More Fixes

README.md

@@ -62,7 +62,7 @@ An enhanced version of [Vencord](https://github.com/Vendicated/Vencord) by [Vend
 - NotifyUserChanges by D3SOX
 - OnePingPerDM by ProffDea
 - PlatformSpoofer by Drag
-- MessagePurge by bhop and nyx
+- PurgeMessages by bhop and nyx
 - QuestionMarkReplacement (QuestionMarkReplace) by nyx
 - Quoter by Samwich
 - RepeatMessage by Tolgchu

src/equicordplugins/keywordNotify/index.tsx

@@ -411,12 +411,6 @@ export default definePlugin({
             return [msg];
         };
 
-        /* return (
-            <>
-                <p>hi uwu</p>
-            </>
-        );*/
-
         return (
             <>
                 <Popout

src/equicordplugins/purgeMessages/index.ts

@@ -17,7 +17,8 @@
 */
 
 import { ApplicationCommandInputType, ApplicationCommandOptionType, findOption, sendBotMessage } from "@api/Commands";
-import { Devs, EquicordDevs } from "@utils/constants";
+import { migratePluginSettings } from "@api/Settings";
+import { EquicordDevs } from "@utils/constants";
 import definePlugin from "@utils/types";
 import { findByPropsLazy } from "@webpack";
 import { MessageStore, UserStore } from "@webpack/common";
@@ -27,25 +28,29 @@ import { loggedMessages } from "../messageLoggerEnhanced/LoggedMessageManager";
 
 const MessageActions = findByPropsLazy("deleteMessage", "startEditMessage");
 
-async function DeleteMessages(amount: number, channel: Channel, delay: number = 1500) {
+async function deleteMessages(amount: number, channel: Channel, delay: number = 1500): Promise<number> {
+    let deleted = 0;
     const userId = UserStore.getCurrentUser().id;
-    const messages: Message[] = MessageStore.getMessages(channel.id)._array.filter((m: Message) => m.author.id === userId).reverse();
+    const messages: Message[] = JSON.parse(JSON.stringify(MessageStore.getMessages(channel.id)._array.filter((m: Message) => m.author.id === userId).reverse()));
-    const parsedMessages: Message[] = JSON.parse(JSON.stringify(messages));
+    const uniqueMessages: Message[] = !loggedMessages.deletedMessages[channel.id] ? messages : messages.filter(message => !loggedMessages.deletedMessages[channel.id].includes(message.id));
-    const uniqueMessages: Message[] = parsedMessages.filter(message => !loggedMessages.deletedMessages[channel.id].includes(message.id));
 
     for (const message of uniqueMessages) {
         MessageActions.deleteMessage(channel.id, message.id);
         amount--;
+        deleted++;
         if (amount === 0) break;
         await new Promise(resolve => setTimeout(resolve, delay));
     }
+
+    return deleted;
 }
 
+migratePluginSettings("PurgeMessages", "MessagePurge");
 export default definePlugin({
-    name: "MessagePurge",
+    name: "PurgeMessages",
     description: "Purges messages from a channel",
     dependencies: ["CommandsAPI"],
-    authors: [EquicordDevs.bhop, Devs.nyx],
+    authors: [EquicordDevs.bhop, EquicordDevs.nyx],
     commands: [
         {
             name: "purge",
@@ -80,10 +85,10 @@ export default definePlugin({
                     content: `> deleting ${amount} messages.`
                 });
 
-                DeleteMessages(amount, channel, delay).then(() => {
+                deleteMessages(amount, channel, delay).then((deleted: number) => {
                     sendBotMessage(ctx.channel.id,
                         {
-                            content: `> deleted ${amount} messages`
+                            content: `> deleted ${deleted} messages`
                         }
                     );
                 });

src/plugins/mutualGroupDMs/index.tsx

@@ -19,9 +19,10 @@
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import { isNonNullish } from "@utils/guards";
+import { pluralise } from "@utils/misc";
 import definePlugin from "@utils/types";
 import { findByPropsLazy } from "@webpack";
-import { Avatar, ChannelStore, Clickable, IconUtils, RelationshipStore, ScrollerThin, UserStore } from "@webpack/common";
+import { Avatar, ChannelStore, Clickable, IconUtils, RelationshipStore, ScrollerThin, UserStore, useStateFromStores } from "@webpack/common";
 import { Channel, User } from "discord-types/general";
 
 const SelectedChannelActionCreators = findByPropsLazy("selectPrivateChannel");
@@ -39,6 +40,10 @@ function getGroupDMName(channel: Channel) {
             .join(", ");
 }
 
+function useGroupDMs(userId: string) {
+    return useStateFromStores([ChannelStore], () => ChannelStore.getSortedPrivateChannels().filter(c => c.isGroupDM() && c.recipients.includes(userId)));
+}
+
 export default definePlugin({
     name: "MutualGroupDMs",
     description: "Shows mutual group dms in profiles",
@@ -64,8 +69,8 @@ export default definePlugin({
             group: true,
             replacement: [
                 {
-                    match: /(?<=(\i\.push)\(\{section:\i\.UserProfileSections\.MUTUAL_GUILDS,text:.{0,250}\}\)\)\}\))/,
+                    match: /(user:(\i),.+?=\i,)(.+?)(\i\.push)(.+?UserProfileSections\.MUTUAL_GUILDS,text:.{0,250}}\)\)}\))/,
-                    replace: ',$1({section:"MUTUAL_GDMS",text:"Mutual Groups"})'
+                    replace: '$1vencordMutualGroupsTabLabel=$self.useGDMCount($2.id),$3$5,$4({section:"MUTUAL_GDMS",text:vencordMutualGroupsTabLabel})'
                 },
                 {
                     match: /(?<=(\i)===\i\.UserProfileSections\.MUTUAL_GUILDS?.{0,150}\}\):)/,
@@ -75,8 +80,13 @@ export default definePlugin({
         },
     ],
 
+    useGDMCount(userId: string) {
+        const state = useGroupDMs(userId).length;
+        const label = "Mutual Group";
+        return state > 0 ? pluralise(state, label) : `No ${label}s`;
+    },
     renderMutualGDMs: ErrorBoundary.wrap(({ user, onClose }: { user: User, onClose: () => void; }) => {
-        const entries = ChannelStore.getSortedPrivateChannels().filter(c => c.isGroupDM() && c.recipients.includes(user.id)).map(c => (
+        const entries = useGroupDMs(user.id).map(c => (
             <Clickable
                 className={ProfileListClasses.listRow}
                 onClick={() => {