rethinked the button handler

Layers-of-Railways · Dec 28, 2023 · 3c6d792 · 3c6d792
1 parent b637b29
commit 3c6d792
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 16 deletions.
diff --git a/src/handlers/button.handler.ts b/src/handlers/button.handler.ts
@@ -2,37 +2,32 @@ import {
     ButtonBuilder,
     ButtonInteraction,
     Events,
+    Interaction,
     InteractionButtonComponentData,
 } from 'discord.js';
 import { Handler } from '..';
-import { BaseSchema, Output } from 'valibot';
-import { error } from 'console';
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
 const buttonMap = new Map<string, Button<any>>();
 
-export class Button<ArgsType extends BaseSchema> {
+export class Button<ArgsType> {
     id: string;
-    args?: ArgsType;
     _onPress?: (interaction: ButtonInteraction, args: ArgsType) => unknown;
     constructor(
         id: string,
-        args: ArgsType,
         onPress: (
             interaction: ButtonInteraction,
-            args: Output<ArgsType>
+            args: ArgsType
         ) => unknown
     ) {
         this.id = id;
         if (buttonMap.has(id)) console.error(`Button ${id} is already defined`);
         buttonMap.set(id, this);
         this._onPress = onPress;
-        this.args = args;
     }
 
     button(
         data: Partial<InteractionButtonComponentData>,
-        args: Output<ArgsType>
+        args: ArgsType
     ): ButtonBuilder {
         const button = new ButtonBuilder({
             ...data,
@@ -43,17 +38,20 @@ export class Button<ArgsType extends BaseSchema> {
 }
 
 export const buttonHandler: Handler = (client) => {
-    client.on(Events.InteractionCreate, async (interaction) => {
+    client.on(Events.InteractionCreate, async (interaction:Interaction) => {
         if (!interaction.isButton()) return;
         const data = JSON.parse(interaction.customId);
         const args = data.args;
         if (!data.id) return;
         if (!buttonMap.has(data.id)) return;
         const button = buttonMap.get(data.id);
         if (!button) return;
-        if (!button.args) throw error('No args set in button');
-        const parsedArgs = button.args.parse(args);
+
         if (!button._onPress) return;
-        button._onPress(interaction, parsedArgs);
+        try{
+            button._onPress(interaction, args);
+        }catch{
+            interaction.reply("error while executing")
+        }
     });
 };
diff --git a/src/webserver/banshare.ts b/src/webserver/banshare.ts
@@ -11,12 +11,10 @@ import {
     TextInputBuilder,
 } from 'discord.js';
 import { Button } from '../handlers/button.handler';
-import { string, object } from 'valibot';
 
 const banButton = new Button(
     'ban',
-    object({ userId: string() }),
-    async (interaction, data) => {
+    async (interaction, data:{userId:string}) => {
         const reason =
             'aero banshare: ' +
             (interaction.message.embeds[0].fields[3].value ??