joinとquitメッセージを新しく追加した

diff --git a/chatServer.js b/chatServer.js
index 8dc2f94..e12470d 100644 (file)
--- a/chatServer.js
+++ b/chatServer.js
@@ -17,6 +17,7 @@ $token_length = 32;   //
 $redisHost = "localhost";      //redis\83T\81[\83o\82Ì\83A\83h\83\8c\83X\r
 $redisPort = 6379;     //redis\83T\81[\83o\82Ì\83|\81[\83g\r
 $redisPassword = "";   //redis\83T\81[\83o\82Ì\83p\83X\83\8f\81[\83h\r
+$system_name = "system";       //\83V\83X\83e\83\80\94­\8c¾\82ð\95\\82·\96¼\91O\r
 \r
 /**\r
  * Module dependencies.\r
@@ -221,6 +222,12 @@ for(var i = 0; i < $max_room_number; i++)
                socket.on("get pastLog", function (msg) {\r
                        ParseGetPastLog(socket,msg);\r
                });\r
+               socket.on("join",function(msg){\r
+                       ParseJoin(socket,msg);\r
+               });\r
+               socket.on("quit",function(msg){\r
+                       ParseQuit(socket,msg);\r
+               });\r
                socket.on("send msg", function (msg) {\r
                        ParseSendMsg(socket,msg);\r
                });\r
@@ -290,6 +297,40 @@ function ParseDisconnect(socket,msg)
        console.log("disconnected");\r
 }\r
 \r
+function ParseJoin(socket,msg)\r
+{\r
+       var ip = GetClientIPAdress(socket);\r
+\r
+       if(ip in ipbanlist)\r
+       {\r
+               socket.emit("error",$block_message);\r
+               return;\r
+       }\r
+\r
+       var newMeg = {\r
+               name:$system_name,\r
+               message:util.format("/enteredby %s %s %s",msg.name,msg.color,msg.mailto),\r
+       };\r
+       ParseSendMsg(socket,newMeg);\r
+}\r
+\r
+function ParseQuit(socket,msg)\r
+{\r
+       var ip = GetClientIPAdress(socket);\r
+\r
+       if(ip in ipbanlist)\r
+       {\r
+               socket.emit("error",$block_message);\r
+               return;\r
+       }\r
+\r
+       var newMeg = {\r
+               name:$system_name,\r
+               message:util.format("/quitedby %s",msg.name),\r
+       };\r
+       ParseSendMsg(socket,newMeg);\r
+}\r
+\r
 //socket \90Ú\91±\92\86\82Ì\83\\83P\83b\83g\r
 //msg msg\83N\83\89\83X\r
 function ParseSendMsg(socket,msg)\r
@@ -303,9 +344,8 @@ function ParseSendMsg(socket,msg)
        }\r
 \r
        var date = new Date();\r
-       //var dateString = date.toFormat("YYYY/MM/DD HH24:MI:SS");\r
 \r
-       var repacked_msg = CreateMessage(msg,date);\r
+       var repacked_msg = CreateMessage(msg.name,date,msg.message);\r
 \r
        socket.json.emit("req msg", repacked_msg);\r
 \r
@@ -442,11 +482,11 @@ function GetClientIPAdress(socket)
 }\r
 \r
 // Message \83N\83\89\83X\r
-function CreateMessage(msg,date)\r
+function CreateMessage(name,date,message)\r
 {\r
-       var result = {name:msg.name,\r
+       var result = {name:name,\r
                date:date,\r
-               message:msg.message};\r
+               message:message};\r
        return result;\r
 }\r
 function CreateMessageFromText(text)\r

diff --git a/public/scripts/chatclient.js b/public/scripts/chatclient.js
index d0d7aa5..cb0d3cf 100644 (file)
--- a/public/scripts/chatclient.js
+++ b/public/scripts/chatclient.js
@@ -208,14 +208,11 @@ function enterEventListener(){
        $.cookie("name",document.enter_form.name.value,{ expires: $expires });\r
        $.cookie("color_index",document.enter_form.color.selectedIndex,{ expires: $expires });\r
 \r
-       var text = "/enteredby " + document.enter_form.name.value + " " + color + " " + document.enter_form.mailto.value;\r
-\r
-       $socket.json.emit("send msg",{name:$system_name,message:text});\r
+       $socket.json.emit("join",{name:document.enter_form.name.value,color:color,mailto:document.enter_form.mailto.value});\r
 }\r
 \r
 function quitEventListener(){\r
-       var text = "/quitedby " + document.enter_form.name.value;\r
-       $socket.json.emit("send msg",{name:$system_name,message:text});\r
+       $socket.json.emit("quit",{name:document.enter_form.name.value});\r
 \r
        $socket.json.emit("get pastLogList",{rno:document.chat_form.rno.value});\r
        $("#enter_frame").css("display","block");\r