From 94016cd4c7045cbd1b896f6b42b166f881942e1f Mon Sep 17 00:00:00 2001 From: Darren Date: Sun, 2 Sep 2012 19:51:53 +0100 Subject: [PATCH] Displaying kick actions --- client_backbone/dev/model_application.js | 26 ++++++++++++++++++++++++ client_backbone/dev/model_channel.js | 2 ++ client_backbone/style.css | 3 ++- 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/client_backbone/dev/model_application.js b/client_backbone/dev/model_application.js index 71ad828..7eadae3 100644 --- a/client_backbone/dev/model_application.js +++ b/client_backbone/dev/model_application.js @@ -143,6 +143,32 @@ kiwi.model.Application = Backbone.Model.extend(new (function () { }); + gw.on('onkick', function (event) { + var channel, members, user, + part_options = {}; + + part_options.type = 'kick'; + part_options.by = event.nick; + part_options.message = event.message || ''; + + channel = that.panels.getByName(event.channel); + if (!channel) return; + + members = channel.get('members'); + if (!members) return; + + user = members.getByNick(event.kicked); + if (!user) return; + + members.remove(user, part_options); + + if (event.kicked === kiwi.gateway.get('nick')) { + members.reset([]); + } + + }); + + gw.on('onmsg', function (event) { var panel, is_pm = (event.channel == kiwi.gateway.get('nick')); diff --git a/client_backbone/dev/model_channel.js b/client_backbone/dev/model_channel.js index 3104508..310e13c 100644 --- a/client_backbone/dev/model_channel.js +++ b/client_backbone/dev/model_channel.js @@ -23,6 +23,8 @@ kiwi.model.Channel = kiwi.model.Panel.extend({ if (options.type === 'quit') { this.addMsg(' ', '<-- ' + member.displayNick(true) + ' has quit ' + msg, 'action quit'); + } else if(options.type === 'kick') { + this.addMsg(' ', '<-- ' + member.displayNick(true) + ' was kicked by ' + options.by + ' ' + msg, 'action kick'); } else { this.addMsg(' ', '<-- ' + member.displayNick(true) + ' has left ' + msg, 'action part'); } diff --git a/client_backbone/style.css b/client_backbone/style.css index 1125b0b..76acb74 100644 --- a/client_backbone/style.css +++ b/client_backbone/style.css @@ -93,10 +93,11 @@ body { .messages .msg .text { margin-left:15em; white-space:pre-wrap; word-wrap:break-word; font-family:monospace; } .messages .msg.action .nick { display:none; } -.messages .msg.action .text { margin-left:9em; } +.messages .msg.action .text { margin-left:9em; color:#009900; font-style:italic; } .messages .msg.action.join { color:#009900; } .messages .msg.action.part .text { color:#900; } .messages .msg.action.quit .text { color:#900; } +.messages .msg.action.kick .text { color:#900; } .messages .msg.status .nick { display:none; } .messages .msg.status .text { color:#990000; margin-left:9em; font-weight:bold; } .messages .msg.topic .nick { display:none; } -- 2.25.1