/[sudobot]/trunk/src/events/interaction/InteractionCreateEvent.ts
ViewVC logotype

Diff of /trunk/src/events/interaction/InteractionCreateEvent.ts

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 81 by rakin, Mon Jul 29 17:28:31 2024 UTC revision 268 by rakin, Mon Jul 29 17:29:17 2024 UTC
# Line 21  export default class InteractionCreateEv Line 21  export default class InteractionCreateEv
21              return;              return;
22          }          }
23    
24          if (interaction.isCommand()) {          if (interaction.isCommand() || interaction.isContextMenu()) {
25              await client.setMessage(interaction);              await client.setMessage(interaction);
26    
27              const { commandName } = interaction;              const { commandName } = interaction;
28    
29              const command = await client.commands.get(commandName);              const command = await client.commands.get(commandName);
30    
31              if (command && command.supportsInteractions) {              if (command && ((interaction.isCommand() && command.supportsInteractions) || (interaction.isContextMenu() && command.supportsContextMenu))) {
32                  const allowed = await client.auth.verify(interaction.member! as GuildMember, command);                  const allowed = await client.auth.verify(interaction.member! as GuildMember, command);
33    
34                  if (!allowed) {                  if (!allowed) {
# Line 50  export default class InteractionCreateEv Line 50  export default class InteractionCreateEv
50                      isInteraction: true                      isInteraction: true
51                  } as InteractionOptions;                  } as InteractionOptions;
52    
53                  if (!await client.cooldown.start(interaction, options))                  await command.execute(client, interaction, options);
                     return;  
   
                 await command.run(client, interaction, options);  
54                  (global as any).lastCommand = commandName;                  (global as any).lastCommand = commandName;
55              }              }
56          }          }
# Line 71  export default class InteractionCreateEv Line 68  export default class InteractionCreateEv
68                      return;                      return;
69                  }                  }
70    
71                    if (!(await command.perms(client, interaction))) {
72                        return;
73                    }
74    
75                  const options = {                  const options = {
76                      cmdName: commandName,                      cmdName: commandName,
77                      options: interaction.options,                      options: interaction.options,
# Line 97  export default class InteractionCreateEv Line 98  export default class InteractionCreateEv
98                  if (!allowed) {                  if (!allowed) {
99                      return;                      return;
100                  }                  }
101                    
102                    if (!(await command.perms(client, interaction))) {
103                        return;
104                    }
105    
106                  await command.default(client, interaction);                  await command.default(client, interaction);
107              }              }
Legend:
Removed from v.81  
changed lines
  Added in v.268
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26