@builder6/rooms 0.13.1 → 0.13.3

package/dist/rooms/rooms.moleculer.js

@@ -36,7 +36,6 @@ let RoomsMoleculer = class RoomsMoleculer extends moleculer_1.Service {
             actions: {
                 createComment: this.createComment,
                 createThread: this.createThread,
-                createNotification: this.createNotification,
             },
             created: this.serviceCreated,
             started: this.serviceStarted,
@@ -98,31 +97,6 @@ let RoomsMoleculer = class RoomsMoleculer extends moleculer_1.Service {
             }
         });
     }
-    createNotification(ctx) {
-        return __awaiter(this, void 0, void 0, function* () {
-            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":"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"}
+{"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;IAEb,cAAc;8DAAI,CAAC;KAAA;IAEnB,cAAc;8DAAI,CAAC;KAAA;IAEnB,YAAY,CAAC,GAAY;;YAC7B,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,GACvD,GAAG,CAAC,MAAa,CAAC;YACpB,IAAI;gBACF,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC;oBAC5C,EAAE;oBACF,OAAO;oBACP,QAAQ;oBACR,QAAQ;oBACR,MAAM;oBACN,MAAM;iBACP,CAAC,CAAC;gBACH,OAAO,MAAM,CAAC;aACf;YAAC,OAAO,KAAK,EAAE;gBACd,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBACrB,OAAO;oBACL,KAAK,EAAE;wBACL,OAAO,EAAE,KAAK,CAAC,OAAO;qBACvB;iBACF,CAAC;aACH;QACH,CAAC;KAAA;IAEK,aAAa,CAAC,GAAY;;YAC9B,MAAM,EAAE,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GACzD,GAAG,CAAC,MAAa,CAAC;YACpB,IAAI;gBACF,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC;oBAC7C,EAAE;oBACF,aAAa;oBACb,IAAI;oBACJ,MAAM;oBACN,QAAQ;oBACR,MAAM;iBACP,CAAC,CAAC;gBACH,OAAO,MAAM,CAAC;aACf;YAAC,OAAO,KAAK,EAAE;gBACd,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBACrB,OAAO;oBACL,KAAK,EAAE;wBACL,OAAO,EAAE,KAAK,CAAC,OAAO;qBACvB;iBACF,CAAC;aACH;QACH,CAAC;KAAA;CACF,CAAA;AAvEY,cAAc;IAD1B,IAAA,mBAAU,GAAE;IAIR,WAAA,IAAA,wBAAY,GAAE,CAAA;qCADgB,4BAAY;QACnB,yBAAa;GAH5B,cAAc,CAuE1B;AAvEY,wCAAc"}

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

@@ -3,14 +3,14 @@ import { JwtService } from '@nestjs/jwt';
 import { RoomDTO } from './dtos/rooms.dto';
 import { RoomMemberDTO } from './dtos/room_members.dto';
 import { NotificationsService } from './notifications.service';
-import { EmailNotificationService } from './emailNotification.service';
 export interface CreateThreadParams {
     id?: string;
     comment?: CreateCommentParams;
     metadata?: object;
-    resolved: boolean;
+    resolved?: boolean;
     roomId?: string;
     userId?: string;
+    participantIds?: string[];
 }
 export interface CreateCommentParams {
     id?: string;
@@ -38,8 +38,7 @@ export declare class RoomsService {
     private mongodbService;
     private jwtService;
     private notificationsService;
-    private emailNotificationService;
-    constructor(mongodbService: MongodbService, jwtService: JwtService, notificationsService: NotificationsService, emailNotificationService: EmailNotificationService);
+    constructor(mongodbService: MongodbService, jwtService: JwtService, notificationsService: NotificationsService);
     getToken({ spaceId, userId, perms, }: {
         spaceId: string;
         userId: string;

package/dist/rooms/rooms.service.js

@@ -26,7 +26,6 @@ const rooms_dto_1 = require("./dtos/rooms.dto");
 const lodash_1 = require("lodash");
 const notifications_service_1 = require("./notifications.service");
 const uuid_1 = require("uuid");
-const emailNotification_service_1 = require("./emailNotification.service");
 var CommentType;
 (function (CommentType) {
     CommentType["Paragraph"] = "paragraph";
@@ -37,11 +36,10 @@ var CommentBodyInlineType;
     CommentBodyInlineType["Link"] = "link";
 })(CommentBodyInlineType = exports.CommentBodyInlineType || (exports.CommentBodyInlineType = {}));
 let RoomsService = class RoomsService {
-    constructor(mongodbService, jwtService, notificationsService, emailNotificationService) {
+    constructor(mongodbService, jwtService, notificationsService) {
         this.mongodbService = mongodbService;
         this.jwtService = jwtService;
         this.notificationsService = notificationsService;
-        this.emailNotificationService = emailNotificationService;
     }
     getToken({ spaceId, userId, perms, }) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -110,6 +108,10 @@ let RoomsService = class RoomsService {
             for (const userId of userIds) {
                 const user = yield this.mongodbService.findOne('users', {
                     _id: userId,
+                }, {
+                    projection: {
+                        name: 1,
+                    },
                 });
                 users.push({
                     name: user ? user.name : 'Unknown',
@@ -136,6 +138,9 @@ let RoomsService = class RoomsService {
             }
             const spaceUsers = yield this.mongodbService.find('space_users', query, {
                 limit: 5,
+                projection: {
+                    name: 1,
+                },
             });
             return spaceUsers.map((spaceUser) => spaceUser.user);
         });
@@ -216,6 +221,7 @@ let RoomsService = class RoomsService {
                 type: 'thread',
                 roomId,
                 userId,
+                participantIds: [userId],
             };
             const result = yield this.mongodbService.insertOne('b6_threads', newThread);
             const newComment = yield this.createComment({
@@ -263,8 +269,6 @@ let RoomsService = class RoomsService {
                 }
             }
             const { content } = body;
-            let notificationsPromises;
-            let createRoomMentionPromises;
             const mentionUsers = [];
             for (const message of content) {
                 if (message.type === CommentType.Paragraph) {
@@ -273,36 +277,41 @@ let RoomsService = class RoomsService {
                         .forEach((child) => mentionUsers.push(child.id));
                 }
             }
+            const thread = yield this.getThread({ roomId, threadId });
+            if (thread) {
+                thread.participantIds = (0, lodash_1.uniq)((thread.participantIds || []).concat([userId]).concat(mentionUsers));
+                yield this.updateThread(threadId, {
+                    participantIds: thread.participantIds,
+                });
+            }
+            let onThreadMentionPromises;
             if (mentionUsers && mentionUsers.length > 0) {
-                const uniqUsers = (0, lodash_1.uniq)(mentionUsers);
-                notificationsPromises = uniqUsers.map((mentionedUserId) => __awaiter(this, void 0, void 0, function* () {
-                    const _id = (0, uuid_1.v4)();
-                    const notification = yield this.notificationsService.createInboxNotification({
-                        _id,
-                        userId: mentionedUserId,
-                        kind: 'thread',
-                        notifiedAt: new Date(),
-                        readAt: null,
-                        roomId,
-                        threadId,
-                    });
-                    yield this.emailNotificationService.sendThreadNotificationEmail({
-                        roomId,
-                        threadId,
-                        userId: mentionedUserId,
-                        fromUserId: userId,
-                        inboxNotificationId: notification._id,
-                    });
-                }));
-                createRoomMentionPromises = uniqUsers.map((mentionedUserId) => {
-                    return this.notificationsService.createRoomMention({
+                const uniqUsers = (0, lodash_1.uniq)(mentionUsers).filter((mentionedUserId) => mentionedUserId !== userId);
+                onThreadMentionPromises = uniqUsers.map((mentionedUserId) => {
+                    return this.notificationsService.onThreadNotification({
                         userId: mentionedUserId,
                         roomId,
                         fromUserId: userId,
+                        threadId,
+                        type: 'mention',
                     });
                 });
-                yield Promise.all([].concat(notificationsPromises, createRoomMentionPromises));
+                yield Promise.all([].concat(onThreadMentionPromises));
             }
+            const participantIds = thread.participantIds.filter((participantUserId) => {
+                return (participantUserId !== userId &&
+                    !mentionUsers.includes(participantUserId));
+            });
+            const onThreadReplyPromises = participantIds.map((participantUserId) => {
+                return this.notificationsService.onThreadNotification({
+                    userId: participantUserId,
+                    roomId,
+                    fromUserId: userId,
+                    threadId,
+                    type: 'reply',
+                });
+            });
+            yield Promise.all([].concat(onThreadReplyPromises));
             delete result['_id'];
             delete result['attachmentIds'];
             return result;
@@ -523,8 +532,7 @@ RoomsService = __decorate([
     (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [core_1.MongodbService,
         jwt_1.JwtService,
-        notifications_service_1.NotificationsService,
-        emailNotification_service_1.EmailNotificationService])
+        notifications_service_1.NotificationsService])
 ], RoomsService);
 exports.RoomsService = RoomsService;
 //# sourceMappingURL=rooms.service.js.map

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.13.1",
+  "version": "0.13.3",
   "description": "",
   "author": "",
   "license": "MIT",
@@ -11,11 +11,11 @@
     "build:watch": "rimraf dist && tsc --watch"
   },
   "dependencies": {
-    "@builder6/core": "0.13.1",
-    "@builder6/email": "0.13.1",
-    "@builder6/files": "0.13.1",
-    "@builder6/moleculer": "0.13.1",
-    "@builder6/pages": "0.13.1",
+    "@builder6/core": "0.13.3",
+    "@builder6/email": "0.13.3",
+    "@builder6/files": "0.13.3",
+    "@builder6/moleculer": "0.13.3",
+    "@builder6/pages": "0.13.3",
     "@liveblocks/emails": "2.12.0",
     "@liveblocks/node": "2.12.0",
     "@react-email/components": "^0.0.31",
@@ -54,5 +54,5 @@
   "devDependencies": {
     "@types/lodash": "^4.17.13"
   },
-  "gitHead": "3f41c5f10b362eb67542925c0302ce78c3a0466e"
+  "gitHead": "08a745b0b9d3b6373d99a8f7e9be99180b494ad9"
 }

package/src/rooms/app.controller.ts

@@ -12,8 +12,10 @@ import { ConfigService } from '@nestjs/config';
 import { AuthGuard } from '@builder6/core';
 import { PagesService } from '@builder6/pages';
 import { RoomsService } from './rooms.service';
+import { ApiBearerAuth, ApiBody, ApiTags } from '@nestjs/swagger';
 
 // 兼容 Steedos OpenAPI v1 格式的 api
+@ApiTags('Rooms')
 @Controller('b6/rooms/')
 @UseGuards(AuthGuard)
 export class RoomsAppController {

package/src/rooms/emailNotification.service.tsx

@@ -18,13 +18,7 @@ export class EmailNotificationService {
     private roomsService: RoomsService,
     private configService: ConfigService,
     private emailService: EmailService,
-  ) {
-    // this.liveblocks = new Liveblocks({
-    //   baseUrl: `${process.env.B6_HOST}`,
-    //   secret:
-    //     'sk_dev_b5cEGS2Swc54G4W6Kj4fTGqIKEAI9WppHtlKNMrsMXfkoTPVoIBlmKNVnlMyUSX_',
-    // } as any);
-  }
+  ) {}
 
   async sendThreadNotificationEmail({
     roomId,
@@ -70,6 +64,9 @@ export class EmailNotificationService {
     if (!emailData) {
       return;
     }
+    const fromUser = (await this.roomsService.resolveUsers({
+      userIds: [fromUserId],
+    })[0]) || { name: 'Somebody' };
     const company = {
       name: this.configService.get('tenant.name'),
       url: this.configService.get('host'),
@@ -105,7 +102,7 @@ export class EmailNotificationService {
             comment={emailData.comment}
           />
         );
-        subject = `[${company.name}] You are mentioned in ${room.name}.`;
+        subject = `[${company.name}] ${fromUser.name} mentioned you in ${room.name}.`;
         break;
       }
     }