@builder6/rooms 0.10.0 → 0.10.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/rooms/app.controller.js +21 -8
- package/dist/rooms/app.controller.js.map +1 -1
- package/dist/rooms/dtos/notifications.dto.d.ts +1 -0
- package/dist/rooms/dtos/notifications.dto.js.map +1 -1
- package/dist/rooms/dtos/room_members.dto.js +0 -1
- package/dist/rooms/dtos/room_members.dto.js.map +1 -1
- package/dist/rooms/notifications.service.d.ts +12 -4
- package/dist/rooms/notifications.service.js +29 -9
- package/dist/rooms/notifications.service.js.map +1 -1
- package/dist/rooms/rooms.controller.d.ts +7 -4
- package/dist/rooms/rooms.controller.js +37 -19
- package/dist/rooms/rooms.controller.js.map +1 -1
- package/dist/rooms/rooms.service.js +14 -2
- package/dist/rooms/rooms.service.js.map +1 -1
- package/package.json +5 -5
- package/src/rooms/app.controller.ts +21 -8
- package/src/rooms/dtos/notifications.dto.ts +1 -0
- package/src/rooms/dtos/room_members.dto.ts +0 -2
- package/src/rooms/notifications.service.ts +47 -11
- package/src/rooms/rooms.controller.ts +41 -26
- package/src/rooms/rooms.service.ts +14 -3
|
@@ -24,17 +24,30 @@ let RoomsAppController = class RoomsAppController {
|
|
|
24
24
|
const user = req['user'];
|
|
25
25
|
try {
|
|
26
26
|
const schema = {
|
|
27
|
-
type: '
|
|
28
|
-
|
|
29
|
-
body: [
|
|
27
|
+
type: 'page',
|
|
28
|
+
toolbar: [
|
|
30
29
|
{
|
|
31
|
-
type: 'rooms-
|
|
32
|
-
|
|
30
|
+
type: 'rooms-provider',
|
|
31
|
+
baseUrl: '',
|
|
32
|
+
body: [
|
|
33
|
+
{
|
|
34
|
+
type: 'rooms-inbox-popover',
|
|
35
|
+
className: 'flex flex-col m-3 gap-3',
|
|
36
|
+
},
|
|
37
|
+
],
|
|
33
38
|
},
|
|
39
|
+
],
|
|
40
|
+
body: [
|
|
34
41
|
{
|
|
35
|
-
type: 'rooms-
|
|
36
|
-
|
|
37
|
-
|
|
42
|
+
type: 'rooms-provider',
|
|
43
|
+
baseUrl: '',
|
|
44
|
+
body: [
|
|
45
|
+
{
|
|
46
|
+
type: 'rooms-comments',
|
|
47
|
+
className: 'flex flex-col m-3 gap-3',
|
|
48
|
+
roomId: `${roomId}`,
|
|
49
|
+
},
|
|
50
|
+
],
|
|
38
51
|
},
|
|
39
52
|
],
|
|
40
53
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.controller.js","sourceRoot":"","sources":["../../src/rooms/app.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAQwB;AAExB,yCAA2C;AAC3C,2CAA+C;AAKxC,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAC7B,YAA6B,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;IAAG,CAAC;IAGrD,AAAN,KAAK,CAAC,QAAQ,CACK,SAAiB,MAAM,EAC/B,KAA0B,EAC5B,GAAY,EACZ,GAAa;QAEpB,MAAM,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC;QACzB,IAAI;YACF,MAAM,MAAM,GAAG;gBACb,IAAI,EAAE,gBAAgB;
|
|
1
|
+
{"version":3,"file":"app.controller.js","sourceRoot":"","sources":["../../src/rooms/app.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAQwB;AAExB,yCAA2C;AAC3C,2CAA+C;AAKxC,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAC7B,YAA6B,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;IAAG,CAAC;IAGrD,AAAN,KAAK,CAAC,QAAQ,CACK,SAAiB,MAAM,EAC/B,KAA0B,EAC5B,GAAY,EACZ,GAAa;QAEpB,MAAM,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC;QACzB,IAAI;YACF,MAAM,MAAM,GAAG;gBACb,IAAI,EAAE,MAAM;gBACZ,OAAO,EAAE;oBACP;wBACE,IAAI,EAAE,gBAAgB;wBACtB,OAAO,EAAE,EAAE;wBACX,IAAI,EAAE;4BACJ;gCACE,IAAI,EAAE,qBAAqB;gCAC3B,SAAS,EAAE,yBAAyB;6BACrC;yBACF;qBACF;iBACF;gBACD,IAAI,EAAE;oBACJ;wBACE,IAAI,EAAE,gBAAgB;wBACtB,OAAO,EAAE,EAAE;wBACX,IAAI,EAAE;4BACJ;gCACE,IAAI,EAAE,gBAAgB;gCACtB,SAAS,EAAE,yBAAyB;gCACpC,MAAM,EAAE,GAAG,MAAM,EAAE;6BACpB;yBACF;qBACF;iBACF;aACF,CAAC;YACF,MAAM,IAAI,GAAG,EAAE,CAAC;YAChB,MAAM,GAAG,GAAG;gBACV,SAAS,EAAE;oBACT,8EAA8E;iBAC/E;aACF,CAAC;YACF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CACjD,MAAM,EACN,IAAI,EACJ,GAAG,EACH,IAAI,CACL,CAAC;YAEF,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SAChC;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACnB,OAAO,EAAE,KAAK,EAAE,wBAAwB,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;SACpE;IACH,CAAC;CACF,CAAA;AAvDO;IADL,IAAA,YAAG,EAAC,SAAS,CAAC;IAEZ,WAAA,IAAA,cAAK,EAAC,QAAQ,CAAC,CAAA;IACf,WAAA,IAAA,cAAK,GAAE,CAAA;IACP,WAAA,IAAA,YAAG,GAAE,CAAA;IACL,WAAA,IAAA,YAAG,GAAE,CAAA;;qDADM,OAAO;;kDAmDpB;AA1DU,kBAAkB;IAF9B,IAAA,mBAAU,EAAC,WAAW,CAAC;IACvB,IAAA,kBAAS,EAAC,gBAAS,CAAC;qCAEwB,oBAAY;GAD5C,kBAAkB,CA2D9B;AA3DY,gDAAkB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notifications.dto.js","sourceRoot":"","sources":["../../../src/rooms/dtos/notifications.dto.ts"],"names":[],"mappings":";;;AAAA,MAAa,eAAe;
|
|
1
|
+
{"version":3,"file":"notifications.dto.js","sourceRoot":"","sources":["../../../src/rooms/dtos/notifications.dto.ts"],"names":[],"mappings":";;;AAAA,MAAa,eAAe;CAS3B;AATD,0CASC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"room_members.dto.js","sourceRoot":"","sources":["../../../src/rooms/dtos/room_members.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA8C;AAC9C,2CAA0C;AAE1C,MAAa,aAAa;IAA1B;
|
|
1
|
+
{"version":3,"file":"room_members.dto.js","sourceRoot":"","sources":["../../../src/rooms/dtos/room_members.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA8C;AAC9C,2CAA0C;AAE1C,MAAa,aAAa;IAA1B;QAYE,UAAK,GAAc,EAAE,CAAC;QAMtB,kBAAa,GAAc,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QAMnD,WAAM,GAAc,uBAAW,CAAC;IAClC,CAAC;CAAA;AAxBC;IAAC,IAAA,qBAAW,GAAE;;0CACD;AAEb;IAAC,IAAA,qBAAW,GAAE;;6CACC;AAGf;IAAC,IAAA,qBAAW,EAAC;QACX,IAAI,EAAE,CAAC,OAAO,CAAC;QACf,OAAO,EAAE,EAAE;KACZ,CAAC;;4CACoB;AAEtB;IAAC,IAAA,qBAAW,EAAC;QACX,IAAI,EAAE,CAAC,KAAK,EAAE,SAAS,EAAE,UAAU,CAAC;QACpC,OAAO,EAAE,CAAC,SAAS,EAAE,UAAU,CAAC;KACjC,CAAC;;oDACiD;AAEnD;IAAC,IAAA,qBAAW,EAAC;QACX,IAAI,EAAE,CAAC,WAAW,EAAE,YAAY,CAAC;QACjC,OAAO,EAAE,uBAAW;KACrB,CAAC;;6CAC8B;AAxBlC,sCAyBC"}
|
|
@@ -4,16 +4,24 @@ import { NotificationDTO } from './dtos/notifications.dto';
|
|
|
4
4
|
export declare class NotificationsService {
|
|
5
5
|
private mongodbService;
|
|
6
6
|
private readonly broker;
|
|
7
|
+
private readonly logger;
|
|
7
8
|
constructor(mongodbService: MongodbService, broker: ServiceBroker);
|
|
8
|
-
|
|
9
|
-
|
|
9
|
+
createRoomMention({ roomId, userId, }: {
|
|
10
|
+
roomId: string;
|
|
11
|
+
userId: string;
|
|
12
|
+
}): Promise<void>;
|
|
13
|
+
createThreadNotification({ _id, id, userId, kind, notifiedAt, readAt, roomId, threadId, }: NotificationDTO): Promise<any>;
|
|
14
|
+
findNotifications({ userId, unread, limit, sinceDate, roomId, threadId, }: {
|
|
10
15
|
userId: string;
|
|
11
16
|
unread?: boolean;
|
|
12
17
|
limit?: number;
|
|
13
18
|
sinceDate?: Date;
|
|
14
19
|
roomId?: string;
|
|
15
20
|
threadId?: string;
|
|
16
|
-
inboxNotificationIds?: string[];
|
|
17
21
|
}): Promise<any>;
|
|
18
|
-
markAsRead(roomId
|
|
22
|
+
markAsRead({ roomId, userId, inboxNotificationIds, }: {
|
|
23
|
+
roomId?: string;
|
|
24
|
+
userId: string;
|
|
25
|
+
inboxNotificationIds: string[] | 'all';
|
|
26
|
+
}): Promise<any>;
|
|
19
27
|
}
|
|
@@ -11,19 +11,35 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
12
|
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
13
|
};
|
|
14
|
+
var NotificationsService_1;
|
|
14
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
16
|
exports.NotificationsService = void 0;
|
|
16
17
|
const core_1 = require("@builder6/core");
|
|
17
18
|
const moleculer_1 = require("@builder6/moleculer");
|
|
18
19
|
const common_1 = require("@nestjs/common");
|
|
19
20
|
const moleculer_2 = require("moleculer");
|
|
20
|
-
|
|
21
|
+
const lodash_1 = require("lodash");
|
|
22
|
+
let NotificationsService = NotificationsService_1 = class NotificationsService {
|
|
21
23
|
constructor(mongodbService, broker) {
|
|
22
24
|
this.mongodbService = mongodbService;
|
|
23
25
|
this.broker = broker;
|
|
26
|
+
this.logger = new common_1.Logger(NotificationsService_1.name);
|
|
24
27
|
}
|
|
25
|
-
async
|
|
28
|
+
async createRoomMention({ roomId, userId, }) {
|
|
29
|
+
if (roomId && roomId.split(':').length === 3) {
|
|
30
|
+
const [objects, objectName, recordId] = roomId.split(':');
|
|
31
|
+
if (objects === 'objects') {
|
|
32
|
+
this.logger.log(`Emitting ${objectName}.mentioned, recordId:${recordId} userId:${userId}`);
|
|
33
|
+
this.broker.emit(`${objectName}.mentioned`, {
|
|
34
|
+
recordId,
|
|
35
|
+
userId,
|
|
36
|
+
});
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
async createThreadNotification({ _id, id, userId, kind = 'thread', notifiedAt, readAt, roomId, threadId, }) {
|
|
26
41
|
return this.mongodbService.insertOne('b6_notifications', {
|
|
42
|
+
_id,
|
|
27
43
|
id,
|
|
28
44
|
userId,
|
|
29
45
|
kind,
|
|
@@ -33,7 +49,7 @@ let NotificationsService = class NotificationsService {
|
|
|
33
49
|
threadId,
|
|
34
50
|
});
|
|
35
51
|
}
|
|
36
|
-
async findNotifications({ userId, unread, limit, sinceDate, roomId, threadId,
|
|
52
|
+
async findNotifications({ userId, unread, limit, sinceDate, roomId, threadId, }) {
|
|
37
53
|
const queryOptions = { userId };
|
|
38
54
|
if (unread)
|
|
39
55
|
queryOptions.readAt = null;
|
|
@@ -44,21 +60,25 @@ let NotificationsService = class NotificationsService {
|
|
|
44
60
|
queryOptions.roomId = roomId;
|
|
45
61
|
if (threadId)
|
|
46
62
|
queryOptions.threadId = threadId;
|
|
47
|
-
if (inboxNotificationIds && inboxNotificationIds.length > 0) {
|
|
48
|
-
queryOptions.id = { $in: inboxNotificationIds };
|
|
49
|
-
}
|
|
50
63
|
const collection = (await this.mongodbService.getCollection('b6_notifications'));
|
|
51
64
|
const query = collection.find(queryOptions).sort({ notifiedAt: 1 });
|
|
52
65
|
if (limit)
|
|
53
66
|
query.limit(limit);
|
|
54
67
|
return query.toArray();
|
|
55
68
|
}
|
|
56
|
-
async markAsRead(roomId, userId,
|
|
69
|
+
async markAsRead({ roomId, userId, inboxNotificationIds, }) {
|
|
70
|
+
const queryOptions = { userId };
|
|
71
|
+
if (roomId)
|
|
72
|
+
queryOptions.roomId = roomId;
|
|
73
|
+
if ((0, lodash_1.isArray)(inboxNotificationIds) && inboxNotificationIds != 'all')
|
|
74
|
+
queryOptions._id = { $in: inboxNotificationIds };
|
|
57
75
|
const collection = (await this.mongodbService.getCollection('b6_notifications'));
|
|
58
|
-
return collection.updateMany(
|
|
76
|
+
return collection.updateMany(queryOptions, {
|
|
77
|
+
$set: { readAt: new Date() },
|
|
78
|
+
});
|
|
59
79
|
}
|
|
60
80
|
};
|
|
61
|
-
NotificationsService = __decorate([
|
|
81
|
+
NotificationsService = NotificationsService_1 = __decorate([
|
|
62
82
|
(0, common_1.Injectable)(),
|
|
63
83
|
__param(1, (0, moleculer_1.InjectBroker)()),
|
|
64
84
|
__metadata("design:paramtypes", [core_1.MongodbService,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notifications.service.js","sourceRoot":"","sources":["../../src/rooms/notifications.service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"notifications.service.js","sourceRoot":"","sources":["../../src/rooms/notifications.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yCAAgD;AAChD,mDAAmD;AACnD,2CAAoD;AACpD,yCAA0C;AAE1C,mCAAiC;AAG1B,IAAM,oBAAoB,4BAA1B,MAAM,oBAAoB;IAE/B,YACU,cAA8B,EACL,MAAqB;QAD9C,mBAAc,GAAd,cAAc,CAAgB;QACL,WAAM,GAAN,MAAM,CAAe;QAHvC,WAAM,GAAG,IAAI,eAAM,CAAC,sBAAoB,CAAC,IAAI,CAAC,CAAC;IAI7D,CAAC;IAEJ,KAAK,CAAC,iBAAiB,CAAC,EACtB,MAAM,EACN,MAAM,GAIP;QAEC,IAAI,MAAM,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;YAC5C,MAAM,CAAC,OAAO,EAAE,UAAU,EAAE,QAAQ,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC1D,IAAI,OAAO,KAAK,SAAS,EAAE;gBACzB,IAAI,CAAC,MAAM,CAAC,GAAG,CACb,YAAY,UAAU,wBAAwB,QAAQ,WAAW,MAAM,EAAE,CAC1E,CAAC;gBACF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,UAAU,YAAY,EAAE;oBAC1C,QAAQ;oBACR,MAAM;iBACP,CAAC,CAAC;aACJ;SACF;IACH,CAAC;IAED,KAAK,CAAC,wBAAwB,CAAC,EAC7B,GAAG,EACH,EAAE,EACF,MAAM,EACN,IAAI,GAAG,QAAQ,EACf,UAAU,EACV,MAAM,EACN,MAAM,EACN,QAAQ,GACQ;QAChB,OAAO,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,kBAAkB,EAAE;YACvD,GAAG;YACH,EAAE;YACF,MAAM;YACN,IAAI;YACJ,UAAU;YACV,MAAM;YACN,MAAM;YACN,QAAQ;SACT,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,EACtB,MAAM,EACN,MAAM,EACN,KAAK,EACL,SAAS,EACT,MAAM,EACN,QAAQ,GAQT;QACC,MAAM,YAAY,GAAG,EAAE,MAAM,EAO5B,CAAC;QACF,IAAI,MAAM;YAAE,YAAY,CAAC,MAAM,GAAG,IAAI,CAAC;QACvC,IAAI,SAAS,EAAE;YACb,YAAY,CAAC,UAAU,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC;SAC9C;QACD,IAAI,MAAM;YAAE,YAAY,CAAC,MAAM,GAAG,MAAM,CAAC;QACzC,IAAI,QAAQ;YAAE,YAAY,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAC/C,MAAM,UAAU,GAAG,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,aAAa,CACzD,kBAAkB,CACnB,CAAQ,CAAC;QACV,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,CAAC,CAAC;QACpE,IAAI,KAAK;YAAE,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC9B,OAAO,KAAK,CAAC,OAAO,EAAE,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,EACf,MAAM,EACN,MAAM,EACN,oBAAoB,GAKrB;QACC,MAAM,YAAY,GAAG,EAAE,MAAM,EAI5B,CAAC;QACF,IAAI,MAAM;YAAE,YAAY,CAAC,MAAM,GAAG,MAAM,CAAC;QACzC,IAAI,IAAA,gBAAO,EAAC,oBAAoB,CAAC,IAAI,oBAAoB,IAAI,KAAK;YAChE,YAAY,CAAC,GAAG,GAAG,EAAE,GAAG,EAAE,oBAAoB,EAAE,CAAC;QACnD,MAAM,UAAU,GAAG,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,aAAa,CACzD,kBAAkB,CACnB,CAAQ,CAAC;QACV,OAAO,UAAU,CAAC,UAAU,CAAC,YAAY,EAAE;YACzC,IAAI,EAAE,EAAE,MAAM,EAAE,IAAI,IAAI,EAAE,EAAE;SAC7B,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AAhHY,oBAAoB;IADhC,IAAA,mBAAU,GAAE;IAKR,WAAA,IAAA,wBAAY,GAAE,CAAA;qCADS,qBAAc;QACG,yBAAa;GAJ7C,oBAAoB,CAgHhC;AAhHY,oDAAoB"}
|
|
@@ -55,26 +55,29 @@ export declare class RoomsController {
|
|
|
55
55
|
createComment(req: Request, roomId: string, threadId: string, record: Record<string, any>): Promise<any>;
|
|
56
56
|
updateComment(req: Request, roomId: string, threadId: string, commentId: string, record: Record<string, any>): Promise<any>;
|
|
57
57
|
deleteComment(req: Request, roomId: string, threadId: string, commentId: string): Promise<{}>;
|
|
58
|
-
|
|
58
|
+
getInboxNotificationsSince(req: Request, since: string): Promise<{
|
|
59
59
|
inboxNotifications: any;
|
|
60
60
|
threads: any[];
|
|
61
61
|
meta: {
|
|
62
|
-
nextCursor: any;
|
|
63
62
|
requestedAt: Date;
|
|
64
63
|
};
|
|
65
64
|
deletedThreads: any[];
|
|
66
65
|
deletedInboxNotifications: any[];
|
|
67
66
|
}>;
|
|
68
|
-
|
|
67
|
+
getInboxNotifications(req: Request, unread: string, limit: string): Promise<{
|
|
69
68
|
inboxNotifications: any;
|
|
70
69
|
threads: any[];
|
|
71
70
|
meta: {
|
|
71
|
+
nextCursor: any;
|
|
72
72
|
requestedAt: Date;
|
|
73
73
|
};
|
|
74
74
|
deletedThreads: any[];
|
|
75
75
|
deletedInboxNotifications: any[];
|
|
76
76
|
}>;
|
|
77
|
-
read(req: Request,
|
|
77
|
+
read(req: Request, inboxNotificationIds: string[]): Promise<{
|
|
78
|
+
data: any;
|
|
79
|
+
}>;
|
|
80
|
+
roomRead(req: Request, roomId: string, inboxNotificationIds: (string[] | 'all')): Promise<{
|
|
78
81
|
data: any;
|
|
79
82
|
}>;
|
|
80
83
|
presignedUrls(attachmentIds: string[]): Promise<{
|
|
@@ -190,46 +190,55 @@ let RoomsController = class RoomsController {
|
|
|
190
190
|
});
|
|
191
191
|
return {};
|
|
192
192
|
}
|
|
193
|
-
async
|
|
193
|
+
async getInboxNotificationsSince(req, since) {
|
|
194
194
|
const userId = req['jwt'].uid;
|
|
195
|
+
const sinceDate = new Date(since);
|
|
195
196
|
const requestedAt = new Date();
|
|
196
197
|
const notifications = await this.notificationsService.findNotifications({
|
|
197
198
|
userId,
|
|
198
|
-
|
|
199
|
-
limit: Number(limit),
|
|
199
|
+
sinceDate,
|
|
200
200
|
});
|
|
201
201
|
const threads = await this.roomsService.getThreadsByIds((0, lodash_1.uniqBy)(notifications, (notification) => `${notification.roomId}-${notification.threadId}`));
|
|
202
202
|
return {
|
|
203
203
|
inboxNotifications: notifications.map((notification) => (0, lodash_1.omit)(notification, ['userId', '_id'])),
|
|
204
204
|
threads,
|
|
205
|
-
meta: {
|
|
206
|
-
nextCursor: null,
|
|
207
|
-
requestedAt,
|
|
208
|
-
},
|
|
205
|
+
meta: { requestedAt },
|
|
209
206
|
deletedThreads: [],
|
|
210
207
|
deletedInboxNotifications: [],
|
|
211
208
|
};
|
|
212
209
|
}
|
|
213
|
-
async
|
|
210
|
+
async getInboxNotifications(req, unread, limit) {
|
|
214
211
|
const userId = req['jwt'].uid;
|
|
215
|
-
const sinceDate = new Date(since);
|
|
216
212
|
const requestedAt = new Date();
|
|
217
213
|
const notifications = await this.notificationsService.findNotifications({
|
|
218
214
|
userId,
|
|
219
|
-
|
|
215
|
+
unread: unread === 'true',
|
|
216
|
+
limit: Number(limit),
|
|
220
217
|
});
|
|
221
218
|
const threads = await this.roomsService.getThreadsByIds((0, lodash_1.uniqBy)(notifications, (notification) => `${notification.roomId}-${notification.threadId}`));
|
|
222
219
|
return {
|
|
223
220
|
inboxNotifications: notifications.map((notification) => (0, lodash_1.omit)(notification, ['userId', '_id'])),
|
|
224
221
|
threads,
|
|
225
|
-
meta: {
|
|
222
|
+
meta: {
|
|
223
|
+
nextCursor: null,
|
|
224
|
+
requestedAt,
|
|
225
|
+
},
|
|
226
226
|
deletedThreads: [],
|
|
227
227
|
deletedInboxNotifications: [],
|
|
228
228
|
};
|
|
229
229
|
}
|
|
230
|
-
async read(req,
|
|
230
|
+
async read(req, inboxNotificationIds) {
|
|
231
231
|
const userId = req['jwt'].uid;
|
|
232
|
-
const notifications = await this.notificationsService.markAsRead(
|
|
232
|
+
const notifications = await this.notificationsService.markAsRead({ userId, inboxNotificationIds });
|
|
233
|
+
return {
|
|
234
|
+
data: notifications?.length > 0
|
|
235
|
+
? notifications.map((notification) => (0, lodash_1.omit)(notification, ['userId', '_id']))
|
|
236
|
+
: undefined,
|
|
237
|
+
};
|
|
238
|
+
}
|
|
239
|
+
async roomRead(req, roomId, inboxNotificationIds) {
|
|
240
|
+
const userId = req['jwt'].uid;
|
|
241
|
+
const notifications = await this.notificationsService.markAsRead({ roomId, userId, inboxNotificationIds });
|
|
233
242
|
return {
|
|
234
243
|
data: notifications?.length > 0
|
|
235
244
|
? notifications.map((notification) => (0, lodash_1.omit)(notification, ['userId', '_id']))
|
|
@@ -411,6 +420,15 @@ __decorate([
|
|
|
411
420
|
__metadata("design:paramtypes", [Object, String, String, String]),
|
|
412
421
|
__metadata("design:returntype", Promise)
|
|
413
422
|
], RoomsController.prototype, "deleteComment", null);
|
|
423
|
+
__decorate([
|
|
424
|
+
(0, common_1.UseGuards)(rooms_guard_1.RoomsGuard),
|
|
425
|
+
(0, common_1.Get)('inbox-notifications/delta'),
|
|
426
|
+
__param(0, (0, common_1.Req)()),
|
|
427
|
+
__param(1, (0, common_1.Query)('since')),
|
|
428
|
+
__metadata("design:type", Function),
|
|
429
|
+
__metadata("design:paramtypes", [Object, String]),
|
|
430
|
+
__metadata("design:returntype", Promise)
|
|
431
|
+
], RoomsController.prototype, "getInboxNotificationsSince", null);
|
|
414
432
|
__decorate([
|
|
415
433
|
(0, common_1.UseGuards)(rooms_guard_1.RoomsGuard),
|
|
416
434
|
(0, common_1.Get)('inbox-notifications'),
|
|
@@ -423,13 +441,13 @@ __decorate([
|
|
|
423
441
|
], RoomsController.prototype, "getInboxNotifications", null);
|
|
424
442
|
__decorate([
|
|
425
443
|
(0, common_1.UseGuards)(rooms_guard_1.RoomsGuard),
|
|
426
|
-
(0, common_1.
|
|
444
|
+
(0, common_1.Post)('inbox-notifications/read'),
|
|
427
445
|
__param(0, (0, common_1.Req)()),
|
|
428
|
-
__param(1, (0, common_1.
|
|
446
|
+
__param(1, (0, common_1.Body)('inboxNotificationIds')),
|
|
429
447
|
__metadata("design:type", Function),
|
|
430
|
-
__metadata("design:paramtypes", [Object,
|
|
448
|
+
__metadata("design:paramtypes", [Object, Array]),
|
|
431
449
|
__metadata("design:returntype", Promise)
|
|
432
|
-
], RoomsController.prototype, "
|
|
450
|
+
], RoomsController.prototype, "read", null);
|
|
433
451
|
__decorate([
|
|
434
452
|
(0, common_1.UseGuards)(rooms_guard_1.RoomsGuard),
|
|
435
453
|
(0, common_1.Post)('rooms/:roomId/inbox-notifications/read'),
|
|
@@ -437,9 +455,9 @@ __decorate([
|
|
|
437
455
|
__param(1, (0, common_1.Param)('roomId')),
|
|
438
456
|
__param(2, (0, common_1.Body)('inboxNotificationIds')),
|
|
439
457
|
__metadata("design:type", Function),
|
|
440
|
-
__metadata("design:paramtypes", [Object, String,
|
|
458
|
+
__metadata("design:paramtypes", [Object, String, Object]),
|
|
441
459
|
__metadata("design:returntype", Promise)
|
|
442
|
-
], RoomsController.prototype, "
|
|
460
|
+
], RoomsController.prototype, "roomRead", null);
|
|
443
461
|
__decorate([
|
|
444
462
|
(0, common_1.UseGuards)(rooms_guard_1.RoomsGuard),
|
|
445
463
|
(0, common_1.Post)('rooms/:roomId/attachments/presigned-urls'),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rooms.controller.js","sourceRoot":"","sources":["../../src/rooms/rooms.controller.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"rooms.controller.js","sourceRoot":"","sources":["../../src/rooms/rooms.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,7 @@ const common_1 = require("@nestjs/common");
|
|
|
16
16
|
const rooms_dto_1 = require("./dtos/rooms.dto");
|
|
17
17
|
const lodash_1 = require("lodash");
|
|
18
18
|
const notifications_service_1 = require("./notifications.service");
|
|
19
|
+
const uuid_1 = require("uuid");
|
|
19
20
|
var CommentType;
|
|
20
21
|
(function (CommentType) {
|
|
21
22
|
CommentType["Paragraph"] = "paragraph";
|
|
@@ -91,6 +92,7 @@ let RoomsService = class RoomsService {
|
|
|
91
92
|
});
|
|
92
93
|
users.push({
|
|
93
94
|
name: user ? user.name : 'Unknown',
|
|
95
|
+
avatar: '/api/v6/users/' + userId + '/avatar',
|
|
94
96
|
});
|
|
95
97
|
}
|
|
96
98
|
return users;
|
|
@@ -208,6 +210,7 @@ let RoomsService = class RoomsService {
|
|
|
208
210
|
}
|
|
209
211
|
const { content } = body;
|
|
210
212
|
let notificationsPromises;
|
|
213
|
+
let createRoomMentionPromises;
|
|
211
214
|
const mentionUsers = [];
|
|
212
215
|
for (const message of content) {
|
|
213
216
|
if (message.type === CommentType.Paragraph) {
|
|
@@ -217,8 +220,11 @@ let RoomsService = class RoomsService {
|
|
|
217
220
|
}
|
|
218
221
|
}
|
|
219
222
|
if (mentionUsers && mentionUsers.length > 0) {
|
|
220
|
-
|
|
223
|
+
const uniqUsers = (0, lodash_1.uniq)(mentionUsers);
|
|
224
|
+
notificationsPromises = uniqUsers.map((userId) => {
|
|
225
|
+
const id = (0, uuid_1.v4)();
|
|
221
226
|
return this.notificationsService.createThreadNotification({
|
|
227
|
+
_id: id,
|
|
222
228
|
id,
|
|
223
229
|
userId,
|
|
224
230
|
kind: 'thread',
|
|
@@ -228,7 +234,13 @@ let RoomsService = class RoomsService {
|
|
|
228
234
|
threadId,
|
|
229
235
|
});
|
|
230
236
|
});
|
|
231
|
-
|
|
237
|
+
createRoomMentionPromises = uniqUsers.map((userId) => {
|
|
238
|
+
return this.notificationsService.createRoomMention({
|
|
239
|
+
userId,
|
|
240
|
+
roomId,
|
|
241
|
+
});
|
|
242
|
+
});
|
|
243
|
+
await Promise.all([].concat(notificationsPromises, createRoomMentionPromises));
|
|
232
244
|
}
|
|
233
245
|
delete result['_id'];
|
|
234
246
|
delete result['attachmentIds'];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rooms.service.js","sourceRoot":"","sources":["../../src/rooms/rooms.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"rooms.service.js","sourceRoot":"","sources":["../../src/rooms/rooms.service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@builder6/rooms",
|
|
3
|
-
"version": "0.10.
|
|
3
|
+
"version": "0.10.3",
|
|
4
4
|
"description": "",
|
|
5
5
|
"author": "",
|
|
6
6
|
"license": "MIT",
|
|
@@ -10,9 +10,9 @@
|
|
|
10
10
|
"build:watch": "rimraf dist && tsc --watch"
|
|
11
11
|
},
|
|
12
12
|
"dependencies": {
|
|
13
|
-
"@builder6/core": "^0.10.
|
|
14
|
-
"@builder6/moleculer": "^0.10.
|
|
15
|
-
"@builder6/pages": "^0.10.
|
|
13
|
+
"@builder6/core": "^0.10.3",
|
|
14
|
+
"@builder6/moleculer": "^0.10.3",
|
|
15
|
+
"@builder6/pages": "^0.10.3",
|
|
16
16
|
"lodash": "^4.17.21"
|
|
17
17
|
},
|
|
18
18
|
"peerDependencies": {
|
|
@@ -41,5 +41,5 @@
|
|
|
41
41
|
"devDependencies": {
|
|
42
42
|
"@types/lodash": "^4.17.13"
|
|
43
43
|
},
|
|
44
|
-
"gitHead": "
|
|
44
|
+
"gitHead": "c36abe10914369d927b9a7ec697d4b3a35a701c3"
|
|
45
45
|
}
|
|
@@ -27,17 +27,30 @@ export class RoomsAppController {
|
|
|
27
27
|
const user = req['user'];
|
|
28
28
|
try {
|
|
29
29
|
const schema = {
|
|
30
|
-
type: '
|
|
31
|
-
|
|
32
|
-
body: [
|
|
30
|
+
type: 'page',
|
|
31
|
+
toolbar: [
|
|
33
32
|
{
|
|
34
|
-
type: 'rooms-
|
|
35
|
-
|
|
33
|
+
type: 'rooms-provider',
|
|
34
|
+
baseUrl: '',
|
|
35
|
+
body: [
|
|
36
|
+
{
|
|
37
|
+
type: 'rooms-inbox-popover',
|
|
38
|
+
className: 'flex flex-col m-3 gap-3',
|
|
39
|
+
},
|
|
40
|
+
],
|
|
36
41
|
},
|
|
42
|
+
],
|
|
43
|
+
body: [
|
|
37
44
|
{
|
|
38
|
-
type: 'rooms-
|
|
39
|
-
|
|
40
|
-
|
|
45
|
+
type: 'rooms-provider',
|
|
46
|
+
baseUrl: '',
|
|
47
|
+
body: [
|
|
48
|
+
{
|
|
49
|
+
type: 'rooms-comments',
|
|
50
|
+
className: 'flex flex-col m-3 gap-3',
|
|
51
|
+
roomId: `${roomId}`,
|
|
52
|
+
},
|
|
53
|
+
],
|
|
41
54
|
},
|
|
42
55
|
],
|
|
43
56
|
};
|
|
@@ -1,17 +1,42 @@
|
|
|
1
1
|
import { MongodbService } from '@builder6/core';
|
|
2
2
|
import { InjectBroker } from '@builder6/moleculer';
|
|
3
|
-
import { Injectable } from '@nestjs/common';
|
|
3
|
+
import { Injectable, Logger } from '@nestjs/common';
|
|
4
4
|
import { ServiceBroker } from 'moleculer';
|
|
5
5
|
import { NotificationDTO } from './dtos/notifications.dto';
|
|
6
|
+
import { isArray } from 'lodash';
|
|
6
7
|
|
|
7
8
|
@Injectable()
|
|
8
9
|
export class NotificationsService {
|
|
10
|
+
private readonly logger = new Logger(NotificationsService.name);
|
|
9
11
|
constructor(
|
|
10
12
|
private mongodbService: MongodbService,
|
|
11
13
|
@InjectBroker() private readonly broker: ServiceBroker,
|
|
12
14
|
) {}
|
|
13
15
|
|
|
16
|
+
async createRoomMention({
|
|
17
|
+
roomId,
|
|
18
|
+
userId,
|
|
19
|
+
}: {
|
|
20
|
+
roomId: string;
|
|
21
|
+
userId: string;
|
|
22
|
+
}) {
|
|
23
|
+
// moleculer 抛消息
|
|
24
|
+
if (roomId && roomId.split(':').length === 3) {
|
|
25
|
+
const [objects, objectName, recordId] = roomId.split(':');
|
|
26
|
+
if (objects === 'objects') {
|
|
27
|
+
this.logger.log(
|
|
28
|
+
`Emitting ${objectName}.mentioned, recordId:${recordId} userId:${userId}`,
|
|
29
|
+
);
|
|
30
|
+
this.broker.emit(`${objectName}.mentioned`, {
|
|
31
|
+
recordId,
|
|
32
|
+
userId,
|
|
33
|
+
});
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
|
|
14
38
|
async createThreadNotification({
|
|
39
|
+
_id,
|
|
15
40
|
id,
|
|
16
41
|
userId,
|
|
17
42
|
kind = 'thread',
|
|
@@ -21,6 +46,7 @@ export class NotificationsService {
|
|
|
21
46
|
threadId,
|
|
22
47
|
}: NotificationDTO) {
|
|
23
48
|
return this.mongodbService.insertOne('b6_notifications', {
|
|
49
|
+
_id,
|
|
24
50
|
id,
|
|
25
51
|
userId,
|
|
26
52
|
kind,
|
|
@@ -38,7 +64,6 @@ export class NotificationsService {
|
|
|
38
64
|
sinceDate,
|
|
39
65
|
roomId,
|
|
40
66
|
threadId,
|
|
41
|
-
inboxNotificationIds,
|
|
42
67
|
}: {
|
|
43
68
|
userId: string;
|
|
44
69
|
unread?: boolean;
|
|
@@ -46,7 +71,6 @@ export class NotificationsService {
|
|
|
46
71
|
sinceDate?: Date;
|
|
47
72
|
roomId?: string;
|
|
48
73
|
threadId?: string;
|
|
49
|
-
inboxNotificationIds?: string[];
|
|
50
74
|
}) {
|
|
51
75
|
const queryOptions = { userId } as {
|
|
52
76
|
userId: string;
|
|
@@ -62,9 +86,6 @@ export class NotificationsService {
|
|
|
62
86
|
}
|
|
63
87
|
if (roomId) queryOptions.roomId = roomId;
|
|
64
88
|
if (threadId) queryOptions.threadId = threadId;
|
|
65
|
-
if (inboxNotificationIds && inboxNotificationIds.length > 0) {
|
|
66
|
-
queryOptions.id = { $in: inboxNotificationIds };
|
|
67
|
-
}
|
|
68
89
|
const collection = (await this.mongodbService.getCollection(
|
|
69
90
|
'b6_notifications',
|
|
70
91
|
)) as any;
|
|
@@ -73,13 +94,28 @@ export class NotificationsService {
|
|
|
73
94
|
return query.toArray();
|
|
74
95
|
}
|
|
75
96
|
|
|
76
|
-
async markAsRead(
|
|
97
|
+
async markAsRead({
|
|
98
|
+
roomId,
|
|
99
|
+
userId,
|
|
100
|
+
inboxNotificationIds,
|
|
101
|
+
}: {
|
|
102
|
+
roomId?: string;
|
|
103
|
+
userId: string;
|
|
104
|
+
inboxNotificationIds: string[] | 'all';
|
|
105
|
+
}) {
|
|
106
|
+
const queryOptions = { userId } as {
|
|
107
|
+
roomId?: string;
|
|
108
|
+
userId: string;
|
|
109
|
+
_id: { $in: string[] };
|
|
110
|
+
};
|
|
111
|
+
if (roomId) queryOptions.roomId = roomId;
|
|
112
|
+
if (isArray(inboxNotificationIds) && inboxNotificationIds != 'all')
|
|
113
|
+
queryOptions._id = { $in: inboxNotificationIds };
|
|
77
114
|
const collection = (await this.mongodbService.getCollection(
|
|
78
115
|
'b6_notifications',
|
|
79
116
|
)) as any;
|
|
80
|
-
return collection.updateMany(
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
);
|
|
117
|
+
return collection.updateMany(queryOptions, {
|
|
118
|
+
$set: { readAt: new Date() },
|
|
119
|
+
});
|
|
84
120
|
}
|
|
85
121
|
}
|
|
@@ -293,20 +293,19 @@ export class RoomsController {
|
|
|
293
293
|
return {};
|
|
294
294
|
}
|
|
295
295
|
|
|
296
|
-
//
|
|
296
|
+
// 获取增量通知
|
|
297
297
|
@UseGuards(RoomsGuard)
|
|
298
|
-
@Get('inbox-notifications')
|
|
299
|
-
async
|
|
298
|
+
@Get('inbox-notifications/delta')
|
|
299
|
+
async getInboxNotificationsSince(
|
|
300
300
|
@Req() req: Request,
|
|
301
|
-
@Query('
|
|
302
|
-
@Query('limit') limit: string,
|
|
301
|
+
@Query('since') since: string,
|
|
303
302
|
) {
|
|
304
303
|
const userId = req['jwt'].uid;
|
|
304
|
+
const sinceDate = new Date(since);
|
|
305
305
|
const requestedAt = new Date();
|
|
306
306
|
const notifications = await this.notificationsService.findNotifications({
|
|
307
307
|
userId,
|
|
308
|
-
|
|
309
|
-
limit: Number(limit),
|
|
308
|
+
sinceDate,
|
|
310
309
|
});
|
|
311
310
|
const threads = await this.roomsService.getThreadsByIds(
|
|
312
311
|
uniqBy(
|
|
@@ -319,28 +318,26 @@ export class RoomsController {
|
|
|
319
318
|
omit(notification, ['userId', '_id']),
|
|
320
319
|
),
|
|
321
320
|
threads,
|
|
322
|
-
meta: {
|
|
323
|
-
nextCursor: null,
|
|
324
|
-
requestedAt,
|
|
325
|
-
},
|
|
321
|
+
meta: { requestedAt },
|
|
326
322
|
deletedThreads: [],
|
|
327
323
|
deletedInboxNotifications: [],
|
|
328
324
|
};
|
|
329
325
|
}
|
|
330
326
|
|
|
331
|
-
//
|
|
327
|
+
// 获取通知
|
|
332
328
|
@UseGuards(RoomsGuard)
|
|
333
|
-
@Get('inbox-notifications
|
|
334
|
-
async
|
|
329
|
+
@Get('inbox-notifications')
|
|
330
|
+
async getInboxNotifications(
|
|
335
331
|
@Req() req: Request,
|
|
336
|
-
@Query('
|
|
332
|
+
@Query('unread') unread: string,
|
|
333
|
+
@Query('limit') limit: string,
|
|
337
334
|
) {
|
|
338
335
|
const userId = req['jwt'].uid;
|
|
339
|
-
const sinceDate = new Date(since);
|
|
340
336
|
const requestedAt = new Date();
|
|
341
337
|
const notifications = await this.notificationsService.findNotifications({
|
|
342
338
|
userId,
|
|
343
|
-
|
|
339
|
+
unread: unread === 'true',
|
|
340
|
+
limit: Number(limit),
|
|
344
341
|
});
|
|
345
342
|
const threads = await this.roomsService.getThreadsByIds(
|
|
346
343
|
uniqBy(
|
|
@@ -353,26 +350,44 @@ export class RoomsController {
|
|
|
353
350
|
omit(notification, ['userId', '_id']),
|
|
354
351
|
),
|
|
355
352
|
threads,
|
|
356
|
-
meta: {
|
|
353
|
+
meta: {
|
|
354
|
+
nextCursor: null,
|
|
355
|
+
requestedAt,
|
|
356
|
+
},
|
|
357
357
|
deletedThreads: [],
|
|
358
358
|
deletedInboxNotifications: [],
|
|
359
359
|
};
|
|
360
360
|
}
|
|
361
361
|
|
|
362
|
-
// read
|
|
362
|
+
// room read
|
|
363
363
|
@UseGuards(RoomsGuard)
|
|
364
|
-
@Post('
|
|
364
|
+
@Post('inbox-notifications/read')
|
|
365
365
|
async read(
|
|
366
366
|
@Req() req: Request,
|
|
367
|
-
@Param('roomId') roomId: string,
|
|
368
367
|
@Body('inboxNotificationIds') inboxNotificationIds: string[],
|
|
369
368
|
) {
|
|
370
369
|
const userId = req['jwt'].uid;
|
|
371
|
-
const notifications = await this.notificationsService.markAsRead(
|
|
372
|
-
|
|
373
|
-
|
|
374
|
-
|
|
375
|
-
|
|
370
|
+
const notifications = await this.notificationsService.markAsRead({ userId, inboxNotificationIds });
|
|
371
|
+
return {
|
|
372
|
+
data:
|
|
373
|
+
notifications?.length > 0
|
|
374
|
+
? notifications.map((notification) =>
|
|
375
|
+
omit(notification, ['userId', '_id']),
|
|
376
|
+
)
|
|
377
|
+
: undefined,
|
|
378
|
+
};
|
|
379
|
+
}
|
|
380
|
+
|
|
381
|
+
// room read
|
|
382
|
+
@UseGuards(RoomsGuard)
|
|
383
|
+
@Post('rooms/:roomId/inbox-notifications/read')
|
|
384
|
+
async roomRead(
|
|
385
|
+
@Req() req: Request,
|
|
386
|
+
@Param('roomId') roomId: string,
|
|
387
|
+
@Body('inboxNotificationIds') inboxNotificationIds: (string[] | 'all'),
|
|
388
|
+
) {
|
|
389
|
+
const userId = req['jwt'].uid;
|
|
390
|
+
const notifications = await this.notificationsService.markAsRead({roomId, userId, inboxNotificationIds });
|
|
376
391
|
return {
|
|
377
392
|
data:
|
|
378
393
|
notifications?.length > 0
|
|
@@ -5,6 +5,7 @@ import { READ_ACCESS, RoomDTO } from './dtos/rooms.dto';
|
|
|
5
5
|
import { RoomMemberDTO } from './dtos/room_members.dto';
|
|
6
6
|
import { uniq } from 'lodash';
|
|
7
7
|
import { NotificationsService } from './notifications.service';
|
|
8
|
+
import { v4 as uuidv4 } from 'uuid';
|
|
8
9
|
import { CommentBody, CommentBodyMention } from './protocol/Comments';
|
|
9
10
|
|
|
10
11
|
export interface CreateThreadParams {
|
|
@@ -142,7 +143,7 @@ export class RoomsService {
|
|
|
142
143
|
});
|
|
143
144
|
users.push({
|
|
144
145
|
name: user ? user.name : 'Unknown',
|
|
145
|
-
|
|
146
|
+
avatar: '/api/v6/users/' + userId + '/avatar',
|
|
146
147
|
});
|
|
147
148
|
}
|
|
148
149
|
|
|
@@ -321,6 +322,7 @@ export class RoomsService {
|
|
|
321
322
|
// 如果有 @ mention 的时候,自动创建 b6_notifications 记录。
|
|
322
323
|
const { content } = body as CommentBody;
|
|
323
324
|
let notificationsPromises: Promise<any>[];
|
|
325
|
+
let createRoomMentionPromises: Promise<any>[];
|
|
324
326
|
const mentionUsers: string[] = [];
|
|
325
327
|
for (const message of content) {
|
|
326
328
|
if (message.type === CommentType.Paragraph) {
|
|
@@ -333,8 +335,11 @@ export class RoomsService {
|
|
|
333
335
|
}
|
|
334
336
|
}
|
|
335
337
|
if (mentionUsers && mentionUsers.length > 0) {
|
|
336
|
-
|
|
338
|
+
const uniqUsers = uniq(mentionUsers);
|
|
339
|
+
notificationsPromises = uniqUsers.map((userId) => {
|
|
340
|
+
const id = uuidv4()
|
|
337
341
|
return this.notificationsService.createThreadNotification({
|
|
342
|
+
_id: id,
|
|
338
343
|
id,
|
|
339
344
|
userId,
|
|
340
345
|
kind: 'thread',
|
|
@@ -344,7 +349,13 @@ export class RoomsService {
|
|
|
344
349
|
threadId,
|
|
345
350
|
});
|
|
346
351
|
});
|
|
347
|
-
|
|
352
|
+
createRoomMentionPromises = uniqUsers.map((userId) => {
|
|
353
|
+
return this.notificationsService.createRoomMention({
|
|
354
|
+
userId,
|
|
355
|
+
roomId,
|
|
356
|
+
});
|
|
357
|
+
});
|
|
358
|
+
await Promise.all([].concat(notificationsPromises, createRoomMentionPromises));
|
|
348
359
|
}
|
|
349
360
|
delete result['_id'];
|
|
350
361
|
delete result['attachmentIds'];
|