xernerx 4.17.6 → 4.17.9

package/dist/validators/commandValidation.js

@@ -3,165 +3,122 @@ import { ChannelType } from 'discord.js';
 import { Style } from 'dumfunctions';
 var CommandTypes;
 (function (CommandTypes) {
-	CommandTypes['SlashCommand'] = 'slash';
-	CommandTypes['MessageCommand'] = 'message';
-	CommandTypes['ContextCommand'] = 'context';
+    CommandTypes["SlashCommand"] = "slash";
+    CommandTypes["MessageCommand"] = "message";
+    CommandTypes["ContextCommand"] = "context";
 })(CommandTypes || (CommandTypes = {}));
 export default async function commandValidation(event, command) {
-	const client = event.client;
-	if (command.ignore?.owner && client.settings.ownerId?.includes(event.user.id)) return false;
-	const cooldownTime = command.cooldown || client.modules.options?.[CommandTypes[command.filetype]]?.cooldown || client.cooldown?.default || 0;
-	const cooldown = {
-		id: event.user.id,
-		command: command.name,
-		createdTimestamp: Number(Date.now()) + cooldownTime,
-	};
-	const clientPermissions = command.permissions?.client || client.modules.options?.[CommandTypes[command.filetype]]?.permissions?.client || client.settings.permissions?.client || [];
-	const userPermissions = command.permissions?.user || client.modules.options?.[CommandTypes[command.filetype]]?.permissions?.user || client.settings.permissions?.user || [];
-	if (!client.cooldowns.collections.commands.has(`${event.user.id}-${command.name}`)) {
-		client.cooldowns.collections.commands.set(`${event.user.id}-${command.name}`, cooldown);
-		setTimeout(() => {
-			client.cooldowns.collections.commands.delete(`${event.user.id}-${command.name}`);
-		}, cooldownTime);
-	} else {
-		const user = client.cooldowns.collections.commands.get(`${event.user.id}-${command.name}`);
-		const time = (user?.createdTimestamp || 0) - Number(Date.now());
-		return emit(
-			event,
-			{
-				reason: 'cooldown',
-				message: `You are on cooldown for \`${command.name}\`, wait another \`${Math.round(time / 10) / 100}s\``,
-				startedAt: user.createdTimestamp,
-				endsAt: user.createdTimestamp + time,
-				time,
-			},
-			command
-		);
-	}
-	if (command.channel && event.channel?.type !== undefined && event.channel?.type >= 0) {
-		if (!command.channel.includes(ChannelType[event.channel?.type]))
-			return await emit(
-				event,
-				{
-					reason: 'invalidChannel',
-					message: `\`${command.name}\` can only be used in ${command.channel.join(', ')} channels`,
-					channels: command.channel,
-				},
-				command
-			);
-	}
-	if ((command.ignore?.channels?.length || 0) > 0 && command.ignore?.channels?.includes(event.channel?.id)) return true;
-	if ((command.ignore?.guilds?.length || 0) > 0 && command.ignore?.guilds?.includes(event.guild?.id)) return true;
-	if ((command.ignore?.users?.length || 0) > 0 && command.ignore?.users?.includes(event.user.id)) return true;
-	if (command.ignore?.voice && event.member?.voice?.channel)
-		return await emit(
-			event,
-			{
-				reason: 'inVoice',
-				message: `\`${command.name}\` cannot be ran while in voice chat`,
-			},
-			command
-		);
-	if (command.strict?.owner && !client.settings.ownerId.includes(event.user.id))
-		return await emit(
-			event,
-			{
-				reason: 'notADeveloper',
-				message: `\`${command.name}\` is a developer command`,
-				owners: client.settings.ownerId,
-			},
-			command
-		);
-	if ((command.strict?.channels?.length || 0) > 0 && !command.strict?.channels?.includes(event.channel?.id))
-		return await emit(
-			event,
-			{
-				reason: 'channelRestricted',
-				message: `\`${command.name}\` cannot be ran in this channel`,
-				channels: command.strict?.channels,
-			},
-			command
-		);
-	if ((command.strict?.guilds?.length || 0) > 0 && !command.strict?.guilds?.includes(event.guild?.id))
-		return await emit(
-			event,
-			{
-				reason: 'guildRestricted',
-				message: `\`${command.name}\` cannot be ran in this guild`,
-				guilds: command.strict?.guilds,
-			},
-			command
-		);
-	if ((command.strict?.users?.length || 0) > 0 && !command.strict?.users?.includes(event.user.id))
-		return await emit(
-			event,
-			{
-				reason: 'userRestricted',
-				message: `\`${command.name}\` cannot be ran by you`,
-				users: command.strict?.users,
-			},
-			command
-		);
-	if (command.strict?.voice && !event.member?.voice?.channel)
-		return await emit(
-			event,
-			{
-				reason: 'voiceRestricted',
-				message: `\`${command.name}\` cannot be ran while not in voice chat`,
-			},
-			command
-		);
-	if (command.permissions?.dm == false && event.channel?.type === ChannelType.DM)
-		return await emit(
-			event,
-			{
-				reason: 'DMRestricted',
-				message: `\`${command.name}\` can't be used in a DM Channel`,
-			},
-			command
-		);
-	if (userPermissions.length) {
-		const missing = [];
-		userPermissions.map((permission) => (event.guild?.members.me?.permissionsIn(event.channel?.id).has(Style.pascalCase(permission, true)) ? null : missing.push(permission)));
-		if (missing.length)
-			return await emit(
-				event,
-				{
-					reason: 'missingUserPermissions',
-					message: `You are missing the following permissions to run \`${command.name}\`:\n${missing.map((permission) => `> - ${permission}`).join('\n')}`,
-					required: userPermissions,
-					missing,
-				},
-				command
-			);
-	}
-	if (clientPermissions.length) {
-		const missing = [];
-		clientPermissions.map((permission) => (event.guild?.members.me?.permissionsIn(event.channel?.id).has(Style.pascalCase(permission, true)) ? null : missing.push(permission)));
-		if (missing.length)
-			return await emit(
-				event,
-				{
-					reason: 'missingClientPermissions',
-					message: `I am missing the following permissions to run \`${command.name}\`:\n${missing.map((permission) => `> - ${permission}`).join('\n')}`,
-					required: clientPermissions,
-					missing,
-				},
-				command
-			);
-	}
-	if ((!command.global || !client.settings.global) && client.settings.local !== event.guild?.id)
-		return await emit(
-			event,
-			{
-				reason: 'local',
-				message: `\`${command.name}\` is not globally deployed`,
-			},
-			command
-		);
-	return false;
+    const client = event.client;
+    if (command.ignore?.owner && client.settings.ownerId?.includes(event.user.id))
+        return false;
+    const cooldownTime = command.cooldown || client.modules.options?.[CommandTypes[command.filetype]]?.cooldown || client.cooldown?.default || 0;
+    const cooldown = {
+        id: event.user.id,
+        command: command.name,
+        createdTimestamp: Number(Date.now()) + cooldownTime,
+    };
+    const clientPermissions = command.permissions?.client || client.modules.options?.[CommandTypes[command.filetype]]?.permissions?.client || client.settings.permissions?.client || [];
+    const userPermissions = command.permissions?.user || client.modules.options?.[CommandTypes[command.filetype]]?.permissions?.user || client.settings.permissions?.user || [];
+    if (!client.cooldowns.collections.commands.has(`${event.user.id}-${command.name}`)) {
+        client.cooldowns.collections.commands.set(`${event.user.id}-${command.name}`, cooldown);
+        setTimeout(() => {
+            client.cooldowns.collections.commands.delete(`${event.user.id}-${command.name}`);
+        }, cooldownTime);
+    }
+    else {
+        const user = client.cooldowns.collections.commands.get(`${event.user.id}-${command.name}`);
+        const time = (user?.createdTimestamp || 0) - Number(Date.now());
+        return emit(event, {
+            reason: 'cooldown',
+            message: `You are on cooldown for \`${command.name}\`, wait another \`${Math.round(time / 10) / 100}s\``,
+            startedAt: user.createdTimestamp,
+            endsAt: user.createdTimestamp + time,
+            time,
+        }, command);
+    }
+    if (command.channel && event.channel?.type !== undefined && event.channel?.type >= 0) {
+        if (!command.channel.includes(ChannelType[event.channel?.type]))
+            return await emit(event, {
+                reason: 'invalidChannel',
+                message: `\`${command.name}\` can only be used in ${command.channel.join(', ')} channels`,
+                channels: command.channel,
+            }, command);
+    }
+    if ((command.ignore?.channels?.length || 0) > 0 && command.ignore?.channels?.includes(event.channel?.id))
+        return true;
+    if ((command.ignore?.guilds?.length || 0) > 0 && command.ignore?.guilds?.includes(event.guild?.id))
+        return true;
+    if ((command.ignore?.users?.length || 0) > 0 && command.ignore?.users?.includes(event.user.id))
+        return true;
+    if (command.ignore?.voice && event.member?.voice?.channel)
+        return await emit(event, {
+            reason: 'inVoice',
+            message: `\`${command.name}\` cannot be ran while in voice chat`,
+        }, command);
+    if (command.strict?.owner && !client.settings.ownerId.includes(event.user.id))
+        return await emit(event, {
+            reason: 'notADeveloper',
+            message: `\`${command.name}\` is a developer command`,
+            owners: client.settings.ownerId,
+        }, command);
+    if ((command.strict?.channels?.length || 0) > 0 && !command.strict?.channels?.includes(event.channel?.id))
+        return await emit(event, {
+            reason: 'channelRestricted',
+            message: `\`${command.name}\` cannot be ran in this channel`,
+            channels: command.strict?.channels,
+        }, command);
+    if ((command.strict?.guilds?.length || 0) > 0 && !command.strict?.guilds?.includes(event.guild?.id))
+        return await emit(event, {
+            reason: 'guildRestricted',
+            message: `\`${command.name}\` cannot be ran in this guild`,
+            guilds: command.strict?.guilds,
+        }, command);
+    if ((command.strict?.users?.length || 0) > 0 && !command.strict?.users?.includes(event.user.id))
+        return await emit(event, {
+            reason: 'userRestricted',
+            message: `\`${command.name}\` cannot be ran by you`,
+            users: command.strict?.users,
+        }, command);
+    if (command.strict?.voice && !event.member?.voice?.channel)
+        return await emit(event, {
+            reason: 'voiceRestricted',
+            message: `\`${command.name}\` cannot be ran while not in voice chat`,
+        }, command);
+    if (command.permissions?.dm == false && event.channel?.type === ChannelType.DM)
+        return await emit(event, {
+            reason: 'DMRestricted',
+            message: `\`${command.name}\` can't be used in a DM Channel`,
+        }, command);
+    if (userPermissions.length) {
+        const missing = [];
+        userPermissions.map((permission) => ((event.member?.permissions).toArray().includes(Style.pascalCase(permission, true)) ? null : missing.push(permission)));
+        if (missing.length)
+            return await emit(event, {
+                reason: 'missingUserPermissions',
+                message: `You are missing the following permissions to run \`${command.name}\`:\n${missing.map((permission) => `> - ${permission}`).join('\n')}`,
+                required: userPermissions,
+                missing,
+            }, command);
+    }
+    if (clientPermissions.length) {
+        const missing = [];
+        clientPermissions.map((permission) => event.guild?.members.me?.permissionsIn(event.channel?.id).has(Style.pascalCase(permission, true)) ? null : missing.push(permission));
+        if (missing.length)
+            return await emit(event, {
+                reason: 'missingClientPermissions',
+                message: `I am missing the following permissions to run \`${command.name}\`:\n${missing.map((permission) => `> - ${permission}`).join('\n')}`,
+                required: clientPermissions,
+                missing,
+            }, command);
+    }
+    if ((!command.global || !client.settings.global) && client.settings.local !== event.guild?.id)
+        return await emit(event, {
+            reason: 'local',
+            message: `\`${command.name}\` is not globally deployed`,
+        }, command);
+    return false;
 }
 async function emit(event, info, command) {
-	event.client.emit('commandBlock', event, info, command);
-	return true;
+    event.client.emit('commandBlock', event, info, command);
+    return true;
 }

package/dist/validators/inhibitorValidations.d.ts

@@ -5,24 +5,5 @@ import XernerxMessageCommand from '../build/XernerxMessageCommand.js';
 import XernerxSlashCommand from '../build/XernerxSlashCommand.js';
 import { XernerxMessage, XernerxMessageContextInteraction, XernerxSlashInteraction, XernerxUserContextInteraction } from '../types/extenders.js';
 import { InhibitorType, XernerxInteraction } from '../types/types.js';
-export declare function inhibitorValidation(
-	event: XernerxMessage | XernerxInteraction<XernerxSlashInteraction | XernerxUserContextInteraction | XernerxMessageContextInteraction>,
-	args?: SlashCommandArguments | MessageCommandArguments | ContextCommandArguments<'user' | 'message'> | null,
-	cmd?: XernerxContextCommand | XernerxMessageCommand | XernerxSlashCommand,
-	type?: 'pre' | 'check' | 'post'
-): Promise<boolean>;
-export declare function inhibitorArguments(
-	event: XernerxMessage | XernerxInteraction<XernerxSlashInteraction | XernerxUserContextInteraction | XernerxMessageContextInteraction>,
-	cmd: XernerxContextCommand | XernerxMessageCommand | XernerxSlashCommand | null,
-	type: InhibitorType
-):
-	| import('../types/extenders.js').XernerxUser
-	| import('discord.js').GuildMember
-	| import('discord.js').Guild
-	| import('discord.js').TextBasedChannel
-	| XernerxSlashCommand
-	| XernerxContextCommand
-	| XernerxMessageCommand
-	| import('discord.js').APIInteractionGuildMember
-	| null
-	| undefined;
+export declare function inhibitorValidation(event: XernerxMessage | XernerxInteraction<XernerxSlashInteraction | XernerxUserContextInteraction | XernerxMessageContextInteraction>, args?: SlashCommandArguments | MessageCommandArguments | ContextCommandArguments<'user' | 'message'> | null, cmd?: XernerxContextCommand | XernerxMessageCommand | XernerxSlashCommand, type?: 'pre' | 'check' | 'post'): Promise<boolean>;
+export declare function inhibitorArguments(event: XernerxMessage | XernerxInteraction<XernerxSlashInteraction | XernerxUserContextInteraction | XernerxMessageContextInteraction>, cmd: XernerxContextCommand | XernerxMessageCommand | XernerxSlashCommand | null, type: InhibitorType): import("../types/extenders.js").XernerxUser | import("discord.js").GuildMember | import("discord.js").Guild | import("discord.js").TextBasedChannel | XernerxSlashCommand | XernerxContextCommand | import("discord.js").APIInteractionGuildMember | XernerxMessageCommand | null | undefined;

package/dist/validators/inhibitorValidations.js

@@ -1,44 +1,44 @@
 /** @format */
 export async function inhibitorValidation(event, args, cmd, type) {
-	const client = event.client;
-	const inhibits = [];
-	for (const [name, inhibitor] of client.inhibitors) {
-		if (type == 'pre')
-			if (Boolean(await inhibitor.pre(event, await inhibitorArguments(event, cmd || null, inhibitor.type)))) {
-				inhibits.push(name);
-			}
-		if (type == 'check')
-			if (Boolean(await inhibitor.check(event, args || null, await inhibitorArguments(event, cmd || null, inhibitor.type)))) {
-				inhibits.push(name);
-			}
-		if (type == 'post')
-			if (Boolean(await inhibitor.post(event, args || null, await inhibitorArguments(event, cmd || null, inhibitor.type)))) {
-				inhibits.push(name);
-			}
-	}
-	return !!inhibits.length;
+    const client = event.client;
+    const inhibits = [];
+    for (const [name, inhibitor] of client.inhibitors) {
+        if (type == 'pre')
+            if (Boolean(await inhibitor.pre(event, (await inhibitorArguments(event, cmd || null, inhibitor.type))))) {
+                inhibits.push(name);
+            }
+        if (type == 'check')
+            if (Boolean(await inhibitor.check(event, args || null, (await inhibitorArguments(event, cmd || null, inhibitor.type))))) {
+                inhibits.push(name);
+            }
+        if (type == 'post')
+            if (Boolean(await inhibitor.post(event, args || null, (await inhibitorArguments(event, cmd || null, inhibitor.type))))) {
+                inhibits.push(name);
+            }
+    }
+    return !!inhibits.length;
 }
 export function inhibitorArguments(event, cmd, type) {
-	switch (type) {
-		case 'channel':
-			return event.channel || null;
-		case 'command':
-			return cmd || null;
-		case 'contextCommand':
-			return cmd || null;
-		case 'guild':
-			return event.guild || null;
-		case 'interaction':
-			return null;
-		case 'member':
-			return event.member || null;
-		case 'message':
-			return null;
-		case 'messageCommand':
-			return cmd || null;
-		case 'slashCommand':
-			return cmd || null;
-		case 'user':
-			return event.user || null;
-	}
+    switch (type) {
+        case 'channel':
+            return event.channel || null;
+        case 'command':
+            return cmd || null;
+        case 'contextCommand':
+            return cmd || null;
+        case 'guild':
+            return event.guild || null;
+        case 'interaction':
+            return null;
+        case 'member':
+            return event.member || null;
+        case 'message':
+            return null;
+        case 'messageCommand':
+            return cmd || null;
+        case 'slashCommand':
+            return cmd || null;
+        case 'user':
+            return event.user || null;
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "xernerx",
-	"version": "4.17.6",
+	"version": "4.17.9",
 	"description": "A bot framework for discord.js.",
 	"main": "dist/main.js",
 	"type": "module",
@@ -43,17 +43,18 @@
 		"url": "https://github.com/xernerx/xernerx/issues"
 	},
 	"dependencies": {
-		"@clack/prompts": "^0.7.0",
+		"@clack/prompts": "^0.9.1",
 		"dbl-sdk": "^2.0.3",
-		"discord.js": "^14.14.1",
+		"discord.js": "^14.17.3",
 		"dumfunctions": "^2.1.6",
 		"xernerx-extension-builder": "0.0.16",
-		"zod": "^3.22.4"
+		"zod": "^3.24.1"
 	},
 	"devDependencies": {
 		"jest": "^29.7.0",
 		"prettier": "3.0.0",
 		"ts-node": "^10.9.2",
-		"typescript": "^5.5.2"
+		"tsup": "^8.3.5",
+		"typescript": "^5.7.3"
 	}
 }

package/tsup.config.ts

@@ -0,0 +1,19 @@
+/** @format */
+
+import { defineConfig } from 'tsup';
+
+export default defineConfig({
+	entry: ['src/main.ts'],
+	splitting: true,
+	sourcemap: true,
+	dts: true,
+	clean: true,
+	format: ['esm', 'cjs'],
+	tsconfig: 'tsconfig.json',
+	treeshake: true,
+	shims: true,
+	keepNames: true,
+	target: 'es2022',
+	skipNodeModulesBundle: true,
+	platform: 'node',
+});

package/dist/functions/xernerxUser.d.ts

@@ -1,4 +0,0 @@
-/** @format */
-import XernerxClient from '../client/XernerxClient.js';
-import { XernerxMessage, XernerxSlashInteraction, XernerxUser, XernerxUserContextInteraction } from '../types/extenders.js';
-export declare function xernerxUser(event: XernerxMessage | XernerxSlashInteraction | XernerxUserContextInteraction | XernerxUserContextInteraction, client: XernerxClient): Promise<XernerxUser>;

package/dist/functions/xernerxUser.js

@@ -1,10 +0,0 @@
-/** @format */
-export async function xernerxUser(event, client) {
-	const author = event.author || event.user;
-	author.owner = isOwner(client, author);
-	if (client.dbl.validate) author.voted = await client?.dbl?.validate(author);
-	return author;
-}
-function isOwner(client, user) {
-	return client.settings.ownerId.includes(user.id);
-}