Merge branch 'master' into develop

# Conflicts:
#	front/src/Connexion/RoomConnection.ts
#	front/src/Phaser/Menu/ReportMenu.ts

front/src/Connexion/AdminMessagesService.ts

@@ -1,5 +1,5 @@
 import {Subject} from "rxjs";
-import {SendUserMessage} from "../Messages/generated/messages_pb";
+import {BanUserMessage, SendUserMessage} from "../Messages/generated/messages_pb";
 
 export enum AdminMessageEventTypes {
     admin = 'message',
@@ -23,7 +23,7 @@ class AdminMessagesService {
         this.messageStream.subscribe((event) => console.log('message', event))
     }
     
-    onSendusermessage(message: SendUserMessage) {
+    onSendusermessage(message: SendUserMessage|BanUserMessage) {
         this._messageStream.next({
             type: message.getType() as unknown as AdminMessageEventTypes,
             text: message.getMessage(),

front/src/Connexion/RoomConnection.ts

@@ -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');
             }

front/src/Phaser/Menu/ReportMenu.ts

@@ -104,8 +104,7 @@ export class ReportMenu extends Phaser.GameObjects.DOMElement {
         gamePError.innerText = '';
         gamePError.style.display = 'none';
         const gameTextArea = this.getChildByID('gameReportInput') as HTMLInputElement;
-        const gameIdUserReported = this.getChildByID('idUserReported') as HTMLInputElement;
-        if(!gameTextArea || !gameTextArea.value ){
+        if(!gameTextArea || !gameTextArea.value){
             gamePError.innerText = 'Report message cannot to be empty.';
             gamePError.style.display = 'block';
             return;
@@ -116,4 +115,4 @@ export class ReportMenu extends Phaser.GameObjects.DOMElement {
         );
         this.close();
     }
-}
+}