Merge pull request #4260 from BradleyShaw/snotice-channel
Display server-originated notices to channels in the channel window
This commit is contained in:
commit
aa310fe877
@ -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 {
|
||||
|
Loading…
Reference in New Issue
Block a user