supernets/hardlounge
supernets/hardlounge
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1859 from thelounge/xpaw/msg-user

Browse Source 
Fix possible issues with `from` in messages
This commit is contained in:
Jérémie Astori 2017-12-19 19:30:52 -05:00 committed by GitHub
commit 70f3d7d6cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/irc-events/message.js
View File

@ -38,11 +38,13 @@ module.exports = function(irc, network) {
function handleMessage(data) { function handleMessage(data) {
let chan; let chan;
const from = chan.getUser(data.nick);
const msg = new Msg({ const msg = new Msg({
type: data.type, type: data.type,
time: data.time, time: data.time,
text: data.message, text: data.message,
self: data.nick === irc.user.nick, self: data.nick === irc.user.nick,
from: from,
highlight: false, highlight: false,
users: [], users: [],
}); });
@ -50,7 +52,6 @@ module.exports = function(irc, network) {
// Server messages go to server window, no questions asked // Server messages go to server window, no questions asked
if (data.from_server) { if (data.from_server) {
chan = network.channels[0]; chan = network.channels[0];
msg.from = chan.getUser(data.nick);
} else { } else {
let target = data.target; let target = data.target;
@ -79,13 +80,11 @@ module.exports = function(irc, network) {
} }
} }
msg.from = chan.getUser(data.nick);
// Query messages (unless self) always highlight // Query messages (unless self) always highlight
if (chan.type === Chan.Type.QUERY) { if (chan.type === Chan.Type.QUERY) {
msg.highlight = !msg.self; msg.highlight = !msg.self;
} else if (chan.type === Chan.Type.CHANNEL) { } else if (chan.type === Chan.Type.CHANNEL) {
msg.from.lastMessage = data.time || Date.now(); from.lastMessage = data.time || Date.now();
} }
} }