fix: Refactor addInvisible suffix to all channels.

src/Handlers/BioHandler.ts

@@ -10,7 +10,7 @@ export default class BioHandler extends DefaultHandler {
   public helpText = () => 'sets your profile bio. Add "global" in the beginning to change your global profile\'s bio.'
 
   public async onCommand (msg: PrivmsgMessage, words: string[]) {
-    const responseMessage = this.makeResponseMesage(msg) as BIO
+    const responseMessage = this.getNameAndIds(msg) as BIO
 
     // Filter bad words.
     const message = { ...msg }
@@ -32,10 +32,18 @@ export default class BioHandler extends DefaultHandler {
 
     if (bioText.length > 1) {
       if (bioText.length > 127) {
-        this.twitch.sendMessage(msg.channelName, msg.senderUsername, 'your bio is too long. 128 characters max.')
+        this.twitch.sendMessage(
+          responseMessage.channelTwitch,
+          responseMessage.userTwitch,
+          'your bio is too long. 128 characters max.',
+        )
         return
       } else if (bioText.length < 3) {
-        this.twitch.sendMessage(msg.channelName, msg.senderUsername, 'your bio is too long. 3 minimum characters.')
+        this.twitch.sendMessage(
+          responseMessage.channelTwitch,
+          responseMessage.userTwitch,
+          'your bio is too long. 3 minimum characters.',
+        )
         return
       }
     }
@@ -46,7 +54,7 @@ export default class BioHandler extends DefaultHandler {
   }
 
   public async onServerResponse ({ channelTwitch, userTwitch, result }: BASE) {
-    this.twitch.sendMessage(channelTwitch.name, userTwitch.name, String(result.value))
+    this.twitch.sendMessage(channelTwitch, userTwitch, String(result.value))
   }
 
   private escapeRegExp (text: string) {

src/Handlers/BotHandler.ts

@@ -12,9 +12,10 @@ export default class BotHandler extends DefaultHandler {
   }
 
   public async onCommand (msg: PrivmsgMessage) {
+    const responseMessage = this.getNameAndIds(msg)
     const message = `${String(this.twitch.packageJSON.description)} By N\u{E0000}otKarar. Version: ${String(this.twitch.packageJSON.version)}`
 
-    this.twitch.sendMessage(msg.channelName, msg.senderUsername, message)
+    this.twitch.sendMessage(responseMessage.channelTwitch, responseMessage.userTwitch, message)
   }
 
   // public onServerResponse (res) {}

src/Handlers/DailyHoroscopeHandler.ts

@@ -41,6 +41,8 @@ export default class DailyHoroscopeHandler extends DefaultHandler {
   private readonly horoscopesDirPath: string = path.join(os.homedir(), 'horoscopes')
 
   public async onCommand (msg: PrivmsgMessage, words: string[]) {
+    const responseMessage = this.getNameAndIds(msg)
+
     let horoscopeName = Sign.LE.toString()
 
     if (words[0] !== undefined) {
@@ -66,7 +68,11 @@ export default class DailyHoroscopeHandler extends DefaultHandler {
         if (response !== null) {
           fileContent = JSON.stringify(response)
         } else {
-          this.twitch.sendMessage(msg.channelName, msg.senderUsername, 'no horoscope today! Check back tomorrow?')
+          this.twitch.sendMessage(
+            responseMessage.channelTwitch,
+            responseMessage.userTwitch,
+            'no horoscope today! Check back tomorrow?',
+          )
           return
         }
       }
@@ -83,14 +89,18 @@ export default class DailyHoroscopeHandler extends DefaultHandler {
       if (response !== null) {
         horoscope = response
       } else {
-        this.twitch.sendMessage(msg.channelName, msg.senderUsername, 'no horoscope today! Check back tomorrow?')
+        this.twitch.sendMessage(
+          responseMessage.channelTwitch,
+          responseMessage.userTwitch,
+          'no horoscope today! Check back tomorrow?',
+        )
         return
       }
     }
 
     const message = `${horoscope.sign} horoscope for date ${horoscope.date}: ${horoscope.horoscope.split('. ')[0]}...`
 
-    this.twitch.sendMessage(msg.channelName, msg.senderUsername, message)
+    this.twitch.sendMessage(responseMessage.channelTwitch, responseMessage.userTwitch, message)
   }
 
   private async requestHoroscope (sign: string) {

src/Handlers/DefaultHandler.ts

@@ -21,7 +21,7 @@ export default class DefaultHandler {
     this.logger = logger
   }
 
-  public makeResponseMesage (msg: PrivmsgMessage): BASE {
+  public getNameAndIds (msg: PrivmsgMessage): BASE {
     return {
       userTwitch: {
         name: msg.senderUsername,

src/Handlers/EmotesHandler.ts

@@ -13,7 +13,7 @@ export default class EmotesHandler extends DefaultHandler {
   }
 
   public async onCommand (msg: PrivmsgMessage, words: string[]) {
-    const responseMessage = this.makeResponseMesage(msg) as EMOTES
+    const responseMessage = this.getNameAndIds(msg) as EMOTES
 
     // TODO: Add FFZ & BTTV emote detections.
 
@@ -36,6 +36,6 @@ export default class EmotesHandler extends DefaultHandler {
   }
 
   public async onServerResponse ({ channelTwitch, userTwitch, result }: BASE) {
-    this.twitch.sendMessage(channelTwitch.name, userTwitch.name, String(result.value))
+    this.twitch.sendMessage(channelTwitch, userTwitch, String(result.value))
   }
 }

src/Handlers/ErrorHandler.ts

@@ -9,7 +9,7 @@ export default class ErrorHandler extends DefaultHandler {
   // public async onCommand (msg: PrivmsgMessage) {}
 
   public async onServerResponse ({ channelTwitch, userTwitch, result }: BASE) {
-    this.twitch.sendMessage(channelTwitch.name, userTwitch.name, result.value)
+    this.twitch.sendMessage(channelTwitch, userTwitch, result.value)
 
     this.twitch.removeUserInstance({ userTwitch, channelTwitch })
   }

src/Handlers/HelpHandler.ts

@@ -8,6 +8,8 @@ export default class HelpHandler extends DefaultHandler {
   public helpText = () => 'rubber ducky 🦆 Never lucky.'
 
   public async onCommand (msg: PrivmsgMessage, words: string[]) {
+    const responseMessage = this.getNameAndIds(msg)
+
     const commands = this.twitch.handlers.filter(command => !command.adminOnly && command.prefix.length !== 0)
 
     let message: string = ''
@@ -24,7 +26,7 @@ export default class HelpHandler extends DefaultHandler {
     }
 
     if (message.length > 0) {
-      this.twitch.sendMessage(msg.channelName, msg.senderUsername, message)
+      this.twitch.sendMessage(responseMessage.channelTwitch, responseMessage.userTwitch, message)
     }
   }
 

src/Handlers/JoinChatHandler.ts

@@ -9,7 +9,7 @@ export default class JoinChannelHandler extends DefaultHandler {
   public adminOnly = true
 
   public async onCommand (msg: PrivmsgMessage, words: string[]) {
-    const responseMessage = this.makeResponseMesage(msg) as JOINCHAT
+    const responseMessage = this.getNameAndIds(msg) as JOINCHAT
 
     // Get user details for provided user.
     const res = await this.twitch.api.getUser(this.twitch.token.superSecret, [words[0]])
@@ -21,7 +21,11 @@ export default class JoinChannelHandler extends DefaultHandler {
 
       this.ws.sendMessage(MessageType.JOINCHAT, JSON.stringify(responseMessage))
     } else {
-      this.twitch.sendMessage(msg.channelName, msg.senderUsername, 'could not find that user on Twitch.')
+      this.twitch.sendMessage(
+        responseMessage.channelTwitch,
+        responseMessage.userTwitch,
+        'could not find that user on Twitch.',
+      )
     }
   }
 
@@ -40,8 +44,8 @@ export default class JoinChannelHandler extends DefaultHandler {
 
       // if (userTwitch.id.length > 0 && userTwitch.name.length > 0) {
       // this.twitch.sendMessage(
-      //   joinUserTwitch.name,
-      //   userTwitch.name,
+      //   joinUserTwitch,
+      //   userTwitch,
       //   `from channel @${channelTwitch.name}, has added this channel to the service!` +
       //   'BeFriendlier.app for more information.`,
       // )

src/Handlers/LeaveChatHandler.ts

@@ -10,7 +10,7 @@ export default class LeaveChannelHandler extends DefaultHandler {
 
   public async onCommand (msg: PrivmsgMessage, words: string[]) {
     // When the bot gets banned, the userTwitch's variables are empty.
-    const responseMessage = this.makeResponseMesage(msg) as LEAVECHAT
+    const responseMessage = this.getNameAndIds(msg) as LEAVECHAT
 
     // Get user details for provided user.
     const res = await this.twitch.api.getUser(this.twitch.token.superSecret, [words[0]])
@@ -22,16 +22,20 @@ export default class LeaveChannelHandler extends DefaultHandler {
 
       this.ws.sendMessage(MessageType.LEAVECHAT, JSON.stringify(responseMessage))
     } else {
-      this.twitch.sendMessage(msg.channelName, msg.senderUsername, 'could not find that user on Twitch.')
+      this.twitch.sendMessage(
+        responseMessage.channelTwitch,
+        responseMessage.userTwitch,
+        'could not find that user on Twitch.',
+      )
     }
   }
 
   public async onServerResponse ({ channelTwitch, userTwitch, leaveUserTwitch }: LEAVECHAT) {
     // When the bot gets banned, it doesn't need to announce that it's leaving, so userTwitch's variables are empty.
     if (userTwitch.name.length > 0 && userTwitch.id.length > 0) {
       this.twitch.sendMessage(
-        leaveUserTwitch.name,
-        userTwitch.name,
+        leaveUserTwitch,
+        userTwitch,
         `from channel @${channelTwitch.name}, has issued me to leave this channel. FeelsBadMan Good bye!`,
       )
     }

src/Handlers/MatchHandler.ts

@@ -10,7 +10,7 @@ export default class MatchHandler extends DefaultHandler {
   public helpText = () => 'attempts to match with the profile.'
 
   public async onCommand (msg: PrivmsgMessage) {
-    const responseMessage = this.makeResponseMesage(msg)
+    const responseMessage = this.getNameAndIds(msg)
 
     const foundUserRoll = this.twitch.getUserInstance(msg)
 
@@ -26,7 +26,7 @@ export default class MatchHandler extends DefaultHandler {
   }
 
   public async onServerResponse ({ channelTwitch, userTwitch, result }: BASE) {
-    this.twitch.sendMessage(channelTwitch.name, userTwitch.name, String(result.value))
+    this.twitch.sendMessage(channelTwitch, userTwitch, String(result.value))
 
     this.twitch.removeUserInstance({ channelTwitch, userTwitch })
   }

src/Handlers/MismatchHandler.ts

@@ -9,7 +9,7 @@ export default class MismatchHandler extends DefaultHandler {
   // public async onCommand (msg: PrivmsgMessage) {}
 
   public async onServerResponse ({ channelTwitch, userTwitch, result }: BASE) {
-    this.twitch.sendMessage(channelTwitch.name, userTwitch.name, String(result.value))
+    this.twitch.sendMessage(channelTwitch, userTwitch, String(result.value))
 
     this.twitch.removeUserInstance({ channelTwitch, userTwitch })
   }

src/Handlers/MoreHandler.ts

@@ -10,7 +10,7 @@ export default class MoreHandler extends DefaultHandler {
   public helpText = () => 'returns more information about the rolled profile.'
 
   public async onCommand (msg: PrivmsgMessage) {
-    const responseMessage = this.makeResponseMesage(msg) as ROLLMATCH
+    const responseMessage = this.getNameAndIds(msg) as ROLLMATCH
 
     const foundUserRoll = this.twitch.getUserInstance(msg)
 

src/Handlers/NoHandler.ts

@@ -10,7 +10,7 @@ export default class NoHandler extends DefaultHandler {
   public helpText = () => 'will add the rolled profile to your mismatches.'
 
   public async onCommand (msg: PrivmsgMessage) {
-    const responseMessage = this.makeResponseMesage(msg)
+    const responseMessage = this.getNameAndIds(msg)
 
     const foundUserRoll = this.twitch.getUserInstance(msg)
 

src/Handlers/PingHandler.ts

@@ -10,7 +10,7 @@ export default class PingHandler extends DefaultHandler {
   public helpText = () => 'returns ping info about Twitch IRC & Website.'
 
   public async onCommand (msg: PrivmsgMessage) {
-    const responseMessage = this.makeResponseMesage(msg)
+    const responseMessage = this.getNameAndIds(msg)
 
     const dateNow = Date.now()
     await this.twitch.ircClient.ping()
@@ -22,8 +22,8 @@ export default class PingHandler extends DefaultHandler {
   public async onServerResponse (data: BASE | undefined, res: { timestamp: number }) {
     if (data !== undefined) {
       this.twitch.sendMessage(
-        data.channelTwitch.name,
-        data.userTwitch.name,
+        data.channelTwitch,
+        data.userTwitch,
         `ping from Bot to Twitch: ~${String(data.result.pingFromBotToTwitch)} ms. ` +
         `Ping from Bot to Website roundabout: ~${String(Date.now() - res.timestamp)} ms.`,
       )

src/Handlers/RollMatchHandler.ts

@@ -13,7 +13,7 @@ export default class RollMatchHandler extends DefaultHandler {
   }
 
   public async onCommand (msg: PrivmsgMessage, words: string[]) {
-    const responseMessage = this.makeResponseMesage(msg) as ROLLMATCH
+    const responseMessage = this.getNameAndIds(msg) as ROLLMATCH
 
     let foundUserRoll = this.twitch.getUserInstance(msg)
 
@@ -42,6 +42,6 @@ export default class RollMatchHandler extends DefaultHandler {
         .replace('%prefix%', '@@')
     }
 
-    this.twitch.sendMessage(channelTwitch.name, userTwitch.name, String(result.value))
+    this.twitch.sendMessage(channelTwitch, userTwitch, String(result.value))
   }
 }

src/Handlers/SayHandler.ts

@@ -8,7 +8,9 @@ export default class SayHandler extends DefaultHandler {
   public adminOnly = true
 
   public async onCommand (msg: PrivmsgMessage, words: string[]) {
-    this.twitch.sendMessage(msg.channelName, msg.senderUsername, words.join(' '))
+    const responseMessage = this.getNameAndIds(msg)
+
+    this.twitch.sendMessage(responseMessage.channelTwitch, responseMessage.userTwitch, words.join(' '))
   }
 
   // public async onServerResponse () {}

src/Handlers/SuccessHandler.ts

@@ -13,22 +13,22 @@ export default class SuccessHandler extends DefaultHandler {
     if (result.matchUsername !== undefined) {
       // Send to this user.
       this.twitch./* TODO: whisper */sendMessage(
-        /** TODO. REMOVE */channelTwitch.name,
-        userTwitch.name,
+        /** TODO. REMOVE */channelTwitch,
+        userTwitch,
         String(result.value).replace('%s%', `@${String(result.matchUsername)}`),
       )
 
       // // Send to matched user.
       // this.twitch./* TODO: whisper */sendMessage(
-      //   /** TODO. REMOVE */channelTwitch.name,
-      //   result.matchUsername,
+      //   /** TODO. REMOVE */channelTwitch,
+      //   result,
       //   String(result.value).replace('%s%', `@${String(userTwitch.name)}`),
       // )
 
       this.twitch.removeUserInstance({ channelTwitch, userTwitch })
     } else {
       // This is a general acknowledgement message from the server.
-      this.twitch.sendMessage(channelTwitch.name, userTwitch.name, String(result.value))
+      this.twitch.sendMessage(channelTwitch, userTwitch, String(result.value))
     }
   }
 }

src/Handlers/TakeABreakHandler.ts

@@ -10,8 +10,8 @@ export default class TakeABreakHandler extends DefaultHandler {
 
   public async onServerResponse ({ channelTwitch, userTwitch, result }: BASE) {
     this.twitch.sendMessage(
-      channelTwitch.name,
-      userTwitch.name,
+      channelTwitch,
+      userTwitch,
       result !== undefined && result.value.length > 0
         ? result.value : 'take a break! You\'re currently on a cooldown period.',
     )

src/Handlers/UnmatchHandler.ts

@@ -12,7 +12,7 @@ export default class UnmatchHandler extends DefaultHandler {
   }
 
   public async onCommand (msg: PrivmsgMessage, words: string[]) {
-    const responseMessage = this.makeResponseMesage(msg) as UNMATCH
+    const responseMessage = this.getNameAndIds(msg) as UNMATCH
 
     // Get user details for provided user.
     const res = await this.twitch.api.getUser(this.twitch.token.superSecret, [words[0]])
@@ -24,11 +24,15 @@ export default class UnmatchHandler extends DefaultHandler {
 
       this.ws.sendMessage(MessageType.UNMATCH, JSON.stringify(responseMessage))
     } else {
-      this.twitch.sendMessage(msg.channelName, msg.senderUsername, 'could not find that user on Twitch.')
+      this.twitch.sendMessage(
+        responseMessage.channelTwitch,
+        responseMessage.userTwitch,
+        'could not find that user on Twitch.',
+      )
     }
   }
 
   public async onServerResponse ({ channelTwitch, userTwitch, result }: UNMATCH) {
-    this.twitch.sendMessage(channelTwitch.name, userTwitch.name, String(result.value))
+    this.twitch.sendMessage(channelTwitch, userTwitch, String(result.value))
   }
 }

src/Handlers/UnregisteredHandler.ts

@@ -9,11 +9,7 @@ export default class UnregisteredHandler extends DefaultHandler {
   // public async onCommand (msg: PrivmsgMessage) {}
 
   public async onServerResponse ({ channelTwitch, userTwitch }: BASE) {
-    this.twitch.sendMessage(
-      channelTwitch.name,
-      userTwitch.name,
-      'you\'re not registered! Browse to the website to register.',
-    )
+    this.twitch.sendMessage(channelTwitch, userTwitch, 'you\'re not registered! Browse to the website to register.')
 
     this.twitch.removeUserInstance({ channelTwitch, userTwitch })
   }