commit 2ae7f5c0c29f6b7b3d18d364b4e997a3c0977d85 · notnite.com/moonlight

+1 -4

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

···

       10
       10
        
         },

     

       11
       11
        
       

     

       12
       12
        
         flux: {

     

       13
       13
       -
           dependencies: [

     

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

     

       15
       15
       -
             "useStateFromStores:function"

     

       16
       16
       -
           ]

     

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

     

       17
       14
        
         },

     

       18
       15
        
       

     

       19
       16
        
         fluxDispatcher: {

+4 -2

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

···

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

     

       4
       4
        
       const MarkdownParser = spacepack.findByCode(

     

       5
       5
        
         "parseAutoModerationSystemMessage:"

     

       6
       6
       -
       )[0].exports.default;

     

       6
       6
       +
       )[0].exports.Z;

     

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

     

       8
       8
        
         .exports.default;

     

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

     

       9
       9
       +
       const Flex = Object.values(

     

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

     

       11
       11
       +
       )[0];

     

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

     

       11
       13
        
         .exports;

     

       12
       14
        
       const ControlClasses = spacepack.findByCode(

+26 -4

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

···

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

     

       2
       2
        
       

     

       3
       3
       -
       module.exports = spacepack.findByCode(

     

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

     

       5
       5
       -
         "Store:"

     

       6
       6
       -
       )[0].exports;

     

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

     

       4
       4
       +
       

     

       5
       5
       +
       const useStateFromStores = spacepack.findFunctionByStrings(

     

       6
       6
       +
         mod,

     

       7
       7
       +
         '"useStateFromStores"'

     

       8
       8
       +
       )!;

     

       9
       9
       +
       

     

       10
       10
       +
       module.exports = {

     

       11
       11
       +
         BatchedStoreListener: spacepack.findFunctionByStrings(

     

       12
       12
       +
           mod,

     

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

     

       14
       14
       +
         ),

     

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

     

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

     

       17
       17
       +
         default: mod.ZP,

     

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

     

       19
       19
       +
         useStateFromStores,

     

       20
       20
       +
         useStateFromStoresArray: spacepack.findFunctionByStrings(

     

       21
       21
       +
           mod,

     

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

     

       23
       23
       +
         ),

     

       24
       24
       +
         useStateFromStoresObject: spacepack.findFunctionByStrings(

     

       25
       25
       +
           mod,

     

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

     

       27
       27
       +
         )

     

       28
       28
       +
       };

+1 -1

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

···

       3
       3
        
       module.exports = spacepack.findByExports(

     

       4
       4
        
         "isDispatching",

     

       5
       5
        
         "dispatch"

     

       6
       6
       -
       )[0].exports.default;

     

       6
       6
       +
       )[0].exports.Z;

+7 -7

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

···

       3
       3
        
       

     

       4
       4
        
       export const patches: Patch[] = [

     

       5
       5
        
         {

     

       6
       6
       -
           find: "DSN:function",

     

       6
       6
       +
           find: "profiledRootComponent:",

     

       7
       7
        
           replace: {

     

       8
       8
        
             type: PatchReplaceType.Normal,

     

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

     

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

     

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

     

       11
       11
        
           }

     

       12
       12
        
         },

     
···

       14
       14
        
           find: "window.DiscordSentry.addBreadcrumb",

     

       15
       15
        
           replace: {

     

       16
       16
        
             type: PatchReplaceType.Normal,

     

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

     

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

     

       18
       18
        
             replacement:

     

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

     

       20
       20
        
           }

     

       21
       21
        
         },

     

       22
       22
        
         {

     

       23
       23
       -
           find: "initSentry:function",

     

       23
       23
       +
           find: "/error-reporting-proxy/web",

     

       24
       24
        
           replace: {

     

       25
       25
        
             type: PatchReplaceType.Normal,

     

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

     

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

     

       26
       26
       +
             match: /(?<=function .\(\){var _;)/,

     

       27
       27
       +
             replacement: "return;"

     

       28
       28
        
           }

     

       29
       29
        
         },

     

       30
       30
        
         {

     

       31
       31
        
           find: "window.DiscordErrors=",

     

       32
       32
        
           replace: {

     

       33
       33
        
             type: PatchReplaceType.Normal,

     

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

     

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

     

       35
       35
        
             replacement: "false"

     

       36
       36
        
           }

     

       37
       37
        
         }

+1 -1

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

···

       22
       22
        
             "Masks.PANEL_BUTTON",

     

       23
       23
        
             "removeButtonContainer:",

     

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

     

       25
       25
       -
             ".default.HEADER_BAR"

     

       25
       25
       +
             ".forumOrHome]:"

     

       26
       26
        
           ]

     

       27
       27
        
         },

     

       28
       28

+2 -1

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

···

       12
       12
        
           element: () => {

     

       13
       13
        
             // Require it here because lazy loading SUX

     

       14
       14
        
             const SettingsNotice =

     

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

     

       15
       15
       +
               spacepack.findByCode("onSaveButtonColor")[0].exports.Z;

     

       16
       16
        
             return (

     

       17
       17
        
               <SettingsNotice

     

       18
       18
        
                 submitting={MoonbaseSettingsStore.submitting}

     
···

       22
       22
        
                 onSave={() => {

     

       23
       23
        
                   MoonbaseSettingsStore.writeConfig();

     

       24
       24
        
                 }}

     

       25
       25
       +
                 disabled={false}

     

       25
       26
        
               />

     

       26
       27
        
             );

     

       27
       28
        
           }

+1 -1

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

···

       27
       27
        
       

     

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

     

       29
       29
        
         .exports;

     

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

     

       30
       30
       +
       const CircleXIcon = spacepack.findByCode(CircleXIconSVG)[0].exports.Z;

     

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

     

       32
       32
        
         return (

     

       33
       33
        
           <div className={RemoveButtonClasses.removeButtonContainer}>

+8 -7

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

···

       27
       27
        
         "topSection"

     

       28
       28
        
       )[0].exports;

     

       29
       29
        
       

     

       30
       30
       -
       const DownloadIcon =

     

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

     

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

     

       33
       33
       -
       const DangerIcon =

     

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

     

       30
       30
       +
       const DownloadIcon = Object.values(

     

       31
       31
       +
         spacepack.findByCode(DownloadIconSVG)[0].exports

     

       32
       32
       +
       )[0];

     

       33
       33
       +
       const TrashIcon = spacepack.findByCode(TrashIconSVG)[0].exports.Z;

     

       34
       34
       +
       const DangerIcon: any = Object.values(

     

       35
       35
       +
         spacepack.findByCode(DangerIconSVG)[0].exports

     

       36
       36
       +
       )[0];

     

       35
       37
        
       

     

       36
       36
       -
       const PanelButton =

     

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

     

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

     

       38
       39
        
       

     

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

     

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

+5 -6

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

···

       35
       35
        
       const modPromise = spacepack.lazyLoad(

     

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

     

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

     

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

     

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

     

       39
       39
        
       );

     

       40
       40
        
       

     

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

     
···

       49
       49
        
         .exports;

     

       50
       50
        
       

     

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

     

       52
       52
       -
         .default;

     

       52
       52
       +
         .Z;

     

       53
       53
        
       

     

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

     

       55
       55
       -
         .exports.default;

     

       55
       55
       +
         .exports.Z;

     

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

     

       57
       57
       -
         .exports.default;

     

       57
       57
       +
         .exports.Z;

     

       58
       58
        
       let ArrowsUpDownIcon: React.FunctionComponent;

     

       59
       59
        
       

     

       60
       60
        
       function toggleTag(

     
···

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

     

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

     

       364
       364
        
           await modPromise;

     

       365
       365
       -
           ArrowsUpDownIcon ??=

     

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

     

       365
       365
       +
           ArrowsUpDownIcon ??= spacepack.findByCode(ArrowsUpDownIconSVG)[0].exports.Z;

     

       367
       366
        
       

     

       368
       367
        
           return { default: FilterBar };

     

       369
       368
        
         })

+3 -2

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

···

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

     

       11
       11
        
       

     

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

     

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

     

       14
       14
       -
         .exports.SearchBar;

     

       13
       13
       +
       const SearchBar: any = Object.values(

     

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

     

       15
       15
       +
       )[0];

     

       15
       16
        
       

     

       16
       17
        
       export default function ExtensionsPage() {

     

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

+1 -2

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

···

       7
       7
        
       

     

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

     

       9
       9
        
       

     

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

     

       11
       11
       -
         .default;

     

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

     

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

     

       13
       12
        
         .exports;

     

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

+1 -1

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

···

       4
       4
        
         {

     

       5
       5
        
           find: "analyticsTrackingStoreMaker:function",

     

       6
       6
        
           replace: {

     

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

     

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

     

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

     

       9
       9
        
           }

     

       10
       10
        
         },

+6 -6

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

···

       10
       10
        
         {

     

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

     

       12
       12
        
           replace: {

     

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

     

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

     

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

     

       14
       14
       +
             replacement: "return{}"

     

       15
       15
        
           }

     

       16
       16
        
         },

     

       17
       17
        
         {

     
···

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

     

       37
       37
        
         [

     

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

     

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

     

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

     

       40
       40
        
         ],

     

       41
       41
        
         [

     

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

     

       42
       42
       +
           '.APP_NATIVE_CRASH,"Storage"',

     

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

     

       44
       44
        
         ],

     

       45
       45
        
         [

     

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

     

       46
       46
       +
           '.APP_NATIVE_CRASH,"Storage"',

     

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

     

       48
       48
        
         ],

     

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

     

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

     

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

     

       51
       51
        
         [

     

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

+4 -4

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

···

       3
       3
        
       

     

       4
       4
        
       export const patches: Patch[] = [

     

       5
       5
        
         {

     

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

     

       6
       6
       +
           find: '"useGenerateUserSettingsSections"',

     

       7
       7
        
           replace: {

     

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

     

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

     

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

     

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

     

       9
       9
       +
             replacement: (sections: string) =>

     

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

     

       11
       11
        
           }

     

       12
       12
        
         },

     

       13
       13
        
         {