From 91b5b66c9bf1987300511701c68dc52c85b5894d Mon Sep 17 00:00:00 2001
From: AntoineDao <antoinedao1@gmail.com>
Date: Thu, 24 Oct 2019 21:44:40 +1000
Subject: [PATCH 1/2] fix(websockets): remove non existing
 `message.args.eventType` and add brackets

small fix to what was causing the server to break when broadcasting messages to a room
---
 app/ws/RadioTower.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/ws/RadioTower.js b/app/ws/RadioTower.js
index 7c58e145..995330a0 100644
--- a/app/ws/RadioTower.js
+++ b/app/ws/RadioTower.js
@@ -85,13 +85,14 @@ module.exports = {
       let roomName = ''
       if ( message.streamId && message.streamId.trim( ) !== '' ) {
         roomName = `stream-${message.streamId}`
-      } else if ( !( !message.resourceId || !message.resourceType ) )
+      } else if ( !( !message.resourceId || !message.resourceType ) ) {
         roomName = `${message.resourceType}-${message.resourceId}`
+      }
 
-      if ( roomName === '' )
-        return winston.debug( `Failed to deliver broadcast from ${senderClientId} (no room name).` )
-
-      winston.debug( `📣 broadcast in ${roomName} from ${senderClientId}: ${message.args.eventType}` )
+      if ( roomName === '' ) {
+        return winston.debug(`Failed to deliver broadcast from ${senderClientId} (no room name).`)
+      }
+      winston.debug( `📣 broadcast in ${roomName} from ${senderClientId}` )
       for ( let ws of ClientStore.clients ) {
         if ( ws.clientId !== senderClientId && ws.rooms.indexOf( roomName ) !== -1 ) { ws.send( raw ) }
       }

From f01bc93abf75bc802d9daa361b17caf463ba335d Mon Sep 17 00:00:00 2001
From: AntoineDao <antoinedao1@gmail.com>
Date: Thu, 24 Oct 2019 22:09:22 +1000
Subject: [PATCH 2/2] style(eslint): gotta make the tests pass right

---
 app/ws/RadioTower.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/ws/RadioTower.js b/app/ws/RadioTower.js
index 995330a0..eb93332b 100644
--- a/app/ws/RadioTower.js
+++ b/app/ws/RadioTower.js
@@ -90,7 +90,7 @@ module.exports = {
       }
 
       if ( roomName === '' ) {
-        return winston.debug(`Failed to deliver broadcast from ${senderClientId} (no room name).`)
+        return winston.debug( `Failed to deliver broadcast from ${senderClientId} (no room name).` )
       }
       winston.debug( `📣 broadcast in ${roomName} from ${senderClientId}` )
       for ( let ws of ClientStore.clients ) {