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 #2550 from thelounge/xpaw/notice-log

Browse source 
Log notices as correct sender when it will be shown in active window
This commit is contained in:
Jérémie Astori 2018-06-12 19:19:21 -04:00 committed by GitHub
parent 2640027bd8 5dced897d8
commit 4d17cfb715
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/models/chan.js
View file

@ -3,6 +3,7 @@
const _ = require("lodash");
const Helper = require("../helper");
const User = require("./user");
const Msg = require("./msg");
const storage = require("../plugins/storage");
module.exports = Chan;
@ -185,9 +186,19 @@ Chan.prototype.writeUserLog = function(client, msg) {
return;
}
let targetChannel = this;
// Is this particular message or channel loggable
if (!msg.isLoggable() || !this.isLoggable()) {
return;
// Because notices are nasty and can be shown in active channel on the client
// if there is no open query, we want to always log notices in the sender's name
if (msg.type === Msg.Type.NOTICE && msg.showInActive) {
targetChannel = {
name: msg.from.nick,
};
} else {
return;
}
}
// Find the parent network where this channel is in
@ -198,7 +209,7 @@ Chan.prototype.writeUserLog = function(client, msg) {
}
for (const messageStorage of client.messageStorage) {
messageStorage.index(target.network, this, msg);
messageStorage.index(target.network, targetChannel, msg);
}
};