CTCP request renamed to is_request

diff --git a/client/src/models/gateway.js b/client/src/models/gateway.js
index 7f9d641326a41560c676f4eff483b9a1cf0bb61b..023a08fd84c08aeef0c68a9f3a565c3a2b386228 100644 (file)
--- a/client/src/models/gateway.js
+++ b/client/src/models/gateway.js
@@ -277,9 +277,9 @@ _kiwi.model.Gateway = function () {
     *   @param  {String}    params      Additional paramaters\r
     *   @param  {Function}  callback    A callback function\r
     */\r
-    this.ctcp = function (connection_id, request, type, target, params, callback) {\r
+    this.ctcp = function (connection_id, is_request, type, target, params, callback) {\r
         var args = {\r
-            request: request,\r
+            is_request: is_request,\r
             type: type,\r
             target: target,\r
             params: params\r
@@ -288,6 +288,13 @@ _kiwi.model.Gateway = function () {
         this.rpcCall('irc.ctcp', connection_id, args, callback);\r
     };\r
 \r
+    this.ctcpRequest = function (connection_id, type, target, params, callback) {\r
+        this.ctcp(connection_id, true, type, target, params, callback);\r
+    };\r
+    this.ctcpResponse = function (connection_id, type, target, params, callback) {\r
+        this.ctcp(connection_id, false, type, target, params, callback);\r
+    };\r
+\r
     /**\r
     *   @param  {String}    target      The target of the message (e.g. a channel or nick)\r
     *   @param  {String}    msg         The message to send\r

diff --git a/server/clientcommands.js b/server/clientcommands.js
index e7936ae8590f942b4454acbb25bc34a21df0831c..1eea2eef1a3d6cdde519204ca468452c3a95d941 100644 (file)
--- a/server/clientcommands.js
+++ b/server/clientcommands.js
@@ -122,7 +122,7 @@ var listeners = {
 \r
     ctcp: function (irc_connection, callback, args) {\r
         if ((args.target) && (args.type)) {\r
-            if (args.request) {\r
+            if (args.is_request) {\r
                 irc_connection.write('PRIVMSG ' + args.target + ' :' + String.fromCharCode(1) + args.type.toUpperCase() + ' ' + args.params + String.fromCharCode(1), callback);\r
             } else {\r
                 irc_connection.write('NOTICE ' + args.target + ' :' + String.fromCharCode(1) + args.type.toUpperCase() + ' ' + args.params + String.fromCharCode(1), callback);\r