sern/handler
1
0
Fork 0
mirror of https://github.com/sern-handler/handler synced 2026-06-27 18:22:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

changing parse method, revising

Browse Source
This commit is contained in:
jacoobes
2022-02-02 15:16:09 -06:00
parent 4606ade698
commit 3162044416
2 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/handler/sern/sern.ts
View File

@@ -1,7 +1,7 @@
import type { MessagePackage, Nullable, Visibility } from "../../types/handler/handler";
import { CommandType } from "../../types/handler/handler";
import { Files } from "../utils/readFile"
import type { ApplicationCommand, Awaitable, Client, CommandInteraction, Message, MessageInteraction, Util } from "discord.js";
import type { ApplicationCommand, ApplicationCommandOption, ApplicationCommandOptionData, Awaitable, Client, CommandInteraction, CommandInteractionOption, Message, MessageInteraction, Util } from "discord.js";
import type { possibleOutput } from "../../types/handler/handler"
import { Err, Ok, Result, Option, None, Some } from "ts-results";
import type { Utils } from "../utils/preprocessors/args";
@@ -31,7 +31,7 @@ export namespace Sern {
if (tryFmt.err) return;
const commandName = this.CtxHandler.fmtMsg!.shift()!;
const module = Files.Commands.get(commandName) ?? Files.Alias.get(commandName)
let cmdResult = (await this.commandResult(module, message))
let cmdResult = (await this.commandResult(module?.mod, message))
if (cmdResult === undefined) return;
message.channel.send(cmdResult)
@@ -46,13 +46,23 @@ export namespace Sern {
})
}
private async interactionResult(module: Sern.Module<unknown> | undefined, interaction: CommandInteraction) : Promise<possibleOutput | undefined> {
private async interactionResult(
module: { mod: Sern.Module<unknown>, options: ApplicationCommandOptionData[]} | undefined,
interaction: CommandInteraction) : Promise<possibleOutput | undefined> {
if (module === undefined) return "Unknown slash command!";
module.delegate(
this.CtxHandler.messagePack as Context,
Ok("")
)
throw Error ("unimplemented");
const name = Array.from(Files.Commands.keys()).find(it => it === interaction.commandName)!;
(await this.client.guilds.fetch(this.privateServerId))
.commands
.create({
name,
description : module.mod.desc,
options: module.options
});
module.mod.delegate({message : None, interaction: Some(interaction)}, Ok(interaction.options) );
throw Error("unimpl")
}
private async commandResult(module: Sern.Module<unknown> | undefined, message: Message) : Promise<possibleOutput| undefined> {
@@ -62,7 +72,7 @@ export namespace Sern {
}
if (module.type === CommandType.SLASH) return `This may be a slash command and not a legacy command`
let args = this.CtxHandler.fmtMsg.join(" ");
let parsedArgs = module.parse === undefined ? Ok("") : module.parse(message, args);
let parsedArgs = module.parse === undefined ? Ok("") : module.parse( { message : Some(message), interaction : None }, args);
if(parsedArgs.err) return parsedArgs.val;
let fn = await module.delegate({interaction : None, message: Some(message)}, parsedArgs)
return fn instanceof Object ? fn.val : undefined
@@ -115,7 +125,7 @@ export namespace Sern {
visibility : Visibility,
type: CommandType,
delegate : ( eventParams : Context , args: Ok<T> ) => Awaitable<Result<possibleOutput, string > | void>
parse? : (message: Message, args: string) => Utils.ArgType<T>
parse? : (message: Context, args: string) => Utils.ArgType<T>
}

22
src/handler/utils/readFile.ts
View File

@@ -1,12 +1,11 @@
import type { CommandInteractionOption } from "discord.js";
import type { ApplicationCommandOptionData, CommandInteractionOption } from "discord.js";
import { readdirSync, statSync } from "fs";
import { basename, join } from "path";
import type { Sern } from "../sern/sern";
export namespace Files {
export const Slash = new Map<string, { mod: Sern.Module<unknown>, options: readonly CommandInteractionOption[] }>();
export const Commands = new Map<string, Sern.Module<unknown>>();
export const Alias = new Map<string, Sern.Module<unknown>>();
export const Commands = new Map<string, { mod: Sern.Module<unknown>, options: ApplicationCommandOptionData[] }>();
export const Alias = new Map<string, { mod: Sern.Module<unknown>, options: ApplicationCommandOptionData[] }>();
//courtesy of Townsy#0001 on Discord
async function readPath(dir: string, arrayOfFiles: string[] = []): Promise<string[]> {
@@ -34,22 +33,21 @@ export namespace Files {
})).then( async modArr => {
for ( const { name, mod, absPath } of modArr) {
switch (mod.type) {
case 2 : Commands.set(name.substring(0, name.length-3), mod); break;
case 2 : Commands.set(name.substring(0, name.length-3), { mod, options: [] }); break;
case 4 : {
const options = ((await import(absPath)).options as readonly CommandInteractionOption[])
Slash.set(name.substring(0, name.length - 3), { mod, options });
const options = ((await import(absPath)).options as ApplicationCommandOptionData[])
Commands.set(name.substring(0, name.length - 3), { mod, options : options ?? [] });
} break;
case 6 : {
Commands.set(name.substring(0, name.length-3), mod);
const options = ((await import(absPath)).options as readonly CommandInteractionOption[])
Slash.set(name.substring(0, name.length - 3), {mod, options});
const options = ((await import(absPath)).options as ApplicationCommandOptionData[])
Commands.set(name.substring(0, name.length-3),{mod, options : options ?? [] } );
} break;
default : throw Error(`${name}.js is not a valid module type.`);
}
if(mod.alias.length > 0) {
for( const alias of mod.alias) {
Alias.set(alias, mod)
for ( const alias of mod.alias) {
Alias.set(alias, {mod, options : []})
}
}
}