|
@@ -199,24 +199,24 @@ export class RoomAssistant {
|
|
|
this.room.logger.error("不存在房间", roomId);
|
|
|
}
|
|
|
this.socket.join(roomId);
|
|
|
- if (!isJoinRoom) {
|
|
|
- this.room.logger.info("加入房间 :", { userId, roomId, user });
|
|
|
- const AllRoomUsers = await getAllRoomUsers(roomId);
|
|
|
- const roomConfig = await getRoomConfig(roomId);
|
|
|
- this.socket.emit(EVENT.roomIn, {
|
|
|
- user,
|
|
|
- roomsPerson: AllRoomUsers,
|
|
|
- roomsConfig: roomConfig,
|
|
|
- });
|
|
|
- this.socket.broadcast.to(roomId).emit(EVENT.someOneInRoom, {
|
|
|
- user,
|
|
|
- roomsPerson: AllRoomUsers,
|
|
|
- roomsConfig: roomConfig,
|
|
|
- });
|
|
|
- } else {
|
|
|
- this.room.logger.info(`已加入房间 :`, { userId });
|
|
|
- }
|
|
|
- await this.notifyUsersChange(roomId, user, true);
|
|
|
+ this.room.logger.info("加入房间 :", { userId, roomId, user });
|
|
|
+ // if (!isJoinRoom) {
|
|
|
+ // this.room.logger.info("加入房间 :", { userId, roomId, user });
|
|
|
+ // const AllRoomUsers = await getAllRoomUsers(roomId);
|
|
|
+ // const roomConfig = await getRoomConfig(roomId);
|
|
|
+ // this.socket.emit(EVENT.roomIn, {
|
|
|
+ // user,
|
|
|
+ // roomsPerson: AllRoomUsers,
|
|
|
+ // roomsConfig: roomConfig,
|
|
|
+ // });
|
|
|
+ // this.socket.broadcast.to(roomId).emit(EVENT.someOneInRoom, {
|
|
|
+ // user,
|
|
|
+ // roomsPerson: AllRoomUsers,
|
|
|
+ // roomsConfig: roomConfig,
|
|
|
+ // });
|
|
|
+ // } else {
|
|
|
+ // this.room.logger.info(`已加入房间 :`, { userId });
|
|
|
+ // }
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -309,10 +309,13 @@ export class RoomAssistant {
|
|
|
roomsPerson: AllRoomUsers,
|
|
|
roomsConfig: roomConfig,
|
|
|
});
|
|
|
- this.socket.broadcast.to(roomId).emit(EVENT.someOneInRoom, {
|
|
|
- user,
|
|
|
- roomsPerson: AllRoomUsers,
|
|
|
- });
|
|
|
+ // this.socket.broadcast.to(roomId).emit(EVENT.someOneInRoom, {
|
|
|
+ // user,
|
|
|
+ // roomsPerson: AllRoomUsers,
|
|
|
+ // });
|
|
|
+
|
|
|
+ await this.notifyUsersChange(roomId, user, true);
|
|
|
+
|
|
|
} catch (error) {
|
|
|
this.room.logger.error("assistant::startCall:", error);
|
|
|
}
|