From eec84d13cf87283428b59b9155eabf07d6b56514 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20N=C3=A9grier?= <d.negrier@thecodingmachine.com>
Date: Fri, 11 Dec 2020 16:47:59 +0100
Subject: [PATCH] Code cleanup

---
 messages/protos/messages.proto       | 17 +++++----
 pusher/src/Services/SocketManager.ts | 53 ----------------------------
 2 files changed, 8 insertions(+), 62 deletions(-)

diff --git a/messages/protos/messages.proto b/messages/protos/messages.proto
index c954bb95..24db45d5 100644
--- a/messages/protos/messages.proto
+++ b/messages/protos/messages.proto
@@ -264,15 +264,14 @@ message PusherToBackMessage {
     JoinRoomMessage joinRoomMessage = 1;
     UserMovesMessage userMovesMessage = 2;
     SilentMessage silentMessage = 3;
-    ViewportMessage viewportMessage = 4;
-    ItemEventMessage itemEventMessage = 5;
-    SetPlayerDetailsMessage setPlayerDetailsMessage = 6;
-    WebRtcSignalToServerMessage webRtcSignalToServerMessage = 7;
-    WebRtcSignalToServerMessage webRtcScreenSharingSignalToServerMessage = 8;
-    PlayGlobalMessage playGlobalMessage = 9;
-    StopGlobalMessage stopGlobalMessage = 10;
-    ReportPlayerMessage reportPlayerMessage = 11;
-    QueryJitsiJwtMessage queryJitsiJwtMessage = 12;
+    ItemEventMessage itemEventMessage = 4;
+    SetPlayerDetailsMessage setPlayerDetailsMessage = 5;
+    WebRtcSignalToServerMessage webRtcSignalToServerMessage = 6;
+    WebRtcSignalToServerMessage webRtcScreenSharingSignalToServerMessage = 7;
+    PlayGlobalMessage playGlobalMessage = 8;
+    StopGlobalMessage stopGlobalMessage = 9;
+    ReportPlayerMessage reportPlayerMessage = 10;
+    QueryJitsiJwtMessage queryJitsiJwtMessage = 11;
   }
 }
 
diff --git a/pusher/src/Services/SocketManager.ts b/pusher/src/Services/SocketManager.ts
index f0bc250a..6255ca20 100644
--- a/pusher/src/Services/SocketManager.ts
+++ b/pusher/src/Services/SocketManager.ts
@@ -202,59 +202,6 @@ export class SocketManager implements ZoneEventListener {
             const pusherToBackMessage = new PusherToBackMessage();
             pusherToBackMessage.setJoinroommessage(joinRoomMessage);
             streamToPusher.write(pusherToBackMessage);
-
-            // TODO: analyze viewport, subscribe to correct handler
-
-            //join new previous room
-            //const gameRoom = this.joinRoom(client, position);
-
-            //const things = gameRoom.setViewport(client, viewport);
-
-            /*const roomJoinedMessage = new RoomJoinedMessage();
-
-            for (const thing of things) {
-                if (thing instanceof User) {
-                    const player: ExSocketInterface|undefined = this.sockets.get(thing.id);
-                    if (player === undefined) {
-                        console.warn('Something went wrong. The World contains a user "'+thing.id+"' but this user does not exist in the sockets list!");
-                        continue;
-                    }
-
-                    const userJoinedMessage = new UserJoinedMessage();
-                    userJoinedMessage.setUserid(thing.id);
-                    userJoinedMessage.setName(player.name);
-                    userJoinedMessage.setCharacterlayersList(ProtobufUtils.toCharacterLayerMessages(player.characterLayers));
-                    userJoinedMessage.setPosition(ProtobufUtils.toPositionMessage(player.position));
-
-                    roomJoinedMessage.addUser(userJoinedMessage);
-                    roomJoinedMessage.setTagList(client.tags);
-                } else if (thing instanceof Group) {
-                    const groupUpdateMessage = new GroupUpdateMessage();
-                    groupUpdateMessage.setGroupid(thing.getId());
-                    groupUpdateMessage.setPosition(ProtobufUtils.toPointMessage(thing.getPosition()));
-
-                    roomJoinedMessage.addGroup(groupUpdateMessage);
-                } else {
-                    console.error("Unexpected type for Movable returned by setViewport");
-                }
-            }
-
-            for (const [itemId, item] of gameRoom.getItemsState().entries()) {
-                const itemStateMessage = new ItemStateMessage();
-                itemStateMessage.setItemid(itemId);
-                itemStateMessage.setStatejson(JSON.stringify(item));
-
-                roomJoinedMessage.addItem(itemStateMessage);
-            }
-
-            roomJoinedMessage.setCurrentuserid(client.userId);
-
-            const serverToClientMessage = new ServerToClientMessage();
-            serverToClientMessage.setRoomjoinedmessage(roomJoinedMessage);
-
-            if (!client.disconnecting) {
-                client.send(serverToClientMessage.serializeBinary().buffer, true);
-            }*/
         } catch (e) {
             console.error('An error occurred on "join_room" event');
             console.error(e);