Skip to content

Commit

Permalink
tmi: fix incorrect username for events
Browse files Browse the repository at this point in the history
Fixes: #1467
PR #1468
  • Loading branch information
sogehige committed Oct 13, 2018
1 parent 2917910 commit 519b470
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions src/bot/tmi.js
Expand Up @@ -282,7 +282,7 @@ class TMI extends Core {

async resub (message: Object) {
try {
const username = message.tags.username
const username = message.tags.login
const method = this.getMethod(message)
const months = Number(message.parameters.months)
const userstate = message.tags
Expand Down Expand Up @@ -310,7 +310,7 @@ class TMI extends Core {

async subscriptionGiftCommunity (message: Object) {
try {
const username = message.tags.username
const username = message.tags.login
const count = Number(message.parameters.senderCount)
// const plan = message.parameters.subPlan

Expand All @@ -330,7 +330,7 @@ class TMI extends Core {

async subgift (message: Object) {
try {
const username = message.tags.username
const username = message.tags.login
const months = Number(message.parameters.months)
const recipient = message.parameters.recipientName.toLowerCase()

Expand Down Expand Up @@ -373,16 +373,17 @@ class TMI extends Core {

async cheer (message: Object) {
try {
const username = message.tags.login
const userstate = message.tags
// remove cheerX or channelCheerX from message
const messageFromUser = message.message.replace(/(.*?[cC]heer[\d]+)/g, '').trim()

if (await global.commons.isIgnored(userstate.username)) return

global.overlays.eventlist.add({ type: 'cheer', username: userstate.username.toLowerCase(), bits: userstate.bits, message: messageFromUser })
global.log.cheer(`${userstate.username.toLowerCase()}, bits: ${userstate.bits}, message: ${messageFromUser}`)
global.db.engine.insert('users.bits', { id: await global.users.getIdByName(userstate.username.toLowerCase()), amount: userstate.bits, message: messageFromUser, timestamp: _.now() })
global.events.fire('cheer', { username: userstate.username.toLowerCase(), bits: userstate.bits, message: messageFromUser })
global.overlays.eventlist.add({ type: 'cheer', username, bits: userstate.bits, message: messageFromUser })
global.log.cheer(`${username}, bits: ${userstate.bits}, message: ${messageFromUser}`)
global.db.engine.insert('users.bits', { id: await global.users.getIdByName(username), amount: userstate.bits, message: messageFromUser, timestamp: _.now() })
global.events.fire('cheer', { username, bits: userstate.bits, message: messageFromUser })
if (await global.cache.isOnline()) await global.db.engine.increment('api.current', { key: 'bits' }, { value: parseInt(userstate.bits, 10) })
} catch (e) {
global.log.error('Error parsing cheer event')
Expand Down

0 comments on commit 519b470

Please sign in to comment.