deblan-mirror/thelounge
deblan-mirror/thelounge
1
0
Fork 0
mirror of https://github.com/thelounge/thelounge.git synced 2024-06-21 06:55:12 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1476 from eliemichel/pr-part-other

Browse source 
Take an optional argument in /part
This commit is contained in:
Pavel Djundik 2017-09-14 09:20:44 +03:00 committed by GitHub
parent 376e7a60fb f26c2dad0f
commit 4431616822
2 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
client/index.html
View file

@ -787,10 +787,13 @@
<div class="help-item">
<div class="subject">
<code>/part</code>
<code>/part [channel]</code>
</div>
<div class="description">
<p>Close the current channel or private message window.</p>
<p>
Close the specified channel or private message window, or the
current channel if <code>channel</code> is ommitted.
</p>
<p>Aliases: <code>/close</code>, <code>/leave</code></p>
</div>
</div>

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

@ -9,7 +9,17 @@ exports.commands = ["close", "leave", "part"];
exports.allowDisconnected = true;
exports.input = function(network, chan, cmd, args) {
if (chan.type === Chan.Type.LOBBY) {
let target = args.length === 0 ? chan : _.find(network.channels, {name: args[0]});
let partMessage = args.length <= 1 ? Helper.config.leaveMessage : args.slice(1).join(" ");
if (typeof target === "undefined") {
// In this case, we assume that the word args[0] is part of the leave
// message and we part the current chan.
target = chan;
partMessage = args.join(" ");
}
if (target.type === Chan.Type.LOBBY) {
chan.pushMessage(this, new Msg({
type: Msg.Type.ERROR,
text: "You can not part from networks, use /quit instead."
@ -17,18 +27,17 @@ exports.input = function(network, chan, cmd, args) {
return;
}
network.channels = _.without(network.channels, chan);
chan.destroy();
network.channels = _.without(network.channels, target);
target.destroy();
this.emit("part", {
chan: chan.id
chan: target.id
});
if (chan.type === Chan.Type.CHANNEL) {
if (target.type === Chan.Type.CHANNEL) {
this.save();
if (network.irc) {
const partMessage = args[0] ? args.join(" ") : Helper.config.leaveMessage;
network.irc.part(chan.name, partMessage);
network.irc.part(target.name, partMessage);
}
}