Browse Source

Add BaseSocketClient#DownloadUsersAsync().

Style cleanups.
pull/773/head
AntiTcb 8 years ago
parent
commit
75a0206318
6 changed files with 8 additions and 11 deletions
  1. +2
    -3
      src/Discord.Net.Rpc/DiscordRpcClient.cs
  2. +1
    -1
      src/Discord.Net.WebSocket/BaseSocketClient.cs
  3. +1
    -2
      src/Discord.Net.WebSocket/DiscordShardedClient.Events.cs
  4. +1
    -1
      src/Discord.Net.WebSocket/DiscordShardedClient.cs
  5. +1
    -2
      src/Discord.Net.WebSocket/DiscordSocketClient.Events.cs
  6. +2
    -2
      src/Discord.Net.WebSocket/DiscordSocketClient.cs

+ 2
- 3
src/Discord.Net.Rpc/DiscordRpcClient.cs View File

@@ -67,8 +67,7 @@ namespace Discord.Rpc

public Task StartAsync() => _connection.StartAsync();
public Task StopAsync() => _connection.StopAsync();

private async Task OnConnectingAsync()
{
await _rpcLogger.DebugAsync("Connecting ApiClient").ConfigureAwait(false);
@@ -450,7 +449,7 @@ namespace Discord.Rpc
//Others
default:
await _rpcLogger.WarningAsync($"Unknown Dispatch ({evnt})").ConfigureAwait(false);
return;
return;
}
break;



+ 1
- 1
src/Discord.Net.WebSocket/BaseSocketClient.cs View File

@@ -45,7 +45,7 @@ namespace Discord.WebSocket
public abstract Task StopAsync();
public abstract Task SetStatusAsync(UserStatus status);
public abstract Task SetGameAsync(string name, string streamUrl = null, StreamType streamType = StreamType.NotStreaming);
// TODO: DownloadUsersAsync?
public abstract Task DownloadUsersAsync(IEnumerable<IGuild> guilds);

/// <inheritdoc />
public Task<RestGuild> CreateGuildAsync(string name, IVoiceRegion region, Stream jpegIcon = null, RequestOptions options = null)


+ 1
- 2
src/Discord.Net.WebSocket/DiscordShardedClient.Events.cs View File

@@ -2,8 +2,7 @@
using System.Threading.Tasks;

namespace Discord.WebSocket
{
//TODO: Add event docstrings
{
public partial class DiscordShardedClient
{
/// <summary>


+ 1
- 1
src/Discord.Net.WebSocket/DiscordShardedClient.cs View File

@@ -214,7 +214,7 @@ namespace Discord.WebSocket
=> _shards[0].GetVoiceRegion(id);

/// <summary> Downloads the users list for the provided guilds, if they don't have a complete list. </summary>
public async Task DownloadUsersAsync(IEnumerable<SocketGuild> guilds)
public override async Task DownloadUsersAsync(IEnumerable<IGuild> guilds)
{
for (int i = 0; i < _shards.Length; i++)
{


+ 1
- 2
src/Discord.Net.WebSocket/DiscordSocketClient.Events.cs View File

@@ -2,8 +2,7 @@
using System.Threading.Tasks;

namespace Discord.WebSocket
{
//TODO: Add event docstrings
{
public partial class DiscordSocketClient
{
//General


+ 2
- 2
src/Discord.Net.WebSocket/DiscordSocketClient.cs View File

@@ -231,7 +231,7 @@ namespace Discord.WebSocket

/// <inheritdoc />
public override async Task<RestApplication> GetApplicationInfoAsync(RequestOptions options = null)
=> _applicationInfo ?? (_applicationInfo = await ClientHelper.GetApplicationInfoAsync(this, options ?? RequestOptions.Default));
=> _applicationInfo ?? (_applicationInfo = await ClientHelper.GetApplicationInfoAsync(this, options ?? RequestOptions.Default).ConfigureAwait(false));

/// <inheritdoc />
public override SocketGuild GetGuild(ulong id)
@@ -278,7 +278,7 @@ namespace Discord.WebSocket
}

/// <summary> Downloads the users list for the provided guilds, if they don't have a complete list. </summary>
public async Task DownloadUsersAsync(IEnumerable<IGuild> guilds)
public override async Task DownloadUsersAsync(IEnumerable<IGuild> guilds)
{
if (ConnectionState == ConnectionState.Connected)
{


Loading…
Cancel
Save