Merge pull request #21 from EvarinDev/dev

...
EvarinDev · Nov 18, 2024 · aea536a · aea536a
2 parents 8fa79e1 + a0802d6
commit aea536a
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 52 deletions.
diff --git a/package.json b/package.json
@@ -14,23 +14,23 @@
     "build": "bun x tsc"
   },
   "devDependencies": {
-    "@eslint/js": "^9.12.0",
+    "@eslint/js": "^9.15.0",
     "@types/bun": "latest",
     "@types/common-tags": "^1.8.4",
-    "@types/ws": "^8.5.12",
-    "eslint": "^9.12.0",
-    "globals": "^15.11.0",
-    "typescript-eslint": "^8.8.1",
+    "@types/ws": "^8.5.13",
+    "eslint": "^9.15.0",
+    "globals": "^15.12.0",
+    "typescript-eslint": "^8.14.0",
     "@dep-tree/cli": "^0.23.0"
   },
   "peerDependencies": {
     "typescript": "^5.6.2"
   },
   "dependencies": {
-    "@prisma/client": "^5.20.0",
+    "@prisma/client": "^5.22.0",
     "ansi-colors": "^4.1.3",
     "common-tags": "^1.8.2",
-    "discord-api-types": "^0.37.101",
+    "discord-api-types": "^0.37.105",
     "discord-hybrid-sharding": "^2.2.3",
     "dotenv": "^16.4.5",
     "ioredis": "^5.4.1",

diff --git a/seyfert.config.js b/seyfert.config.js
@@ -5,7 +5,6 @@ const c = require("./dist/config.js");
 
 module.exports = config.bot({
     token: c.default.TOKEN ?? "",
-    debug: true,
     intents: ["Guilds", "GuildVoiceStates"],
     locations: {
         base: "src/client",

diff --git a/src/client/index.ts b/src/client/index.ts
@@ -7,8 +7,8 @@ Logger.customize(customLogger);
 client.start().then(() => {
 	client.uploadCommands().then(() => {
 		client.logger.info("Commands uploaded");
-	}).catch((err) => {
-		client.logger.error(err);
+	}).catch((err: Error) => {
+		client.logger.error(err.message);
 	});
 	//client.redis.connect();
 }).catch((err) => {

diff --git a/src/client/service/commands/BotinfoCommand.ts b/src/client/service/commands/BotinfoCommand.ts
@@ -53,7 +53,7 @@ const Botinfo: ServiceExecute = {
             const clusterData = await client.cluster.broadcastEval((c) => {
                 const users = () => {
                     let totalMembers = 0;
-                    for (const guild of c.cache.guilds.values()) {
+                    for (const guild of c.cache.guilds.values().filter((g) => g.memberCount)) {
                         totalMembers += guild.memberCount;
                     }
                     return totalMembers;

diff --git a/src/client/service/commands/MusicPlay.ts b/src/client/service/commands/MusicPlay.ts
@@ -92,7 +92,7 @@ const MusicPlay: ServiceExecute = {
 				{
 					const playlist = res.playlist;
 					await interaction.editOrReply({
-						components: [config.config.ads_component],
+						components: [config.config.ads_component || undefined],
 						embeds: [
 							{
 								author: {
@@ -129,15 +129,19 @@ const MusicPlay: ServiceExecute = {
 							},
 						],
 					});
-					player.queue.add(res.playlist.tracks);
-					if (!player.playing) await player.play();
+					if (!player.queue || !player.queue.current) {
+						player.queue.add(res.playlist.tracks)
+						await player.play()
+					} else {
+						player.queue.add(res.playlist.tracks)
+					}
 				}
 				break;
 			case "track":
 				{
 					const track = res.tracks[0];
 					await interaction.editOrReply({
-						components: [config.config.ads_component],
+						components: [config.config.ads_component || undefined],
 						embeds: [
 							{
 								author: {
@@ -174,8 +178,12 @@ const MusicPlay: ServiceExecute = {
 							},
 						],
 					});
-					player.queue.add(track);
-					if (!player.playing) await player.play();
+					if (!player.queue || !player.queue.current) {
+						player.queue.add(track)
+						await player.play()
+					} else {
+						player.queue.add(track)
+					}
 				}
 				break;
 			case "search": {
@@ -194,7 +202,7 @@ const MusicPlay: ServiceExecute = {
 				player.queue.add(track);
 
 				await interaction.editOrReply({
-					components: [config.config.ads_component],
+					components: [config.config.ads_component || undefined],
 					embeds: [
 						{
 							author: {
@@ -231,8 +239,9 @@ const MusicPlay: ServiceExecute = {
 						},
 					],
 				});
-
-				if (!player.playing) await player.play();
+				if (!player.queue || !player.queue.current) {
+					await player.play()
+				}
 				break;
 			}
 		}

diff --git a/src/client/structures/utils/Client.ts b/src/client/structures/utils/Client.ts
@@ -18,28 +18,6 @@ export function UpdateStatus(client: UsingClient) {
                         uptime: data.stats.uptime,
                     };
                 }),
-                cluster: client.cluster.broadcastEval((c) => {
-                    const guilds = c.cache.guilds.count();
-                    const client_id = c.me.id;
-                    const memory = process.memoryUsage().heapUsed;
-                    const ping = c.gateway.latency;
-                    const uptime = c.uptime;
-                    return {
-                        cluster_id: c.cluster.id,
-                        memory,
-                        guilds,
-                        users: (() => {
-                            let totalMembers = 0;
-                            for (const guild of c.cache.guilds.values()) {
-                                totalMembers += guild.memberCount;
-                            }
-                            return totalMembers;
-                        })(),
-                        client_id,
-                        ping,
-                        uptime,
-                    };
-                }),
             }),
         ).then((d) => {
 			return d

diff --git a/src/config.ts b/src/config.ts
@@ -13,10 +13,10 @@ const config: { [key: string]: IConfig } = {
 		},
 		Lavalink: [
 			{
-				identifier: "Jirayu.net[0] [recommend]",
-				host: "lavalink.jirayu.net",
-				password: "youshallnotpass",
-				port: 13592,
+				identifier: "Anantix [recommend]",
+				host: "lavalink.anantix.network",
+				password: "pg6|(}7fuD_:7d#QQq?9",
+				port: 2335,
 				playback: true,
 				search: true,
 				version: "v4",
@@ -33,12 +33,12 @@ const config: { [key: string]: IConfig } = {
 		},
 		Lavalink: [
 			{
-				identifier: "Jirayu.net[1]",
-				host: "lavalink.jirayu.net",
-				password: "youshallnotpass",
-				port: 13592,
-				playback: false,
-				search: false,
+				identifier: "Anantix [recommend]",
+				host: "lavalink.anantix.network",
+				password: "pg6|(}7fuD_:7d#QQq?9",
+				port: 2335,
+				playback: true,
+				search: true,
 				version: "v4",
 			},
 		],