From 1b2bc07592da7fe9831075f24f7cb18bd3b79470 Mon Sep 17 00:00:00 2001
From: Vendicated <vendicated@riseup.net>
Date: Tue, 1 Jul 2025 22:57:22 +0200
Subject: [PATCH] TypingTweaks: fix several users are typing display

---
 src/plugins/typingTweaks/index.tsx | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/plugins/typingTweaks/index.tsx b/src/plugins/typingTweaks/index.tsx
index 59b967c4..b20840f2 100644
--- a/src/plugins/typingTweaks/index.tsx
+++ b/src/plugins/typingTweaks/index.tsx
@@ -22,7 +22,7 @@ import { Devs } from "@utils/constants";
 import { openUserProfile } from "@utils/discord";
 import definePlugin, { OptionType } from "@utils/types";
 import { Avatar, GuildMemberStore, React, RelationshipStore } from "@webpack/common";
-import { User } from "discord-types/general";
+import { Channel, User } from "discord-types/general";
 import { PropsWithChildren } from "react";
 
 import managedStyle from "./style.css?managed";
@@ -45,13 +45,14 @@ const settings = definePluginSettings({
     }
 });
 
-export const buildSeveralUsers = ErrorBoundary.wrap(({ a, b, count }: { a: string, b: string, count: number; }) => {
+export const buildSeveralUsers = ErrorBoundary.wrap(({ a, b, count, channel }: { a: User, b: User, count: number; channel: Channel; }) => {
     return (
         <>
-            <strong key="0">{a}</strong>,
-            ", ",
-            <strong key="1">{b}</strong>,
-            `, and ${count} others are typing...`
+            <TypingUser user={a} guildId={channel.guild_id} />
+            {", "}
+            <TypingUser user={b} guildId={channel.guild_id} />
+            {", "}
+            and {count} others are typing...
         </>
     );
 }, { noop: true });
@@ -113,7 +114,8 @@ export default definePlugin({
                 {
                     // 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 })`,
+                    replace: (_, rest, a, b, users) =>
+                        `${rest}$self.buildSeveralUsers({ a: ${a}, b: ${b}, count: ${users}.length - 2, channel: arguments[0]?.channel })`,
                     predicate: () => settings.store.alternativeFormatting
                 }
             ]