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

Merge pull request #4260 from BradleyShaw/snotice-channel

Browse source 
Display server-originated notices to channels in the channel window
This commit is contained in:
Max Leiter 2021-06-22 00:30:42 -07:00 committed by GitHub
parent a046bfe8d1 38c0c343c3
commit aa310fe877
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/plugins/irc-events/message.js
View file

@ -51,8 +51,13 @@ module.exports = function (irc, network) {
return Helper.compareHostmask(entry, data);
});
// Server messages go to server window, no questions asked
if (data.from_server) {
// Server messages that aren't targeted at a channel go to the server window
if (
data.from_server &&
(!data.target ||
!network.getChannel(data.target) ||
network.getChannel(data.target).type !== Chan.Type.CHANNEL)
) {
chan = network.channels[0];
from = chan.getUser(data.nick);
} else {