Merge pull request benawad#2852 from TheOtterlord/staging

Fix emotes
Mahmoud-Skafi · May 20, 2021 · ff16132 · ff16132
2 parents beacbac + 526b437
commit ff16132
Show file tree

Hide file tree

Showing 2 changed files with 325 additions and 6,532 deletions.
diff --git a/kibbeh/src/modules/room/chat/RoomChatInput.tsx b/kibbeh/src/modules/room/chat/RoomChatInput.tsx
@@ -125,12 +125,21 @@ export const RoomChatInput: React.FC<ChatInputProps> = ({ users }) => {
                 ? inputRef!.current!.selectionStart
                 : position + 2) || 0;
 
+            let msg = '';
+
+            if ((message.match(/:/g)?.length ?? 0) % 2) {
+              msg = message.split('').reverse().join('');
+              msg = msg.replace(msg.split(':')[0] + ':', '');
+              msg = msg.split('').reverse().join('');
+            } else {
+              msg = message;
+            }
+
             const newMsg = [
-              message.slice(0, position),
-              (message.endsWith(" ") ? "" : " ") +
-                (`:${emoji.short_names[0]}:` || "") +
+              msg.slice(0, position),
+              (`:${emoji.short_names[0]}:` || "") +
                 " ",
-              message.slice(position),
+              msg.slice(position),
             ].join("");
             setMessage(newMsg);
           }}