From 9d3c91e9df7f5168da2ce8b6d1f60e0fd792f935 Mon Sep 17 00:00:00 2001
From: Nuckyz <61953774+Nuckyz@users.noreply.github.com>
Date: Tue, 10 Dec 2024 18:29:15 -0300
Subject: [PATCH] TypingTweaks: Fix plugin

---
 src/plugins/typingTweaks/index.tsx | 45 ++++++++++++++----------------
 1 file changed, 21 insertions(+), 24 deletions(-)

diff --git a/src/plugins/typingTweaks/index.tsx b/src/plugins/typingTweaks/index.tsx
index e2bbb4bc..026cd527 100644
--- a/src/plugins/typingTweaks/index.tsx
+++ b/src/plugins/typingTweaks/index.tsx
@@ -91,34 +91,31 @@ export default definePlugin({
     name: "TypingTweaks",
     description: "Show avatars and role colours in the typing indicator",
     authors: [Devs.zt],
+    settings,
+
     patches: [
-        // Style the indicator and add function call to modify the children before rendering
         {
-            find: "getCooldownTextStyle",
-            replacement: {
-                match: /(?<=children:\[(\i)\.length>0.{0,200}?"aria-atomic":!0,children:)\i/,
-                replace: "$self.mutateChildren(this.props, $1, $&), style: $self.TYPING_TEXT_STYLE"
-            }
-        },
-        // Changes the indicator to keep the user object when creating the list of typing users
-        {
-            find: "getCooldownTextStyle",
-            replacement: {
-                match: /(?<=map\(\i=>)\i\.\i\.getName\(\i,this\.props\.channel\.id,(\i)\)/,
-                replace: "$1"
-            }
-        },
-        // Adds the alternative formatting for several users typing
-        {
-            find: "getCooldownTextStyle",
-            replacement: {
-                match: /(,{a:(\i),b:(\i),c:\i}\):)\i\.\i\.string\(\i\.\i#{intl::SEVERAL_USERS_TYPING}\)(?<=(\i)\.length.+?)/,
-                replace: (_, rest, a, b, users) => `${rest}$self.buildSeveralUsers({ a: ${a}, b: ${b}, count: ${users}.length - 2 })`
-            },
-            predicate: () => settings.store.alternativeFormatting
+            find: "#{intl::THREE_USERS_TYPING}",
+            replacement: [
+                {
+                    // Style the indicator and add function call to modify the children before rendering
+                    match: /(?<=children:\[(\i)\.length>0.{0,200}?"aria-atomic":!0,children:)\i(?<=guildId:(\i).+?)/,
+                    replace: "$self.mutateChildren($2,$1,$&),style:$self.TYPING_TEXT_STYLE"
+                },
+                {
+                    // Changes the indicator to keep the user object when creating the list of typing users
+                    match: /\.map\((\i)=>\i\.\i\.getName\(\i,\i\.id,\1\)\)/,
+                    replace: ""
+                },
+                {
+                    // Adds the alternative formatting for several users typing
+                    match: /(,{a:(\i),b:(\i),c:\i}\):\i\.length>3&&\(\i=)\i\.\i\.string\(\i\.\i#{intl::SEVERAL_USERS_TYPING}\)(?<=(\i)\.length.+?)/,
+                    replace: (_, rest, a, b, users) => `${rest}$self.buildSeveralUsers({ a: ${a}, b: ${b}, count: ${users}.length - 2 })`,
+                    predicate: () => settings.store.alternativeFormatting
+                }
+            ]
         }
     ],
-    settings,
 
     TYPING_TEXT_STYLE: {
         display: "grid",