@builder6/rooms 0.11.1 → 0.11.3

package/src/rooms/app.controller.ts

@@ -11,6 +11,7 @@ import { Response } from 'express';
 import { ConfigService } from '@nestjs/config';
 import { AuthGuard } from '@builder6/core';
 import { PagesService } from '@builder6/pages';
+import { RoomsService } from './rooms.service';
 
 // 兼容 Steedos OpenAPI v1 格式的 api
 @Controller('b6/rooms/')
@@ -18,6 +19,7 @@ import { PagesService } from '@builder6/pages';
 export class RoomsAppController {
   constructor(
     private readonly pagesService: PagesService,
+    private readonly roomsService: RoomsService,
     private configService: ConfigService,
   ) {}
 
@@ -29,20 +31,24 @@ export class RoomsAppController {
     @Res() res: Response,
   ) {
     const user = req['user'];
-    const unpkgUrl = this.configService.get('unpkg.url');
+    const room = await this.roomsService.resolveRoomInfo({ roomId });
+    const roomName = room?.name || roomId;
     try {
       const schema = {
         type: 'page',
+        title: roomName,
+        regions: ['body', 'toolbar', 'header'],
         toolbar: [
           {
             type: 'rooms-provider',
             baseUrl: '',
-            body: [
-              {
+            body: {
+              type: 'wrapper',
+              className: 'p-4',
+              body: {
                 type: 'rooms-inbox-popover',
-                className: 'flex flex-col m-3 gap-3',
               },
-            ],
+            },
           },
         ],
         body: [
@@ -62,7 +68,7 @@ export class RoomsAppController {
       const data = {};
       const env = {
         assetUrls: [
-          `https://unpkg.com/@steedos-widgets/liveblocks@6.3.12-beta.4/dist/assets.json`,
+          `https://unpkg.com/@steedos-widgets/liveblocks@6.3.12-beta.6/dist/assets.json`,
         ],
       };
       const rendered = await this.pagesService.renderAmis(

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

@@ -8,6 +8,9 @@ export class RoomMemberDTO {
   @ApiProperty()
   userId: string;
 
+  @ApiProperty()
+  roomId: string;
+
   // 可选范围为：['owner']
   @ApiProperty({
     enum: ['owner'],

package/src/rooms/emailNotification.service.tsx

@@ -60,10 +60,10 @@ export class EmailNotificationService {
           return await this.roomsService.resolveUsers({ userIds });
         },
         resolveRoomInfo: async ({ roomId }) => {
-          const rooms = await this.roomsService.resolveRoomInfo({
-            roomIds: [roomId],
+          const room = await this.roomsService.resolveRoomInfo({
+            roomId,
           });
-          return rooms['0'];
+          return room;
         },
       },
     );
@@ -83,35 +83,6 @@ export class EmailNotificationService {
     let email;
     let subject;
 
-    // switch (emailData.type) {
-    //   case 'unreadMention': {
-    //     email = (
-    //       <div>
-    //         <div>
-    //           @{emailData.comment.author.id} at {emailData.comment.createdAt}
-    //         </div>
-    //         <div>{emailData.comment.reactBody}</div>
-    //       </div>
-    //     );
-    //     break;
-    //   }
-
-    //   case 'unreadReplies': {
-    //     email = (
-    //       <div>
-    //         {emailData.comments.map((comment) => (
-    //           <div key={comment.id}>
-    //             <div>
-    //               @{comment.author.id} at {comment.createdAt}
-    //             </div>
-    //             <div>{comment.reactBody}</div>
-    //           </div>
-    //         ))}
-    //       </div>
-    //     );
-    //     break;
-    //   }
-    // }
     switch (emailData.type) {
       // Handle unread replies use case
       case 'unreadReplies': {

package/src/rooms/rooms.controller.ts

@@ -68,14 +68,9 @@ export class RoomsController {
   async searchUsers(
     @Req() req: Request,
     @Query('keyword') keyword: string,
-    @Query('roomdId') roomdId: string,
   ) {
     const spaceId = req['jwt'].sid;
-    const users = await this.roomsService.searchUsers(
-      spaceId,
-      keyword,
-      roomdId,
-    );
+    const users = await this.roomsService.searchUsers(spaceId, keyword);
     return users;
   }
 
@@ -85,7 +80,7 @@ export class RoomsController {
     if (typeof roomIds === 'string') {
       roomIds = [roomIds];
     }
-    const rooms = await this.roomsService.resolveRoomInfo({ roomIds });
+    const rooms = await this.roomsService.resolveRoomsInfo({ roomIds });
     return rooms;
   }
 

package/src/rooms/rooms.service.ts

@@ -94,10 +94,14 @@ export class RoomsService {
       });
     }
 
+    // 如果当前用户不在 room 中，创建一个 room member
     let member = await this.getRoomMember(roomId, userId);
     if (!member) {
-      member = await this.createRoomMember(room, {
+      member = await this.createRoomMember({
         userId,
+        roomId,
+        notifications: room.defaultNotifications,
+        scopes: room.defaultScopes,
       });
     }
 
@@ -149,18 +153,21 @@ export class RoomsService {
   }
 
   // 按照 email, name, username 搜索用户, 返回 userId 数组
-  async searchUsers(
-    spaceId: string,
-    keyword: string,
-    roomId: string,
-  ): Promise<string[]> {
-    const spaceUsers = await this.mongodbService.find('space_users', {
+  async searchUsers(spaceId: string, keyword: string): Promise<string[]> {
+    if (!keyword) {
+      return [];
+    }
+    const query: any = {
       space: spaceId,
       $or: [
         { username: { $regex: keyword, $options: 'i' } },
         { email: { $regex: keyword, $options: 'i' } },
         { name: { $regex: keyword, $options: 'i' } },
       ],
+    };
+    // 最多返回5行
+    const spaceUsers = await this.mongodbService.find('space_users', query, {
+      limit: 5,
     });
 
     return spaceUsers.map((spaceUser) => spaceUser.user as string);
@@ -537,26 +544,24 @@ export class RoomsService {
     // 循环 members，执行 createRoomMember，并保存到 result.members
     room.members = [];
     for (const member of members) {
-      const newMember = await this.createRoomMember(room, member);
+      const newMember = await this.createRoomMember({
+        notifications: room.defaultNotifications,
+        scopes: room.defaultScopes,
+        ...member,
+      });
       room.members.push(newMember);
     }
 
     return room;
   }
 
-  async createRoomMember(room: RoomDTO, member: RoomMemberDTO) {
-    const {
-      _id,
-      userId,
-      roles = [],
-      notifications = room.defaultNotifications,
-      scopes = room.defaultScopes,
-    } = member;
+  async createRoomMember(member: RoomMemberDTO) {
+    const { _id, userId, roomId, roles = [], notifications, scopes } = member;
     const newMember = {
       _id,
       userId,
       roles,
-      roomId: room._id,
+      roomId,
       notifications,
       scopes,
       createdAt: new Date().toISOString(),
@@ -613,40 +618,49 @@ export class RoomsService {
     return rooms;
   }
 
-  async resolveRoomInfo({ roomIds }: { roomIds: string[] }) {
+  async resolveRoomsInfo({ roomIds }: { roomIds: string[] }) {
     const result = [];
     for (const roomId of roomIds) {
-      if (
-        roomId &&
-        roomId.split(':').length === 3 &&
-        roomId.split(':')[0] === 'objects'
-      ) {
-        const [, objectName, recordId] = roomId.split(':');
-        const record = await this.mongodbService.findOne(
-          objectName,
-          {
-            _id: recordId,
-          },
-          {
-            projection: {
-              name: 1,
-            },
+      const room = await this.resolveRoomInfo({ roomId });
+      result.push(room);
+    }
+
+    return result;
+  }
+
+  async resolveRoomInfo({ roomId }: { roomId: string }) {
+    if (
+      roomId &&
+      roomId.split(':').length === 3 &&
+      roomId.split(':')[0] === 'objects'
+    ) {
+      const [, objectName, recordId] = roomId.split(':');
+      const record = await this.mongodbService.findOne(
+        objectName,
+        {
+          _id: recordId,
+        },
+        {
+          projection: {
+            name: 1,
           },
-        );
+        },
+      );
 
-        result.push({
-          id: roomId,
-          name: record ? record.name : roomId,
-          url: record ? `${process.env.B6_HOST}/b6/rooms/${roomId}` : null,
-        });
-      } else {
-        result.push({
-          id: roomId,
-          name: roomId,
-        });
-      }
+      return {
+        id: roomId,
+        name: record ? record.name : roomId,
+        url: record
+          ? `${process.env.B6_ROOT_URL}/app/-/${objectName}/view/${recordId}`
+          : null,
+      };
+    } else {
+      return {
+        id: roomId,
+        name: roomId,
+        url: `${process.env.B6_HOST}/b6/rooms/${roomId}`,
+      };
     }
-    return result;
   }
 
   async getInboxNotification({ inboxNotificationId, userId }) {