Fix GetGuildBoostSubscriptionsAsync

gehongyan · Nov 20, 2022 · 37076d6 · 37076d6
1 parent efae1a9
commit 37076d6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/src/Kook.Net.Core/KookConfig.cs b/src/Kook.Net.Core/KookConfig.cs
@@ -130,6 +130,11 @@ public class KookConfig
     /// </returns>
     public const int MaxIntimacyScore = 2200;
 
+    /// <summary>
+    ///     Returns the duration of a Kook boost pack.
+    /// </summary>
+    public static readonly TimeSpan BoostPackDuration = TimeSpan.FromDays(30);
+
     /// <summary>
     ///     Gets or sets how a request should act in the case of an error, by default.
     /// </summary>

diff --git a/src/Kook.Net.Rest/Entities/Guilds/GuildHelper.cs b/src/Kook.Net.Rest/Entities/Guilds/GuildHelper.cs
@@ -31,7 +31,7 @@ public static async Task<ImmutableDictionary<IUser, IReadOnlyCollection<BoostSub
         IGuild guild, BaseKookClient client, RequestOptions options)
     {
         IEnumerable<BoostSubscription> subscriptions = await client.ApiClient
-            .GetGuildBoostSubscriptionsAsync(guild.Id, since: DateTimeOffset.Now, options: options).FlattenAsync();
+            .GetGuildBoostSubscriptionsAsync(guild.Id, since: DateTimeOffset.Now.Add(-KookConfig.BoostPackDuration), options: options).FlattenAsync();
         return subscriptions.GroupBy(x => x.UserId)
             .ToImmutableDictionary(x => RestUser.Create(client, x.First().User) as IUser,
                 x => x.GroupBy(y => (y.StartTime, y.EndTime))

diff --git a/src/Kook.Net.Rest/KookRestApiClient.cs b/src/Kook.Net.Rest/KookRestApiClient.cs
@@ -443,8 +443,8 @@ public IAsyncEnumerable<IReadOnlyCollection<BoostSubscription>> GetGuildBoostSub
     {
         Preconditions.NotEqual(guildId, 0, nameof(guildId));
         string query = $"guild_id={guildId}";
-        if (since.HasValue) query += $"&start_time={since.Value.ToUnixTimeMilliseconds()}";
-        if (until.HasValue) query += $"&end_time={until.Value.ToUnixTimeMilliseconds()}";
+        if (since.HasValue) query += $"&start_time={since.Value.ToUnixTimeSeconds()}";
+        if (until.HasValue) query += $"&end_time={until.Value.ToUnixTimeSeconds()}";
         options = RequestOptions.CreateOrClone(options);
 
         var ids = new BucketIds(guildId: guildId);

diff --git a/src/Kook.Net.WebSocket/Entities/Guilds/SocketGuildHelper.cs b/src/Kook.Net.WebSocket/Entities/Guilds/SocketGuildHelper.cs
@@ -33,7 +33,7 @@ public static async Task<ImmutableDictionary<IUser, IReadOnlyCollection<BoostSub
         SocketGuild guild, BaseSocketClient client, RequestOptions options)
     {
         IEnumerable<BoostSubscription> subscriptions = await client.ApiClient
-            .GetGuildBoostSubscriptionsAsync(guild.Id, since: DateTimeOffset.Now, options: options).FlattenAsync();
+            .GetGuildBoostSubscriptionsAsync(guild.Id, since: DateTimeOffset.Now.Add(-KookConfig.BoostPackDuration), options: options).FlattenAsync();
         return subscriptions.GroupBy(x => x.UserId)
             .ToImmutableDictionary(x => guild.GetUser(x.Key) ?? client.GetUser(x.Key) ?? RestUser.Create(client, x.First().User) as IUser,
                 x => x.GroupBy(y => (y.StartTime, y.EndTime))