deblan-mirror/thelounge
deblan-mirror/thelounge
1
0
Fork 0
mirror of https://github.com/thelounge/thelounge.git synced 2024-06-19 22:15:10 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3808 from thelounge/xpaw/fix-part

Browse source 
Fix up first argument not being used as part message
This commit is contained in:
Pavel Djundik 2020-03-16 20:29:46 +02:00 committed by GitHub
parent 52002c3e22 424bc4f7df
commit a9d2b30d96
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/plugins/inputs/part.js
View file

@ -9,14 +9,16 @@ exports.commands = ["close", "leave", "part"];
exports.allowDisconnected = true; exports.allowDisconnected = true;
exports.input = function(network, chan, cmd, args) { exports.input = function(network, chan, cmd, args) {
let target = args.length === 0 ? chan : _.find(network.channels, {name: args[0]}); let target = chan;
let partMessage = args.length <= 1 ? Helper.config.leaveMessage : args.slice(1).join(" ");
if (typeof target === "undefined") { if (args.length > 0) {
// In this case, we assume that the word args[0] is part of the leave const newTarget = network.getChannel(args[0]);
// message and we part the current chan.
target = chan; if (typeof newTarget !== "undefined") {
partMessage = args.join(" "); // If first argument is a channel user is in, part that channel
target = newTarget;
args.shift();
}
} }
if (target.type === Chan.Type.LOBBY) { if (target.type === Chan.Type.LOBBY) {
@ -46,6 +48,7 @@ exports.input = function(network, chan, cmd, args) {
}); });
this.save(); this.save();
} else { } else {
const partMessage = args.join(" ") || Helper.config.leaveMessage;
network.irc.part(target.name, partMessage); network.irc.part(target.name, partMessage);
} }