From ab1b002ed17c7f012e25ae11ec5db8a03264b322 Mon Sep 17 00:00:00 2001
From: TheKodeToad <TheKodeToad@proton.me>
Date: Wed, 25 Oct 2023 19:43:48 +0100
Subject: [PATCH] TypingTweaks: fix (#1883)

---
 src/plugins/typingIndicator/index.tsx |  2 +-
 src/plugins/typingTweaks/index.tsx    | 31 +++++++++++++++------------
 src/utils/discord.tsx                 |  7 +++---
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/src/plugins/typingIndicator/index.tsx b/src/plugins/typingIndicator/index.tsx
index 8ac344606..9de76cacf 100644
--- a/src/plugins/typingIndicator/index.tsx
+++ b/src/plugins/typingIndicator/index.tsx
@@ -83,7 +83,7 @@ function TypingIndicator({ channelId }: { channelId: string; }) {
         }
         default: {
             tooltipText = Settings.plugins.TypingTweaks.enabled
-                ? buildSeveralUsers({ a: getDisplayName(guildId, typingUsersArray[0]), b: getDisplayName(guildId, typingUsersArray[1]), c: typingUsersArray.length - 2 })
+                ? buildSeveralUsers({ a: getDisplayName(guildId, typingUsersArray[0]), b: getDisplayName(guildId, typingUsersArray[1]), count: typingUsersArray.length - 2 })
                 : Formatters.Messages.SEVERAL_USERS_TYPING;
             break;
         }
diff --git a/src/plugins/typingTweaks/index.tsx b/src/plugins/typingTweaks/index.tsx
index b76f4931f..62bcd41f6 100644
--- a/src/plugins/typingTweaks/index.tsx
+++ b/src/plugins/typingTweaks/index.tsx
@@ -21,12 +21,9 @@ import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import { openUserProfile } from "@utils/discord";
 import definePlugin, { OptionType } from "@utils/types";
-import { findByCodeLazy } from "@webpack";
-import { GuildMemberStore, React, RelationshipStore } from "@webpack/common";
+import { Avatar, GuildMemberStore, React, RelationshipStore } from "@webpack/common";
 import { User } from "discord-types/general";
 
-const Avatar = findByCodeLazy(".typingIndicatorRef", "svg");
-
 const settings = definePluginSettings({
     showAvatars: {
         type: OptionType.BOOLEAN,
@@ -45,12 +42,12 @@ const settings = definePluginSettings({
     }
 });
 
-export function buildSeveralUsers({ a, b, c }: { a: string, b: string, c: number; }) {
+export function buildSeveralUsers({ a, b, count }: { a: string, b: string, count: number; }) {
     return [
         <strong key="0">{a}</strong>,
         ", ",
-        <strong key="2">{b}</strong>,
-        `, and ${c} others are typing...`
+        <strong key="1">{b}</strong>,
+        `, and ${count} others are typing...`
     ];
 }
 
@@ -99,30 +96,36 @@ export default definePlugin({
         {
             find: "getCooldownTextStyle",
             replacement: {
-                match: /=(\i)\[2];(.+)"aria-atomic":!0,children:(\i)}\)/,
-                replace: "=$1[2];$2\"aria-atomic\":!0,style:{display:\"grid\",gridAutoFlow:\"column\",gridGap:\"0.25em\"},children:$self.mutateChildren(this.props,$1,$3)})"
+                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: /return \i\.\i\.getName\(.,.\.props\.channel\.id,(.)\)/,
-                replace: "return $1"
+                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: /((\i)\.length\?.\..\.Messages\.THREE_USERS_TYPING.format\(\{a:(\i),b:(\i),c:.}\)):.+?SEVERAL_USERS_TYPING/,
-                replace: "$1:$self.buildSeveralUsers({a:$3,b:$4,c:$2.length-2})"
+                match: /(?<=(\i)\.length\?\i.\i\.Messages.THREE_USERS_TYPING\.format\({\i:(\i),\i:(\i),\i:\i}\):)\i\.\i\.Messages\.SEVERAL_USERS_TYPING/,
+                replace: (_, users, a, b) => `$self.buildSeveralUsers({ a: ${a}, b: ${b}, count: ${users}.length - 2 })`
             },
             predicate: () => settings.store.alternativeFormatting
         }
     ],
     settings,
 
+    TYPING_TEXT_STYLE: {
+        display: "grid",
+        gridAutoFlow: "column",
+        gridGap: "0.25em"
+    },
+
     buildSeveralUsers,
 
     mutateChildren(props: any, users: User[], children: any) {
@@ -135,5 +138,5 @@ export default definePlugin({
                 ? <TypingUser {...props} user={users[element++]} />
                 : c
         );
-    },
+    }
 });
diff --git a/src/utils/discord.tsx b/src/utils/discord.tsx
index 76721d044..96193f219 100644
--- a/src/utils/discord.tsx
+++ b/src/utils/discord.tsx
@@ -17,13 +17,14 @@
 */
 
 import { MessageObject } from "@api/MessageEvents";
-import { findByCodeLazy, findByPropsLazy } from "@webpack";
+import { findByPropsLazy } from "@webpack";
 import { ChannelStore, ComponentDispatch, FluxDispatcher, GuildStore, MaskedLink, ModalImageClasses, PrivateChannelsStore, RestAPI, SelectedChannelStore, SelectedGuildStore, UserProfileStore, UserSettingsActionCreators, UserUtils } from "@webpack/common";
 import { Guild, Message, User } from "discord-types/general";
 
 import { ImageModal, ModalRoot, ModalSize, openModal } from "./modal";
 
 const MessageActions = findByPropsLazy("editMessage", "sendMessage");
+const UserProfileActions = findByPropsLazy("openUserProfileModal", "closeUserProfileModal");
 
 export function getCurrentChannel() {
     return ChannelStore.getChannel(SelectedChannelStore.getChannelId());
@@ -99,14 +100,12 @@ export function openImageModal(url: string, props?: Partial<React.ComponentProps
     ));
 }
 
-const openProfile = findByCodeLazy("friendToken", "USER_PROFILE_MODAL_OPEN");
-
 export async function openUserProfile(id: string) {
     const user = await UserUtils.getUser(id);
     if (!user) throw new Error("No such user: " + id);
 
     const guildId = SelectedGuildStore.getGuildId();
-    openProfile({
+    UserProfileActions.openUserProfileModal({
         userId: id,
         guildId,
         channelId: SelectedChannelStore.getChannelId(),