Merge pull request #10 from ephemeralrogue/update-dependencies

updated dependencies

Author: ephemeralrogue

CHANGELOG.md

@@ -1,5 +1,12 @@
 # changelog
 
+## release 2.0.0 (12.10.24)
+1. improved docker implementation
+2. updated dependencies
+    - updated sapphire framework
+    - rolled events folder into sapphire system
+    - updated `ClientReady` event to be ready by sapphire
+
 ## release (10.11.23)
 1. foregoing semver updates per template use
 2. created pr-prep yaml for github actions

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "spades",
   "description": "discord.js bot template",
-  "version": "1.0.1",
+  "version": "2.0.0",
   "main": "src/app/app.js",
   "type": "module",
   "author": "nonsensetwice",
@@ -26,7 +26,7 @@
   },
   "homepage": "https://github.com/nonsensetwice/spades#readme",
   "dependencies": {
-    "@sapphire/framework": "^4.6.0",
+    "@sapphire/framework": "^5.3.1",
     "@sentry/integrations": "^7.70.0",
     "@sentry/node": "^7.119.2",
     "@sentry/tracing": "^7.70.0",
@@ -36,6 +36,9 @@
     "pino": "^8.15.1",
     "pino-sentry-transport": "^1.0.5"
   },
+  "overrides": {
+    "whatwg-url": "^14.0.0"
+  },
   "devDependencies": {
     "eslint": "^9.13.0",
     "globals": "^15.11.0"

package.json

@@ -1,20 +1,17 @@
-import { readdir } from 'fs/promises';
-import { join } from 'path';
 import {
 	GatewayIntentBits,
 	Partials
 } from 'discord.js';
-import { SapphireClient } from '@sapphire/framework';
+import OverloadClient from './utils/OverloadClient.js';
 import Log from './utils/Log.js';
 import { init, Integrations } from '@sentry/node';
 import { RewriteFrames } from '@sentry/integrations';
 
 initializeSentryIO();
 
 const client = initializeClient();
-initializeEvents();
 
-client.login(process.env.DISCORD_BOT_TOKEN).catch(Log.error);
+client.login(process.env.DISCORD_BOT_TOKEN).catch(error => Log.error(error));
 
 function initializeClient() {
 	const clientOptions = {
@@ -37,35 +34,7 @@ function initializeClient() {
 			Partials.User
 		],
 	};
-	return new SapphireClient(clientOptions);
-}
-
-// the events handler
-async function initializeEvents() {
-	
-	client.on('error', Log.error);
-
-	const eventsPath = new URL('./events', import.meta.url);
-	const eventsArray = await readdir(eventsPath);
-	const eventFiles = eventsArray.filter(file => file.endsWith('.js'));
-	// client.events = new Collection();
-	eventFiles.forEach(async function(file) {
-		const filePath = join(eventsPath.toString(), file);
-		const eventModule = await import(filePath);
-		const event = await eventModule.default;
-		// client.events.set(event.name, event);
-		try {
-			if (event.once) {
-				client.once(event.name, (...args) => event.execute(...args, client));
-			} else {
-				client.on(event.name, (...args) => event.execute(...args, client));
-			}
-		} catch (e) {
-			// eslint-disable-next-line no-console
-			console.error('events error:', e);
-		}
-	});
-	return client.events;
+	return new OverloadClient(clientOptions);
 }
 
 // Sentry setup