From 51f153f40081d66a4bcd8056cc3ea172dd1a5c27 Mon Sep 17 00:00:00 2001 From: Daniel-I-Am Date: Mon, 24 Aug 2020 22:24:52 +0200 Subject: [PATCH] Fix synchronous async warning CheckPerms --- ChaosBot/Discord/Modules/User/Lodestone.cs | 4 ++-- ChaosBot/Discord/Modules/User/Points.cs | 6 +++--- ChaosBot/Discord/Modules/User/RaffleCmd.cs | 14 +++++++------- ChaosBot/Services/CheckPermissions.cs | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ChaosBot/Discord/Modules/User/Lodestone.cs b/ChaosBot/Discord/Modules/User/Lodestone.cs index df21aa7..36e56bc 100644 --- a/ChaosBot/Discord/Modules/User/Lodestone.cs +++ b/ChaosBot/Discord/Modules/User/Lodestone.cs @@ -40,7 +40,7 @@ namespace ChaosBot.Discord.Modules.User await LodestoneHelp(); } } - else if (((cmd.ToLower() == "link") || (cmd.ToLower() == "l") || (cmd.ToLower() == "attach") || (cmd.ToLower() == "claim") || (cmd.ToLower() == "take")) && (await CheckPermissions.CheckPerms(Context, "lodestone.link", "User"))) + else if (((cmd.ToLower() == "link") || (cmd.ToLower() == "l") || (cmd.ToLower() == "attach") || (cmd.ToLower() == "claim") || (cmd.ToLower() == "take")) && (CheckPermissions.CheckPerms(Context, "lodestone.link", "User"))) { if(args.Length >= 1) { @@ -92,7 +92,7 @@ namespace ChaosBot.Discord.Modules.User sb.AppendLine("To get Character Info:"); sb.AppendLine($"By Id: {ConfigurationRepository.GetValue("Discord:Prefix", Context.Guild.Id, "!")}lodestone character 9231394073691143535"); sb.AppendLine($"By Name: {ConfigurationRepository.GetValue("Discord:Prefix", Context.Guild.Id, "!")}lodestone character Siren Luna Kaisar"); - if (await CheckPermissions.CheckPerms(Context, "lodestone.link", "User")) + if (CheckPermissions.CheckPerms(Context, "lodestone.link", "User")) { sb.AppendLine("To Link your Character:"); sb.AppendLine($"By Id: {ConfigurationRepository.GetValue("Discord:Prefix", Context.Guild.Id, "!")}lodestone link 9231394073691143535"); diff --git a/ChaosBot/Discord/Modules/User/Points.cs b/ChaosBot/Discord/Modules/User/Points.cs index 7916698..ebe593d 100644 --- a/ChaosBot/Discord/Modules/User/Points.cs +++ b/ChaosBot/Discord/Modules/User/Points.cs @@ -31,7 +31,7 @@ namespace ChaosBot.Discord.Modules.User { if(Amount != 0) { - Boolean adminAccess = await CheckPermissions.CheckPerms(Context, "points.add", "Admin"); + Boolean adminAccess = CheckPermissions.CheckPerms(Context, "points.add", "Admin"); await AddPoints(userMention, Amount, adminAccess); } else @@ -41,7 +41,7 @@ namespace ChaosBot.Discord.Modules.User } else if ((cmd.ToLower() == "remove") || (cmd.ToLower() == "rem") || (cmd.ToLower() == "take") || (cmd.ToLower() == "-")) { - if((Amount != 0) && (await CheckPermissions.CheckPerms(Context, "points.remove", "Admin"))) + if((Amount != 0) && (CheckPermissions.CheckPerms(Context, "points.remove", "Admin"))) { await RemPoints(userMention, Amount); } @@ -52,7 +52,7 @@ namespace ChaosBot.Discord.Modules.User } else if ((cmd.ToLower() == "delete") || (cmd.ToLower() == "del")) { - if((Amount == 0) && (await CheckPermissions.CheckPerms(Context, "points.remove", "Admin"))) + if((Amount == 0) && (CheckPermissions.CheckPerms(Context, "points.remove", "Admin"))) { await DelPoints(userMention); } diff --git a/ChaosBot/Discord/Modules/User/RaffleCmd.cs b/ChaosBot/Discord/Modules/User/RaffleCmd.cs index f4d9dc1..6191e1b 100644 --- a/ChaosBot/Discord/Modules/User/RaffleCmd.cs +++ b/ChaosBot/Discord/Modules/User/RaffleCmd.cs @@ -25,7 +25,7 @@ namespace ChaosBot.Discord.Modules.User { if ((cmd.ToLower() == "add") || (cmd.ToLower() == "+") || (cmd.ToLower() == "give")) { - if((Amount != 0) && (await CheckPermissions.CheckPerms(Context, "raffle.add", "Admin"))) + if((Amount != 0) && (CheckPermissions.CheckPerms(Context, "raffle.add", "Admin"))) { await AddRaffle(userMention, Amount, true); } @@ -36,7 +36,7 @@ namespace ChaosBot.Discord.Modules.User } else if (cmd.ToLower() == "pick") { - if(await CheckPermissions.CheckPerms(Context, "raffle.pick", "Admin")) + if(CheckPermissions.CheckPerms(Context, "raffle.pick", "Admin")) { await PickRaffle(); } @@ -47,7 +47,7 @@ namespace ChaosBot.Discord.Modules.User } else if ((cmd.ToLower() == "remove") || (cmd.ToLower() == "rem") || (cmd.ToLower() == "take") || (cmd.ToLower() == "-")) { - if((Amount != 0) && (await CheckPermissions.CheckPerms(Context, "raffle.remove", "Admin"))) + if((Amount != 0) && (CheckPermissions.CheckPerms(Context, "raffle.remove", "Admin"))) { await RemRaffle(userMention, Amount); } @@ -58,7 +58,7 @@ namespace ChaosBot.Discord.Modules.User } else if ((cmd.ToLower() == "delete") || (cmd.ToLower() == "del")) { - if((Amount == 0) && (await CheckPermissions.CheckPerms(Context, "raffle.remove", "Admin"))) + if((Amount == 0) && (CheckPermissions.CheckPerms(Context, "raffle.remove", "Admin"))) { await DelRaffle(userMention); } @@ -71,7 +71,7 @@ namespace ChaosBot.Discord.Modules.User { await TotalRaffle(); } - else if ((cmd.ToLower() == "clear") && (await CheckPermissions.CheckPerms(Context, "raffle.clear", "Admin"))) + else if ((cmd.ToLower() == "clear") && (CheckPermissions.CheckPerms(Context, "raffle.clear", "Admin"))) { await ClearRaffle(userMention); } @@ -104,9 +104,9 @@ namespace ChaosBot.Discord.Modules.User sb.AppendLine($"{ConfigurationRepository.GetValue("Discord:Prefix", Context.Guild.Id, "!")}raffle buy "); sb.AppendLine(); sb.AppendLine("Moderation commands:"); - if(await CheckPermissions.CheckPerms(Context, "raffle.add", "Admin")) + if(CheckPermissions.CheckPerms(Context, "raffle.add", "Admin")) sb.AppendLine($"{ConfigurationRepository.GetValue("Discord:Prefix", Context.Guild.Id, "!")}raffle add "); - if(await CheckPermissions.CheckPerms(Context, "raffle.remove", "Admin")) + if(CheckPermissions.CheckPerms(Context, "raffle.remove", "Admin")) { sb.AppendLine($"{ConfigurationRepository.GetValue("Discord:Prefix", Context.Guild.Id, "!")}raffle remove "); sb.AppendLine($"{ConfigurationRepository.GetValue("Discord:Prefix", Context.Guild.Id, "!")}raffle delete "); diff --git a/ChaosBot/Services/CheckPermissions.cs b/ChaosBot/Services/CheckPermissions.cs index dc27cfc..f954c76 100644 --- a/ChaosBot/Services/CheckPermissions.cs +++ b/ChaosBot/Services/CheckPermissions.cs @@ -14,7 +14,7 @@ namespace ChaosBot.Services { private static ILogger _logger = Program.Logger; - public static async Task CheckPerms(ICommandContext context, string command, string defaultRole = "User") + public static Boolean CheckPerms(ICommandContext context, string command, string defaultRole = "User") { // Debug information _logger.Trace($"CheckCommandPerm.CheckPermissionsAsync|Checking permissions for command: {command}");