commit 7baba96952f894fb448190bad5fa4698a78c49ee · notnite.com/moonlight

+1 -1

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

···

       30
       30
        
             applicationId: APPLICATION_ID,

     

       31
       31
        
             untranslatedDescription: command.description,

     

       32
       32
        
             displayDescription: command.description,

     

       33
       33
       -
             options: command.options.map((o) => ({

     

       33
       33
       +
             options: command.options?.map((o) => ({

     

       34
       34
        
               ...o,

     

       35
       35
        
               displayName: o.name,

     

       36
       36
        
               displayDescription: o.description

+84 -15

packages/types/src/coreExtensions/commands.ts

···

       16
       16
        
       }

     

       17
       17
        
       

     

       18
       18
        
       export enum OptionType {

     

       19
       19
       -
         ATTACHMENT = 11,

     

       19
       19
       +
         SUB_COMMAND = 1,

     

       20
       20
       +
         SUB_COMMAND_GROUP = 2,

     

       21
       21
       +
         STRING = 3,

     

       22
       22
       +
         INTEGER = 4,

     

       20
       23
        
         BOOLEAN = 5,

     

       24
       24
       +
         USER = 6,

     

       21
       25
        
         CHANNEL = 7,

     

       22
       22
       -
         INTEGER = 4,

     

       26
       26
       +
         ROLE = 8,

     

       23
       27
        
         MENTIONABLE = 9,

     

       24
       28
        
         NUMBER = 10,

     

       25
       25
       -
         ROLE = 8,

     

       26
       26
       -
         STRING = 3,

     

       27
       27
       -
         SUB_COMMAND = 1,

     

       28
       28
       -
         SUB_COMMAND_GROUP = 2,

     

       29
       29
       -
         USER = 6

     

       29
       29
       +
         ATTACHMENT = 11

     

       30
       30
        
       }

     

       31
       31
        
       

     

       32
       32
       -
       export type RegisteredCommandOption = {

     

       33
       33
       -
         name: string;

     

       32
       32
       +
       export enum ChannelType {

     

       33
       33
       +
         GUILD_TEXT = 0,

     

       34
       34
       +
         DM = 1,

     

       35
       35
       +
         GUILD_VOICE = 2,

     

       36
       36
       +
         GROUP_DM = 3,

     

       37
       37
       +
         GUILD_CATEGORY = 4,

     

       38
       38
       +
         GUILD_ANNOUNCEMENT = 5,

     

       39
       39
       +
         GUILD_STORE = 6,

     

       40
       40
       +
         ANNOUNCEMENT_THREAD = 10,

     

       41
       41
       +
         PUBLIC_THREAD = 11,

     

       42
       42
       +
         PRIVATE_THREAD = 12,

     

       43
       43
       +
         GUILD_STAGE_VOICE = 13,

     

       44
       44
       +
         GUILD_DIRECTORY = 14,

     

       45
       45
       +
         GUILD_FORUM = 15,

     

       46
       46
       +
         GUILD_MEDIA = 16,

     

       47
       47
       +
         LOBBY = 17,

     

       48
       48
       +
         DM_SDK = 18

     

       49
       49
       +
       }

     

       50
       50
       +
       

     

       51
       51
       +
       export type RegisteredCommandOption = MoonlightCommandOption & {

     

       34
       52
        
         displayName: string;

     

       35
       35
       -
         type: OptionType;

     

       36
       36
       -
         description: string;

     

       37
       53
        
         displayDescription: string;

     

       38
       54
        
       };

     

       39
       55
        
       

     

       40
       40
       -
       export type MoonlightCommandOption = {

     

       56
       56
       +
       export type CommandOptionChoice<T> = {

     

       41
       57
        
         name: string;

     

       42
       42
       -
         type: OptionType;

     

       58
       58
       +
         value: T;

     

       59
       59
       +
       };

     

       60
       60
       +
       

     

       61
       61
       +
       type CommandOptionBase<T> = {

     

       62
       62
       +
         type: T;

     

       63
       63
       +
         name: string;

     

       43
       64
        
         description: string;

     

       65
       65
       +
         required?: T extends OptionType.SUB_COMMAND

     

       66
       66
       +
           ? never

     

       67
       67
       +
           : T extends OptionType.SUB_COMMAND_GROUP

     

       68
       68
       +
             ? never

     

       69
       69
       +
             : boolean | undefined;

     

       70
       70
       +
         choices?: T extends OptionType.STRING

     

       71
       71
       +
           ? CommandOptionChoice<string>[]

     

       72
       72
       +
           : T extends OptionType.INTEGER

     

       73
       73
       +
             ? CommandOptionChoice<number>[]

     

       74
       74
       +
             : T extends OptionType.NUMBER

     

       75
       75
       +
               ? CommandOptionChoice<number>[]

     

       76
       76
       +
               : never;

     

       77
       77
       +
         options?: T extends OptionType.SUB_COMMAND

     

       78
       78
       +
           ? MoonlightCommandOption[]

     

       79
       79
       +
           : T extends OptionType.SUB_COMMAND_GROUP

     

       80
       80
       +
             ? MoonlightCommandOption[]

     

       81
       81
       +
             : never;

     

       82
       82
       +
         channelTypes?: T extends OptionType.CHANNEL ? ChannelType[] : never;

     

       83
       83
       +
         minValue?: T extends OptionType.INTEGER ? number : T extends OptionType.NUMBER ? number : never;

     

       84
       84
       +
         maxValue?: T extends OptionType.INTEGER ? number : T extends OptionType.NUMBER ? number : never;

     

       85
       85
       +
         minLength?: T extends OptionType.STRING ? number : never;

     

       86
       86
       +
         maxLength?: T extends OptionType.STRING ? number : never;

     

       44
       87
        
       };

     

       45
       88
        
       

     

       89
       89
       +
       // This is bad lol

     

       90
       90
       +
       export type MoonlightCommandOption =

     

       91
       91
       +
         | CommandOptionBase<OptionType.SUB_COMMAND>

     

       92
       92
       +
         | CommandOptionBase<OptionType.SUB_COMMAND_GROUP>

     

       93
       93
       +
         | CommandOptionBase<OptionType.STRING>

     

       94
       94
       +
         | CommandOptionBase<OptionType.INTEGER>

     

       95
       95
       +
         | CommandOptionBase<OptionType.BOOLEAN>

     

       96
       96
       +
         | CommandOptionBase<OptionType.USER>

     

       97
       97
       +
         | CommandOptionBase<OptionType.CHANNEL>

     

       98
       98
       +
         | CommandOptionBase<OptionType.ROLE>

     

       99
       99
       +
         | CommandOptionBase<OptionType.MENTIONABLE>

     

       100
       100
       +
         | CommandOptionBase<OptionType.NUMBER>

     

       101
       101
       +
         | CommandOptionBase<OptionType.ATTACHMENT>;

     

       102
       102
       +
       

     

       46
       103
        
       // TODO: types

     

       47
       104
        
       export type CommandPredicateState = {

     

       48
       105
        
         channel: any;

     
···

       58
       115
        
         applicationId: string; // set to -3!

     

       59
       116
        
         untranslatedDescription: string;

     

       60
       117
        
         displayDescription: string;

     

       61
       61
       -
         options: RegisteredCommandOption[];

     

       118
       118
       +
         options?: RegisteredCommandOption[];

     

       62
       119
        
         predicate?: (state: CommandPredicateState) => boolean;

     

       63
       120
        
         execute: (options: CommandOption[]) => void;

     

       64
       121
        
       };

     
···

       76
       133
        
          * You likely want BUILT_IN (or BUILT_IN_TEXT if usable with replies)

     

       77
       134
        
          */

     

       78
       135
        
         inputType: InputType;

     

       79
       79
       -
         options: MoonlightCommandOption[];

     

       136
       136
       +
         options?: MoonlightCommandOption[];

     

       80
       137
        
         predicate?: (state: CommandPredicateState) => boolean;

     

       81
       138
        
         execute: (options: CommandOption[]) => void;

     

       82
       139
        
       };

     
···

       91
       148
        
         | {

     

       92
       149
        
             type: OptionType.STRING;

     

       93
       150
        
             value: string;

     

       151
       151
       +
           }

     

       152
       152
       +
         | {

     

       153
       153
       +
             type: OptionType.NUMBER | OptionType.INTEGER;

     

       154
       154
       +
             value: number;

     

       155
       155
       +
           }

     

       156
       156
       +
         | {

     

       157
       157
       +
             type: OptionType.BOOLEAN;

     

       158
       158
       +
             value: boolean;

     

       159
       159
       +
           }

     

       160
       160
       +
         | {

     

       161
       161
       +
             type: OptionType.SUB_COMMAND | OptionType.SUB_COMMAND_GROUP;

     

       162
       162
       +
             options: CommandOption[];

     

       94
       163
        
           }

     

       95
       164
        
       );

     

       96
       165