TeamInklings/OctobotStealth
TeamInklings/OctobotStealth
Archived
1
0
Fork 0
forked from TeamInklings/Octobot
Code Pull requests Wiki Activity Actions

Synchronize roles only on member data updates (#130)

Browse source 
This PR makes it so that roles in MemberData are updated only in
MemberUpdateService. This reduces possible points of failures,
maintenance burden and reliance on gateway events
This commit is contained in:
Octol1ttle 2023-09-30 20:36:55 +05:00 committed by GitHub
parent 5d278883d5
commit d713b977f0
Signed by: GitHub
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/Responders/GuildMemberRolesUpdatedResponder.cs
View file

@ -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();
}
}

19
src/Services/GuildDataService.cs
View file

@ -4,7 +4,6 @@ using System.Text.Json.Nodes;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Octobot.Data;
using Remora.Discord.API.Abstractions.Rest;
using Remora.Rest.Core;
namespace Octobot.Services;
@ -15,14 +14,12 @@ namespace Octobot.Services;
public sealed class GuildDataService : IHostedService
{
private readonly ConcurrentDictionary<Snowflake, GuildData> _datas = new();
private readonly IDiscordRestGuildAPI _guildApi;
private readonly ILogger<GuildDataService> _logger;
// https://github.com/dotnet/aspnetcore/issues/39139
public GuildDataService(
IHostApplicationLifetime lifetime, IDiscordRestGuildAPI guildApi, ILogger<GuildDataService> logger)
IHostApplicationLifetime lifetime, ILogger<GuildDataService> logger)
{
_guildApi = guildApi;
_logger = logger;
lifetime.ApplicationStopping.Register(ApplicationStopping);
}
@ -110,15 +107,6 @@ public sealed class GuildDataService : IHostedService
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);
}
@ -150,11 +138,6 @@ public sealed class GuildDataService : IHostedService
return (await GetData(guildId, ct)).Settings;
}
public async Task<MemberData> GetMemberData(Snowflake guildId, Snowflake userId, CancellationToken ct = default)
{
return (await GetData(guildId, ct)).GetOrCreateMemberData(userId);
}
public ICollection<Snowflake> GetGuildIds()
{
return _datas.Keys;

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

@ -89,6 +89,11 @@ public sealed partial class MemberUpdateService : BackgroundService
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);
failedResults.AddIfFailed(autoUnmuteResult);