Small bug fixes

nuovze · Nov 27, 2019 · db9b4d4 · db9b4d4
1 parent 14a0ca7
commit db9b4d4
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/src/commands/config.ts b/src/commands/config.ts
@@ -3,9 +3,12 @@ import * as fs from 'fs';
 import * as path from 'path';
 
 import rsrc from '../classes/Resources';
+import config from '../resources/global_config';
 import guild_config from '../resources/guild_config';
 
+
 module.exports.props = {
+  requiresElevation: config.elevation_names.owner,
   description: "sets up the discord bot for the server"
 };
 

diff --git a/src/commands/help.ts b/src/commands/help.ts
@@ -15,20 +15,23 @@ module.exports.run = async (client: any, message: Message) => {
   embed.setDescription("All the commands **you** have access to in this server");
   embed.setColor(0x00ae86);
 
-  let guildConfig = client.guild_configsp[rsrc.getGuildNameFromGuild(message.guild)];
+  let guildConfig = client.guild_configs[rsrc.getGuildNameFromGuild(message.guild)];
 
   client.commands.forEach((value: any, key: string) => {
     if (!value.props || !message.member) return;
 
     let elevatedPermissions = value.props.requiresElevation && message.member.roles.has(guildConfig.roles[value.props.requiresElevation]);
     let noPermissions = !value.props.requiresElevation || value.props.requiresElevation === "";
 
+    if(message.member.user.id === client.global_config.botowner)
+      elevatedPermissions = true;
+
     if (elevatedPermissions || noPermissions) {
       var header = "**!" + key + "**";
       let desc = value.props.description;
       if (value.props.usage) header += `\n\t*!${key} ${value.props.usage}*`;
 
-      if (elevatedPermissions) desc += `  \`\`\`css\n[${value.props.requiresElevation}]\`\`\``;
+      if (elevatedPermissions && !noPermissions) desc += `  \`\`\`css\n[${value.props.requiresElevation}]\`\`\``;
 
       embed.addField(header, desc, true);
     }

diff --git a/src/events/message.ts b/src/events/message.ts
@@ -55,9 +55,8 @@ module.exports = (client: any, message: Message) => {
 
   if (command != "config") {
     if (!guildConfig?.setup) return message.reply("your guild owner has to configure me before I can execute commands :(");
-    if (cmd.props.requiresElevation && cmd.props.requiresElevation !== "") {
-      if (cmd.props.requiresElevation === "botowner" && message.member.user.tag != "ShermanZero#1200") return;
-      else if (!message.member?.roles.has(guildConfig.roles[cmd.props.requiresElevation])) return;
+    if (cmd.props.requiresElevation && message.member.user.id !== client.global_config.botowner) {
+      if (!message.member?.roles.has(guildConfig.roles[cmd.props.requiresElevation])) return;
     }
   }
 

diff --git a/src/resources/global_config.ts b/src/resources/global_config.ts
@@ -2,9 +2,10 @@ export default {
   token: "NjM2NjE4NjI4ODQ2MDU5NTMw.XdItDg.lj4bgzJ5-GYW_-OywI9HKLgEZgg",
   status: "dead | !help",
   prefix: "!",
+  botowner: "349728538439450625",
 
   elevation_names: {
-    botowner: "shermanzero",
+    botowner: "botowner",
     owner: "owner",
     moderator: "mod"
   },