mirror of
https://github.com/TeamOctolings/Octobot.git
synced 2025-04-20 00:43:36 +03:00
fix(member data): synchronize roles only on member data ticks
This commit is contained in:
parent
5d278883d5
commit
1b7ae55ede
3 changed files with 5 additions and 42 deletions
|
@ -1,33 +0,0 @@
|
||||||
using JetBrains.Annotations;
|
|
||||||
using Octobot.Data;
|
|
||||||
using Octobot.Services;
|
|
||||||
using Remora.Discord.API.Abstractions.Gateway.Events;
|
|
||||||
using Remora.Discord.Gateway.Responders;
|
|
||||||
using Remora.Results;
|
|
||||||
|
|
||||||
namespace Octobot.Responders;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Handles updating <see cref="MemberData.Roles" /> when a guild member is updated.
|
|
||||||
/// </summary>
|
|
||||||
[UsedImplicitly]
|
|
||||||
public class GuildMemberUpdateResponder : IResponder<IGuildMemberUpdate>
|
|
||||||
{
|
|
||||||
private readonly GuildDataService _guildData;
|
|
||||||
|
|
||||||
public GuildMemberUpdateResponder(GuildDataService guildData)
|
|
||||||
{
|
|
||||||
_guildData = guildData;
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task<Result> RespondAsync(IGuildMemberUpdate gatewayEvent, CancellationToken ct = default)
|
|
||||||
{
|
|
||||||
var memberData = await _guildData.GetMemberData(gatewayEvent.GuildID, gatewayEvent.User.ID, ct);
|
|
||||||
if (memberData.MutedUntil is null)
|
|
||||||
{
|
|
||||||
memberData.Roles = gatewayEvent.Roles.ToList().ConvertAll(r => r.Value);
|
|
||||||
}
|
|
||||||
|
|
||||||
return Result.FromSuccess();
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -110,15 +110,6 @@ public sealed class GuildDataService : IHostedService
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (data.MutedUntil is null)
|
|
||||||
{
|
|
||||||
var memberResult = await _guildApi.GetGuildMemberAsync(guildId, data.Id.ToSnowflake(), ct);
|
|
||||||
if (memberResult.IsSuccess)
|
|
||||||
{
|
|
||||||
data.Roles = memberResult.Entity.Roles.ToList().ConvertAll(r => r.Value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
memberData.Add(data.Id, data);
|
memberData.Add(data.Id, data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -89,6 +89,11 @@ public sealed partial class MemberUpdateService : BackgroundService
|
||||||
return failedResults.AggregateErrors();
|
return failedResults.AggregateErrors();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (data.MutedUntil is null)
|
||||||
|
{
|
||||||
|
data.Roles = guildMember.Roles.ToList().ConvertAll(r => r.Value);
|
||||||
|
}
|
||||||
|
|
||||||
var autoUnmuteResult = await TryAutoUnmuteAsync(guildId, id, data, ct);
|
var autoUnmuteResult = await TryAutoUnmuteAsync(guildId, id, data, ct);
|
||||||
failedResults.AddIfFailed(autoUnmuteResult);
|
failedResults.AddIfFailed(autoUnmuteResult);
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue