Implement with_counts for user guild endpoint.

See discord/discord-api-docs#5628.
Remora · Jul 14, 2023 · 2d50e88 · 2d50e88
1 parent 8f8d27d
commit 2d50e88
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/Backend/Remora.Discord.API.Abstractions/API/Rest/IDiscordRestUserAPI.cs b/Backend/Remora.Discord.API.Abstractions/API/Rest/IDiscordRestUserAPI.cs
@@ -76,13 +76,15 @@ Task<Result<IUser>> ModifyCurrentUserAsync
     /// <param name="before">Get guilds before this guild ID.</param>
     /// <param name="after">Get guilds after this guild ID.</param>
     /// <param name="limit">The maximum number of guilds to get (1-200). Defaults to 200.</param>
+    /// <param name="withCounts">Whether member and presence counts should be included.</param>
     /// <param name="ct">The cancellation token for this operation.</param>
     /// <returns>A retrieval result which may or may not have succeeded.</returns>
     Task<Result<IReadOnlyList<IPartialGuild>>> GetCurrentUserGuildsAsync
     (
         Optional<Snowflake> before = default,
         Optional<Snowflake> after = default,
         Optional<int> limit = default,
+        Optional<bool> withCounts = default,
         CancellationToken ct = default
     );
 

diff --git a/Backend/Remora.Discord.Caching/API/CachingDiscordRestUserAPI.Delegations.cs b/Backend/Remora.Discord.Caching/API/CachingDiscordRestUserAPI.Delegations.cs
@@ -39,10 +39,11 @@ public Task<Result<IReadOnlyList<IPartialGuild>>> GetCurrentUserGuildsAsync
         Optional<Snowflake> before = default,
         Optional<Snowflake> after = default,
         Optional<int> limit = default,
+        Optional<bool> withCounts = default,
         CancellationToken ct = default
     )
     {
-        return _actual.GetCurrentUserGuildsAsync(before, after, limit, ct);
+        return _actual.GetCurrentUserGuildsAsync(before, after, limit, withCounts, ct);
     }
 
     /// <inheritdoc />

diff --git a/Backend/Remora.Discord.Rest/API/Users/DiscordRestUserAPI.cs b/Backend/Remora.Discord.Rest/API/Users/DiscordRestUserAPI.cs
@@ -123,6 +123,7 @@ public virtual async Task<Result<IReadOnlyList<IPartialGuild>>> GetCurrentUserGu
         Optional<Snowflake> before = default,
         Optional<Snowflake> after = default,
         Optional<int> limit = default,
+        Optional<bool> withCounts = default,
         CancellationToken ct = default
     )
     {
@@ -155,6 +156,11 @@ public virtual async Task<Result<IReadOnlyList<IPartialGuild>>> GetCurrentUserGu
                     b.AddQueryParameter("limit", realLimit.ToString());
                 }
 
+                if (withCounts.TryGet(out var realWithCounts))
+                {
+                    b.AddQueryParameter("with_counts", realWithCounts.ToString());
+                }
+
                 b.WithRateLimitContext(this.RateLimitCache);
             },
             ct: ct

diff --git a/Tests/Remora.Discord.Rest.Tests/API/Users/DiscordRestUserAPITests.cs b/Tests/Remora.Discord.Rest.Tests/API/Users/DiscordRestUserAPITests.cs
@@ -239,6 +239,7 @@ public async Task PerformsRequestCorrectly()
             var before = DiscordSnowflake.New(0);
             var after = DiscordSnowflake.New(1);
             var limit = 10;
+            var withCounts = true;
 
             var api = CreateAPI
             (
@@ -250,13 +251,14 @@ public async Task PerformsRequestCorrectly()
                         {
                             new KeyValuePair<string, string>("before", before.ToString()),
                             new KeyValuePair<string, string>("after", after.ToString()),
-                            new KeyValuePair<string, string>("limit", limit.ToString())
+                            new KeyValuePair<string, string>("limit", limit.ToString()),
+                            new KeyValuePair<string, string>("with_counts", withCounts.ToString())
                         }
                     )
                     .Respond("application/json", "[]")
             );
 
-            var result = await api.GetCurrentUserGuildsAsync(before, after, limit);
+            var result = await api.GetCurrentUserGuildsAsync(before, after, limit, withCounts);
             ResultAssert.Successful(result);
         }