Merge branch 'master' into synchronous-event-update

src/Responders/GuildLoadedResponder.cs

@@ -50,19 +50,6 @@ public class GuildLoadedResponder : IResponder<IGuildCreate>
             data.GetOrCreateMemberData(member.User.Value.ID);
         }
 
-        foreach (var schEvent in guild.GuildScheduledEvents)
-        {
-            if (!data.ScheduledEvents.TryGetValue(schEvent.ID.Value, out var eventData))
-            {
-                continue;
-            }
-
-            eventData.Name = schEvent.Name;
-            eventData.ScheduledStartTime = schEvent.ScheduledStartTime;
-            eventData.ScheduleOnStatusUpdated = eventData.Status != schEvent.Status;
-            eventData.Status = schEvent.Status;
-        }
-
         if (!GuildSettings.ReceiveStartupMessages.Get(cfg))
         {
             return Result.FromSuccess();

src/Responders/GuildMemberRolesUpdatedResponder.cs

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

src/Responders/ScheduledEventUpdatedResponder.cs

@@ -1,30 +0,0 @@
-using JetBrains.Annotations;
-using Octobot.Services;
-using Remora.Discord.API.Abstractions.Gateway.Events;
-using Remora.Discord.Gateway.Responders;
-using Remora.Results;
-
-namespace Octobot.Responders;
-
-[UsedImplicitly]
-public class ScheduledEventUpdatedResponder : IResponder<IGuildScheduledEventUpdate>
-{
-    private readonly GuildDataService _guildData;
-
-    public ScheduledEventUpdatedResponder(GuildDataService guildData)
-    {
-        _guildData = guildData;
-    }
-
-    public async Task<Result> RespondAsync(IGuildScheduledEventUpdate gatewayEvent, CancellationToken ct = default)
-    {
-        var data = await _guildData.GetData(gatewayEvent.GuildID, ct);
-        var eventData = data.ScheduledEvents[gatewayEvent.ID.Value];
-        eventData.Name = gatewayEvent.Name;
-        eventData.ScheduledStartTime = gatewayEvent.ScheduledStartTime;
-        eventData.ScheduleOnStatusUpdated = eventData.Status != gatewayEvent.Status;
-        eventData.Status = gatewayEvent.Status;
-
-        return Result.FromSuccess();
-    }
-}

src/Services/GuildDataService.cs

@@ -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;

src/Services/Update/MemberUpdateService.cs

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

src/Services/Update/ScheduledEventUpdateService.cs

@@ -56,6 +56,8 @@ public sealed class ScheduledEventUpdateService : BackgroundService
             return Result.FromError(eventsResult);
         }
 
+        SyncScheduledEvents(data, events);
+
         foreach (var storedEvent in data.ScheduledEvents.Values)
         {
             var scheduledEvent = TryGetScheduledEvent(events, storedEvent.Id);
@@ -95,20 +97,25 @@ public sealed class ScheduledEventUpdateService : BackgroundService
             failedResults.AddIfFailed(statusUpdatedResponseResult);
         }
 
-        SyncScheduledEvents(data, events);
-
         return failedResults.AggregateErrors();
     }
 
-    private static void SyncScheduledEvents(GuildData data, IReadOnlyCollection<IGuildScheduledEvent> events)
+    private static void SyncScheduledEvents(GuildData data, IEnumerable<IGuildScheduledEvent> events)
     {
-        if (data.ScheduledEvents.Count < events.Count)
+        foreach (var @event in events)
         {
-            foreach (var @event in events.Where(@event => !data.ScheduledEvents.ContainsKey(@event.ID.Value)))
+            if (!data.ScheduledEvents.ContainsKey(@event.ID.Value))
             {
-                data.ScheduledEvents.Add(@event.ID.Value, new ScheduledEventData(@event.ID.Value,
+                data.ScheduledEvents.Add(@event.ID.Value,
-                    @event.Name, @event.ScheduledStartTime, @event.Status));
+                    new ScheduledEventData(@event.ID.Value, @event.Name, @event.ScheduledStartTime, @event.Status));
+                continue;
             }
+
+            var eventData = data.ScheduledEvents[@event.ID.Value];
+            eventData.Name = @event.Name;
+            eventData.ScheduledStartTime = @event.ScheduledStartTime;
+            eventData.ScheduleOnStatusUpdated = eventData.Status != @event.Status;
+            eventData.Status = @event.Status;
         }
     }