Add QUIT and PART message support.

channel.js

@@ -13,7 +13,7 @@ var channel = function(){
 		// TODO
 	};
 	
-	this.uJoin = function(user){
+	this.joinUser = function(user){
 		if(this.users.indexOf(user) >= 0) return;
 		this.users.push(user);
 	};
@@ -33,6 +33,15 @@ var channel = function(){
 	this.addInvex = function(invex){
 		// TODO
 	};
+	
+	this.removeUser = function(user){
+		for(var i=0; i<this.users.length; i++){
+			if(this.users[i] == user){
+				this.users.splice(i, 1);
+				break;
+			}
+		}
+	};
 }
 
 module.exports = channel;

irc.js

@@ -12,8 +12,6 @@ var servers = [];
 var channels = [];
 var me = null;
 
-module.exports.setConnection = setConnection;
-
 function findServer(s){
 	for(var i=0; i<servers.length; i++){
 		srv = servers[i];
@@ -81,35 +79,6 @@ function parseUmodes(text){
 	// TODO
 }
 
-function setConnection(host, port, protocol){
-	uplink = require('./protocol/' + protocol);
-	me = new IRCserver;
-	me.introduce('serwisy.pirc.pl', '11K', 'Serwisy', 0, null);
-	servers.push(me);
-	uplink.setHandlers({
-		send: ircSendData,
-		findServer: findServer,
-		findUser: findUser,
-		killUser: killUser,
-		newServer: newServer,
-		newUser: newUser,
-		parseUmodes: parseUmodes,
-		getChannel: getChannel
-	});
-	uplink.setSettings({
-		ID: me.sid,
-		password: 'myservicespassword',
-		name: me.name,
-		description: me.description,
-		version: 'k4be-services',
-		me: me
-	});
-	connection = new net.Socket();
-	connection.connect(port, host, uplink.connected.bind(this));
-	connection.on('data', ircDataReceived);
-	connection.on('close', ircConnectionClosed);
-}
-
 function ircSendData(tags, from, cmd, args){
 	var data = makeTagsString(tags);
 	if(from){
@@ -165,7 +134,65 @@ function processReplyTags(inputTags, newTags){
 	// TODO
 }
 
+function quitUser(user){
+	console.log('Removing user '+user.name);
+	for(var i=0; i<channels.length; i++){
+		channels[i].removeUser(user);
+	}
+	for(var i=0; i<users.length; i++){
+		if(users[i] == user){
+			users.splice(i, 1);
+			break;
+		}
+	}
+}
+
+function removeEmptyChannels(){
+	for(var i=channels.length - 1; i >= 0; i--){
+		if(channels[i].users.length == 0){
+			storeChannelData(channels[i]);
+			console.log('Removing channel '+channels[i].name);
+			channels.splice(i, 1);
+		}
+	}
+}
+
+function storeChannelData(channel){
+// TODO maybe move a level up
+}
+
+setInterval(removeEmptyChannels, 1000);
+
 var irc = {
+	'setConnection': function(host, port, protocol){
+	uplink = require('./protocol/' + protocol);
+	me = new IRCserver;
+	me.introduce('serwisy.pirc.pl', '11K', 'Serwisy', 0, null);
+	servers.push(me);
+	uplink.setHandlers({
+		send: ircSendData,
+		findServer: findServer,
+		findUser: findUser,
+		killUser: killUser,
+		newServer: newServer,
+		newUser: newUser,
+		parseUmodes: parseUmodes,
+		getChannel: getChannel,
+		quitUser: quitUser
+	});
+	uplink.setSettings({
+		ID: me.sid,
+		password: 'myservicespassword',
+		name: me.name,
+		description: me.description,
+		version: 'k4be-services',
+		me: me
+	});
+	connection = new net.Socket();
+	connection.connect(port, host, uplink.connected.bind(this));
+	connection.on('data', ircDataReceived);
+	connection.on('close', ircConnectionClosed);
+	},
 	'messagedata': function() {
 		this.text = '';
 		this.args = [];
@@ -371,3 +398,5 @@ var irc = {
 	}
 };
 
+module.exports = irc;
+

protocol/unrealircd.js

@@ -12,7 +12,8 @@ var handlers = {
 	newServer: null,
 	newUser: null,
 	parseUmodes: null,
-	getChannel: null
+	getChannel: null,
+	quitUser: null
 };
 
 var settings = {
@@ -138,90 +139,11 @@ var cmdBinds = {
 	'SID': function(msg){
 		handlers.newServer(msg.args[0], msg.args[2], msg.args[3], msg.args[1], msg.sender);
 	},
-/*
-messagedata {
-  text: 'James Wheare',
-  args: [
-    'jwheare', // nick 0
-    '0', // hopcount 1
-    '1583326466', // TS 2
-    'sid2', // ident 3
-    '192.184.10.9', // host 4
-    '0932YWXX0', // uid 5
-    '0', // account 6
-    '+T', // umodes 7
-    '192.184.10.9', // vhost 8
-    '142AA462.921FA108.2DA10B49.IP', // cloakedHost 9
-    'wLgKCQ==', // ip 10
-    'James Wheare' // realname 11
-  ],
-  tags: [],
-  command: 'UID',
-  sender: {
-    nick: 'test1.pirc.pl',
-    ident: '',
-    host: '',
-    server: true,
-    user: false
-  },
-  time: 2020-03-09T08:33:46.447Z,
-  reply: [Function],
-  originalString: ':093 UID jwheare 0 1583326466 sid2 192.184.10.9 0932YWXX0 0 +T 192.184.10.9 142AA462.921FA108.2DA10B49.IP wLgKCQ== :James Wheare'
-}
-*/
+	
 	'UID': function(msg){ // nick, distance, TS, ident, host, uid, account, umodes, vhost, cloakedHost, ip, realname, uplink
 		handlers.newUser(msg.args[0], msg.args[1], msg.args[2], msg.args[3], msg.args[4], msg.args[5], msg.args[6], handlers.parseUmodes(msg.args[7]), msg.args[8], msg.args[9], msg.args[10], msg.args[11], msg.sender.server);
 	},
-/*
->>> :143 SJOIN 1580651090 #help +nt :0936CITMS 0931Y7O8W
-messagedata {
-  text: '0936CITMS 0931Y7O8W',
-  args: [ '1580651090', '#help', '+nt', '0936CITMS 0931Y7O8W' ],
-  tags: [],
-  command: 'SJOIN',
-  sender: {
-    nick: 'test3.pirc.pl',
-    ident: '',
-    host: '',
-    server: server {
-      name: 'test3.pirc.pl',
-      sid: '143',
-      description: 'serwer testowy!',
-      distance: '1',
-      uplink: [server],
-      introduce: [Function]
-    },
-    user: false
-  },
-  time: 2020-03-09T10:05:44.305Z,
-  reply: [Function],
-  originalString: ':143 SJOIN 1580651090 #help +nt :0936CITMS 0931Y7O8W'
-}
->>> :143 SJOIN 1582647660 #jwheare +nt :@0936CITMS
-messagedata {
-  text: '@0936CITMS',
-  args: [ '1582647660', '#jwheare', '+nt', '@0936CITMS' ],
-  tags: [],
-  command: 'SJOIN',
-  sender: {
-    nick: 'test3.pirc.pl',
-    ident: '',
-    host: '',
-    server: server {
-      name: 'test3.pirc.pl',
-      sid: '143',
-      description: 'serwer testowy!',
-      distance: '1',
-      uplink: [server],
-      introduce: [Function]
-    },
-    user: false
-  },
-  time: 2020-03-09T10:05:44.306Z,
-  reply: [Function],
-  originalString: ':143 SJOIN 1582647660 #jwheare +nt :@0936CITMS'
-}
-*/
+
 	'SJOIN': function(msg){
 		var channel = handlers.getChannel(msg.args[1]);
 		channel.setTS(msg.args[0]);
@@ -244,7 +166,7 @@ messagedata {
 				var udata = parseModePrefix(member);
 				if(!udata) return;
 				console.log(udata.user.name + ' joined ' + msg.args[1]);
-				channel.uJoin(udata.user);
+				channel.joinUser(udata.user);
 				channel.setStatusModes(udata.user, udata.modes);
 			}
 		}
@@ -269,6 +191,15 @@ messagedata {
 	
 	'PING': function(msg){
 		msg.reply(null, 'PONG', msg.args);
+	},
+
+	'QUIT': function(msg){
+		handlers.quitUser(msg.sender.user);
+	},
+
+	'PART': function(msg){
+		var channel = handlers.getChannel(msg.args[0]);
+		channel.removeUser(msg.sender.user);
 	}
 };