From f95f38b09251a6a796e3a7b16bf27d365056ea9f Mon Sep 17 00:00:00 2001
From: Gregoire Parant <g.parant@thecodingmachine.com>
Date: Mon, 26 Oct 2020 14:13:51 +0100
Subject: [PATCH] Permit to remove callback

---
 front/src/WebRtc/DiscussionManager.ts | 9 +++++----
 front/src/WebRtc/MediaManager.ts      | 4 ++--
 front/src/WebRtc/SimplePeer.ts        | 2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/front/src/WebRtc/DiscussionManager.ts b/front/src/WebRtc/DiscussionManager.ts
index 4663adcf..d2a52632 100644
--- a/front/src/WebRtc/DiscussionManager.ts
+++ b/front/src/WebRtc/DiscussionManager.ts
@@ -15,7 +15,7 @@ export class DiscussionManager {
 
     private activeDiscussion: boolean = false;
 
-    private sendMessageCallBack : Set<SendMessageCallback> = new Set<SendMessageCallback>();
+    private sendMessageCallBack : Map<number|string, SendMessageCallback> = new Map<number|string, SendMessageCallback>();
 
     constructor(name: string) {
         this.mainContainer = HtmlUtils.getElementByIdOrFail<HTMLDivElement>('main-container');
@@ -71,7 +71,7 @@ export class DiscussionManager {
             if (event.key === 'Enter') {
                 event.preventDefault();
                 this.addMessage(name, inputMessage.value, true);
-                for(const callback of this.sendMessageCallBack) {
+                for(const callback of this.sendMessageCallBack.values()) {
                     callback(inputMessage.value);
                 }
                 inputMessage.value = "";
@@ -160,10 +160,11 @@ export class DiscussionManager {
         if(element){
             element.remove();
         }
+        this.sendMessageCallBack.delete(userId);
     }
 
-    public onSendMessageCallback(callback: SendMessageCallback): void {
-        this.sendMessageCallBack.add(callback);
+    public onSendMessageCallback(userId: string|number, callback: SendMessageCallback): void {
+        this.sendMessageCallBack.set(userId, callback);
     }
 
 }
\ No newline at end of file
diff --git a/front/src/WebRtc/MediaManager.ts b/front/src/WebRtc/MediaManager.ts
index 660aa599..6c33bc32 100644
--- a/front/src/WebRtc/MediaManager.ts
+++ b/front/src/WebRtc/MediaManager.ts
@@ -579,8 +579,8 @@ export class MediaManager {
         this.discussionManager.addMessage(name, message, isMe)
     }
 
-    public addSendMessageCallback(callback: SendMessageCallback){
-        this.discussionManager.onSendMessageCallback(callback)
+    public addSendMessageCallback(userId: string|number, callback: SendMessageCallback){
+        this.discussionManager.onSendMessageCallback(userId, callback)
     }
 }
 
diff --git a/front/src/WebRtc/SimplePeer.ts b/front/src/WebRtc/SimplePeer.ts
index a9c24f17..72c9d890 100644
--- a/front/src/WebRtc/SimplePeer.ts
+++ b/front/src/WebRtc/SimplePeer.ts
@@ -147,7 +147,7 @@ export class SimplePeer {
         const peer = new VideoPeer(user.userId, user.initiator ? user.initiator : false, this.Connection);
 
         //permit to send message
-        mediaManager.addSendMessageCallback((message: string) => {
+        mediaManager.addSendMessageCallback(user.userId,(message: string) => {
             peer.write(new Buffer(JSON.stringify({type: MESSAGE_TYPE_MESSAGE, name: name?.toUpperCase(), message: message})));
         });