Add event calls

channel.js

@@ -7,6 +7,12 @@ var channel = function(){
 	this.listModes = {}; // indexed by mode name
 	this.users = [];
 	this.metadata = {};
+	
+	this.events = {};
+	
+	this.setEvents = function(events){
+		this.events = events;
+	};
 
 	this.setTS = function(TS){
 		this.TS = TS;
@@ -19,6 +25,7 @@ var channel = function(){
 					var statusMode = modes[mode][i];
 					this.statusModes[statusMode.user.uid][statusMode.name] = statusMode.status;
 					console.log((statusMode.status?'Setting':'Unsetting')+' '+statusMode.name+' for '+statusMode.user.name+' on '+this.name);
+					this.events.doEvent('channelStatusMode', this, statusMode);
 				}
 			} else if(mode == 'list'){
 				for(var i=0; i<modes[mode].length; i++){
@@ -38,9 +45,11 @@ var channel = function(){
 							}
 						}
 					}
+					this.events.doEvent('channelListMode', this, listMode);
 				}
 			} else {
 				this.modes[mode] = modes[mode];
+				this.events.doEvent('channelModes', this);
 			}
 		}
 	};
@@ -49,6 +58,7 @@ var channel = function(){
 		if(this.users.indexOf(user) >= 0) return;
 		this.users.push(user);
 		this.statusModes[user.uid] = {};
+		this.events.doEvent('channelJoin', this, user);
 	};
 	
 	this.removeUser = function(user){
@@ -58,6 +68,7 @@ var channel = function(){
 		for(var i=0; i<this.users.length; i++){
 			if(this.users[i] == user){
 				this.users.splice(i, 1);
+				this.events.doEvent('channelLeave', this, user);
 				break;
 			}
 		}
@@ -71,10 +82,12 @@ var channel = function(){
 				delete this.metadata[name];
 			}
 		}
+		this.events.doEvent('channelMetadata', this, name);
 	};
 	
 	this.setTopic = function(topic){
 		this.topic = topic;
+		this.events.doEvent('channelTopic', this);
 	};
 }
 

irc.js

@@ -91,6 +91,7 @@ function getChannel(name){
 	if(!channel){
 		console.log('Creating channel '+name);
 		channel = new IRCchannel;
+		channel.setEvents(events);
 		channel.name = name;
 		channels.push(channel);
 		events.doEvent('channelCreate', channel);
@@ -112,6 +113,7 @@ function newUser(nick, distance, TS, ident, host, uid, account, umodes, vhost, c
 	}
 	console.log('Introducing user '+nick);
 	user = new IRCuser;
+	user.setEvents(events);
 	user.introduce(nick, distance, TS, ident, host, uid, account, umodes, vhost, cloakedHost, ip, realname, uplink);
 	users.push(user);
 	events.doEvent('userCreate', user);
@@ -124,6 +126,7 @@ function newServer(name, sid, desc, distance, uplink){
 	}
 	console.log('Introducing server '+name+' (SID='+sid+', uplink="'+uplink.name+'")');
 	server = new IRCserver;
+	server.setEvents(events);
 	server.introduce(name, sid, desc, distance, uplink);
 	servers.push(server);
 	events.doEvent('serverCreate', server);
@@ -228,6 +231,7 @@ var irc = {
 	'setConnection': function(host, port, protocol){
 		uplink = require('./protocol/' + protocol);
 		me = new IRCserver;
+		me.setEvents(events);
 		me.introduce('serwisy.pirc.pl', '11K', 'Serwisy', 0, null);
 		servers.push(me);
 		uplink.setHandlers({
@@ -263,6 +267,7 @@ var irc = {
 	},
 	'makeUser': function(nick, ident, host, realname){
 		var user = new IRCuser;
+		user.setEvents(events);
 		var uid = uplink.makeUid();
 		user.introduce(nick, 0, Math.floor(new Date() / 1000).toString(10), ident, host, uid, null, '+SoB'/*TODO*/, null, null, null, realname, me);
 		users.push(user);

server.js

@@ -1,4 +1,3 @@
-
 var server = function(){
 	this.name = null;
 	this.sid = null;
@@ -6,6 +5,12 @@ var server = function(){
 	this.distance = null;
 	this.uplink = null;
 
+	this.events = {};
+	
+	this.setEvents = function(events){
+		this.events = events;
+	};
+
 	this.introduce = function(newName, newSid, newDescription, newDistance, newUplink){
 		this.name = newName;
 		this.sid = newSid;
@@ -16,6 +21,7 @@ var server = function(){
 	
 	this.setDescription = function(description){
 		this.description = description;
+		this.events.doEvent('serverDesc', this);
 	};
 }
 

services.js

@@ -1,17 +1,35 @@
 var irc = require('./irc');
 
 var events = {
-	'netSynced': [],
 	'botMessage': [],
+	'botNotice': [],
 	'channelMessage': [],
 	'channelNotice': [],
-	'botNotice': [],
-	'serverDelete': [],
+	'channelModes': [],
+	'channelListMode': [],
+	'channelStatusMode': [],
+	'channelJoin': [],
+	'channelLeave': [],
+	'channelMetadata': [],
 	'channelCreate': [],
-	'userCreate': [],
+
+	'netSynced': [],
+
+	'serverDelete': [],
 	'serverCreate': [],
+	'serverDesc': [],
+
 	'uplinkLost': [],
+
 	'userDelete': [],
+	'userCreate': [],
+	'userVHost': [],
+	'userVIdent': [],
+	'userRealname': [],
+	'userNick': [],
+	'userUmode': [],
+	'userMetadata': [],
+
 	'doEvent': function(event, args){
 		if(event in events){
 			for(var i=0; i<events[event].length; i++){

user.js

@@ -16,6 +16,8 @@ var user = function(){
 	this.certfp = null;
 	this.vident = null;
 	this.metadata = {};
+	
+	this.events = {};
 
 	this.introduce = function(nick, distance, TS, ident, host, uid, account, umodes, vhost, cloakedHost, ip, realname, uplink){ // nick, distance, TS, ident, host, uid, account, umodes, vhost, cloakedHost, ip, realname, uplink
 		this.name = nick;
@@ -33,6 +35,10 @@ var user = function(){
 		this.uplink = uplink;
 	}
 	
+	this.setEvents = function(events){
+		this.events = events;
+	}
+	
 	this.setSecure = function(secure){
 		this.secure = secure;
 	}
@@ -43,24 +49,29 @@ var user = function(){
 	
 	this.changeVHost = function(host){
 		this.vhost = host;
+		this.events.doEvent('userVHost', this);
 	}
 	
 	this.changeVIdent = function(ident){
 		this.vident = ident;
+		this.events.doEvent('userVIdent', this);
 	}
 	
 	this.setRealname = function(realname){
 		this.realname = realname;
+		this.events.doEvent('userRealname', this);
 	}
 	
 	this.changeNick = function(nick){
 		this.name = nick;
+		this.events.doEvent('userNick', this);
 	}
 	
 	this.changeUmodes = function(umodes){
 		for(umode in umodes){
 			this.umodes[umode] = umodes[umode];
 		}
+		this.events.doEvent('userUmode', this);
 	}
 	
 	this.setMetadata = function(name, visibility, value){
@@ -71,6 +82,7 @@ var user = function(){
 				delete this.metadata[name];
 			}
 		}
+		this.events.doEvent('userMetadata', this, name);
 	}
 }