Skip to content

Commit

Permalink
lib/message: Fix incorrect sender username pass for parse process
Browse files Browse the repository at this point in the history
  • Loading branch information
sogehige committed Apr 14, 2018
1 parent ea09f9a commit e7ef446
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions libs/message.js
Expand Up @@ -161,7 +161,7 @@ class Message {
.replace(/\(|\)/g, '')
.replace(/\$sender/g, (global.configuration.getValue('atUsername') ? '@' : '') + attr.sender)
.replace(/\$param/g, attr.param)
process.send({ type: 'parse', sender: attr.sender, message: cmd, skip: true, quiet: true })
process.send({ type: 'parse', sender: { username: attr.sender }, message: cmd, skip: true, quiet: true })
return ''
},
'(!#)': async function (filter) {
Expand All @@ -170,7 +170,7 @@ class Message {
.replace(/\(|\)/g, '')
.replace(/\$sender/g, (global.configuration.getValue('atUsername') ? '@' : '') + attr.sender)
.replace(/\$param/g, attr.param)
process.send({ type: 'parse', sender: attr.sender, message: cmd, skip: true, quiet: false })
process.send({ type: 'parse', sender: { username: attr.sender }, message: cmd, skip: true, quiet: false })
return ''
}
}
Expand Down Expand Up @@ -268,14 +268,14 @@ class Message {
let user = await global.db.engine.find('users', { username: viewer.username, is: { ubscriber: true } })
if (!_.isEmpty(user)) onlineSubscribers.push(user.username)
}
onlineSubscribers = _.filter(onlineSubscribers, function (o) { return o !== attr.sender.username })
onlineSubscribers = _.filter(onlineSubscribers, function (o) { return o !== attr.sender })

let onlineFollowers = []
for (let viewer of onlineViewers) {
let user = await global.db.engine.find('users', { username: viewer.username, is: { follower: true } })
if (!_.isEmpty(user)) onlineFollowers.push(user.username)
}
onlineFollowers = _.filter(onlineFollowers, function (o) { return o !== attr.sender.username })
onlineFollowers = _.filter(onlineFollowers, function (o) { return o !== attr.sender })

let randomVar = {
online: {
Expand Down

0 comments on commit e7ef446

Please sign in to comment.