commit c70a3f1fa604ed8061d9e060550f304bcbb3fc73 · notnite.com/moonlight

+1 -4

packages/core-extensions/src/common/index.ts

···

       10
        
         },

     

       11
        
       

     

       12
        
         flux: {

     

       13
       -
           dependencies: [

     

       14
       -
             { ext: "spacepack", id: "spacepack" },

     

       15
       -
             "useStateFromStores:function"

     

       16
       -
           ]

     

       17
        
         },

     

       18
        
       

     

       19
        
         fluxDispatcher: {

···

       10
        
         },

     

       11
        
       

     

       12
        
         flux: {

     

       13
       +
           dependencies: [{ ext: "spacepack", id: "spacepack" }, "connectStores:"]

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       14
        
         },

     

       15
        
       

     

       16
        
         fluxDispatcher: {

+19 -4

packages/core-extensions/src/common/webpackModules/components.ts

···

       3
        
       const Components = spacepack.findByCode("MasonryList:function")[0].exports;

     

       4
        
       const MarkdownParser = spacepack.findByCode(

     

       5
        
         "parseAutoModerationSystemMessage:"

     

       6
       -
       )[0].exports.default;

     

       7
        
       const LegacyText = spacepack.findByCode(".selectable", ".colorStandard")[0]

     

       8
        
         .exports.default;

     

       9
       -
       const Flex = spacepack.findByCode(".flex" + "GutterSmall,")[0].exports.Flex;

     

       10
       -
       const CardClasses = spacepack.findByCode("card", "cardHeader", "inModal")[0]

     

       11
       -
         .exports;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       12
        
       const ControlClasses = spacepack.findByCode(

     

       13
        
         "title",

     

       14
        
         "titleDefault",

···

       3
        
       const Components = spacepack.findByCode("MasonryList:function")[0].exports;

     

       4
        
       const MarkdownParser = spacepack.findByCode(

     

       5
        
         "parseAutoModerationSystemMessage:"

     

       6
       +
       )[0].exports.Z;

     

       7
        
       const LegacyText = spacepack.findByCode(".selectable", ".colorStandard")[0]

     

       8
        
         .exports.default;

     

       9
       +
       const Flex = Object.values(

     

       10
       +
         spacepack.findByCode(".flex" + "GutterSmall,")[0].exports

     

       11
       +
       )[0];

     

       12
       +
       

     

       13
       +
       const CardClasses = {};

     

       14
       +
       spacepack

     

       15
       +
         .lazyLoad(

     

       16
       +
           "renderArtisanalHack",

     

       17
       +
           /\[(?:.\.e\("\d+?"\),?)+\][^}]+?webpackId:\d+,name:"ChannelSettings"/,

     

       18
       +
           /webpackId:(\d+),name:"ChannelSettings"/

     

       19
       +
         )

     

       20
       +
         .then(() =>

     

       21
       +
           Object.assign(

     

       22
       +
             CardClasses,

     

       23
       +
             spacepack.findByExports("card", "cardHeader", "inModal")[0].exports

     

       24
       +
           )

     

       25
       +
         );

     

       26
       +
       

     

       27
        
       const ControlClasses = spacepack.findByCode(

     

       28
        
         "title",

     

       29
        
         "titleDefault",

+26 -4

packages/core-extensions/src/common/webpackModules/flux.ts

···

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

     

       2
        
       

     

       3
       -
       module.exports = spacepack.findByCode(

     

       4
       -
         ["useStateFromStores", ":function"].join(""),

     

       5
       -
         "Store:"

     

       6
       -
       )[0].exports;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0

···

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

     

       2
        
       

     

       3
       +
       const mod = spacepack.findByCode("connectStores:")[0].exports;

     

       4
       +
       

     

       5
       +
       const useStateFromStores = spacepack.findFunctionByStrings(

     

       6
       +
         mod,

     

       7
       +
         '"useStateFromStores"'

     

       8
       +
       )!;

     

       9
       +
       

     

       10
       +
       module.exports = {

     

       11
       +
         BatchedStoreListener: spacepack.findFunctionByStrings(

     

       12
       +
           mod,

     

       13
       +
           " tried to load a non-existent store."

     

       14
       +
         ),

     

       15
       +
         Dispatcher: spacepack.findFunctionByStrings(mod, "_dispatchWithDevtools("),

     

       16
       +
         Store: spacepack.findFunctionByStrings(mod, "registerActionHandlers("),

     

       17
       +
         default: mod.ZP,

     

       18
       +
         statesWillNeverBeEqual: spacepack.findFunctionByStrings(mod, "return!1"),

     

       19
       +
         useStateFromStores,

     

       20
       +
         useStateFromStoresArray: spacepack.findFunctionByStrings(

     

       21
       +
           mod,

     

       22
       +
           new RegExp(`return ${useStateFromStores.name}\\(.+?\\.[^Z]\\)`)

     

       23
       +
         ),

     

       24
       +
         useStateFromStoresObject: spacepack.findFunctionByStrings(

     

       25
       +
           mod,

     

       26
       +
           new RegExp(`return ${useStateFromStores.name}\\(.+?\\.Z\\)`)

     

       27
       +
         )

     

       28
       +
       };

+1 -1

packages/core-extensions/src/common/webpackModules/fluxDispatcher.ts

···

       3
        
       module.exports = spacepack.findByExports(

     

       4
        
         "isDispatching",

     

       5
        
         "dispatch"

     

       6
       -
       )[0].exports.default;

···

       3
        
       module.exports = spacepack.findByExports(

     

       4
        
         "isDispatching",

     

       5
        
         "dispatch"

     

       6
       +
       )[0].exports.Z;

+4 -1

packages/core-extensions/src/contextMenu/index.tsx

···

       26
        
       

     

       27
        
       export const webpackModules: Record<string, ExtensionWebpackModule> = {

     

       28
        
         contextMenu: {

     

       29
       -
           dependencies: [{ ext: "spacepack", id: "spacepack" }, "MenuGroup:"]

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       30
        
         },

     

       31
        
         evilMenu: {

     

       32
        
           dependencies: [

···

       26
        
       

     

       27
        
       export const webpackModules: Record<string, ExtensionWebpackModule> = {

     

       28
        
         contextMenu: {

     

       29
       +
           dependencies: [

     

       30
       +
             { ext: "spacepack", id: "spacepack" },

     

       31
       +
             "Menu API only allows Items and groups of Items as children."

     

       32
       +
           ]

     

       33
        
         },

     

       34
        
         evilMenu: {

     

       35
        
           dependencies: [

+31 -4

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

···

       55
        
         return el;

     

       56
        
       }

     

       57
        
       

     

       58
       -
       const MenuElements = spacepack.findByCode("return null", "MenuGroup:")[0]

     

       59
       -
         .exports;

     

       60
       -
       

     

       61
        
       module.exports = {

     

       62
       -
         ...MenuElements,

     

       63
        
         addItem,

     

       64
        
         _patchMenu,

     

       65
        
         _saveProps

     

       66
        
       };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0

···

       55
        
         return el;

     

       56
        
       }

     

       57
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       58
        
       module.exports = {

     

       0
        
       
     

       59
        
         addItem,

     

       60
        
         _patchMenu,

     

       61
        
         _saveProps

     

       62
        
       };

     

       63
       +
       

     

       64
       +
       // Unmangle Menu elements

     

       65
       +
       const code =

     

       66
       +
         spacepack.require.m[

     

       67
       +
           spacepack.findByCode(

     

       68
       +
             "Menu API only allows Items and groups of Items as children."

     

       69
       +
           )[0].id

     

       70
       +
         ].toString();

     

       71
       +
       

     

       72
       +
       let MangledMenu;

     

       73
       +
       

     

       74
       +
       const typeRegex = /if\(.\.type===(.)\.(.+?)\).+?type:"(.+?)"/g;

     

       75
       +
       const typeMap: Record<string, string | undefined> = {

     

       76
       +
         checkbox: "MenuCheckboxItem",

     

       77
       +
         control: "MenuControlItem",

     

       78
       +
         groupstart: "MenuGroup",

     

       79
       +
         customitem: "MenuItem",

     

       80
       +
         radio: "MenuRadioItem",

     

       81
       +
         separator: "MenuSeparator"

     

       82
       +
       };

     

       83
       +
       

     

       84
       +
       for (const [, modIdent, mangled, type] of code.matchAll(typeRegex)) {

     

       85
       +
         if (!MangledMenu) {

     

       86
       +
           const modId = code.match(new RegExp(`${modIdent}=.\\((\\d+?)\\)`))![1];

     

       87
       +
           MangledMenu = spacepack.require(modId);

     

       88
       +
         }

     

       89
       +
       

     

       90
       +
         const prop = typeMap[type];

     

       91
       +
         if (!prop) continue;

     

       92
       +
         module.exports[prop] = MangledMenu[mangled];

     

       93
       +
       }

+5 -1

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

···

       16
        
       );

     

       17
        
       const exp: any = {};

     

       18
        
       mod({}, exp, require);

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       19
        
       module.exports = (el: any) => {

     

       20
       -
         return exp.Menu({

     

       21
        
           children: el,

     

       22
        
           __contextMenu_evilMenu: true

     

       23
        
         });

···

       16
        
       );

     

       17
        
       const exp: any = {};

     

       18
        
       mod({}, exp, require);

     

       19
       +
       const Menu = spacepack.findFunctionByStrings(

     

       20
       +
         exp,

     

       21
       +
         "Menu API only allows Items and groups of Items as children."

     

       22
       +
       )!;

     

       23
        
       module.exports = (el: any) => {

     

       24
       +
         return Menu({

     

       25
        
           children: el,

     

       26
        
           __contextMenu_evilMenu: true

     

       27
        
         });

+3 -1

packages/core-extensions/src/disableSentry/host.ts

···

       30
        
           {

     

       31
        
             urls: [

     

       32
        
               "https://*.sentry.io/*",

     

       33
       -
               "https://*.discord.com/error-reporting-proxy/*"

     

       0
        
       
     

       0
        
       
     

       34
        
             ]

     

       35
        
           },

     

       36
        
           function (details, callback) {

···

       30
        
           {

     

       31
        
             urls: [

     

       32
        
               "https://*.sentry.io/*",

     

       33
       +
               "https://*.discord.com/error-reporting-proxy/*",

     

       34
       +
               "https://discord.com/assets/sentry.*.js",

     

       35
       +
               "https://*.discord.com/assets/sentry.*.js"

     

       36
        
             ]

     

       37
        
           },

     

       38
        
           function (details, callback) {

+4 -12

packages/core-extensions/src/disableSentry/index.ts

···

       3
        
       

     

       4
        
       export const patches: Patch[] = [

     

       5
        
         {

     

       6
       -
           find: "DSN:function",

     

       7
        
           replace: {

     

       8
        
             type: PatchReplaceType.Normal,

     

       9
       -
             match: /(?<=\.default=){.+?}}/,

     

       10
        
             replacement: 'require("disableSentry_stub").proxy()'

     

       11
        
           }

     

       12
        
         },

     
···

       14
        
           find: "window.DiscordSentry.addBreadcrumb",

     

       15
        
           replace: {

     

       16
        
             type: PatchReplaceType.Normal,

     

       17
       -
             match: /default:function\(\){return .}/,

     

       18
        
             replacement:

     

       19
        
               'default:function(){return (...args)=>{moonlight.getLogger("disableSentry").debug("Sentry calling addBreadcrumb passthrough:", ...args);}}'

     

       20
        
           }

     

       21
        
         },

     

       22
        
         {

     

       23
       -
           find: "initSentry:function",

     

       24
       -
           replace: {

     

       25
       -
             type: PatchReplaceType.Normal,

     

       26
       -
             match: /initSentry:function\(\){return .}/,

     

       27
       -
             replacement: "default:function(){return ()=>{}}"

     

       28
       -
           }

     

       29
       -
         },

     

       30
       -
         {

     

       31
        
           find: "window.DiscordErrors=",

     

       32
        
           replace: {

     

       33
        
             type: PatchReplaceType.Normal,

     

       34
       -
             match: /\(0,.\.usesClientMods\)\(\)/,

     

       35
        
             replacement: "false"

     

       36
        
           }

     

       37
        
         }

···

       3
        
       

     

       4
        
       export const patches: Patch[] = [

     

       5
        
         {

     

       6
       +
           find: "profiledRootComponent:",

     

       7
        
           replace: {

     

       8
        
             type: PatchReplaceType.Normal,

     

       9
       +
             match: /(?<=\.Z=){.+?}}/,

     

       10
        
             replacement: 'require("disableSentry_stub").proxy()'

     

       11
        
           }

     

       12
        
         },

     
···

       14
        
           find: "window.DiscordSentry.addBreadcrumb",

     

       15
        
           replace: {

     

       16
        
             type: PatchReplaceType.Normal,

     

       17
       +
             match: /Z:function\(\){return .}/,

     

       18
        
             replacement:

     

       19
        
               'default:function(){return (...args)=>{moonlight.getLogger("disableSentry").debug("Sentry calling addBreadcrumb passthrough:", ...args);}}'

     

       20
        
           }

     

       21
        
         },

     

       22
        
         {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       23
        
           find: "window.DiscordErrors=",

     

       24
        
           replace: {

     

       25
        
             type: PatchReplaceType.Normal,

     

       26
       +
             match: /(?<=uses_client_mods:)./,

     

       27
        
             replacement: "false"

     

       28
        
           }

     

       29
        
         }

+2 -7

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

···

       1
        
       import { ExtensionWebExports } from "@moonlight-mod/types";

     

       2
        
       

     

       3
       -
       import { CircleXIconSVG, DownloadIconSVG, TrashIconSVG } from "./types";

     

       4
       -
       

     

       5
        
       export const webpackModules: ExtensionWebExports["webpackModules"] = {

     

       6
        
         stores: {

     

       7
        
           dependencies: [

     
···

       16
        
             { ext: "common", id: "react" },

     

       17
        
             { ext: "common", id: "components" },

     

       18
        
             { ext: "moonbase", id: "stores" },

     

       19
       -
             DownloadIconSVG,

     

       20
       -
             TrashIconSVG,

     

       21
       -
             CircleXIconSVG,

     

       22
        
             "Masks.PANEL_BUTTON",

     

       23
       -
             "removeButtonContainer:",

     

       24
        
             '"Missing channel in Channel.openChannelContextMenu"',

     

       25
       -
             ".default.HEADER_BAR"

     

       26
        
           ]

     

       27
        
         },

     

       28

···

       1
        
       import { ExtensionWebExports } from "@moonlight-mod/types";

     

       2
        
       

     

       0
        
       
     

       0
        
       
     

       3
        
       export const webpackModules: ExtensionWebExports["webpackModules"] = {

     

       4
        
         stores: {

     

       5
        
           dependencies: [

     
···

       14
        
             { ext: "common", id: "react" },

     

       15
        
             { ext: "common", id: "components" },

     

       16
        
             { ext: "moonbase", id: "stores" },

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       17
        
             "Masks.PANEL_BUTTON",

     

       18
       +
             "renderArtisanalHack(){",

     

       19
        
             '"Missing channel in Channel.openChannelContextMenu"',

     

       20
       +
             ".forumOrHome]:"

     

       21
        
           ]

     

       22
        
         },

     

       23

-15

packages/core-extensions/src/moonbase/types.ts

···

       1
        
       import { DetectedExtension, ExtensionManifest } from "types/src";

     

       2
        
       

     

       3
       -
       export const DownloadIconSVG =

     

       4
       -
         "M12 2a1 1 0 0 1 1 1v10.59l3.3-3.3a1 1 0 1 1 1.4 1.42l-5 5a1 1 0 0 1-1.4 0l-5-5a1 1 0 1 1 1.4-1.42l3.3 3.3V3a1 1 0 0 1 1-1ZM3 20a1 1 0 1 0 0 2h18a1 1 0 1 0 0-2H3Z";

     

       5
       -
       export const TrashIconSVG =

     

       6
       -
         "M5 6.99902V18.999C5 20.101 5.897 20.999 7 20.999H17C18.103 20.999 19 20.101 19 18.999V6.99902H5ZM11 17H9V11H11V17ZM15 17H13V11H15V17Z";

     

       7
       -
       export const CircleXIconSVG =

     

       8
       -
         "M7.02799 0.333252C3.346 0.333252 0.361328 3.31792 0.361328 6.99992C0.361328 10.6819 3.346 13.6666 7.02799 13.6666C10.71 13.6666 13.6947 10.6819 13.6947 6.99992C13.6947 3.31792 10.7093 0.333252 7.02799 0.333252ZM10.166 9.19525L9.22333 10.1379L7.02799 7.94325L4.83266 10.1379L3.89 9.19525L6.08466 6.99992L3.88933 4.80459L4.832 3.86259L7.02733 6.05792L9.22266 3.86259L10.1653 4.80459L7.97066 6.99992L10.166 9.19525Z";

     

       9
       -
       export const DangerIconSVG =

     

       10
       -
         "M12 23a11 11 0 1 0 0-22 11 11 0 0 0 0 22Zm1.44-15.94L13.06 14a1.06 1.06 0 0 1-2.12 0l-.38-6.94a1 1 0 0 1 1-1.06h.88a1 1 0 0 1 1 1.06Zm-.19 10.69a1.25 1.25 0 1 1-2.5 0 1.25 1.25 0 0 1 2.5 0Z";

     

       11
       -
       export const ChevronSmallDownIconSVG =

     

       12
       -
         "M16.59 8.59003L12 13.17L7.41 8.59003L6 10L12 16L18 10L16.59 8.59003Z";

     

       13
       -
       export const ChevronSmallUpIconSVG =

     

       14
       -
         "M7.41 16.0001L12 11.4201L16.59 16.0001L18 14.5901L12 8.59006L6 14.5901L7.41 16.0001Z";

     

       15
       -
       export const ArrowsUpDownIconSVG =

     

       16
       -
         "M3.81962 11.3333L3.81962 1.33325L5.52983 1.33325L5.52985 11.3333L7.46703 9.36658L8.66663 10.5916L4.67068 14.6666L0.666626 10.5916L1.86622 9.34158L3.81962 11.3333Z";

     

       17
       -
       

     

       18
        
       export type MoonbaseNatives = {

     

       19
        
         fetchRepositories(

     

       20
        
           repos: string[]

···

       1
        
       import { DetectedExtension, ExtensionManifest } from "types/src";

     

       2
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       3
        
       export type MoonbaseNatives = {

     

       4
        
         fetchRepositories(

     

       5
        
           repos: string[]

+5 -3

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

···

       7
        
       import { MenuItem } from "@moonlight-mod/wp/common_components";

     

       8
        
       

     

       9
        
       const { open } = spacepack.findByExports("setSection", "clearSubsection")[0]

     

       10
       -
         .exports.default;

     

       11
        
       

     

       12
        
       settings.addSection("moonbase", "Moonbase", Moonbase, null, -2, {

     

       13
        
         stores: [MoonbaseSettingsStore],

     

       14
        
         element: () => {

     

       15
        
           // Require it here because lazy loading SUX

     

       16
       -
           const SettingsNotice =

     

       17
       -
             spacepack.findByCode("onSaveButtonColor")[0].exports.default;

     

       0
        
       
     

       0
        
       
     

       18
        
           return (

     

       19
        
             <SettingsNotice

     

       20
        
               submitting={MoonbaseSettingsStore.submitting}

···

       7
        
       import { MenuItem } from "@moonlight-mod/wp/common_components";

     

       8
        
       

     

       9
        
       const { open } = spacepack.findByExports("setSection", "clearSubsection")[0]

     

       10
       +
         .exports.Z;

     

       11
        
       

     

       12
        
       settings.addSection("moonbase", "Moonbase", Moonbase, null, -2, {

     

       13
        
         stores: [MoonbaseSettingsStore],

     

       14
        
         element: () => {

     

       15
        
           // Require it here because lazy loading SUX

     

       16
       +
           const SettingsNotice = spacepack.findByCode(

     

       17
       +
             "onSaveButtonColor",

     

       18
       +
             "FocusRingScope"

     

       19
       +
           )[0].exports.Z;

     

       20
        
           return (

     

       21
        
             <SettingsNotice

     

       22
        
               submitting={MoonbaseSettingsStore.submitting}

+15 -4

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

···

       1
        
       import { LogLevel } from "@moonlight-mod/types";

     

       2
       -
       import { CircleXIconSVG } from "../../../types";

     

       3
        
       

     

       4
        
       const logLevels = Object.values(LogLevel).filter(

     

       5
        
         (v) => typeof v === "string"

     
···

       19
        
         Tooltip,

     

       20
        
         Clickable

     

       21
        
       } from "@moonlight-mod/wp/common_components";

     

       0
        
       
     

       22
        
       

     

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

     

       24
        
       

     

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

     

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

     

       27
        
       

     

       28
       -
       const RemoveButtonClasses = spacepack.findByCode("removeButtonContainer")[0]

     

       29
       -
         .exports;

     

       30
       -
       const CircleXIcon = spacepack.findByCode(CircleXIconSVG)[0].exports.default;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       31
        
       function RemoveEntryButton({ onClick }: { onClick: () => void }) {

     

       32
        
         return (

     

       33
        
           <div className={RemoveButtonClasses.removeButtonContainer}>

···

       1
        
       import { LogLevel } from "@moonlight-mod/types";

     

       0
        
       
     

       2
        
       

     

       3
        
       const logLevels = Object.values(LogLevel).filter(

     

       4
        
         (v) => typeof v === "string"

     
···

       18
        
         Tooltip,

     

       19
        
         Clickable

     

       20
        
       } from "@moonlight-mod/wp/common_components";

     

       21
       +
       import CommonComponents from "@moonlight-mod/wp/common_components";

     

       22
        
       

     

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

     

       24
        
       

     

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

     

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

     

       27
        
       

     

       28
       +
       let RemoveButtonClasses: any;

     

       29
       +
       spacepack

     

       30
       +
         .lazyLoad(

     

       31
       +
           "renderArtisanalHack",

     

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

     

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

     

       34
       +
         )

     

       35
       +
         .then(

     

       36
       +
           () =>

     

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

     

       38
       +
               .exports)

     

       39
       +
         );

     

       40
       +
       

     

       41
       +
       const { CircleXIcon } = CommonComponents;

     

       42
        
       function RemoveEntryButton({ onClick }: { onClick: () => void }) {

     

       43
        
         return (

     

       44
        
           <div className={RemoveButtonClasses.removeButtonContainer}>

+36 -50

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

···

       1
       -
       import {

     

       2
       -
         DangerIconSVG,

     

       3
       -
         DownloadIconSVG,

     

       4
       -
         ExtensionState,

     

       5
       -
         TrashIconSVG

     

       6
       -
       } from "../../../types";

     

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

     

       8
        
       

     

       9
        
       import React from "@moonlight-mod/wp/common_react";

     
···

       22
        
       

     

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

     

       24
        
       

     

       25
       -
       const UserProfileClasses = spacepack.findByCode(

     

       26
       -
         "tabBarContainer",

     

       27
       -
         "topSection"

     

       28
       -
       )[0].exports;

     

       29
       -
       

     

       30
       -
       const DownloadIcon =

     

       31
       -
         spacepack.findByCode(DownloadIconSVG)[0].exports.DownloadIcon;

     

       32
       -
       const TrashIcon = spacepack.findByCode(TrashIconSVG)[0].exports.default;

     

       33
       -
       const DangerIcon =

     

       34
       -
         spacepack.findByCode(DangerIconSVG)[0].exports.CircleExclamationPointIcon;

     

       35
        
       

     

       36
       -
       const PanelButton =

     

       37
       -
         spacepack.findByCode("Masks.PANEL_BUTTON")[0].exports.default;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       38
        
       

     

       39
        
       export default function ExtensionCard({ uniqueId }: { uniqueId: number }) {

     

       40
        
         const [tab, setTab] = React.useState(ExtensionPage.Info);

     
···

       136
        
                     {restartNeeded && (

     

       137
        
                       <PanelButton

     

       138
        
                         icon={() => (

     

       139
       -
                           <DangerIcon

     

       140
        
                             color={CommonComponents.tokens.colors.STATUS_DANGER}

     

       141
        
                           />

     

       142
        
                         )}

     
···

       157
        
               </Flex>

     

       158
        
             </div>

     

       159
        
       

     

       160
       -
             <div className={UserProfileClasses.body}>

     

       161
        
               {(description != null || settings != null) && (

     

       162
       -
                 <div

     

       163
       -
                   className={UserProfileClasses.tabBarContainer}

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       164
        
                   style={{

     

       165
       -
                     padding: "0 10px"

     

       166
        
                   }}

     

       167
        
                 >

     

       168
       -
                   <TabBar

     

       169
       -
                     selectedItem={tab}

     

       170
       -
                     type="top"

     

       171
       -
                     onItemSelect={setTab}

     

       172
       -
                     className={UserProfileClasses.tabBar}

     

       173
        
                   >

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       174
        
                     <TabBar.Item

     

       175
       -
                       className={UserProfileClasses.tabBarItem}

     

       176
       -
                       id={ExtensionPage.Info}

     

       177
        
                     >

     

       178
       -
                       Info

     

       179
        
                     </TabBar.Item>

     

       0
        
       
     

       180
        
       

     

       181
       -
                     {description != null && (

     

       182
       -
                       <TabBar.Item

     

       183
       -
                         className={UserProfileClasses.tabBarItem}

     

       184
       -
                         id={ExtensionPage.Description}

     

       185
       -
                       >

     

       186
       -
                         Description

     

       187
       -
                       </TabBar.Item>

     

       188
       -
                     )}

     

       189
       -
       

     

       190
       -
                     {settings != null && (

     

       191
       -
                       <TabBar.Item

     

       192
       -
                         className={UserProfileClasses.tabBarItem}

     

       193
       -
                         id={ExtensionPage.Settings}

     

       194
       -
                       >

     

       195
       -
                         Settings

     

       196
       -
                       </TabBar.Item>

     

       197
       -
                     )}

     

       198
       -
                   </TabBar>

     

       199
       -
                 </div>

     

       200
        
               )}

     

       201
        
       

     

       202
        
               <Flex

···

       1
       +
       import { ExtensionState } from "../../../types";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

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

     

       3
        
       

     

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

     
···

       17
        
       

     

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

     

       19
        
       

     

       20
       +
       const { DownloadIcon, TrashIcon, CircleWarningIcon } = CommonComponents;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       21
        
       

     

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

     

       23
       +
       const TabBarClasses = spacepack.findByExports(

     

       24
       +
         "tabBar",

     

       25
       +
         "tabBarItem",

     

       26
       +
         "headerContentWrapper"

     

       27
       +
       )[0].exports;

     

       28
        
       

     

       29
        
       export default function ExtensionCard({ uniqueId }: { uniqueId: number }) {

     

       30
        
         const [tab, setTab] = React.useState(ExtensionPage.Info);

     
···

       126
        
                     {restartNeeded && (

     

       127
        
                       <PanelButton

     

       128
        
                         icon={() => (

     

       129
       +
                           <CircleWarningIcon

     

       130
        
                             color={CommonComponents.tokens.colors.STATUS_DANGER}

     

       131
        
                           />

     

       132
        
                         )}

     
···

       147
        
               </Flex>

     

       148
        
             </div>

     

       149
        
       

     

       150
       +
             <div>

     

       151
        
               {(description != null || settings != null) && (

     

       152
       +
                 <TabBar

     

       153
       +
                   selectedItem={tab}

     

       154
       +
                   type="top"

     

       155
       +
                   onItemSelect={setTab}

     

       156
       +
                   className={TabBarClasses.tabBar}

     

       157
        
                   style={{

     

       158
       +
                     padding: "0 20px"

     

       159
        
                   }}

     

       160
        
                 >

     

       161
       +
                   <TabBar.Item

     

       162
       +
                     className={TabBarClasses.tabBarItem}

     

       163
       +
                     id={ExtensionPage.Info}

     

       0
        
       
     

       0
        
       
     

       164
        
                   >

     

       165
       +
                     Info

     

       166
       +
                   </TabBar.Item>

     

       167
       +
       

     

       168
       +
                   {description != null && (

     

       169
        
                     <TabBar.Item

     

       170
       +
                       className={TabBarClasses.tabBarItem}

     

       171
       +
                       id={ExtensionPage.Description}

     

       172
        
                     >

     

       173
       +
                       Description

     

       174
        
                     </TabBar.Item>

     

       175
       +
                   )}

     

       176
        
       

     

       177
       +
                   {settings != null && (

     

       178
       +
                     <TabBar.Item

     

       179
       +
                       className={TabBarClasses.tabBarItem}

     

       180
       +
                       id={ExtensionPage.Settings}

     

       181
       +
                     >

     

       182
       +
                       Settings

     

       183
       +
                     </TabBar.Item>

     

       184
       +
                   )}

     

       185
       +
                 </TabBar>

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       186
        
               )}

     

       187
        
       

     

       188
        
               <Flex

+26 -40

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

···

       1
        
       import { tagNames } from "./info";

     

       2
       -
       import {

     

       3
       -
         ArrowsUpDownIconSVG,

     

       4
       -
         ChevronSmallDownIconSVG,

     

       5
       -
         ChevronSmallUpIconSVG

     

       6
       -
       } from "../../../types";

     

       7
        
       

     

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

     

       9
        
       import React from "@moonlight-mod/wp/common_react";

     
···

       20
        
         MenuCheckboxItem,

     

       21
        
         MenuItem

     

       22
        
       } from "@moonlight-mod/wp/common_components";

     

       0
        
       
     

       23
        
       

     

       24
        
       export enum Filter {

     

       25
        
         Core = 1 << 0,

     
···

       32
        
       }

     

       33
        
       export const defaultFilter = ~(~0 << 7);

     

       34
        
       

     

       35
       -
       const modPromise = spacepack.lazyLoad(

     

       36
       -
         '"Missing channel in Channel.openChannelContextMenu"',

     

       37
       -
         /e\("(\d+)"\)/g,

     

       38
       -
         /webpackId:"(.+?)"/

     

       39
       -
       );

     

       40
       -
       

     

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

     

       42
        
       const SortMenuClasses = spacepack.findByCode("container:", "clearText:")[0]

     

       43
        
         .exports;

     

       44
       -
       const FilterDialogClasses = spacepack.findByCode(

     

       45
       -
         "countContainer:",

     

       46
       -
         "tagContainer:"

     

       47
       -
       )[0].exports;

     

       48
       -
       const FilterBarClasses = spacepack.findByCode("tagsButtonWithCount:")[0]

     

       49
       -
         .exports;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       50
        
       

     

       51
        
       const TagItem = spacepack.findByCode(".FORUM_TAG_A11Y_FILTER_BY_TAG")[0].exports

     

       52
       -
         .default;

     

       53
        
       

     

       54
       -
       const ChevronSmallDownIcon = spacepack.findByCode(ChevronSmallDownIconSVG)[0]

     

       55
       -
         .exports.default;

     

       56
       -
       const ChevronSmallUpIcon = spacepack.findByCode(ChevronSmallUpIconSVG)[0]

     

       57
       -
         .exports.default;

     

       58
       -
       let ArrowsUpDownIcon: React.FunctionComponent;

     

       59
        
       

     

       60
        
       function toggleTag(

     

       61
        
         selectedTags: Set<string>,

     
···

       209
        
         );

     

       210
        
       }

     

       211
        
       

     

       212
       -
       function FilterBar({

     

       213
        
         filter,

     

       214
        
         setFilter,

     

       215
        
         selectedTags,

     
···

       274
        
                   className={FilterBarClasses.sortDropdown}

     

       275
        
                   innerClassName={FilterBarClasses.sortDropdownInner}

     

       276
        
                 >

     

       277
       -
                   <ArrowsUpDownIcon />

     

       278
        
                   <Text

     

       279
        
                     className={FilterBarClasses.sortDropdownText}

     

       280
        
                     variant="text-sm/medium"

     
···

       283
        
                     Sort & filter

     

       284
        
                   </Text>

     

       285
        
                   {isShown ? (

     

       286
       -
                     <ChevronSmallUpIcon size={20} />

     

       287
        
                   ) : (

     

       288
       -
                     <ChevronSmallDownIcon size={20} />

     

       289
        
                   )}

     

       290
        
                 </Button>

     

       291
        
               )}

     
···

       347
        
                     <>All</>

     

       348
        
                   )}

     

       349
        
                   {isShown ? (

     

       350
       -
                     <ChevronSmallUpIcon size={20} />

     

       351
        
                   ) : (

     

       352
       -
                     <ChevronSmallDownIcon size={20} />

     

       353
        
                   )}

     

       354
        
                 </Button>

     

       355
        
               )}

     
···

       357
        
           </div>

     

       358
        
         );

     

       359
        
       }

     

       360
       -
       

     

       361
       -
       // TODO: spacepack lazy loading utils

     

       362
       -
       export default React.lazy(() =>

     

       363
       -
         modPromise.then(async () => {

     

       364
       -
           await modPromise;

     

       365
       -
           ArrowsUpDownIcon ??=

     

       366
       -
             spacepack.findByCode(ArrowsUpDownIconSVG)[0].exports.default;

     

       367
       -
       

     

       368
       -
           return { default: FilterBar };

     

       369
       -
         })

     

       370
       -
       );

···

       1
        
       import { tagNames } from "./info";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       2
        
       

     

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

     

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

     
···

       15
        
         MenuCheckboxItem,

     

       16
        
         MenuItem

     

       17
        
       } from "@moonlight-mod/wp/common_components";

     

       18
       +
       import CommonComponents from "@moonlight-mod/wp/common_components";

     

       19
        
       

     

       20
        
       export enum Filter {

     

       21
        
         Core = 1 << 0,

     
···

       28
        
       }

     

       29
        
       export const defaultFilter = ~(~0 << 7);

     

       30
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

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

     

       32
        
       const SortMenuClasses = spacepack.findByCode("container:", "clearText:")[0]

     

       33
        
         .exports;

     

       34
       +
       

     

       35
       +
       let FilterDialogClasses: any;

     

       36
       +
       let FilterBarClasses: any;

     

       37
       +
       spacepack

     

       38
       +
         .lazyLoad(

     

       39
       +
           '"Missing channel in Channel.openChannelContextMenu"',

     

       40
       +
           /e\("(\d+)"\)/g,

     

       41
       +
           /webpackId:(\d+?),/

     

       42
       +
         )

     

       43
       +
         .then(() => {

     

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

     

       45
       +
           FilterDialogClasses = spacepack.findByCode(

     

       46
       +
             "countContainer:",

     

       47
       +
             "tagContainer:"

     

       48
       +
           )[0].exports;

     

       49
       +
         });

     

       50
        
       

     

       51
        
       const TagItem = spacepack.findByCode(".FORUM_TAG_A11Y_FILTER_BY_TAG")[0].exports

     

       52
       +
         .Z;

     

       53
        
       

     

       54
       +
       const { ChevronSmallDownIcon, ChevronSmallUpIcon, ArrowsUpDownIcon } =

     

       55
       +
         CommonComponents;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       56
        
       

     

       57
        
       function toggleTag(

     

       58
        
         selectedTags: Set<string>,

     
···

       206
        
         );

     

       207
        
       }

     

       208
        
       

     

       209
       +
       export default function FilterBar({

     

       210
        
         filter,

     

       211
        
         setFilter,

     

       212
        
         selectedTags,

     
···

       271
        
                   className={FilterBarClasses.sortDropdown}

     

       272
        
                   innerClassName={FilterBarClasses.sortDropdownInner}

     

       273
        
                 >

     

       274
       +
                   <ArrowsUpDownIcon size="xs" />

     

       275
        
                   <Text

     

       276
        
                     className={FilterBarClasses.sortDropdownText}

     

       277
        
                     variant="text-sm/medium"

     
···

       280
        
                     Sort & filter

     

       281
        
                   </Text>

     

       282
        
                   {isShown ? (

     

       283
       +
                     <ChevronSmallUpIcon size={"custom"} width={20} />

     

       284
        
                   ) : (

     

       285
       +
                     <ChevronSmallDownIcon size={"custom"} width={20} />

     

       286
        
                   )}

     

       287
        
                 </Button>

     

       288
        
               )}

     
···

       344
        
                     <>All</>

     

       345
        
                   )}

     

       346
        
                   {isShown ? (

     

       347
       +
                     <ChevronSmallUpIcon size={"custom"} width={20} />

     

       348
        
                   ) : (

     

       349
       +
                     <ChevronSmallDownIcon size={"custom"} width={20} />

     

       350
        
                   )}

     

       351
        
                 </Button>

     

       352
        
               )}

     
···

       354
        
           </div>

     

       355
        
         );

     

       356
        
       }

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0

+9 -11

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

···

       9
        
       

     

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

     

       11
        
       

     

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

     

       13
       -
       const SearchBar = spacepack.findByCode("Messages.SEARCH", "hideSearchIcon")[0]

     

       14
       -
         .exports.SearchBar;

     

       15
        
       

     

       16
        
       export default function ExtensionsPage() {

     

       17
        
         const moonbaseId = MoonbaseSettingsStore.getExtensionUniqueId("moonbase")!;

     
···

       89
        
                 spellCheck: "false"

     

       90
        
               }}

     

       91
        
             />

     

       92
       -
             <React.Suspense fallback={<div className={Margins.marginBottom20}></div>}>

     

       93
       -
               <FilterBar

     

       94
       -
                 filter={filter}

     

       95
       -
                 setFilter={setFilter}

     

       96
       -
                 selectedTags={selectedTags}

     

       97
       -
                 setSelectedTags={setSelectedTags}

     

       98
       -
               />

     

       99
       -
             </React.Suspense>

     

       100
        
             {filtered.map((ext) => (

     

       101
        
               <ExtensionCard uniqueId={ext.uniqueId} key={ext.id} />

     

       102
        
             ))}

···

       9
        
       

     

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

     

       11
        
       

     

       12
       +
       const SearchBar: any = Object.values(

     

       13
       +
         spacepack.findByCode("Messages.SEARCH", "hideSearchIcon")[0].exports

     

       14
       +
       )[0];

     

       15
        
       

     

       16
        
       export default function ExtensionsPage() {

     

       17
        
         const moonbaseId = MoonbaseSettingsStore.getExtensionUniqueId("moonbase")!;

     
···

       89
        
                 spellCheck: "false"

     

       90
        
               }}

     

       91
        
             />

     

       92
       +
             <FilterBar

     

       93
       +
               filter={filter}

     

       94
       +
               setFilter={setFilter}

     

       95
       +
               selectedTags={selectedTags}

     

       96
       +
               setSelectedTags={setSelectedTags}

     

       97
       +
             />

     

       0
        
       
     

       0
        
       
     

       98
        
             {filtered.map((ext) => (

     

       99
        
               <ExtensionCard uniqueId={ext.uniqueId} key={ext.id} />

     

       100
        
             ))}

+2 -6

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

···

       7
        
         SelectSettingType

     

       8
        
       } from "@moonlight-mod/types/config";

     

       9
        
       

     

       10
       -
       import {

     

       11
       -
         CircleXIconSVG,

     

       12
       -
         ExtensionState,

     

       13
       -
         MoonbaseExtension

     

       14
       -
       } from "../../../types";

     

       15
        
       

     

       16
        
       import React from "@moonlight-mod/wp/common_react";

     

       17
        
       import CommonComponents from "@moonlight-mod/wp/common_components";

     
···

       223
        
       

     

       224
        
       const RemoveButtonClasses = spacepack.findByCode("removeButtonContainer")[0]

     

       225
        
         .exports;

     

       226
       -
       const CircleXIcon = spacepack.findByCode(CircleXIconSVG)[0].exports.default;

     

       227
        
       function RemoveEntryButton({

     

       228
        
         onClick,

     

       229
        
         disabled

···

       7
        
         SelectSettingType

     

       8
        
       } from "@moonlight-mod/types/config";

     

       9
        
       

     

       10
       +
       import { ExtensionState, MoonbaseExtension } from "../../../types";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       11
        
       

     

       12
        
       import React from "@moonlight-mod/wp/common_react";

     

       13
        
       import CommonComponents from "@moonlight-mod/wp/common_components";

     
···

       219
        
       

     

       220
        
       const RemoveButtonClasses = spacepack.findByCode("removeButtonContainer")[0]

     

       221
        
         .exports;

     

       222
       +
       const CircleXIcon = CommonComponents.CircleXIcon;

     

       223
        
       function RemoveEntryButton({

     

       224
        
         onClick,

     

       225
        
         disabled

+2 -3

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

···

       9
        
       

     

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

     

       11
        
       

     

       12
       -
       const { Divider } = spacepack.findByCode(".default.HEADER_BAR")[0].exports

     

       13
       -
         .default;

     

       14
        
       const TitleBarClasses = spacepack.findByCode("iconWrapper:", "children:")[0]

     

       15
        
         .exports;

     

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

     

       17
        
       const { setSection, clearSubsection } = spacepack.findByExports(

     

       18
        
         "setSection",

     

       19
        
         "clearSubsection"

     

       20
       -
       )[0].exports.default;

     

       21
        
       

     

       22
        
       export const pages: {

     

       23
        
         id: string;

···

       9
        
       

     

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

     

       11
        
       

     

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

     

       0
        
       
     

       13
        
       const TitleBarClasses = spacepack.findByCode("iconWrapper:", "children:")[0]

     

       14
        
         .exports;

     

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

     

       16
        
       const { setSection, clearSubsection } = spacepack.findByExports(

     

       17
        
         "setSection",

     

       18
        
         "clearSubsection"

     

       19
       +
       )[0].exports.Z;

     

       20
        
       

     

       21
        
       export const pages: {

     

       22
        
         id: string;

+1 -1

packages/core-extensions/src/noTrack/index.ts

···

       4
        
         {

     

       5
        
           find: "analyticsTrackingStoreMaker:function",

     

       6
        
           replace: {

     

       7
       -
             match: /analyticsTrackingStoreMaker:function\(\){return .}/,

     

       8
        
             replacement: "analyticsTrackingStoreMaker:function(){return ()=>{}}"

     

       9
        
           }

     

       10
        
         },

···

       4
        
         {

     

       5
        
           find: "analyticsTrackingStoreMaker:function",

     

       6
        
           replace: {

     

       7
       +
             match: /analyticsTrackingStoreMaker:function\(\){return .+?}/,

     

       8
        
             replacement: "analyticsTrackingStoreMaker:function(){return ()=>{}}"

     

       9
        
           }

     

       10
        
         },

+6 -6

packages/core-extensions/src/quietLoggers/index.ts

···

       10
        
         {

     

       11
        
           find: '"./ggsans-800-extrabolditalic.woff2":',

     

       12
        
           replace: {

     

       13
       -
             match: /\.then\(function\(\){var.+?"MODULE_NOT_FOUND",.\}\)/,

     

       14
       -
             replacement: ".then(()=>(()=>{}))"

     

       15
        
           }

     

       16
        
         },

     

       17
        
         {

     
···

       36
        
         ['="RunningGameStore"', /.\.info\("games",{.+?}\),/],

     

       37
        
         [

     

       38
        
           '"[BUILD INFO] Release Channel: "',

     

       39
       -
           /new .{1,2}\.default\(\)\.log\("\[BUILD INFO\] Release Channel: ".+?"\)\),/

     

       40
        
         ],

     

       41
        
         [

     

       42
       -
           '.AnalyticEvents.APP_NATIVE_CRASH,"Storage"',

     

       43
        
           /console\.log\("AppCrashedFatalReport lastCrash:",.,.\);/

     

       44
        
         ],

     

       45
        
         [

     

       46
       -
           '.AnalyticEvents.APP_NATIVE_CRASH,"Storage"',

     

       47
        
           'console.log("AppCrashedFatalReport: getLastCrash not supported.");'

     

       48
        
         ],

     

       49
       -
         ['"[NATIVE INFO] ', /new .{1,2}\.default\(\)\.log\("\[NATIVE INFO] .+?\)\),/],

     

       50
        
         ['"Spellchecker"', /.\.info\("Switching to ".+?"\(unavailable\)"\);?/g],

     

       51
        
         [

     

       52
        
           'throw Error("Messages are still loading.");',

···

       10
        
         {

     

       11
        
           find: '"./ggsans-800-extrabolditalic.woff2":',

     

       12
        
           replace: {

     

       13
       +
             match: /throw .+?,./,

     

       14
       +
             replacement: "return{}"

     

       15
        
           }

     

       16
        
         },

     

       17
        
         {

     
···

       36
        
         ['="RunningGameStore"', /.\.info\("games",{.+?}\),/],

     

       37
        
         [

     

       38
        
           '"[BUILD INFO] Release Channel: "',

     

       39
       +
           /new .{1,2}\.Z\(\)\.log\("\[BUILD INFO\] Release Channel: ".+?"\)\),/

     

       40
        
         ],

     

       41
        
         [

     

       42
       +
           '.APP_NATIVE_CRASH,"Storage"',

     

       43
        
           /console\.log\("AppCrashedFatalReport lastCrash:",.,.\);/

     

       44
        
         ],

     

       45
        
         [

     

       46
       +
           '.APP_NATIVE_CRASH,"Storage"',

     

       47
        
           'console.log("AppCrashedFatalReport: getLastCrash not supported.");'

     

       48
        
         ],

     

       49
       +
         ['"[NATIVE INFO] ', /new .{1,2}\.Z\(\)\.log\("\[NATIVE INFO] .+?\)\);/],

     

       50
        
         ['"Spellchecker"', /.\.info\("Switching to ".+?"\(unavailable\)"\);?/g],

     

       51
        
         [

     

       52
        
           'throw Error("Messages are still loading.");',

+5 -5

packages/core-extensions/src/settings/index.ts

···

       3
        
       

     

       4
        
       export const patches: Patch[] = [

     

       5
        
         {

     

       6
       -
           find: ".useUnseenOutboundPromotions)().length",

     

       7
        
           replace: {

     

       8
       -
             match: /(\.push\(.+?\)}\)\)}\),)(.)}/,

     

       9
       -
             replacement: (_, orig, sections) =>

     

       10
       -
               `${orig}require("settings_settings").Settings._mutateSections(${sections})}`

     

       11
        
           }

     

       12
        
         },

     

       13
        
         {

     
···

       16
        
             match: /children:\[(.)\.map\(.+?\),children:.\((.)\)/,

     

       17
        
             replacement: (orig, sections, section) =>

     

       18
        
               `${orig.replace(

     

       19
       -
                 /Object\.values\(.\.UserSettingsSections\)/,

     

       20
        
                 (orig) =>

     

       21
        
                   `[...require("settings_settings").Settings.sectionNames,...${orig}]`

     

       22
        
               )}??${sections}.find(x=>x.section==${section})?._moonlight_submenu?.()`

···

       3
        
       

     

       4
        
       export const patches: Patch[] = [

     

       5
        
         {

     

       6
       +
           find: '"useGenerateUserSettingsSections"',

     

       7
        
           replace: {

     

       8
       +
             match: /(?<=\.push\(.+?\)}\)\)}\),)./,

     

       9
       +
             replacement: (sections: string) =>

     

       10
       +
               `require("settings_settings").Settings._mutateSections(${sections})`

     

       11
        
           }

     

       12
        
         },

     

       13
        
         {

     
···

       16
        
             match: /children:\[(.)\.map\(.+?\),children:.\((.)\)/,

     

       17
        
             replacement: (orig, sections, section) =>

     

       18
        
               `${orig.replace(

     

       19
       +
                 /Object\.values\(.\..+?\)/,

     

       20
        
                 (orig) =>

     

       21
        
                   `[...require("settings_settings").Settings.sectionNames,...${orig}]`

     

       22
        
               )}??${sections}.find(x=>x.section==${section})?._moonlight_submenu?.()`

+11 -5

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

···

       167
        
           chunk: RegExp,

     

       168
        
           module: RegExp

     

       169
        
         ) => {

     

       170
       -
           if (!chunk.flags.includes("g"))

     

       171
       -
             return Promise.reject("Chunk ID regex must be global");

     

       172
       -
       

     

       173
        
           const mod = Array.isArray(find)

     

       174
        
             ? spacepack.findByCode(...find)

     

       175
        
             : spacepack.findByCode(find);

     
···

       178
        
           const findId = mod[0].id;

     

       179
        
           const findCode = webpackRequire.m[findId].toString().replace(/\n/g, "");

     

       180
        
       

     

       181
       -
           const chunkIds = [...findCode.matchAll(chunk)].map(([, id]) => id);

     

       182
       -
           if (chunkIds.length === 0) return Promise.reject("Chunk ID match failed");

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       183
        
       

     

       184
        
           const moduleId = findCode.match(module)?.[1];

     

       185
        
           if (!moduleId) return Promise.reject("Module ID match failed");

···

       167
        
           chunk: RegExp,

     

       168
        
           module: RegExp

     

       169
        
         ) => {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       170
        
           const mod = Array.isArray(find)

     

       171
        
             ? spacepack.findByCode(...find)

     

       172
        
             : spacepack.findByCode(find);

     
···

       175
        
           const findId = mod[0].id;

     

       176
        
           const findCode = webpackRequire.m[findId].toString().replace(/\n/g, "");

     

       177
        
       

     

       178
       +
           let chunkIds;

     

       179
       +
           if (chunk.flags.includes("g")) {

     

       180
       +
             chunkIds = [...findCode.matchAll(chunk)].map(([, id]) => id);

     

       181
       +
           } else {

     

       182
       +
             const match = findCode.match(chunk);

     

       183
       +
             if (match)

     

       184
       +
               chunkIds = [...match[0].matchAll(/"(\d+)"/g)].map(([, id]) => id);

     

       185
       +
           }

     

       186
       +
       

     

       187
       +
           if (!chunkIds || chunkIds.length === 0)

     

       188
       +
             return Promise.reject("Chunk ID match failed");

     

       189
        
       

     

       190
        
           const moduleId = findCode.match(module)?.[1];

     

       191
        
           if (!moduleId) return Promise.reject("Module ID match failed");

+17 -6

packages/core/src/patch.ts

···

       330
        
           }

     

       331
        
         });

     

       332
        
       

     

       333
       -
         registerWebpackModule({

     

       334
       -
           ext: "moonlight",

     

       335
       -
           id: "fix_rspack_init_modules",

     

       336
       -
           entrypoint: true,

     

       337
       -
           run: function (module, exports, require) {

     

       338
       -
             patchModules(require.m);

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       339
        
           }

     

       340
        
         });

     

       341
        
       }

···

       330
        
           }

     

       331
        
         });

     

       332
        
       

     

       333
       +
         Object.defineProperty(Function.prototype, "m", {

     

       334
       +
           configurable: true,

     

       335
       +
           set(modules: any) {

     

       336
       +
             const { stack } = new Error();

     

       337
       +
             if (stack!.includes("/assets/") && !Array.isArray(modules)) {

     

       338
       +
               patchModules(modules);

     

       339
       +
               if (!window.webpackChunkdiscord_app)

     

       340
       +
                 window.webpackChunkdiscord_app = [];

     

       341
       +
               injectModules(modules);

     

       342
       +
             }

     

       343
       +
       

     

       344
       +
             Object.defineProperty(this, "m", {

     

       345
       +
               value: modules,

     

       346
       +
               configurable: true,

     

       347
       +
               enumerable: true,

     

       348
       +
               writable: true

     

       349
       +
             });

     

       350
        
           }

     

       351
        
         });

     

       352
        
       }

packages/types/src/coreExtensions/components.ts

···

       267
        
       

     

       268
        
       // TODO: wtaf is up with react types not working in jsx

     

       269
        
       export type CommonComponents = {

     

       0
        
       
     

       270
        
         Clickable: ComponentClass<

     

       271
        
           PropsWithChildren<{

     

       272
        
             onClick?: () => void;

···

       267
        
       

     

       268
        
       // TODO: wtaf is up with react types not working in jsx

     

       269
        
       export type CommonComponents = {

     

       270
       +
         [index: string]: any;

     

       271
        
         Clickable: ComponentClass<

     

       272
        
           PropsWithChildren<{

     

       273
        
             onClick?: () => void;