Merge branch 'main' into presets

Author: yofukashino

package.json

@@ -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

@@ -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

@@ -151,7 +151,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 +210,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

@@ -144,9 +144,9 @@ function getSettingsElement(id: string, type: AddonType): React.ComponentType |
   if (type === AddonType.Theme) {
     if (themes.getDisabled().includes(id)) return undefined;
 
-    const theme = themes.themes.get(id)!;
+    const theme = themes.themes.get(id);
 
-    if (theme.manifest.presets?.length) {
+    if (theme?.manifest.presets?.length) {
       return () => <ThemePresetSettings id={id} />;
     }
     return undefined;
@@ -470,7 +470,6 @@ function Cards({
               body: intl.format(t.REPLUGGED_ADDON_UNINSTALL_PROMPT_BODY, { type: label(type) }),
               confirmText: intl.string(discordT.APPLICATION_UNINSTALL_PROMPT_CONFIRM),
               cancelText: intl.string(discordT.CANCEL),
-              confirmColor: Button.Colors.RED,
             });
             if (!confirmation) return;
 

src/renderer/coremods/settings/pages/Addons.tsx

@@ -2,7 +2,6 @@ import { React, modal } from "@common";
 import { t as discordT, intl } from "@common/i18n";
 import { ToastType, toast } from "@common/toast";
 import {
-  Button,
   Divider,
   FieldSet,
   Notice,
@@ -53,7 +52,6 @@ function restartModal(doRelaunch = false, onConfirm?: () => void, onCancel?: ()
         ? intl.string(discordT.BUNDLE_READY_RESTART)
         : intl.string(discordT.ERRORS_RELOAD),
       cancelText: intl.string(discordT.CANCEL),
-      confirmColor: Button.Colors.RED,
       onConfirm,
       onCancel,
     })

src/renderer/coremods/settings/pages/General.tsx

@@ -1,5 +1,6 @@
 import { waitForProps } from "@webpack";
 
+import type { VoidConfirmModal } from "discord-client-types/discord_app/design/void/components/VoidConfirmModal/VoidConfirmModal";
 import type * as Design from "discord-client-types/discord_app/design/web";
 
 export type DiscordComponents = {
@@ -12,7 +13,7 @@ export type DiscordComponents = {
   Text: Design.Text;
   ToastPosition: typeof Design.ToastPosition;
   ToastType: typeof Design.ToastType;
-  VoidConfirmModal: Design.ConfirmModal;
+  VoidConfirmModal: VoidConfirmModal;
   createToast: Design.CreateToast;
   popToast: Design.PopToast;
   showToast: Design.ShowToast;

src/renderer/modules/common/components.ts

@@ -1,28 +1,32 @@
 import { filters, getFunctionBySource, waitForModule } from "@webpack";
 import type React from "react";
 
-import type * as Design from "discord-client-types/discord_app/design/web";
+import type {
+  VoidSelectOption,
+  VoidSingleSelect,
+  VoidSingleSelectProps,
+} from "discord-client-types/discord_app/design/components/VoidSelect/web/VoidSelect";
 
 const selectSource = '"renderLeading","renderTrailing","value","onChange"';
 const mod = await waitForModule(filters.bySource(selectSource));
-const SingleSelect = getFunctionBySource<Design.SingleSelect>(mod, selectSource)!;
+const SingleSelect = getFunctionBySource<VoidSingleSelect>(mod, selectSource)!;
 
 interface CustomSingleSelectProps<
-  TOptions extends readonly Design.SelectOption[] = readonly Design.SelectOption[],
+  TOptions extends readonly VoidSelectOption[] = readonly VoidSelectOption[],
   TClearable extends boolean = false,
-> extends Design.SingleSelectProps<TOptions, TClearable> {
+> extends VoidSingleSelectProps<TOptions, TClearable> {
   disabled?: boolean;
 }
 
 export type CustomSingleSelectType = <
-  TOptions extends readonly Design.SelectOption[] = readonly Design.SelectOption[],
+  TOptions extends readonly VoidSelectOption[] = readonly VoidSelectOption[],
   TClearable extends boolean = false,
 >(
   props: React.PropsWithChildren<CustomSingleSelectProps<TOptions, TClearable>>,
 ) => React.ReactElement;
 
 function CustomSingleSelect<
-  TOptions extends readonly Design.SelectOption[] = readonly Design.SelectOption[],
+  TOptions extends readonly VoidSelectOption[] = readonly VoidSelectOption[],
   TClearable extends boolean = false,
 >({ disabled, ...props }: CustomSingleSelectProps<TOptions, TClearable>): React.ReactElement {
   return <SingleSelect isDisabled={disabled} {...props} />;

src/renderer/modules/components/Select.tsx

@@ -1,9 +1,8 @@
-import { getFunctionBySource } from "@webpack";
-import components from "../common/components";
+import { filters, getFunctionBySource, waitForModule } from "@webpack";
 
-import type * as Design from "discord-client-types/discord_app/design/web";
+import type { Tooltip } from "discord-client-types/discord_app/design/mana/components/Tooltip/Tooltip";
 
-export default getFunctionBySource<Design.VoidTooltipContainer>(
-  components,
-  /className:\i,element:\i="div"/,
-)!;
+const tooltipString = ".tooltipWithShortcut,";
+const mod = await waitForModule(filters.bySource(tooltipString));
+
+export default getFunctionBySource<Tooltip>(mod, tooltipString)!;