xernerx 4.14.1 → 4.15.1

package/dist/client/XernerxClient.d.ts

@@ -17,19 +17,19 @@ export default class XernerxClient extends Client {
             dm: boolean;
         } | undefined;
         ignore?: {
+            system: boolean;
+            users: string[];
             owner: boolean;
             self: boolean;
             bots: boolean;
-            system: boolean;
-            users: string[];
             channels: string[];
             guilds: string[];
         } | undefined;
         log?: boolean | {
+            warn: boolean;
             error: boolean;
             ready: boolean;
             info: boolean;
-            warn: boolean;
             table: string[] | null;
         } | undefined;
         cooldown?: {

package/dist/utils/ClientUtil.d.ts

@@ -15,5 +15,5 @@ export default class ClientUtil extends Util {
     resolveChannel(query: string | Record<string, string>): Promise<import("discord.js").Channel | null>;
     resolveGuild(query: string | Record<string, string>): Promise<import("discord.js").Guild | null>;
     uptime(timestamp?: number | null): string;
-    commands(): ([string, XernerxMessageCommand] | [string, XernerxSlashCommand] | [string, XernerxContextCommand])[];
+    commands(): (XernerxSlashCommand | XernerxContextCommand | XernerxMessageCommand)[];
 }

package/dist/utils/ClientUtil.js

@@ -76,6 +76,6 @@ export default class ClientUtil extends Util {
             return `${seconds}s`;
     }
     commands() {
-        return [...this.client.commands.context, ...this.client.commands.slash, ...this.client.commands.message];
+        return [...this.client.commands.context.toJSON(), ...this.client.commands.slash.toJSON(), ...this.client.commands.message.toJSON()];
     }
 }

package/dist/utils/InteractionUtil.d.ts

@@ -2,7 +2,7 @@
 import { EmbedBuilder, InteractionEditReplyOptions, InteractionReplyOptions, MessageCreateOptions, MessagePayload } from 'discord.js';
 import XernerxClient from '../client/XernerxClient.js';
 import { ContextCommandArguments, PaginatorOptions, SlashCommandArguments } from '../types/interfaces.js';
-import { XernerxInteraction } from '../types/types.js';
+import { PermissionNames, XernerxInteraction } from '../types/types.js';
 import Util from './Util.js';
 import { XernerxMessageContextInteraction, XernerxSlashInteraction, XernerxUser, XernerxUserContextInteraction } from '../types/extenders.js';
 type MimicOptions = {
@@ -20,5 +20,6 @@ export default class InteractionUtil extends Util {
     mimic(user: XernerxUser | string, interaction: MessageCreateOptions, options: MimicOptions): Promise<void>;
     paginator(embeds: Array<EmbedBuilder>, options?: PaginatorOptions): Promise<void | import("discord.js").Message<false> | import("discord.js").Message<true>>;
     commands(): import("@discordjs/collection").Collection<string, import("../main.js").XernerxSlashCommand> | import("@discordjs/collection").Collection<string, import("../main.js").XernerxContextCommand>;
+    permissionCheck(type: 'user' | 'client', permissions: Array<PermissionNames>): boolean;
 }
 export {};

package/dist/utils/InteractionUtil.js

@@ -2,6 +2,7 @@
 import { ActionRowBuilder, ButtonBuilder, ButtonStyle, InteractionType, StringSelectMenuBuilder, } from 'discord.js';
 import Util from './Util.js';
 import XernerxError from '../tools/XernerxError.js';
+import { Style } from 'dumfunctions';
 export default class InteractionUtil extends Util {
     constructor(client, interaction) {
         super(client);
@@ -124,4 +125,29 @@ export default class InteractionUtil extends Util {
         else
             return this.client.commands.context;
     }
+    permissionCheck(type, permissions) {
+        console.log(type);
+        const missing = [];
+        for (const permission of permissions) {
+            if (type == 'user') {
+                this.interaction.memberPermissions?.has(Style.pascalCase(permission, true)) ? null : missing.push(permission);
+            }
+            if (type == 'client') {
+                this.interaction.guild?.members.me?.permissionsIn(this.interaction.channel?.id).has(Style.pascalCase(permission, true)) ? null : missing.push(permission);
+            }
+        }
+        const command = this.commands().toJSON().find((cmd) => cmd.name == this.parsed.alias?.split(/ +/)[0]);
+        console.log(type);
+        if (missing.length) {
+            this.client.emit(`commandBlock`, this.interaction, {
+                reason: `missing${Style.pascalCase(type)}Permissions`,
+                message: `${type == 'user' ? 'You are' : 'I am'} missing the following permissions to run \`${command?.name}\`:\n${missing.map((permission) => `> - ${permission}`).join('\n')}`,
+                required: permissions,
+                missing,
+            }, command || null);
+            return false;
+        }
+        else
+            return true;
+    }
 }

package/dist/utils/MessageUtil.d.ts

@@ -4,6 +4,7 @@ import XernerxClient from '../client/XernerxClient.js';
 import { XernerxMessage, XernerxUser } from '../types/extenders.js';
 import Util from './Util.js';
 import { PaginatorOptions } from '../types/interfaces.js';
+import { PermissionNames } from '../main.js';
 type MimicOptions = {
     timeout: number;
 };
@@ -20,5 +21,6 @@ export default class MessageUtil extends Util {
     mimic(user: XernerxUser | string, message: MessageCreateOptions, options: MimicOptions): Promise<void>;
     paginator(embeds: Array<EmbedBuilder>, options?: PaginatorOptions): Promise<void | import("discord.js").Message<boolean> | null>;
     commands(): import("@discordjs/collection").Collection<string, import("../main.js").XernerxMessageCommand>;
+    permissionCheck(type: 'user' | 'client', permissions: Array<PermissionNames>): boolean;
 }
 export {};

package/dist/utils/MessageUtil.js

@@ -2,6 +2,7 @@
 import { ActionRowBuilder, ButtonBuilder, ButtonStyle, StringSelectMenuBuilder, } from 'discord.js';
 import Util from './Util.js';
 import XernerxError from '../tools/XernerxError.js';
+import { Style } from 'dumfunctions';
 export default class MessageUtil extends Util {
     constructor(client, message) {
         super(client);
@@ -138,4 +139,29 @@ export default class MessageUtil extends Util {
     commands() {
         return this.client.commands.message;
     }
+    permissionCheck(type, permissions) {
+        console.log(type);
+        const missing = [];
+        for (const permission of permissions) {
+            if (type == 'user') {
+                this.message.member?.permissionsIn(this.message.channel.id).has(Style.pascalCase(permission, true)) ? null : missing.push(permission);
+            }
+            if (type == 'client') {
+                this.message.guild?.members.me?.permissionsIn(this.message.channel.id).has(Style.pascalCase(permission, true)) ? null : missing.push(permission);
+            }
+        }
+        const command = this.commands().find((cmd) => cmd.name == this.parsed.alias || cmd.aliases?.includes(this.parsed.alias));
+        console.log(type);
+        if (missing.length) {
+            this.client.emit(`commandBlock`, this.message, {
+                reason: `missing${Style.pascalCase(type)}Permissions`,
+                message: `${type == 'user' ? 'You are' : 'I am'} missing the following permissions to run \`${command?.name}\`:\n${missing.map((permission) => `> - ${permission}`).join('\n')}`,
+                required: permissions,
+                missing,
+            }, command || null);
+            return false;
+        }
+        else
+            return true;
+    }
 }

package/dist/validators/commandValidation.js

@@ -1,5 +1,6 @@
 /** @format */
-import { ChannelType, PermissionFlagsBits } from 'discord.js';
+import { ChannelType } from 'discord.js';
+import { Style } from 'dumfunctions';
 var CommandTypes;
 (function (CommandTypes) {
     CommandTypes["SlashCommand"] = "slash";
@@ -88,10 +89,10 @@ export default async function commandValidation(event, command) {
             reason: 'DMRestricted',
             message: `\`${command.name}\` can't be used in a DM Channel`,
         }, command);
-    if (userPermissions) {
-        const missing = userPermissions.map((permission) => ((event.member?.permissions).has(toBigInt([permission])) ? null : permission)).filter((x) => x);
-        const desired = (event.member?.permissions).has(toBigInt(userPermissions));
-        if (!desired)
+    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')}`,
@@ -99,10 +100,10 @@ export default async function commandValidation(event, command) {
                 missing,
             }, command);
     }
-    if (clientPermissions) {
-        const missing = clientPermissions.map((permission) => (event.guild?.members.me?.permissions.has(toBigInt([permission])) ? null : permission)).filter((x) => x);
-        const desired = event.guild?.members.me?.permissions?.has(toBigInt(clientPermissions));
-        if (!desired)
+    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')}`,
@@ -121,16 +122,3 @@ async function emit(event, info, command) {
     event.client.emit('commandBlock', event, info, command);
     return true;
 }
-function toBigInt(permissions) {
-    let bigIntPermissions = 0n;
-    permissions.map((permission) => {
-        permission =
-            PermissionFlagsBits[permission
-                .split(/ +/)
-                .map((word) => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase())
-                .join('')];
-        if (typeof permission === 'bigint')
-            bigIntPermissions += permission;
-    });
-    return bigIntPermissions;
-}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "xernerx",
-	"version": "4.14.1",
+	"version": "4.15.1",
 	"description": "A bot framework for discord.js.",
 	"main": "dist/main.js",
 	"type": "module",
@@ -30,7 +30,9 @@
 		"site": "git add docs && npm run commit && git push",
 		"write": "npm i && npm run build && npm run format",
 		"format": "npx prettier --write src dist",
-		"build": "tsc && npm run format"
+		"build": "npm run build:esm && npm run format",
+		"build:esm": "tsc",
+		"build:cjs": "tsc --module CommonJS --outDir dist/cjs"
 	},
 	"repository": {
 		"type": "git",
@@ -42,7 +44,7 @@
 	"dependencies": {
 		"dbl-sdk": "^2.0.3",
 		"discord.js": "^14.14.1",
-		"dumfunctions": "2.1.2",
+		"dumfunctions": "^2.1.6",
 		"xernerx-extension-builder": "0.0.16",
 		"zod": "^3.22.4"
 	},

package/dist/functions/sendWebhook.d.ts

@@ -1,4 +0,0 @@
-/** @format */
-/// <reference types="node" resolution-mode="require"/>
-import { MessagePayload } from 'discord.js';
-export default function sendWebhook(url: URL, body: MessagePayload): Promise<unknown>;

package/dist/functions/sendWebhook.js

@@ -1,14 +0,0 @@
-/** @format */
-export default async function sendWebhook(url, body) {
-    const response = await fetch(url, {
-        method: 'POST',
-        headers: {
-            'Content-Type': 'application/json',
-        },
-        body: JSON.stringify(body),
-    });
-    if (response.status === 204)
-        return true;
-    const data = await response.json();
-    return data;
-}

package/dist/handlers/WebhookHandler.d.ts

@@ -1,8 +0,0 @@
-/** @format */
-import XernerxClient from '../client/XernerxClient.js';
-import Handler from './Handler.js';
-export default class IntegrationHandler extends Handler {
-    readonly readyTimestamp: number;
-    constructor(client: XernerxClient);
-    loadIntegrations(options: any): Promise<void>;
-}

package/dist/handlers/WebhookHandler.js

@@ -1,10 +0,0 @@
-/** @format */
-// import XernerxLog from '../tools/XernerxLog.js';
-import Handler from './Handler.js';
-export default class IntegrationHandler extends Handler {
-    constructor(client) {
-        super(client);
-        this.readyTimestamp = Number(Date.now());
-    }
-    async loadIntegrations(options) { }
-}