commit 73be7709f22acebf90d25fdc9fb05da7da6556af · notnite.com/moonlight

+1 -1

CHANGELOG.md

···

       1
       1
       -
       - Fixes for latest Discord

     

       1
       1
       +
       - core-extensions/contextMenu: Fix patches

+1 -1

package.json

···

       1
       1
        
       {

     

       2
       2
        
         "name": "moonlight",

     

       3
       3
       -
         "version": "1.0.9",

     

       3
       3
       +
         "version": "1.0.10",

     

       4
       4
        
         "description": "Yet another Discord mod",

     

       5
       5
        
         "homepage": "https://moonlight-mod.github.io/",

     

       6
       6
        
         "license": "LGPL-3.0-or-later",

+1 -2

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

···

       5
       5
        
           find: "Menu API only allows Items and groups of Items as children.",

     

       6
       6
        
           replace: [

     

       7
       7
        
             {

     

       8
       8
       -
               match:

     

       9
       9
       -
                 /(?<=let{navId[^}]+?}=(.),(.)=function .\(.\){.+(?=,.=function))/,

     

       8
       8
       +
               match: /(?<=let{navId[^}]+?}=(.),(.)=.\(.\))/,

     

       10
       9
        
               replacement: (_, props, items) =>

     

       11
       10
        
                 `,__contextMenu=!${props}.__contextMenu_evilMenu&&require("contextMenu_contextMenu")._patchMenu(${props}, ${items})`

     

       12
       11
        
             }

+5 -6

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

···

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

     

       7
       7
        
           )[0].id

     

       8
       8
        
         ].toString();

     

       9
       9
       -
       code = code.replace(/,.=(?=function .\(.\){.+?,.=function)/, ";return ");

     

       10
       10
       -
       code = code.replace(/,(?=__contextMenu)/, ";let ");

     

       9
       9
       +
       code = code.replace(

     

       10
       10
       +
         /onSelect:(.)}=(.),.=(.\(.\)),/,

     

       11
       11
       +
         `onSelect:$1}=$2;return $3;let `

     

       12
       12
       +
       );

     

       11
       13
        
       const mod = new Function(

     

       12
       14
        
         "module",

     

       13
       15
        
         "exports",

     
···

       16
       18
        
       );

     

       17
       19
        
       const exp: any = {};

     

       18
       20
        
       mod({}, exp, require);

     

       19
       19
       -
       const Menu = spacepack.findFunctionByStrings(

     

       20
       20
       -
         exp,

     

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

     

       22
       22
       -
       )!;

     

       21
       21
       +
       const Menu = spacepack.findFunctionByStrings(exp, "isUsingKeyboardNavigation")!;

     

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

     

       24
       23
        
         return Menu({

     

       25
       24
        
           children: el,

+1 -1

packages/types/package.json

···

       1
       1
        
       {

     

       2
       2
        
         "name": "@moonlight-mod/types",

     

       3
       3
       -
         "version": "1.1.8",

     

       3
       3
       +
         "version": "1.1.9",

     

       4
       4
        
         "main": "./src/index.ts",

     

       5
       5
        
         "types": "./src/index.ts",

     

       6
       6
        
         "exports": {

+23 -1

packages/types/src/coreExtensions.ts

···

       76
       76
        
       export type CommonReact = typeof import("react");

     

       77
       77
        
       export type CommonFlux = FluxDefault;

     

       78
       78
        
       export type CommonComponents = CommonComponents_; // lol

     

       79
       79
       -
       export type CommonFluxDispatcher = Dispatcher<any>;

     

       79
       79
       +
       export type CommonFluxDispatcher = Dispatcher<any> & {

     

       80
       80
       +
         dispatch: (payload: any) => void;

     

       81
       81
       +
         isDispatching: () => boolean;

     

       82
       82
       +
       

     

       83
       83
       +
         addInterceptor: (interceptor: (event: any) => boolean | undefined) => void;

     

       84
       84
       +
       

     

       85
       85
       +
         flushWaitQueue: () => void;

     

       86
       86
       +
         wait: (callback: () => void) => void;

     

       87
       87
       +
       

     

       88
       88
       +
         subscribe: (eventType: string, callback: (event: any) => void) => void;

     

       89
       89
       +
         unsubscribe: (eventType: string, callback: (event: any) => void) => void;

     

       90
       90
       +
       

     

       91
       91
       +
         register: (

     

       92
       92
       +
           name: string,

     

       93
       93
       +
           actionHandlers: Record<string, (event: any) => void>,

     

       94
       94
       +
           storeDidChange: (event: any) => void,

     

       95
       95
       +
           band: number,

     

       96
       96
       +
           token: string

     

       97
       97
       +
         ) => number;

     

       98
       98
       +
       

     

       99
       99
       +
         createToken: () => string;

     

       100
       100
       +
         addDependencies: (id: string, deps: string[]) => void;

     

       101
       101
       +
       };

     

       80
       102
        
       

     

       81
       103
        
       export * as Markdown from "./coreExtensions/markdown";

     

       82
       104
        
       export * as ContextMenu from "./coreExtensions/contextMenu";

+55 -45

packages/types/src/coreExtensions/contextMenu.ts

···

       27
       27
        
         color?: string;

     

       28
       28
        
         children: React.ReactComponentElement<MenuElement>[];

     

       29
       29
        
       }>;

     

       30
       30
       -
       export type MenuItem = React.FunctionComponent<{

     

       31
       31
       -
         id: any;

     

       32
       32
       -
         dontCloseOnActionIfHoldingShiftKey?: boolean;

     

       33
       33
       -
       } & ({

     

       34
       34
       -
         label: string;

     

       35
       35
       -
         subtext?: string;

     

       36
       36
       -
         color?: string;

     

       37
       37
       -
         hint?: string;

     

       38
       38
       -
         disabled?: boolean;

     

       39
       39
       -
         icon?: any;

     

       40
       40
       -
         showIconFirst?: boolean;

     

       41
       41
       -
         imageUrl?: string;

     

       30
       30
       +
       export type MenuItem = React.FunctionComponent<

     

       31
       31
       +
         {

     

       32
       32
       +
           id: any;

     

       33
       33
       +
           dontCloseOnActionIfHoldingShiftKey?: boolean;

     

       34
       34
       +
         } & (

     

       35
       35
       +
           | {

     

       36
       36
       +
               label: string;

     

       37
       37
       +
               subtext?: string;

     

       38
       38
       +
               color?: string;

     

       39
       39
       +
               hint?: string;

     

       40
       40
       +
               disabled?: boolean;

     

       41
       41
       +
               icon?: any;

     

       42
       42
       +
               showIconFirst?: boolean;

     

       43
       43
       +
               imageUrl?: string;

     

       42
       44
        
       

     

       43
       43
       -
         className?: string;

     

       44
       44
       -
         focusedClassName?: string;

     

       45
       45
       -
         subMenuIconClassName?: string;

     

       45
       45
       +
               className?: string;

     

       46
       46
       +
               focusedClassName?: string;

     

       47
       47
       +
               subMenuIconClassName?: string;

     

       46
       48
        
       

     

       47
       47
       -
         action?: () => void;

     

       48
       48
       -
         onFocus?: () => void;

     

       49
       49
       +
               action?: () => void;

     

       50
       50
       +
               onFocus?: () => void;

     

       49
       51
        
       

     

       50
       50
       -
         iconProps?: any;

     

       51
       51
       -
         sparkle?: any;

     

       52
       52
       +
               iconProps?: any;

     

       53
       53
       +
               sparkle?: any;

     

       52
       54
        
       

     

       53
       53
       -
         children?: React.ReactComponentElement<MenuElement>[];

     

       54
       54
       -
         onChildrenScroll?: any;

     

       55
       55
       -
         childRowHeight?: any;

     

       56
       56
       -
         listClassName?: string;

     

       57
       57
       -
         subMenuClassName?: string;

     

       58
       58
       -
       } | {

     

       59
       59
       -
         color?: string;

     

       60
       60
       -
         disabled?: boolean;

     

       61
       61
       -
         keepItemStyles?: boolean;

     

       55
       55
       +
               children?: React.ReactComponentElement<MenuElement>[];

     

       56
       56
       +
               onChildrenScroll?: any;

     

       57
       57
       +
               childRowHeight?: any;

     

       58
       58
       +
               listClassName?: string;

     

       59
       59
       +
               subMenuClassName?: string;

     

       60
       60
       +
             }

     

       61
       61
       +
           | {

     

       62
       62
       +
               color?: string;

     

       63
       63
       +
               disabled?: boolean;

     

       64
       64
       +
               keepItemStyles?: boolean;

     

       62
       65
        
       

     

       63
       63
       -
         action?: () => void;

     

       66
       66
       +
               action?: () => void;

     

       64
       67
        
       

     

       65
       65
       -
         render: any;

     

       66
       66
       -
         navigable?: boolean;

     

       67
       67
       -
       })>;

     

       68
       68
       +
               render: any;

     

       69
       69
       +
               navigable?: boolean;

     

       70
       70
       +
             }

     

       71
       71
       +
         )

     

       72
       72
       +
       >;

     

       68
       73
        
       export type MenuCheckboxItem = React.FunctionComponent<{

     

       69
       74
        
         id: any;

     

       70
       75
        
         label: string;

     
···

       84
       89
        
         disabled?: boolean;

     

       85
       90
        
         action?: () => void;

     

       86
       91
        
       }>;

     

       87
       87
       -
       export type MenuControlItem = React.FunctionComponent<{

     

       88
       88
       -
         id: any;

     

       89
       89
       -
         label: string;

     

       90
       90
       -
         color?: string;

     

       91
       91
       -
         disabled?: boolean;

     

       92
       92
       -
         showDefaultFocus?: boolean;

     

       93
       93
       -
       } & ({

     

       94
       94
       -
         control: any;

     

       95
       95
       -
       } | {

     

       96
       96
       -
         control?: undefined;

     

       97
       97
       -
         interactive?: boolean;

     

       98
       98
       -
         children?: React.ReactComponentElement<MenuElement>[];

     

       99
       99
       -
       })>;

     

       92
       92
       +
       export type MenuControlItem = React.FunctionComponent<

     

       93
       93
       +
         {

     

       94
       94
       +
           id: any;

     

       95
       95
       +
           label: string;

     

       96
       96
       +
           color?: string;

     

       97
       97
       +
           disabled?: boolean;

     

       98
       98
       +
           showDefaultFocus?: boolean;

     

       99
       99
       +
         } & (

     

       100
       100
       +
           | {

     

       101
       101
       +
               control: any;

     

       102
       102
       +
             }

     

       103
       103
       +
           | {

     

       104
       104
       +
               control?: undefined;

     

       105
       105
       +
               interactive?: boolean;

     

       106
       106
       +
               children?: React.ReactComponentElement<MenuElement>[];

     

       107
       107
       +
             }

     

       108
       108
       +
         )

     

       109
       109
       +
       >;

     

       100
       110
        
       /* eslint-disable prettier/prettier */

     

       101
       111
        
       

     

       102
       112
        
       export type ContextMenu = {