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

don't use unnecessary API call

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

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

@ -80,9 +80,16 @@ 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 punishmentsResult = await CheckMemberPunishmentsAsync(guildId, id, data, ct); var guildMemberResult = await _guildApi.GetGuildMemberAsync(guildId, id, ct);
var punishmentsResult = await CheckMemberPunishmentsAsync(guildId, id, data, guildMemberResult, ct);
failedResults.AddIfFailed(punishmentsResult); failedResults.AddIfFailed(punishmentsResult);
if (!guildMemberResult.IsDefined(out var guildMember))
{
return failedResults.AggregateErrors();
}
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(
@ -90,12 +97,6 @@ public sealed partial class MemberUpdateService : BackgroundService
failedResults.AddIfFailed(addResult); failedResults.AddIfFailed(addResult);
} }
var guildMemberResult = await _guildApi.GetGuildMemberAsync(guildId, id, ct);
if (!guildMemberResult.IsDefined(out var guildMember))
{
return failedResults.AggregateErrors();
}
if (!guildMember.User.IsDefined(out var user)) if (!guildMember.User.IsDefined(out var user))
{ {
failedResults.AddIfFailed(new ArgumentNullError(nameof(guildMember.User))); failedResults.AddIfFailed(new ArgumentNullError(nameof(guildMember.User)));
@ -118,7 +119,8 @@ public sealed partial class MemberUpdateService : BackgroundService
} }
private async Task<Result> CheckMemberPunishmentsAsync( private async Task<Result> CheckMemberPunishmentsAsync(
Snowflake guildId, Snowflake id, MemberData data, CancellationToken ct) Snowflake guildId, Snowflake id, MemberData data, Result<IGuildMember> guildMemberResult,
CancellationToken ct)
{ {
if (DateTimeOffset.UtcNow > data.BannedUntil) if (DateTimeOffset.UtcNow > data.BannedUntil)
{ {
@ -132,14 +134,8 @@ public sealed partial class MemberUpdateService : BackgroundService
return unbanResult; return unbanResult;
} }
if (DateTimeOffset.UtcNow > data.MutedUntil) if (DateTimeOffset.UtcNow > data.MutedUntil && guildMemberResult.IsSuccess)
{ {
var isOnServer = await _guildApi.GetGuildMemberAsync(guildId, id, ct);
if (!isOnServer.IsSuccess)
{
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);