Combined some socket request code

2018-10-19 11:28:17 +02:00
parent a7340fa155
commit 2c6b33c2b8
2 changed files with 22 additions and 40 deletions
@@ -263,10 +263,16 @@ class Room extends EventEmitter
 			);
 		});

-		signalingPeer.socket.on('chat-history', (request, cb) =>
+		signalingPeer.socket.on('server-history', (request, cb) =>
 		{
 			// Return to sender
-			cb(null, { chatHistory: this._chatHistory });
+			cb(
+				null,
+				{
+					chatHistory : this._chatHistory,
+					fileHistory : this._fileHistory
+				}
+			);
 		});

 		signalingPeer.socket.on('send-file', (request, cb) =>
@@ -292,12 +298,6 @@ class Room extends EventEmitter
 			);
 		});

-		signalingPeer.socket.on('file-history', (request, cb) =>
-		{
-			// Return to sender
-			cb(null, { fileHistory : this._fileHistory });
-		});
-
 		signalingPeer.socket.on('raisehand-message', (request, cb) =>
 		{
 			// Return no error