Merge branch 'master' into develop

# Conflicts: # front/src/Connexion/RoomConnection.ts # front/src/Phaser/Menu/ReportMenu.ts
2021-03-11 02:22:05 +01:00
parent 21cc842c33 ce6976ec34
commit 2fcb8a76b1
8 changed files with 100 additions and 93 deletions
@@ -27,7 +27,7 @@ import {
    SendJitsiJwtMessage,
    CharacterLayerMessage,
    PingMessage,
-    SendUserMessage
+    SendUserMessage, BanUserMessage
 } from "../Messages/generated/messages_pb"

 import {UserSimplePeerInterface} from "../WebRtc/SimplePeer";
@@ -177,6 +177,8 @@ export class RoomConnection implements RoomConnection {
                this.dispatch(EventMessage.START_JITSI_ROOM, message.getSendjitsijwtmessage());
            } else if (message.hasSendusermessage()) {
                adminMessagesService.onSendusermessage(message.getSendusermessage() as SendUserMessage);
+            } else if (message.hasBanusermessage()) {
+                adminMessagesService.onSendusermessage(message.getSendusermessage() as BanUserMessage);
            } else {
                throw new Error('Unknown message received');
            }