github/Discord.Net
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Feature] Add excludeDeleted argument to GetEntitlementsAsync (#3074)

Browse Source 
* add `excludeDeleted` argument

* i love when it still builds locally somehow
This commit is contained in:
Mihail Gribkov
2025-03-02 01:17:08 +03:00
committed by GitHub
parent aa66928c48
commit 9c9407b7f4
7 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Discord.Net.Core/IDiscordClient.cs
View File

@@ -343,7 +343,7 @@ namespace Discord
/// </summary>
IAsyncEnumerable<IReadOnlyCollection<IEntitlement>> GetEntitlementsAsync(int limit = 100,
ulong? afterId = null, ulong? beforeId = null, bool excludeEnded = false, ulong? guildId = null, ulong? userId = null,
ulong[] skuIds = null, RequestOptions options = null);
ulong[] skuIds = null, RequestOptions options = null, bool? excludeDeleted = null);
/// <summary>
/// Returns all SKUs for a given application.

2
src/Discord.Net.Rest/API/Rest/ListEntitlementsParams.cs
View File

@@ -15,4 +15,6 @@ internal class ListEntitlementsParams
public Optional<ulong> GuildId { get; set; }
public Optional<bool> ExcludeEnded { get; set; }
public Optional<bool> ExcludeDeleted { get; set; }
}

2
src/Discord.Net.Rest/BaseDiscordClient.cs
View File

@@ -287,7 +287,7 @@ namespace Discord.Rest
/// Returns all entitlements for a given app.
/// </summary>
IAsyncEnumerable<IReadOnlyCollection<IEntitlement>> IDiscordClient.GetEntitlementsAsync(int limit, ulong? afterId, ulong? beforeId,
bool excludeEnded, ulong? guildId, ulong? userId, ulong[] skuIds, RequestOptions options) => AsyncEnumerable.Empty<IReadOnlyCollection<IEntitlement>>();
bool excludeEnded, ulong? guildId, ulong? userId, ulong[] skuIds, RequestOptions options, bool? excludeDeleted) => AsyncEnumerable.Empty<IReadOnlyCollection<IEntitlement>>();
/// <summary>
/// Gets all SKUs for a given application.

3
src/Discord.Net.Rest/ClientHelper.cs
View File

@@ -405,7 +405,7 @@ namespace Discord.Rest
public static IAsyncEnumerable<IReadOnlyCollection<RestEntitlement>> ListEntitlementsAsync(BaseDiscordClient client, int? limit = 100,
ulong? afterId = null, ulong? beforeId = null, bool excludeEnded = false, ulong? guildId = null, ulong? userId = null,
ulong[] skuIds = null, RequestOptions options = null)
ulong[] skuIds = null, bool? excludeDeleted = null, RequestOptions options = null)
{
return new PagedAsyncEnumerable<RestEntitlement>(
DiscordConfig.MaxEntitlementsPerBatch,
@@ -419,6 +419,7 @@ namespace Discord.Rest
GuildId = guildId ?? Optional<ulong>.Unspecified,
UserId = userId ?? Optional<ulong>.Unspecified,
SkuIds = skuIds ?? Optional<ulong[]>.Unspecified,
ExcludeDeleted = excludeDeleted ?? Optional<bool>.Unspecified
};
if (info.Position != null)
args.AfterId = info.Position.Value;

5
src/Discord.Net.Rest/DiscordRestApiClient.cs
View File

@@ -2842,6 +2842,11 @@ namespace Discord.API
query += $"&exclude_ended={args.ExcludeEnded.Value}";
}
if (args.ExcludeDeleted.IsSpecified)
{
query += $"&exclude_deleted={args.ExcludeDeleted.Value}";
}
return SendAsync<Entitlement[]>("GET", () => $"applications/{CurrentApplicationId}/entitlements{query}", new BucketIds(), options: options);
}

4
src/Discord.Net.Rest/DiscordRestClient.cs
View File

@@ -289,8 +289,8 @@ namespace Discord.Rest
/// <inheritdoc cref="IDiscordClient.GetEntitlementsAsync" />
public IAsyncEnumerable<IReadOnlyCollection<IEntitlement>> GetEntitlementsAsync(int? limit = 100,
ulong? afterId = null, ulong? beforeId = null, bool excludeEnded = false, ulong? guildId = null, ulong? userId = null,
ulong[] skuIds = null, RequestOptions options = null)
=> ClientHelper.ListEntitlementsAsync(this, limit, afterId, beforeId, excludeEnded, guildId, userId, skuIds, options);
ulong[] skuIds = null, RequestOptions options = null, bool? excludeDeleted = null)
=> ClientHelper.ListEntitlementsAsync(this, limit, afterId, beforeId, excludeEnded, guildId, userId, skuIds, excludeDeleted, options);
/// <inheritdoc />
public Task<IReadOnlyCollection<SKU>> GetSKUsAsync(RequestOptions options = null)

4
src/Discord.Net.WebSocket/DiscordSocketClient.cs
View File

@@ -442,8 +442,8 @@ namespace Discord.WebSocket
/// <inheritdoc cref="IDiscordClient.GetEntitlementsAsync"/>
public IAsyncEnumerable<IReadOnlyCollection<IEntitlement>> GetEntitlementsAsync(int? limit = 100,
ulong? afterId = null, ulong? beforeId = null, bool excludeEnded = false, ulong? guildId = null, ulong? userId = null,
ulong[] skuIds = null, RequestOptions options = null)
=> ClientHelper.ListEntitlementsAsync(this, limit, afterId, beforeId, excludeEnded, guildId, userId, skuIds, options);
ulong[] skuIds = null, RequestOptions options = null, bool? excludeDeleted = null)
=> ClientHelper.ListEntitlementsAsync(this, limit, afterId, beforeId, excludeEnded, guildId, userId, skuIds, excludeDeleted, options);
/// <inheritdoc />
public Task<IReadOnlyCollection<SKU>> GetSKUsAsync(RequestOptions options = null)