deblan-mirror/thelounge
deblan-mirror/thelounge
1
0
Fork 0
mirror of https://github.com/thelounge/thelounge.git synced 2024-06-07 16:22:18 +02:00
Code Issues 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
parent 676cc01203 e4c6d78762
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
{{> ../user_name nick=target mode=""}}
{{> ../user_name nick=target.nick mode=target.mode}}
{{#if text}}
<i class="part-reason">({{{parse text}}})</i>
{{/if}}

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

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