From dade5809fd48499f7c9573df50c13bb3ab4473cf Mon Sep 17 00:00:00 2001
From: Daniel-I-Am <djdecloet@gmail.com>
Date: Wed, 17 Jun 2020 12:50:13 +0200
Subject: [PATCH] Remove RequireRole precondition

---
 ChaosBot/Discord/Modules/ConfigCommands.cs    |  2 +-
 ChaosBot/Discord/PreConditions/RequireRole.cs | 34 -------------------
 2 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 ChaosBot/Discord/PreConditions/RequireRole.cs

diff --git a/ChaosBot/Discord/Modules/ConfigCommands.cs b/ChaosBot/Discord/Modules/ConfigCommands.cs
index e81820b..d1a2fba 100644
--- a/ChaosBot/Discord/Modules/ConfigCommands.cs
+++ b/ChaosBot/Discord/Modules/ConfigCommands.cs
@@ -14,7 +14,7 @@ namespace ChaosBot.Discord.Modules
         private static readonly string _prefix = ConfigurationRepository.GetValue<string>("Discord:Prefix");
 
         [Command("config")]
-        [RequireRole("Admin")]
+        [CheckCommandPerm]
         public async Task setConfig(string configFlag = null, string value = null)
         {
             var sb = new StringBuilder();
diff --git a/ChaosBot/Discord/PreConditions/RequireRole.cs b/ChaosBot/Discord/PreConditions/RequireRole.cs
deleted file mode 100644
index 3416044..0000000
--- a/ChaosBot/Discord/PreConditions/RequireRole.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using ChaosBot;
-using ChaosBot.Database.Repository;
-using Discord.Commands;
-using Discord.WebSocket;
-
-public class RequireRole : PreconditionAttribute
-{
-    private string _role { get; set; }
-
-    public RequireRole(string role) => _role = role;
-
-    public override Task<PreconditionResult> CheckPermissionsAsync(ICommandContext context, CommandInfo command, IServiceProvider services)
-    {
-        if (context.User is SocketGuildUser gUser)
-        {
-            /*
-             * Owner has access to all commands
-             */
-            if(context.Guild.OwnerId == context.User.Id) return Task.FromResult(PreconditionResult.FromSuccess());
-
-            var requiredGroup = (ConfigurationRepository.GetValue<string>($"Role:{_role}", context.Guild.Id) != null) ? ConfigurationRepository.GetValue<string>($"Role:{_role}", context.Guild.Id) : _role;
-
-            if (gUser.Roles.Any(r => r.Name == requiredGroup))
-                return Task.FromResult(PreconditionResult.FromSuccess());
-            else
-                return Task.FromResult(PreconditionResult.FromError($"You must have a role named {requiredGroup} to run this command."));
-        }
-        else
-            return Task.FromResult(PreconditionResult.FromError("You must be in a guild to run this command."));
-    }
-}
\ No newline at end of file