Merge branch 'dev' into immediate-finds

src/api/MessageUpdater.ts

@@ -0,0 +1,29 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import { MessageCache, MessageStore } from "@webpack/common";
+import { FluxStore } from "@webpack/types";
+import { Message } from "discord-types/general";
+
+/**
+ * Update and re-render a message
+ * @param channelId The channel id of the message
+ * @param messageId The message id
+ * @param fields The fields of the message to change. Leave empty if you just want to re-render
+ */
+export function updateMessage(channelId: string, messageId: string, fields?: Partial<Message>) {
+    const channelMessageCache = MessageCache.getOrCreate(channelId);
+    if (!channelMessageCache.has(messageId)) return;
+
+    // To cause a message to re-render, we basically need to create a new instance of the message and obtain a new reference
+    // If we have fields to modify we can use the merge method of the class, otherwise we just create a new instance with the old fields
+    const newChannelMessageCache = channelMessageCache.update(messageId, (oldMessage: any) => {
+        return fields ? oldMessage.merge(fields) : new oldMessage.constructor(oldMessage);
+    });
+
+    MessageCache.commit(newChannelMessageCache);
+    (MessageStore as unknown as FluxStore).emitChange();
+}

src/api/index.ts

@@ -26,6 +26,7 @@ import * as $MessageAccessories from "./MessageAccessories";
 import * as $MessageDecorations from "./MessageDecorations";
 import * as $MessageEventsAPI from "./MessageEvents";
 import * as $MessagePopover from "./MessagePopover";
+import * as $MessageUpdater from "./MessageUpdater";
 import * as $Notices from "./Notices";
 import * as $Notifications from "./Notifications";
 import * as $ServerList from "./ServerList";
@@ -110,3 +111,8 @@ export const ContextMenu = $ContextMenu;
  * An API allowing you to add buttons to the chat input
  */
 export const ChatButtons = $ChatButtons;
+
+/**
+ * An API allowing you to update and re-render messages
+ */
+export const MessageUpdater = $MessageUpdater;

src/main/patcher.ts

@@ -140,8 +140,14 @@ if (!IS_VANILLA) {
         return originalAppend.apply(this, args);
     };
 
+    // disable renderer backgrounding to prevent the app from unloading when in the background
+    // https://github.com/electron/electron/issues/2822
+    // https://github.com/GoogleChrome/chrome-launcher/blob/5a27dd574d47a75fec0fb50f7b774ebf8a9791ba/docs/chrome-flags-for-tools.md#task-throttling
     // Work around discord unloading when in background
+    // Discord also recently started adding these flags but only on windows for some reason dunno why, it happens on Linux too
     app.commandLine.appendSwitch("disable-renderer-backgrounding");
+    app.commandLine.appendSwitch("disable-background-timer-throttling");
+    app.commandLine.appendSwitch("disable-backgrounding-occluded-windows");
 } else {
     console.log("[Vencord] Running in vanilla mode. Not loading Vencord");
 }

src/plugins/_api/messageUpdater.ts

@@ -0,0 +1,37 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2022 Vendicated and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import { Devs } from "@utils/constants";
+import definePlugin from "@utils/types";
+
+export default definePlugin({
+    name: "MessageUpdaterAPI",
+    description: "API for updating and re-rendering messages.",
+    authors: [Devs.Nuckyz],
+
+    patches: [
+        {
+            // Message accessories have a custom logic to decide if they should render again, so we need to make it not ignore changed message reference
+            find: "}renderEmbeds(",
+            replacement: {
+                match: /(?<=this.props,\i,\[)"message",/,
+                replace: ""
+            }
+        }
+    ]
+});

src/plugins/fakeNitro/index.tsx

@@ -332,7 +332,7 @@ export default definePlugin({
             ]
         },
         {
-            find: "renderEmbeds(",
+            find: "}renderEmbeds(",
             replacement: [
                 {
                     // Call our function to decide whether the embed should be ignored or not

src/plugins/invisibleChat.desktop/index.tsx

@@ -18,12 +18,13 @@
 
 import { addChatBarButton, ChatBarButton } from "@api/ChatButtons";
 import { addButton, removeButton } from "@api/MessagePopover";
+import { updateMessage } from "@api/MessageUpdater";
 import { definePluginSettings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
 import { getStegCloak } from "@utils/dependencies";
 import definePlugin, { OptionType } from "@utils/types";
-import { ChannelStore, Constants, FluxDispatcher, RestAPI, Tooltip } from "@webpack/common";
+import { ChannelStore, Constants, RestAPI, Tooltip } from "@webpack/common";
 import { Message } from "discord-types/general";
 
 import { buildDecModal } from "./components/DecryptionModal";
@@ -103,7 +104,7 @@ export default definePlugin({
     name: "InvisibleChat",
     description: "Encrypt your Messages in a non-suspicious way!",
     authors: [Devs.SammCheese],
-    dependencies: ["MessagePopoverAPI", "ChatInputButtonAPI"],
+    dependencies: ["MessagePopoverAPI", "ChatInputButtonAPI", "MessageUpdaterAPI"],
     patches: [
         {
             // Indicator
@@ -180,14 +181,7 @@ export default definePlugin({
                 message.embeds.push(embed);
         }
 
-        this.updateMessage(message);
+        updateMessage(message.channel_id, message.id, { embeds: message.embeds });
-    },
-
-    updateMessage: (message: any) => {
-        FluxDispatcher.dispatch({
-            type: "MESSAGE_UPDATE",
-            message,
-        });
     },
 
     popOverIcon: () => <PopOverIcon />,

src/plugins/messageLinkEmbeds/index.tsx

@@ -17,6 +17,7 @@
 */
 
 import { addAccessory, removeAccessory } from "@api/MessageAccessories";
+import { updateMessage } from "@api/MessageUpdater";
 import { definePluginSettings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants.js";
@@ -28,7 +29,6 @@ import {
     Button,
     ChannelStore,
     Constants,
-    FluxDispatcher,
     GuildStore,
     IconUtils,
     MessageStore,
@@ -249,15 +249,9 @@ function MessageEmbedAccessory({ message }: { message: Message; }) {
             if (linkedMessage) {
                 messageCache.set(messageID, { message: linkedMessage, fetched: true });
             } else {
-                const msg = { ...message } as any;
-                delete msg.embeds;
-                delete msg.interaction;
 
                 messageFetchQueue.unshift(() => fetchMessage(channelID, messageID)
-                    .then(m => m && FluxDispatcher.dispatch({
+                    .then(m => m && updateMessage(message.channel_id, message.id))
-                        type: "MESSAGE_UPDATE",
-                        message: msg
-                    }))
                 );
                 continue;
             }
@@ -366,7 +360,7 @@ export default definePlugin({
     name: "MessageLinkEmbeds",
     description: "Adds a preview to messages that link another message",
     authors: [Devs.TheSun, Devs.Ven, Devs.RyanCaoDev],
-    dependencies: ["MessageAccessoriesAPI"],
+    dependencies: ["MessageAccessoriesAPI", "MessageUpdaterAPI"],
 
     settings,
 

src/plugins/seeSummaries/README.md

@@ -2,6 +2,8 @@
 
 Enables Discord's experimental Summaries feature on every server, displaying AI generated summaries of conversations.
 
+Read more about summaries in the [official Discord help article](https://support.discord.com/hc/en-us/articles/12926016807575-In-Channel-Conversation-Summaries)!
+
 Note that this plugin can't fetch old summaries, it can only display ones created while your Discord is running with the plugin enabled.
 
 ![](https://github.com/Vendicated/Vencord/assets/45497981/bd931b0c-2e85-4c10-9f7c-8ba01eb55745)

src/webpack/common/types/stores.d.ts

@@ -41,8 +41,33 @@ export class FluxStore {
     waitFor: GenericFunction;
 }
 
+export class FluxEmitter {
+    constructor();
+
+    changeSentinel: number;
+    changedStores: Set<FluxStore>;
+    isBatchEmitting: boolean;
+    isDispatching: boolean;
+    isPaused: boolean;
+    pauseTimer: NodeJS.Timeout | null;
+    reactChangedStores: Set<FluxStore>;
+
+    batched(batch: (...args: any[]) => void): void;
+    destroy(): void;
+    emit(): void;
+    emitNonReactOnce(): void;
+    emitReactOnce(): void;
+    getChangeSentinel(): number;
+    getIsPaused(): boolean;
+    injectBatchEmitChanges(batch: (...args: any[]) => void): void;
+    markChanged(store: FluxStore): void;
+    pause(): void;
+    resume(): void;
+}
+
 export interface Flux {
     Store: typeof FluxStore;
+    Emitter: FluxEmitter;
 }
 
 export class WindowStore extends FluxStore {

src/webpack/common/utils.ts

@@ -127,6 +127,7 @@ const persistFilter = filters.byCode("[zustand persist middleware]");
 export const zustandPersist = find(m => m.persist && persistFilter(m.persist), m => m.persist);
 
 export const MessageActions = findByProps("editMessage", "sendMessage");
+export const MessageCache = findByProps("clearCache", "_channelMessages");
 export const UserProfileActions = findByProps("openUserProfileModal", "closeUserProfileModal");
 export const InviteActions = findByProps("resolveInvite");
 

src/webpack/patchWebpack.ts

@@ -197,7 +197,7 @@ function patchFactories(factories: Record<string, (module: any, exports: any, re
 
             // There are (at the time of writing) 11 modules exporting the window
             // Make these non enumerable to improve webpack search performance
-            if (exports === window && require.c) {
+            if (require.c && (exports === window || exports?.default === window)) {
                 Object.defineProperty(require.c, id, {
                     value: require.c[id],
                     enumerable: false,

src/webpack/webpack.tsx

@@ -376,7 +376,7 @@ export const cacheFind = traceFunction("cacheFind", function cacheFind(filter: F
 
     for (const key in cache) {
         const mod = cache[key];
-        if (!mod?.exports || mod.exports === window) continue;
+        if (!mod?.exports) continue;
 
         if (filter(mod.exports)) {
             return mod.exports;