Removing unneeded plugin callbacks

diff --git a/client/assets/plugins/textstyle.html b/client/assets/plugins/textstyle.html
index 39ac9d03f7b838c768a7e79c7f822e6fb25c6374..4fc54ca51e3f0e4e067dd4ea037ea0e7460e981e 100644 (file)
--- a/client/assets/plugins/textstyle.html
+++ b/client/assets/plugins/textstyle.html
@@ -140,8 +140,6 @@
             if (data.params[1]) {
                 data.params[1] = style_codes + data.params[1];
             }
-
-            event.callback();
         });
 
 

diff --git a/client/src/helpers/plugininterface.js b/client/src/helpers/plugininterface.js
index 0c2782af9cbfd64f5833a96036603182bf42fc32..44f1598630966a3aa6738c42a635bb9fac8b7c8a 100644 (file)
--- a/client/src/helpers/plugininterface.js
+++ b/client/src/helpers/plugininterface.js
@@ -111,7 +111,14 @@ if (typeof module === 'object' && typeof module.exports !== 'undefined') {
 var p = new PluginInterface();
 p.on('test', function (event, data) {
     data.a += '!';
-    event.callback();
+});
+
+p.on('test', function (event, data) {
+    data.wait = true;
+    setTimeout(function() {
+        data.a += '!';
+        event.callback();
+    }, 1000);
 });
 
 p.emit('test', {a: 'hello world'}).then(function (data) {

diff --git a/server/plugininterface.js b/server/plugininterface.js
index e9ec2f95c794da642cb74faeabe926ef514334b1..9bfed5fa3f126701f57130cfcdce36ddb77e1a87 100644 (file)
--- a/server/plugininterface.js
+++ b/server/plugininterface.js
@@ -114,7 +114,14 @@ if (typeof module === 'object' && typeof module.exports !== 'undefined') {
 var p = new PluginInterface();
 p.on('test', function (event, data) {
     data.a += '!';
-    event.callback();
+});
+
+p.on('test', function (event, data) {
+    data.wait = true;
+    setTimeout(function() {
+        data.a += '!';
+        event.callback();
+    }, 1000);
 });
 
 p.emit('test', {a: 'hello world'}).then(function (data) {

diff --git a/server_modules/example.js b/server_modules/example.js
index a12f8ddb62b119de689b45502e2282d789e413a5..d880c1914423709e6d9dbcb469d2eeae5e328ce6 100644 (file)
--- a/server_modules/example.js
+++ b/server_modules/example.js
@@ -6,26 +6,22 @@ var module = new kiwiModules.Module('Example Module');
 // A web client is connected
 module.on('client created', function(event, data) {
     console.log('[client connection]', data);
-    event.callback();
 });
 
 
 // The Client recieves a IRC PRIVMSG command
 module.on('irc message', function(event, data) {
        console.log('[MESSAGE]', data.irc_event);
-    event.callback();
 });
 
 // The Client recieves a IRC USER NOTICE command
 module.on('irc user notice', function(event, data) {
        console.log('[NOTICE]', data.irc_event);
-    event.callback();
 });
 
 // The client recieves an IRC JOIN command
 module.on('irc channel join', function(event, data) {
        console.log('[JOIN]', data.irc_event);
-    event.callback();
 });
 
 
@@ -36,5 +32,4 @@ module.on('client command', function(event, data) {
 
        console.log('[CLIENT COMMAND]', client_method);
        console.log('    ', client_args);
-    event.callback();
 });

diff --git a/server_modules/stats.js b/server_modules/stats.js
index 6922c0fab9e4c2c595a74dbf49d389bc5a8987b5..736ba177a05a71d2a59ad32d8debd809f53962ee 100644 (file)
--- a/server_modules/stats.js
+++ b/server_modules/stats.js
@@ -22,11 +22,9 @@ module.on('stat counter', function (event, event_data) {
     ignored_events.push('http.request');
 
     if (ignored_events.indexOf(stat_name) > -1) {
-        return event.callback();
+        return;
     }
 
     timestamp = Math.floor((new Date()).getTime() / 1000);
     stats_file.write(timestamp.toString() + ' ' + stat_name + '\n');
-
-    event.callback();
 });