Inv mods

server/sockets/modules/join.js

@@ -140,7 +140,7 @@ module.exports = (App) => {
       return App.handler.get_out(socket)
     }
 
-    if (!App.handler.user_is_invited(socket, info, userinfo)) {
+    if (!App.handler.user_is_invited(info, userinfo)) {
       return App.handler.get_out(socket)
     }
 

server/sockets/modules/room.js

@@ -305,6 +305,7 @@ module.exports = (App) => {
     }
   }
 
+  // In limited mode ignore requests from non ops/admins
   App.handler.check_limited = (socket) => {
     let room = App.vars.rooms[socket.hue.room_id]
 
@@ -316,4 +317,25 @@ module.exports = (App) => {
 
     return true
   }
+
+  // Check if a user is at least voice in the room
+  App.handler.user_is_invited = (room, user) => {
+    if (room.public) {
+      return true
+    }
+
+    for (let user_id in room.keys) {
+      if (user_id === user.id) {
+        let role = room.keys[user_id]
+
+        if ([`admin`, `op`, `voice`].includes(role)) {
+          return true
+        }
+
+        break
+      }
+    }
+
+    return false
+  }
 }

server/sockets/modules/rooms.js

@@ -28,25 +28,4 @@ module.exports = (App) => {
       roomlist: App.roomlist,
     })
   }
-
-  // Check if a user is at least voice in the room
-  App.handler.user_is_invited = (socket, room, user) => {
-    if (room.public) {
-      return true
-    }
-
-    for (let user_id in room.keys) {
-      if (user_id === user.id) {
-        let role = room.keys[user_id]
-
-        if ([`admin`, `op`, `voice`].includes(role)) {
-          return true
-        }
-
-        break
-      }
-    }
-
-    return false
-  }
 }