Merge branch 'main' into utc

Author: yofukashino

cspell.json

@@ -56,6 +56,7 @@
     "replug",
     "replugged",
     "scroller",
+    "setsize",
     "signingkey",
     "Skema",
     "skus",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "replugged",
-  "version": "4.11.0",
+  "version": "4.11.1",
   "description": "A lightweight @discord client mod focused on simplicity and performance",
   "license": "MIT",
   "engines": {
@@ -57,7 +57,7 @@
     "adm-zip": "^0.5.16",
     "chalk": "^5.6.2",
     "codemirror": "^6.0.2",
-    "discord-client-types": "^0.0.11",
+    "discord-client-types": "^0.0.12",
     "esbuild": "^0.27.0",
     "esbuild-sass-plugin": "^3.3.1",
     "prompts": "^2.4.2",

pnpm-lock.yaml

@@ -7,7 +7,7 @@ export default [
     replacements: [
       // Add the "replugged-badge" class if it's our custom badge
       {
-        match: /src:null!=\(\i=(\i)\.iconSrc\).{15,30}?,className:\i\(\)\(\i\.badge,\i/,
+        match: /src:null!=\(\i=(\i)\.iconSrc\).{15,30}?,className:\i\(\)\(\i\.\i,\i/,
         replace: `$&,{["replugged-badge"]:$1.component}`,
       },
       // Change to a div and add a children for our custom badge

src/renderer/coremods/badges/plaintextPatches.ts

@@ -92,7 +92,7 @@ async function injectRepluggedSectionIcon(): Promise<void> {
 
 async function injectApplicationCommandIndexStore(): Promise<void> {
   const applicationCommandIndexStoreMod = await waitForModule<Record<string, UseDiscoveryState>>(
-    filters.bySource("APPLICATION_COMMAND_INDEX"),
+    filters.bySource(".APPLICATION_COMMAND_CACHE_FETCH,"),
   );
   const useDiscoveryStateKey = getFunctionKeyBySource(
     applicationCommandIndexStoreMod,

src/renderer/coremods/commands/index.ts

@@ -49,12 +49,10 @@ export default (generalSettings.get("experiments")
         : []),
       // Always return true for the 'isStaff' property in SettingRendererUtils
       alwaysTruePatch(`header:"Developer Only"`, /isStaff:\i/),
-      // Add developer only settings to the UserSettingsCogContextMenu
-      alwaysTruePatch(`layoutDebuggingEnabled,isStaff:`, "isStaff())===!0"),
       // Show the Playgrounds and Build Overrides menu items in the UserSettingsCogContextMenu
       alwaysTruePatch("user-settings-cog", /isStaff\(\)/g),
       // Show the ExperimentEmbed
-      alwaysTruePatch(/className:\i\.experimentOverride,/, ".isStaffPersonal())"),
+      alwaysTruePatch('"Clear Treatment ".concat(', ".isStaffPersonal())"),
       // Show the PlaygroundEmbed
       alwaysTruePatch("data-has-story", ".isStaffPersonal())"),
       // Show the Playgrounds tab in the UserSettingsCogContextMenu

src/renderer/coremods/experiments/plaintextPatches.ts

@@ -17,11 +17,6 @@ div[class] .addon-embed-copied:hover {
   max-width: 210px;
 }
 
-.replugged-addon-embed-button-tooltip {
-  display: flex;
-  flex: 1;
-}
-
 .replugged-addon-embed-button {
   flex: 1;
 }

src/renderer/coremods/installer/AddonEmbed.css

@@ -2,9 +2,9 @@ import { React, classNames } from "@common";
 import { t as discordT, intl } from "@common/i18n";
 import { Button, Clickable, Text, Tooltip } from "@components";
 import { Logger } from "@replugged";
-import { getByProps } from "@webpack";
+import { getBySource } from "@webpack";
 import { t } from "src/renderer/modules/i18n";
-import { openExternal } from "src/renderer/util";
+import { mapClassNames, openExternal } from "src/renderer/util";
 import type { CheckResultSuccess } from "src/types";
 import { getSourceLink } from "../settings/pages";
 import { type InstallLinkProps, authorList, checkIsInstalled, getInfo, install } from "./util";
@@ -61,12 +61,13 @@ function Link({ className }: { className?: string }): React.ReactElement {
 }
 
 const Icon = React.memo(({ className }: { className?: string }): React.ReactElement | null => {
-  const svgMod = getByProps<SvgMod>("svgContentRight");
+  const svgMod = getBySource<SvgMod>("svgContentRight_");
   if (!svgMod) {
     logger.error("Failed to get svgMod");
     return null;
   }
-  const { svgContentRight, svgContentLines, svgContentLeft, svgDots, svgTag } = svgMod;
+  const { svgContentRight, svgContentLines, svgContentLeft, svgDots, svgTag } =
+    mapClassNames(svgMod);
 
   return (
     <svg width="57" height="40" viewBox="0 0 57 40" fill="none" className={className}>
@@ -119,7 +120,7 @@ const Embed = React.memo(
           installClick: () => void;
         },
   ): React.ReactElement | null => {
-    const classMod = getByProps<ClassMod>("titleRegion");
+    const classMod = getBySource<ClassMod>("titleRegion_");
     if (!classMod) {
       logger.error("Failed to find classMod");
       return null;
@@ -142,7 +143,7 @@ const Embed = React.memo(
       copyLink,
       copyLinkIcon,
       copied,
-    } = classMod;
+    } = mapClassNames(classMod);
 
     return (
       <div className={wrapper}>
@@ -151,7 +152,7 @@ const Embed = React.memo(
             <div className={barLoader} />
           ) : (
             <>
-              <Tooltip text={props.authors} className="replugged-addon-embed-title-tooltip">
+              <Tooltip text={props.authors}>
                 <strong className={classNames(title, "replugged-addon-embed-title")}>
                   {props.authors}
                 </strong>
@@ -210,7 +211,6 @@ const Embed = React.memo(
               text={intl.formatToPlainString(t.REPLUGGED_ERROR_ALREADY_INSTALLED, {
                 name: props.name,
               })}
-              className="replugged-addon-embed-button-tooltip"
               shouldShow={props.isInstalled ? undefined : false}
               hideOnClick={false}>
               <Button

src/renderer/coremods/installer/AddonEmbed.tsx

@@ -1,16 +1,15 @@
 import { marginStyles, modal } from "@common";
 import { t as discordT, intl } from "@common/i18n";
 import { ToastType, toast } from "@common/toast";
-import { Button, Notice } from "@components";
+import { Notice } from "@components";
 import { Logger } from "@replugged";
 import { generalSettings } from "src/renderer/managers/settings";
 import { setUpdaterState } from "src/renderer/managers/updater";
 import { t } from "src/renderer/modules/i18n";
-import { openExternal } from "src/renderer/util";
 import type { AnyAddonManifest, CheckResultSuccess } from "src/types";
 import * as pluginManager from "../../managers/plugins";
 import * as themeManager from "../../managers/themes";
-import { getAddonType, getSourceLink, label } from "../settings/pages";
+import { getAddonType, label } from "../settings/pages";
 
 const logger = Logger.coremod("Installer");
 
@@ -226,7 +225,7 @@ export function authorList(authors: string[]): string {
 async function showInstallPrompt(
   manifest: AnyAddonManifest,
   source: InstallerSource | undefined,
-  linkToStore = true,
+  _linkToStore = true,
 ): Promise<boolean | null> {
   let type: string;
   switch (manifest.type) {
@@ -245,7 +244,9 @@ async function showInstallPrompt(
     authors,
   });
 
-  const storeUrl = linkToStore ? getSourceLink(manifest) : undefined;
+  // TODO: Fix this! Mana ConfirmModals do not support secondary confirm buttons
+
+  // const storeUrl = linkToStore ? getSourceLink(manifest) : undefined;
 
   const res = await modal.confirm({
     title,
@@ -263,8 +264,8 @@ async function showInstallPrompt(
     ),
     confirmText: intl.string(discordT.CONFIRM),
     cancelText: intl.string(discordT.CANCEL),
-    secondaryConfirmText: storeUrl ? intl.string(t.REPLUGGED_INSTALLER_OPEN_STORE) : undefined,
-    onConfirmSecondary: () => (storeUrl ? openExternal(storeUrl) : undefined),
+    // secondaryConfirmText: storeUrl ? intl.string(t.REPLUGGED_INSTALLER_OPEN_STORE) : undefined,
+    // onConfirmSecondary: () => (storeUrl ? openExternal(storeUrl) : undefined),
   });
 
   return res;
@@ -357,7 +358,6 @@ export async function installFlow(
         }),
         confirmText: intl.string(discordT.ERRORS_RELOAD),
         cancelText: intl.string(discordT.CANCEL),
-        confirmColor: Button.Colors.RED,
       })
       .then((answer) => {
         if (answer) {

src/renderer/coremods/installer/util.tsx

@@ -1,5 +1,4 @@
 import { intl } from "@common/i18n";
-import { Flex, Text } from "@components";
 import { messagesLoader } from "i18n/en-US.messages";
 import type React from "react";
 import { t } from "../../modules/i18n";
@@ -11,22 +10,6 @@ export function getFormattedPercentage(locale: string): React.ReactNode {
   return intl.format(t.REPLUGGED_I18N_TRANSLATED_PERCENTAGE, { translated: Number(percentage) });
 }
 
-export function _renderLabel({
-  label,
-  value,
-}: {
-  label: string;
-  localizedName: string;
-  value: string;
-}): React.ReactElement {
-  return (
-    <Flex direction={Flex.Direction.VERTICAL}>
-      <Text variant="text-md/normal">{label}</Text>
-      <Text variant="text-xs/normal">{getFormattedPercentage(value)}</Text>
-    </Flex>
-  );
-}
-
 export function start(): void {
   const totalStrCount = Object.keys(messagesLoader.messages[messagesLoader.defaultLocale]).length;