feat: gil custom context

zaida04 · Mar 28, 2024 · 5b11f2e · 5b11f2e
1 parent 265273c
commit 5b11f2e
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/packages/gil/__tests__/bot_sqlite/index.ts b/packages/gil/__tests__/bot_sqlite/index.ts
@@ -4,14 +4,15 @@ import { GilClient } from "../../lib/GilClient";
 import { BetterSQLite3Adapter } from "../../lib/adapters/db/BetterSQLite3Adapter";
 
 import sqlite from "better-sqlite3";
-import { ConsoleAdapter } from "../../lib";
+import pino from "pino";
+import { PinoAdapter } from "../../lib";
 const database = sqlite("test.db");
 
 const YokiBot = new GilClient({
 	token: process.env.TOKEN!,
 	commandDirectory: join(__dirname, "..", "shared", "commands"),
 	listenerDirectory: join(__dirname, "listeners"),
-	loggingAdapter: new ConsoleAdapter(),
+	loggingAdapter: new PinoAdapter(pino({ base: null })),
 	databaseAdapter: new BetterSQLite3Adapter({
 		sqliteInstance: database,
 		serverTable: "servers",

diff --git a/packages/gil/lib/GilClient.ts b/packages/gil/lib/GilClient.ts
@@ -12,7 +12,7 @@ import { TaskManager } from "./structures/Task";
 interface GilClientOptions {
 	token: string;
 	clientOptions?: ClientOptions;
-	customContext?: unknown;
+	customCommandContext?: (data: { serverId: string; authorId: string; messageId: string }) => Promise<Record<string, unknown>>;
 	// adapters
 	loggingAdapter?: LoggerAdapter;
 	databaseAdapter: DatabaseAdapter;

diff --git a/packages/gil/lib/listeners/CommandMessageListener.ts b/packages/gil/lib/listeners/CommandMessageListener.ts
@@ -73,10 +73,19 @@ export default class CommandMessageListener extends Listener {
 			return;
 		}
 
+		const context = this.gil.options.customCommandContext
+			? await this.gil.options.customCommandContext({
+					serverId: params.server.server_id,
+					authorId: params.member.id,
+					messageId: params.message.id,
+			  })
+			: {};
+
 		try {
 			await command.execute({
 				message: params.message,
 				args: attemptConvertArguments.arguments,
+				...context,
 			});
 		} catch (e) {
 			// todo: user friendly error "something went wrong" message

diff --git a/packages/gil/lib/structures/Command.ts b/packages/gil/lib/structures/Command.ts
@@ -43,13 +43,16 @@ export abstract class Command {
 		public readonly options: CommandOptions,
 	) {}
 
-	public abstract execute(commandContext: CommandExecuteContext): unknown | Promise<unknown>;
+	public abstract execute(commandContext: CommandContext<unknown, unknown>): unknown | Promise<unknown>;
 }
+
 export interface CommandExecuteContext<Args = Record<string, CommandArgument>> {
 	message: Message;
 	args: Args;
 }
 
+export type CommandContext<T, Args = Record<string, CommandArgument>> = T & CommandExecuteContext<Args>;
+
 export class CommandManager extends Manager {
 	public readonly commands = new Collection<string, Command>();