fix: Add a check for no entered emotes.

KararTY · Jul 31, 2021 · fcaa7da · fcaa7da
1 parent e63560e
commit fcaa7da
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -44,7 +44,7 @@
     "@adonisjs/env": "^1.0.18",
     "@adonisjs/logger": "^2.1.0",
     "@adonisjs/validator": "^7.4.0",
-    "befriendlier-shared": "kararty/BeFriendlier-Shared#0fc51b5",
+    "befriendlier-shared": "kararty/BeFriendlier-Shared#b4c9e83",
     "dank-twitch-irc": "^4.3.0",
     "got": "^11.8.2",
     "p-queue": "^6.6.2",

diff --git a/src/Handlers/GiveEmotesHandler.ts b/src/Handlers/GiveEmotesHandler.ts
@@ -15,6 +15,7 @@ export default class GiveEmotesHandler extends DefaultHandler {
 
     // Get user details for provided user.
     const res = await this.twitch.api.getUser(this.twitch.token.superSecret, [words[0]])
+
     if (res !== null && res.length > 0) {
       responseMessage.recipientUserTwitch = {
         id: res[0].id,
@@ -27,6 +28,10 @@ export default class GiveEmotesHandler extends DefaultHandler {
 
       responseMessage.emotes = this.parseEmotes(msg, words.slice(1))
 
+      if (responseMessage.emotes.length === 0) {
+        return this.twitch.sendMessage(responseMessage.channelTwitch, responseMessage.userTwitch, messagesText.noEmotes)
+      }
+
       this.ws.sendMessage(this.messageType, JSON.stringify(responseMessage))
     } else {
       this.twitch.sendMessage(

diff --git a/src/messagesText.ts b/src/messagesText.ts
@@ -7,6 +7,7 @@ const messagesText = {
   unregistered: 'you\'re not registered! Browse to the website to register.',
   noHoroscope: 'no horoscope today! Check back tomorrow?',
   sameUser: 'recipient user is the same user as you.',
+  noEmotes: 'you\'ve not entered any Twitch emotes in your message.',
   helpText: {
     help: 'rubber ducky 🦆 Never lucky.',
     emotes: 'sets your favorite emotes for your profile. Add "global" in the beginning to change your global profile\'s bio.',
@@ -20,7 +21,7 @@ const messagesText = {
     ping: 'returns ping info about Twitch IRC & Website.',
     rollMatch: 'initiates a match! Good luck, rubber ducky 🦆 Append "global" to initiate a match with global profiles.',
     unmatch: 'unmatches with the provided user. Append "global" to unmatch with a user in your global profile.',
-    giveEmotes: 'lets you trade your emotes with another befriendlier user.',
+    giveEmotes: 'lets you trade your emotes with another befriendlier user. (<recipient name> <amount> <emote name>)',
   },
 }