Discord/chaosbot
3
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases Wiki Activity

Add functionality for discord login #patch

Browse Source
This commit is contained in:
Daniel_I_Am 2020-08-25 00:49:36 +02:00
commit 15462112eb
No known key found for this signature in database
GPG Key ID: 80C428FCC9743E84
7 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChaosBot/Discord/Modules/Admin/Config.cs
View File

@ -86,7 +86,7 @@ namespace ChaosBot.Discord.Modules.Admin
{ {
if ((key != null) && (value != null) ) if ((key != null) && (value != null) )
{ {
if(await RestrictedConfig.IsAllowed(key)) if(RestrictedConfig.IsAllowed(key))
{ {
using (ChaosbotContext dbContext = new ChaosbotContext()) using (ChaosbotContext dbContext = new ChaosbotContext())
{ {
@ -120,7 +120,7 @@ namespace ChaosBot.Discord.Modules.Admin
{ {
try try
{ {
if ((key != null) && (await RestrictedConfig.IsAllowed(key))) if ((key != null) && (RestrictedConfig.IsAllowed(key)))
{ {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
EmbedBuilder embed = new EmbedBuilder(); EmbedBuilder embed = new EmbedBuilder();
@ -161,7 +161,7 @@ namespace ChaosBot.Discord.Modules.Admin
{ {
try try
{ {
if ((key != null) && (await RestrictedConfig.IsAllowed(key))) if ((key != null) && (RestrictedConfig.IsAllowed(key)))
{ {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
EmbedBuilder embed = new EmbedBuilder(); EmbedBuilder embed = new EmbedBuilder();

4
ChaosBot/Discord/Modules/User/Lodestone.cs
View File

@ -40,7 +40,7 @@ namespace ChaosBot.Discord.Modules.User
await LodestoneHelp(); 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) if(args.Length >= 1)
{ {
@ -92,7 +92,7 @@ namespace ChaosBot.Discord.Modules.User
sb.AppendLine("To get Character Info:"); sb.AppendLine("To get Character Info:");
sb.AppendLine($"By Id: {ConfigurationRepository.GetValue<string>("Discord:Prefix", Context.Guild.Id, "!")}lodestone character 9231394073691143535"); sb.AppendLine($"By Id: {ConfigurationRepository.GetValue<string>("Discord:Prefix", Context.Guild.Id, "!")}lodestone character 9231394073691143535");
sb.AppendLine($"By Name: {ConfigurationRepository.GetValue<string>("Discord:Prefix", Context.Guild.Id, "!")}lodestone character Siren Luna Kaisar"); sb.AppendLine($"By Name: {ConfigurationRepository.GetValue<string>("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("To Link your Character:");
sb.AppendLine($"By Id: {ConfigurationRepository.GetValue<string>("Discord:Prefix", Context.Guild.Id, "!")}lodestone link 9231394073691143535"); sb.AppendLine($"By Id: {ConfigurationRepository.GetValue<string>("Discord:Prefix", Context.Guild.Id, "!")}lodestone link 9231394073691143535");

6
ChaosBot/Discord/Modules/User/Points.cs
View File

@ -31,7 +31,7 @@ namespace ChaosBot.Discord.Modules.User
{ {
if(Amount != 0) 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); await AddPoints(userMention, Amount, adminAccess);
} }
else else
@ -41,7 +41,7 @@ namespace ChaosBot.Discord.Modules.User
} }
else if ((cmd.ToLower() == "remove") || (cmd.ToLower() == "rem") || (cmd.ToLower() == "take") || (cmd.ToLower() == "-")) 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); await RemPoints(userMention, Amount);
} }
@ -52,7 +52,7 @@ namespace ChaosBot.Discord.Modules.User
} }
else if ((cmd.ToLower() == "delete") || (cmd.ToLower() == "del")) 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); await DelPoints(userMention);
} }

14
ChaosBot/Discord/Modules/User/RaffleCmd.cs
View File

@ -25,7 +25,7 @@ namespace ChaosBot.Discord.Modules.User
{ {
if ((cmd.ToLower() == "add") || (cmd.ToLower() == "+") || (cmd.ToLower() == "give")) 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); await AddRaffle(userMention, Amount, true);
} }
@ -36,7 +36,7 @@ namespace ChaosBot.Discord.Modules.User
} }
else if (cmd.ToLower() == "pick") else if (cmd.ToLower() == "pick")
{ {
if(await CheckPermissions.CheckPerms(Context, "raffle.pick", "Admin")) if(CheckPermissions.CheckPerms(Context, "raffle.pick", "Admin"))
{ {
await PickRaffle(); await PickRaffle();
} }
@ -47,7 +47,7 @@ namespace ChaosBot.Discord.Modules.User
} }
else if ((cmd.ToLower() == "remove") || (cmd.ToLower() == "rem") || (cmd.ToLower() == "take") || (cmd.ToLower() == "-")) 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); await RemRaffle(userMention, Amount);
} }
@ -58,7 +58,7 @@ namespace ChaosBot.Discord.Modules.User
} }
else if ((cmd.ToLower() == "delete") || (cmd.ToLower() == "del")) 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); await DelRaffle(userMention);
} }
@ -71,7 +71,7 @@ namespace ChaosBot.Discord.Modules.User
{ {
await TotalRaffle(); 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); await ClearRaffle(userMention);
} }
@ -104,9 +104,9 @@ namespace ChaosBot.Discord.Modules.User
sb.AppendLine($"{ConfigurationRepository.GetValue<string>("Discord:Prefix", Context.Guild.Id, "!")}raffle buy <amount>"); sb.AppendLine($"{ConfigurationRepository.GetValue<string>("Discord:Prefix", Context.Guild.Id, "!")}raffle buy <amount>");
sb.AppendLine(); sb.AppendLine();
sb.AppendLine("Moderation commands:"); sb.AppendLine("Moderation commands:");
if(await CheckPermissions.CheckPerms(Context, "raffle.add", "Admin")) if(CheckPermissions.CheckPerms(Context, "raffle.add", "Admin"))
sb.AppendLine($"{ConfigurationRepository.GetValue<string>("Discord:Prefix", Context.Guild.Id, "!")}raffle add <discord mention> <amount>"); sb.AppendLine($"{ConfigurationRepository.GetValue<string>("Discord:Prefix", Context.Guild.Id, "!")}raffle add <discord mention> <amount>");
if(await CheckPermissions.CheckPerms(Context, "raffle.remove", "Admin")) if(CheckPermissions.CheckPerms(Context, "raffle.remove", "Admin"))
{ {
sb.AppendLine($"{ConfigurationRepository.GetValue<string>("Discord:Prefix", Context.Guild.Id, "!")}raffle remove <discord mention> <amount>"); sb.AppendLine($"{ConfigurationRepository.GetValue<string>("Discord:Prefix", Context.Guild.Id, "!")}raffle remove <discord mention> <amount>");
sb.AppendLine($"{ConfigurationRepository.GetValue<string>("Discord:Prefix", Context.Guild.Id, "!")}raffle delete <discord mention>"); sb.AppendLine($"{ConfigurationRepository.GetValue<string>("Discord:Prefix", Context.Guild.Id, "!")}raffle delete <discord mention>");

2
ChaosBot/Services/CheckPermissions.cs
View File

@ -14,7 +14,7 @@ namespace ChaosBot.Services
{ {
private static ILogger _logger = Program.Logger; private static ILogger _logger = Program.Logger;
public static async Task<Boolean> CheckPerms(ICommandContext context, string command, string defaultRole = "User") public static Boolean CheckPerms(ICommandContext context, string command, string defaultRole = "User")
{ {
// Debug information // Debug information
_logger.Trace($"CheckCommandPerm.CheckPermissionsAsync|Checking permissions for command: {command}"); _logger.Trace($"CheckCommandPerm.CheckPermissionsAsync|Checking permissions for command: {command}");

2
ChaosBot/Services/RestrictedConfig.cs
View File

@ -14,7 +14,7 @@ namespace ChaosBot.Services
{ {
private static ILogger _logger = Program.Logger; private static ILogger _logger = Program.Logger;
public static async Task<Boolean> IsAllowed(string key) public static Boolean IsAllowed(string key)
{ {
// TODO: List populated from DB // TODO: List populated from DB
List<string> restrictedCfg = new List<string> {"Database:Host", "Database:Port", "Database:Name", "Database:User", "Database:Pass", "Bot:Version", "NLog", "WebServer", "Discord:Token"}; List<string> restrictedCfg = new List<string> {"Database:Host", "Database:Port", "Database:Name", "Database:User", "Database:Pass", "Bot:Version", "NLog", "WebServer", "Discord:Token"};

2
ChaosBot/wwwroot

@ -1 +1 @@
Subproject commit ad857be54bdaf13813a00458c242bcc808db89ec Subproject commit 2200cf510be2d0926edfd470c70b5aeeb006afe7