commit 0c8e8322b06a8453c404b43ad4ba4c4dbb7d41f5 · notnite.com/moonlight

+1 -3

packages/core-extensions/src/moonbase/webpackModules/crashScreen.tsx

···

       1
       1
        
       import React from "@moonlight-mod/wp/react";

     

       2
       2
       -
       import * as Components from "@moonlight-mod/wp/discord/components/common/index";

     

       2
       2
       +
       import { Button, TabBar } from "@moonlight-mod/wp/discord/components/common/index";

     

       3
       3
        
       import { useStateFromStores, useStateFromStoresObject } from "@moonlight-mod/wp/discord/packages/flux";

     

       4
       4
        
       import { MoonbaseSettingsStore } from "@moonlight-mod/wp/moonbase_stores";

     

       5
       5
        
       import { RepositoryManifest, UpdateState } from "../types";

     

       6
       6
        
       import { ConfigExtension, DetectedExtension } from "@moonlight-mod/types";

     

       7
       7
        
       import DiscoveryClasses from "@moonlight-mod/wp/discord/modules/discovery/web/Discovery.css";

     

       8
       8
       -
       

     

       9
       9
       -
       const { Button, TabBar } = Components;

     

       10
       8
        
       

     

       11
       9
        
       const MODULE_REGEX = /Webpack-Module-(\d+)/g;

     

       12
       10

+1 -5

packages/core-extensions/src/moonbase/webpackModules/ui/RestartAdvice.tsx

···

       1
       1
        
       import { useStateFromStores } from "@moonlight-mod/wp/discord/packages/flux";

     

       2
       2
        
       import { MoonbaseSettingsStore } from "@moonlight-mod/wp/moonbase_stores";

     

       3
       3
       -
       import * as Components from "@moonlight-mod/wp/discord/components/common/index";

     

       3
       3
       +
       import { Button, CircleWarningIcon } from "@moonlight-mod/wp/discord/components/common/index";

     

       4
       4
        
       import React from "@moonlight-mod/wp/react";

     

       5
       5
        
       import { RestartAdvice } from "../../types";

     

       6
       6
        
       import HelpMessage from "./HelpMessage";

     

       7
       7
       -
       

     

       8
       8
       -
       const { Button } = Components;

     

       9
       7
        
       

     

       10
       8
        
       const strings: Record<RestartAdvice, string> = {

     

       11
       9
        
         [RestartAdvice.NotNeeded]: "how did you even",

     
···

       27
       25
        
         [RestartAdvice.ReloadNeeded]: () => window.location.reload(),

     

       28
       26
        
         [RestartAdvice.RestartNeeded]: () => MoonbaseSettingsStore.restartDiscord()

     

       29
       27
        
       };

     

       30
       30
       -
       

     

       31
       31
       -
       const { CircleWarningIcon } = Components;

     

       32
       28
        
       

     

       33
       29
        
       export default function RestartAdviceMessage() {

     

       34
       30
        
         const restartAdvice = useStateFromStores([MoonbaseSettingsStore], () => MoonbaseSettingsStore.restartAdvice);

+9 -3

packages/core-extensions/src/moonbase/webpackModules/ui/about.tsx

···

       1
       1
       -
       import * as Components from "@moonlight-mod/wp/discord/components/common/index";

     

       1
       1
       +
       import {

     

       2
       2
       +
         Card,

     

       3
       3
       +
         Text,

     

       4
       4
       +
         useThemeContext,

     

       5
       5
       +
         Button,

     

       6
       6
       +
         AngleBracketsIcon,

     

       7
       7
       +
         BookCheckIcon,

     

       8
       8
       +
         ClydeIcon

     

       9
       9
       +
       } from "@moonlight-mod/wp/discord/components/common/index";

     

       2
       10
        
       import Flex from "@moonlight-mod/wp/discord/uikit/Flex";

     

       3
       11
        
       import React from "@moonlight-mod/wp/react";

     

       4
       12
        
       import MarkupUtils from "@moonlight-mod/wp/discord/modules/markup/MarkupUtils";

     

       5
       13
        
       import AppCardClasses from "@moonlight-mod/wp/discord/modules/guild_settings/web/AppCard.css";

     

       6
       14
        
       import spacepack from "@moonlight-mod/wp/spacepack_spacepack";

     

       7
       7
       -
       

     

       8
       8
       -
       const { Card, Text, useThemeContext, Button, AngleBracketsIcon, BookCheckIcon, ClydeIcon } = Components;

     

       9
       15
        
       

     

       10
       16
        
       const wordmark = "https://raw.githubusercontent.com/moonlight-mod/moonlight/refs/heads/main/img/wordmark.png";

     

       11
       17
        
       const wordmarkLight =

+1 -3

packages/core-extensions/src/moonbase/webpackModules/ui/config/index.tsx

···

       16
       16
        
         Clickable

     

       17
       17
        
       } from "@moonlight-mod/wp/discord/components/common/index";

     

       18
       18
        
       import Flex from "@moonlight-mod/wp/discord/uikit/Flex";

     

       19
       19
       -
       import * as Components from "@moonlight-mod/wp/discord/components/common/index";

     

       19
       19
       +
       import { CircleXIcon } from "@moonlight-mod/wp/discord/components/common/index";

     

       20
       20
        
       import Margins from "@moonlight-mod/wp/discord/styles/shared/Margins.css";

     

       21
       21
        
       import FormSwitchClasses from "@moonlight-mod/wp/discord/components/common/FormSwitch.css";

     

       22
       22
        
       

     
···

       35
       35
        
               "discord/modules/guild_settings/roles/web/GuildSettingsRoleEdit.css"

     

       36
       36
        
             ))

     

       37
       37
        
         );

     

       38
       38
       -
       

     

       39
       39
       -
       const { CircleXIcon } = Components;

     

       40
       38
        
       

     

       41
       39
        
       function RemoveEntryButton({ onClick }: { onClick: () => void }) {

     

       42
       40
        
         return (

+12 -5

packages/core-extensions/src/moonbase/webpackModules/ui/extensions/card.tsx

···

       2
       2
        
       import { constants, ExtensionLoadSource, ExtensionTag } from "@moonlight-mod/types";

     

       3
       3
        
       

     

       4
       4
        
       import { ExtensionCompat } from "@moonlight-mod/core/extension/loader";

     

       5
       5
       -
       import * as Components from "@moonlight-mod/wp/discord/components/common/index";

     

       5
       5
       +
       import {

     

       6
       6
       +
         BeakerIcon,

     

       7
       7
       +
         DownloadIcon,

     

       8
       8
       +
         TrashIcon,

     

       9
       9
       +
         AngleBracketsIcon,

     

       10
       10
       +
         Tooltip,

     

       11
       11
       +
         Card,

     

       12
       12
       +
         Text,

     

       13
       13
       +
         FormSwitch,

     

       14
       14
       +
         TabBar,

     

       15
       15
       +
         Button

     

       16
       16
       +
       } from "@moonlight-mod/wp/discord/components/common/index";

     

       6
       17
        
       import React from "@moonlight-mod/wp/react";

     

       7
       18
        
       import { useStateFromStores } from "@moonlight-mod/wp/discord/packages/flux";

     

       8
       19
        
       import Flex from "@moonlight-mod/wp/discord/uikit/Flex";

     
···

       25
       36
        
         Settings

     

       26
       37
        
       }

     

       27
       38
        
       

     

       28
       28
       -
       const { BeakerIcon, DownloadIcon, TrashIcon, AngleBracketsIcon, Tooltip } = Components;

     

       29
       29
       -
       

     

       30
       39
        
       const COMPAT_TEXT_MAP: Record<ExtensionCompat, string> = {

     

       31
       40
        
         [ExtensionCompat.Compatible]: "huh?",

     

       32
       41
        
         [ExtensionCompat.InvalidApiLevel]: "Incompatible API level",

     
···

       49
       58
        
       

     

       50
       59
        
         // Why it work like that :sob:

     

       51
       60
        
         if (ext == null) return <></>;

     

       52
       52
       -
       

     

       53
       53
       -
         const { Card, Text, FormSwitch, TabBar, Button } = Components;

     

       54
       61
        
       

     

       55
       62
        
         const tagline = ext.manifest?.meta?.tagline;

     

       56
       63
        
         const settings = ext.settingsOverride ?? ext.manifest?.settings;

+6 -4

packages/core-extensions/src/moonbase/webpackModules/ui/extensions/filterBar.tsx

···

       12
       12
        
         Menu,

     

       13
       13
        
         MenuGroup,

     

       14
       14
        
         MenuCheckboxItem,

     

       15
       15
       -
         MenuItem

     

       15
       15
       +
         MenuItem,

     

       16
       16
       +
         ChevronSmallDownIcon,

     

       17
       17
       +
         ChevronSmallUpIcon,

     

       18
       18
       +
         ArrowsUpDownIcon,

     

       19
       19
       +
         RetryIcon,

     

       20
       20
       +
         Tooltip

     

       16
       21
        
       } from "@moonlight-mod/wp/discord/components/common/index";

     

       17
       17
       -
       import * as Components from "@moonlight-mod/wp/discord/components/common/index";

     

       18
       22
        
       import { MoonbaseSettingsStore } from "@moonlight-mod/wp/moonbase_stores";

     

       19
       23
        
       import Margins from "@moonlight-mod/wp/discord/styles/shared/Margins.css";

     

       20
       24
        
       import TagItem from "@moonlight-mod/wp/discord/modules/forums/web/Tag";

     
···

       41
       45
        
           HeaderClasses = spacepack.require("discord/modules/forums/web/Header.css");

     

       42
       46
        
           SortMenuClasses = spacepack.require("discord/modules/forums/web/SortMenu.css");

     

       43
       47
        
         });

     

       44
       44
       -
       

     

       45
       45
       -
       const { ChevronSmallDownIcon, ChevronSmallUpIcon, ArrowsUpDownIcon, RetryIcon, Tooltip } = Components;

     

       46
       48
        
       

     

       47
       49
        
       function toggleTag(selectedTags: Set<string>, setSelectedTags: (tags: Set<string>) => void, tag: string) {

     

       48
       50
        
         const newState = new Set(selectedTags);

+1 -2

packages/core-extensions/src/moonbase/webpackModules/ui/extensions/index.tsx

···

       6
       6
        
       import React from "@moonlight-mod/wp/react";

     

       7
       7
        
       import spacepack from "@moonlight-mod/wp/spacepack_spacepack";

     

       8
       8
        
       import { useStateFromStoresObject } from "@moonlight-mod/wp/discord/packages/flux";

     

       9
       9
       -
       import * as Components from "@moonlight-mod/wp/discord/components/common/index";

     

       9
       9
       +
       import { FormDivider, CircleInformationIcon, XSmallIcon } from "@moonlight-mod/wp/discord/components/common/index";

     

       10
       10
        
       import PanelButton from "@moonlight-mod/wp/discord/components/common/PanelButton";

     

       11
       11
        
       

     

       12
       12
        
       import { MoonbaseSettingsStore } from "@moonlight-mod/wp/moonbase_stores";

     
···

       14
       14
        
       import HelpMessage from "../HelpMessage";

     

       15
       15
        
       

     

       16
       16
        
       const SearchBar = spacepack.require("discord/uikit/search/SearchBar").default;

     

       17
       17
       -
       const { FormDivider, CircleInformationIcon, XSmallIcon } = Components;

     

       18
       17
        
       

     

       19
       18
        
       export default function ExtensionsPage() {

     

       20
       19
        
         const { extensions, savedFilter, showOnlyUpdateable } = useStateFromStoresObject([MoonbaseSettingsStore], () => {

+7 -9

packages/core-extensions/src/moonbase/webpackModules/ui/extensions/popup.tsx

···

       1
       1
        
       // TODO: clean up the styling here

     

       2
       2
        
       import React from "@moonlight-mod/wp/react";

     

       3
       3
        
       import { MoonbaseExtension } from "core-extensions/src/moonbase/types";

     

       4
       4
       -
       import * as Components from "@moonlight-mod/wp/discord/components/common/index";

     

       4
       4
       +
       import {

     

       5
       5
       +
         openModalLazy,

     

       6
       6
       +
         useModalsStore,

     

       7
       7
       +
         closeModal,

     

       8
       8
       +
         SingleSelect,

     

       9
       9
       +
         Text

     

       10
       10
       +
       } from "@moonlight-mod/wp/discord/components/common/index";

     

       5
       11
        
       import { MoonbaseSettingsStore } from "@moonlight-mod/wp/moonbase_stores";

     

       6
       12
        
       import { ExtensionLoadSource } from "@moonlight-mod/types";

     

       7
       13
        
       import Flex from "@moonlight-mod/wp/discord/uikit/Flex";

     

       8
       14
        
       import ConfirmModal from "@moonlight-mod/wp/discord/components/modals/ConfirmModal";

     

       9
       9
       -
       

     

       10
       10
       -
       const { openModalLazy, useModalsStore, closeModal } = Components;

     

       11
       15
        
       

     

       12
       16
        
       function close() {

     

       13
       17
        
         const ModalStore = useModalsStore.getState();

     
···

       31
       35
        
         option: string | undefined;

     

       32
       36
        
         setOption: (pick: string | undefined) => void;

     

       33
       37
        
       }) {

     

       34
       34
       -
         const { SingleSelect } = Components;

     

       35
       35
       -
       

     

       36
       38
        
         return (

     

       37
       39
        
           <SingleSelect

     

       38
       40
        
             key={id}

     
···

       60
       62
        
         deps: Record<string, MoonbaseExtension[]>;

     

       61
       63
        
         transitionState: number | null;

     

       62
       64
        
       }) {

     

       63
       63
       -
         const { Text } = Components;

     

       64
       64
       -
       

     

       65
       65
        
         const amountNotAvailable = Object.values(deps).filter((candidates) => candidates.length === 0).length;

     

       66
       66
        
       

     

       67
       67
        
         const [options, setOptions] = React.useState<Record<string, string | undefined>>(

     
···

       167
       167
        
         uniqueId: number;

     

       168
       168
        
         cb: () => void;

     

       169
       169
        
       }) {

     

       170
       170
       -
         const { Text } = Components;

     

       171
       171
       -
       

     

       172
       170
        
         return (

     

       173
       171
        
           <ConfirmModal

     

       174
       172
        
             title={title}

+16 -14

packages/core-extensions/src/moonbase/webpackModules/ui/extensions/settings.tsx

···

       11
       11
        
       

     

       12
       12
        
       import spacepack from "@moonlight-mod/wp/spacepack_spacepack";

     

       13
       13
        
       import React from "@moonlight-mod/wp/react";

     

       14
       14
       -
       import * as Components from "@moonlight-mod/wp/discord/components/common/index";

     

       14
       14
       +
       import {

     

       15
       15
       +
         FormSwitch,

     

       16
       16
       +
         FormItem,

     

       17
       17
       +
         FormText,

     

       18
       18
       +
         TextInput,

     

       19
       19
       +
         Slider,

     

       20
       20
       +
         TextArea,

     

       21
       21
       +
         Tooltip,

     

       22
       22
       +
         Clickable,

     

       23
       23
       +
         CircleXIcon,

     

       24
       24
       +
         Text,

     

       25
       25
       +
         SingleSelect,

     

       26
       26
       +
         Button,

     

       27
       27
       +
         useVariableSelect,

     

       28
       28
       +
         multiSelect

     

       29
       29
       +
       } from "@moonlight-mod/wp/discord/components/common/index";

     

       15
       30
        
       import { useStateFromStores } from "@moonlight-mod/wp/discord/packages/flux";

     

       16
       31
        
       import Flex from "@moonlight-mod/wp/discord/uikit/Flex";

     

       17
       32
        
       import MarkupUtils from "@moonlight-mod/wp/discord/modules/markup/MarkupUtils";

     
···

       63
       78
        
       }

     

       64
       79
        
       

     

       65
       80
        
       function Boolean({ ext, name, setting, disabled }: SettingsProps) {

     

       66
       66
       -
         const { FormSwitch } = Components;

     

       67
       81
        
         const { value, displayName, description } = useConfigEntry<boolean>(ext.uniqueId, name);

     

       68
       82
        
       

     

       69
       83
        
         return (

     
···

       83
       97
        
       }

     

       84
       98
        
       

     

       85
       99
        
       function Number({ ext, name, setting, disabled }: SettingsProps) {

     

       86
       86
       -
         const { FormItem, FormText, Slider } = Components;

     

       87
       100
        
         const { value, displayName, description } = useConfigEntry<number>(ext.uniqueId, name);

     

       88
       101
        
       

     

       89
       102
        
         const castedSetting = setting as NumberSettingType;

     
···

       108
       121
        
       }

     

       109
       122
        
       

     

       110
       123
        
       function String({ ext, name, setting, disabled }: SettingsProps) {

     

       111
       111
       -
         const { FormItem, FormText, TextInput } = Components;

     

       112
       124
        
         const { value, displayName, description } = useConfigEntry<string>(ext.uniqueId, name);

     

       113
       125
        
       

     

       114
       126
        
         return (

     
···

       126
       138
        
       }

     

       127
       139
        
       

     

       128
       140
        
       function MultilineString({ ext, name, setting, disabled }: SettingsProps) {

     

       129
       129
       -
         const { FormItem, FormText, TextArea } = Components;

     

       130
       141
        
         const { value, displayName, description } = useConfigEntry<string>(ext.uniqueId, name);

     

       131
       142
        
       

     

       132
       143
        
         return (

     
···

       146
       157
        
       }

     

       147
       158
        
       

     

       148
       159
        
       function Select({ ext, name, setting, disabled }: SettingsProps) {

     

       149
       149
       -
         const { FormItem, FormText, SingleSelect } = Components;

     

       150
       160
        
         const { value, displayName, description } = useConfigEntry<string>(ext.uniqueId, name);

     

       151
       161
        
       

     

       152
       162
        
         const castedSetting = setting as SelectSettingType;

     
···

       170
       180
        
       }

     

       171
       181
        
       

     

       172
       182
        
       function MultiSelect({ ext, name, setting, disabled }: SettingsProps) {

     

       173
       173
       -
         const { FormItem, FormText, Select, useVariableSelect, multiSelect } = Components;

     

       174
       183
        
         const { value, displayName, description } = useConfigEntry<string | string[]>(ext.uniqueId, name);

     

       175
       184
        
       

     

       176
       185
        
         const castedSetting = setting as MultiSelectSettingType;

     
···

       197
       206
        
         );

     

       198
       207
        
       }

     

       199
       208
        
       

     

       200
       200
       -
       // FIXME: type component keys

     

       201
       201
       -
       const { CircleXIcon } = Components;

     

       202
       202
       -
       

     

       203
       209
        
       function RemoveEntryButton({ onClick, disabled }: { onClick: () => void; disabled: boolean }) {

     

       204
       204
       -
         const { Tooltip, Clickable } = Components;

     

       205
       210
        
         return (

     

       206
       211
        
           <div className={GuildSettingsRoleEditClasses.removeButtonContainer}>

     

       207
       212
        
             <Tooltip text="Remove entry" position="top">

     
···

       216
       221
        
       }

     

       217
       222
        
       

     

       218
       223
        
       function List({ ext, name, setting, disabled }: SettingsProps) {

     

       219
       219
       -
         const { FormItem, FormText, TextInput, Button } = Components;

     

       220
       224
        
         const { value, displayName, description } = useConfigEntry<string[]>(ext.uniqueId, name);

     

       221
       225
        
       

     

       222
       226
        
         const entries = value ?? [];

     
···

       276
       280
        
       }

     

       277
       281
        
       

     

       278
       282
        
       function Dictionary({ ext, name, setting, disabled }: SettingsProps) {

     

       279
       279
       -
         const { FormItem, FormText, TextInput, Button } = Components;

     

       280
       283
        
         const { value, displayName, description } = useConfigEntry<Record<string, string>>(ext.uniqueId, name);

     

       281
       284
        
       

     

       282
       285
        
         const entries = Object.entries(value ?? {});

     
···

       358
       361
        
         );

     

       359
       362
        
       

     

       360
       363
        
         if (Component == null) {

     

       361
       361
       -
           const { Text } = Components;

     

       362
       364
        
           return (

     

       363
       365
        
             <Text variant="text-md/normal">{`Custom setting "${displayName}" is missing a component. Perhaps the extension is not installed?`}</Text>

     

       364
       366
        
           );

+1 -3

packages/core-extensions/src/moonbase/webpackModules/ui/update.tsx

···

       1
       1
        
       import { useStateFromStores } from "@moonlight-mod/wp/discord/packages/flux";

     

       2
       2
        
       import { MoonbaseSettingsStore } from "@moonlight-mod/wp/moonbase_stores";

     

       3
       3
       -
       import * as Components from "@moonlight-mod/wp/discord/components/common/index";

     

       3
       3
       +
       import { ThemeDarkIcon, Button } from "@moonlight-mod/wp/discord/components/common/index";

     

       4
       4
        
       import React from "@moonlight-mod/wp/react";

     

       5
       5
        
       import { UpdateState } from "../../types";

     

       6
       6
        
       import HelpMessage from "./HelpMessage";

     

       7
       7
       -
       

     

       8
       8
       -
       const { ThemeDarkIcon, Button } = Components;

     

       9
       7
        
       

     

       10
       8
        
       const logger = moonlight.getLogger("moonbase/ui/update");

     

       11
       9

+1 -3

packages/core-extensions/src/moonbase/webpackModules/updates.tsx

···

       3
       3
        
       import Notices from "@moonlight-mod/wp/notices_notices";

     

       4
       4
        
       import { MoonlightBranch } from "@moonlight-mod/types";

     

       5
       5
        
       import React from "@moonlight-mod/wp/react";

     

       6
       6
       -
       import * as Components from "@moonlight-mod/wp/discord/components/common/index";

     

       7
       7
       -
       

     

       8
       8
       -
       const { ThemeDarkIcon } = Components;

     

       6
       6
       +
       import { ThemeDarkIcon } from "@moonlight-mod/wp/discord/components/common/index";

     

       9
       7
        
       

     

       10
       8
        
       function plural(str: string, num: number) {

     

       11
       9
        
         return `${str}${num > 1 ? "s" : ""}`;

+3 -6

packages/core-extensions/src/notices/webpackModules/component.tsx

···

       1
       1
        
       import React from "@moonlight-mod/wp/react";

     

       2
       2
        
       import Dispatcher from "@moonlight-mod/wp/discord/Dispatcher";

     

       3
       3
       -
       import * as Components from "@moonlight-mod/wp/discord/components/common/index";

     

       3
       3
       +
       import { Notice, NoticeCloseButton, PrimaryCTANoticeButton } from "@moonlight-mod/wp/discord/components/common/index";

     

       4
       4
        
       import { useStateFromStoresObject } from "@moonlight-mod/wp/discord/packages/flux";

     

       5
       5
        
       import NoticesStore from "@moonlight-mod/wp/notices_notices";

     

       6
       6
       -
       import type { Notice } from "@moonlight-mod/types/coreExtensions/notices";

     

       6
       6
       +
       import type { Notice as NoticeType } from "@moonlight-mod/types/coreExtensions/notices";

     

       7
       7
        
       

     

       8
       8
       -
       // FIXME: types

     

       9
       9
       -
       const { Notice, NoticeCloseButton, PrimaryCTANoticeButton } = Components;

     

       10
       10
       -
       

     

       11
       11
       -
       function popAndDismiss(notice: Notice) {

     

       8
       8
       +
       function popAndDismiss(notice: NoticeType) {

     

       12
       9
        
         NoticesStore.popNotice();

     

       13
       10
        
         if (notice?.onDismiss) {

     

       14
       11
        
           notice.onDismiss();