Batch clients into sets of 100 for reconfig command

[KiwiIRC.git] / server / irc / channel.js

diff --git a/server/irc/channel.js b/server/irc/channel.js
index 819e06c5a532546e606acd016952563641a5a52b..fcdeec28a4db9bc19e55b27bb30d57d74fc514d2 100644 (file)
--- a/server/irc/channel.js
+++ b/server/irc/channel.js
@@ -27,15 +27,15 @@ var IrcChannel = function(irc_connection, name) {
         topicsetby:     onTopicSetBy,
         mode:           onMode
     };
-    EventBinder.bindIrcEvents('channel:' + this.name, this.irc_events, this, irc_connection);
-}
+    EventBinder.bindIrcEvents('channel ' + this.name, this.irc_events, this, irc_connection);
+};
 
 
 module.exports = IrcChannel;
 
 
 IrcChannel.prototype.dispose = function (){
-    EventBinder.unbindIrcEvents('channel:' + this.name, this.irc_events, this.irc_connection);
+    EventBinder.unbindIrcEvents('channel ' + this.name, this.irc_events, this.irc_connection);
     this.irc_connection = undefined;
 };
 
@@ -53,7 +53,7 @@ function onJoin(event) {
     if (event.nick === this.irc_connection.nick) {
         this.irc_connection.write('NAMES ' + this.name);
     }
-};
+}
 
 
 function onPart(event) {
@@ -64,7 +64,7 @@ function onPart(event) {
         channel: this.name,
         message: event.message
     });
-};
+}
 
 
 function onKick(event) {
@@ -76,7 +76,7 @@ function onKick(event) {
         channel: this.name,
         message: event.message
     });
-};
+}
 
 
 function onQuit(event) {
@@ -86,7 +86,7 @@ function onQuit(event) {
         hostname: event.hostname,
         message: event.message
     });
-};
+}
 
 
 function onMsg(event) {
@@ -97,18 +97,19 @@ function onMsg(event) {
         channel: this.name,
         msg: event.msg
     });
-};
+}
 
 
 function onNotice(event) {
     this.irc_connection.clientEvent('notice', {
+        from_server: event.from_server,
         nick: event.nick,
         ident: event.ident,
         hostname: event.hostname,
         target: event.target,
         msg: event.msg
     });
-};
+}
 
 
 function onCtcpRequest(event) {
@@ -120,7 +121,7 @@ function onCtcpRequest(event) {
         type: event.type,
         msg: event.msg
     });
-};
+}
 
 
 function onCtcpResponse(event) {
@@ -132,7 +133,7 @@ function onCtcpResponse(event) {
         type: event.type,
         msg: event.msg
     });
-};
+}
 
 
 // TODO: Split event.users into batches of 50
@@ -143,7 +144,7 @@ function onNicklist(event) {
     });
     // TODO: uncomment when using an IrcUser per nick
     //updateUsersList.call(this, event.users);
-};
+}
 
 
 function onNicklistEnd(event) {
@@ -153,7 +154,7 @@ function onNicklistEnd(event) {
     });
     // TODO: uncomment when using an IrcUser per nick
     //updateUsersList.call(this, event.users);
-};
+}
 
 function updateUsersList(users) {
     var that = this;
@@ -173,12 +174,12 @@ function onTopic(event) {
         channel: this.name,
         topic: event.topic
     });
-};
+}
 
 
 function onBanList(event) {
     this.ban_list_buffer.push(event);
-};
+}
 
 function onBanListEnd(event) {
     var that = this;
@@ -186,14 +187,14 @@ function onBanListEnd(event) {
         that.irc_connection.clientEvent('banlist', ban);
     });
     this.ban_list_buffer = [];
-};
+}
 
 function onTopic(event) {
     this.irc_connection.clientEvent('topic', {
         channel: event.channel,
         topic: event.topic
     });
-};
+}
 
 function onTopicSetBy(event) {
     this.irc_connection.clientEvent('topicsetby', {
@@ -201,7 +202,7 @@ function onTopicSetBy(event) {
         channel: event.channel,
         when: event.when
     });
-};
+}
 
 function onMode(event) {
     this.irc_connection.clientEvent('mode', {
@@ -209,30 +210,4 @@ function onMode(event) {
         nick: event.nick,
         modes: event.modes
     });
-};
-
-
-/*
-server:event
-server:*
-channel:#channel:event
-channel:*:event
-user:event
-user:*
-
-Server disconnected:
-    server:disconnect
-    server:*
-
-Joining channel #kiwiirc:
-    channel:#kiwiirc:join
-    channel:*:join
-
-Channel message:
-    channel:#kiwiirc:privmsg
-    channel:*:privmsg
-
-Private message:
-    user:privmsg
-    user:*
-*/
\ No newline at end of file
+}