diff --git a/defaults/config.js b/defaults/config.js index 3c863917..e3e728eb 100644 --- a/defaults/config.js +++ b/defaults/config.js @@ -316,6 +316,14 @@ module.exports = { ca: "" }, + // + // Default quit and part message if none is provided. + // + // @type string + // @default "The Lounge - https://thelounge.github.io" + // + leaveMessage: "The Lounge - https://thelounge.github.io", + // // Run The Lounge with identd support. // diff --git a/src/client.js b/src/client.js index 9acce727..ef3f5ce2 100644 --- a/src/client.js +++ b/src/client.js @@ -501,7 +501,7 @@ Client.prototype.quit = function() { } this.networks.forEach((network) => { if (network.irc) { - network.irc.quit("Page closed"); + network.irc.quit(Helper.config.leaveMessage); } network.destroy(); diff --git a/src/plugins/inputs/disconnect.js b/src/plugins/inputs/disconnect.js index bd43e40d..5c414884 100644 --- a/src/plugins/inputs/disconnect.js +++ b/src/plugins/inputs/disconnect.js @@ -1,9 +1,11 @@ "use strict"; +const Helper = require("../../helper"); + exports.commands = ["disconnect"]; exports.input = function(network, chan, cmd, args) { - var quitMessage = args[0] ? args.join(" ") : ""; + var quitMessage = args[0] ? args.join(" ") : Helper.config.leaveMessage; network.irc.quit(quitMessage); }; diff --git a/src/plugins/inputs/part.js b/src/plugins/inputs/part.js index 1dd11906..88a46563 100644 --- a/src/plugins/inputs/part.js +++ b/src/plugins/inputs/part.js @@ -3,6 +3,7 @@ var _ = require("lodash"); var Msg = require("../../models/msg"); var Chan = require("../../models/chan"); +const Helper = require("../../helper"); exports.commands = ["close", "leave", "part"]; exports.allowDisconnected = true; @@ -26,7 +27,8 @@ exports.input = function(network, chan, cmd, args) { this.save(); if (network.irc) { - network.irc.part(chan.name, args.join(" ")); + const partMessage = args[0] ? args.join(" ") : Helper.config.leaveMessage; + network.irc.part(chan.name, partMessage); } } diff --git a/src/plugins/inputs/quit.js b/src/plugins/inputs/quit.js index 50594037..8ef2950f 100644 --- a/src/plugins/inputs/quit.js +++ b/src/plugins/inputs/quit.js @@ -1,14 +1,13 @@ "use strict"; var _ = require("lodash"); +const Helper = require("../../helper"); exports.commands = ["quit"]; exports.allowDisconnected = true; exports.input = function(network, chan, cmd, args) { var client = this; - var irc = network.irc; - var quitMessage = args[0] ? args.join(" ") : ""; client.networks = _.without(client.networks, network); network.destroy(); @@ -17,8 +16,9 @@ exports.input = function(network, chan, cmd, args) { network: network.id }); - if (irc) { - irc.quit(quitMessage); + if (network.irc) { + const quitMessage = args[0] ? args.join(" ") : Helper.config.leaveMessage; + network.irc.quit(quitMessage); } return true;