Fixes For Canary

README.md

@@ -10,7 +10,7 @@ You can join our [discord server](https://discord.gg/5Xh2W87egW) for commits, ch
 
 ### Extra included plugins
 <details>
-<summary>126 additional plugins</summary>
+<summary>124 additional plugins</summary>
 
 - AllCallTimers by MaxHerbold & D3SOX
 - AltKrispSwitch by newwares
@@ -34,7 +34,6 @@ You can join our [discord server](https://discord.gg/5Xh2W87egW) for commits, ch
 - CuteAnimeBoys by ShadyGoat
 - CuteNekos by echo
 - CutePats by thororen
-- DeadMembers by Kyuuhachi
 - Demonstration by Samwich
 - DisableCameras by Joona
 - DoNotLeak by Perny
@@ -105,7 +104,6 @@ You can join our [discord server](https://discord.gg/5Xh2W87egW) for commits, ch
 - ScreenRecorder by AutumnVN (Vesktop & Equibop only)
 - SearchFix by Jaxx
 - SekaiStickers by MaiKokain
-- ServerSearch by camila314
 - Shakespearean by vmohammad (Dev build only)
 - ShowBadgesInChat by Inbestigator & KrystalSkull
 - Slap by Korbo

src/equicordplugins/channelTabs/index.tsx

@@ -79,7 +79,7 @@ export default definePlugin({
         {
             find: ".messagesPopoutWrap",
             replacement: {
-                match: /\i&&\((\i).maxHeight-=\d{1,3}\)/,
+                match: /\i&&\((\i).maxHeight.{1,5}\)/,
                 replace: "$&;$1.maxHeight-=$self.containerHeight"
             }
         },

src/equicordplugins/clientSideBlock/index.tsx

@@ -216,7 +216,7 @@ export default definePlugin({
         {
             find: "}getMutualFriends(",
             replacement: {
-                match: /(getMutualFriends\(\i\){)return (\i\[\i\])/,
+                match: /(getMutualFriends\(\i\){)return (\i\.get\(\i\))/,
                 replace: "$1if($2 != undefined) return $2.filter(u => !$self.shouldHideUser(u.key))"
             }
         }

src/equicordplugins/deadMembers/index.tsx

@@ -1,62 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2024 Vendicated and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import { Devs } from "@utils/constants";
-import definePlugin from "@utils/types";
-import { ChannelStore, GuildMemberStore, useStateFromStores } from "@webpack/common";
-
-export default definePlugin({
-    name: "DeadMembers",
-    description: "Shows when the sender of a message has left the guild",
-    authors: [Devs.Kyuuhachi],
-
-    patches: [
-        {
-            find: '.BADGES=1]="BADGES"',
-            replacement: {
-                match: /(\i)=\{className:\i.username,style:.*?onContextMenu:\i,children:.*?\},/,
-                replace: "$&__dummyvar=($1.children=$self.wrapMessageAuthor(arguments[0],$1.children)),"
-            }
-        },
-        {
-            find: "Messages.FORUM_POST_AUTHOR_A11Y_LABEL",
-            replacement: {
-                match: /(?<=\}=(\i),\{(user:\i,author:\i)\}=.{0,400}?\(\i\.Fragment,{children:)\i(?=}\),)/,
-                replace: "$self.wrapForumAuthor({...$1,$2},$&)"
-            }
-        },
-    ],
-
-    wrapMessageAuthor({ message }, text) {
-        const channel = ChannelStore.getChannel(message.channel_id);
-        return message.webhookId
-            ? text
-            : <DeadIndicator
-                channel={channel}
-                userId={message.author.id}
-                text={text}
-            />;
-    },
-
-    wrapForumAuthor({ channel, user }, text) {
-        return !user
-            ? text
-            : <DeadIndicator
-                channel={channel}
-                userId={user.id}
-                text={text}
-            />;
-    },
-});
-
-
-function DeadIndicator({ channel, userId, text }) {
-    const isMember = useStateFromStores(
-        [GuildMemberStore],
-        () => GuildMemberStore.isMember(channel?.guild_id, userId),
-    );
-    return channel?.guild_id && !isMember ? <s className="c98-author-dead">{text}</s> : text;
-}

src/equicordplugins/messageColors/index.tsx

@@ -55,8 +55,8 @@ export default definePlugin({
             find: ".defaultRules.text,match:",
             group: true,
             replacement: {
-                // $)/)
+                // $)
-                match: /\$\)\/\)}/,
+                match: /\$\)/,
                 // hsl(|rgb(|$&
                 replace: requiredFirstCharacters.join("|") + "|$&",
             },

src/equicordplugins/messageLoggerEnhanced/index.tsx

@@ -580,8 +580,8 @@ export default definePlugin({
         {
             find: '"MessageStore"',
             replacement: {
-                match: /LOAD_MESSAGES_SUCCESS:function\(\i\){/,
+                match: /getOrCreate\(\i\);\i=\i\.loadComplete.*?}\),/,
-                replace: "$&$self.messageLoadSuccess(arguments[0]);"
+                replace: "$self.messageLoadSuccess(arguments[0]);"
             }
         },
 

src/equicordplugins/modalFade/index.tsx

@@ -58,12 +58,12 @@ export default definePlugin({
             }
         },
         {
-            find: "{})).SUBTLE=\"SUBTLE\"",
+            find: ".SUBTLE=\"SUBTLE\"",
             replacement: {
                 match: /\(0,\i\.useTransition\)*/,
                 replace: "$self.nullTransition"
             }
-        },
+        }
     ],
 
     nullTransition(value: any, args: object) {

src/equicordplugins/replaceActivityTypes/index.tsx

@@ -53,9 +53,9 @@ export default definePlugin({
     patches: [
         // how has this patch not broken yet lol (i do not like fixing patches tho)
         {
-            find: '="LocalActivityStore",',
+            find: '"LocalActivityStore"',
             replacement: {
-                match: /LOCAL_ACTIVITY_UPDATE:function\((\i)\)\{/,
+                match: /\i\((\i)\)\{.{0,50}activity.{0,10}=\i;/,
                 replace: "$&$self.patchActivity($1.activity);",
             }
         }

src/equicordplugins/serverSearch/index.tsx

@@ -1,59 +0,0 @@
-/*
- * Vencord, a Discord client mod
- * Copyright (c) 2023 Vendicated, camila314, and contributors
- * SPDX-License-Identifier: GPL-3.0-or-later
- */
-
-import "./styles.css";
-
-import { addServerListElement, removeServerListElement, ServerListRenderPosition } from "@api/ServerList";
-import ErrorBoundary from "@components/ErrorBoundary";
-import { EquicordDevs } from "@utils/constants";
-import definePlugin from "@utils/types";
-import { findByCodeLazy } from "@webpack";
-import { Tooltip } from "webpack/common/components";
-
-const openPopout = findByCodeLazy(".QUICKSWITCHER_OPENED,{");
-function SearchIcon() {
-    return (
-        <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24" id="vc-searchbutton-icon">
-            <path
-                fill="currentColor"
-                fill-rule="evenodd"
-                d="M15.62 17.03a9 9 0 1 1 1.41-1.41l4.68 4.67a1 1 0 0 1-1.421.42l-4.67-4.68ZM17 10a7 7 0 1 1-14 0 7 7 0 0 1 14 0Z"
-                clip-rule="evenodd"></path>
-        </svg>
-    );
-}
-
-export default definePlugin({
-    name: "ServerSearch",
-    authors: [EquicordDevs.camila314],
-    description: "Navigate your servers better with a quick search button",
-
-    renderButton() {
-        return <ErrorBoundary noop>
-            <div id="vc-searchbutton-container">
-                <Tooltip text="Search" position="right">
-                    {({ onMouseEnter, onMouseLeave }) => (
-                        <div
-                            id="vc-searchbutton"
-                            onMouseEnter={onMouseEnter}
-                            onMouseLeave={onMouseLeave}
-                            onClick={() => openPopout("DM_SEARCH")}>
-                            <SearchIcon />
-                        </div>
-                    )}
-                </Tooltip>
-            </div>
-        </ErrorBoundary>;
-    },
-
-    start() {
-        addServerListElement(ServerListRenderPosition.Above, this.renderButton);
-    },
-
-    stop() {
-        removeServerListElement(ServerListRenderPosition.Above, this.renderButton);
-    }
-});

src/equicordplugins/serverSearch/styles.css

@@ -1,33 +0,0 @@
-#vc-searchbutton-container {
-    width: 100%;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    margin-bottom: 8px;
-}
-
-#vc-searchbutton {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    background-color: var(--background-primary);
-    height: 48px;
-    width: 48px;
-    border-radius: 100%;
-    transition: border-radius 0.15s ease-out, background-color 0.15s ease-out;
-}
-
-#vc-searchbutton-icon {
-    color: var(--text-normal);
-}
-
-#vc-searchbutton:hover {
-    border-radius: 34%;
-    background-color: var(--green-360);
-    cursor: pointer;
-}
-
-#vc-searchbutton:hover #vc-searchbutton-icon {
-    color: var(--white-500);
-}

src/plugins/showMeYourName/index.tsx

@@ -48,7 +48,7 @@ export default definePlugin({
     authors: [Devs.Rini, Devs.TheKodeToad],
     patches: [
         {
-            find: '?"@":"")',
+            find: '?"@":""',
             replacement: {
                 match: /(?<=onContextMenu:\i,children:).*?\)}/,
                 replace: "$self.renderUsername(arguments[0])}"