Browse Source

Merge pull request #28 from Omnimaga/irc

bug fix.
Sorunome 10 years ago
parent
commit
39f3072690
1 changed files with 12 additions and 12 deletions
  1. 12 12
      app/OmnomIRC.js

+ 12 - 12
app/OmnomIRC.js

@@ -160,7 +160,7 @@ if(cluster.isMaster){
 			case 'M':
 				if(typeof irc != 'undefined'){
 					msg = JSON.parse(msg);
-					if(msg.message){
+					if(typeof msg.message != 'udefined'){
 						irc.say(msg.room,'('+options.origins[msg.origin][0]+')'+'<'+msg.from+'> '+msg.message);
 					}
 				}
@@ -203,6 +203,17 @@ if(cluster.isMaster){
 			'png': 'image/png',
 			'jpg': 'image/jpeg'
 		},
+		message = function(room,from,message,origin,socket){
+			if(typeof socket == 'undefined'){
+				socket = io.sockets.in(room);
+			}
+			socket.emit('message',{
+				message: message,
+				room: room,
+				from: from,
+				origin: origin
+			})
+		},
 		app = require('http').createServer(function(req,res){
 			if(toobusy()){
 				res.writeHead(503,{
@@ -422,17 +433,6 @@ if(cluster.isMaster){
 					});
 				}
 			},
-			message = function(room,from,message,origin,socket){
-				if(typeof socket == 'undefined'){
-					socket = io.sockets.in(room);
-				}
-				socket.emit('message',{
-					message: message,
-					room: room,
-					from: from,
-					origin: origin
-				})
-			},
 			fromServer = function(room,message,socket){
 				if(typeof socket == 'undefined'){
 					socket = io.sockets.in(room);