commit 202962ce3c75e602cf8ef2d0fea04986e5e4ca61 · notnite.com/moonlight

+1

packages/core-extensions/src/contextMenu/webpackModules/contextMenu.ts

···

       58
       58
        
       };

     

       59
       59
        
       

     

       60
       60
        
       // Unmangle Menu elements

     

       61
       61
       +
       // spacepack.require.m[moonlight.moonmap.modules["discord/modules/menus/web/Menu"]].toString();

     

       61
       62
        
       const code =

     

       62
       63
        
         spacepack.require.m[

     

       63
       64
        
           spacepack.findByCode("Menu API only allows Items and groups of Items as children.")[0].id

+1

packages/core-extensions/src/contextMenu/webpackModules/evilMenu.ts

···

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

     

       2
       2
        
       

     

       3
       3
       +
       // spacepack.require.m[moonlight.moonmap.modules["discord/modules/menus/web/Menu"]].toString();

     

       3
       4
        
       let code =

     

       4
       5
        
         spacepack.require.m[

     

       5
       6
        
           spacepack.findByCode("Menu API only allows Items and groups of Items as children.")[0].id

+2

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

···

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

     

       8
       8
        
       

     

       9
       9
        
       const { Button, TabBar } = Components;

     

       10
       10
       +
       // TODO: confirm this is loaded with main chunk or something

     

       11
       11
       +
       // discord/modules/discovery/web/Discovery.css

     

       10
       12
        
       const TabBarClasses = spacepack.findByCode(/tabBar:"tabBar_[a-z0-9]+",tabBarItem:"tabBarItem_[a-z0-9]+"/)[0].exports;

     

       11
       13
        
       

     

       12
       14
        
       const MODULE_REGEX = /Webpack-Module-(\d+)/g;

+2

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

···

       10
       10
        
       

     

       11
       11
        
       const Margins = spacepack.require("discord/styles/shared/Margins.css");

     

       12
       12
        
       

     

       13
       13
       +
       // discord/actions/UserSettingsModalActionCreators

     

       13
       14
        
       const { open } = spacepack.findByCode(':"USER_SETTINGS_MODAL_SET_SECTION"')[0].exports.Z;

     

       14
       15
        
       

     

       15
       16
        
       let SettingsNotice;

     
···

       17
       18
        
         stores: [MoonbaseSettingsStore],

     

       18
       19
        
         element: () => {

     

       19
       20
        
           // Require it here because lazy loading SUX

     

       21
       21
       +
           // discord/components/common/SettingsNotice

     

       20
       22
        
           SettingsNotice ??= spacepack.findByCode("onSaveButtonColor", "FocusRingScope")[0].exports.Z;

     

       21
       23
        
           return (

     

       22
       24
        
             <SettingsNotice

+1

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

···

       4
       4
        
       import { Text } from "@moonlight-mod/wp/discord/components/common/index";

     

       5
       5
        
       

     

       6
       6
        
       const Margins = spacepack.require("discord/styles/shared/Margins.css");

     

       7
       7
       +
       // discord/components/common/HelpMessage.css

     

       7
       8
        
       const HelpMessageClasses = spacepack.findByCode("positive:", "iconDiv:")[0].exports;

     

       8
       9
        
       

     

       9
       10
        
       // reimpl of HelpMessage but with a custom icon

+1

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

···

       53
       53
        
             onClick={() => {

     

       54
       54
        
               if (openInClient) {

     

       55
       55
        
                 try {

     

       56
       56
       +
                   // discord/utils/MaskedLinkUtils handleClick

     

       56
       57
        
                   const openLink = spacepack.findFunctionByStrings(

     

       57
       58
        
                     spacepack.findByCode(".trackAnnouncementMessageLinkClicked({messageId:")[0].exports,

     

       58
       59
        
                     ".trackAnnouncementMessageLinkClicked({messageId:"

+7 -2

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

···

       20
       20
        
       

     

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

     

       22
       22
        
       

     

       23
       23
       +
       // discord/components/common/FormSwitch.css

     

       23
       24
        
       const FormClasses = spacepack.findByCode("dividerDefault:")[0].exports;

     

       25
       25
       +
       // discord/styles/shared/Margins.css

     

       24
       26
        
       const Margins = spacepack.findByCode("marginCenterHorz:")[0].exports;

     

       25
       27
        
       

     

       26
       28
        
       let RemoveButtonClasses: any;

     
···

       30
       32
        
           /\[(?:.\.e\("\d+?"\),?)+\][^}]+?webpackId:\d+,name:"GuildSettings"/,

     

       31
       33
        
           /webpackId:(\d+),name:"GuildSettings"/

     

       32
       34
        
         )

     

       33
       33
       -
         .then(() => (RemoveButtonClasses = spacepack.findByCode("removeButtonContainer")[0].exports));

     

       35
       35
       +
         .then(

     

       36
       36
       +
           () =>

     

       37
       37
       +
             // discord/modules/guild_settings/roles/web/GuildSettingsRoleEdit.css

     

       38
       38
       +
             (RemoveButtonClasses = spacepack.findByCode("removeButtonContainer")[0].exports)

     

       39
       39
       +
         );

     

       34
       40
        
       

     

       35
       35
       -
       // FIXME: type component keys

     

       36
       41
        
       const { CircleXIcon } = Components;

     

       37
       42
        
       

     

       38
       43
        
       function RemoveEntryButton({ onClick }: { onClick: () => void }) {

+4

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

···

       25
       25
        
       

     

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

     

       27
       27
        
       

     

       28
       28
       +
       // discord/components/common/PanelButton

     

       28
       29
        
       const PanelButton = spacepack.findByCode("Masks.PANEL_BUTTON")[0].exports.Z;

     

       30
       30
       +
       // discord/modules/discovery/web/Discovery.css

     

       29
       31
        
       const TabBarClasses = spacepack.findByCode("tabBar:", "tabBarItem:", "headerContentWrapper:")[0].exports;

     

       32
       32
       +
       // discord/styles/shared/Markup.css

     

       30
       33
        
       const MarkupClasses = spacepack.findByCode("markup:", "inlineFormat:")[0].exports;

     

       31
       34
        
       

     

       35
       35
       +
       // discord/modules/build_overrides/web/BuildOverride.css

     

       32
       36
        
       const BuildOverrideClasses = spacepack.findByCode("disabledButtonOverride:")[0].exports;

     

       33
       37
        
       

     

       34
       38
        
       const COMPAT_TEXT_MAP: Record<ExtensionCompat, string> = {

+5 -1

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

···

       30
       30
        
       }

     

       31
       31
        
       export const defaultFilter = 127 as Filter;

     

       32
       32
        
       

     

       33
       33
       +
       // discord/styles/shared/Margins.css

     

       33
       34
        
       const Margins = spacepack.findByCode("marginCenterHorz:")[0].exports;

     

       35
       35
       +
       // discord/modules/forums/web/SortMenu.css

     

       34
       36
        
       const SortMenuClasses = spacepack.findByCode("container:", "clearText:")[0].exports;

     

       35
       37
        
       

     

       36
       38
        
       let FilterDialogClasses: any;

     
···

       38
       40
        
       spacepack

     

       39
       41
        
         .lazyLoad('"Missing channel in Channel.openChannelContextMenu"', /e\("(\d+)"\)/g, /webpackId:(\d+?),/)

     

       40
       42
        
         .then(() => {

     

       43
       43
       +
           // discord/modules/forums/web/Forums.css

     

       41
       44
        
           FilterBarClasses = spacepack.findByCode("tagsButtonWithCount:")[0].exports;

     

       45
       45
       +
           // discord/modules/forums/web/Header.css

     

       42
       46
        
           FilterDialogClasses = spacepack.findByCode("countContainer:", "tagContainer:")[0].exports;

     

       43
       47
        
         });

     

       44
       48
        
       

     

       49
       49
       +
       // discord/modules/forums/web/Tag

     

       45
       50
        
       const TagItem = spacepack.findByCode('"forum-tag-"')[0].exports.Z;

     

       46
       51
        
       

     

       47
       47
       -
       // FIXME: type component keys

     

       48
       52
        
       const { ChevronSmallDownIcon, ChevronSmallUpIcon, ArrowsUpDownIcon, RetryIcon, Tooltip } = Components;

     

       49
       53
        
       

     

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

+2

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

···

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

     

       13
       13
        
       import HelpMessage from "../HelpMessage";

     

       14
       14
        
       

     

       15
       15
       +
       // discord/uikit/search/SearchBar

     

       15
       16
        
       const SearchBar: any = Object.values(spacepack.findByCode("hideSearchIcon")[0].exports)[0];

     

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

     

       18
       18
       +
       // discord/components/common/PanelButton

     

       17
       19
        
       const PanelButton = spacepack.findByCode("Masks.PANEL_BUTTON")[0].exports.Z;

     

       18
       20
        
       

     

       19
       21
        
       export default function ExtensionsPage() {

+2 -10

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

···

       2
       2
        
       import { MoonbaseExtension } from "../../../types";

     

       3
       3
        
       

     

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

     

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

     

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

     

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

     

       7
       6
        
       

     

       8
       7
        
       type Dependency = {

     

       9
       8
        
         id: string;

     
···

       34
       33
        
         [ExtensionTag.Library]: "Library"

     

       35
       34
        
       };

     

       36
       35
        
       

     

       37
       37
       -
       const UserInfoClasses = spacepack.findByCode("infoScroller", "userInfoSection", "userInfoSectionHeader")[0].exports;

     

       38
       38
       -
       

     

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

     

       40
       40
       -
       

     

       41
       41
       -
       // FIXME: type component keys

     

       42
       42
       -
       const { Text } = Components;

     

       43
       37
        
       

     

       44
       38
        
       function InfoSection({ title, children }: { title: string; children: React.ReactNode }) {

     

       45
       39
        
         return (

     
···

       48
       42
        
               marginRight: "1em"

     

       49
       43
        
             }}

     

       50
       44
        
           >

     

       51
       51
       -
             <Text variant="eyebrow" className={UserInfoClasses.userInfoSectionHeader}>

     

       52
       52
       -
               {title}

     

       53
       53
       -
             </Text>

     

       45
       45
       +
             <Text variant="eyebrow">{title}</Text>

     

       54
       46
        
       

     

       55
       47
        
             <Text variant="text-sm/normal">{children}</Text>

     

       56
       48
        
           </div>

+4 -3

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

···

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

     

       9
       9
        
       

     

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

     

       11
       11
       -
       const Popup = spacepack.findByCode(".minorContainer", "secondaryAction")[0].exports.default;

     

       11
       11
       +
       // discord/components/modals/ConfirmModal

     

       12
       12
       +
       const ConfirmModal = spacepack.findByCode(".minorContainer", "secondaryAction")[0].exports.default;

     

       12
       13
        
       

     

       13
       14
        
       function close() {

     

       14
       15
        
         const ModalStore = useModalsStore.getState();

     
···

       75
       76
        
         );

     

       76
       77
        
       

     

       77
       78
        
         return (

     

       78
       78
       -
           <Popup

     

       79
       79
       +
           <ConfirmModal

     

       79
       80
        
             body={

     

       80
       81
        
               <Flex

     

       81
       82
        
                 style={{

     
···

       171
       172
        
         const { Text } = Components;

     

       172
       173
        
       

     

       173
       174
        
         return (

     

       174
       174
       -
           <Popup

     

       175
       175
       +
           <ConfirmModal

     

       175
       176
        
             title={title}

     

       176
       177
        
             body={

     

       177
       178
        
               <Flex>

+1

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

···

       184
       184
        
         );

     

       185
       185
        
       }

     

       186
       186
        
       

     

       187
       187
       +
       // discord/modules/guild_settings/roles/web/GuildSettingsRoleEdit.css

     

       187
       188
        
       const RemoveButtonClasses = spacepack.findByCode("removeButtonContainer")[0].exports;

     

       188
       189
        
       

     

       189
       190
        
       // FIXME: type component keys

+4

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

···

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

     

       12
       12
        
       import RestartAdviceMessage from "./RestartAdvice";

     

       13
       13
        
       

     

       14
       14
       +
       // discord/components/common/BaseHeaderBar

     

       14
       15
        
       const { Divider } = spacepack.findByCode(".forumOrHome]:")[0].exports.Z;

     

       16
       16
       +
       // discord/components/common/HeaderBar.css

     

       15
       17
        
       const TitleBarClasses = spacepack.findByCode("iconWrapper:", "children:")[0].exports;

     

       18
       18
       +
       // discord/modules/people/web/PeoplePage.css

     

       16
       19
        
       const TabBarClasses = spacepack.findByCode("nowPlayingColumn:")[0].exports;

     

       20
       20
       +
       // discord/actions/UserSettingsModalActionCreators

     

       17
       21
        
       const { setSection, clearSubsection } = spacepack.findByCode(':"USER_SETTINGS_MODAL_SET_SECTION"')[0].exports.Z;

     

       18
       22
        
       const Margins = spacepack.require("discord/styles/shared/Margins.css");

     

       19
       23

+1

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

···

       59
       59
        
               {

     

       60
       60
        
                 name: "Open Moonbase",

     

       61
       61
        
                 onClick: () => {

     

       62
       62
       +
                   // discord/actions/UserSettingsModalActionCreators .default

     

       62
       63
        
                   const { open } = spacepack.findByCode(':"USER_SETTINGS_MODAL_SET_SECTION"')[0].exports.Z;

     

       63
       64
        
                   if (MoonbaseSettingsStore.getExtensionConfigRaw<boolean>("moonbase", "sections", false)) {

     

       64
       65
        
                     open("moonbase-extensions");