Fix alias bug and begin porting process.

retrixe · Sep 2, 2018 · f603b5f · f603b5f
1 parent 5471c14
commit f603b5f
Show file tree

Hide file tree

Showing 12 changed files with 8 additions and 4 deletions.
diff --git a/server/bot/commands/admin.ts → server/bot/oldCommands/admin.ts b/server/bot/commands/admin.ts → server/bot/oldCommands/admin.ts
diff --git a/server/bot/commands/admin/ban.ts → server/bot/oldCommands/admin/ban.ts b/server/bot/commands/admin/ban.ts → server/bot/oldCommands/admin/ban.ts
diff --git a/server/bot/commands/admin/mute.ts → server/bot/oldCommands/admin/mute.ts b/server/bot/commands/admin/mute.ts → server/bot/oldCommands/admin/mute.ts
diff --git a/server/bot/commands/admin/roles.ts → server/bot/oldCommands/admin/roles.ts b/server/bot/commands/admin/roles.ts → server/bot/oldCommands/admin/roles.ts
diff --git a/server/bot/commands/admin/warn.ts → server/bot/oldCommands/admin/warn.ts b/server/bot/commands/admin/warn.ts → server/bot/oldCommands/admin/warn.ts
diff --git a/server/bot/commands/api.ts → server/bot/oldCommands/api.ts b/server/bot/commands/api.ts → server/bot/oldCommands/api.ts
diff --git a/server/bot/commands/games.ts → server/bot/oldCommands/games.ts b/server/bot/commands/games.ts → server/bot/oldCommands/games.ts
diff --git a/server/bot/commands/gunfight.ts → server/bot/oldCommands/gunfight.ts b/server/bot/commands/gunfight.ts → server/bot/oldCommands/gunfight.ts
diff --git a/server/bot/commands/help.ts → server/bot/oldCommands/help.ts b/server/bot/commands/help.ts → server/bot/oldCommands/help.ts
@@ -70,7 +70,11 @@ export const handleHelp: IveBotCommand = (client) => ({
   generator: async (message, args) => {
     const aliasCheck = (
       i: string
-    ) => client.commands[i].aliases && client.commands[i].aliases.includes(args.join(' '))
+    ) => (
+      client.commands[i].aliases && client.commands[i].aliases.includes(
+        args.join(' ').split('/').join('')
+      )
+    )
     if (
       args.join(' ').split('/').join('') in client.commands
     ) return generateDocs(client.commands[args.join(' ').split('/').join('')])

diff --git a/server/bot/commands/tools.ts → server/bot/oldCommands/tools.ts b/server/bot/commands/tools.ts → server/bot/oldCommands/tools.ts
diff --git a/server/bot/commands/utilities.ts → server/bot/oldCommands/utilities.ts b/server/bot/commands/utilities.ts → server/bot/oldCommands/utilities.ts
diff --git a/server/index.ts b/server/index.ts
@@ -69,15 +69,15 @@ MongoClient.connect(mongoURL === 'dotenv' ? process.env.MONGO_URL : mongoURL, {
   // Avoid usage, submit PRs to bot/commands and not bot/index and bot/oldCommands.
   client.on('messageCreate', botCallback(client, tempDB, db))
   // Register all commands in bot/commands onto the CommandClient.
-  readdir('./server/bot/commands', (err, commandFiles) => {
+  readdir('./server/bot/oldCommands', (err, commandFiles) => {
     // Handle any errors.
     if (err) { console.error(err); throw new Error('Commands could not be retrieved.') }
     // This only supports two levels of files, one including files inside commands, and one in..
     // a subfolder.
     commandFiles.forEach(commandFile => {
       // If it's a file..
-      if (statSync('./server/bot/commands/' + commandFile).isFile() && commandFile.endsWith('.ts')) {
-        const commands: { [index: string]: IveBotCommand } = require('./bot/commands/' + commandFile)
+      if (statSync('./server/bot/oldCommands/' + commandFile).isFile() && commandFile.endsWith('.ts')) {
+        const commands: { [index: string]: IveBotCommand } = require('./bot/oldCommands/' + commandFile)
         // ..and there are commands..
         if (!Object.keys(commands).length) return
         // ..register the commands.