|
@@ -12,7 +12,7 @@ export class ActionsService {
|
|
|
private roomService: RoomService,
|
|
|
@Inject(forwardRef(() => UsersService))
|
|
|
private userService: UsersService,
|
|
|
- ) { }
|
|
|
+ ) {}
|
|
|
|
|
|
async handleAllAction(socket: Socket, data: ActionsParams): Promise<void> {
|
|
|
const isSocketLeader = () => {
|
|
@@ -43,11 +43,12 @@ export class ActionsService {
|
|
|
params.nickname = data.data.Nickname;
|
|
|
params.text = data.data.text;
|
|
|
params.userId = data.data.UserId;
|
|
|
- this.handleDanmaku(params);
|
|
|
+
|
|
|
+ this.handleDanmaku(params, roomId);
|
|
|
break;
|
|
|
case 'users-muted':
|
|
|
const mutedParams = data as any as MutedStateType;
|
|
|
- mutedParams.roomId = roomId;
|
|
|
+
|
|
|
isSocketLeader() && (await this.handleMutedState(mutedParams));
|
|
|
await this.roomService.handleRoomStatusAction(socket);
|
|
|
break;
|
|
@@ -60,7 +61,6 @@ export class ActionsService {
|
|
|
break;
|
|
|
case 'users-kicked':
|
|
|
const kickParams = data as any as KickStateType;
|
|
|
- // console.log('kickParams', socket.data.user, kickParams);
|
|
|
isSocketLeader() && (await this.handleKickState(socket, kickParams));
|
|
|
break;
|
|
|
default:
|
|
@@ -70,9 +70,8 @@ export class ActionsService {
|
|
|
socket.broadcast.to(roomId).emit('action', data);
|
|
|
}
|
|
|
|
|
|
- async handleDanmaku(data: DanmakuDataType) {
|
|
|
+ async handleDanmaku(data: DanmakuDataType, roomId: string) {
|
|
|
console.log('data', data);
|
|
|
- const roomId = this.roomService._userInfo.RoomId;
|
|
|
const time = Date.now();
|
|
|
if (roomId) {
|
|
|
this.redis.hset(
|