xernerx 4.10.0 → 4.12.0

package/dist/client/XernerxClient.d.ts

@@ -46,6 +46,7 @@ export default class XernerxClient extends Client {
     readonly stats: Record<string, number>;
     readonly cache: XernerxCache;
     readonly cooldowns: Cooldowns;
+    readonly dbl: any;
     constructor(discordOptions: ClientOptions, xernerxOptions: XernerxOptions, config?: unknown);
     connect(token: string): Promise<string>;
 }

package/dist/client/XernerxClient.js

@@ -4,7 +4,7 @@ import { z } from 'zod';
 import CommandHandler from '../handlers/CommandHandler.js';
 import EventHandler from '../handlers/EventHandler.js';
 import InhibitorHandler from '../handlers/InhibitorHandler.js';
-import WebhookHandler from '../handlers/WebhookHandler.js';
+import IntegrationHandler from '../handlers/IntegrationHandler.js';
 import XernerxLog from '../tools/XernerxLog.js';
 import ClientUtil from '../utils/ClientUtil.js';
 import ExtensionHandler from '../handlers/ExtensionHandler.js';
@@ -64,26 +64,28 @@ export default class XernerxClient extends Client {
         };
         this.events = new Collection();
         this.inhibitors = new Collection();
-        this.modules = {
-            options: {},
-            commandHandler: new CommandHandler(this),
-            eventHandler: new EventHandler(this),
-            inhibitorHandler: new InhibitorHandler(this),
-            webhookHandler: new WebhookHandler(this),
-            extensionHandler: new ExtensionHandler(this),
-        };
         this.util = new ClientUtil(this);
         this.stats = {
             guildCount: this.guilds.cache.size,
             userCount: 0,
             shardId: 0,
-            shardCount: 1,
+            shardCount: this.options.shardCount || 1,
+            voteCount: 0,
         };
+        this.dbl = {};
         this.cache = {
             messages: new Collection(),
             cooldowns: new Collection(),
         };
         this.cooldowns = new Cooldowns(this, xernerxOptions.cooldown?.collections);
+        this.modules = {
+            options: {},
+            commandHandler: new CommandHandler(this),
+            eventHandler: new EventHandler(this),
+            inhibitorHandler: new InhibitorHandler(this),
+            integrationHandler: new IntegrationHandler(this),
+            extensionHandler: new ExtensionHandler(this),
+        };
         return this;
     }
     async connect(token) {

package/dist/client/XernerxShardClient.d.ts

@@ -11,6 +11,8 @@ export default class XernerxShardClient extends ShardingManager {
         guildCount: number;
         userCount: number;
         shardCount: number;
+        voteCount: number;
+        shards: {};
     };
     user: ClientUser | null;
     spawner: Promise<import("@discordjs/collection").Collection<number, import("discord.js").Shard>>;

package/dist/client/XernerxShardClient.js

@@ -5,18 +5,19 @@ import { Style } from 'dumfunctions';
 export default class XernerxShardClient extends ShardingManager {
     constructor(file, discordOptions, xernerxOptions) {
         super(file, discordOptions);
-        this.stats = { guildCount: 0, userCount: 0, shardCount: 0 };
+        this.stats = { guildCount: 0, userCount: 0, shardCount: 0, voteCount: 0, shards: {} };
         this.user = null;
         this.on('shardCreate', async (shard) => {
             shard
                 .on('ready', async () => {
-                const guilds = (await shard.fetchClientValue('guilds.cache'));
-                const guildCount = guilds.length;
-                const userCount = guilds.map((guild) => guild.memberCount).length ? guilds.map((guild) => guild.memberCount).reduce((a, b) => (a += b)) : 0;
+                await new Promise((resolve) => setTimeout(resolve, 250));
+                const stats = (await shard.fetchClientValue('stats'));
+                this.stats.shards[String(shard.id)] = stats;
                 this.user = (await shard.fetchClientValue('user'));
-                this.stats.guildCount += Number(guildCount);
-                this.stats.userCount += Number(userCount);
+                this.stats.guildCount += stats.guildCount;
+                this.stats.userCount += stats.userCount;
                 this.stats.shardCount++;
+                this.stats.voteCount = stats.voteCount;
                 await new XernerxLog({ settings: xernerxOptions }).info(`Launched shard ${Style.log(String(shard.id), { color: Style.TextColor.Cyan })} for ${Style.log(this.user?.tag, { color: Style.TextColor.Blue })}! ${xernerxOptions?.timeout ? `Automatically killing in ${Style.log(String(xernerxOptions.timeout), { color: Style.TextColor.Cyan })}ms.` : ''}`);
             })
                 .on('error', (error) => {

package/dist/functions/deploy.js

@@ -7,7 +7,14 @@ const globalCommands = [];
 const localCommands = [];
 export default function deploy(client) {
     const commands = [];
+    function stats() {
+        client.stats.guildCount = client.guilds.cache.size;
+        client.stats.userCount = client.guilds.cache.map((g) => g.memberCount || g.approximateMemberCount || 0).reduce((a, b) => (a += b));
+    }
+    client.on('messageCreate', stats);
+    client.on('interactionCreate', stats);
     client.prependOnceListener('ready', (client) => {
+        stats();
         client.commands.slash.map((command) => commands.push(command));
         client.commands.context.map((command) => commands.push(command));
         client.commands.slash.map((command) => commands.push(command));
@@ -44,7 +51,7 @@ function put(client, global, body) {
     if (!global && !client.settings?.local)
         throw new XernerxError(`No guild ID provided as local guild!`);
     if (!global && client.settings?.local)
-        rest.put(Routes.applicationGuildCommands(client.user?.id, client.settings.local), { body });
+        return rest.put(Routes.applicationGuildCommands(client.user?.id, client.settings.local), { body });
     else
-        rest.put(Routes.applicationCommands(client.user?.id), { body });
+        return rest.put(Routes.applicationCommands(client.user?.id), { body });
 }

package/dist/functions/setPresence.js

@@ -1,10 +1,12 @@
 /** @format */
+import { ActivityType } from 'discord.js';
+import { Style } from 'dumfunctions';
 export default function setPresence(client, options) {
     const presence = () => client.user?.setPresence({
         activities: [
             {
                 name: options.text,
-                type: options.type,
+                type: ActivityType[Style.titleCase(options.type || 'Custom')],
                 url: options.url,
             },
         ],

package/dist/functions/xernerxUser.js

@@ -2,7 +2,8 @@
 export async function xernerxUser(event, client) {
     const author = event.author || event.user;
     author.owner = isOwner(client, author);
-    author.voted = client.util.hasVoted ? await client.util.hasVoted(author.id) : null;
+    if (client.dbl.validate)
+        author.voted = await client?.dbl?.validate(author);
     return author;
 }
 function isOwner(client, user) {

package/dist/handlers/IntegrationHandler.d.ts

@@ -0,0 +1,15 @@
+/** @format */
+import XernerxClient from '../client/XernerxClient.js';
+import Handler from './Handler.js';
+import dbl from 'dbl-sdk';
+export default class IntegrationHandler extends Handler {
+    readonly readyTimestamp: number;
+    readonly dbl: dbl;
+    constructor(client: XernerxClient);
+    loadIntegrations(options?: DBLOptions): Promise<void>;
+}
+interface DBLOptions {
+    post?: boolean;
+    votes?: boolean;
+}
+export {};

package/dist/handlers/IntegrationHandler.js

@@ -0,0 +1,25 @@
+/** @format */
+// import XernerxLog from '../tools/XernerxLog.js';
+import Handler from './Handler.js';
+import dbl from 'dbl-sdk';
+export default class IntegrationHandler extends Handler {
+    constructor(client) {
+        super(client);
+        this.dbl = new dbl(client, client.config);
+        this.readyTimestamp = Number(Date.now());
+    }
+    async loadIntegrations(options = { votes: true }) {
+        this.client.once('ready', async (client) => {
+            this.client.dbl.validate = (user) => this.dbl.validate(user);
+            if (options.post) {
+                this.dbl.post();
+            }
+            if (options.votes) {
+                this.dbl.votes();
+                this.client.on('dbl-sync', (client, responses) => {
+                    this.client.stats.voteCount = responses.voteCount;
+                });
+            }
+        });
+    }
+}

package/dist/handlers/WebhookHandler.d.ts

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

package/dist/handlers/WebhookHandler.js

@@ -1,49 +1,10 @@
 /** @format */
-import XernerxLog from '../tools/XernerxLog.js';
+// import XernerxLog from '../tools/XernerxLog.js';
 import Handler from './Handler.js';
-export default class WebhookHandler extends Handler {
+export default class IntegrationHandler extends Handler {
     constructor(client) {
         super(client);
         this.readyTimestamp = Number(Date.now());
     }
-    async loadWebhooks(options) {
-        this.client.once('ready', async (client) => {
-            this.post(options.token);
-            setInterval(() => {
-                this.post(client.token);
-            }, 60000 * 30);
-            this.client.util.hasVoted = async (userId) => {
-                return !!(await (await fetch(`https://top.gg/api/bots/${this.client.user?.id}/check?userId=${userId}`, {
-                    headers: { 'Authorization': options.token, 'Content-Type': 'application/json' },
-                })).json()).voted;
-            };
-        });
-    }
-    async post(token) {
-        const guilds = await this.client.guilds.fetch();
-        this.client.stats.guildCount = this.client.guilds.cache.size;
-        this.client.stats.userCount = (await Promise.all(guilds.map(async (guild) => (await this.client.guilds.fetch(guild.id)).memberCount))).reduce((a, b) => (a += b));
-        this.client.stats.shardId = this.client.options.shards?.at(0) || 0;
-        this.client.stats.shardCount = this.client.options.shardCount || this.client.options.shards?.length || 1;
-        try {
-            new XernerxLog(this.client).info(`Posted Stats to Top.gg!`);
-            this.client.emit('webhookCreate', this.client, this.client.stats);
-            return await fetch(`https://top.gg/api/bots/stats`, {
-                method: 'POST',
-                headers: {
-                    'Authorization': token,
-                    'Content-Type': 'application/json',
-                },
-                body: JSON.stringify({
-                    server_count: this.client.stats.guildCount,
-                    shard_id: this.client.stats.shardId,
-                    shard_count: this.client.stats.shardCount,
-                }),
-            });
-        }
-        catch (error) {
-            new XernerxLog(this.client).error(`An error occurred while posting stats to Top.gg`, error);
-            return this.client.emit('webhookError', this.client, this.client.stats);
-        }
-    }
+    async loadIntegrations(options) { }
 }

package/dist/types/interfaces.d.ts

@@ -3,7 +3,7 @@ import { ActivityType, ChannelType, Collection, PresenceStatusData } from 'disco
 import CommandHandler from '../handlers/CommandHandler.js';
 import EventHandler from '../handlers/EventHandler.js';
 import InhibitorHandler from '../handlers/InhibitorHandler.js';
-import WebhookHandler from '../handlers/WebhookHandler.js';
+import IntegrationHandler from '../handlers/IntegrationHandler.js';
 import XernerxContextCommand from '../build/XernerxContextCommand.js';
 import MessageCommandBuilder from '../build/XernerxMessageCommand.js';
 import XernerxSlashCommand from '../build/XernerxSlashCommand.js';
@@ -53,7 +53,7 @@ export interface ModuleOptions {
     commandHandler: CommandHandler;
     eventHandler: EventHandler;
     inhibitorHandler: InhibitorHandler;
-    webhookHandler: WebhookHandler;
+    integrationHandler: IntegrationHandler;
     extensionHandler: ExtensionHandler;
 }
 export interface XernerxCommands {
@@ -233,7 +233,7 @@ export interface XernerxInhibitorOptions {
 }
 export interface PresenceOptions {
     text: string;
-    type?: ActivityType.Playing | ActivityType.Streaming | ActivityType.Listening | ActivityType.Watching | ActivityType.Competing;
+    type?: keyof typeof ActivityType;
     url: string;
     status?: PresenceStatusData;
     interval?: number;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "xernerx",
-	"version": "4.10.0",
+	"version": "4.12.0",
 	"description": "A bot framework for discord.js.",
 	"main": "dist/main.js",
 	"type": "module",
@@ -40,11 +40,11 @@
 		"url": "https://github.com/xernerx/xernerx/issues"
 	},
 	"dependencies": {
-		"dbl-sdk": "1.2.0",
+		"dbl-sdk": "^2.0.2",
 		"discord.js": "^14.14.1",
 		"dumfunctions": "2.1.2",
 		"xernerx-extension-builder": "0.0.16",
-		"zod": "3.22.2"
+		"zod": "^3.22.4"
 	},
 	"devDependencies": {
 		"prettier": "3.0.0",