10 years ago · e90f20cddf
--- a/app/OmnomIRC.js
+++ b/app/OmnomIRC.js
@@ -63,9 +63,9 @@ var fs = require('fs'),
 
 					}
 
 				},
 
 				origins: [
 
+					['S','Server'],
 
 					['O','OmnomIRC'],
 
-					['#','IRC'],
 
-					['S','Server']
 
+					['#','IRC']
 
 				]
 
 			},
 
 			i,
@@ -94,7 +94,15 @@ var fs = require('fs'),
 
 			});
 
 		}
 
 		return options;
 
-	})();
 
+	})(),
 
+	origin = function(name){
 
+		for(var i in options.origins){
 
+			if(options.orgins[i][1] == name){
 
+				return i;
 
+			}
 
+			return 0;
 
+		}
 
+	};
 
 if(typeof fs.existsSync == 'undefined') fs.existsSync = path.existsSync; // legacy support
 
 if(cluster.isMaster){
 
 	var iWorker;
@@ -139,8 +147,7 @@ if(cluster.isMaster){
 
 	process.on('message',function(msg){
 
 		var c = msg[0];
 
 		msg = msg.substr(1);
 
-		logger.debug('Child recieved command '+c+' with message '+msg);
 
-		
 
+		logger.debug('Child recieved command '+c+' with message '+msg);		
 
 		switch(c){
 
 			case 'Q':
 
 				if(typeof app != 'undefined' && typeof irc == 'undefined'){
@@ -169,16 +176,10 @@ if(cluster.isMaster){
 
 				});
 
 				irc.on('CHANMSG',function(d){
 
 					console.log(d);
 
-					var origin = -1;
 
-					for(var i in options.origins){
 
-						if (options.origins[i][1]=='IRC'){
 
-							origin = i;
 
-							break;
 
-						}
 
-					}
 
-					message(d.reciever,d.sender,d.message,origin);
 
+					message(d.reciever,d.sender,d.message,origin('IRC'));
 
 				});
 
-				/*irc.addListener('names',function(chan,nicks){
 
+				// Beginnings of names handler
 
+				/*irc.on('names',function(chan,nicks){
 
 					for(var i in nicks){
 
 						logger.debug('[NICKS] Channel '+chan+' '+nicks[i]);
 
 					}
--- a/app/www/data/plugins/test/script.js
+++ b/app/www/data/plugins/test/script.js
@@ -4,9 +4,9 @@ hook('message',function(msg,from,room,source){
 
 		$o.chat.send(source,room);
 
 	}
 
 });
 
-/*hook('send',function(msg,room){
 
+hook('send',function(msg,room){
 
 	return msg.toLowerCase()!='the game';
 
-})*/;
 
+});
 
 hook('start',function(){
 
 	$('body').show();
 
 });
--- a/app/www/js/omnomirc.js
+++ b/app/www/js/omnomirc.js
@@ -83,6 +83,7 @@
 
 					}
 
 					emit('message',{
 
 						from: 0,
 
+						origin: 0,
 
 						message: properties.nick+' '+ret,
 
 						room: $o.ui.tabs.current().name
 
 					});
@@ -178,7 +179,8 @@
 
 								emit('echo',{
 
 									room: data.room,
 
 									message: v+' left the room',
 
-									from: 0
 
+									from: 0,
 
+									origin: 0
 
 								});
 
 								runHook('part',[
 
 									v,
@@ -233,6 +235,7 @@
 
 					emit('echo',{
 
 						room: $o.ui.tabs.current().name,
 
 						from: 0,
 
+						origin: 0,
 
 						message: 'reconnected'
 
 					});
 
 				}
@@ -247,6 +250,7 @@
 
 					emit('echo',{
 
 						room: $o.ui.tabs.current().name,
 
 						from: 0,
 
+						origin: 0,
 
 						message: 'connected'
 
 					});
 
 				}
@@ -390,6 +394,14 @@
 
 				}).timeago('dispose');
 
 			}
 
 		},
 
+		origin = function(name){
 
+			for(var i in properties.origins){
 
+				if(name == properties.origins[i][1]){
 
+					return i;
 
+				}
 
+			}
 
+			return 0;
 
+		},
 
 		socket,$i,$s,$h,$cl,$c,$tl,hht;
 
 	$.extend($o,{
 
 		version: function(){
@@ -738,7 +750,8 @@
 
 								emit('echo',{
 
 									room: $o.ui.tabs.tab(id).name,
 
 									message: 'messages cleared',
 
-									from: 0
 
+									from: 0,
 
+									origin: 0
 
 								});
 
 							}
 
 						});
@@ -937,18 +950,11 @@
 
 						}
 
 						event(msg,'send');
 
 						if(runHook('send',[msg,room])){
 
-							var origin = -1;
 
-							for(var i in $o.prop('origins')){
 
-								if ($o.prop('origins')[i][1]=='OmnomIRC'){
 
-									origin = i;
 
-									break;
 
-								}
 
-							}
 
 							emit('message',{
 
 								message: msg,
 
 								room: room,
 
 								from: properties.nick,
 
-								origin: origin
 
+								origin: origin('OmnomIRC')
 
 							});
 
 						}
 
 					}