@builder6/rooms 0.10.4 → 0.10.5

package/README.md

@@ -16,5 +16,5 @@ https://liveblocks.io/docs/api-reference/rest-api-endpoints#Room
 - b6_room_members
 - b6_threads
 - b6_comments
-- b6_notifications
+- b6_inbox_notifications
 ```

package/dist/rooms/dtos/inbox_notifications.dto.d.ts

@@ -0,0 +1,9 @@
+export declare class InboxNotificationDTO {
+    _id: string;
+    userId: string;
+    kind: string;
+    notifiedAt?: Date;
+    readAt?: Date;
+    roomId: string;
+    threadId: string;
+}

package/dist/rooms/dtos/inbox_notifications.dto.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.InboxNotificationDTO = void 0;
+class InboxNotificationDTO {
+}
+exports.InboxNotificationDTO = InboxNotificationDTO;
+//# sourceMappingURL=inbox_notifications.dto.js.map

package/dist/rooms/dtos/inbox_notifications.dto.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"inbox_notifications.dto.js","sourceRoot":"","sources":["../../../src/rooms/dtos/inbox_notifications.dto.ts"],"names":[],"mappings":";;;AAAA,MAAa,oBAAoB;CAQhC;AARD,oDAQC"}

package/dist/rooms/dtos/notifications.dto.d.ts

@@ -1,10 +1,14 @@
 export declare class NotificationDTO {
-    _id: string;
-    id: string;
-    userId: string;
-    kind: string;
-    notifiedAt?: Date;
-    readAt?: Date;
-    roomId: string;
-    threadId: string;
+    _id?: string;
+    name: string;
+    body: string;
+    related_to: {
+        o: string;
+        ids: string[];
+    };
+    related_name: string;
+    from: string;
+    space: string;
+    owner: string;
+    is_read: boolean;
 }

package/dist/rooms/dtos/notifications.dto.js.map

@@ -1 +1 @@
-{"version":3,"file":"notifications.dto.js","sourceRoot":"","sources":["../../../src/rooms/dtos/notifications.dto.ts"],"names":[],"mappings":";;;AAAA,MAAa,eAAe;CAS3B;AATD,0CASC"}
+{"version":3,"file":"notifications.dto.js","sourceRoot":"","sources":["../../../src/rooms/dtos/notifications.dto.ts"],"names":[],"mappings":";;;AAAA,MAAa,eAAe;CAa3B;AAbD,0CAaC"}

package/dist/rooms/notifications.service.d.ts

@@ -1,16 +1,18 @@
 import { MongodbService } from '@builder6/core';
 import { ServiceBroker } from 'moleculer';
+import { InboxNotificationDTO } from './dtos/inbox_notifications.dto';
 import { NotificationDTO } from './dtos/notifications.dto';
 export declare class NotificationsService {
     private mongodbService;
     private readonly broker;
     private readonly logger;
     constructor(mongodbService: MongodbService, broker: ServiceBroker);
-    createRoomMention({ roomId, userId, }: {
+    createRoomMention({ roomId, userId, fromUserId, }: {
         roomId: string;
         userId: string;
+        fromUserId: string;
     }): Promise<void>;
-    createThreadNotification({ _id, id, userId, kind, notifiedAt, readAt, roomId, threadId, }: NotificationDTO): Promise<any>;
+    createInboxNotification({ _id, userId, kind, notifiedAt, readAt, roomId, threadId, }: InboxNotificationDTO): Promise<any>;
     findNotifications({ userId, unread, limit, sinceDate, roomId, threadId, }: {
         userId: string;
         unread?: boolean;
@@ -24,4 +26,5 @@ export declare class NotificationsService {
         userId: string;
         inboxNotificationIds: string[] | 'all';
     }): Promise<any>;
+    createNotification({ name, body, related_to, from, space, owner, is_read, }: NotificationDTO): Promise<any>;
 }

package/dist/rooms/notifications.service.js

@@ -25,7 +25,7 @@ let NotificationsService = NotificationsService_1 = class NotificationsService {
         this.broker = broker;
         this.logger = new common_1.Logger(NotificationsService_1.name);
     }
-    async createRoomMention({ roomId, userId, }) {
+    async createRoomMention({ roomId, userId, fromUserId, }) {
         if (roomId && roomId.split(':').length === 3) {
             const [objects, objectName, recordId] = roomId.split(':');
             if (objects === 'objects') {
@@ -33,14 +33,37 @@ let NotificationsService = NotificationsService_1 = class NotificationsService {
                 this.broker.emit(`${objectName}.mentioned`, {
                     recordId,
                     userId,
+                    fromUserId,
+                });
+                const record = await this.mongodbService.findOne(objectName, {
+                    _id: recordId,
+                }, {
+                    projection: {
+                        name: 1,
+                        space: 1,
+                        owner: 1,
+                    },
+                });
+                await this.createNotification({
+                    name: record.name,
+                    body: `You were mentioned`,
+                    related_to: {
+                        o: objectName,
+                        ids: [recordId],
+                    },
+                    related_name: record.name,
+                    from: fromUserId,
+                    space: record.space,
+                    owner: userId,
+                    is_read: false,
                 });
             }
         }
     }
-    async createThreadNotification({ _id, id, userId, kind = 'thread', notifiedAt, readAt, roomId, threadId, }) {
-        return this.mongodbService.insertOne('b6_notifications', {
+    async createInboxNotification({ _id, userId, kind = 'thread', notifiedAt, readAt, roomId, threadId, }) {
+        return this.mongodbService.insertOne('b6_inbox_notifications', {
             _id,
-            id,
+            id: _id,
             userId,
             kind,
             notifiedAt,
@@ -60,7 +83,7 @@ let NotificationsService = NotificationsService_1 = class NotificationsService {
             queryOptions.roomId = roomId;
         if (threadId)
             queryOptions.threadId = threadId;
-        const collection = (await this.mongodbService.getCollection('b6_notifications'));
+        const collection = (await this.mongodbService.getCollection('b6_inbox_notifications'));
         const query = collection.find(queryOptions).sort({ notifiedAt: 1 });
         if (limit)
             query.limit(limit);
@@ -73,11 +96,22 @@ let NotificationsService = NotificationsService_1 = class NotificationsService {
         if ((0, lodash_1.isArray)(inboxNotificationIds)) {
             queryOptions._id = { $in: inboxNotificationIds };
         }
-        const collection = (await this.mongodbService.getCollection('b6_notifications'));
+        const collection = (await this.mongodbService.getCollection('b6_inbox_notifications'));
         return collection.updateMany(queryOptions, {
             $set: { readAt: new Date() },
         });
     }
+    async createNotification({ name, body, related_to, from, space, owner, is_read = false, }) {
+        return await this.mongodbService.insertOne('notifications', {
+            name,
+            body,
+            related_to,
+            from,
+            space,
+            owner,
+            is_read,
+        });
+    }
 };
 NotificationsService = NotificationsService_1 = __decorate([
     (0, common_1.Injectable)(),

package/dist/rooms/notifications.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"notifications.service.js","sourceRoot":"","sources":["../../src/rooms/notifications.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"notifications.service.js","sourceRoot":"","sources":["../../src/rooms/notifications.service.ts"],"names":[],"mappings":"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"}

package/dist/rooms/rooms.controller.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="lodash" />
 import { FilesService } from '@builder6/core';
 import { RoomsService } from './rooms.service';
 import { JwtService } from '@nestjs/jwt';
@@ -49,7 +50,7 @@ export declare class RoomsController {
     createThread(req: Request, roomId: string, record: Record<string, any>): Promise<any>;
     threadWithNotification(req: Request, roomId: string, threadId: string): Promise<{
         thread: any;
-        inboxNotification: import("lodash").Omit<any, "userId" | "_id">;
+        inboxNotification: import("lodash").Omit<any, "_id" | "userId">;
     }>;
     threadMarkasResolved(req: Request, roomId: string, threadId: string): Promise<any>;
     threadMarkasUnResolved(req: Request, roomId: string, threadId: string): Promise<any>;

package/dist/rooms/rooms.moleculer.d.ts

@@ -8,4 +8,5 @@ export declare class RoomsMoleculer extends Service {
     serviceStopped(): Promise<void>;
     createThread(ctx: Context): Promise<any>;
     createComment(ctx: Context): Promise<any>;
+    createNotification(ctx: Context): Promise<any>;
 }

package/dist/rooms/rooms.moleculer.js

@@ -27,6 +27,7 @@ let RoomsMoleculer = class RoomsMoleculer extends moleculer_1.Service {
             actions: {
                 createComment: this.createComment,
                 createThread: this.createThread,
+                createNotification: this.createNotification,
             },
             created: this.serviceCreated,
             started: this.serviceStarted,
@@ -80,6 +81,29 @@ let RoomsMoleculer = class RoomsMoleculer extends moleculer_1.Service {
             };
         }
     }
+    async createNotification(ctx) {
+        const { name, body, from, owner, related_name, related_to, space } = ctx.params;
+        try {
+            const result = this.notificationService.createNotification({
+                name,
+                body,
+                from,
+                owner,
+                related_name,
+                related_to,
+                space,
+            });
+            return result;
+        }
+        catch (error) {
+            console.error(error);
+            return {
+                error: {
+                    message: error.message,
+                },
+            };
+        }
+    }
 };
 RoomsMoleculer = __decorate([
     (0, common_1.Injectable)(),

package/dist/rooms/rooms.moleculer.js.map

@@ -1 +1 @@
-{"version":3,"file":"rooms.moleculer.js","sourceRoot":"","sources":["../../src/rooms/rooms.moleculer.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,yCAA4D;AAC5D,2CAA4C;AAC5C,mDAAmD;AACnD,mDAA+C;AAGxC,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,mBAAO;IACzC,YACmB,YAA0B,EAC3B,MAAqB;QAErC,KAAK,CAAC,MAAM,CAAC,CAAC;QAHG,iBAAY,GAAZ,YAAY,CAAc;QAK3C,IAAI,CAAC,kBAAkB,CAAC;YACtB,IAAI,EAAE,iBAAiB;YACvB,QAAQ,EAAE,EAAE;YACZ,OAAO,EAAE;gBACP,aAAa,EAAE,IAAI,CAAC,aAAa;gBACjC,YAAY,EAAE,IAAI,CAAC,YAAY;aAChC;YACD,OAAO,EAAE,IAAI,CAAC,cAAc;YAC5B,OAAO,EAAE,IAAI,CAAC,cAAc;YAC5B,OAAO,EAAE,IAAI,CAAC,cAAc;SAC7B,CAAC,CAAC;IACL,CAAC;IAED,cAAc,KAAI,CAAC;IAEnB,KAAK,CAAC,cAAc,KAAI,CAAC;IAEzB,KAAK,CAAC,cAAc,KAAI,CAAC;IAEzB,KAAK,CAAC,YAAY,CAAC,GAAY;QAC7B,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,GACvD,GAAG,CAAC,MAAa,CAAC;QACpB,IAAI;YACF,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC;gBAC5C,EAAE;gBACF,OAAO;gBACP,QAAQ;gBACR,QAAQ;gBACR,MAAM;gBACN,MAAM;aACP,CAAC,CAAC;YACH,OAAO,MAAM,CAAC;SACf;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACrB,OAAO;gBACL,KAAK,EAAE;oBACL,OAAO,EAAE,KAAK,CAAC,OAAO;iBACvB;aACF,CAAC;SACH;IACH,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,GAAY;QAC9B,MAAM,EAAE,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GACzD,GAAG,CAAC,MAAa,CAAC;QACpB,IAAI;YACF,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC;gBAC7C,EAAE;gBACF,aAAa;gBACb,IAAI;gBACJ,MAAM;gBACN,QAAQ;gBACR,MAAM;aACP,CAAC,CAAC;YACH,OAAO,MAAM,CAAC;SACf;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACrB,OAAO;gBACL,KAAK,EAAE;oBACL,OAAO,EAAE,KAAK,CAAC,OAAO;iBACvB;aACF,CAAC;SACH;IACH,CAAC;CACF,CAAA;AAvEY,cAAc;IAD1B,IAAA,mBAAU,GAAE;IAIR,WAAA,IAAA,wBAAY,GAAE,CAAA;qCADgB,4BAAY;QACnB,yBAAa;GAH5B,cAAc,CAuE1B;AAvEY,wCAAc"}
+{"version":3,"file":"rooms.moleculer.js","sourceRoot":"","sources":["../../src/rooms/rooms.moleculer.ts"],"names":[],"mappings":"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"}

package/dist/rooms/rooms.service.js

@@ -221,12 +221,11 @@ let RoomsService = class RoomsService {
         }
         if (mentionUsers && mentionUsers.length > 0) {
             const uniqUsers = (0, lodash_1.uniq)(mentionUsers);
-            notificationsPromises = uniqUsers.map((userId) => {
-                const id = (0, uuid_1.v4)();
-                return this.notificationsService.createThreadNotification({
-                    _id: id,
-                    id,
-                    userId,
+            notificationsPromises = uniqUsers.map((mentionedUserId) => {
+                const _id = (0, uuid_1.v4)();
+                return this.notificationsService.createInboxNotification({
+                    _id,
+                    userId: mentionedUserId,
                     kind: 'thread',
                     notifiedAt: new Date(),
                     readAt: null,
@@ -234,10 +233,11 @@ let RoomsService = class RoomsService {
                     threadId,
                 });
             });
-            createRoomMentionPromises = uniqUsers.map((userId) => {
+            createRoomMentionPromises = uniqUsers.map((mentionedUserId) => {
                 return this.notificationsService.createRoomMention({
-                    userId,
+                    userId: mentionedUserId,
                     roomId,
+                    fromUserId: userId,
                 });
             });
             await Promise.all([].concat(notificationsPromises, createRoomMentionPromises));

package/dist/rooms/rooms.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"rooms.service.js","sourceRoot":"","sources":["../../src/rooms/rooms.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"rooms.service.js","sourceRoot":"","sources":["../../src/rooms/rooms.service.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@builder6/rooms",
-  "version": "0.10.4",
+  "version": "0.10.5",
   "description": "",
   "author": "",
   "license": "MIT",
@@ -11,9 +11,9 @@
     "build:watch": "rimraf dist && tsc --watch"
   },
   "dependencies": {
-    "@builder6/core": "^0.10.4",
-    "@builder6/moleculer": "^0.10.4",
-    "@builder6/pages": "^0.10.4",
+    "@builder6/core": "^0.10.5",
+    "@builder6/moleculer": "^0.10.5",
+    "@builder6/pages": "^0.10.5",
     "lodash": "^4.17.21"
   },
   "peerDependencies": {
@@ -42,5 +42,5 @@
   "devDependencies": {
     "@types/lodash": "^4.17.13"
   },
-  "gitHead": "3386dc54fc488034f40ee1005cbcb00180e3737a"
+  "gitHead": "1598f58131153d17285d3a29031fe01a0ebf6b3a"
 }

package/src/rooms/dtos/inbox_notifications.dto.ts

@@ -0,0 +1,9 @@
+export class InboxNotificationDTO {
+  _id: string;
+  userId: string;
+  kind: string;
+  notifiedAt?: Date;
+  readAt?: Date;
+  roomId: string;
+  threadId: string;
+}

package/src/rooms/dtos/notifications.dto.ts

@@ -1,10 +1,14 @@
 export class NotificationDTO {
-  _id: string;
-  id: string;
-  userId: string;
-  kind: string;
-  notifiedAt?: Date;
-  readAt?: Date;
-  roomId: string;
-  threadId: string;
+  _id?: string;
+  name: string;
+  body: string;
+  related_to: {
+    o: string;
+    ids: string[];
+  };
+  related_name: string;
+  from: string;
+  space: string;
+  owner: string;
+  is_read: boolean;
 }

package/src/rooms/notifications.service.ts

@@ -2,8 +2,9 @@ import { MongodbService } from '@builder6/core';
 import { InjectBroker } from '@builder6/moleculer';
 import { Injectable, Logger } from '@nestjs/common';
 import { ServiceBroker } from 'moleculer';
-import { NotificationDTO } from './dtos/notifications.dto';
+import { InboxNotificationDTO } from './dtos/inbox_notifications.dto';
 import { isArray } from 'lodash';
+import { NotificationDTO } from './dtos/notifications.dto';
 
 @Injectable()
 export class NotificationsService {
@@ -16,9 +17,11 @@ export class NotificationsService {
   async createRoomMention({
     roomId,
     userId,
+    fromUserId,
   }: {
     roomId: string;
     userId: string;
+    fromUserId: string;
   }) {
     // moleculer 抛消息
     if (roomId && roomId.split(':').length === 3) {
@@ -30,24 +33,51 @@ export class NotificationsService {
         this.broker.emit(`${objectName}.mentioned`, {
           recordId,
           userId,
+          fromUserId,
+        });
+        const record = await this.mongodbService.findOne(
+          objectName,
+          {
+            _id: recordId,
+          },
+          {
+            projection: {
+              name: 1,
+              space: 1,
+              owner: 1,
+            },
+          },
+        );
+
+        await this.createNotification({
+          name: record.name,
+          body: `You were mentioned`,
+          related_to: {
+            o: objectName,
+            ids: [recordId],
+          },
+          related_name: record.name,
+          from: fromUserId,
+          space: record.space,
+          owner: userId,
+          is_read: false,
         });
       }
     }
   }
 
-  async createThreadNotification({
+  async createInboxNotification({
     _id,
-    id,
     userId,
     kind = 'thread',
     notifiedAt,
     readAt,
     roomId,
     threadId,
-  }: NotificationDTO) {
-    return this.mongodbService.insertOne('b6_notifications', {
+  }: InboxNotificationDTO) {
+    return this.mongodbService.insertOne('b6_inbox_notifications', {
       _id,
-      id,
+      id: _id,
       userId,
       kind,
       notifiedAt,
@@ -87,7 +117,7 @@ export class NotificationsService {
     if (roomId) queryOptions.roomId = roomId;
     if (threadId) queryOptions.threadId = threadId;
     const collection = (await this.mongodbService.getCollection(
-      'b6_notifications',
+      'b6_inbox_notifications',
     )) as any;
     const query = collection.find(queryOptions).sort({ notifiedAt: 1 });
     if (limit) query.limit(limit);
@@ -113,10 +143,30 @@ export class NotificationsService {
       queryOptions._id = { $in: inboxNotificationIds as string[] };
     }
     const collection = (await this.mongodbService.getCollection(
-      'b6_notifications',
+      'b6_inbox_notifications',
     )) as any;
     return collection.updateMany(queryOptions, {
       $set: { readAt: new Date() },
     });
   }
+
+  async createNotification({
+    name,
+    body,
+    related_to,
+    from,
+    space,
+    owner,
+    is_read = false,
+  }: NotificationDTO) {
+    return await this.mongodbService.insertOne('notifications', {
+      name,
+      body,
+      related_to,
+      from,
+      space,
+      owner,
+      is_read,
+    });
+  }
 }

package/src/rooms/rooms.moleculer.ts

@@ -17,6 +17,7 @@ export class RoomsMoleculer extends Service {
       actions: {
         createComment: this.createComment,
         createThread: this.createThread,
+        createNotification: this.createNotification,
       },
       created: this.serviceCreated,
       started: this.serviceStarted,
@@ -75,4 +76,28 @@ export class RoomsMoleculer extends Service {
       };
     }
   }
+
+  async createNotification(ctx: Context) {
+    const { name, body, from, owner, related_name, related_to, space } =
+      ctx.params as any;
+    try {
+      const result = this.notificationService.createNotification({
+        name,
+        body,
+        from,
+        owner,
+        related_name,
+        related_to,
+        space,
+      });
+      return result;
+    } catch (error) {
+      console.error(error);
+      return {
+        error: {
+          message: error.message,
+        },
+      };
+    }
+  }
 }

package/src/rooms/rooms.service.ts

@@ -319,7 +319,7 @@ export class RoomsService {
       result.attachments.push(attachment);
     }
 
-    // 如果有 @ mention 的时候，自动创建 b6_notifications 记录。
+    // 如果有 @ mention 的时候，自动创建 b6_inbox_notifications 记录。
     const { content } = body as CommentBody;
     let notificationsPromises: Promise<any>[];
     let createRoomMentionPromises: Promise<any>[];
@@ -336,12 +336,11 @@ export class RoomsService {
     }
     if (mentionUsers && mentionUsers.length > 0) {
       const uniqUsers = uniq(mentionUsers);
-      notificationsPromises = uniqUsers.map((userId) => {
-        const id = uuidv4();
-        return this.notificationsService.createThreadNotification({
-          _id: id,
-          id,
-          userId,
+      notificationsPromises = uniqUsers.map((mentionedUserId) => {
+        const _id = uuidv4();
+        return this.notificationsService.createInboxNotification({
+          _id,
+          userId: mentionedUserId,
           kind: 'thread',
           notifiedAt: new Date(),
           readAt: null,
@@ -349,10 +348,11 @@ export class RoomsService {
           threadId,
         });
       });
-      createRoomMentionPromises = uniqUsers.map((userId) => {
+      createRoomMentionPromises = uniqUsers.map((mentionedUserId) => {
         return this.notificationsService.createRoomMention({
-          userId,
+          userId: mentionedUserId,
           roomId,
+          fromUserId: userId,
         });
       });
       await Promise.all(