[ISSUE 250] Showing message when user is kicked or kick

diff --git a/client/assets/src/models/channel.js b/client/assets/src/models/channel.js
index 8e90c83ceb3da891f4d6313a3b8b15e68383ca94..5c7cb5f6d8520e1c0089768e4d96994022238509 100644 (file)
--- a/client/assets/src/models/channel.js
+++ b/client/assets/src/models/channel.js
@@ -27,19 +27,30 @@ _kiwi.model.Channel = _kiwi.model.Panel.extend({
 \r
         members.bind("remove", function (member, members, options) {\r
             var show_message = _kiwi.global.settings.get('show_joins_parts');\r
-            if (show_message === false) {\r
-                return;\r
-            }\r
+\r
 \r
             var msg = (options.message) ? '(' + options.message + ')' : '';\r
 \r
             if (options.type === 'quit') {\r
-                this.addMsg(' ', '== ' + member.displayNick(true) + ' has quit ' + msg, 'action quit');\r
+                \r
+              this.addMsg(' ', '== ' + member.displayNick(true) + ' has quit ' + msg, 'action quit');\r
+\r
             } else if(options.type === 'kick') {\r
-                this.addMsg(' ', '== ' + member.displayNick(true) + ' was kicked by ' + options.by + ' ' + msg, 'action kick');\r
+               \r
+              if (!options.kicked) {\r
+              \r
+                if (show_message || options.kicker) { \r
+                  this.addMsg(' ', '== ' + member.displayNick(true) + ' was kicked by ' + options.by + ' ' + msg, 'action kick');\r
+                \r
+                }\r
+                \r
+              } else {\r
+                this.addMsg(' ', '=== You have been kicked by ' + options.by + ' '+msg, 'action kick');\r
+              }\r
+            \r
             } else {\r
                 this.addMsg(' ', '== ' + member.displayNick(true) + ' has left ' + msg, 'action part');\r
             }\r
         }, this);\r
     }\r
-});
\ No newline at end of file
+});\r

diff --git a/client/assets/src/models/network.js b/client/assets/src/models/network.js
index 92f49a527089da1f6089feb24922ed5c82f1d254..a2330f8a75b4661fd8558c52003a68228380c9df 100644 (file)
--- a/client/assets/src/models/network.js
+++ b/client/assets/src/models/network.js
@@ -279,6 +279,8 @@
         part_options.type = 'kick';
         part_options.by = event.nick;
         part_options.message = event.message || '';
+        part_options.kicked = (event.kicked == this.get('nick'))
+        part_options.kicker = (event.nick == this.get('nick'))
 
         channel = this.panels.getByName(event.channel);
         if (!channel) return;
@@ -289,10 +291,11 @@
         user = members.getByNick(event.kicked);
         if (!user) return;
 
+
         members.remove(user, part_options);
 
-        if (event.kicked === this.get('nick')) {
-            members.reset([]);
+        if (part_options.kicked) {
+            members.reset([]);        
         }
     }
 
@@ -698,4 +701,4 @@
     }
 }
 
-)();
\ No newline at end of file
+)();