Noi/BirthdayBot
1
0
Fork 0
mirror of https://github.com/NoiTheCat/BirthdayBot.git synced 2024-11-22 05:54:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Have precondition queries be more explicit

Browse source
This commit is contained in:
Noi 2022-03-20 12:40:33 -07:00
parent b1b7c60211
commit 65fbdacf58
2 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
ApplicationCommands/Preconditions/EnforceBlocking.cs
View file

@ -23,18 +23,20 @@ class EnforceBlockingAttribute : PreconditionAttribute {
if (user.GuildPermissions.ManageGuild) return Task.FromResult(PreconditionResult.FromSuccess()); if (user.GuildPermissions.ManageGuild) return Task.FromResult(PreconditionResult.FromSuccess());
using var db = new BotDatabaseContext(); using var db = new BotDatabaseContext();
var settings = guild.GetConfigOrNew(db); var settings = (from row in db.GuildConfigurations
where row.GuildId == (long)guild.Id
select new { ModRole = (ulong?)row.ModeratorRole, ModMode = row.Moderated }).FirstOrDefault();
if (settings != null) {
// Bot moderators override all blocking measures in place
if (user.Roles.Any(r => r.Id == settings.ModRole)) return Task.FromResult(PreconditionResult.FromSuccess());
// Bot moderators override any blocks // Check for moderated mode
if (settings.ModeratorRole.HasValue && user.Roles.Any(r => r.Id == (ulong)settings.ModeratorRole.Value)) if (settings.ModMode) return Task.FromResult(PreconditionResult.FromError(FailModerated));
return Task.FromResult(PreconditionResult.FromSuccess());
// Moderated mode check // Check if user exists in blocklist
if (settings.Moderated) return Task.FromResult(PreconditionResult.FromError(FailModerated)); if (db.BlocklistEntries.Where(row => row.GuildId == (long)guild.Id && row.UserId == (long)user.Id).Any())
return Task.FromResult(PreconditionResult.FromError(FailBlocked));
// Block list check }
var blockquery = db.BlocklistEntries.Where(entry => entry.GuildId == (long)guild.Id && entry.UserId == (long)user.Id);
if (blockquery.Any()) return Task.FromResult(PreconditionResult.FromError(FailBlocked));
return Task.FromResult(PreconditionResult.FromSuccess()); return Task.FromResult(PreconditionResult.FromSuccess());
} }

6
ApplicationCommands/Preconditions/RequireBotModerator.cs
View file

@ -22,8 +22,10 @@ class RequireBotModeratorAttribute : PreconditionAttribute {
if (user.GuildPermissions.ManageGuild) return Task.FromResult(PreconditionResult.FromSuccess()); if (user.GuildPermissions.ManageGuild) return Task.FromResult(PreconditionResult.FromSuccess());
using var db = new BotDatabaseContext(); using var db = new BotDatabaseContext();
var settings = ((SocketGuild)context.Guild).GetConfigOrNew(db); var checkRole = (ulong?)db.GuildConfigurations
if (settings.ModeratorRole.HasValue && user.Roles.Any(r => r.Id == (ulong)settings.ModeratorRole.Value)) .Where(g => g.GuildId == (long)((SocketGuild)context.Guild).Id)
.Select(g => g.RoleId).FirstOrDefault();
if (checkRole.HasValue && user.Roles.Any(r => r.Id == checkRole.Value))
return Task.FromResult(PreconditionResult.FromSuccess()); return Task.FromResult(PreconditionResult.FromSuccess());
return Task.FromResult(PreconditionResult.FromError(Error)); return Task.FromResult(PreconditionResult.FromError(Error));