diff options
| -rw-r--r-- | bot.js | 124 | ||||
| -rw-r--r-- | bot.ts | 64 | ||||
| -rw-r--r-- | commands/utility/help.cjs (renamed from commands/utility/help.js) | 0 | ||||
| -rw-r--r-- | commands/utility/uptime.cjs (renamed from commands/utility/uptime.js) | 0 | ||||
| -rw-r--r-- | commands/voice/join.cjs (renamed from commands/voice/join.js) | 0 | ||||
| -rw-r--r-- | commands/voice/leave.cjs (renamed from commands/voice/leave.js) | 0 | ||||
| -rw-r--r-- | commands/voice/loopc.js (renamed from commands/voice/loop.js) | 0 | ||||
| -rw-r--r-- | commands/voice/pause.cjs (renamed from commands/voice/pause.js) | 0 | ||||
| -rw-r--r-- | commands/voice/play.cjs (renamed from commands/voice/play.js) | 0 | ||||
| -rw-r--r-- | commands/voice/queuec.js (renamed from commands/voice/queue.js) | 0 | ||||
| -rw-r--r-- | commands/voice/remove.cjs (renamed from commands/voice/remove.js) | 0 | ||||
| -rw-r--r-- | commands/voice/resume.cjs (renamed from commands/voice/resume.js) | 0 | ||||
| -rw-r--r-- | commands/voice/shuffle.cjs (renamed from commands/voice/shuffle.js) | 0 | ||||
| -rw-r--r-- | commands/voice/skip.cjs (renamed from commands/voice/skip.js) | 0 | ||||
| -rw-r--r-- | commands/voice/skipallc.js (renamed from commands/voice/skipall.js) | 0 | ||||
| -rw-r--r-- | commands/voice/skipto.cjs (renamed from commands/voice/skipto.js) | 0 | ||||
| -rw-r--r-- | commands/voice/volume.cjs (renamed from commands/voice/volume.js) | 0 | ||||
| -rw-r--r-- | package.json | 1 | ||||
| -rw-r--r-- | tsconfig.json | 67 |
19 files changed, 222 insertions, 34 deletions
@@ -1,64 +1,120 @@ -const config = require('./config.json'); -const { CommandoClient } = require('discord.js-commando'); -const path = require('path'); -const { Structures } = require('discord.js'); -Structures.extend('Guild', Guild => { - class MusicGuild extends Guild { - constructor(client, data) { - super(client, data); - this.musicData = { +"use strict"; +var __extends = (this && this.__extends) || (function () { + var extendStatics = function (d, b) { + extendStatics = Object.setPrototypeOf || + ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) || + function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; }; + return extendStatics(d, b); + }; + return function (d, b) { + extendStatics(d, b); + function __() { this.constructor = d; } + d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); + }; +})(); +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +var __generator = (this && this.__generator) || function (thisArg, body) { + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g; + return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; + function verb(n) { return function (v) { return step([n, v]); }; } + function step(op) { + if (f) throw new TypeError("Generator is already executing."); + while (_) try { + if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t; + if (y = 0, t) op = [op[0] & 2, t.value]; + switch (op[0]) { + case 0: case 1: t = op; break; + case 4: _.label++; return { value: op[1], done: false }; + case 5: _.label++; y = op[1]; op = [0]; continue; + case 7: op = _.ops.pop(); _.trys.pop(); continue; + default: + if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } + if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } + if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } + if (t[2]) _.ops.pop(); + _.trys.pop(); continue; + } + op = body.call(thisArg, _); + } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } + if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true }; + } +}; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; +Object.defineProperty(exports, "__esModule", { value: true }); +var config = require('./config.json'); +var CommandoClient = require('discord.js-commando').CommandoClient; +var path_1 = __importDefault(require("path")); +var Structures = require('discord.js').Structures; +Structures.extend('Guild', function (Guild) { + var MusicGuild = /** @class */ (function (_super) { + __extends(MusicGuild, _super); + function MusicGuild(client, data) { + var _this = _super.call(this, client, data) || this; + _this.musicData = { queue: [], isPlaying: false, volume: 1, songDispatcher: null }; + return _this; } - } + return MusicGuild; + }(Guild)); return MusicGuild; }); - -const client = new CommandoClient({ +var client = new CommandoClient({ commandPrefix: 'msb!', owner: '217348698294714370' }); - client.registry .registerDefaultTypes() .registerGroups([ - ['voice', 'Voice Command Group'], - ['utility', 'Utility Command Group'] - ]) + ['voice', 'Voice Command Group'], + ['utility', 'Utility Command Group'] +]) .registerDefaultGroups() .registerDefaultCommands({ - help: false - }) - .registerCommandsIn(path.join(__dirname, 'commands')); - -client.once('ready', () => { - console.log(`Started bot: ${client.user.tag} (ID: ${client.user.id})\nCurrently running on ${client.guilds.cache.size} server(s).`); + help: false +}) + .registerCommandsIn(path_1.default.join(__dirname, 'commands')); +client.once('ready', function () { + console.log("Started bot: " + client.user.tag + " (ID: " + client.user.id + ")\nCurrently running on " + client.guilds.cache.size + " server(s)."); client.user.setActivity('msb!h | v1.1.1', { type: 'LISTENING' }); //client.channels.cache.get('600773421525237781').send('bot started up'); }); - client.on('error', console.error); client.on('debug', console.debug); - -client.on('message', async msg => { - var msgContent = msg.content.toLowerCase(); +client.on('message', function (msg) { return __awaiter(void 0, void 0, void 0, function () { function prefixCheck() { if (msgContent.startsWith('msb!')) { return true; } } - if (prefixCheck()) { - if (msg.channel.type == 'dm') { - console.log(msg.author.tag, 'says', msgContent, 'in a DM'); - } else { - console.log(msg.member.user.tag, 'says', msgContent, 'in #' + msg.channel.name); + var msgContent; + return __generator(this, function (_a) { + msgContent = msg.content.toLowerCase(); + if (prefixCheck()) { + if (msg.channel.type == 'dm') { + console.log(msg.author.tag, 'says', msgContent, 'in a DM'); + } + else { + console.log(msg.member.user.tag, 'says', msgContent, 'in #' + msg.channel.name); + } } - } -}); - + return [2 /*return*/]; + }); +}); }); client.login(config['secret']); @@ -0,0 +1,64 @@ +const config = require('./config.json'); +const { CommandoClient } = require('discord.js-commando'); +import path from 'path'; +const { Structures } = require('discord.js'); +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; +}); + +const client = new CommandoClient({ + commandPrefix: 'msb!', + owner: '217348698294714370' +}); + +client.registry + .registerDefaultTypes() + .registerGroups([ + ['voice', 'Voice Command Group'], + ['utility', 'Utility Command Group'] + ]) + .registerDefaultGroups() + .registerDefaultCommands({ + help: false + }) + .registerCommandsIn(path.join(__dirname, 'commands')); + +client.once('ready', () => { + console.log(`Started bot: ${client.user.tag} (ID: ${client.user.id})\nCurrently running on ${client.guilds.cache.size} server(s).`); + client.user.setActivity('msb!h | v1.1.1', { + type: 'LISTENING' + }); + //client.channels.cache.get('600773421525237781').send('bot started up'); +}); + +client.on('error', console.error); +client.on('debug', console.debug); + +client.on('message', async msg => { + var msgContent = msg.content.toLowerCase(); + function prefixCheck() { + if (msgContent.startsWith('msb!')) { + return true; + } + } + if (prefixCheck()) { + if (msg.channel.type == 'dm') { + console.log(msg.author.tag, 'says', msgContent, 'in a DM'); + } else { + console.log(msg.member.user.tag, 'says', msgContent, 'in #' + msg.channel.name); + } + } +}); + +client.login(config['secret']); diff --git a/commands/utility/help.js b/commands/utility/help.cjs index 5b7174f..5b7174f 100644 --- a/commands/utility/help.js +++ b/commands/utility/help.cjs diff --git a/commands/utility/uptime.js b/commands/utility/uptime.cjs index 34b073c..34b073c 100644 --- a/commands/utility/uptime.js +++ b/commands/utility/uptime.cjs diff --git a/commands/voice/join.js b/commands/voice/join.cjs index cac5e50..cac5e50 100644 --- a/commands/voice/join.js +++ b/commands/voice/join.cjs diff --git a/commands/voice/leave.js b/commands/voice/leave.cjs index ba48594..ba48594 100644 --- a/commands/voice/leave.js +++ b/commands/voice/leave.cjs diff --git a/commands/voice/loop.js b/commands/voice/loopc.js index 507b424..507b424 100644 --- a/commands/voice/loop.js +++ b/commands/voice/loopc.js diff --git a/commands/voice/pause.js b/commands/voice/pause.cjs index 20d4254..20d4254 100644 --- a/commands/voice/pause.js +++ b/commands/voice/pause.cjs diff --git a/commands/voice/play.js b/commands/voice/play.cjs index 8797593..8797593 100644 --- a/commands/voice/play.js +++ b/commands/voice/play.cjs diff --git a/commands/voice/queue.js b/commands/voice/queuec.js index ac9c236..ac9c236 100644 --- a/commands/voice/queue.js +++ b/commands/voice/queuec.js diff --git a/commands/voice/remove.js b/commands/voice/remove.cjs index edcb948..edcb948 100644 --- a/commands/voice/remove.js +++ b/commands/voice/remove.cjs diff --git a/commands/voice/resume.js b/commands/voice/resume.cjs index a3f32ce..a3f32ce 100644 --- a/commands/voice/resume.js +++ b/commands/voice/resume.cjs diff --git a/commands/voice/shuffle.js b/commands/voice/shuffle.cjs index a6251ca..a6251ca 100644 --- a/commands/voice/shuffle.js +++ b/commands/voice/shuffle.cjs diff --git a/commands/voice/skip.js b/commands/voice/skip.cjs index 9cac14c..9cac14c 100644 --- a/commands/voice/skip.js +++ b/commands/voice/skip.cjs diff --git a/commands/voice/skipall.js b/commands/voice/skipallc.js index 32800b1..32800b1 100644 --- a/commands/voice/skipall.js +++ b/commands/voice/skipallc.js diff --git a/commands/voice/skipto.js b/commands/voice/skipto.cjs index aa27add..aa27add 100644 --- a/commands/voice/skipto.js +++ b/commands/voice/skipto.cjs diff --git a/commands/voice/volume.js b/commands/voice/volume.cjs index 0a59a68..0a59a68 100644 --- a/commands/voice/volume.js +++ b/commands/voice/volume.cjs diff --git a/package.json b/package.json index cde9cdb..1321c23 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,7 @@ "scripts": { "test": "echo \"Error: no test specified\" && exit 1" }, + "type": "module", "author": "sin", "license": "MIT", "dependencies": { diff --git a/tsconfig.json b/tsconfig.json new file mode 100644 index 0000000..fb6a9cb --- /dev/null +++ b/tsconfig.json @@ -0,0 +1,67 @@ +{ + "compilerOptions": { + /* Basic Options */ + // "incremental": true, /* Enable incremental compilation */ + "target": "es5", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */ + "module": "es2015", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */ + // "lib": [], /* Specify library files to be included in the compilation. */ + // "allowJs": true, /* Allow javascript files to be compiled. */ + // "checkJs": true, /* Report errors in .js files. */ + // "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */ + // "declaration": true, /* Generates corresponding '.d.ts' file. */ + // "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */ + // "sourceMap": true, /* Generates corresponding '.map' file. */ + // "outFile": "./", /* Concatenate and emit output to single file. */ + // "outDir": "./", /* Redirect output structure to the directory. */ + // "rootDir": "./", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */ + // "composite": true, /* Enable project compilation */ + // "tsBuildInfoFile": "./", /* Specify file to store incremental compilation information */ + // "removeComments": true, /* Do not emit comments to output. */ + // "noEmit": true, /* Do not emit outputs. */ + // "importHelpers": true, /* Import emit helpers from 'tslib'. */ + // "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */ + // "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */ + + /* Strict Type-Checking Options */ + "strict": true, /* Enable all strict type-checking options. */ + // "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */ + // "strictNullChecks": true, /* Enable strict null checks. */ + // "strictFunctionTypes": true, /* Enable strict checking of function types. */ + // "strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */ + // "strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */ + // "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */ + // "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */ + + /* Additional Checks */ + // "noUnusedLocals": true, /* Report errors on unused locals. */ + // "noUnusedParameters": true, /* Report errors on unused parameters. */ + // "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */ + // "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */ + + /* Module Resolution Options */ + // "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */ + // "baseUrl": "./", /* Base directory to resolve non-absolute module names. */ + // "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */ + // "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */ + // "typeRoots": [], /* List of folders to include type definitions from. */ + // "types": [], /* Type declaration files to be included in compilation. */ + // "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */ + "esModuleInterop": true, /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */ + // "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */ + // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ + + /* Source Map Options */ + // "sourceRoot": "", /* Specify the location where debugger should locate TypeScript files instead of source locations. */ + // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */ + // "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */ + // "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */ + + /* Experimental Options */ + // "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */ + // "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */ + + /* Advanced Options */ + "resolveJsonModule": true, /* Include modules imported with '.json' extension */ + "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */ + } +} |