minster586/nadekobot
1
0
Fork 0
mirror of https://gitlab.com/Kwoth/nadekobot.git synced 2025-09-10 17:28:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: selfhosters shouldn't get a feature limit about reaction roles anymore

Browse Source
This commit is contained in:
Kwoth
2024-06-15 11:07:17 +00:00
parent 8fae6e621d
commit 518f2e425e
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/NadekoBot/Modules/Administration/Role/ReactionRolesService.cs
View File

@@ -254,7 +254,7 @@ public sealed class ReactionRolesService : IReadyExecutor, INService, IReactionR
var activeReactionRoles = await ctx.GetTable<ReactionRoleV2>() var activeReactionRoles = await ctx.GetTable<ReactionRoleV2>()
.Where(x => x.GuildId == guild.Id) .Where(x => x.GuildId == guild.Id)
.CountAsync(); .CountAsync();
var limit = await _ps.GetUserLimit(LimitedFeatureName.ReactionRole, guild.OwnerId); var limit = await _ps.GetUserLimit(LimitedFeatureName.ReactionRole, guild.OwnerId);
if (!_creds.IsOwner(guild.OwnerId) && (activeReactionRoles >= limit.Quota && limit.Quota >= 0)) if (!_creds.IsOwner(guild.OwnerId) && (activeReactionRoles >= limit.Quota && limit.Quota >= 0))

15
src/NadekoBot/Modules/Patronage/PatronageService.cs
View File

@@ -247,7 +247,7 @@ public sealed class PatronageService
{ {
if (_creds.GetCreds().IsOwner(userId)) if (_creds.GetCreds().IsOwner(userId))
return true; return true;
if (!_pConf.Data.IsEnabled) if (!_pConf.Data.IsEnabled)
return true; return true;
@@ -266,7 +266,7 @@ public sealed class PatronageService
{ {
if (_creds.GetCreds().IsOwner(userId)) if (_creds.GetCreds().IsOwner(userId))
return true; return true;
if (!_pConf.Data.IsEnabled) if (!_pConf.Data.IsEnabled)
return true; return true;
@@ -316,14 +316,23 @@ public sealed class PatronageService
private TypedKey<int> CreateKey(LimitedFeatureName key, ulong userId) private TypedKey<int> CreateKey(LimitedFeatureName key, ulong userId)
=> new($"limited_feature:{key}:{userId}"); => new($"limited_feature:{key}:{userId}");
private QuotaLimit _emptyQuota = new QuotaLimit() private readonly QuotaLimit _emptyQuota = new QuotaLimit()
{ {
Quota = 0, Quota = 0,
QuotaPeriod = QuotaPer.PerDay, QuotaPeriod = QuotaPer.PerDay,
}; };
private readonly QuotaLimit _infiniteQuota = new QuotaLimit()
{
Quota = -1,
QuotaPeriod = QuotaPer.PerDay,
};
public async Task<QuotaLimit> GetUserLimit(LimitedFeatureName name, ulong userId) public async Task<QuotaLimit> GetUserLimit(LimitedFeatureName name, ulong userId)
{ {
if (!_pConf.Data.IsEnabled)
return _infiniteQuota;
var maybePatron = await GetPatronAsync(userId); var maybePatron = await GetPatronAsync(userId);
if (maybePatron is not { } patron) if (maybePatron is not { } patron)