tmi: fix is moderator checking

sogebot · Feb 6, 2019 · 7cdf998 · 7cdf998
1 parent f127259
commit 7cdf998
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/bot/commons.js b/src/bot/commons.js
@@ -216,8 +216,7 @@ Commons.prototype.isBroadcaster = function (user) {
 Commons.prototype.isMod = async function (user) {
   try {
     if (_.isString(user)) user = await global.users.getByName(user)
-    else if (_.isNil(user.isModerator)) user = await global.users.getByName(user.username)
-    else user = { is: { mod: user.isModerator } }
+    else user = { is: { mod: typeof user.badges.moderator !== 'undefined' } }
     return !_.isNil(user.is.mod) ? user.is.mod : false
   } catch (e) {
     return false

diff --git a/src/bot/tmi.js b/src/bot/tmi.js
@@ -193,11 +193,11 @@ class TMI extends Core {
 
       this.client[type].chat.on('MODE', async (message) => {
         const user = await global.users.getByName(message.username)
-        if (!user.is.mod && message.isModerator) global.events.fire('mod', { username: message.username })
+        if (!user.is.mod && typeof message.badges.moderator !== 'undefined') global.events.fire('mod', { username: message.username })
         if (!user.id) { user.id = await global.api.getIdFromTwitch(message.username) }
-        global.users.set(message.username, { id: user.id, is: { mod: message.isModerator } })
+        global.users.set(message.username, { id: user.id, is: { mod: typeof message.badges.moderator !== 'undefined' } })
 
-        if (message.username === global.oauth.settings.bot.username) global.status.MOD = message.isModerator
+        if (message.username === global.oauth.settings.bot.username) global.status.MOD = typeof message.badges.moderator !== 'undefined'
       })
 
       this.client[type].chat.on('USERNOTICE', message => {