From ed6f256fb3afdb6fbe69c4f01e8fed77e8a5edf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A5var=20Aamb=C3=B8=20Fosstveit?= <havar@fosstveit.net>
Date: Sun, 22 Mar 2020 19:55:06 +0100
Subject: [PATCH] Various cleanups

---
 server/lib/Room.js | 26 ++------------------------
 1 file changed, 2 insertions(+), 24 deletions(-)

diff --git a/server/lib/Room.js b/server/lib/Room.js
index b397ae1..5ede4fa 100644
--- a/server/lib/Room.js
+++ b/server/lib/Room.js
@@ -120,15 +120,14 @@ class Room extends EventEmitter
 	{
 		logger.info('handlePeer() [peer:"%s", roles:"%s"]', peer.id, peer.roles);
 
+		// Allow reconnections, remove old peer
 		if (this._peers[peer.id])
 		{
 			logger.warn(
 				'handleConnection() | there is already a peer with same peerId [peer:"%s"]',
 				peer.id);
 
-			peer.close();
-
-			return;
+			this._peers[peer.id].close();
 		}
 
 		// Always let ADMIN in, even if locked
@@ -461,27 +460,6 @@ class Room extends EventEmitter
 
 			case 'join':
 			{
-
-				try
-				{
-					if (peer.socket.handshake.session.passport.user.displayName)
-					{
-						this._notification(
-							peer.socket,
-							'changeDisplayname',
-							{
-								peerId         : peer.id,
-								displayName    : peer.socket.handshake.session.passport.user.displayName,
-								oldDisplayName : ''
-							},
-							true
-						);
-					}
-				}
-				catch (error)
-				{
-					logger.error(error);
-				}
 				// Ensure the Peer is not already joined.
 				if (peer.joined)
 					throw new Error('Peer already joined');