From 7d45862023510838206e76cc9b08f72da213dea0 Mon Sep 17 00:00:00 2001
From: sadan4 <117494111+sadan4@users.noreply.github.com>
Date: Wed, 29 Jan 2025 20:28:11 -0500
Subject: [PATCH 1/3] Fix IgnoreActivities and AlwaysAnimate for canary (#3182)

---
 src/plugins/alwaysAnimate/index.ts     | 4 ++--
 src/plugins/ignoreActivities/index.tsx | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/plugins/alwaysAnimate/index.ts b/src/plugins/alwaysAnimate/index.ts
index fc528466..a5297445 100644
--- a/src/plugins/alwaysAnimate/index.ts
+++ b/src/plugins/alwaysAnimate/index.ts
@@ -43,8 +43,8 @@ export default definePlugin({
             // Status emojis
             find: "#{intl::GUILD_OWNER}),children:",
             replacement: {
-                match: /(?<=\.activityEmoji,.+?animate:)\i/,
-                replace: "!0"
+                match: /(\.CUSTOM_STATUS.+?animate:)\i/,
+                replace: (_, rest) => `${rest}!0`
             }
         },
         {
diff --git a/src/plugins/ignoreActivities/index.tsx b/src/plugins/ignoreActivities/index.tsx
index 0a88aa1f..d21f0579 100644
--- a/src/plugins/ignoreActivities/index.tsx
+++ b/src/plugins/ignoreActivities/index.tsx
@@ -241,7 +241,7 @@ export default definePlugin({
             find: '"LocalActivityStore"',
             replacement: [
                 {
-                    match: /HANG_STATUS.+?(?=!?\i\(\)\(\i,\i\))(?<=(\i)\.push.+?)/,
+                    match: /\.LISTENING.+?(?=!?\i\(\)\(\i,\i\))(?<=(\i)\.push.+?)/,
                     replace: (m, activities) => `${m}${activities}=${activities}.filter($self.isActivityNotIgnored);`
                 }
             ]

From 68662c96255f617189411d97a9f11cabe2f5584d Mon Sep 17 00:00:00 2001
From: jamesbt365 <jamesbt365@gmail.com>
Date: Thu, 30 Jan 2025 01:36:56 +0000
Subject: [PATCH 2/3] QuickReply: Fix showing toggle mention in guilds (#3181)

---
 src/plugins/quickReply/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/quickReply/index.ts b/src/plugins/quickReply/index.ts
index 4a7060c5..f6ca5b45 100644
--- a/src/plugins/quickReply/index.ts
+++ b/src/plugins/quickReply/index.ts
@@ -196,7 +196,7 @@ function nextReply(isUp: boolean) {
         channel,
         message,
         shouldMention: shouldMention(message),
-        showMentionToggle: channel.isPrivate() && message.author.id !== meId,
+        showMentionToggle: !channel.isPrivate() && message.author.id !== meId,
         _isQuickReply: true
     });
     ComponentDispatch.dispatchToLastSubscribed("TEXTAREA_FOCUS");

From 8fccda4a249b843c094e944c2051e951a7a43235 Mon Sep 17 00:00:00 2001
From: Sqaaakoi <sqaaakoi-git@sqaaakoi.xyz>
Date: Thu, 30 Jan 2025 14:41:32 +1300
Subject: [PATCH 3/3] WhoReacted, TypingIndicator: Fix triggering other actions
 (#3161)

Prevents typing in message user box from activating parent click handlers
Fixes https://github.com/Vendicated/Vencord/issues/3128
---
 src/plugins/typingIndicator/index.tsx | 28 +++++++++++++++++----------
 src/plugins/whoReacted/index.tsx      |  4 ++--
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/plugins/typingIndicator/index.tsx b/src/plugins/typingIndicator/index.tsx
index 642dcc29..e6903bcd 100644
--- a/src/plugins/typingIndicator/index.tsx
+++ b/src/plugins/typingIndicator/index.tsx
@@ -100,16 +100,24 @@ function TypingIndicator({ channelId, guildId }: { channelId: string; guildId: s
                 {props => (
                     <div className="vc-typing-indicator" {...props}>
                         {((settings.store.indicatorMode & IndicatorMode.Avatars) === IndicatorMode.Avatars) && (
-                            <UserSummaryItem
-                                users={typingUsersArray.map(id => UserStore.getUser(id))}
-                                guildId={guildId}
-                                renderIcon={false}
-                                max={3}
-                                showDefaultAvatarsForNullUsers
-                                showUserPopout
-                                size={16}
-                                className="vc-typing-indicator-avatars"
-                            />
+                            <div
+                                onClick={e => {
+                                    e.stopPropagation();
+                                    e.preventDefault();
+                                }}
+                                onKeyPress={e => e.stopPropagation()}
+                            >
+                                <UserSummaryItem
+                                    users={typingUsersArray.map(id => UserStore.getUser(id))}
+                                    guildId={guildId}
+                                    renderIcon={false}
+                                    max={3}
+                                    showDefaultAvatarsForNullUsers
+                                    showUserPopout
+                                    size={16}
+                                    className="vc-typing-indicator-avatars"
+                                />
+                            </div>
                         )}
                         {((settings.store.indicatorMode & IndicatorMode.Dots) === IndicatorMode.Dots) && (
                             <div className="vc-typing-indicator-dots">
diff --git a/src/plugins/whoReacted/index.tsx b/src/plugins/whoReacted/index.tsx
index 803cc715..aea57fef 100644
--- a/src/plugins/whoReacted/index.tsx
+++ b/src/plugins/whoReacted/index.tsx
@@ -93,7 +93,7 @@ function makeRenderMoreUsers(users: User[]) {
     };
 }
 
-function handleClickAvatar(event: React.MouseEvent<HTMLElement, MouseEvent>) {
+function handleClickAvatar(event: React.UIEvent<HTMLElement, Event>) {
     event.stopPropagation();
 }
 
@@ -165,7 +165,7 @@ export default definePlugin({
             <div
                 style={{ marginLeft: "0.5em", transform: "scale(0.9)" }}
             >
-                <div onClick={handleClickAvatar}>
+                <div onClick={handleClickAvatar} onKeyPress={handleClickAvatar}>
                     <UserSummaryItem
                         users={users}
                         guildId={ChannelStore.getChannel(message.channel_id)?.guild_id}