diff --git a/src/handler/events/messageEvent.ts b/src/handler/events/messageEvent.ts index e69de29..def16c4 100644 --- a/src/handler/events/messageEvent.ts +++ b/src/handler/events/messageEvent.ts @@ -0,0 +1,15 @@ +import type { Message } from "discord.js"; +import { filter, fromEvent, Observable } from "rxjs"; +import type Wrapper from "../structures/wrapper"; +import { isNotFromBot } from "../utilities/messageHelpers"; + +export const onMessageCreate = ( wrapper : Wrapper) => { + const { client } = wrapper; + (fromEvent( client, 'messageCreate') as Observable) + .pipe ( + filter( isNotFromBot ), + + ).subscribe() + + +} diff --git a/src/handler/events/readyEvent.ts b/src/handler/events/readyEvent.ts index 1d5356a..7300879 100644 --- a/src/handler/events/readyEvent.ts +++ b/src/handler/events/readyEvent.ts @@ -16,3 +16,8 @@ export const onReady = ( wrapper : Wrapper ) => { ) .subscribe(); } + +async function createCommandCache ( ) { + + +} diff --git a/src/handler/sern.ts b/src/handler/sern.ts index 5fc046c..5d2f98f 100644 --- a/src/handler/sern.ts +++ b/src/handler/sern.ts @@ -25,7 +25,8 @@ import { onReady } from './events/readyEvent'; export function init( wrapper : Wrapper) { const { events, client } = wrapper; if (events !== undefined) eventObserver(client, events); - onReady(wrapper); + onReady(wrapper); + } function eventObserver(client: Client, events: DiscordEvent[] ) { @@ -245,7 +246,7 @@ export class Handler { */ get prefix(): string { - return this.wrapper.prefix; + return this.wrapper.defaultPrefix; } /** diff --git a/src/handler/structures/wrapper.ts b/src/handler/structures/wrapper.ts index 29a4a67..1b9d6da 100644 --- a/src/handler/structures/wrapper.ts +++ b/src/handler/structures/wrapper.ts @@ -5,7 +5,7 @@ import type { DiscordEvent } from '../../types/handler'; * An object to be passed into Sern.Handler constructor. * @typedef {object} Wrapper * @property {readonly Client} client - * @property {readonly string} prefix + * @property {readonly string} defaultPrefix * @property {readonly string} commands * @prop {(handler : Handler) => void)} init * @property {readonly {test: boolean, id: string}[]} privateServers @@ -13,7 +13,7 @@ import type { DiscordEvent } from '../../types/handler'; */ interface Wrapper { readonly client: Client; - readonly prefix: string; + readonly defaultPrefix: string; readonly commands: string; init?: (handler: Wrapper) => void; readonly privateServers: { test: boolean; id: string }[];