TeamInklings/Octobot
TeamInklings/Octobot
1
0
Fork 1
mirror of https://github.com/TeamOctolings/Octobot.git synced 2025-04-20 00:43:36 +03:00
Code Issues Wiki Activity

resolving issues...

Browse source
This commit is contained in:
Macintxsh 2023-09-27 21:19:22 +03:00
parent 170d87fff0
commit 70553a7e2e
Signed by: mctaylors
GPG key ID: 361D326747B61E65
1 changed files with 34 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/Services/Update/MemberUpdateService.cs
View file

@ -80,16 +80,18 @@ public sealed partial class MemberUpdateService : BackgroundService
var failedResults = new List<Result>(); var failedResults = new List<Result>();
var id = data.Id.ToSnowflake(); var id = data.Id.ToSnowflake();
var autoUnbanResult = await TryAutoUnbanAsync(guildId, id, data, ct);
failedResults.AddIfFailed(autoUnbanResult);
var guildMemberResult = await _guildApi.GetGuildMemberAsync(guildId, id, ct); var guildMemberResult = await _guildApi.GetGuildMemberAsync(guildId, id, ct);
var punishmentsResult = await CheckMemberPunishmentsAsync(guildId, id, data, guildMemberResult, ct);
failedResults.AddIfFailed(punishmentsResult);
if (!guildMemberResult.IsDefined(out var guildMember)) if (!guildMemberResult.IsDefined(out var guildMember))
{ {
return failedResults.AggregateErrors(); return failedResults.AggregateErrors();
} }
var autoUnmuteResult = await TryAutoUnmuteAsync(guildId, id, data, ct);
failedResults.AddIfFailed(autoUnmuteResult);
if (defaultRole.Value is not 0 && !data.Roles.Contains(defaultRole.Value)) if (defaultRole.Value is not 0 && !data.Roles.Contains(defaultRole.Value))
{ {
var addResult = await _guildApi.AddGuildMemberRoleAsync( var addResult = await _guildApi.AddGuildMemberRoleAsync(
@ -118,12 +120,14 @@ public sealed partial class MemberUpdateService : BackgroundService
return failedResults.AggregateErrors(); return failedResults.AggregateErrors();
} }
private async Task<Result> CheckMemberPunishmentsAsync( private async Task<Result> TryAutoUnbanAsync(
Snowflake guildId, Snowflake id, MemberData data, Result<IGuildMember> guildMemberResult, Snowflake guildId, Snowflake id, MemberData data, CancellationToken ct)
CancellationToken ct)
{ {
if (DateTimeOffset.UtcNow > data.BannedUntil) if (DateTimeOffset.UtcNow <= data.BannedUntil)
{ {
return Result.FromSuccess();
}
var unbanResult = await _guildApi.RemoveGuildBanAsync( var unbanResult = await _guildApi.RemoveGuildBanAsync(
guildId, id, Messages.PunishmentExpired.EncodeHeader(), ct); guildId, id, Messages.PunishmentExpired.EncodeHeader(), ct);
if (unbanResult.IsSuccess) if (unbanResult.IsSuccess)
@ -134,8 +138,14 @@ public sealed partial class MemberUpdateService : BackgroundService
return unbanResult; return unbanResult;
} }
if (DateTimeOffset.UtcNow > data.MutedUntil && guildMemberResult.IsSuccess) private async Task<Result> TryAutoUnmuteAsync(
Snowflake guildId, Snowflake id, MemberData data, CancellationToken ct)
{ {
if (DateTimeOffset.UtcNow <= data.MutedUntil)
{
return Result.FromSuccess();
}
var unmuteResult = await _guildApi.ModifyGuildMemberAsync( var unmuteResult = await _guildApi.ModifyGuildMemberAsync(
guildId, id, roles: data.Roles.ConvertAll(r => r.ToSnowflake()), guildId, id, roles: data.Roles.ConvertAll(r => r.ToSnowflake()),
reason: Messages.PunishmentExpired.EncodeHeader(), ct: ct); reason: Messages.PunishmentExpired.EncodeHeader(), ct: ct);
@ -147,9 +157,6 @@ public sealed partial class MemberUpdateService : BackgroundService
return unmuteResult; return unmuteResult;
} }
return Result.FromSuccess();
}
private async Task<Result> FilterNicknameAsync(Snowflake guildId, IUser user, IGuildMember member, private async Task<Result> FilterNicknameAsync(Snowflake guildId, IUser user, IGuildMember member,
CancellationToken ct) CancellationToken ct)
{ {