Browse Source

Ignore cache impl

pull/2223/head
Armano den Boef 3 years ago
parent
commit
2ed8058974
3 changed files with 18 additions and 73 deletions
  1. +3
    -9
      src/Discord.Net.Core/Entities/Guilds/IGuild.cs
  2. +6
    -27
      src/Discord.Net.Rest/Entities/Guilds/RestGuild.cs
  3. +9
    -37
      src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs

+ 3
- 9
src/Discord.Net.Core/Entities/Guilds/IGuild.cs View File

@@ -424,13 +424,11 @@ namespace Discord
/// </note>
/// </remarks>
/// <param name="limit">The amount of bans to get from the guild.</param>
/// <param name="mode">The <see cref="CacheMode"/> that determines whether the object should be fetched from
/// cache.</param>
/// <param name="options">The options to be used when sending the request.</param>
/// <returns>
/// A paged collection of bans.
/// </returns>
IAsyncEnumerable<IReadOnlyCollection<IBan>> GetBansAsync(int limit = DiscordConfig.MaxBansPerBatch, CacheMode mode = CacheMode.AllowDownload, RequestOptions options = null);
IAsyncEnumerable<IReadOnlyCollection<IBan>> GetBansAsync(int limit = DiscordConfig.MaxBansPerBatch, RequestOptions options = null);
/// <summary>
/// Gets <paramref name="limit"/> amount of bans from the guild starting at the provided <paramref name="fromUserId"/>
/// </summary>
@@ -448,13 +446,11 @@ namespace Discord
/// <param name="fromUserId">The ID of the user to start to get bans from.</param>
/// <param name="dir">The direction of the bans to be gotten.</param>
/// <param name="limit">The number of bans to get.</param>
/// <param name="mode">The <see cref="CacheMode"/> that determines whether the object should be fetched from
/// cache.</param>
/// <param name="options">The options to be used when sending the request.</param>
/// <returns>
/// A paged collection of bans.
/// </returns>
IAsyncEnumerable<IReadOnlyCollection<IBan>> GetBansAsync(ulong fromUserId, Direction dir, int limit = DiscordConfig.MaxBansPerBatch, CacheMode mode = CacheMode.AllowDownload, RequestOptions options = null);
IAsyncEnumerable<IReadOnlyCollection<IBan>> GetBansAsync(ulong fromUserId, Direction dir, int limit = DiscordConfig.MaxBansPerBatch, RequestOptions options = null);
/// <summary>
/// Gets <paramref name="limit"/> amount of bans from the guild starting at the provided <paramref name="fromUser"/>
/// </summary>
@@ -472,13 +468,11 @@ namespace Discord
/// <param name="fromUser">The user to start to get bans from.</param>
/// <param name="dir">The direction of the bans to be gotten.</param>
/// <param name="limit">The number of bans to get.</param>
/// <param name="mode">The <see cref="CacheMode"/> that determines whether the object should be fetched from
/// cache.</param>
/// <param name="options">The options to be used when sending the request.</param>
/// <returns>
/// A paged collection of bans.
/// </returns>
IAsyncEnumerable<IReadOnlyCollection<IBan>> GetBansAsync(IUser fromUser, Direction dir, int limit = DiscordConfig.MaxBansPerBatch, CacheMode mode = CacheMode.AllowDownload, RequestOptions options = null);
IAsyncEnumerable<IReadOnlyCollection<IBan>> GetBansAsync(IUser fromUser, Direction dir, int limit = DiscordConfig.MaxBansPerBatch, RequestOptions options = null);
/// <summary>
/// Gets a ban object for a banned user.
/// </summary>


+ 6
- 27
src/Discord.Net.Rest/Entities/Guilds/RestGuild.cs View File

@@ -1263,35 +1263,14 @@ namespace Discord.Rest
async Task<IReadOnlyCollection<IGuildScheduledEvent>> IGuild.GetEventsAsync(RequestOptions options)
=> await GetEventsAsync(options).ConfigureAwait(false);
/// <inheritdoc />
IAsyncEnumerable<IReadOnlyCollection<IBan>> IGuild.GetBansAsync(int limit, CacheMode mode, RequestOptions options)
{
if (mode == CacheMode.AllowDownload)
{
return GetBansAsync(limit, options);
}
else
return AsyncEnumerable.Empty<IReadOnlyCollection<IBan>>();
}
IAsyncEnumerable<IReadOnlyCollection<IBan>> IGuild.GetBansAsync(int limit, RequestOptions options)
=> GetBansAsync(limit, options);
/// <inheritdoc />
IAsyncEnumerable<IReadOnlyCollection<IBan>> IGuild.GetBansAsync(ulong fromUserId, Direction dir, int limit, CacheMode mode, RequestOptions options)
{
if (mode == CacheMode.AllowDownload)
{
return GetBansAsync(fromUserId, dir, limit, options);
}
else
return AsyncEnumerable.Empty<IReadOnlyCollection<IBan>>();
}
IAsyncEnumerable<IReadOnlyCollection<IBan>> IGuild.GetBansAsync(ulong fromUserId, Direction dir, int limit, RequestOptions options)
=> GetBansAsync(fromUserId, dir, limit, options);
/// <inheritdoc />
IAsyncEnumerable<IReadOnlyCollection<IBan>> IGuild.GetBansAsync(IUser fromUser, Direction dir, int limit, CacheMode mode, RequestOptions options)
{
if (mode == CacheMode.AllowDownload)
{
return GetBansAsync(fromUser, dir, limit, options);
}
else
return AsyncEnumerable.Empty<IReadOnlyCollection<IBan>>();
}
IAsyncEnumerable<IReadOnlyCollection<IBan>> IGuild.GetBansAsync(IUser fromUser, Direction dir, int limit, RequestOptions options)
=> GetBansAsync(fromUser, dir, limit, options);
/// <inheritdoc/>
async Task<IBan> IGuild.GetBanAsync(IUser user, RequestOptions options)
=> await GetBanAsync(user, options).ConfigureAwait(false);


+ 9
- 37
src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs View File

@@ -637,13 +637,11 @@ namespace Discord.WebSocket
/// </note>
/// </remarks>
/// <param name="limit">The number of bans to get.</param>
/// <param name="mode">The <see cref="CacheMode"/> that determines whether the object should be fetched from
/// cache.</param>
/// <param name="options">The options to be used when sending the request.</param>
/// <returns>
/// A paged collection of bans.
/// </returns>
public IAsyncEnumerable<IReadOnlyCollection<RestBan>> GetBansAsync(int limit = DiscordConfig.MaxBansPerBatch, CacheMode mode = CacheMode.AllowDownload, RequestOptions options = null)
public IAsyncEnumerable<IReadOnlyCollection<RestBan>> GetBansAsync(int limit = DiscordConfig.MaxBansPerBatch, RequestOptions options = null)
=> GuildHelper.GetBansAsync(this, Discord, null, Direction.Before, limit, options);

/// <summary>
@@ -663,13 +661,11 @@ namespace Discord.WebSocket
/// <param name="fromUserId">The ID of the user to start to get bans from.</param>
/// <param name="dir">The direction of the bans to be gotten.</param>
/// <param name="limit">The number of bans to get.</param>
/// <param name="mode">The <see cref="CacheMode"/> that determines whether the object should be fetched from
/// cache.</param>
/// <param name="options">The options to be used when sending the request.</param>
/// <returns>
/// A paged collection of bans.
/// </returns>
public IAsyncEnumerable<IReadOnlyCollection<RestBan>> GetBansAsync(ulong fromUserId, Direction dir, int limit = DiscordConfig.MaxBansPerBatch, CacheMode mode = CacheMode.AllowDownload, RequestOptions options = null)
public IAsyncEnumerable<IReadOnlyCollection<RestBan>> GetBansAsync(ulong fromUserId, Direction dir, int limit = DiscordConfig.MaxBansPerBatch, RequestOptions options = null)
=> GuildHelper.GetBansAsync(this, Discord, fromUserId, dir, limit, options);

/// <summary>
@@ -689,13 +685,11 @@ namespace Discord.WebSocket
/// <param name="fromUser">The user to start to get bans from.</param>
/// <param name="dir">The direction of the bans to be gotten.</param>
/// <param name="limit">The number of bans to get.</param>
/// <param name="mode">The <see cref="CacheMode"/> that determines whether the object should be fetched from
/// cache.</param>
/// <param name="options">The options to be used when sending the request.</param>
/// <returns>
/// A paged collection of bans.
/// </returns>
public IAsyncEnumerable<IReadOnlyCollection<RestBan>> GetBansAsync(IUser fromUser, Direction dir, int limit = DiscordConfig.MaxBansPerBatch, CacheMode mode = CacheMode.AllowDownload, RequestOptions options = null)
public IAsyncEnumerable<IReadOnlyCollection<RestBan>> GetBansAsync(IUser fromUser, Direction dir, int limit = DiscordConfig.MaxBansPerBatch, RequestOptions options = null)
=> GuildHelper.GetBansAsync(this, Discord, fromUser.Id, dir, limit, options);

/// <summary>
@@ -1876,36 +1870,14 @@ namespace Discord.WebSocket
async Task<IReadOnlyCollection<IGuildScheduledEvent>> IGuild.GetEventsAsync(RequestOptions options)
=> await GetEventsAsync(options).ConfigureAwait(false);
/// <inheritdoc />
IAsyncEnumerable<IReadOnlyCollection<IBan>> IGuild.GetBansAsync(int limit, RequestOptions options)
=> GetBansAsync(limit, options);
/// <inheritdoc />
IAsyncEnumerable<IReadOnlyCollection<IBan>> IGuild.GetBansAsync(int limit, CacheMode mode, RequestOptions options)
{
if (mode == CacheMode.AllowDownload)
{
return GetBansAsync(limit, options);
}
else
return AsyncEnumerable.Empty<IReadOnlyCollection<IBan>>();
}
IAsyncEnumerable<IReadOnlyCollection<IBan>> IGuild.GetBansAsync(ulong fromUserId, Direction dir, int limit, RequestOptions options)
=> GetBansAsync(fromUserId, dir, limit, options);
/// <inheritdoc />
IAsyncEnumerable<IReadOnlyCollection<IBan>> IGuild.GetBansAsync(ulong fromUserId, Direction dir, int limit, CacheMode mode, RequestOptions options)
{
if (mode == CacheMode.AllowDownload)
{
return GetBansAsync(fromUserId, dir, limit, options);
}
else
return AsyncEnumerable.Empty<IReadOnlyCollection<IBan>>();
}
/// <inheritdoc />
IAsyncEnumerable<IReadOnlyCollection<IBan>> IGuild.GetBansAsync(IUser fromUser, Direction dir, int limit, CacheMode mode, RequestOptions options)
{
if (mode == CacheMode.AllowDownload)
{
return GetBansAsync(fromUser, dir, limit, options);
}
else
return AsyncEnumerable.Empty<IReadOnlyCollection<IBan>>();
}
IAsyncEnumerable<IReadOnlyCollection<IBan>> IGuild.GetBansAsync(IUser fromUser, Direction dir, int limit, RequestOptions options)
=> GetBansAsync(fromUser, dir, limit, options);
/// <inheritdoc/>
async Task<IBan> IGuild.GetBanAsync(IUser user, RequestOptions options)
=> await GetBanAsync(user, options).ConfigureAwait(false);


Loading…
Cancel
Save