Browse Source

Added @AntiTcb's suggestions

pull/745/head
ObsidianMinor 8 years ago
parent
commit
d35ef8fa0d
3 changed files with 18 additions and 9 deletions
  1. +10
    -1
      src/Discord.Net.Rest/ClientHelper.cs
  2. +4
    -4
      src/Discord.Net.Rest/Entities/Users/RestUser.cs
  3. +4
    -4
      src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs

+ 10
- 1
src/Discord.Net.Rest/ClientHelper.cs View File

@@ -156,7 +156,16 @@ namespace Discord.Rest
public static async Task<IReadOnlyCollection<RestRelationship>> GetRelationshipsAsync(BaseDiscordClient client) public static async Task<IReadOnlyCollection<RestRelationship>> GetRelationshipsAsync(BaseDiscordClient client)
{ {
var models = await client.ApiClient.GetRelationshipsAsync().ConfigureAwait(false); var models = await client.ApiClient.GetRelationshipsAsync().ConfigureAwait(false);
return models.Select(r => RestRelationship.Create(client, r)).ToImmutableArray();
return models.Select(r => RestRelationship.Create(client, r)).ToReadOnlyCollection(models);
} }

public static async Task AddFriendAsync(BaseDiscordClient client, ulong user, RequestOptions options)
=> await client.ApiClient.AddFriendAsync(user, options).ConfigureAwait(false);

public static async Task BlockUserAsync(BaseDiscordClient client, ulong user, RequestOptions options)
=> await client.ApiClient.BlockUserAsync(user, options).ConfigureAwait(false);

public static async Task RemoveRelationshipAsync(BaseDiscordClient client, ulong user, RequestOptions options)
=> await client.ApiClient.RemoveRelationshipAsync(user, options).ConfigureAwait(false);
} }
} }

+ 4
- 4
src/Discord.Net.Rest/Entities/Users/RestUser.cs View File

@@ -62,13 +62,13 @@ namespace Discord.Rest


public override string ToString() => $"{Username}#{Discriminator}"; public override string ToString() => $"{Username}#{Discriminator}";
private string DebuggerDisplay => $"{Username}#{Discriminator} ({Id}{(IsBot ? ", Bot" : "")})"; private string DebuggerDisplay => $"{Username}#{Discriminator} ({Id}{(IsBot ? ", Bot" : "")})";
public Task AddFriendAsync(RequestOptions options = null) public Task AddFriendAsync(RequestOptions options = null)
=> Discord.ApiClient.AddFriendAsync(Id, options);
=> ClientHelper.AddFriendAsync(Discord, Id, options);
public Task BlockUserAsync(RequestOptions options = null) public Task BlockUserAsync(RequestOptions options = null)
=> Discord.ApiClient.BlockUserAsync(Id, options);
=> ClientHelper.BlockUserAsync(Discord, Id, options);
public Task RemoveRelationshipAsync(RequestOptions options = null) public Task RemoveRelationshipAsync(RequestOptions options = null)
=> Discord.ApiClient.RemoveRelationshipAsync(Id, options);
=> ClientHelper.RemoveRelationshipAsync(Discord, Id, options);


//IUser //IUser
async Task<IDMChannel> IUser.GetOrCreateDMChannelAsync(RequestOptions options) async Task<IDMChannel> IUser.GetOrCreateDMChannelAsync(RequestOptions options)


+ 4
- 4
src/Discord.Net.WebSocket/Entities/Users/SocketUser.cs View File

@@ -65,12 +65,12 @@ namespace Discord.WebSocket
public override string ToString() => $"{Username}#{Discriminator}"; public override string ToString() => $"{Username}#{Discriminator}";
private string DebuggerDisplay => $"{Username}#{Discriminator} ({Id}{(IsBot ? ", Bot" : "")})"; private string DebuggerDisplay => $"{Username}#{Discriminator} ({Id}{(IsBot ? ", Bot" : "")})";
internal SocketUser Clone() => MemberwiseClone() as SocketUser; internal SocketUser Clone() => MemberwiseClone() as SocketUser;
public async Task AddFriendAsync(RequestOptions options = null) public async Task AddFriendAsync(RequestOptions options = null)
=> await Discord.ApiClient.AddFriendAsync(Id, options);
=> await ClientHelper.AddFriendAsync(Discord, Id, options);
public async Task BlockUserAsync(RequestOptions options = null) public async Task BlockUserAsync(RequestOptions options = null)
=> await Discord.ApiClient.BlockUserAsync(Id, options);
=> await ClientHelper.BlockUserAsync(Discord, Id, options);
public async Task RemoveRelationshipAsync(RequestOptions options = null) public async Task RemoveRelationshipAsync(RequestOptions options = null)
=> await Discord.ApiClient.RemoveRelationshipAsync(Id, options);
=> await ClientHelper.RemoveRelationshipAsync(Discord, Id, options);
} }
} }

Loading…
Cancel
Save