ルームの設定を送信する箇所をメソッド化した

diff --git a/chatServer.js b/chatServer.js
index 6b73ea2..3a34f8e 100644 (file)
--- a/chatServer.js
+++ b/chatServer.js
@@ -230,24 +230,14 @@ for(var i = 0; i < $max_room_number; i++)
                console.log("connected from %s",ip);\r
 \r
                var rno = GetRoomNumberFromName(socket.namespace.name);\r
-               var roomconfig = {};\r
-               $rooms.Get(rno).AddRom(ip);\r
-               if($rooms.Get(rno).IsVolatile() == false)\r
-               {\r
-                       if($rooms.Get(rno).IsFixedPassword())\r
-                               roomconfig.type = 2;\r
-                       else if($rooms.Get(rno).IsHiddenLogFromRom())\r
-                               roomconfig.type = 3;\r
-                       else\r
-                               roomconfig.type = 1;\r
-                       roomconfig.IsOwned = !$rooms.Get(rno).IsFirstAuth();\r
-               }else{\r
-                       roomconfig.type = 0;\r
-               }\r
+               var room = $rooms.Get(rno);\r
+               room.AddRom(ip);\r
+\r
+               var roomconfig = room.GetConfig();\r
                roomconfig.admin = socket.handshake.admin;\r
                socket.json.emit("send roominfo",roomconfig);\r
 \r
-               var romcount = $rooms.Get(rno).GetRomCount();\r
+               var romcount = room.GetRomCount();\r
                socket.json.emit("send romcount",romcount);\r
                socket.json.broadcast.emit("send romcount",romcount);\r
 \r
@@ -726,6 +716,22 @@ function RoomInfomation(pass,hiddenlogflag)
        this.owner = null;\r
        this.time = null;\r
        this.hiddenlog = hiddenlogflag;\r
+       this.GetConfig = function(){\r
+               var roomconfig = {};\r
+               if(this.IsVolatile() == false)\r
+               {\r
+                       if(this.IsFixedPassword())\r
+                               roomconfig.type = 2;\r
+                       else if(this.IsHiddenLogFromRom())\r
+                               roomconfig.type = 3;\r
+                       else\r
+                               roomconfig.type = 1;\r
+                       roomconfig.IsOwned = !this.IsFirstAuth();\r
+               }else{\r
+                       roomconfig.type = 0;\r
+               }\r
+               return roomconfig;\r
+       }\r
        this.IsVolatile = function(){\r
                return this.owner == null &&\r
                        this.password == null &&\r