supernets/hardlounge
supernets/hardlounge
4
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1527 from dgw/kick-modes

Browse Source 
Display correct kick modes
This commit is contained in:
Pavel Djundik 2017-09-14 10:46:35 +03:00 committed by GitHub
commit 9e008a76b7
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/views/actions/kick.tpl
View File

@ -1,6 +1,6 @@
{{> ../user_name nick=from}} {{> ../user_name nick=from.nick mode=from.mode}}
has kicked has kicked
{{> ../user_name nick=target mode=""}} {{> ../user_name nick=target.nick mode=target.mode}}
{{#if text}} {{#if text}}
<i class="part-reason">({{{parse text}}})</i> <i class="part-reason">({{{parse text}}})</i>
{{/if}} {{/if}}

10
src/plugins/irc-events/kick.js
View File

@ -11,12 +11,13 @@ module.exports = function(irc, network) {
return; return;
} }
const user = chan.findUser(data.kicked); const kicker = chan.findUser(data.nick);
const target = chan.findUser(data.kicked);
if (data.kicked === irc.user.nick) { if (data.kicked === irc.user.nick) {
chan.users = []; chan.users = [];
} else { } else {
chan.users = _.without(chan.users, user); chan.users = _.without(chan.users, target);
} }
client.emit("users", { client.emit("users", {
@ -26,9 +27,8 @@ module.exports = function(irc, network) {
var msg = new Msg({ var msg = new Msg({
type: Msg.Type.KICK, type: Msg.Type.KICK,
time: data.time, time: data.time,
mode: user.mode, from: kicker,
from: data.nick, target: target,
target: data.kicked,
text: data.message || "", text: data.message || "",
highlight: data.kicked === irc.user.nick, highlight: data.kicked === irc.user.nick,
self: data.nick === irc.user.nick self: data.nick === irc.user.nick