feat: TypeScript rewrite (#21)

.env.example

@@ -0,0 +1,4 @@
+TOKEN=
+MONGODB_URI=
+DBL_TOKEN=
+

.gitignore

@@ -1,3 +1,5 @@
 node_modules/
+dist/
+yarn-error.log
 .env
 json.sqlite

package.json

@@ -1,55 +1,36 @@
 {
-  "name": "@minota/wushi",
-  "version": "2.2.0",
-  "description": "wushi is a social discord bot which helps spice up communities.",
+  "name": "wushi",
+  "version": "3.0.0",
+  "description": "wushi is a social bot written in TypeScript.",
   "main": "src/bot.js",
-  "scripts": {
-    "start": "npx nodemon --exec babel-node src/bot.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/xMinota/wushi.git"
-  },
-  "keywords": [
-    "wushi",
-    "discord",
-    "typescript",
-    "chatbot",
-    "chat",
-    "bot"
-  ],
-  "author": "Minota",
+  "repository": "https://github.com/wushi-bot/wushi",
+  "author": "Minota <[email protected]>",
   "license": "GPL-3.0",
-  "bugs": {
-    "url": "https://github.com/xMinota/wushi/issues"
-  },
-  "homepage": "https://github.com/xMinota/wushi#readme",
+  "private": false,
   "dependencies": {
     "@aero/centra": "^1.0.6",
-    "@babel/core": "^7.11.6",
-    "@babel/node": "^7.10.5",
-    "@babel/preset-env": "^7.11.5",
+    "@types/ws": "^7.4.5",
     "axios": "^0.21.1",
     "body-parser": "^1.19.0",
-    "bufferutil": "^4.0.3",
-    "canvas": "^2.6.1",
-    "canvas-constructor": "^3.2.0",
-    "chalk": "^4.1.0",
+    "canvas": "^2.8.0",
+    "canvas-constructor": "3.2.0",
+    "chalk": "^4.1.1",
     "dblapi.js": "^2.4.1",
-    "discord.js-light": "github:timotejroiko/discord.js-light",
-    "dotenv": "^8.2.0",
-    "erlpack": "github:discord/erlpack",
+    "discord.js": "^13.0.0-dev.03d3a5cdde5492433d27bbfe46afe0ebf2de5904",
+    "dotenv": "^10.0.0",
     "express": "^4.17.1",
     "moment": "^2.29.1",
     "moment-duration-format": "^2.3.2",
     "ms": "^2.1.3",
+    "path": "^0.12.7",
     "quick.db": "^7.1.3",
     "romanize-number": "^1.0.1",
-    "sodium": "^3.0.2",
-    "timeago.js": "^4.0.2",
     "tinycolor2": "^1.4.2",
-    "urban-dictionary": "^3.0.0",
-    "utf-8-validate": "^5.0.4",
-    "zlib-sync": "^0.1.7"
+    "urban-dictionary": "^3.0.1"
+  },
+  "devDependencies": {
+    "@types/node": "^15.12.5",
+    "mongoose": "^5.13.2",
+    "typescript": "^4.3.4"
   }
 }

src/bot.ts

@@ -0,0 +1,19 @@
+import Client from './classes/Client'
+import Database from './database'
+import 'dotenv/config'
+import { runPetChecks, runUnvoteChecks } from './utils/economy'
+
+const intents = ['GUILDS', 'GUILD_MESSAGES', 'GUILD_MEMBERS', 'GUILD_PRESENCES']
+
+const self = new Client({
+  fetchAllMembers: true,
+  intents: intents
+})
+
+new Database()
+
+runPetChecks(self)
+runUnvoteChecks(self)
+
+self.load()
+self.start(process.env.TOKEN!!)

src/structs/client.js → src/classes/Client.ts

@@ -1,27 +1,37 @@
-import { Client, Collection } from 'discord.js-light'
-import { readdir, readdirSync } from 'fs'
+import { Client, Collection } from 'discord.js'
+//import TwitchMonitor from './TwitchMonitor'
+import Logger from '../utils/logger'
+import { readdirSync, readdir } from 'fs'
 import path from 'path'
-import { Logger } from '../utils/logger'
 
-import 'dotenv/config'
+export default class Bot extends Client {
 
-class Bot extends Client {
-  constructor (options) {
+  owners: array
+  commands: any
+  aliases: any
+  cooldowns: any
+  logger: Logger
+  version: string
+
+  constructor (options: any) {
     super(options)
-    this.logger = new Logger()
     this.commands = new Collection()
     this.aliases = new Collection()
     this.cooldowns = new Collection()
-    this.version = '2.2.0'
+    this.logger = new Logger()
+    this.version = '3.0.0'
     this.owners = ['488786712206770196']
   }
 
-  login (token) {
+  start (token: string) {
     super.login(token)
+    this.logger.log('info', 'Logged into the bot.')
+    //const Twitch = new TwitchMonitor(this)
+    //Twitch.start()
     return this
   }
 
-  loadCommands () {
+  load() {
     this.logger.log('info', 'Beginning to check for commands...')
     const folders = readdirSync(path.join(__dirname, '..', '/commands/'), { withFileTypes: true })
       .filter(dirent => dirent.isDirectory())
@@ -34,30 +44,24 @@ class Bot extends Client {
           command.conf.aliases.forEach(alias => {
             this.aliases.set(alias, command.conf.name)
           })
-          this.logger.log('runner', `Registered command ${cmd}`)
+          this.logger.log('info', `Registered command ${cmd}`)
         } catch (e) {
-          this.logger.log('runner', `Skipped command because it encountered an error: ${e}`)
+          this.logger.log('error', `Skipped command because it encountered an error: ${e}`)
         }
       }
     }
-    this.logger.log('info', 'All possible commands have been added.')
-  }
-
-  loadEvents () {
     this.logger.log('info', 'Beginning to check for events...')
     readdir(path.join(__dirname, '..', '/events/'), (err, files) => {
       if (err) return console.error(err)
       files.forEach(file => {
         if (file.endsWith('.js')) {
           const event = require(path.join(__dirname, '..', `/events/${file}`))
           const eventName = file.split('.')[0]
-          this.logger.log('runner', `Added event: ${eventName}`)
+          this.logger.log('info', `Added event: ${eventName}`)
           super.on(eventName, (...args) => event.run(this, ...args))
         }
       })
     })
-    this.logger.log('info', 'All possible events have been added.')
+    this.logger.log('info', 'All possible events & commands have been added.')
   }
-}
-
-module.exports = Bot
+}

src/structs/command.js → src/classes/Command.ts

@@ -1,17 +1,20 @@
-class Command {
+import Client from "../classes/Client"
+
+export default class Command {
+  conf: any
+  client: Client
   constructor (client, {
-    name = null,
+    name = 'none',
     description = 'No description provided.',
     category = 'Miscellaneous',
     usage = 'No usage provided.',
     enabled = true,
     guildOnly = false,
-    aliases = [],
+    aliases = ['none'],
     subcommands = [],
-    cooldown = false
+    cooldown = -1
   }) {
     this.client = client
     this.conf = { name, description, category, usage, enabled, guildOnly, aliases, cooldown, subcommands }
   }
-}
-module.exports = Command
+}

src/commands/Admin/evaluate.js → src/commands/Admin/evaluate.ts

@@ -1,4 +1,4 @@
-import Command from '../../structs/command'
+import Command from '../../classes/Command'
 
 const clean = text => {
   if (typeof (text) === 'string') {
@@ -12,9 +12,9 @@ class EvalCommand extends Command {
   constructor (client) {
     super(client, {
       name: 'evaluate',
-      description: '...',
+      description: 'Evaluate a JavaScript statement',
       category: 'Admin',
-      aliases: ['eval', 'e'],
+      aliases: ['eval', 'e', 'ev'],
       usage: 'eval <statement>',
       cooldown: 1
     })

src/commands/Configuration/admin-role.js → src/commands/Configuration/admin-role.ts

@@ -1,6 +1,6 @@
-import Command from '../../structs/command'
-import { Message, MessageEmbed } from 'discord.js-light'
-import utils from '../../utils/utils'
+import Command from '../../classes/Command'
+import { MessageEmbed } from 'discord.js'
+import { getPrefix, removeA } from '../../utils/utils'
 import db from 'quick.db'
 const cfg = new db.table('config') 
 
@@ -38,15 +38,15 @@ class AdminRoleCommand extends Command {
       } else {
         embed.addField('<:info:820704940682510449> Admins', `\`\`\`${roles}\`\`\``)
       }
-      embed.addField('<:role:821012711403683841> How to?', `Add an Admin via \`${utils.getPrefix(msg.guild.id)}adminrole @Admin\`.`)
-      msg.reply(embed)
+      embed.addField('<:role:821012711403683841> How to?', `Add an Admin via \`${getPrefix(msg.guild.id)}adminrole @Admin\`.`)
+      msg.reply({ embeds: [embed] })
       return true
     } else {
       if (!msg.mentions.roles.first()) {
         const embed = new MessageEmbed()
           .setColor(color)
           .addField('<:role:821012711403683841> Role not found', 'You haven\'t inserted a valid role.')
-        msg.reply(embed)
+        msg.reply({ embeds: [embed] })
         return false
       } else {
         const role = msg.mentions.roles.first()
@@ -56,15 +56,15 @@ class AdminRoleCommand extends Command {
           const embed = new MessageEmbed()
             .setColor(color)
             .addField(`<:check:820704989282172960> Success!`, `Successfully added <@&${role.id}> to the Admin Roles.`)
-          msg.reply(embed)
+          msg.reply({ embeds: [embed] })
           return true
-        } else {
-          let i = utils.removeA(admins, role.id)
+        } else { // @ts-ignore
+          let i = removeA(admins, role.id) 
           cfg.set(`${msg.guild.id}.admins`, i)
           const embed = new MessageEmbed()
             .setColor(color)
             .addField(`<:check:820704989282172960> Success!`, `Successfully removed <@&${role.id}> from the Admin Roles.`)
-          msg.reply(embed)
+          msg.reply({ embeds: [embed] })
           return true
         }
       }

src/commands/Configuration/config.js → src/commands/Configuration/config.ts

@@ -1,6 +1,6 @@
-import { MessageEmbed } from 'discord.js-light'
-import Command from '../../structs/command'
-import utils from '../../utils/utils'
+import { MessageEmbed } from 'discord.js'
+import Command from '../../classes/Command'
+import { getPrefix } from '../../utils/utils'
 import db from 'quick.db'
 const cfg = new db.table('config')
 
@@ -18,7 +18,6 @@ class ConfigCommand extends Command {
 
   async run (bot, msg, args) {
     const admins = cfg.get(`${msg.guild.id}.admins`) || []
-    const mods = cfg.get(`${msg.guild.id}.mods`) || []
 
     const disabledCommands = cfg.get(`${msg.guild.id}.disabledCommands`) || []
     const disabledModules = cfg.get(`${msg.guild.id}.disabledModules`) || []
@@ -27,7 +26,7 @@ class ConfigCommand extends Command {
     const embed = new MessageEmbed()
       .setColor(color)
       .setTitle(`<:info:820704940682510449> ${msg.guild.name}'s Configuration`)
-      .addField('<:slash:820751995824504913> Prefix', `The prefix for this server is \`${utils.getPrefix(msg.guild.id)}\``)
+      .addField('<:slash:820751995824504913> Prefix', `The prefix for this server is \`${getPrefix(msg.guild.id)}\``)
 
     if (disabledModules.length === 0) {
       embed.addField(':newspaper: Disabled Modules', `\`\`\`None\`\`\``)
@@ -51,17 +50,8 @@ class ConfigCommand extends Command {
       })
       embed.addField('<:role:821012711403683841> Admins', `${adminRoles.join(', ')}`)
     }
-    if (mods.length === 0) {
-      embed.addField('<:role:821012711403683841> Mods', `\`\`\`None\`\`\``)
-    } else {
-      let modRoles = []
-      mods.forEach(mod => {
-        modRoles.push(`<@&${mod}>`)
-      })
-      embed.addField('<:role:821012711403683841> Mods', `${modRoles.join(', ')}`)
-    }
 
-    msg.reply(embed)
+    msg.reply({ embeds: [embed] })
     return true
   }
 }

src/commands/Configuration/embed-color.js → src/commands/Configuration/embed-color.ts

@@ -1,6 +1,6 @@
-import Command from '../../structs/command'
+import Command from '../../classes/Command'
 import col from 'tinycolor2'
-import { MessageEmbed } from 'discord.js-light'
+import { MessageEmbed } from 'discord.js'
 import db from 'quick.db'
 
 const cfg = new db.table('config')
@@ -25,7 +25,7 @@ class EmbedColorCommand extends Command {
     const embed = new MessageEmbed()
       .setColor(color.toHex())
       .addField('<:check:820704989282172960> Success!', `Successfully set your embed color to **#${color.toHex()}**.`)
-    msg.reply(embed)
+    msg.reply({ embeds: [embed] })
     return true
   }
 }