From 687883bbf8294e595210f4e81003c14d23e713f8 Mon Sep 17 00:00:00 2001
From: Octol1ttle <l1ttleofficial@outlook.com>
Date: Tue, 17 Oct 2023 17:07:01 +0500
Subject: [PATCH] Use MemberData to determine a subscriber's role list (#165)

Closes #163

Discord's API sucks a lot. You ask it for a member, but it won't give
you a member. This is why this PR updates the
`GetEventNotificationMentions` method used to determine what roles and
users should get pinged for a scheduled event. Previously, the bot asked
Discord to provide the member for each subscriber to determine whether
or not they have the event notification role (to avoid pinging people
personally when the role would already ping them). With this pull
request, the bot uses MemberData, it's own member storage, for that
purpose (if you're wondering why, refer to the first two sentences)
---
 src/Services/Update/ScheduledEventUpdateService.cs |  4 ++--
 src/Services/UtilityService.cs                     | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Services/Update/ScheduledEventUpdateService.cs b/src/Services/Update/ScheduledEventUpdateService.cs
index 20d23fa..792eef9 100644
--- a/src/Services/Update/ScheduledEventUpdateService.cs
+++ b/src/Services/Update/ScheduledEventUpdateService.cs
@@ -286,7 +286,7 @@ public sealed class ScheduledEventUpdateService : BackgroundService
         };
 
         var contentResult = await _utility.GetEventNotificationMentions(
-            scheduledEvent, data.Settings, ct);
+            scheduledEvent, data, ct);
         if (!contentResult.IsDefined(out var content))
         {
             return Result.FromError(contentResult);
@@ -412,7 +412,7 @@ public sealed class ScheduledEventUpdateService : BackgroundService
         IGuildScheduledEvent scheduledEvent, GuildData data, CancellationToken ct)
     {
         var contentResult = await _utility.GetEventNotificationMentions(
-            scheduledEvent, data.Settings, ct);
+            scheduledEvent, data, ct);
         if (!contentResult.IsDefined(out var content))
         {
             return Result.FromError(contentResult);
diff --git a/src/Services/UtilityService.cs b/src/Services/UtilityService.cs
index b144ca7..5bc06ea 100644
--- a/src/Services/UtilityService.cs
+++ b/src/Services/UtilityService.cs
@@ -160,16 +160,16 @@ public sealed class UtilityService : IHostedService
     /// <param name="scheduledEvent">
     ///     The scheduled event whose subscribers will be mentioned.
     /// </param>
-    /// <param name="settings">The settings of the guild containing the scheduled event</param>
+    /// <param name="data">The data of the guild containing the scheduled event.</param>
     /// <param name="ct">The cancellation token for this operation.</param>
     /// <returns>A result containing the string which may or may not have succeeded.</returns>
     public async Task<Result<string>> GetEventNotificationMentions(
-        IGuildScheduledEvent scheduledEvent, JsonNode settings, CancellationToken ct = default)
+        IGuildScheduledEvent scheduledEvent, GuildData data, CancellationToken ct = default)
     {
         var builder = new StringBuilder();
-        var role = GuildSettings.EventNotificationRole.Get(settings);
+        var role = GuildSettings.EventNotificationRole.Get(data.Settings);
         var subscribersResult = await _eventApi.GetGuildScheduledEventUsersAsync(
-            scheduledEvent.GuildID, scheduledEvent.ID, withMember: true, ct: ct);
+            scheduledEvent.GuildID, scheduledEvent.ID, ct: ct);
         if (!subscribersResult.IsDefined(out var subscribers))
         {
             return Result<string>.FromError(subscribersResult);
@@ -181,7 +181,7 @@ public sealed class UtilityService : IHostedService
         }
 
         builder = subscribers.Where(
-                subscriber => subscriber.GuildMember.IsDefined(out var member) && !member.Roles.Contains(role))
+                subscriber => !data.GetOrCreateMemberData(subscriber.User.ID).Roles.Contains(role.Value))
             .Aggregate(builder, (current, subscriber) => current.Append($"{Mention.User(subscriber.User)} "));
         return builder.ToString();
     }