Merge pull request #482 from underctrl-io/update-middlewares

Update middlewares

Author: notunderctrl

apps/test-bot/package.json

@@ -21,7 +21,7 @@
     "discord.js": "catalog:discordjs",
     "dotenv": "^16.4.7",
     "ms": "^2.1.3",
-    "zod": "^3.25.56"
+    "zod": "^4.1.1"
   },
   "devDependencies": {
     "@types/ms": "^2.1.0",

apps/test-bot/src/app/commands/(developer)/+middleware.ts

@@ -1,4 +1,4 @@
-import { Logger, MiddlewareContext } from 'commandkit';
+import { Logger, MiddlewareContext, stopMiddlewares } from 'commandkit';
 import { MessageFlags } from 'discord.js';
 
 export function beforeExecute(ctx: MiddlewareContext) {
@@ -16,7 +16,7 @@ export function beforeExecute(ctx: MiddlewareContext) {
       ctx.message.reply('You are not allowed to use this command.');
     }
 
-    ctx.cancel();
+    stopMiddlewares();
   }
 }
 

apps/test-bot/src/app/commands/(developer)/run-after.ts

@@ -1,4 +1,8 @@
-import { CommandData, after, ChatInputCommand } from 'commandkit';
+import {
+  CommandData,
+  unstable_after as after,
+  ChatInputCommand,
+} from 'commandkit';
 
 export const command: CommandData = {
   name: 'run-after',

apps/test-bot/src/app/commands/(general)/+middleware.ts

@@ -1,9 +1,10 @@
-import { Logger, MiddlewareContext } from 'commandkit';
+import { Logger, MiddlewareContext, stopMiddlewares } from 'commandkit';
 
 export function beforeExecute(ctx: MiddlewareContext) {
   Logger.info(
     `Directory-scoped middleware: ${ctx.commandName} will be executed!`,
   );
+  // stopMiddlewares();
 }
 
 export function afterExecute(ctx: MiddlewareContext) {

apps/test-bot/src/app/commands/(general)/+ping.middleware.ts

@@ -1,9 +1,25 @@
-import { Logger, MiddlewareContext } from 'commandkit';
+import {
+  unstable_after as after,
+  Logger,
+  type MiddlewareContext,
+  stopMiddlewares,
+} from 'commandkit';
 
 export function beforeExecute(ctx: MiddlewareContext) {
+  // Logger.info(
+  //   `Command-scoped middleware: ${ctx.commandName} will be executed!`,
+  // );
+
+  Logger.info(`Command-scoped middleware: ${ctx.commandName} will be stopped!`);
   Logger.info(
-    `Command-scoped middleware: ${ctx.commandName} will be executed!`,
+    'None of the other beforeExecute middlewares are supposed to be executed',
   );
+
+  after(() => {
+    Logger.info(`after() has been called in command-scoped middleware: ping`);
+  });
+
+  stopMiddlewares();
 }
 
 export function afterExecute(ctx: MiddlewareContext) {

apps/test-bot/src/app/commands/(general)/ping.ts

@@ -11,6 +11,10 @@ import {
   AutocompleteCommandContext,
   CommandMetadata,
   MessageCommandContext,
+  stopMiddlewares,
+  Logger,
+  unstable_after as after,
+  CommandMetadataFunction,
 } from 'commandkit';
 
 export const command: CommandData = {
@@ -32,10 +36,25 @@ export const command: CommandData = {
   // guilds: ['1314834483660455938'],
 };
 
-export const metadata: CommandMetadata = {
-  userPermissions: 'Administrator',
-  botPermissions: 'KickMembers',
-  // guilds: ['1314834483660455938'],
+// export const metadata: CommandMetadata = {
+//   // userPermissions: 'Administrator',
+//   // botPermissions: 'KickMembers',
+//   // guilds: ['1314834483660455938'],
+//   aliases: [''],
+//   userPermissions: 'Administrator',
+//   botPermissions: 'KickMembers',
+//   guilds: ['1314834483660455938'],
+// };
+
+export const generateMetadata: CommandMetadataFunction = async () => {
+  // Dynamically determine the metadata for the command
+
+  return {
+    userPermissions: 'Administrator',
+    botPermissions: ['KickMembers', 'BanMembers'],
+    // guilds: ['1234567890', '1234567891'],
+    aliases: ['p', 'pong'],
+  };
 };
 
 const tests = Array.from({ length: 10 }, (_, i) => ({
@@ -98,4 +117,8 @@ export async function chatInput({
       button.setDisabled(true);
       message.edit({ components: [row] });
     });
+
+  after(() => {
+    Logger.debug('after called in ping');
+  });
 }

apps/test-bot/src/app/commands/(interactions)/+middleware.ts

@@ -1,4 +1,4 @@
-import { Logger, MiddlewareContext } from 'commandkit';
+import { Logger, MiddlewareContext, stopMiddlewares } from 'commandkit';
 import { MessageFlags } from 'discord.js';
 
 export function beforeExecute(ctx: MiddlewareContext) {
@@ -18,7 +18,7 @@ export function beforeExecute(ctx: MiddlewareContext) {
       ctx.message.reply('You are not allowed to use this command.');
     }
 
-    ctx.cancel();
+    stopMiddlewares();
   }
 }
 

apps/test-bot/src/app/commands/(interactions)/confirmation.tsx

@@ -6,7 +6,7 @@ import {
   OnButtonKitClick,
 } from 'commandkit';
 import { ButtonStyle, MessageFlags } from 'discord.js';
-import { AiConfig, AiCommand } from '@commandkit/ai';
+import { AiConfig, AiCommand, ToolParameterType } from '@commandkit/ai';
 import { z } from 'zod';
 
 export const command: CommandData = {
@@ -15,7 +15,7 @@ export const command: CommandData = {
 };
 
 export const aiConfig = {
-  parameters: z.object({
+  inputSchema: z.object({
     message: z
       .string()
       .describe('The message to be shown in the confirmation.'),

apps/test-bot/src/app/commands/(leveling)/xp.ts

@@ -1,5 +1,5 @@
 import { ChatInputCommandContext, CommandData } from 'commandkit';
-import { database } from '@/database/store.ts';
+import { database } from '@/database/store';
 import { cacheTag } from '@commandkit/cache';
 import { AiCommand, AiConfig } from '@commandkit/ai';
 import { z } from 'zod';
@@ -11,7 +11,7 @@ export const command: CommandData = {
 
 export const aiConfig = {
   description: 'Get the XP of a user in a guild.',
-  parameters: z.object({
+  inputSchema: z.object({
     guildId: z.string().describe('The ID of the guild.'),
     userId: z.string().describe('The ID of the user.'),
   }),

apps/test-bot/src/app/commands/+global-middleware.ts

@@ -1,7 +1,9 @@
-import { Logger, MiddlewareContext } from 'commandkit';
+import { Logger, MiddlewareContext, stopMiddlewares } from 'commandkit';
 
 export function beforeExecute(ctx: MiddlewareContext) {
   Logger.info(`Global middleware: ${ctx.commandName} will be executed!`);
+  // ctx.message.reply('Global middleware: This command will not be executed!');
+  // stopMiddlewares();
 }
 
 export function afterExecute(ctx: MiddlewareContext) {