Fix Patches

packages/discord-types/src/modules/CloudUpload.d.ts

@@ -26,7 +26,7 @@ export interface WebUploadItem extends BaseUploadItem {
 export type CloudUploadItem = ReactNativeUploadItem | WebUploadItem;
 
 export class CloudUpload extends EventEmitter {
-    constructor(item: CloudUploadItem, channelId: string, showLargeMessageDialog?: boolean, reactNativeFileIndex?: number);
+    constructor(item: CloudUploadItem, channelId: string, reactNativeFileIndex?: number);
 
     channelId: string;
     classification: string;
@@ -54,7 +54,6 @@ export class CloudUpload extends EventEmitter {
     preCompressionSize: number;
     responseUrl: string;
     sensitive: boolean;
-    showLargeMessageDialog: boolean;
     spoiler: boolean;
     startTime: number;
     status: "NOT_STARTED" | "STARTED" | "UPLOADING" | "ERROR" | "COMPLETED" | "CANCELLED" | "REMOVED_FROM_MSG_DRAFT";

src/equicordplugins/noRoleHeaders/index.ts

@@ -15,7 +15,7 @@ export default definePlugin({
         {
             find: "._areActivitiesExperimentallyHidden=(",
             replacement: {
-                match: /NumberFormat\(.{0,50}\]\);(?=.{0,100}\.membersGroup)/,
+                match: /NumberFormat\(.{0,50}\]\);(?=.{0,100}\.memberGroupsPlaceholder)/,
                 replace: "$&return null;"
             }
         }

src/equicordplugins/sidebarChat/index.tsx

@@ -10,6 +10,7 @@ import { NavContextMenuPatchCallback } from "@api/ContextMenu";
 import { HeaderBarButton } from "@api/HeaderBar";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
+import { classNameFactory } from "@utils/css";
 import { getCurrentChannel } from "@utils/discord";
 import definePlugin from "@utils/types";
 import { Channel, Guild, User } from "@vencord/discord-types";
@@ -19,7 +20,6 @@ import {
     filters,
     findByPropsLazy,
     findComponentByCodeLazy,
-    findLazy,
     findStoreLazy,
     mapMangledModuleLazy
 } from "@webpack";
@@ -47,6 +47,8 @@ import {
 
 import { settings, SidebarStore } from "./store";
 
+const cl = classNameFactory("vc-sidebar-chat-");
+
 const { HeaderBar } = mapMangledModuleLazy(".themedMobile]:", {
     HeaderBar: filters.byCode(".themedMobile]:"),
 });
@@ -78,9 +80,6 @@ const PopoutWindow = findComponentByCodeLazy("Missing guestWindow reference");
 const FullChannelView = findComponentByCodeLazy("showFollowButton:(null");
 const WanderingCubesLoading = findComponentByCodeLazy('="wanderingCubes"');
 
-// love
-const ppStyle = findLazy(m => m?.popoutContent && Object.keys(m).length === 1);
-
 const ChatInputTypes = findByPropsLazy("FORM", "NORMAL");
 const Sidebars = findByPropsLazy("ThreadSidebar", "MessageRequestSidebar");
 const ChatClasses = findByPropsLazy("threadSidebarOpen");
@@ -332,9 +331,9 @@ const RenderPopout = ErrorBoundary.wrap(({ channel, name }: { channel: Channel;
         <PopoutWindow
             withTitleBar
             windowKey={`DISCORD_VC_SC-${channel.id}`}
-            title={name || "Vencord"}
+            title={name || "Equicord"}
             channelId={channel.id}
-            contentClassName={ppStyle.popoutContent}
+            contentClassName={cl("popout")}
         >
             <FullChannelView providedChannel={channel} />
         </PopoutWindow>

src/equicordplugins/sidebarChat/styles.css

@@ -8,4 +8,8 @@
 
 [class*="page"] > * {
     min-width: 0;
-}
+}
+
+.vc-sidebar-chat-popout {
+    align-items: stretch;
+}

src/plugins/roleColorEverywhere/index.tsx

@@ -106,8 +106,8 @@ export default definePlugin({
             find: 'tutorialId:"whos-online',
             replacement: [
                 {
-                    match: /null,\i," — ",\i\]/,
-                    replace: "null,$self.RoleGroupColor(arguments[0])]"
+                    match: /(?<=\.roleIcon.{0,15}:null,).{0,150}— ",\i\]\}\)\]/,
+                    replace: "$self.RoleGroupColor(arguments[0])]"
                 },
             ],
             predicate: () => settings.store.memberList

src/webpack/common/utils.ts

@@ -141,7 +141,7 @@ export const UserUtils = {
 
 export const UploadManager = findByPropsLazy("clearAll", "addFile");
 export const UploadHandler = {
-    promptToUpload: findByCodeLazy("=!0,showLargeMessageDialog:") as (files: File[], channel: t.Channel, draftType: Number) => void
+    promptToUpload: findByCodeLazy("Unexpected mismatch between files and file metadata") as (files: File[], channel: t.Channel, draftType: Number) => void
 };
 
 export const ApplicationAssetUtils = mapMangledModuleLazy("getAssetImage: size must === [", {