Skip to content

Commit 1e2bfd6

Browse files
committed
make secondary moderator follow the same design pattern as IsAdmin
1 parent f912063 commit 1e2bfd6

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

src/Bot/Helpers/DiscordHelper.cs

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,25 @@ public static bool IsBotOwner(this IUser user)
3030
=> Config.Owner == user.Id;
3131

3232
private static bool IsGuildOwner(this IGuildUser user)
33-
=> user.Guild.OwnerId == user.Id || IsBotOwner(user);
33+
=> user.Guild.OwnerId == user.Id || user.IsBotOwner();
3434

3535
public static bool IsAdmin(this VolteContext ctx, IGuildUser user)
3636
=> HasRole(user, ctx.GuildData.Settings.Moderation.AdminRole)
37-
|| IsGuildOwner(user);
37+
|| user.IsGuildOwner();
38+
39+
public static bool IsSecondaryModerator(this VolteContext ctx, IGuildUser user)
40+
=> user.HasRole(ctx.GuildData.Settings.Moderation.SecondaryModRole)
41+
|| ctx.IsAdmin(user)
42+
|| user.IsGuildOwner();
3843

3944
public static bool IsModerator(this VolteContext ctx, IGuildUser user)
40-
=> user.HasRole(ctx.GuildData.Settings.Moderation.ModRole)
41-
|| user.HasRole(ctx.GuildData.Settings.Moderation.SecondaryModRole)
42-
|| ctx.IsAdmin(user)
43-
|| IsGuildOwner(user);
45+
=> user.HasRole(ctx.GuildData.Settings.Moderation.ModRole)
46+
|| ctx.IsSecondaryModerator(user);
4447

4548
public static bool HasRole(this IGuildUser user, ulong roleId) => user.RoleIds.Contains(roleId);
46-
49+
4750
public static Task WarnAsync(this IGuildUser member, VolteContext ctx, string reason)
48-
=> ctx.Services.GetRequiredService<DatabaseService>().WarnAsync(ctx.User, member, reason);
51+
=> member.WarnAsync(ctx.User, ctx.Services, reason);
4952

5053
public static Task WarnAsync(this IGuildUser member, IUser issuer, IServiceProvider provider, string reason)
5154
{

0 commit comments

Comments
 (0)