sern/handler
1
0
Fork 0
mirror of https://github.com/sern-handler/handler synced 2026-06-21 07:12:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: Standard for of does not resolve promises. Switched to for await

Browse Source
This commit is contained in:
Jacob Nguyen
2022-05-19 13:49:31 -05:00
parent b8cda351e1
commit 66b9f51fa7
1 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/handler/events/interactionCreate.ts
View File

@@ -1,4 +1,10 @@
import type { CommandInteraction, Interaction, MessageComponentInteraction, SelectMenuInteraction } from 'discord.js';
import type {
Awaitable,
CommandInteraction,
Interaction,
MessageComponentInteraction,
SelectMenuInteraction,
} from 'discord.js';
import { concatMap, fromEvent, map, Observable, of, throwError } from 'rxjs';
import type Wrapper from '../structures/wrapper';
import * as Files from '../utilities/readFile';
@@ -10,12 +16,13 @@ import type { Module } from '../structures/module';
import {
isButton,
isChatInputCommand,
isMessageCtxMenuCmd,
isMessageCtxMenuCmd, isPromise,
isSelectMenu,
isUserContextMenuCmd,
} from '../utilities/predicates';
import { filterCorrectModule } from './observableHandling';
import { CommandType } from '../structures/enums';
import type { Result } from 'ts-results';
function applicationCommandHandler(mod: Module | undefined, interaction: CommandInteraction) {
const mod$ = <T extends CommandType>(cmdTy : T) => of(mod).pipe(
@@ -31,7 +38,7 @@ function applicationCommandHandler(mod: Module | undefined, interaction: Command
return of(m.onEvent?.map(e => e.execute(
[ctx, ['slash', i.options]],
controller
)) ?? []).pipe(map(res => ({ m, res, execute() { return m.execute(ctx, ['slash', i.options]); } }) ));
)) ?? []).pipe(map(res => ({ mod, res, execute() { return m.execute(ctx, ['slash', i.options]); } }) ));
}),
);
},
@@ -44,7 +51,7 @@ function applicationCommandHandler(mod: Module | undefined, interaction: Command
return of(m.onEvent?.map(e => e.execute(
[ctx],
controller
)) ?? []).pipe(map(res => ({ m, res, execute() { return m.execute(ctx); } }) ));
)) ?? []).pipe(map(res => ({ mod, res, execute() { return m.execute(ctx); } }) ));
}),
);
},
@@ -55,7 +62,7 @@ function applicationCommandHandler(mod: Module | undefined, interaction: Command
return of(m.onEvent?.map(e => e.execute(
[ctx],
controller
)) ?? []).pipe(map(res => ({ m, res, execute() { return m.execute(ctx); } }) ));
)) ?? []).pipe(map(res => ({ mod, res, execute() { return m.execute(ctx); } }) ));
}),
);
})
@@ -77,7 +84,7 @@ function messageComponentInteractionHandler(
return of(m.onEvent?.map(e => e.execute(
[ctx],
controller
)) ?? []).pipe(map(res => ({ m, res, execute() { return m.execute(ctx); } }) ));
)) ?? []).pipe(map(res => ({ mod, res, execute() { return m.execute(ctx); } }) ));
}),
);
})
@@ -87,7 +94,7 @@ function messageComponentInteractionHandler(
return of(m.onEvent?.map(e => e.execute(
[ctx],
controller
)) ?? []).pipe(map(res => ({ m, res, execute() { return m.execute(ctx); } }) ));
)) ?? []).pipe(map(res => ({ mod, res, execute() { return m.execute(ctx); } }) ));
}),
);
})
@@ -117,13 +124,23 @@ export function onInteractionCreate (wrapper: Wrapper) {
} else return throwError(() => SernError.NotSupportedInteraction);
}),
).subscribe({
next({m, res, execute}) {
},
async next({ mod, res : eventPluginRes, execute}) {
const ePlugArr : Result<void, void>[] = [];
for await ( const res of eventPluginRes) {
if(isPromise(res)) {
ePlugArr.push(res);
}
ePlugArr.push(res as Awaited<Result<void, void>>);
}
if(ePlugArr.every(e => e.ok)) {
await execute();
} else {
console.log(ePlugArr);
console.log(mod, 'failed');
}
},
error(err) {
console.log(err);
}
});
}
}