tiramisu/seyfert
5
0
Fork 0
mirror of https://github.com/tiramisulabs/seyfert.git synced 2025-07-02 13:06:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: defaults of integrationTypes & contexts

Browse Source
This commit is contained in:
MARCROCK22 2024-06-04 00:26:54 +00:00
parent 7e30f4ba78
commit 625e400c20
5 changed files with 265 additions and 260 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/client/onmessagecreate.ts
View File

@ -91,7 +91,7 @@ export async function onMessageCreate(
const prefixes = (await self.options.commands.prefix(message)).sort((a, b) => b.length - a.length);
const prefix = prefixes.find(x => message.content.startsWith(x));
if (!(prefix && message.content.startsWith(prefix))) return;
if (!(prefix !== undefined && message.content.startsWith(prefix))) return;
const content = message.content.slice(prefix.length).trimStart();
const { fullCommandName, command, parent } = getCommandFromContent(
@ -105,7 +105,8 @@ export async function onMessageCreate(
if (!command) return;
if (!command.run) return self.logger.warn(`${fullCommandName} command does not have 'run' callback`);
if (!(command.contexts?.includes(InteractionContextType.BotDM) || message.guildId)) return;
if (!command.contexts.includes(InteractionContextType.BotDM) && !message.guildId) return;
if (!command.contexts.includes(InteractionContextType.Guild) && message.guildId) return;
if (command.guildId && !command.guildId?.includes(message.guildId!)) return;
const resolved: MakeRequired<ContextOptionsResolved> = {

4
src/commands/applications/chat.ts
View File

@ -126,8 +126,8 @@ export class BaseCommand {
nsfw?: boolean;
description!: string;
defaultMemberPermissions?: bigint;
integrationTypes?: ApplicationIntegrationType[];
contexts?: InteractionContextType[];
integrationTypes: ApplicationIntegrationType[] = [];
contexts: InteractionContextType[] = [];
botPermissions?: bigint;
name_localizations?: Partial<Record<LocaleString, string>>;
description_localizations?: Partial<Record<LocaleString, string>>;

4
src/commands/applications/menu.ts
View File

@ -19,8 +19,8 @@ export abstract class ContextMenuCommand {
name!: string;
type!: ApplicationCommandType.User | ApplicationCommandType.Message;
nsfw?: boolean;
integrationTypes?: ApplicationIntegrationType[];
contexts?: InteractionContextType[];
integrationTypes: ApplicationIntegrationType[] = [];
contexts: InteractionContextType[] = [];
description!: string;
defaultMemberPermissions?: bigint;
botPermissions?: bigint;

8
src/commands/decorators.ts
View File

@ -157,8 +157,12 @@ export function Declare(declare: DeclareOptions) {
class extends target {
name = declare.name;
nsfw = declare.nsfw;
contexts = declare.contexts?.map(i => InteractionContextType[i]);
integrationTypes = declare.integrationTypes?.map(i => ApplicationIntegrationType[i]);
contexts =
declare.contexts?.map(i => InteractionContextType[i]) ??
Object.values(InteractionContextType).filter(x => typeof x === 'number');
integrationTypes = declare.integrationTypes?.map(i => ApplicationIntegrationType[i]) ?? [
ApplicationIntegrationType.GuildInstall,
];
defaultMemberPermissions = Array.isArray(declare.defaultMemberPermissions)
? declare.defaultMemberPermissions?.reduce((acc, prev) => acc | PermissionFlagsBits[prev], BigInt(0))
: declare.defaultMemberPermissions;

4
src/commands/handler.ts
View File

@ -143,14 +143,14 @@ export class CommandHandler extends BaseHandler {
//TODO: locales
if ('contexts' in command && 'contexts' in cached) {
if (command.contexts?.length !== cached.contexts?.length) return true;
if (command.contexts.length !== cached.contexts.length) return true;
if (command.contexts && cached.contexts) {
if (command.contexts.some(ctx => !cached.contexts!.includes(ctx))) return true;
}
}
if ('integration_types' in command && 'integration_types' in cached) {
if (command.integration_types?.length !== cached.integration_types?.length) return true;
if (command.integration_types.length !== cached.integration_types.length) return true;
if (command.integration_types && cached.integration_types) {
if (command.integration_types.some(ctx => !cached.integration_types!.includes(ctx))) return true;
}