fix: Properly parse %prefix% & %s%.

KararTY · Aug 11, 2020 · a0d6c66 · a0d6c66
1 parent 55a2274
commit a0d6c66
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/Handlers/RollMatchHandler.ts b/src/Handlers/RollMatchHandler.ts
@@ -1,4 +1,4 @@
-import { MessageType, ROLLMATCH } from 'befriendlier-shared'
+import { MessageType, ROLLMATCH, More } from 'befriendlier-shared'
 import { PrivmsgMessage } from 'dank-twitch-irc'
 import DefaultHandler from './DefaultHandler'
 
@@ -29,7 +29,14 @@ export default class RollMatchHandler extends DefaultHandler {
     this.ws.sendMessage(MessageType.ROLLMATCH, JSON.stringify(responseMessage))
   }
 
-  public async onServerResponse ({ channelTwitch, userTwitch, result }: ROLLMATCH) {
+  public async onServerResponse ({ channelTwitch, userTwitch, result, more }: ROLLMATCH) {
+    if (more === More.NONE) {
+      result.value = result.value
+        .replace('%prefix%', '@@')
+        .replace('%prefix%', '@@')
+        .replace('%prefix%', '@@')
+    }
+
     this.twitch.sendMessage(channelTwitch.name, userTwitch.name, String(result.value))
   }
 }
diff --git a/src/Handlers/SuccessHandler.ts b/src/Handlers/SuccessHandler.ts
@@ -13,14 +13,14 @@ export default class SuccessHandler extends DefaultHandler {
     this.twitch./* TODO: whisper */sendMessage(
       /** TODO. REMOVE */channelTwitch.name,
       userTwitch.name,
-      String(result.value).replace('%s', `@${String(result.matchUsername)}`),
+      String(result.value).replace('%s%', `@${String(result.matchUsername)}`),
     )
 
     // // Send to matched user.
     // this.twitch./* TODO: whisper */sendMessage(
     //   /** TODO. REMOVE */channelTwitch.name,
     //   result.matchUsername,
-    //   String(result.value).replace('%s', `@${String(userTwitch.name)}`),
+    //   String(result.value).replace('%s%', `@${String(userTwitch.name)}`),
     // )
 
     this.twitch.removeUserInstance({ channelTwitch, userTwitch })