package.json

@@ -1,7 +1,7 @@
 {
     "name": "vencord",
     "private": "true",
-    "version": "1.10.6",
+    "version": "1.10.5",
     "description": "The cutest Discord client mod",
     "homepage": "https://github.com/Vendicated/Vencord#readme",
     "bugs": {
@@ -35,7 +35,6 @@
         "testTsc": "tsc --noEmit"
     },
     "dependencies": {
-        "@intrnl/xxhash64": "^0.1.2",
         "@sapphi-red/web-noise-suppressor": "0.3.5",
         "@vap/core": "0.0.12",
         "@vap/shiki": "0.10.5",

pnpm-lock.yaml

@@ -16,9 +16,6 @@ importers:
 
   .:
     dependencies:
-      '@intrnl/xxhash64':
-        specifier: ^0.1.2
-        version: 0.1.2
       '@sapphi-red/web-noise-suppressor':
         specifier: 0.3.5
         version: 0.3.5
@@ -540,9 +537,6 @@ packages:
     resolution: {integrity: sha512-d2CGZR2o7fS6sWB7DG/3a95bGKQyHMACZ5aW8qGkkqQpUoZV6C0X7Pc7l4ZNMZkfNBf4VWNe9E1jRsf0G146Ew==}
     engines: {node: '>=18.18'}
 
-  '@intrnl/xxhash64@0.1.2':
-    resolution: {integrity: sha512-1+lx7j99fdph+uy3EnjQyr39KQZ7LP56+aWOr6finJWpgYpvb7XrhFUqDwnEk/wpPC98nCjAT6RulpW3crWjlg==}
-
   '@jridgewell/gen-mapping@0.3.5':
     resolution: {integrity: sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==}
     engines: {node: '>=6.0.0'}
@@ -2945,8 +2939,6 @@ snapshots:
 
   '@humanwhocodes/retry@0.3.0': {}
 
-  '@intrnl/xxhash64@0.1.2': {}
-
   '@jridgewell/gen-mapping@0.3.5':
     dependencies:
       '@jridgewell/set-array': 1.2.1

src/components/Icons.tsx

@@ -18,8 +18,9 @@
 
 import "./iconStyles.css";
 
-import { getIntlMessage, getTheme, Theme } from "@utils/discord";
+import { getTheme, Theme } from "@utils/discord";
 import { classes } from "@utils/misc";
+import { i18n } from "@webpack/common";
 import type { PropsWithChildren } from "react";
 
 interface BaseIconProps extends IconProps {
@@ -132,7 +133,7 @@ export function InfoIcon(props: IconProps) {
 export function OwnerCrownIcon(props: IconProps) {
     return (
         <Icon
-            aria-label={getIntlMessage("GUILD_OWNER")}
+            aria-label={i18n.Messages.GUILD_OWNER}
             {...props}
             className={classes(props.className, "vc-owner-crown-icon")}
             role="img"

src/debug/loadLazyChunks.ts

@@ -31,7 +31,9 @@ export async function loadLazyChunks() {
             const lazyChunks = factoryCode.matchAll(LazyChunkRegex);
             const validChunkGroups = new Set<[chunkIds: number[], entryPoint: number]>();
 
-            const shouldForceDefer = false;
+            // Workaround for a chunk that depends on the ChannelMessage component but may be be force loaded before
+            // the chunk containing the component
+            const shouldForceDefer = factoryCode.includes(".Messages.GUILD_FEED_UNFEATURE_BUTTON_TEXT");
 
             await Promise.all(Array.from(lazyChunks).map(async ([, rawChunkIds, entryPoint]) => {
                 const chunkIds = rawChunkIds ? Array.from(rawChunkIds.matchAll(Webpack.ChunkIdsRegex)).map(m => Number(m[1])) : [];

src/plugins/_api/memberListDecorators.ts

@@ -31,7 +31,7 @@ export default definePlugin({
                     match: /let\{[^}]*lostPermissionTooltipText:\i[^}]*\}=(\i),/,
                     replace: "$&vencordProps=$1,"
                 }, {
-                    match: /#{intl::GUILD_OWNER}(?=.+?decorators:(\i)\(\)).+?\1=?\(\)=>.+?children:\[/,
+                    match: /\.Messages\.GUILD_OWNER(?=.+?decorators:(\i)\(\)).+?\1=?\(\)=>.+?children:\[/,
                     replace: "$&...(typeof vencordProps=='undefined'?[]:Vencord.Api.MemberListDecorators.__getDecorators(vencordProps)),"
                 }
             ]

src/plugins/_api/messageAccessories.ts

@@ -25,7 +25,7 @@ export default definePlugin({
     authors: [Devs.Cyn],
     patches: [
         {
-            find: "#{intl::REMOVE_ATTACHMENT_BODY}",
+            find: ".Messages.REMOVE_ATTACHMENT_BODY",
             replacement: {
                 match: /(?<=.container\)?,children:)(\[.+?\])/,
                 replace: "Vencord.Api.MessageAccessories._modifyAccessories($1,this.props)",

src/plugins/_api/messageDecorations.ts

@@ -27,7 +27,7 @@ export default definePlugin({
         {
             find: '"Message Username"',
             replacement: {
-                match: /#{intl::GUILD_COMMUNICATION_DISABLED_BOTTOM_SHEET_TITLE}.+?}\),\i(?=\])/,
+                match: /\.Messages\.GUILD_COMMUNICATION_DISABLED_BOTTOM_SHEET_TITLE.+?}\),\i(?=\])/,
                 replace: "$&,...Vencord.Api.MessageDecorations.__addDecorationsToMessage(arguments[0])"
             }
         }

src/plugins/_api/messageEvents.ts

@@ -25,7 +25,7 @@ export default definePlugin({
     authors: [Devs.Arjix, Devs.hunt, Devs.Ven],
     patches: [
         {
-            find: "#{intl::EDIT_TEXTAREA_HELP}",
+            find: ".Messages.EDIT_TEXTAREA_HELP",
             replacement: {
                 match: /(?<=,channel:\i\}\)\.then\().+?(?=return \i\.content!==this\.props\.message\.content&&\i\((.+?)\))/,
                 replace: (match, args) => "" +

src/plugins/_api/messagePopover.ts

@@ -24,9 +24,9 @@ export default definePlugin({
     description: "API to add buttons to message popovers.",
     authors: [Devs.KingFish, Devs.Ven, Devs.Nuckyz],
     patches: [{
-        find: "#{intl::MESSAGE_UTILITIES_A11Y_LABEL}",
+        find: "Messages.MESSAGE_UTILITIES_A11Y_LABEL",
         replacement: {
-            match: /\.jsx\)\((\i\.\i),\{label:\i\.\i\.string\(\i\.\i#{intl::MESSAGE_ACTION_REPLY}.{0,200}?"reply-self".{0,50}?\}\):null(?=,.+?message:(\i))/,
+            match: /\.jsx\)\((\i\.\i),\{label:\i\.\i\.Messages\.MESSAGE_ACTION_REPLY.{0,200}?"reply-self".{0,50}?\}\):null(?=,.+?message:(\i))/,
             replace: "$&,Vencord.Api.MessagePopover._buildPopoverElements($1,$2)"
         }
     }],

src/plugins/_api/serverList.ts

@@ -25,16 +25,16 @@ export default definePlugin({
     description: "Api required for plugins that modify the server list",
     patches: [
         {
-            find: "#{intl::DISCODO_DISABLED}",
+            find: "Messages.DISCODO_DISABLED",
             replacement: {
-                match: /(?<=#{intl::DISCODO_DISABLED}.+?return)(\(.{0,75}?tutorialContainer.+?}\))(?=}function)/,
+                match: /(?<=Messages\.DISCODO_DISABLED.+?return)(\(.{0,75}?tutorialContainer.+?}\))(?=}function)/,
                 replace: "[$1].concat(Vencord.Api.ServerList.renderAll(Vencord.Api.ServerList.ServerListRenderPosition.Above))"
             }
         },
         {
-            find: "#{intl::SERVERS}),children",
+            find: "Messages.SERVERS,children",
             replacement: {
-                match: /(?<=#{intl::SERVERS}\),children:)\i\.map\(\i\)/,
+                match: /(?<=Messages\.SERVERS,children:)\i\.map\(\i\)/,
                 replace: "Vencord.Api.ServerList.renderAll(Vencord.Api.ServerList.ServerListRenderPosition.In).concat($&)"
             }
         }

src/plugins/_core/settings.tsx

@@ -25,9 +25,8 @@ import ThemesTab from "@components/VencordSettings/ThemesTab";
 import UpdaterTab from "@components/VencordSettings/UpdaterTab";
 import VencordTab from "@components/VencordSettings/VencordTab";
 import { Devs } from "@utils/constants";
-import { getIntlMessage } from "@utils/discord";
 import definePlugin, { OptionType } from "@utils/types";
-import { React } from "@webpack/common";
+import { i18n, React } from "@webpack/common";
 
 import gitHash from "~git-hash";
 
@@ -58,7 +57,7 @@ export default definePlugin({
             ]
         },
         {
-            find: ".SEARCH_NO_RESULTS&&0===",
+            find: "Messages.ACTIVITY_SETTINGS",
             replacement: [
                 {
                     match: /(?<=section:(.{0,50})\.DIVIDER\}\))([,;])(?=.{0,200}(\i)\.push.{0,100}label:(\i)\.header)/,
@@ -71,7 +70,7 @@ export default definePlugin({
             ]
         },
         {
-            find: "#{intl::USER_SETTINGS_ACTIONS_MENU_LABEL}",
+            find: "Messages.USER_SETTINGS_ACTIONS_MENU_LABEL",
             replacement: {
                 match: /(?<=function\((\i),\i\)\{)(?=let \i=Object.values\(\i.\i\).*?(\i\.\i)\.open\()/,
                 replace: "$2.open($1);return;"
@@ -149,18 +148,13 @@ export default definePlugin({
 
         if (!header) return;
 
-        try {
         const names = {
-                top: getIntlMessage("USER_SETTINGS"),
+            top: i18n.Messages.USER_SETTINGS,
-                aboveNitro: getIntlMessage("BILLING_SETTINGS"),
+            aboveNitro: i18n.Messages.BILLING_SETTINGS,
-                belowNitro: getIntlMessage("APP_SETTINGS"),
+            belowNitro: i18n.Messages.APP_SETTINGS,
-                aboveActivity: getIntlMessage("ACTIVITY_SETTINGS")
+            aboveActivity: i18n.Messages.ACTIVITY_SETTINGS
         };
-
         return header === names[settingsLocation];
-        } catch {
-            return firstChild === "PREMIUM";
-        }
     },
 
     patchedSettings: new WeakSet(),

src/plugins/_core/supportHelper.tsx

@@ -147,9 +147,9 @@ export default definePlugin({
     settings,
 
     patches: [{
-        find: "#{intl::BEGINNING_DM}",
+        find: ".BEGINNING_DM.format",
         replacement: {
-            match: /#{intl::BEGINNING_DM},{.+?}\),(?=.{0,300}(\i)\.isMultiUserDM)/,
+            match: /BEGINNING_DM\.format\(\{.+?\}\),(?=.{0,300}(\i)\.isMultiUserDM)/,
             replace: "$& $self.renderContributorDmWarningCard({ channel: $1 }),"
         }
     }],

src/plugins/accountPanelServerProfile/index.tsx

@@ -69,7 +69,7 @@ export default definePlugin({
 
     patches: [
         {
-            find: "#{intl::ACCOUNT_SPEAKING_WHILE_MUTED}",
+            find: ".Messages.ACCOUNT_SPEAKING_WHILE_MUTED",
             group: true,
             replacement: [
                 {

src/plugins/alwaysAnimate/index.ts

@@ -41,7 +41,7 @@ export default definePlugin({
         },
         {
             // Status emojis
-            find: "#{intl::GUILD_OWNER}",
+            find: ".Messages.GUILD_OWNER,",
             replacement: {
                 match: /(?<=\.activityEmoji,.+?animate:)\i/,
                 replace: "!0"

src/plugins/anonymiseFileNames/index.tsx

@@ -86,9 +86,9 @@ export default definePlugin({
             }
         },
         {
-            find: "#{intl::ATTACHMENT_UTILITIES_SPOILER}",
+            find: ".Messages.ATTACHMENT_UTILITIES_SPOILER",
             replacement: {
-                match: /(?<=children:\[)(?=.{10,80}tooltip:.{0,100}#{intl::ATTACHMENT_UTILITIES_SPOILER})/,
+                match: /(?<=children:\[)(?=.{10,80}tooltip:.{0,100}\i\.\i\.Messages\.ATTACHMENT_UTILITIES_SPOILER)/,
                 replace: "arguments[0].canEdit!==false?$self.renderIcon(arguments[0]):null,"
             },
         },

src/plugins/banger/index.ts

@@ -36,7 +36,7 @@ export default definePlugin({
     settings,
     patches: [
         {
-            find: "#{intl::BAN_CONFIRM_TITLE}",
+            find: "BAN_CONFIRM_TITLE.",
             replacement: {
                 match: /src:\i\("?\d+"?\)/g,
                 replace: "src:$self.source"

src/plugins/betterFolders/index.tsx

@@ -18,10 +18,9 @@
 
 import { definePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
-import { getIntlMessage } from "@utils/discord";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByPropsLazy, findLazy, findStoreLazy } from "@webpack";
-import { FluxDispatcher, useMemo } from "@webpack/common";
+import { FluxDispatcher, i18n, useMemo } from "@webpack/common";
 
 import FolderSideBar from "./FolderSideBar";
 
@@ -173,7 +172,7 @@ export default definePlugin({
                 // Disable expanding and collapsing folders transition in the normal GuildsBar sidebar
                 {
                     predicate: () => !settings.store.keepIcons,
-                    match: /(?<=#{intl::SERVER_FOLDER_PLACEHOLDER}.+?useTransition\)\()/,
+                    match: /(?<=\.Messages\.SERVER_FOLDER_PLACEHOLDER.+?useTransition\)\()/,
                     replace: "$self.shouldShowTransition(arguments[0])&&"
                 },
                 // If we are rendering the normal GuildsBar sidebar, we avoid rendering guilds from folders that are expanded
@@ -206,7 +205,7 @@ export default definePlugin({
             }
         },
         {
-            find: "#{intl::DISCODO_DISABLED}",
+            find: ".Messages.DISCODO_DISABLED",
             predicate: () => settings.store.closeAllHomeButton,
             replacement: {
                 // Close all folders when clicking the home button
@@ -275,16 +274,12 @@ export default definePlugin({
     },
 
     makeGuildsBarGuildListFilter(isBetterFolders: boolean) {
-        try {
         return child => {
             if (isBetterFolders) {
-                    return child?.props?.["aria-label"] === getIntlMessage("SERVERS");
+                return child?.props?.["aria-label"] === i18n.Messages.SERVERS;
             }
             return true;
         };
-        } catch {
-            return true;
-        }
     },
 
     makeGuildsBarTreeFilter(isBetterFolders: boolean) {

src/plugins/betterGifAltText/index.ts

@@ -34,9 +34,9 @@ export default definePlugin({
             },
         },
         {
-            find: "#{intl::GIF}",
+            find: ".Messages.GIF,",
             replacement: {
-                match: /alt:(\i)=(\i\.\i\.string\(\i\.\i#{intl::GIF}\))(?=,[^}]*\}=(\i))/,
+                match: /alt:(\i)=(\i\.\i\.Messages\.GIF)(?=,[^}]*\}=(\i))/,
                 replace:
                     // rename prop so we can always use default value
                     "alt_$$:$1=$self.altify($3)||$2",

src/plugins/betterNotes/index.tsx

@@ -63,9 +63,9 @@ export default definePlugin({
             }
         },
         {
-            find: "#{intl::NOTE_PLACEHOLDER}",
+            find: "Messages.NOTE_PLACEHOLDER",
             replacement: {
-                match: /#{intl::NOTE_PLACEHOLDER}\),/,
+                match: /\.NOTE_PLACEHOLDER,/,
                 replace: "$&spellCheck:!$self.noSpellCheck,"
             }
         }

src/plugins/betterRoleDot/index.ts

@@ -47,7 +47,7 @@ export default definePlugin({
         },
 
         {
-            find: "#{intl::ADD_ROLE_A11Y_LABEL}",
+            find: ".ADD_ROLE_A11Y_LABEL",
             all: true,
             predicate: () => Settings.plugins.BetterRoleDot.copyRoleColorInProfilePopout && !Settings.plugins.BetterRoleDot.bothStyles,
             noWarn: true,

src/plugins/betterSessions/index.tsx

@@ -60,7 +60,7 @@ export default definePlugin({
 
     patches: [
         {
-            find: "#{intl::AUTH_SESSIONS_SESSION_LOG_OUT}",
+            find: "Messages.AUTH_SESSIONS_SESSION_LOG_OUT",
             replacement: [
                 // Replace children with a single label with state
                 {

src/plugins/betterSettings/PluginsSubmenu.tsx

@@ -5,9 +5,8 @@
  */
 
 import { openPluginModal } from "@components/PluginSettings/PluginModal";
-import { getIntlMessage } from "@utils/discord";
 import { isObjectEmpty } from "@utils/misc";
-import { Alerts, Menu, useMemo, useState } from "@webpack/common";
+import { Alerts, i18n, Menu, useMemo, useState } from "@webpack/common";
 
 import Plugins from "~plugins";
 
@@ -49,7 +48,7 @@ export default function PluginsSubmenu() {
                         query={query}
                         onChange={setQuery}
                         ref={ref}
-                        placeholder={getIntlMessage("SEARCH")}
+                        placeholder={i18n.Messages.SEARCH}
                     />
                 )}
             />

src/plugins/betterSettings/index.tsx

@@ -7,11 +7,10 @@
 import { definePluginSettings } from "@api/Settings";
 import { classNameFactory } from "@api/Styles";
 import { Devs } from "@utils/constants";
-import { getIntlMessage } from "@utils/discord";
 import { Logger } from "@utils/Logger";
 import definePlugin, { OptionType } from "@utils/types";
 import { waitFor } from "@webpack";
-import { ComponentDispatch, FocusLock, Menu, useEffect, useRef } from "@webpack/common";
+import { ComponentDispatch, FocusLock, i18n, Menu, useEffect, useRef } from "@webpack/common";
 import type { HTMLAttributes, ReactElement } from "react";
 
 import PluginsSubmenu from "./PluginsSubmenu";
@@ -112,7 +111,7 @@ export default definePlugin({
             predicate: () => settings.store.disableFade
         },
         { // Load menu TOC eagerly
-            find: "#{intl::USER_SETTINGS_WITH_BUILD_OVERRIDE}",
+            find: "Messages.USER_SETTINGS_WITH_BUILD_OVERRIDE.format",
             replacement: {
                 match: /(\i)\(this,"handleOpenSettingsContextMenu",.{0,100}?null!=\i&&.{0,100}?(await Promise\.all[^};]*?\)\)).*?,(?=\1\(this)/,
                 replace: "$&(async ()=>$2)(),"
@@ -120,7 +119,7 @@ export default definePlugin({
             predicate: () => settings.store.eagerLoad
         },
         { // Settings cog context menu
-            find: "#{intl::USER_SETTINGS_ACTIONS_MENU_LABEL}",
+            find: "Messages.USER_SETTINGS_ACTIONS_MENU_LABEL",
             replacement: [
                 {
                     match: /(EXPERIMENTS:.+?)(\(0,\i.\i\)\(\))(?=\.filter\(\i=>\{let\{section:\i\}=)/,
@@ -160,7 +159,7 @@ export default definePlugin({
             if (item.section === "HEADER") {
                 items.push({ label: item.label, items: [] });
             } else if (item.section === "DIVIDER") {
-                items.push({ label: getIntlMessage("OTHER_OPTIONS"), items: [] });
+                items.push({ label: i18n.Messages.OTHER_OPTIONS, items: [] });
             } else {
                 items.at(-1)!.items.push(item);
             }

src/plugins/clientTheme/index.tsx

@@ -14,7 +14,7 @@ import definePlugin, { OptionType, StartAt } from "@utils/types";
 import { findByCodeLazy, findComponentByCodeLazy, findStoreLazy } from "@webpack";
 import { Button, Forms, ThemeStore, useStateFromStores } from "@webpack/common";
 
-const ColorPicker = findComponentByCodeLazy("#{intl::USER_SETTINGS_PROFILE_COLOR_SELECT_COLOR}", ".BACKGROUND_PRIMARY)");
+const ColorPicker = findComponentByCodeLazy(".Messages.USER_SETTINGS_PROFILE_COLOR_SELECT_COLOR", ".BACKGROUND_PRIMARY)");
 
 const colorPresets = [
     "#1E1514", "#172019", "#13171B", "#1C1C28", "#402D2D",

src/plugins/consoleJanitor/index.ts

@@ -66,13 +66,6 @@ export default definePlugin({
     },
 
     patches: [
-        {
-            find: 'react-spring: The "interpolate" function',
-            replacement: {
-                match: /,console.warn\('react-spring: The "interpolate" function is deprecated in v10 \(use "to" instead\)'\)/,
-                replace: ""
-            }
-        },
         {
             find: 'console.warn("Window state not initialized"',
             replacement: {

src/plugins/consoleShortcuts/index.ts

@@ -18,7 +18,6 @@
 
 import { Devs } from "@utils/constants";
 import { getCurrentChannel, getCurrentGuild } from "@utils/discord";
-import { runtimeHashMessageKey } from "@utils/intlHash";
 import { SYM_LAZY_CACHED, SYM_LAZY_GET } from "@utils/lazy";
 import { relaunch } from "@utils/native";
 import { canonicalizeMatch, canonicalizeReplace, canonicalizeReplacement } from "@utils/patches";
@@ -105,7 +104,6 @@ function makeShortcuts() {
         canonicalizeMatch,
         canonicalizeReplace,
         canonicalizeReplacement,
-        runtimeHashMessageKey,
         fakeRender: (component: ComponentType, props: any) => {
             const prevWin = fakeRenderWin?.deref();
             const win = prevWin?.closed === false

src/plugins/copyFileContents/index.tsx

@@ -25,7 +25,7 @@ export default definePlugin({
     authors: [Devs.Obsidian, Devs.Nuckyz],
     patches: [
         {
-            find: "#{intl::PREVIEW_BYTES_LEFT}",
+            find: ".Messages.PREVIEW_BYTES_LEFT.format(",
             replacement: {
                 match: /\.footerGap.+?url:\i,fileName:\i,fileSize:\i}\),(?<=fileContents:(\i),bytesLeft:(\i).+?)/g,
                 replace: "$&$self.addCopyButton({fileContents:$1,bytesLeft:$2}),"

src/plugins/crashHandler/index.ts

@@ -67,7 +67,7 @@ export default definePlugin({
 
     patches: [
         {
-            find: "#{intl::ERRORS_UNEXPECTED_CRASH}",
+            find: ".Messages.ERRORS_UNEXPECTED_CRASH",
             replacement: {
                 match: /this\.setState\((.+?)\)/,
                 replace: "$self.handleCrash(this,$1);"

src/plugins/decor/index.tsx

@@ -41,7 +41,7 @@ export default definePlugin({
         {
             find: "DefaultCustomizationSections",
             replacement: {
-                match: /(?<=#{intl::USER_SETTINGS_AVATAR_DECORATION}\)},"decoration"\),)/,
+                match: /(?<=USER_SETTINGS_AVATAR_DECORATION},"decoration"\),)/,
                 replace: "$self.DecorSection(),"
             }
         },

src/plugins/decor/ui/components/DecorationGridCreate.tsx

@@ -5,8 +5,7 @@
  */
 
 import { PlusIcon } from "@components/Icons";
-import { getIntlMessage } from "@utils/discord";
+import { i18n, Text } from "@webpack/common";
-import { Text } from "@webpack/common";
 import { HTMLProps } from "react";
 
 import { DecorationGridItem } from ".";
@@ -25,7 +24,7 @@ export default function DecorationGridCreate(props: DecorationGridCreateProps) {
             variant="text-xs/normal"
             color="header-primary"
         >
-            {getIntlMessage("CREATE")}
+            {i18n.Messages.CREATE}
         </Text>
     </DecorationGridItem >;
 }

src/plugins/decor/ui/components/DecorationGridNone.tsx

@@ -5,8 +5,7 @@
  */
 
 import { NoEntrySignIcon } from "@components/Icons";
-import { getIntlMessage } from "@utils/discord";
+import { i18n, Text } from "@webpack/common";
-import { Text } from "@webpack/common";
 import { HTMLProps } from "react";
 
 import { DecorationGridItem } from ".";
@@ -25,7 +24,7 @@ export default function DecorationGridNone(props: DecorationGridNoneProps) {
             variant="text-xs/normal"
             color="header-primary"
         >
-            {getIntlMessage("NONE")}
+            {i18n.Messages.NONE}
         </Text>
     </DecorationGridItem >;
 }

src/plugins/disableCallIdle/index.ts

@@ -27,7 +27,7 @@ export default definePlugin({
     authors: [Devs.Nuckyz],
     patches: [
         {
-            find: "#{intl::BOT_CALL_IDLE_DISCONNECT_2}",
+            find: ".Messages.BOT_CALL_IDLE_DISCONNECT",
             replacement: {
                 match: /,?(?=\i\(this,"idleTimeout",new \i\.\i\))/,
                 replace: ";return;"

src/plugins/fakeNitro/index.tsx

@@ -285,7 +285,7 @@ export default definePlugin({
         },
         // Remove boost requirements to stream with high quality
         {
-            find: "#{intl::STREAM_FPS_OPTION}",
+            find: "STREAM_FPS_OPTION.format",
             predicate: () => settings.store.enableStreamQualityBypass,
             replacement: {
                 match: /guildPremiumTier:\i\.\i\.TIER_\d,?/g,
@@ -356,7 +356,7 @@ export default definePlugin({
             ]
         },
         {
-            find: "#{intl::STICKER_POPOUT_UNJOINED_PRIVATE_GUILD_DESCRIPTION}",
+            find: ".Messages.STICKER_POPOUT_UNJOINED_PRIVATE_GUILD_DESCRIPTION.format",
             predicate: () => settings.store.transformStickers,
             replacement: [
                 {
@@ -381,7 +381,7 @@ export default definePlugin({
             }
         },
         {
-            find: "#{intl::EMOJI_POPOUT_UNJOINED_DISCOVERABLE_GUILD_DESCRIPTION}",
+            find: ".Messages.EMOJI_POPOUT_UNJOINED_DISCOVERABLE_GUILD_DESCRIPTION",
             predicate: () => settings.store.transformEmojis,
             replacement: {
                 // Add the fake nitro emoji notice

src/plugins/fakeProfileThemes/index.tsx

@@ -108,10 +108,10 @@ interface ProfileModalProps {
     isTryItOutFlow: boolean;
 }
 
-const ColorPicker = findComponentByCodeLazy<ColorPickerProps>("#{intl::USER_SETTINGS_PROFILE_COLOR_SELECT_COLOR}", ".BACKGROUND_PRIMARY)");
+const ColorPicker = findComponentByCodeLazy<ColorPickerProps>(".Messages.USER_SETTINGS_PROFILE_COLOR_SELECT_COLOR", ".BACKGROUND_PRIMARY)");
 const ProfileModal = findComponentByCodeLazy<ProfileModalProps>("isTryItOutFlow:", "pendingThemeColors:", "pendingAvatarDecoration:", "EDIT_PROFILE_BANNER");
 
-const requireColorPicker = extractAndLoadChunksLazy(["#{intl::USER_SETTINGS_PROFILE_COLOR_DEFAULT_BUTTON}"], /createPromise:\(\)=>\i\.\i(\("?.+?"?\)).then\(\i\.bind\(\i,"?(.+?)"?\)\)/);
+const requireColorPicker = extractAndLoadChunksLazy(["USER_SETTINGS_PROFILE_COLOR_DEFAULT_BUTTON.format"], /createPromise:\(\)=>\i\.\i(\("?.+?"?\)).then\(\i\.bind\(\i,"?(.+?)"?\)\)/);
 
 export default definePlugin({
     name: "FakeProfileThemes",
@@ -126,9 +126,9 @@ export default definePlugin({
             }
         },
         {
-            find: "#{intl::USER_SETTINGS_RESET_PROFILE_THEME}",
+            find: ".USER_SETTINGS_RESET_PROFILE_THEME",
             replacement: {
-                match: /#{intl::USER_SETTINGS_RESET_PROFILE_THEME}\)}\)(?<=color:(\i),.{0,500}?color:(\i),.{0,500}?)/,
+                match: /RESET_PROFILE_THEME}\)(?<=color:(\i),.{0,500}?color:(\i),.{0,500}?)/,
                 replace: "$&,$self.addCopy3y3Button({primary:$1,accent:$2})"
             }
         }

src/plugins/forceOwnerCrown/index.ts

@@ -27,7 +27,7 @@ export default definePlugin({
     authors: [Devs.D3SOX, Devs.Nickyux],
     patches: [
         {
-            find: "#{intl::GUILD_OWNER}",
+            find: ".Messages.GUILD_OWNER,",
             replacement: {
                 match: /,isOwner:(\i),/,
                 replace: ",_isOwner:$1=$self.isGuildOwner(e),"

src/plugins/friendsSince/index.tsx

@@ -26,7 +26,7 @@ export default definePlugin({
         {
             find: ".PANEL}),nicknameIcons",
             replacement: {
-                match: /#{intl::USER_PROFILE_MEMBER_SINCE}\),.{0,100}userId:(\i\.id)}\)}\)/,
+                match: /USER_PROFILE_MEMBER_SINCE,.{0,100}userId:(\i\.id)}\)}\)/,
                 replace: "$&,$self.FriendsSinceComponent({userId:$1,isSidebar:true})"
             }
         },
@@ -34,7 +34,7 @@ export default definePlugin({
         {
             find: "action:\"PRESS_APP_CONNECTION\"",
             replacement: {
-                match: /#{intl::USER_PROFILE_MEMBER_SINCE}\),.{0,100}userId:(\i\.id),.{0,100}}\)}\),/,
+                match: /USER_PROFILE_MEMBER_SINCE,.{0,100}userId:(\i\.id),.{0,100}}\)}\),/,
                 replace: "$&,$self.FriendsSinceComponent({userId:$1,isSidebar:false}),"
             }
         }

src/plugins/fullSearchContext/index.tsx

@@ -19,11 +19,10 @@
 import { findGroupChildrenByChildId, NavContextMenuPatchCallback } from "@api/ContextMenu";
 import { migratePluginSettings } from "@api/Settings";
 import { Devs } from "@utils/constants";
-import { getIntlMessage } from "@utils/discord";
 import { NoopComponent } from "@utils/react";
 import definePlugin from "@utils/types";
 import { filters, findByPropsLazy, waitFor } from "@webpack";
-import { ChannelStore, ContextMenuApi, UserStore } from "@webpack/common";
+import { ChannelStore, ContextMenuApi, i18n, UserStore } from "@webpack/common";
 import { Message } from "discord-types/general";
 
 const { useMessageMenu } = findByPropsLazy("useMessageMenu");
@@ -42,7 +41,7 @@ function MessageMenu({ message, channel, onHeightUpdate }) {
 
     return useMessageMenu({
         navId: "message-actions",
-        ariaLabel: getIntlMessage("MESSAGE_UTILITIES_A11Y_LABEL"),
+        ariaLabel: i18n.Messages.MESSAGE_UTILITIES_A11Y_LABEL,
 
         message,
         channel,
@@ -73,7 +72,7 @@ const contextMenuPatch: NavContextMenuPatchCallback = (children, props: MessageA
 
     const group = findGroupChildrenByChildId("devmode-copy-id", children, true);
     group?.push(
-        CopyIdMenuItem({ id: props.message.author.id, label: getIntlMessage("COPY_ID_AUTHOR") })
+        CopyIdMenuItem({ id: props.message.author.id, label: i18n.Messages.COPY_ID_AUTHOR })
     );
 };
 

src/plugins/gameActivityToggle/index.tsx

@@ -92,7 +92,7 @@ export default definePlugin({
 
     patches: [
         {
-            find: "#{intl::ACCOUNT_SPEAKING_WHILE_MUTED}",
+            find: ".Messages.ACCOUNT_SPEAKING_WHILE_MUTED",
             replacement: {
                 match: /this\.renderNameZone\(\).+?children:\[/,
                 replace: "$&$self.GameActivityToggleButton(),"

src/plugins/greetStickerPicker/index.tsx

@@ -166,7 +166,7 @@ export default definePlugin({
 
     patches: [
         {
-            find: "#{intl::WELCOME_CTA_LABEL}",
+            find: "Messages.WELCOME_CTA_LABEL",
             replacement: {
                 match: /innerClassName:\i\.welcomeCTAButton,(?<={channel:\i,message:\i}=(\i).{0,400}?)/,
                 replace: "$&onContextMenu:(vcEvent)=>$self.pickSticker(vcEvent, $1),"

src/plugins/ignoreActivities/index.tsx

@@ -260,9 +260,9 @@ export default definePlugin({
             }
         },
         {
-            find: "#{intl::SETTINGS_GAMES_TOGGLE_OVERLAY}",
+            find: ".Messages.SETTINGS_GAMES_TOGGLE_OVERLAY",
             replacement: {
-                match: /#{intl::SETTINGS_GAMES_TOGGLE_OVERLAY}.+?}\(\),(?<={overlay:\i,.+?=(\i),.+?)(?=!(\i))/,
+                match: /\.Messages\.SETTINGS_GAMES_TOGGLE_OVERLAY.+?}\(\),(?<={overlay:\i,.+?=(\i),.+?)(?=!(\i))/,
                 replace: (m, props, nowPlaying) => `${m}$self.renderToggleGameActivityButton(${props},${nowPlaying}),`
             }
         },

src/plugins/imageZoom/index.tsx

@@ -179,11 +179,6 @@ export default definePlugin({
                 {
                     match: /componentWillUnmount\(\){/,
                     replace: "$&$self.unMountMagnifier();"
-                },
-
-                {
-                    match: /componentDidUpdate\(\i\){/,
-                    replace: "$&$self.updateMagnifier(this);"
                 }
             ]
         }
@@ -220,11 +215,6 @@ export default definePlugin({
         }
     },
 
-    updateMagnifier(instance) {
-        this.unMountMagnifier();
-        this.renderMagnifier(instance);
-    },
-
     unMountMagnifier() {
         this.root?.unmount();
         this.currentMagnifierElement = null;

src/plugins/implicitRelationships/index.ts

@@ -32,7 +32,7 @@ export default definePlugin({
     patches: [
         // Counts header
         {
-            find: "#{intl::FRIENDS_ALL_HEADER}",
+            find: ".FRIENDS_ALL_HEADER",
             replacement: {
                 match: /toString\(\)\}\);case (\i\.\i)\.BLOCKED/,
                 replace: 'toString()});case $1.IMPLICIT:return "Implicit — "+arguments[1];case $1.BLOCKED'
@@ -48,9 +48,9 @@ export default definePlugin({
         },
         // Sections header
         {
-            find: "#{intl::FRIENDS_SECTION_ONLINE}",
+            find: ".FRIENDS_SECTION_ONLINE",
             replacement: {
-                match: /(\(0,\i\.jsx\)\(\i\.TabBar\.Item,\{id:\i\.\i)\.BLOCKED,className:([^\s]+?)\.item,children:\i\.\i\.string\(\i\.\i#{intl::BLOCKED}\)\}\)/,
+                match: /(\(0,\i\.jsx\)\(\i\.TabBar\.Item,\{id:\i\.\i)\.BLOCKED,className:([^\s]+?)\.item,children:\i\.\i\.Messages\.BLOCKED\}\)/,
                 replace: "$1.IMPLICIT,className:$2.item,children:\"Implicit\"}),$&"
             },
         },
@@ -117,7 +117,7 @@ export default definePlugin({
 
     wrapSort(comparator: Function, row: any) {
         return row.type === 5
-            ? -(UserAffinitiesStore.getUserAffinity(row.user.id)?.affinity ?? 0)
+            ? -UserAffinitiesStore.getUserAffinity(row.user.id)?.affinity ?? 0
             : comparator(row);
     },
 

src/plugins/invisibleChat.desktop/index.tsx

@@ -111,7 +111,7 @@ export default definePlugin({
     patches: [
         {
             // Indicator
-            find: "#{intl::MESSAGE_EDITED}",
+            find: ".Messages.MESSAGE_EDITED,",
             replacement: {
                 match: /let\{className:\i,message:\i[^}]*\}=(\i)/,
                 replace: "try {$1 && $self.INV_REGEX.test($1.message.content) ? $1.content.push($self.indicator()) : null } catch {};$&"

src/plugins/keepCurrentChannel/index.ts

@@ -19,7 +19,7 @@
 import * as DataStore from "@api/DataStore";
 import { Devs } from "@utils/constants";
 import definePlugin from "@utils/types";
-import { ChannelRouter, ChannelStore, NavigationRouter, SelectedChannelStore, SelectedGuildStore } from "@webpack/common";
+import { ChannelRouter, SelectedChannelStore, SelectedGuildStore } from "@webpack/common";
 
 export interface LogoutEvent {
     type: "LOGOUT";
@@ -45,16 +45,6 @@ export default definePlugin({
     description: "Attempt to navigate to the channel you were in before switching accounts or loading Discord.",
     authors: [Devs.Nuckyz],
 
-    patches: [
-        {
-            find: '"Switching accounts"',
-            replacement: {
-                match: /goHomeAfterSwitching:\i/,
-                replace: "goHomeAfterSwitching:!1"
-            }
-        }
-    ],
-
     flux: {
         LOGOUT(e: LogoutEvent) {
             ({ isSwitchingAccount } = e);
@@ -65,11 +55,7 @@ export default definePlugin({
             isSwitchingAccount = false;
 
             if (previousCache?.channelId) {
-                if (ChannelStore.hasChannel(previousCache.channelId)) {
                 ChannelRouter.transitionToChannel(previousCache.channelId);
-                } else {
-                    NavigationRouter.transitionToGuild("@me");
-                }
             }
         },
 

src/plugins/loadingQuotes/index.ts

@@ -62,7 +62,7 @@ export default definePlugin({
 
     patches: [
         {
-            find: "#{intl::LOADING_DID_YOU_KNOW}",
+            find: ".LOADING_DID_YOU_KNOW",
             replacement: [
                 {
                     match: /"_loadingText".+?(?=(\i)\[.{0,10}\.random)/,

src/plugins/memberCount/index.tsx

@@ -74,7 +74,7 @@ export default definePlugin({
         {
             find: ".invitesDisabledTooltip",
             replacement: {
-                match: /#{intl::VIEW_AS_ROLES_MENTIONS_WARNING}.{0,100}(?=])/,
+                match: /\.VIEW_AS_ROLES_MENTIONS_WARNING.{0,100}(?=])/,
                 replace: "$&,$self.renderTooltip(arguments[0].guild)"
             },
             predicate: () => settings.store.toolTip

src/plugins/messageLogger/index.tsx

@@ -24,12 +24,12 @@ import { Settings } from "@api/Settings";
 import { disableStyle, enableStyle } from "@api/Styles";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
-import { getIntlMessage } from "@utils/discord";
+import { proxyLazy } from "@utils/lazy";
 import { Logger } from "@utils/Logger";
 import { classes } from "@utils/misc";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByCodeLazy, findByPropsLazy } from "@webpack";
-import { ChannelStore, FluxDispatcher, Menu, MessageStore, Parser, SelectedChannelStore, Timestamp, UserStore, useStateFromStores } from "@webpack/common";
+import { ChannelStore, FluxDispatcher, i18n, Menu, MessageStore, Parser, SelectedChannelStore, Timestamp, UserStore, useStateFromStores } from "@webpack/common";
 import { Message } from "discord-types/general";
 
 import overlayStyle from "./deleteStyleOverlay.css?managed";
@@ -178,7 +178,7 @@ export default definePlugin({
                             isEdited={true}
                             isInline={false}
                         >
-                            <span className={styles.edited}>{" "}({getIntlMessage("MESSAGE_EDITED")})</span>
+                            <span className={styles.edited}>{" "}({i18n.Messages.MESSAGE_EDITED})</span>
                         </Timestamp>
                     </div>
                 ))}
@@ -312,35 +312,9 @@ export default definePlugin({
         );
     },
 
-    Messages: {
+    Messages: proxyLazy(() => ({
-        // DELETED_MESSAGE_COUNT: getMessage("{count, plural, =0 {No deleted messages} one {{count} deleted message} other {{count} deleted messages}}")
+        DELETED_MESSAGE_COUNT: getMessage("{count, plural, =0 {No deleted messages} one {{count} deleted message} other {{count} deleted messages}}")
-        // TODO: find a better way to generate intl messages
+    })),
-        DELETED_MESSAGE_COUNT: () => ({
-            ast: [[
-                6,
-                "count",
-                {
-                    "=0": ["No deleted messages"],
-                    one: [
-                        [
-                            1,
-                            "count"
-                        ],
-                        " deleted message"
-                    ],
-                    other: [
-                        [
-                            1,
-                            "count"
-                        ],
-                        " deleted messages"
-                    ]
-                },
-                0,
-                "cardinal"
-            ]]
-        })
-    },
 
     patches: [
         {
@@ -471,7 +445,7 @@ export default definePlugin({
 
         {
             // Message content renderer
-            find: "#{intl::MESSAGE_EDITED}",
+            find: "Messages.MESSAGE_EDITED,\")\"",
             replacement: [
                 {
                     // Render editHistory in the deepest div for message content
@@ -523,7 +497,7 @@ export default definePlugin({
         },
         {
             // Message group rendering
-            find: "#{intl::NEW_MESSAGES_ESTIMATED_WITH_DATE}",
+            find: "Messages.NEW_MESSAGES_ESTIMATED_WITH_DATE",
             replacement: [
                 {
                     match: /(\i).type===\i\.\i\.MESSAGE_GROUP_BLOCKED\|\|/,

src/plugins/moreUserTags/index.tsx

@@ -19,7 +19,6 @@
 import { definePluginSettings } from "@api/Settings";
 import { Flex } from "@components/Flex";
 import { Devs } from "@utils/constants";
-import { getIntlMessage } from "@utils/discord";
 import { Margins } from "@utils/margins";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByCodeLazy, findLazy } from "@webpack";
@@ -188,13 +187,13 @@ export default definePlugin({
             }
         },
         {
-            find: "#{intl::DISCORD_SYSTEM_MESSAGE_BOT_TAG_TOOLTIP_OFFICIAL}",
+            find: ".DISCORD_SYSTEM_MESSAGE_BOT_TAG_TOOLTIP_OFFICIAL,",
             replacement: [
                 // make the tag show the right text
                 {
-                    match: /(switch\((\i)\){.+?)case (\i(?:\.\i)?)\.BOT:default:(\i)=(.{0,40}#{intl::APP_TAG}\))/,
+                    match: /(switch\((\i)\){.+?)case (\i(?:\.\i)?)\.BOT:default:(\i)=.{0,40}(\i\.\i\.Messages)\.APP_TAG/,
-                    replace: (_, origSwitch, variant, tags, displayedText, originalText) =>
+                    replace: (_, origSwitch, variant, tags, displayedText, strings) =>
-                        `${origSwitch}default:{${displayedText} = $self.getTagText(${tags}[${variant}],${originalText})}`
+                        `${origSwitch}default:{${displayedText} = $self.getTagText(${tags}[${variant}], ${strings})}`
                 },
                 // show OP tags correctly
                 {
@@ -218,7 +217,7 @@ export default definePlugin({
         },
         // in the member list
         {
-            find: "#{intl::GUILD_OWNER}",
+            find: ".Messages.GUILD_OWNER,",
             replacement: {
                 match: /(?<type>\i)=\(null==.{0,100}\.BOT;return null!=(?<user>\i)&&\i\.bot/,
                 replace: "$<type> = $self.getTag({user: $<user>, channel: arguments[0].channel, origType: $<user>.bot ? 0 : null, location: 'not-chat' }); return typeof $<type> === 'number'"
@@ -233,7 +232,7 @@ export default definePlugin({
             }
         },
         {
-            find: "#{intl::USER_PROFILE_PRONOUNS}",
+            find: ".Messages.USER_PROFILE_PRONOUNS",
             replacement: {
                 match: /(?=,hideBotTag:!0)/,
                 replace: ",moreTags_channelId:arguments[0].moreTags_channelId"
@@ -296,26 +295,22 @@ export default definePlugin({
 
     isOPTag: (tag: number) => tag === Tag.Types.ORIGINAL_POSTER || tags.some(t => tag === Tag.Types[`${t.name}-OP`]),
 
-    getTagText(passedTagName: string, originalText: string) {
+    getTagText(passedTagName: string, strings: Record<string, string>) {
-        try {
+        if (!passedTagName) return strings.APP_TAG;
         const [tagName, variant] = passedTagName.split("-");
-            if (!passedTagName) return getIntlMessage("APP_TAG");
         const tag = tags.find(({ name }) => tagName === name);
-            if (!tag) return getIntlMessage("APP_TAG");
+        if (!tag) return strings.APP_TAG;
-            if (variant === "BOT" && tagName !== "WEBHOOK" && this.settings.store.dontShowForBots) return getIntlMessage("APP_TAG");
+        if (variant === "BOT" && tagName !== "WEBHOOK" && this.settings.store.dontShowForBots) return strings.APP_TAG;
 
         const tagText = settings.store.tagSettings?.[tag.name]?.text || tag.displayName;
         switch (variant) {
             case "OP":
-                    return `${getIntlMessage("BOT_TAG_FORUM_ORIGINAL_POSTER")} • ${tagText}`;
+                return `${strings.BOT_TAG_FORUM_ORIGINAL_POSTER} • ${tagText}`;
             case "BOT":
-                    return `${getIntlMessage("APP_TAG")} • ${tagText}`;
+                return `${strings.APP_TAG} • ${tagText}`;
             default:
                 return tagText;
         }
-        } catch {
-            return originalText;
-        }
     },
 
     getTag({

src/plugins/noBlockedMessages/index.ts

@@ -18,18 +18,17 @@
 
 import { Settings } from "@api/Settings";
 import { Devs } from "@utils/constants";
-import { runtimeHashMessageKey } from "@utils/intlHash";
 import { Logger } from "@utils/Logger";
 import definePlugin, { OptionType } from "@utils/types";
 import { findByPropsLazy } from "@webpack";
-import { i18n } from "@webpack/common";
 import { Message } from "discord-types/general";
 
 const RelationshipStore = findByPropsLazy("getRelationships", "isBlocked");
 
 interface MessageDeleteProps {
-    // i18n message i18n.t["+FcYMz"] if deleted, with args
+    collapsedReason: {
-    collapsedReason: () => any
+        message: string;
+    };
 }
 
 export default definePlugin({
@@ -38,7 +37,7 @@ export default definePlugin({
     authors: [Devs.rushii, Devs.Samu],
     patches: [
         {
-            find: "#{intl::BLOCKED_MESSAGES_HIDE}",
+            find: "Messages.BLOCKED_MESSAGES_HIDE",
             replacement: [
                 {
                     match: /let\{[^}]*collapsedReason[^}]*\}/,
@@ -78,11 +77,6 @@ export default definePlugin({
     },
 
     shouldHide(props: MessageDeleteProps) {
-        try {
+        return !props?.collapsedReason?.message.includes("deleted");
-            return props.collapsedReason() === i18n.t[runtimeHashMessageKey("BLOCKED_MESSAGE_COUNT")]();
-        } catch (e) {
-            console.error(e);
-        }
-        return false;
     }
 });

src/plugins/noOnboardingDelay/index.ts

@@ -25,7 +25,7 @@ export default definePlugin({
     authors: [Devs.nekohaxx],
     patches: [
         {
-            find: "#{intl::ONBOARDING_COVER_WELCOME_SUBTITLE}",
+            find: "Messages.ONBOARDING_COVER_WELCOME_SUBTITLE",
             replacement: {
                 match: "3e3",
                 replace: "0"

src/plugins/noPendingCount/index.ts

@@ -87,7 +87,7 @@ export default definePlugin({
             replacement: {
                 // The two groups inside the first group grab the minified names of the variables,
                 // they are then referenced later to find unviewedTrialCount + unviewedDiscountCount.
-                match: /(?<=\{unviewedTrialCount:(\i),unviewedDiscountCount:(\i)\}.{0,300}\i=)\1\+\2/,
+                match: /(?<=\{unviewedTrialCount:(\i),unviewedDiscountCount:(\i)\}.{0,200}\i=)\1\+\2/,
                 replace: "0"
             }
         }

src/plugins/noUnblockToJump/index.ts

@@ -28,21 +28,21 @@ export default definePlugin({
         {
             find: '.id,"Search Results"',
             replacement: {
-                match: /if\(.{1,10}\)(.{1,10}\.show\({.{1,50}#{intl::UNBLOCK_TO_JUMP_TITLE})/,
+                match: /if\(.{1,10}\)(.{1,10}\.show\({.{1,50}UNBLOCK_TO_JUMP_TITLE)/,
                 replace: "if(false)$1"
             }
         },
         {
             find: "renderJumpButton()",
             replacement: {
-                match: /if\(.{1,10}\)(.{1,10}\.show\({.{1,50}#{intl::UNBLOCK_TO_JUMP_TITLE})/,
+                match: /if\(.{1,10}\)(.{1,10}\.show\({.{1,50}UNBLOCK_TO_JUMP_TITLE)/,
                 replace: "if(false)$1"
             }
         },
         {
             find: "flash:!0,returnMessageId",
             replacement: {
-                match: /.\?(.{1,10}\.show\({.{1,50}#{intl::UNBLOCK_TO_JUMP_TITLE})/,
+                match: /.\?(.{1,10}\.show\({.{1,50}UNBLOCK_TO_JUMP_TITLE)/,
                 replace: "false?$1"
             }
         }

src/plugins/normalizeMessageLinks/index.ts

@@ -13,7 +13,7 @@ export default definePlugin({
     authors: [Devs.bb010g],
     patches: [
         {
-            find: "#{intl::COPY_MESSAGE_LINK}",
+            find: ".Messages.COPY_MESSAGE_LINK,",
             replacement: {
                 match: /\.concat\(location\.host\)/,
                 replace: ".concat($self.normalizeHost(location.host))",

src/plugins/pauseInvitesForever/index.tsx

@@ -18,9 +18,8 @@
 
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
-import { getIntlMessage } from "@utils/discord";
 import definePlugin from "@utils/types";
-import { Constants, GuildStore, RestAPI } from "@webpack/common";
+import { Constants, GuildStore, i18n, RestAPI } from "@webpack/common";
 
 function showDisableInvites(guildId: string) {
     // @ts-ignore
@@ -44,15 +43,15 @@ export default definePlugin({
 
     patches: [
         {
-            find: "#{intl::GUILD_INVITE_DISABLE_ACTION_SHEET_DESCRIPTION}",
+            find: "Messages.GUILD_INVITE_DISABLE_ACTION_SHEET_DESCRIPTION",
             group: true,
             replacement: [
                 {
-                    match: /children:\i\.\i\.string\(\i\.\i#{intl::GUILD_INVITE_DISABLE_ACTION_SHEET_DESCRIPTION}\)/,
+                    match: /children:\i\.\i\.\i\.GUILD_INVITE_DISABLE_ACTION_SHEET_DESCRIPTION/,
                     replace: "children: $self.renderInvitesLabel({guildId:arguments[0].guildId,setChecked})",
                 },
                 {
-                    match: /\.INVITES_DISABLED\)(?=.+?#{intl::INVITES_PERMANENTLY_DISABLED_TIP}.+?checked:(\i)).+?\[\1,(\i)\]=\i.useState\(\i\)/,
+                    match: /\.INVITES_DISABLED\)(?=.+?\.Messages\.INVITES_PERMANENTLY_DISABLED_TIP.+?checked:(\i)).+?\[\1,(\i)\]=\i.useState\(\i\)/,
                     replace: "$&,setChecked=$2"
                 }
             ]
@@ -62,7 +61,7 @@ export default definePlugin({
     renderInvitesLabel: ErrorBoundary.wrap(({ guildId, setChecked }) => {
         return (
             <div>
-                {getIntlMessage("GUILD_INVITE_DISABLE_ACTION_SHEET_DESCRIPTION")}
+                {i18n.Messages.GUILD_INVITE_DISABLE_ACTION_SHEET_DESCRIPTION}
                 {showDisableInvites(guildId) && <a role="button" onClick={() => {
                     setChecked(true);
                     disableInvites(guildId);

src/plugins/permissionFreeWill/index.ts

@@ -32,7 +32,7 @@ export default definePlugin({
     patches: [
         // Permission lockout, just set the check to true
         {
-            find: "#{intl::STAGE_CHANNEL_CANNOT_OVERWRITE_PERMISSION}",
+            find: ".STAGE_CHANNEL_CANNOT_OVERWRITE_PERMISSION",
             replacement: [
                 {
                     match: /case"DENY":.{0,50}if\((?=\i\.\i\.can)/,
@@ -43,7 +43,7 @@ export default definePlugin({
         },
         // Onboarding, same thing but we need to prevent the check
         {
-            find: "#{intl::ONBOARDING_CHANNEL_THRESHOLD_WARNING}",
+            find: ".ONBOARDING_CHANNEL_THRESHOLD_WARNING",
             replacement: [
                 {
                     match: /{(\i:function\(\){return \i},?){2}}/,

src/plugins/permissionsViewer/components/RolesAndUsersPermissions.tsx

@@ -19,10 +19,10 @@
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Flex } from "@components/Flex";
 import { InfoIcon, OwnerCrownIcon } from "@components/Icons";
-import { getIntlMessage, getUniqueUsername } from "@utils/discord";
+import { getUniqueUsername } from "@utils/discord";
 import { ModalCloseButton, ModalContent, ModalHeader, ModalProps, ModalRoot, ModalSize, openModal } from "@utils/modal";
 import { findByCodeLazy } from "@webpack";
-import { Clipboard, ContextMenuApi, FluxDispatcher, GuildMemberStore, GuildStore, Menu, PermissionsBits, ScrollerThin, Text, Tooltip, useEffect, UserStore, useState, useStateFromStores } from "@webpack/common";
+import { Clipboard, ContextMenuApi, FluxDispatcher, GuildMemberStore, GuildStore, i18n, Menu, PermissionsBits, ScrollerThin, Text, Tooltip, useEffect, UserStore, useState, useStateFromStores } from "@webpack/common";
 import { UnicodeEmoji } from "@webpack/types";
 import type { Guild, Role, User } from "discord-types/general";
 
@@ -216,7 +216,7 @@ function RoleContextMenu({ guild, roleId, onClose }: { guild: Guild; roleId: str
         >
             <Menu.MenuItem
                 id={cl("copy-role-id")}
-                label={getIntlMessage("COPY_ID_ROLE")}
+                label={i18n.Messages.COPY_ID_ROLE}
                 action={() => {
                     Clipboard.copy(roleId);
                 }}
@@ -225,7 +225,7 @@ function RoleContextMenu({ guild, roleId, onClose }: { guild: Guild; roleId: str
             {(settings.store as any).unsafeViewAsRole && (
                 <Menu.MenuItem
                     id={cl("view-as-role")}
-                    label={getIntlMessage("VIEW_AS_ROLE")}
+                    label={i18n.Messages.VIEW_AS_ROLE}
                     action={() => {
                         const role = GuildStore.getRole(guild.id, roleId);
                         if (!role) return;
@@ -257,7 +257,7 @@ function UserContextMenu({ userId }: { userId: string; }) {
         >
             <Menu.MenuItem
                 id={cl("copy-user-id")}
-                label={getIntlMessage("COPY_ID_USER")}
+                label={i18n.Messages.COPY_ID_USER}
                 action={() => {
                     Clipboard.copy(userId);
                 }}

src/plugins/permissionsViewer/components/UserPermissions.tsx

@@ -18,10 +18,9 @@
 
 import ErrorBoundary from "@components/ErrorBoundary";
 import { ExpandableHeader } from "@components/ExpandableHeader";
-import { getIntlMessage } from "@utils/discord";
 import { classes } from "@utils/misc";
 import { filters, findBulk, proxyLazyWebpack } from "@webpack";
-import { PermissionsBits, Text, Tooltip, useMemo, UserStore } from "@webpack/common";
+import { i18n, PermissionsBits, Text, Tooltip, useMemo, UserStore } from "@webpack/common";
 import type { Guild, GuildMember } from "discord-types/general";
 
 import { PermissionsSortOrder, settings } from "..";
@@ -106,7 +105,7 @@ function UserPermissionsComponent({ guild, guildMember, forceOpen = false }: { g
                 permissions: Object.values(PermissionsBits).reduce((prev, curr) => prev | curr, 0n)
             });
 
-            const OWNER = getIntlMessage("GUILD_OWNER") || "Server Owner";
+            const OWNER = i18n.Messages.GUILD_OWNER || "Server Owner";
             userPermissions.push({
                 permission: OWNER,
                 roleName: "Owner",

src/plugins/permissionsViewer/index.tsx

@@ -170,7 +170,7 @@ export default definePlugin({
 
     patches: [
         {
-            find: "#{intl::VIEW_ALL_ROLES}",
+            find: ".VIEW_ALL_ROLES,",
             replacement: {
                 match: /\.expandButton,.+?null,/,
                 replace: "$&$self.ViewPermissionsButton(arguments[0]),"

src/plugins/permissionsViewer/utils.ts

@@ -17,9 +17,8 @@
 */
 
 import { classNameFactory } from "@api/Styles";
-import { getIntlMessage } from "@utils/discord";
 import { wordsToTitle } from "@utils/text";
-import { GuildStore, Parser } from "@webpack/common";
+import { GuildStore, i18n, Parser } from "@webpack/common";
 import { Guild, GuildMember, Role } from "discord-types/general";
 import type { ReactNode } from "react";
 
@@ -45,7 +44,7 @@ const PermissionKeyMap = {
 export function getPermissionString(permission: string) {
     permission = PermissionKeyMap[permission] || permission;
 
-    return getIntlMessage(permission) ||
+    return i18n.Messages[permission] ||
         // shouldn't get here but just in case
         formatPermissionWithoutMatchingString(permission);
 }
@@ -59,7 +58,7 @@ export function getPermissionDescription(permission: string): ReactNode {
     else if (permission !== "STREAM")
         permission = PermissionKeyMap[permission] || permission;
 
-    const msg = getIntlMessage(`ROLE_PERMISSIONS_${permission}_DESCRIPTION`) as any;
+    const msg = i18n.Messages[`ROLE_PERMISSIONS_${permission}_DESCRIPTION`] as any;
     if (msg?.hasMarkdown)
         return Parser.parse(msg.message);
 

src/plugins/pinDms/components/CreateCategoryModal.tsx

@@ -30,7 +30,7 @@ interface ColorPickerWithSwatchesProps {
     renderCustomButton?: () => React.ReactNode;
 }
 
-const ColorPicker = findComponentByCodeLazy<ColorPickerProps>("#{intl::USER_SETTINGS_PROFILE_COLOR_SELECT_COLOR}", ".BACKGROUND_PRIMARY)");
+const ColorPicker = findComponentByCodeLazy<ColorPickerProps>(".Messages.USER_SETTINGS_PROFILE_COLOR_SELECT_COLOR", ".BACKGROUND_PRIMARY)");
 const ColorPickerWithSwatches = findExportedComponentLazy<ColorPickerWithSwatchesProps>("ColorPicker", "CustomColorPicker");
 
 export const requireSettingsMenu = extractAndLoadChunksLazy(['name:"UserSettings"'], /createPromise:.{0,20}Promise\.all\((\[\i\.\i\("?.+?"?\).+?\])\).then\(\i\.bind\(\i,"?(.+?)"?\)\).{0,50}"UserSettings"/);

src/plugins/replyTimestamp/index.tsx

@@ -67,7 +67,7 @@ export default definePlugin({
 
     patches: [
         {
-            find: "#{intl::REPLY_QUOTE_MESSAGE_BLOCKED}",
+            find: ".REPLY_QUOTE_MESSAGE_BLOCKED",
             replacement: {
                 match: /\.onClickReply,.+?}\),(?=\i,\i,\i\])/,
                 replace: "$&$self.ReplyTimestamp(arguments[0]),"

src/plugins/reverseImageSearch/index.tsx

@@ -108,7 +108,7 @@ export default definePlugin({
 
     patches: [
         {
-            find: "#{intl::MESSAGE_ACTIONS_MENU_LABEL}",
+            find: ".Messages.MESSAGE_ACTIONS_MENU_LABEL,shouldHideMediaOptions",
             replacement: {
                 match: /favoriteableType:\i,(?<=(\i)\.getAttribute\("data-type"\).+?)/,
                 replace: (m, target) => `${m}reverseImageSearchType:${target}.getAttribute("data-role"),`

src/plugins/roleColorEverywhere/index.tsx

@@ -104,7 +104,7 @@ export default definePlugin({
             predicate: () => settings.store.memberList,
         },
         {
-            find: "#{intl::THREAD_BROWSER_PRIVATE}",
+            find: ".Messages.THREAD_BROWSER_PRIVATE",
             replacement: [
                 {
                     match: /children:\[\i," — ",\i\]/,
@@ -132,7 +132,7 @@ export default definePlugin({
             predicate: () => settings.store.reactorsList,
         },
         {
-            find: "#{intl::MESSAGE_EDITED}",
+            find: '.Messages.MESSAGE_EDITED,")"',
             replacement: {
                 match: /(?<=isUnsupported\]:(\i)\.isUnsupported\}\),)(?=children:\[)/,
                 replace: "style:{color:$self.useMessageColor($1)},"

src/plugins/shikiCodeblocks.desktop/index.ts

@@ -46,7 +46,7 @@ export default definePlugin({
             }
         },
         {
-            find: "#{intl::PREVIEW_NUM_LINES}",
+            find: ".PREVIEW_NUM_LINES",
             replacement: {
                 match: /(?<=function \i\((\i)\)\{)(?=let\{text:\i,language:)/,
                 replace: "return $self.renderHighlighter({lang:$1.language,content:$1.text});"

src/plugins/showAllMessageButtons/index.ts

@@ -26,7 +26,7 @@ export default definePlugin({
 
     patches: [
         {
-            find: "#{intl::MESSAGE_UTILITIES_A11Y_LABEL}",
+            find: ".Messages.MESSAGE_UTILITIES_A11Y_LABEL",
             replacement: {
                 match: /isExpanded:\i&&(.+?),/,
                 replace: "isExpanded:$1,"

src/plugins/showConnections/VerifiedIcon.tsx

@@ -16,12 +16,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { getIntlMessage } from "@utils/discord";
 import { findComponentByCodeLazy, findLazy } from "@webpack";
-import { useToken } from "@webpack/common";
+import { i18n, useToken } from "@webpack/common";
 
 const ColorMap = findLazy(m => m.colors?.INTERACTIVE_MUTED?.css);
-const VerifiedIconComponent = findComponentByCodeLazy("#{intl::CONNECTIONS_ROLE_OFFICIAL_ICON_TOOLTIP}");
+const VerifiedIconComponent = findComponentByCodeLazy(".CONNECTIONS_ROLE_OFFICIAL_ICON_TOOLTIP");
 
 export function VerifiedIcon() {
     const color = useToken(ColorMap.colors.INTERACTIVE_MUTED).hex();
@@ -32,7 +31,7 @@ export function VerifiedIcon() {
             color={color}
             forcedIconColor={forcedIconColor}
             size={16}
-            tooltipText={getIntlMessage("CONNECTION_VERIFIED")}
+            tooltipText={i18n.Messages.CONNECTION_VERIFIED}
         />
     );
 }

src/plugins/showHiddenChannels/components/HiddenChannelLockScreen.tsx

@@ -19,7 +19,7 @@
 import { Settings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { formatDuration } from "@utils/text";
-import { findByPropsLazy, findComponentByCodeLazy } from "@webpack";
+import { findByPropsLazy, findComponentByCodeLazy, findComponentLazy } from "@webpack";
 import { EmojiStore, FluxDispatcher, GuildMemberStore, GuildStore, Parser, PermissionsBits, PermissionStore, SnowflakeUtils, Text, Timestamp, Tooltip, useEffect, useState } from "@webpack/common";
 import type { Channel } from "discord-types/general";
 
@@ -80,8 +80,14 @@ const enum ChannelFlags {
 
 const ChatScrollClasses = findByPropsLazy("auto", "managedReactiveScroller");
 const ChatClasses = findByPropsLazy("chat", "content", "noChat", "chatContent");
-const ChannelBeginHeader = findComponentByCodeLazy("#{intl::ROLE_REQUIRED_SINGLE_USER_MESSAGE}");
+const ChannelBeginHeader = findComponentByCodeLazy(".Messages.ROLE_REQUIRED_SINGLE_USER_MESSAGE");
-const TagComponent = findComponentByCodeLazy("#{intl::FORUM_TAG_A11Y_FILTER_BY_TAG}");
+const TagComponent = findComponentLazy(m => {
+    if (typeof m !== "function") return false;
+
+    const code = Function.prototype.toString.call(m);
+    // Get the component which doesn't include increasedActivity
+    return code.includes(".Messages.FORUM_TAG_A11Y_FILTER_BY_TAG") && !code.includes("increasedActivityPill");
+});
 
 const EmojiParser = findByPropsLazy("convertSurrogateToName");
 const EmojiUtils = findByPropsLazy("getURL", "getEmojiColors");

src/plugins/showHiddenChannels/index.tsx

@@ -103,7 +103,7 @@ export default definePlugin({
             replacement: [
                 {
                     // Do not show confirmation to join a voice channel when already connected to another if clicking on a hidden voice channel
-                    match: /(?<=getBlockedUsersForVoiceChannel\((\i)\.id\);return\()/,
+                    match: /(?<=getBlockedUsersForVoiceChannel\((\i)\.id\);return)/,
                     replace: (_, channel) => `!$self.isHiddenChannel(${channel})&&`
                 },
                 {
@@ -149,7 +149,7 @@ export default definePlugin({
             }
         },
         {
-            find: "#{intl::CHANNEL_TOOLTIP_DIRECTORY}",
+            find: ".Messages.CHANNEL_TOOLTIP_DIRECTORY",
             predicate: () => settings.store.showMode === ShowMode.LockIcon,
             replacement: {
                 // Lock Icon
@@ -274,7 +274,7 @@ export default definePlugin({
             }
         },
         {
-            find: "#{intl::ROLE_REQUIRED_SINGLE_USER_MESSAGE}",
+            find: ".Messages.ROLE_REQUIRED_SINGLE_USER_MESSAGE",
             replacement: [
                 {
                     // Change the role permission check to CONNECT if the channel is locked
@@ -336,7 +336,7 @@ export default definePlugin({
             ]
         },
         {
-            find: "#{intl::CHANNEL_CALL_CURRENT_SPEAKER}",
+            find: ".Messages.CHANNEL_CALL_CURRENT_SPEAKER.format",
             replacement: [
                 {
                     // Remove the divider and the open chat button for the HiddenChannelLockScreen
@@ -351,7 +351,7 @@ export default definePlugin({
             ]
         },
         {
-            find: "#{intl::EMBEDDED_ACTIVITIES_DEVELOPER_ACTIVITY_SHELF_FETCH_ERROR}",
+            find: ".Messages.EMBEDDED_ACTIVITIES_DEVELOPER_ACTIVITY_SHELF_FETCH_ERROR",
             replacement: [
                 {
                     // Render our HiddenChannelLockScreen component instead of the main voice channel component
@@ -401,7 +401,7 @@ export default definePlugin({
             ]
         },
         {
-            find: "#{intl::STAGE_FULL_MODERATOR_TITLE}",
+            find: ".Messages.STAGE_FULL_MODERATOR_TITLE",
             replacement: [
                 {
                     // Remove the divider and amount of users in stage channel components for the HiddenChannelLockScreen
@@ -463,7 +463,7 @@ export default definePlugin({
             ]
         },
         {
-            find: "#{intl::FORM_LABEL_MUTED}",
+            find: ".Messages.FORM_LABEL_MUTED",
             replacement: {
                 // Make GuildChannelStore.getChannels return hidden channels
                 match: /(?<=getChannels\(\i)(?=\))/,

src/plugins/showHiddenThings/index.ts

@@ -68,7 +68,7 @@ export default definePlugin({
         },
         // fixes a bug where Members page must be loaded to see highest role, why is Discord depending on MemberSafetyStore.getEnhancedMember for something that can be obtained here?
         {
-            find: "#{intl::GUILD_MEMBER_MOD_VIEW_PERMISSION_GRANTED_BY_ARIA_LABEL}",
+            find: "Messages.GUILD_MEMBER_MOD_VIEW_PERMISSION_GRANTED_BY_ARIA_LABEL,allowOverflow",
             predicate: () => settings.store.showModView,
             replacement: {
                 match: /(role:)\i(?=,guildId.{0,100}role:(\i\[))/,

src/plugins/showTimeoutDuration/index.tsx

@@ -9,16 +9,13 @@ import "./styles.css";
 import { definePluginSettings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
-import { getIntlMessage } from "@utils/discord";
-import { canonicalizeMatch } from "@utils/patches";
 import definePlugin, { OptionType } from "@utils/types";
 import { findComponentLazy } from "@webpack";
-import { ChannelStore, GuildMemberStore, Text, Tooltip } from "@webpack/common";
+import { ChannelStore, GuildMemberStore, i18n, Text, Tooltip } from "@webpack/common";
 import { Message } from "discord-types/general";
 import { FunctionComponent, ReactNode } from "react";
 
-const countDownFilter = canonicalizeMatch("#{intl::MAX_AGE_NEVER}");
+const CountDown = findComponentLazy(m => m.prototype?.render?.toString().includes(".MAX_AGE_NEVER"));
-const CountDown = findComponentLazy(m => m.prototype?.render?.toString().includes(countDownFilter));
 
 const enum DisplayStyle {
     Tooltip = "tooltip",
@@ -51,14 +48,9 @@ function renderTimeout(message: Message, inline: boolean) {
         />
     );
 
-    getIntlMessage("GUILD_ENABLE_COMMUNICATION_TIME_REMAINING", {
-        username: message.author.username,
-        countdown
-    });
-
     return inline
         ? countdown()
-        : getIntlMessage("GUILD_ENABLE_COMMUNICATION_TIME_REMAINING", {
+        : i18n.Messages.GUILD_ENABLE_COMMUNICATION_TIME_REMAINING.format({
             username: message.author.username,
             countdown
         });
@@ -73,10 +65,10 @@ export default definePlugin({
 
     patches: [
         {
-            find: "#{intl::GUILD_COMMUNICATION_DISABLED_ICON_TOOLTIP_BODY}",
+            find: ".GUILD_COMMUNICATION_DISABLED_ICON_TOOLTIP_BODY",
             replacement: [
                 {
-                    match: /(\i)\.Tooltip,{(text:.{0,30}#{intl::GUILD_COMMUNICATION_DISABLED_ICON_TOOLTIP_BODY}\))/,
+                    match: /(\i)\.Tooltip,{(text:.{0,30}\.Messages\.GUILD_COMMUNICATION_DISABLED_ICON_TOOLTIP_BODY)/,
                     replace: "$self.TooltipWrapper,{message:arguments[0].message,$2"
                 }
             ]

src/plugins/sortFriendRequests/index.tsx

@@ -45,7 +45,7 @@ export default definePlugin({
             replace: "}).sortBy(row => $self.wrapSort(($1), row)).value()"
         }
     }, {
-        find: "#{intl::FRIEND_REQUEST_CANCEL}",
+        find: ".Messages.FRIEND_REQUEST_CANCEL",
         replacement: {
             predicate: () => settings.store.showDates,
             match: /subText:(\i)(?<=user:(\i).+?)/,

src/plugins/startupTimings/index.tsx

@@ -26,7 +26,7 @@ export default definePlugin({
     description: "Adds Startup Timings to the Settings menu",
     authors: [Devs.Megu],
     patches: [{
-        find: "#{intl::ACTIVITY_SETTINGS}",
+        find: "Messages.ACTIVITY_SETTINGS",
         replacement: {
             match: /(?<=}\)([,;])(\i\.settings)\.forEach.+?(\i)\.push.+}\)}\))/,
             replace: (_, commaOrSemi, settings, elements) => "" +

src/plugins/themeAttributes/index.ts

@@ -38,7 +38,7 @@ export default definePlugin({
         // add --avatar-url-<resolution> css variable to avatar img elements
         // popout profiles
         {
-            find: "#{intl::LABEL_WITH_ONLINE_STATUS}",
+            find: ".LABEL_WITH_ONLINE_STATUS",
             replacement: {
                 match: /src:null!=\i\?(\i).{1,50}"aria-hidden":!0/,
                 replace: "$&,style:$self.getAvatarStyles($1)"
@@ -55,8 +55,6 @@ export default definePlugin({
     ],
 
     getAvatarStyles(src: string) {
-        if (src.startsWith("data:")) return {};
-
         return Object.fromEntries(
             [128, 256, 512, 1024, 2048, 4096].map(size => [
                 `--avatar-url-${size}`,

src/plugins/typingIndicator/index.tsx

@@ -21,10 +21,9 @@ import "./style.css";
 import { definePluginSettings, Settings } from "@api/Settings";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Devs } from "@utils/constants";
-import { getIntlMessage } from "@utils/discord";
 import definePlugin, { OptionType } from "@utils/types";
 import { findComponentByCodeLazy, findExportedComponentLazy, findStoreLazy } from "@webpack";
-import { ChannelStore, GuildMemberStore, RelationshipStore, SelectedChannelStore, Tooltip, UserStore, useStateFromStores } from "@webpack/common";
+import { ChannelStore, GuildMemberStore, i18n, RelationshipStore, SelectedChannelStore, Tooltip, UserStore, useStateFromStores } from "@webpack/common";
 
 import { buildSeveralUsers } from "../typingTweaks";
 
@@ -76,21 +75,21 @@ function TypingIndicator({ channelId }: { channelId: string; }) {
     switch (typingUsersArray.length) {
         case 0: break;
         case 1: {
-            tooltipText = getIntlMessage("ONE_USER_TYPING", { a: getDisplayName(guildId, typingUsersArray[0]) });
+            tooltipText = i18n.Messages.ONE_USER_TYPING.format({ a: getDisplayName(guildId, typingUsersArray[0]) });
             break;
         }
         case 2: {
-            tooltipText = getIntlMessage("TWO_USERS_TYPING", { a: getDisplayName(guildId, typingUsersArray[0]), b: getDisplayName(guildId, typingUsersArray[1]) });
+            tooltipText = i18n.Messages.TWO_USERS_TYPING.format({ a: getDisplayName(guildId, typingUsersArray[0]), b: getDisplayName(guildId, typingUsersArray[1]) });
             break;
         }
         case 3: {
-            tooltipText = getIntlMessage("THREE_USERS_TYPING", { a: getDisplayName(guildId, typingUsersArray[0]), b: getDisplayName(guildId, typingUsersArray[1]), c: getDisplayName(guildId, typingUsersArray[2]) });
+            tooltipText = i18n.Messages.THREE_USERS_TYPING.format({ a: getDisplayName(guildId, typingUsersArray[0]), b: getDisplayName(guildId, typingUsersArray[1]), c: getDisplayName(guildId, typingUsersArray[2]) });
             break;
         }
         default: {
             tooltipText = Settings.plugins.TypingTweaks.enabled
                 ? buildSeveralUsers({ a: getDisplayName(guildId, typingUsersArray[0]), b: getDisplayName(guildId, typingUsersArray[1]), count: typingUsersArray.length - 2 })
-                : getIntlMessage("SEVERAL_USERS_TYPING");
+                : i18n.Messages.SEVERAL_USERS_TYPING;
             break;
         }
     }

src/plugins/typingTweaks/index.tsx

@@ -112,8 +112,8 @@ export default definePlugin({
         {
             find: "getCooldownTextStyle",
             replacement: {
-                match: /(,{a:(\i),b:(\i),c:\i}\):)\i\.\i\.string\(\i\.\i#{intl::SEVERAL_USERS_TYPING}\)(?<=(\i)\.length.+?)/,
+                match: /(?<=(\i)\.length\?\i.\i\.Messages.THREE_USERS_TYPING\.format\({\i:(\i),(?:\i:)?(\i),\i:\i}\):)\i\.\i\.Messages\.SEVERAL_USERS_TYPING/,
-                replace: (_, rest, a, b, users) => `${rest}$self.buildSeveralUsers({ a: ${a}, b: ${b}, count: ${users}.length - 2 })`
+                replace: (_, users, a, b) => `$self.buildSeveralUsers({ a: ${a}, b: ${b}, count: ${users}.length - 2 })`
             },
             predicate: () => settings.store.alternativeFormatting
         }

src/plugins/unlockedAvatarZoom/index.ts

@@ -25,7 +25,7 @@ export default definePlugin({
     settings,
     patches: [
         {
-            find: "#{intl::AVATAR_UPLOAD_EDIT_MEDIA}",
+            find: ".Messages.AVATAR_UPLOAD_EDIT_MEDIA",
             replacement: {
                 match: /maxValue:\d/,
                 replace: "maxValue:$self.settings.store.zoomMultiplier",

src/plugins/userMessagesPronouns/PronounsChatComponent.tsx

@@ -18,10 +18,9 @@
 
 import { getUserSettingLazy } from "@api/UserSettings";
 import ErrorBoundary from "@components/ErrorBoundary";
-import { getIntlMessage } from "@utils/discord";
 import { classes } from "@utils/misc";
 import { findByPropsLazy } from "@webpack";
-import { Tooltip, UserStore } from "@webpack/common";
+import { i18n, Tooltip, UserStore } from "@webpack/common";
 import { Message } from "discord-types/general";
 
 import { settings } from "./settings";
@@ -45,7 +44,7 @@ function PronounsChatComponent({ message }: { message: Message; }) {
     const pronouns = useFormattedPronouns(message.author.id);
 
     return pronouns && (
-        <Tooltip text={getIntlMessage("USER_PROFILE_PRONOUNS")}>
+        <Tooltip text={i18n.Messages.USER_PROFILE_PRONOUNS}>
             {tooltipProps => (
                 <span
                     {...tooltipProps}

src/plugins/userVoiceShow/components.tsx

@@ -14,7 +14,7 @@ import { Channel } from "discord-types/general";
 const cl = classNameFactory("vc-uvs-");
 
 const { selectVoiceChannel } = findByPropsLazy("selectVoiceChannel", "selectChannel");
-const { useChannelName } = mapMangledModuleLazy("#{intl::GROUP_DM_ALONE}", {
+const { useChannelName } = mapMangledModuleLazy(".Messages.GROUP_DM_ALONE", {
     useChannelName: filters.byCode("()=>null==")
 });
 const getDMChannelIcon = findByCodeLazy(".getChannelIconURL({");

src/plugins/userVoiceShow/index.tsx

@@ -57,7 +57,7 @@ export default definePlugin({
     patches: [
         // User Popout, Full Size Profile, Direct Messages Side Profile
         {
-            find: "#{intl::USER_PROFILE_LOAD_ERROR}",
+            find: ".Messages.USER_PROFILE_LOAD_ERROR",
             replacement: {
                 match: /(\.fetchError.+?\?)null/,
                 replace: (_, rest) => `${rest}$self.VoiceChannelIndicator({userId:arguments[0]?.userId,isProfile:true})`
@@ -78,7 +78,7 @@ export default definePlugin({
         {
             find: "PrivateChannel.renderAvatar",
             replacement: {
-                match: /#{intl::CLOSE_DM}.+?}\)(?=])/,
+                match: /\.Messages\.CLOSE_DM.+?}\)(?=])/,
                 replace: "$&,$self.VoiceChannelIndicator({userId:arguments[0]?.user?.id})"
             },
             predicate: () => settings.store.showVoiceChannelIndicator

src/plugins/validReply/index.ts

@@ -37,9 +37,9 @@ export default definePlugin({
     authors: [Devs.newwares],
     patches: [
         {
-            find: "#{intl::REPLY_QUOTE_MESSAGE_NOT_LOADED}",
+            find: "Messages.REPLY_QUOTE_MESSAGE_NOT_LOADED",
             replacement: {
-                match: /#{intl::REPLY_QUOTE_MESSAGE_NOT_LOADED}\)/,
+                match: /Messages\.REPLY_QUOTE_MESSAGE_NOT_LOADED/,
                 replace: "$&,onMouseEnter:()=>$self.fetchReply(arguments[0])"
             }
         },

src/plugins/viewRaw/index.tsx

@@ -23,12 +23,11 @@ import { CodeBlock } from "@components/CodeBlock";
 import ErrorBoundary from "@components/ErrorBoundary";
 import { Flex } from "@components/Flex";
 import { Devs } from "@utils/constants";
-import { getIntlMessage } from "@utils/discord";
 import { Margins } from "@utils/margins";
 import { copyWithToast } from "@utils/misc";
 import { closeModal, ModalCloseButton, ModalContent, ModalFooter, ModalHeader, ModalRoot, ModalSize, openModal } from "@utils/modal";
 import definePlugin, { OptionType } from "@utils/types";
-import { Button, ChannelStore, Forms, Menu, Text } from "@webpack/common";
+import { Button, ChannelStore, Forms, i18n, Menu, Text } from "@webpack/common";
 import { Message } from "discord-types/general";
 
 
@@ -123,7 +122,7 @@ function MakeContextCallback(name: "Guild" | "User" | "Channel"): NavContextMenu
     return (children, props) => {
         const value = props[name.toLowerCase()];
         if (!value) return;
-        if (props.label === getIntlMessage("CHANNEL_ACTIONS_MENU_LABEL")) return; // random shit like notification settings
+        if (props.label === i18n.Messages.CHANNEL_ACTIONS_MENU_LABEL) return; // random shit like notification settings
 
         const lastChild = children.at(-1);
         if (lastChild?.key === "developer-actions") {

src/plugins/volumeBooster/index.ts

@@ -57,7 +57,7 @@ export default definePlugin({
     patches: [
         // Change the max volume for sliders to allow for values above 200
         ...[
-            "#{intl::USER_VOLUME}",
+            ".Messages.USER_VOLUME",
             "currentVolume:"
         ].map(find => ({
             find,

src/plugins/webContextMenus.web/index.ts

@@ -127,11 +127,11 @@ export default definePlugin({
                     replace: "return [true"
                 },
                 {
-                    match: /(?<=#{intl::COPY_IMAGE_MENU_ITEM}\),)action:/,
+                    match: /(?<=COPY_IMAGE_MENU_ITEM,)action:/,
                     replace: "action:()=>$self.copyImage(arguments[0]),oldAction:"
                 },
                 {
-                    match: /(?<=#{intl::SAVE_IMAGE_MENU_ITEM}\),)action:/,
+                    match: /(?<=SAVE_IMAGE_MENU_ITEM,)action:/,
                     replace: "action:()=>$self.saveImage(arguments[0]),oldAction:"
                 },
             ]
@@ -202,14 +202,14 @@ export default definePlugin({
             }
         },
         {
-            find: "#{intl::SEARCH_WITH_GOOGLE}",
+            find: ".Messages.SEARCH_WITH_GOOGLE",
             replacement: {
                 match: /\i\.isPlatformEmbedded/,
                 replace: "true"
             }
         },
         {
-            find: "#{intl::COPY}),hint:",
+            find: ".Messages.COPY,hint:",
             replacement: [
                 {
                     match: /\i\.isPlatformEmbedded/,

src/utils/discord.css

@@ -7,18 +7,18 @@
 **/
 
 .vc-image-modal {
-    background: transparent !important;
+    background: transparent!important;
-    box-shadow: none !important;
+    box-shadow: none!important;
     display: flex;
     justify-content: center;
     align-items: center;
-    border-radius: 0;
+    border-radius: 0
 }
 
 @media(width <= 485px) {
     .vc-image-modal {
-        display: relative;
+        display:relative;
         overflow: visible;
-        overflow: initial;
+        overflow: initial
     }
 }

src/utils/discord.tsx

@@ -19,38 +19,10 @@
 import "./discord.css";
 
 import { MessageObject } from "@api/MessageEvents";
-import { ChannelStore, ComponentDispatch, Constants, FluxDispatcher, GuildStore, i18n, InviteActions, MessageActions, PrivateChannelsStore, RestAPI, SelectedChannelStore, SelectedGuildStore, UserProfileActions, UserProfileStore, UserSettingsActionCreators, UserUtils } from "@webpack/common";
+import { ChannelStore, ComponentDispatch, Constants, FluxDispatcher, GuildStore, InviteActions, MessageActions, PrivateChannelsStore, RestAPI, SelectedChannelStore, SelectedGuildStore, UserProfileActions, UserProfileStore, UserSettingsActionCreators, UserUtils } from "@webpack/common";
 import { Channel, Guild, Message, User } from "discord-types/general";
-import { Except } from "type-fest";
 
-import { runtimeHashMessageKey } from "./intlHash";
+import { ImageModal, ImageModalItem, openModal } from "./modal";
-import { Logger } from "./Logger";
-import { MediaModalItem, MediaModalProps, openMediaModal } from "./modal";
-
-const IntlManagerLogger = new Logger("IntlManager");
-
-/**
- * Get an internationalized message from a non hashed key
- * @param key The plain message key
- * @param values The values to interpolate, if it's a rich message
- */
-export function getIntlMessage(key: string, values?: Record<PropertyKey, any>): any {
-    return getIntlMessageFromHash(runtimeHashMessageKey(key), values, key);
-}
-
-/**
- * Get an internationalized message from a hashed key
- * @param hashedKey The hashed message key
- * @param values The values to interpolate, if it's a rich message
- */
-export function getIntlMessageFromHash(hashedKey: string, values?: Record<PropertyKey, any>, originalKey?: string): any {
-    try {
-        return values == null ? i18n.intl.string(i18n.t[hashedKey]) : i18n.intl.format(i18n.t[hashedKey], values);
-    } catch (e) {
-        IntlManagerLogger.error(`Failed to get intl message for key: ${originalKey ?? hashedKey}`, e);
-        return originalKey ?? "";
-    }
-}
 
 /**
  * Open the invite modal
@@ -139,20 +111,24 @@ export function sendMessage(
 }
 
 /**
- * You must specify either height or width in the item
+ * You must specify either height or width
  */
-export function openImageModal(item: Except<MediaModalItem, "type">, mediaModalProps?: Omit<MediaModalProps, "items">) {
+export function openImageModal(props: Omit<ImageModalItem, "type">): string {
-    return openMediaModal({
+    return openModal(modalProps => (
-        className: "vc-image-modal",
+        <ImageModal
-        fit: "vc-position-inherit",
+            {...modalProps}
-        shouldAnimateCarousel: true,
+            className="vc-image-modal"
-        items: [{
+            fit="vc-position-inherit"
+            items={[{
                 type: "IMAGE",
-            original: item.original ?? item.url,
+                original: props.url,
-            ...item,
+                ...props,
-        }],
+            }]}
-        ...mediaModalProps
+            onClose={modalProps.onClose}
-    });
+            shouldHideMediaOptions={false}
+            shouldAnimate
+        />
+    ));
 }
 
 export async function openUserProfile(id: string) {

src/utils/index.ts

@@ -22,7 +22,6 @@ export * from "./ChangeList";
 export * from "./constants";
 export * from "./discord";
 export * from "./guards";
-export * from "./intlHash";
 export * from "./lazy";
 export * from "./lazyReact";
 export * from "./localStorage";

src/utils/intlHash.ts

@@ -1,52 +0,0 @@
-/* eslint-disable simple-header/header */
-
-/**
- * discord-intl
- *
- * @copyright 2024 Discord, Inc.
- * @link https://github.com/discord/discord-intl
- * @license MIT
- */
-
-import { hash as h64 } from "@intrnl/xxhash64";
-
-const BASE64_TABLE = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".split("");
-const IS_BIG_ENDIAN = (() => {
-    const array = new Uint8Array(4);
-    const view = new Uint32Array(array.buffer);
-    return !((view[0] = 1) & array[0]);
-})();
-
-function numberToBytes(number: number | bigint) {
-    number = BigInt(number);
-    const array: number[] = [];
-    const byteCount = Math.ceil(Math.floor(Math.log2(Number(number)) + 1) / 8);
-    for (let i = 0; i < byteCount; i++) {
-        array.unshift(Number((number >> BigInt(8 * i)) & BigInt(255)));
-    }
-
-    const bytes = new Uint8Array(array);
-    // The native `hashToMessageKey` always works in Big/Network Endian bytes, so this array
-    // needs to be converted to the same endianness to get the same base64 result.
-    return IS_BIG_ENDIAN ? bytes : bytes.reverse();
-}
-
-/**
- * Returns a consistent, short hash of the given key by first processing it through a hash digest,
- * then encoding the first few bytes to base64.
- *
- * This function is specifically written to mirror the native backend hashing function used by
- * `@discord/intl-loader-core`, to be able to hash names at runtime.
- */
-export function runtimeHashMessageKey(key: string): string {
-    const hash = h64(key, 0);
-    const bytes = numberToBytes(hash);
-    return [
-        BASE64_TABLE[bytes[0] >> 2],
-        BASE64_TABLE[((bytes[0] & 0x03) << 4) | (bytes[1] >> 4)],
-        BASE64_TABLE[((bytes[1] & 0x0f) << 2) | (bytes[2] >> 6)],
-        BASE64_TABLE[bytes[2] & 0x3f],
-        BASE64_TABLE[bytes[3] >> 2],
-        BASE64_TABLE[((bytes[3] & 0x03) << 4) | (bytes[3] >> 4)],
-    ].join("");
-}

src/utils/modal.tsx

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { findByPropsLazy, findModuleId, proxyLazyWebpack, wreq } from "@webpack";
+import { findByPropsLazy, findComponentByCodeLazy } from "@webpack";
 import type { ComponentType, PropsWithChildren, ReactNode, Ref } from "react";
 
 import { LazyComponent } from "./react";
@@ -101,39 +101,24 @@ export const Modals = findByPropsLazy("ModalRoot", "ModalCloseButton") as {
     }>;
 };
 
-export type MediaModalItem = {
+export interface ImageModalItem {
-    url: string;
     type: "IMAGE" | "VIDEO";
-    original?: string;
+    url: string;
-    alt?: string;
     width?: number;
     height?: number;
-    animated?: boolean;
+    original?: string;
-    maxWidth?: number;
+}
-    maxHeight?: number;
-} & Record<PropertyKey, any>;
 
-export type MediaModalProps = {
+export type ImageModal = ComponentType<{
-    location?: string;
-    contextKey?: string;
-    onCloseCallback?: () => void;
     className?: string;
-    items: MediaModalItem[];
-    startingIndex?: number;
-    onIndexChange?: (...args: any[]) => void;
     fit?: string;
-    shouldRedactExplicitContent?: boolean;
+    onClose?(): void;
     shouldHideMediaOptions?: boolean;
-    shouldAnimateCarousel?: boolean;
+    shouldAnimate?: boolean;
-};
+    items: ImageModalItem[];
+}>;
 
-export const openMediaModal: (props: MediaModalProps) => void = proxyLazyWebpack(() => {
+export const ImageModal = findComponentByCodeLazy(".MEDIA_MODAL_CLOSE") as ImageModal;
-    const mediaModalKeyModuleId = findModuleId('"Zoomed Media Modal"');
-    if (mediaModalKeyModuleId == null) return;
-
-    const openMediaModalModule = wreq(findModuleId(mediaModalKeyModuleId, "modalKey:") as any);
-    return Object.values<any>(openMediaModalModule).find(v => String(v).includes("modalKey:"));
-});
 
 export const ModalRoot = LazyComponent(() => Modals.ModalRoot);
 export const ModalHeader = LazyComponent(() => Modals.ModalHeader);

src/utils/patches.ts

@@ -16,31 +16,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { runtimeHashMessageKey } from "./intlHash";
 import { Patch, PatchReplacement, ReplaceFn } from "./types";
 
 export function canonicalizeMatch<T extends RegExp | string>(match: T): T {
-    let partialCanon = typeof match === "string" ? match : match.source;
+    if (typeof match === "string") return match;
-    partialCanon = partialCanon.replaceAll(/#{intl::([A-Za-z_$][\w$]*)}/g, (_, key) => {
+    const canonSource = match.source
-        const hashed = runtimeHashMessageKey(key);
+        .replaceAll("\\i", "[A-Za-z_$][\\w$]*");
-
-        const isString = typeof match === "string";
-        const hasSpecialChars = !Number.isNaN(Number(hashed[0])) || hashed.includes("+") || hashed.includes("/");
-
-        if (hasSpecialChars) {
-            return isString
-                ? `["${hashed}"]`
-                : String.raw`(?:\["${hashed}"\])`.replaceAll("+", "\\+");
-        }
-
-        return isString ? `.${hashed}` : String.raw`(?:\.${hashed})`;
-    });
-
-    if (typeof match === "string") {
-        return partialCanon as T;
-    }
-
-    const canonSource = partialCanon.replaceAll(String.raw`\i`, String.raw`(?:[A-Za-z_$][\w$]*)`);
     return new RegExp(canonSource, match.flags) as T;
 }
 

src/webpack/common/components.ts

@@ -56,7 +56,7 @@ export let FocusLock: t.FocusLock;
 export let useToken: t.useToken;
 
 export const MaskedLink = waitForComponent<t.MaskedLink>("MaskedLink", filters.componentByCode("MASKED_LINK)"));
-export const Timestamp = waitForComponent<t.Timestamp>("Timestamp", filters.byCode("#{intl::MESSAGE_EDITED_TIMESTAMP_A11Y_LABEL}"));
+export const Timestamp = waitForComponent<t.Timestamp>("Timestamp", filters.byCode(".Messages.MESSAGE_EDITED_TIMESTAMP_A11Y_LABEL.format"));
 export const Flex = waitForComponent<t.Flex>("Flex", ["Justify", "Align", "Wrap"]);
 
 export const { OAuth2AuthorizeModal } = findByPropsLazy("OAuth2AuthorizeModal");

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

@@ -19,6 +19,7 @@
 export * from "./classes";
 export * from "./components";
 export * from "./fluxEvents";
+export * from "./i18nMessages";
 export * from "./menu";
 export * from "./stores";
 export * from "./utils";

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

@@ -21,6 +21,7 @@ import type { ReactNode } from "react";
 import { LiteralUnion } from "type-fest";
 
 import type { FluxEvents } from "./fluxEvents";
+import { i18nMessages } from "./i18nMessages";
 
 export { FluxEvents };
 
@@ -147,6 +148,19 @@ export interface LocaleInfo {
     postgresLang: string;
 }
 
+export interface i18n {
+    getAvailableLocales(): Locale[];
+    getLanguages(): LocaleInfo[];
+    getDefaultLocale(): string;
+    getLocale(): string;
+    getLocaleInfo(): LocaleInfo;
+    setLocale(locale: string): void;
+
+    loadPromise: Promise<void>;
+
+    Messages: Record<i18nMessages, any>;
+}
+
 export interface Clipboard {
     copy(text: string): void;
     SUPPORTS_COPY: boolean;

src/webpack/common/utils.ts

@@ -16,7 +16,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { runtimeHashMessageKey } from "@utils/intlHash";
 import type { Channel } from "discord-types/general";
 
 // eslint-disable-next-line path-alias/no-relative
@@ -57,10 +56,7 @@ export const { match, P }: Pick<typeof import("ts-pattern"), "match" | "P"> = ma
 
 export const lodash: typeof import("lodash") = findByPropsLazy("debounce", "cloneDeep");
 
-export const i18n = mapMangledModuleLazy('defaultLocale:"en-US"', {
+export const i18n: t.i18n = findLazy(m => m.Messages?.["en-US"]);
-    intl: filters.byProps("string", "format"),
-    t: filters.byProps(runtimeHashMessageKey("DISCORD"))
-});
 
 export let SnowflakeUtils: t.SnowflakeUtils;
 waitFor(["fromTimestamp", "extractTimestamp"], m => SnowflakeUtils = m);
@@ -135,7 +131,7 @@ export const UserUtils = {
 
 export const UploadManager = findByPropsLazy("clearAll", "addFile");
 export const UploadHandler = {
-    promptToUpload: findByCodeLazy("#{intl::ATTACHMENT_TOO_MANY_ERROR_TITLE}") as (files: File[], channel: Channel, draftType: Number) => void
+    promptToUpload: findByCodeLazy(".ATTACHMENT_TOO_MANY_ERROR_TITLE,") as (files: File[], channel: Channel, draftType: Number) => void
 };
 
 export const ApplicationAssetUtils = findByPropsLazy("fetchAssetIds", "getAssetImage") as {