Merge pull request #204 from moonlight-mod/components-crisis

moonlight-mod · Jan 28, 2025 · 027f865 · 027f865
2 parents b2dd5b8 + 4220ee1
commit 027f865
Show file tree

Hide file tree

Showing 17 changed files with 93 additions and 687 deletions.
diff --git a/packages/core-extensions/src/commands/index.ts b/packages/core-extensions/src/commands/index.ts
@@ -7,9 +7,9 @@ export const patches: Patch[] = [
     replace: [
       // inject commands
       {
-        match: /return (\i)=\i/,
+        match: /return (\i)\.filter/,
         replacement: (orig, commands) =>
-          `${commands}=[...${commands},...require("commands_commands").default._getCommands()];${orig}`
+          `return [...${commands},...require("commands_commands").default._getCommands()].filter`
       },
 
       // section

diff --git a/packages/core-extensions/src/contextMenu/webpackModules/evilMenu.ts b/packages/core-extensions/src/contextMenu/webpackModules/evilMenu.ts
@@ -8,7 +8,7 @@ let code =
 
 const parserSym = code.match(/(?<=_patchMenu\(.,).+?(?=\()/)![0];
 
-code = code.replace(/(?<=function\(\){return ).(?=})/, parserSym);
+code = code.replace(/{(.):\(\)=>./, (orig, e) => `{${e}:()=>${parserSym}`);
 const mod = new Function("module", "exports", "require", `(${code}).apply(this, arguments)`);
 
 const exp: any = {};

diff --git a/packages/core-extensions/src/disableSentry/index.ts b/packages/core-extensions/src/disableSentry/index.ts
@@ -6,8 +6,8 @@ export const patches: Patch[] = [
     find: "profiledRootComponent:",
     replace: {
       type: PatchReplaceType.Normal,
-      match: /(?<=\.Z=){.+?}}/,
-      replacement: 'require("disableSentry_stub").proxy()'
+      match: /Z:\(\)=>\i/,
+      replacement: 'Z:()=>require("disableSentry_stub").proxy()'
     }
   },
   {

diff --git a/packages/core-extensions/src/experiments/index.ts b/packages/core-extensions/src/experiments/index.ts
@@ -11,8 +11,8 @@ export const patches: Patch[] = [
   {
     find: '"scientist:triggered"', // Scientist? Triggered.
     replace: {
-      match: /(?<=personal_connection_id\|\|)!1/,
-      replacement: "!0"
+      match: ".personal_connection_id",
+      replacement: ".personal_connection_id || true"
     }
   },
 

diff --git a/packages/core-extensions/src/moonbase/index.tsx b/packages/core-extensions/src/moonbase/index.tsx
@@ -43,6 +43,8 @@ export const webpackModules: Record<string, ExtensionWebpackModule> = {
       { id: "discord/components/common/index" },
       { ext: "moonbase", id: "stores" },
       { id: "discord/modules/guild_settings/web/AppCard.css" },
+      { ext: "contextMenu", id: "contextMenu" },
+      { id: "discord/modules/modals/Modals" },
       "Masks.PANEL_BUTTON",
       '"Missing channel in Channel.openChannelContextMenu"',
       ".forumOrHome]:"
@@ -55,6 +57,7 @@ export const webpackModules: Record<string, ExtensionWebpackModule> = {
       { ext: "settings", id: "settings" },
       { id: "react" },
       { ext: "moonbase", id: "ui" },
+      { ext: "contextMenu", id: "contextMenu" },
       ':"USER_SETTINGS_MODAL_SET_SECTION"'
     ],
     entrypoint: true

diff --git a/packages/core-extensions/src/moonbase/manifest.json b/packages/core-extensions/src/moonbase/manifest.json
@@ -7,7 +7,7 @@
     "tagline": "The official settings UI for moonlight",
     "authors": ["Cynosphere", "NotNite", "redstonekasi"]
   },
-  "dependencies": ["spacepack", "settings", "common", "notices"],
+  "dependencies": ["spacepack", "settings", "common", "notices", "contextMenu"],
   "settings": {
     "sections": {
       "advice": "reload",

diff --git a/packages/core-extensions/src/moonbase/webpackModules/settings.tsx b/packages/core-extensions/src/moonbase/webpackModules/settings.tsx
@@ -5,7 +5,8 @@ import { Moonbase, pages, RestartAdviceMessage, Update } from "@moonlight-mod/wp
 import UserSettingsModalActionCreators from "@moonlight-mod/wp/discord/actions/UserSettingsModalActionCreators";
 import Margins from "@moonlight-mod/wp/discord/styles/shared/Margins.css";
 import { MoonbaseSettingsStore } from "@moonlight-mod/wp/moonbase_stores";
-import { MenuItem, Text, Breadcrumbs } from "@moonlight-mod/wp/discord/components/common/index";
+import { Text, Breadcrumbs } from "@moonlight-mod/wp/discord/components/common/index";
+import { MenuItem } from "@moonlight-mod/wp/contextMenu_contextMenu";
 
 const notice = {
   stores: [MoonbaseSettingsStore],

diff --git a/packages/core-extensions/src/moonbase/webpackModules/ui/extensions/card.tsx b/packages/core-extensions/src/moonbase/webpackModules/ui/extensions/card.tsx
@@ -3,7 +3,7 @@ import { constants, ExtensionLoadSource, ExtensionTag } from "@moonlight-mod/typ
 
 import { ExtensionCompat } from "@moonlight-mod/core/extension/loader";
 import {
-  BeakerIcon,
+  ScienceIcon,
   DownloadIcon,
   TrashIcon,
   AngleBracketsIcon,
@@ -118,7 +118,7 @@ export default function ExtensionCard({ uniqueId, selectTag }: { uniqueId: numbe
             <Text variant="text-md/semibold">{ext.manifest?.meta?.name ?? ext.id}</Text>
             {ext.source.type === ExtensionLoadSource.Developer && (
               <Tooltip text="This is a local extension" position="top">
-                {(props: any) => <BeakerIcon {...props} class={BuildOverrideClasses.infoIcon} size="xs" />}
+                {(props: any) => <ScienceIcon {...props} class={BuildOverrideClasses.infoIcon} size="xs" />}
               </Tooltip>
             )}
 

diff --git a/packages/core-extensions/src/moonbase/webpackModules/ui/extensions/filterBar.tsx b/packages/core-extensions/src/moonbase/webpackModules/ui/extensions/filterBar.tsx
@@ -10,15 +10,13 @@ import {
   Popout,
   Dialog,
   Menu,
-  MenuGroup,
-  MenuCheckboxItem,
-  MenuItem,
   ChevronSmallDownIcon,
   ChevronSmallUpIcon,
   ArrowsUpDownIcon,
   RetryIcon,
   Tooltip
 } from "@moonlight-mod/wp/discord/components/common/index";
+import { MenuGroup, MenuCheckboxItem, MenuItem } from "@moonlight-mod/wp/contextMenu_contextMenu";
 import { MoonbaseSettingsStore } from "@moonlight-mod/wp/moonbase_stores";
 import Margins from "@moonlight-mod/wp/discord/styles/shared/Margins.css";
 import TagItem from "@moonlight-mod/wp/discord/modules/forums/web/Tag";

diff --git a/packages/core-extensions/src/moonbase/webpackModules/ui/extensions/popup.tsx b/packages/core-extensions/src/moonbase/webpackModules/ui/extensions/popup.tsx
@@ -1,13 +1,8 @@
 // TODO: clean up the styling here
 import React from "@moonlight-mod/wp/react";
 import { MoonbaseExtension } from "core-extensions/src/moonbase/types";
-import {
-  openModalLazy,
-  useModalsStore,
-  closeModal,
-  SingleSelect,
-  Text
-} from "@moonlight-mod/wp/discord/components/common/index";
+import { openModalLazy, useModalsStore, closeModal } from "@moonlight-mod/wp/discord/modules/modals/Modals";
+import { SingleSelect, Text } from "@moonlight-mod/wp/discord/components/common/index";
 import { MoonbaseSettingsStore } from "@moonlight-mod/wp/moonbase_stores";
 import { ExtensionLoadSource } from "@moonlight-mod/types";
 import Flex from "@moonlight-mod/wp/discord/uikit/Flex";

diff --git a/packages/core-extensions/src/noHideToken/index.ts b/packages/core-extensions/src/noHideToken/index.ts
@@ -2,10 +2,10 @@ import { Patch } from "@moonlight-mod/types";
 
 export const patches: Patch[] = [
   {
-    find: "hideToken:function",
+    find: "hideToken:()=>",
     replace: {
-      match: /(?<=hideToken:function\(\){)/,
-      replacement: `return()=>{};`
+      match: /hideToken:\(\)=>.+?,/,
+      replacement: `hideToken:()=>{},`
     }
   }
 ];
diff --git a/packages/core-extensions/src/noTrack/index.ts b/packages/core-extensions/src/noTrack/index.ts
@@ -2,10 +2,10 @@ import { Patch } from "@moonlight-mod/types";
 
 export const patches: Patch[] = [
   {
-    find: "analyticsTrackingStoreMaker:function",
+    find: "analyticsTrackingStoreMaker:()=>",
     replace: {
-      match: /analyticsTrackingStoreMaker:function\(\){return .+?}/,
-      replacement: "analyticsTrackingStoreMaker:function(){return ()=>{}}"
+      match: /analyticsTrackingStoreMaker:\(\)=>.+?,/,
+      replacement: "analyticsTrackingStoreMaker:()=>()=>{},"
     }
   },
   {

diff --git a/packages/types/package.json b/packages/types/package.json
@@ -10,8 +10,8 @@
   },
   "dependencies": {
     "@moonlight-mod/lunast": "^1.0.0",
-    "@moonlight-mod/mappings": "^1.1.10",
-    "@moonlight-mod/moonmap": "^1.0.3",
+    "@moonlight-mod/mappings": "^1.1.11",
+    "@moonlight-mod/moonmap": "^1.0.4",
     "@types/react": "^18.3.10",
     "csstype": "^3.1.2",
     "standalone-electron-types": "^1.0.0"