Refactoring, moved/removed some files

.gitignore

@@ -3,5 +3,4 @@ package-lock.json
 old/
 databases/*
 config.json
-
 .vscode/

autocomplete/tag.js

@@ -3,12 +3,9 @@ const fs = require('fs')
 module.exports = {
   id: 'tag',
   async execute(interaction) {
-    // Auto complete the tag command
-    if (interaction.options.getSubcommand() === 'remove' || interaction.options.getSubcommand() === 'get') {
-      const tags = JSON.parse(fs.readFileSync('./databases/tags.json'))
-      let tagNames = Object.keys(tags)
-      tagNames = tagNames.filter(name => name.startsWith(interaction.options.getFocused()))
-      return interaction.respond(tagNames.map(tag => ({ name: tag, value: tag })))
-    }
+    if (interaction.options.getSubcommand() !== 'remove' || interaction.options.getSubcommand() !== 'get') return
+    const tags = JSON.parse(fs.readFileSync('./databases/tags.json'))
+    const tagNames = Object.keys(tags).filter(name => name.startsWith(interaction.options.getFocused()))
+    return interaction.respond(tagNames.map(tag => ({ name: tag, value: tag })))
   }
 }

commands/avatar.js

@@ -5,7 +5,7 @@ module.exports = {
   data: new SlashCommandBuilder()
     .setName('avatar')
     .setDescription("Get your or another user's avatar")
-    .addUserOption(option => option.setName('target').setDescription('User to show avatar for')),
+    .addUserOption(option => option.setName('target').setDescription('User to get avatar for')),
   async execute(interaction) {
     const user = interaction.options.getUser('target') || interaction.user
     const avatar = format => user.avatarURL({ format })

commands/define.js

@@ -1,14 +1,14 @@
 const { SlashCommandBuilder } = require('discord.js')
 const config = require('../utils/config')
-const axios = require('axios').default
+const { default: axios } = require('axios')
 
 module.exports = {
   data: new SlashCommandBuilder()
     .setName('define')
     .setDescription('Define a word with Urban Dictionary!')
     .addStringOption(option => option.setName('query').setDescription('Word to search for').setRequired(true)),
   async execute(interaction) {
-    // my api ;)
+    // https://guides.bludood.com/apis/urban-dictionary-api
     const api = 'https://urbanapi.up.railway.app'
     const query = interaction.options.getString('query')
     interaction.deferReply()

commands/yourmom.js

@@ -1,5 +1,5 @@
 const { SlashCommandBuilder } = require('discord.js')
-const axios = require('axios').default
+const { default: axios } = require('axios')
 const config = require('../utils/config')
 
 module.exports = {

index.js

@@ -1,7 +1,7 @@
 const { Client, Collection, GatewayIntentBits, Events } = require('discord.js')
 const fs = require('fs')
 const deploy = require('./utils/deploy')
-const bconsole = require('./console')
+const con = require('./utils/console')
 const { cacheAll } = require('./utils/reactionroles')
 const config = require('./utils/config')
 const { token } = config.get()
@@ -40,16 +40,14 @@ for (const eventFile of fs.readdirSync('./events').filter(file => file.endsWith(
   client.on(event.event, event.listener)
 }
 
-bconsole.init(process.argv[2])
+con.init()
 client.once(Events.ClientReady, async c => {
-  bconsole.motd(c.user.tag)
+  con.motd(c.user.tag)
   deploy(c.user.id)
   cacheAll(client)
 })
 
-client.on(Events.Error, error => {
-  console.log(error)
-})
+client.on(Events.Error, err => console.error(err))
 
 client.on(Events.InteractionCreate, async interaction => {
   if (interaction.isCommand()) {

package.json

@@ -5,7 +5,7 @@
   "main": "index.js",
   "scripts": {
     "start": "node index.js",
-    "setup": "node setup.js"
+    "setup": "node utils/setup.js"
   },
   "author": "BluDood",
   "license": "ISC",

utils/config.js

@@ -7,7 +7,7 @@ function checkConfig() {
     process.exit()
   }
   try {
-    JSON.parse(fs.readFileSync('./databases/reactionroles.json'))
+    JSON.parse(fs.readFileSync('./config.json'))
   } catch {
     console.log("Looks like your config file has been corrupted. Please regenerate it with 'npm run setup' and try again.")
     process.exit()

console.js → utils/console.js

@@ -1,5 +1,5 @@
 const chalk = require('chalk')
-const sleep = require('./utils/sleep')
+const sleep = require('./sleep')
 
 let minimal = false
 
@@ -19,6 +19,7 @@ async function motd(tag) {
   }
   tag && console.log(`Welcome to BluBot! Your bot (${tag}) is now running.`)
   console.log(minimal ? 'Press h and hit Enter for help.' : 'Press h for help.')
+  console.log(process.argv)
 }
 
 const commands = {
@@ -46,8 +47,8 @@ const commands = {
 }
 
 module.exports = {
-  init: arg => {
-    if (arg === '--minimal') minimal = true
+  init: () => {
+    if (process.argv[2] === '--minimal') minimal = true
     !minimal && console.clear()
     console.log(chalk.yellow('Starting BluBot...'))
     if (!minimal) {

utils/deploy.js

@@ -23,9 +23,6 @@ module.exports = id => {
 
   rest
     .put(Routes.applicationGuildCommands(id, guildId), { body: commands })
-    .then(() =>
-      // so it doesn't interfere with the console animation
-      sleep(1000).then(() => console.log('Successfully updated guild commands.'))
-    )
+    .then(() => sleep(1000).then(() => console.log('Successfully updated guild commands.')))
     .catch(console.error)
 }

utils/reactionroles.js

@@ -6,7 +6,8 @@ function ensureDatabase() {
   try {
     JSON.parse(fs.readFileSync('./databases/reactionroles.json'))
   } catch {
-    // show a warning first?
+    fs.writeFileSync('./databases/reactionroles.bak.json', fs.readFileSync('./databases/reactionroles.json'))
+    console.log('Your reaction role database was corrupted, so we had to reset it. You can find a backup in ./databases/reactionroles.bak.json')
     fs.writeFileSync('./databases/reactionroles.json', '[]')
   }
 }