move music manager to import, v7.7.0

7 files changed, 38 insertions, 34 deletions

diff --git a/dist/bot.js b/dist/bot.js
index 57fd132..78ede22 100644
--- a/dist/bot.js
+++ b/dist/bot.js
@@ -15,22 +15,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const config_json_1 = __importDefault(require("./config.json"));
 const discord_js_commando_1 = require("discord.js-commando");
 const path_1 = __importDefault(require("path"));
-const discord_js_1 = require("discord.js");
 const emoji_random_1 = __importDefault(require("emoji-random"));
-discord_js_1.Structures.extend('Guild', Guild => {
-    class MusicGuild extends Guild {
-        constructor(client, data) {
-            super(client, data);
-            this.musicData = {
-                queue: [],
-                isPlaying: false,
-                volume: 1,
-                songDispatcher: null
-            };
-        }
-    }
-    return MusicGuild;
-});
+require('./models/MusicGuild.js');
 const client = new discord_js_commando_1.CommandoClient({
     commandPrefix: 'uwu!',
     owner: '217348698294714370'
@@ -97,4 +83,4 @@ client.on('message', (msg) => __awaiter(void 0, void 0, void 0, function* () {
     }
 }));
 client.login(config_json_1.default['secret']);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYm90LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2JvdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7OztBQUFBLGdFQUFtQztBQUNuQyw2REFBcUQ7QUFFckQsZ0RBQXdCO0FBQ3hCLDJDQUF3QztBQUN4QyxnRUFBaUM7QUFDakMsdUJBQVUsQ0FBQyxNQUFNLENBQUMsT0FBTyxFQUFFLEtBQUssQ0FBQyxFQUFFO0lBQy9CLE1BQU0sVUFBVyxTQUFRLEtBQUs7UUFDMUIsWUFBWSxNQUFNLEVBQUUsSUFBSTtZQUNwQixLQUFLLENBQUMsTUFBTSxFQUFFLElBQUksQ0FBQyxDQUFDO1lBQ3BCLElBQUksQ0FBQyxTQUFTLEdBQUc7Z0JBQ2IsS0FBSyxFQUFFLEVBQUU7Z0JBQ1QsU0FBUyxFQUFFLEtBQUs7Z0JBQ2hCLE1BQU0sRUFBRSxDQUFDO2dCQUNULGNBQWMsRUFBRSxJQUFJO2FBQ3ZCLENBQUM7UUFDTixDQUFDO0tBQ0o7SUFDRCxPQUFPLFVBQVUsQ0FBQztBQUN0QixDQUFDLENBQUMsQ0FBQztBQUVILE1BQU0sTUFBTSxHQUFHLElBQUksb0NBQWMsQ0FBQztJQUM5QixhQUFhLEVBQUUsTUFBTTtJQUNyQixLQUFLLEVBQUUsb0JBQW9CO0NBQzlCLENBQUMsQ0FBQztBQUlILE1BQU0sQ0FBQyxRQUFRO0tBQ1Ysb0JBQW9CLEVBQUU7S0FDdEIsY0FBYyxDQUFDO0lBQ1osQ0FBQyxLQUFLLEVBQUUsbUJBQW1CLENBQUM7SUFDNUIsQ0FBQyxZQUFZLEVBQUUsMEJBQTBCLENBQUM7SUFDMUMsQ0FBQyxRQUFRLEVBQUUsc0JBQXNCLENBQUM7SUFDbEMsQ0FBQyxPQUFPLEVBQUUscUJBQXFCLENBQUM7SUFDaEMsQ0FBQyxNQUFNLEVBQUUsb0JBQW9CLENBQUM7SUFDOUIsQ0FBQyxPQUFPLEVBQUUscUJBQXFCLENBQUM7SUFDaEMsQ0FBQyxRQUFRLEVBQUUsc0JBQXNCLENBQUM7SUFDbEMsQ0FBQyxTQUFTLEVBQUUsd0JB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
\ No newline at end of file
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYm90LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2JvdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7OztBQUFBLGdFQUFtQztBQUNuQyw2REFBcUQ7QUFFckQsZ0RBQXdCO0FBQ3hCLGdFQUFpQztBQUNqQyxPQUFPLENBQUMsd0JBQXdCLENBQUMsQ0FBQTtBQUVqQyxNQUFNLE1BQU0sR0FBRyxJQUFJLG9DQUFjLENBQUM7SUFDOUIsYUFBYSxFQUFFLE1BQU07SUFDckIsS0FBSyxFQUFFLG9CQUFvQjtDQUM5QixDQUFDLENBQUM7QUFJSCxNQUFNLENBQUMsUUFBUTtLQUNWLG9CQUFvQixFQUFFO0tBQ3RCLGNBQWMsQ0FBQztJQUNaLENBQUMsS0FBSyxFQUFFLG1CQUFtQixDQUFDO0lBQzVCLENBQUMsWUFBWSxFQUFFLDBCQUEwQixDQUFDO0lBQzFDLENBQUMsUUFBUSxFQUFFLHNCQUFzQixDQUFDO0lBQ2xDLENBQUMsT0FBTyxFQUFFLHFCQUFxQixDQUFDO0lBQ2hDLENBQUMsTUFBTSxFQUFFLG9CQUFvQixDQUFDO0lBQzlCLENBQUMsT0FBTyxFQUFFLHFCQUFxQixDQUFDO0lBQ2hDLENBQUMsUUFBUSxFQUFFLHNCQUFzQixDQUFDO0lBQ2xDLENBQUMsU0FBUyxFQUFFLHdCQUF3QixDQUFDO0lBQ3JDLENBQUMsS0FBSyxFQUFFLG1CQUFtQixDQUFDO0lBQzVCLENBQUMsTUFBTSxFQUFFLG9CQUFvQixDQUFDO0NBQ2pDLENBQUM7S0FDRCxxQkFBcUIsRUFBRTtLQUN2Qix1QkFBdUIsQ0FBQztJQUNyQixJQUFJLEVBQUUsSUFBSTtDQUNiLENBQUM7S0FDRCxrQkFBa0IsQ0FBQyxjQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBRSxVQUFVLENBQUMsQ0FBQyxDQUFDO0FBRTFELE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFLEdBQUcsRUFBRTs7SUFFdEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxhQUFhLENBQUMs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
\ No newline at end of file
diff --git a/dist/config.json b/dist/config.json
index 014a3a8..3e5fa40 100644
--- a/dist/config.json
+++ b/dist/config.json
@@ -1,5 +1,5 @@
 {
     "secret": "Njk5NDczMjYzOTk4MjcxNDg5.XpU5oQ.btZuxVudhNllSQY6CxrXXtMJm9A",
     "yt-api-key": "AIzaSyCeG1lQAeInv4vjFv_eTL9IFAFNdQC9Nk8",
-    "version": "7.6.0"
+    "version": "7.7.0"
 }
diff --git a/dist/models/MusicGuild.js b/dist/models/MusicGuild.js
new file mode 100644
index 0000000..dac7ea5
--- /dev/null
+++ b/dist/models/MusicGuild.js
@@ -0,0 +1,17 @@
+"use strict";
+const discord_js_1 = require("discord.js");
+module.exports = discord_js_1.Structures.extend('Guild', Guild => {
+    class MusicGuild extends Guild {
+        constructor(client, data) {
+            super(client, data);
+            this.musicData = {
+                queue: [],
+                isPlaying: false,
+                volume: 1,
+                songDispatcher: null
+            };
+        }
+    }
+    return MusicGuild;
+});
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTXVzaWNHdWlsZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9tb2RlbHMvTXVzaWNHdWlsZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsMkNBQXdDO0FBQ3hDLGlCQUFTLHVCQUFVLENBQUMsTUFBTSxDQUFDLE9BQU8sRUFBRSxLQUFLLENBQUMsRUFBRTtJQUN4QyxNQUFNLFVBQVcsU0FBUSxLQUFLO1FBQzFCLFlBQVksTUFBTSxFQUFFLElBQUk7WUFDcEIsS0FBSyxDQUFDLE1BQU0sRUFBRSxJQUFJLENBQUMsQ0FBQztZQUNwQixJQUFJLENBQUMsU0FBUyxHQUFHO2dCQUNiLEtBQUssRUFBRSxFQUFFO2dCQUNULFNBQVMsRUFBRSxLQUFLO2dCQUNoQixNQUFNLEVBQUUsQ0FBQztnQkFDVCxjQUFjLEVBQUUsSUFBSTthQUN2QixDQUFDO1FBQ04sQ0FBQztLQUNKO0lBQ0QsT0FBTyxVQUFVLENBQUM7QUFDdEIsQ0FBQyxDQUFDLENBQUMifQ==
\ No newline at end of file
diff --git a/package.json b/package.json
index 41e28a0..8648198 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "package",
-  "version": "7.6.0",
+  "version": "7.7.0",
   "description": "A Discord bot that supports audio playback, fun commands, utilities, and soundsboard, and more to come!",
   "main": "./dist/app.js",
   "scripts": {
diff --git a/src/bot.ts b/src/bot.ts
index 8036f07..1a05f46 100644
--- a/src/bot.ts
+++ b/src/bot.ts
@@ -2,22 +2,8 @@ import config from './config.json';
 import { CommandoClient } from 'discord.js-commando';
 //import WS  from './ws/ws';
 import path from 'path';
-import { Structures } from 'discord.js';
 import emoji from 'emoji-random';
-Structures.extend('Guild', Guild => {
-    class MusicGuild extends Guild {
-        constructor(client, data) {
-            super(client, data);
-            this.musicData = {
-                queue: [],
-                isPlaying: false,
-                volume: 1,
-                songDispatcher: null
-            };
-        }
-    }
-    return MusicGuild;
-});
+require('./models/MusicGuild.js')
 
 const client = new CommandoClient({
     commandPrefix: 'uwu!',
diff --git a/src/config.json b/src/config.json
index cc997d9..d21d878 100644
--- a/src/config.json
+++ b/src/config.json
@@ -1,5 +1,5 @@
 {
     "secret":"Njk5NDczMjYzOTk4MjcxNDg5.XpU5oQ.btZuxVudhNllSQY6CxrXXtMJm9A",
     "yt-api-key":"AIzaSyCeG1lQAeInv4vjFv_eTL9IFAFNdQC9Nk8",
-    "version":"7.6.0"
+    "version":"7.7.0"
 }
\ No newline at end of file
diff --git a/src/models/MusicGuild.ts b/src/models/MusicGuild.ts
new file mode 100644
index 0000000..f425fe2
--- /dev/null
+++ b/src/models/MusicGuild.ts
@@ -0,0 +1,15 @@
+import { Structures } from 'discord.js';
+export = Structures.extend('Guild', Guild => {
+    class MusicGuild extends Guild {
+        constructor(client, data) {
+            super(client, data);
+            this.musicData = {
+                queue: [],
+                isPlaying: false,
+                volume: 1,
+                songDispatcher: null
+            };
+        }
+    }
+    return MusicGuild;
+});
\ No newline at end of file