Merge pull request #31 from warengroup/v0.2.4

Version 0.2.4

.github/workflows/docker-build.yml

@@ -0,0 +1,19 @@
+name: Docker Build
+
+on:
+  pull_request:
+
+jobs:
+  buildx:
+    name: Docker Build
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Setup Docker Buildx
+      uses: docker/setup-buildx-action@v1.5.1
+      id: buildx
+      with:
+        install: true
+    - name: Build
+      run: docker build . # will run buildx

Dockerfile

@@ -14,4 +14,6 @@ RUN npm install -g npm
 
 RUN npm install
 
+RUN npm run build
+
 CMD [ "npm", "start" ]

package.json

@@ -1,11 +1,12 @@
 {
   "name": "eximiabots-radiox",
-  "version": "0.2.0",
+  "version": "0.2.4",
   "description": "Internet Radio to your Discord guild",
   "main": "index.js",
   "scripts": {
     "build": "rimraf ./build && tsc",
-    "start": "npm run build && node build/index.js"
+    "start": "node build/index.js",
+    "start:dev": "npm run build && node build/index.js"
   },
   "repository": {
     "type": "git",
@@ -17,32 +18,32 @@
     "url": "https://github.com/warengroup/eximiabots-radiox/issues"
   },
   "dependencies": {
-    "@discordjs/opus": "^0.5.3",
+    "@discordjs/opus": "^0.6.0",
-    "@discordjs/voice": "^0.5.6",
+    "@discordjs/voice": "^0.6.0",
-    "@types/node": "^16.4.13",
-    "@types/ws": "^7.4.7",
     "discord-api-types": "^0.22.0",
-    "discord.js": "^13.0.1",
+    "discord.js": "^13.1.0",
     "dotenv": "^10.0.0",
     "libsodium-wrappers": "^0.7.9",
     "node-fetch": "^2.6.1",
-    "path": "^0.12.7",
+    "path": "^0.12.7"
-    "tsc-watch": "^4.4.0",
-    "typescript": "^4.3.5"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^4.29.0",
+    "@types/node": "^16.6.1",
-    "@typescript-eslint/parser": "^4.29.0",
+    "@types/ws": "^7.4.7",
+    "@typescript-eslint/eslint-plugin": "^4.29.2",
+    "@typescript-eslint/parser": "^4.29.2",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-prettier": "^3.4.0",
+    "eslint-plugin-prettier": "^3.4.1",
     "nodemon": "^2.0.12",
     "prettier": "^2.3.2",
     "rimraf": "^3.0.2",
-    "ts-node": "^10.1.0"
+    "ts-node": "^10.2.1",
+    "tsc-watch": "^4.5.0",
+    "typescript": "^4.3.5"
   },
   "engines": {
       "node": ">=16.6.0",
       "npm": ">=7.0.0"
   }
-}
+}

src/client/commands/help.js

@@ -27,8 +27,9 @@ module.exports = {
             msg.channel.send({ embeds: [embed] });
         } else {
             const categories = [];
+            let commandsToArray = Array.from(client.commands.values());
             for (let i = 0; i < client.commands.size; i++) {
-                if (!categories.includes(client.commands.array()[i].category)) categories.push(client.commands.array()[i].category);
+                if (!categories.includes(commandsToArray[i].category)) categories.push(commandsToArray[i].category);
             }
             let commands = '';
             for (let i = 0; i < categories.length; i++) {

src/client/commands/play.js

@@ -4,7 +4,6 @@ const {
     getVoiceConnection,
     joinVoiceChannel
 } = require("@discordjs/voice");
-const { createDiscordJSAdapter } = require("../utils/adapter");
 
 module.exports = {
     name: "play",
@@ -99,7 +98,7 @@ module.exports = {
                 joinVoiceChannel({
                     channelId: voiceChannel.id,
                     guildId: voiceChannel.guild.id,
-                    adapterCreator: createDiscordJSAdapter(voiceChannel)
+                    adapterCreator: voiceChannel.guild.voiceAdapterCreator
                 });
             construct.connection = connection;
             let date = new Date();

src/client/events/voiceStateUpdate.js

@@ -2,7 +2,6 @@ const {
     getVoiceConnection,
     joinVoiceChannel
 } = require("@discordjs/voice");
-const { createDiscordJSAdapter } = require("../utils/adapter");
 
 module.exports = {
     name: "voiceStateUpdate",
@@ -29,7 +28,7 @@ module.exports = {
                             radio.connection = joinVoiceChannel({
                                 channelId: oldState.channel.id,
                                 guildId: oldState.channel.guild.id,
-                                adapterCreator: createDiscordJSAdapter(oldState.channel)
+                                adapterCreator: oldState.channel.guild.voiceAdapterCreator
                             })
                             //radio.connection = await oldState.channel.join()
                         ),

src/client/messages.js

@@ -7,7 +7,7 @@ module.exports = {
     bugTitle: "Found a bug with %client.user.username%?",
     bugDescription: "Join the support server \n %client.config.supportGuild%",
     helpTitle: "%client.user.username% help:",
-    helpDescription: "%commands% \n %client.config.prefix%help <command> to see more information about a command.",
+    helpDescription: "%commands%",
     helpCommandTitle: "%client.config.prefix%%command.name% %command.usage%",
     helpCommandDescription: "%command.description% \n Command Alias: %command.alias%",
     inviteTitle: "Invite %client.user.username% to your Discord server!",

src/client/utils/adapter.ts

@@ -1,70 +0,0 @@
-import { DiscordGatewayAdapterCreator, DiscordGatewayAdapterLibraryMethods } from '@discordjs/voice';
-import { VoiceChannel, Snowflake, Client, Constants, WebSocketShard, Guild, StageChannel } from 'discord.js';
-import { GatewayVoiceServerUpdateDispatchData, GatewayVoiceStateUpdateDispatchData } from 'discord-api-types/v9';
-
-const adapters = new Map<Snowflake, DiscordGatewayAdapterLibraryMethods>();
-const trackedClients = new Set<Client>();
-
-/**
- * Tracks a Discord.js client, listening to VOICE_SERVER_UPDATE and VOICE_STATE_UPDATE events.
- * @param client - The Discord.js Client to track
- */
-function trackClient(client: Client) {
-	if (trackedClients.has(client)) return;
-	trackedClients.add(client);
-	client.ws.on(Constants.WSEvents.VOICE_SERVER_UPDATE, (payload: GatewayVoiceServerUpdateDispatchData) => {
-		adapters.get(payload.guild_id)?.onVoiceServerUpdate(payload);
-	});
-	client.ws.on(Constants.WSEvents.VOICE_STATE_UPDATE, (payload: GatewayVoiceStateUpdateDispatchData) => {
-		if (payload.guild_id && payload.session_id && payload.user_id === client.user?.id) {
-			adapters.get(payload.guild_id)?.onVoiceStateUpdate(payload);
-		}
-	});
-}
-
-const trackedGuilds = new Map<WebSocketShard, Set<Snowflake>>();
-
-function cleanupGuilds(shard: WebSocketShard) {
-	const guilds = trackedGuilds.get(shard);
-	if (guilds) {
-		for (const guildID of guilds.values()) {
-			adapters.get(guildID)?.destroy();
-		}
-	}
-}
-
-function trackGuild(guild: Guild) {
-	let guilds = trackedGuilds.get(guild.shard);
-	if (!guilds) {
-		const cleanup = () => cleanupGuilds(guild.shard);
-		guild.shard.on('close', cleanup);
-		guild.shard.on('destroyed', cleanup);
-		guilds = new Set();
-		trackedGuilds.set(guild.shard, guilds);
-	}
-	guilds.add(guild.id);
-}
-
-/**
- * Creates an adapter for a Voice Channel
- * @param channel - The channel to create the adapter for
- */
-export function createDiscordJSAdapter(channel: VoiceChannel | StageChannel): DiscordGatewayAdapterCreator {
-	return (methods) => {
-		adapters.set(channel.guild.id, methods);
-		trackClient(channel.client);
-		trackGuild(channel.guild);
-		return {
-			sendPayload(data) {
-				if (channel.guild.shard.status === Constants.Status.READY) {
-					channel.guild.shard.send(data);
-					return true;
-				}
-				return false;
-			},
-			destroy() {
-				return adapters.delete(channel.guild.id);
-			},
-		};
-	};
-}