@builder6/rooms 0.10.8 → 0.11.0

package/src/rooms/rooms.controller.ts

@@ -2,6 +2,7 @@ import { AuthGuard } from '@builder6/core';
 import { FilesService } from '@builder6/files';
 import { RoomsService } from './rooms.service';
 import { omit, uniqBy } from 'lodash';
+import { ApiBody } from '@nestjs/swagger';
 import {
   Controller,
   Get,
@@ -22,8 +23,8 @@ import * as rawBody from 'raw-body';
 import { Request } from 'express';
 import { RoomsGateway } from './rooms.gateway';
 import { ServerMsgCode } from './protocol/ServerMsg';
-import { READ_ACCESS } from './dtos/rooms.dto';
 import { NotificationsService } from './notifications.service';
+import { EmailNotificationService } from './emailNotification.service';
 
 @Controller('v2/c/')
 export class RoomsController {
@@ -33,6 +34,7 @@ export class RoomsController {
     private jwtService: JwtService,
     private roomsGateway: RoomsGateway,
     private notificationsService: NotificationsService,
+    private emailNotificationService: EmailNotificationService,
   ) {}
 
   @UseGuards(AuthGuard)
@@ -54,7 +56,10 @@ export class RoomsController {
   @UseGuards(RoomsGuard)
   @Get('users')
   async getUsers(@Query('userIds') userIds: string | string[]) {
-    const users = await this.roomsService.getUsers(userIds);
+    if (typeof userIds === 'string') {
+      userIds = [userIds];
+    }
+    const users = await this.roomsService.resolveUsers({ userIds });
     return users;
   }
 
@@ -77,7 +82,10 @@ export class RoomsController {
   @UseGuards(RoomsGuard)
   @Get('rooms')
   async getRooms(@Query('roomIds') roomIds: string | string[]) {
-    const rooms = await this.roomsService.getRooms(roomIds);
+    if (typeof roomIds === 'string') {
+      roomIds = [roomIds];
+    }
+    const rooms = await this.roomsService.resolveRoomInfo({ roomIds });
     return rooms;
   }
 
@@ -176,7 +184,7 @@ export class RoomsController {
     @Param('roomId') roomId: string,
     @Param('threadId') threadId: string,
   ) {
-    const thread = await this.roomsService.getThread(roomId, threadId);
+    const thread = await this.roomsService.getThread({ roomId, threadId });
     const inboxNotifications =
       await this.notificationsService.findNotifications({
         userId: req['jwt'].uid,
@@ -519,4 +527,14 @@ export class RoomsController {
     });
     return {};
   }
+
+  @Post('email')
+  @ApiBody({
+    schema: {
+      type: 'object',
+    },
+  })
+  async sendEmail(@Body() body: object) {
+    this.emailNotificationService.sendThreadNotificationEmail(body as any);
+  }
 }

package/src/rooms/rooms.module.ts

@@ -10,12 +10,15 @@ import { PagesModule } from '@builder6/pages';
 import { NotificationsService } from './notifications.service';
 import { RoomsAppController } from './app.controller';
 import { RoomsMoleculer } from './rooms.moleculer';
+import { EmailNotificationService } from './emailNotification.service';
+import { EmailModule } from '@builder6/email';
 
 /* 按照 liveblocks.io 规范实现的API */
 @Module({
   imports: [
     AuthModule,
     MongodbModule,
+    EmailModule,
     FilesModule,
     PagesModule,
     JwtModule.register({
@@ -24,6 +27,12 @@ import { RoomsMoleculer } from './rooms.moleculer';
     }),
   ],
   controllers: [RoomsAppController, RoomsController],
-  providers: [RoomsService, RoomsGateway, NotificationsService, RoomsMoleculer],
+  providers: [
+    RoomsService,
+    RoomsGateway,
+    NotificationsService,
+    EmailNotificationService,
+    RoomsMoleculer,
+  ],
 })
 export class RoomsModule {}

package/src/rooms/rooms.service.ts

@@ -7,6 +7,7 @@ import { uniq } from 'lodash';
 import { NotificationsService } from './notifications.service';
 import { v4 as uuidv4 } from 'uuid';
 import { CommentBody, CommentBodyMention } from './protocol/Comments';
+import { EmailNotificationService } from './emailNotification.service';
 
 export interface CreateThreadParams {
   id?: string;
@@ -49,6 +50,7 @@ export class RoomsService {
     private mongodbService: MongodbService,
     private jwtService: JwtService,
     private notificationsService: NotificationsService,
+    private emailNotificationService: EmailNotificationService,
   ) {}
 
   async getToken({
@@ -115,7 +117,6 @@ export class RoomsService {
   async getAttachmentById(attachmentId: string): Promise<Attachment> {
     // 模拟从数据库获取附件
     // 实际实现中应替换为数据库查询
-
     const attachment = await this.mongodbService.findOne(
       'cfs.files.filerecord',
       {
@@ -131,10 +132,7 @@ export class RoomsService {
     };
   }
 
-  async getUsers(userIds: string | string[]) {
-    if (typeof userIds === 'string') {
-      userIds = [userIds];
-    }
+  async resolveUsers({ userIds }: { userIds: string[] }) {
     const users = [];
 
     for (const userId of userIds) {
@@ -143,7 +141,7 @@ export class RoomsService {
       });
       users.push({
         name: user ? user.name : 'Unknown',
-        avatar: '/api/v6/users/' + userId + '/avatar',
+        avatar: `${process.env.B6_HOST}/api/v6/users/${userId}/avatar`,
       });
     }
 
@@ -168,7 +166,7 @@ export class RoomsService {
     return spaceUsers.map((spaceUser) => spaceUser.user as string);
   }
 
-  async getThread(roomId: string, threadId: string) {
+  async getThread({ roomId, threadId }: { roomId: string; threadId: string }) {
     const thread = await this.mongodbService.findOne('b6_threads', {
       roomId: roomId,
       _id: threadId,
@@ -212,7 +210,10 @@ export class RoomsService {
     for (let i = 0; i < notifications.length; i++) {
       const notification = notifications[i];
       threadPromises.push(
-        this.getThread(notification.roomId, notification.threadId),
+        this.getThread({
+          roomId: notification.roomId,
+          threadId: notification.threadId,
+        }),
       );
     }
     if (threadPromises.length > 0) {
@@ -336,16 +337,25 @@ export class RoomsService {
     }
     if (mentionUsers && mentionUsers.length > 0) {
       const uniqUsers = uniq(mentionUsers);
-      notificationsPromises = uniqUsers.map((mentionedUserId) => {
+      notificationsPromises = uniqUsers.map(async (mentionedUserId) => {
         const _id = uuidv4();
-        return this.notificationsService.createInboxNotification({
-          _id,
-          userId: mentionedUserId,
-          kind: 'thread',
-          notifiedAt: new Date(),
-          readAt: null,
+        const notification =
+          await this.notificationsService.createInboxNotification({
+            _id,
+            userId: mentionedUserId,
+            kind: 'thread',
+            notifiedAt: new Date(),
+            readAt: null,
+            roomId,
+            threadId,
+          });
+
+        await this.emailNotificationService.sendThreadNotificationEmail({
           roomId,
           threadId,
+          userId: mentionedUserId,
+          fromUserId: userId,
+          inboxNotificationId: notification._id,
         });
       });
       createRoomMentionPromises = uniqUsers.map((mentionedUserId) => {
@@ -603,10 +613,7 @@ export class RoomsService {
     return rooms;
   }
 
-  async getRooms(roomIds: string[] | string) {
-    if (typeof roomIds === 'string') {
-      roomIds = [roomIds];
-    }
+  async resolveRoomInfo({ roomIds }: { roomIds: string[] }) {
     const result = [];
     for (const roomId of roomIds) {
       if (
@@ -630,7 +637,7 @@ export class RoomsService {
         result.push({
           id: roomId,
           name: record ? record.name : roomId,
-          url: record ? `/b6/steedos/${objectName}/${recordId}` : null,
+          url: record ? `${process.env.B6_HOST}/b6/rooms/${roomId}` : null,
         });
       } else {
         result.push({
@@ -641,4 +648,12 @@ export class RoomsService {
     }
     return result;
   }
+
+  async getInboxNotification({ inboxNotificationId, userId }) {
+    const notification = await this.notificationsService.getInboxNotification({
+      inboxNotificationId,
+      userId,
+    });
+    return notification;
+  }
 }

package/tsconfig.json

@@ -1,6 +1,8 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
+    "jsx": "react",
+    "target": "es6",
     "outDir": "./dist",
     "rootDir": "./src"
   },