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

Merge pull request #3079 from thelounge/xpaw/error-unhandled-target

Browse source 
Put channel errors and unhandled numerics to relevant channel if it exists
This commit is contained in:
Jérémie Astori 2019-02-26 01:34:25 -05:00 committed by GitHub
parent 5b8b6b714a 4d9c01deea
commit d0421a2541
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/plugins/irc-events/error.js
View file

@ -21,13 +21,26 @@ module.exports = function(irc, network) {
text += data.error;
}
const lobby = network.channels[0];
const msg = new Msg({
type: Msg.Type.ERROR,
text: text,
showInActive: true,
});
lobby.pushMessage(client, msg, true);
let target = network.channels[0];
// If this error is channel specific and a channel
// with this name exists, put this error in that channel
if (data.channel) {
const channel = network.getChannel(data.channel);
if (typeof channel !== "undefined") {
target = channel;
msg.showInActive = false;
}
}
target.pushMessage(client, msg, true);
});
irc.on("nick in use", function(data) {

12
src/plugins/irc-events/unhandled.js
View file

@ -6,12 +6,22 @@ module.exports = function(irc, network) {
const client = this;
irc.on("unknown command", function(command) {
let target = network.channels[0];
// Do not display users own name
if (command.params[0] === network.irc.user.nick) {
command.params.shift();
} else {
// If this numeric starts with a channel name that exists
// put this message in that channel
const channel = network.getChannel(command.params[0]);
if (typeof channel !== "undefined") {
target = channel;
}
}
network.channels[0].pushMessage(client, new Msg({
target.pushMessage(client, new Msg({
type: Msg.Type.UNHANDLED,
command: command.command,
params: command.params,