From 2d7d1a2e8c8413c372299fd00eb040dcb78ba9a3 Mon Sep 17 00:00:00 2001
From: soge__ <sogehige@gmail.com>
Date: Sun, 14 Nov 2021 15:00:06 +0100
Subject: [PATCH] feat(message): remove username if replies are enabled

---
 src/helpers/tmi/message.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/helpers/tmi/message.ts b/src/helpers/tmi/message.ts
index 5b4fc91519e..bab61fe77fe 100644
--- a/src/helpers/tmi/message.ts
+++ b/src/helpers/tmi/message.ts
@@ -20,6 +20,10 @@ export async function message(type: 'say' | 'whisper' | 'me', username: string |
         tmiEmitter.emit('say', username, `/me ${messageToSend}`);
       } else {
         if (twitch.sendAsReply) {
+          if (messageToSend.startsWith(username) || messageToSend.startsWith('@' + username)) {
+            const regexp = new RegExp(`^@?${username}\\s?\\W?`);
+            messageToSend = messageToSend.replace(regexp, '').trim();
+          }
           tmiEmitter.emit('say', username, `${messageToSend}`, { replyTo: messageId });
         } else {
           tmiEmitter.emit(type as any, username, `${messageToSend}`);