From fe35400498b094ac8e738d1164d3872da13a99cb Mon Sep 17 00:00:00 2001 From: RogueException Date: Tue, 24 Jan 2017 11:42:28 -0400 Subject: [PATCH] Cleanup --- src/Discord.Net.Commands/Info/ModuleInfo.cs | 1 - src/Discord.Net.Commands/Info/ParameterInfo.cs | 1 - src/Discord.Net.Core/Audio/IAudioClient.cs | 1 - src/Discord.Net.Core/Extensions/GuildUserExtensions.cs | 1 - src/Discord.Net.Core/Utils/Preconditions.cs | 1 - src/Discord.Net.Rest/DiscordRestClient.cs | 3 +-- .../Entities/Channels/RestGuildChannel.cs | 3 +-- src/Discord.Net.Rest/Entities/Invites/InviteHelper.cs | 1 - src/Discord.Net.Rest/Entities/Roles/RestRole.cs | 3 +-- src/Discord.Net.Rest/Entities/Roles/RoleHelper.cs | 3 +-- src/Discord.Net.Rest/Entities/Users/RestGuildUser.cs | 3 +-- src/Discord.Net.Rest/Entities/Users/RestSelfUser.cs | 3 +-- src/Discord.Net.Rest/Net/Converters/ImageConverter.cs | 3 +-- src/Discord.Net.Rpc/DiscordRpcApiClient.cs | 2 +- .../Entities/Channels/RpcGuildChannel.cs | 1 - .../Entities/Channels/RpcTextChannel.cs | 3 +-- .../Entities/Messages/RpcUserMessage.cs | 3 +-- .../Entities/Users/UserVoiceProperties.cs | 10 ---------- src/Discord.Net.WebSocket/Audio/AudioClient.cs | 1 - .../Entities/Channels/SocketGuildChannel.cs | 3 +-- .../Entities/Channels/SocketTextChannel.cs | 3 +-- src/Discord.Net.WebSocket/Entities/Roles/SocketRole.cs | 3 +-- .../Entities/Users/SocketGuildUser.cs | 3 +-- .../Entities/Users/SocketSelfUser.cs | 3 +-- 24 files changed, 15 insertions(+), 47 deletions(-) delete mode 100644 src/Discord.Net.Rpc/Entities/Users/UserVoiceProperties.cs diff --git a/src/Discord.Net.Commands/Info/ModuleInfo.cs b/src/Discord.Net.Commands/Info/ModuleInfo.cs index 40a43459..198d2a92 100644 --- a/src/Discord.Net.Commands/Info/ModuleInfo.cs +++ b/src/Discord.Net.Commands/Info/ModuleInfo.cs @@ -1,4 +1,3 @@ -using System; using System.Linq; using System.Collections.Generic; using System.Collections.Immutable; diff --git a/src/Discord.Net.Commands/Info/ParameterInfo.cs b/src/Discord.Net.Commands/Info/ParameterInfo.cs index 45ce3f0f..a0cdf03d 100644 --- a/src/Discord.Net.Commands/Info/ParameterInfo.cs +++ b/src/Discord.Net.Commands/Info/ParameterInfo.cs @@ -1,5 +1,4 @@ using System; -using System.Linq; using System.Collections.Generic; using System.Collections.Immutable; using System.Threading.Tasks; diff --git a/src/Discord.Net.Core/Audio/IAudioClient.cs b/src/Discord.Net.Core/Audio/IAudioClient.cs index dfc6f60b..472ad32f 100644 --- a/src/Discord.Net.Core/Audio/IAudioClient.cs +++ b/src/Discord.Net.Core/Audio/IAudioClient.cs @@ -1,5 +1,4 @@ using System; -using System.IO; using System.Threading.Tasks; namespace Discord.Audio diff --git a/src/Discord.Net.Core/Extensions/GuildUserExtensions.cs b/src/Discord.Net.Core/Extensions/GuildUserExtensions.cs index 855551c3..9d152adf 100644 --- a/src/Discord.Net.Core/Extensions/GuildUserExtensions.cs +++ b/src/Discord.Net.Core/Extensions/GuildUserExtensions.cs @@ -6,7 +6,6 @@ namespace Discord { public static class GuildUserExtensions { - //TODO: Should we remove Add/Remove? Encourages race conditions. public static Task AddRolesAsync(this IGuildUser user, params IRole[] roles) => ChangeRolesAsync(user, add: roles); public static Task AddRolesAsync(this IGuildUser user, IEnumerable roles) diff --git a/src/Discord.Net.Core/Utils/Preconditions.cs b/src/Discord.Net.Core/Utils/Preconditions.cs index 02cc5d28..14a730b7 100644 --- a/src/Discord.Net.Core/Utils/Preconditions.cs +++ b/src/Discord.Net.Core/Utils/Preconditions.cs @@ -1,5 +1,4 @@ using System; -using System.Linq; namespace Discord { diff --git a/src/Discord.Net.Rest/DiscordRestClient.cs b/src/Discord.Net.Rest/DiscordRestClient.cs index d00a7e1f..384e4382 100644 --- a/src/Discord.Net.Rest/DiscordRestClient.cs +++ b/src/Discord.Net.Rest/DiscordRestClient.cs @@ -1,5 +1,4 @@ -using Discord.Net.Queue; -using System.Collections.Generic; +using System.Collections.Generic; using System.Collections.Immutable; using System.IO; using System.Threading.Tasks; diff --git a/src/Discord.Net.Rest/Entities/Channels/RestGuildChannel.cs b/src/Discord.Net.Rest/Entities/Channels/RestGuildChannel.cs index c3b14cbe..c11d7625 100644 --- a/src/Discord.Net.Rest/Entities/Channels/RestGuildChannel.cs +++ b/src/Discord.Net.Rest/Entities/Channels/RestGuildChannel.cs @@ -1,5 +1,4 @@ -using Discord.API.Rest; -using System; +using System; using System.Collections.Generic; using System.Collections.Immutable; using System.Linq; diff --git a/src/Discord.Net.Rest/Entities/Invites/InviteHelper.cs b/src/Discord.Net.Rest/Entities/Invites/InviteHelper.cs index 8ec42817..80a49e34 100644 --- a/src/Discord.Net.Rest/Entities/Invites/InviteHelper.cs +++ b/src/Discord.Net.Rest/Entities/Invites/InviteHelper.cs @@ -1,5 +1,4 @@ using System.Threading.Tasks; -using Model = Discord.API.Invite; namespace Discord.Rest { diff --git a/src/Discord.Net.Rest/Entities/Roles/RestRole.cs b/src/Discord.Net.Rest/Entities/Roles/RestRole.cs index e39dea1a..7e9f8385 100644 --- a/src/Discord.Net.Rest/Entities/Roles/RestRole.cs +++ b/src/Discord.Net.Rest/Entities/Roles/RestRole.cs @@ -1,5 +1,4 @@ -using Discord.API.Rest; -using System; +using System; using System.Diagnostics; using System.Threading.Tasks; using Model = Discord.API.Role; diff --git a/src/Discord.Net.Rest/Entities/Roles/RoleHelper.cs b/src/Discord.Net.Rest/Entities/Roles/RoleHelper.cs index d6b7c597..0081351f 100644 --- a/src/Discord.Net.Rest/Entities/Roles/RoleHelper.cs +++ b/src/Discord.Net.Rest/Entities/Roles/RoleHelper.cs @@ -1,5 +1,4 @@ -using Discord.API.Rest; -using System; +using System; using System.Threading.Tasks; using Model = Discord.API.Role; diff --git a/src/Discord.Net.Rest/Entities/Users/RestGuildUser.cs b/src/Discord.Net.Rest/Entities/Users/RestGuildUser.cs index ee3551fd..36bda64d 100644 --- a/src/Discord.Net.Rest/Entities/Users/RestGuildUser.cs +++ b/src/Discord.Net.Rest/Entities/Users/RestGuildUser.cs @@ -1,5 +1,4 @@ -using Discord.API.Rest; -using System; +using System; using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; diff --git a/src/Discord.Net.Rest/Entities/Users/RestSelfUser.cs b/src/Discord.Net.Rest/Entities/Users/RestSelfUser.cs index 3afaff77..ab5ec4a3 100644 --- a/src/Discord.Net.Rest/Entities/Users/RestSelfUser.cs +++ b/src/Discord.Net.Rest/Entities/Users/RestSelfUser.cs @@ -1,5 +1,4 @@ -using Discord.API.Rest; -using System; +using System; using System.Diagnostics; using System.Threading.Tasks; using Model = Discord.API.User; diff --git a/src/Discord.Net.Rest/Net/Converters/ImageConverter.cs b/src/Discord.Net.Rest/Net/Converters/ImageConverter.cs index e82b7952..f4d591d7 100644 --- a/src/Discord.Net.Rest/Net/Converters/ImageConverter.cs +++ b/src/Discord.Net.Rest/Net/Converters/ImageConverter.cs @@ -1,5 +1,4 @@ -using Discord.API; -using Newtonsoft.Json; +using Newtonsoft.Json; using System; using Model = Discord.API.Image; diff --git a/src/Discord.Net.Rpc/DiscordRpcApiClient.cs b/src/Discord.Net.Rpc/DiscordRpcApiClient.cs index 05e04706..b1ac7121 100644 --- a/src/Discord.Net.Rpc/DiscordRpcApiClient.cs +++ b/src/Discord.Net.Rpc/DiscordRpcApiClient.cs @@ -237,7 +237,7 @@ namespace Discord.API options = RequestOptions.CreateOrClone(options); var msg = new AuthenticateParams { - AccessToken = _authToken + AccessToken = AuthToken }; options.IgnoreState = true; return await SendRpcAsync("AUTHENTICATE", msg, options: options).ConfigureAwait(false); diff --git a/src/Discord.Net.Rpc/Entities/Channels/RpcGuildChannel.cs b/src/Discord.Net.Rpc/Entities/Channels/RpcGuildChannel.cs index 77579867..99fb3ecd 100644 --- a/src/Discord.Net.Rpc/Entities/Channels/RpcGuildChannel.cs +++ b/src/Discord.Net.Rpc/Entities/Channels/RpcGuildChannel.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; -using Discord.API.Rest; using Model = Discord.API.Rpc.Channel; using Discord.Rest; diff --git a/src/Discord.Net.Rpc/Entities/Channels/RpcTextChannel.cs b/src/Discord.Net.Rpc/Entities/Channels/RpcTextChannel.cs index 29df5f64..9a88072b 100644 --- a/src/Discord.Net.Rpc/Entities/Channels/RpcTextChannel.cs +++ b/src/Discord.Net.Rpc/Entities/Channels/RpcTextChannel.cs @@ -1,5 +1,4 @@ -using Discord.API.Rest; -using Discord.Rest; +using Discord.Rest; using System; using System.Collections.Generic; using System.Collections.Immutable; diff --git a/src/Discord.Net.Rpc/Entities/Messages/RpcUserMessage.cs b/src/Discord.Net.Rpc/Entities/Messages/RpcUserMessage.cs index 71f35126..240290fa 100644 --- a/src/Discord.Net.Rpc/Entities/Messages/RpcUserMessage.cs +++ b/src/Discord.Net.Rpc/Entities/Messages/RpcUserMessage.cs @@ -1,5 +1,4 @@ -using Discord.API.Rest; -using Discord.Rest; +using Discord.Rest; using System; using System.Collections.Generic; using System.Collections.Immutable; diff --git a/src/Discord.Net.Rpc/Entities/Users/UserVoiceProperties.cs b/src/Discord.Net.Rpc/Entities/Users/UserVoiceProperties.cs deleted file mode 100644 index 68409ae9..00000000 --- a/src/Discord.Net.Rpc/Entities/Users/UserVoiceProperties.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace Discord.Rpc.Entities.Users -{ - class UserVoiceProperties - { - } -} diff --git a/src/Discord.Net.WebSocket/Audio/AudioClient.cs b/src/Discord.Net.WebSocket/Audio/AudioClient.cs index 784cdf19..5bedf178 100644 --- a/src/Discord.Net.WebSocket/Audio/AudioClient.cs +++ b/src/Discord.Net.WebSocket/Audio/AudioClient.cs @@ -5,7 +5,6 @@ using Discord.WebSocket; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using System; -using System.IO; using System.Linq; using System.Text; using System.Threading; diff --git a/src/Discord.Net.WebSocket/Entities/Channels/SocketGuildChannel.cs b/src/Discord.Net.WebSocket/Entities/Channels/SocketGuildChannel.cs index 58c93eba..207a60a4 100644 --- a/src/Discord.Net.WebSocket/Entities/Channels/SocketGuildChannel.cs +++ b/src/Discord.Net.WebSocket/Entities/Channels/SocketGuildChannel.cs @@ -1,5 +1,4 @@ -using Discord.API.Rest; -using Discord.Rest; +using Discord.Rest; using System; using System.Collections.Generic; using System.Collections.Immutable; diff --git a/src/Discord.Net.WebSocket/Entities/Channels/SocketTextChannel.cs b/src/Discord.Net.WebSocket/Entities/Channels/SocketTextChannel.cs index ae256495..98aefcf9 100644 --- a/src/Discord.Net.WebSocket/Entities/Channels/SocketTextChannel.cs +++ b/src/Discord.Net.WebSocket/Entities/Channels/SocketTextChannel.cs @@ -1,5 +1,4 @@ -using Discord.API.Rest; -using Discord.Rest; +using Discord.Rest; using System; using System.Collections.Generic; using System.Collections.Immutable; diff --git a/src/Discord.Net.WebSocket/Entities/Roles/SocketRole.cs b/src/Discord.Net.WebSocket/Entities/Roles/SocketRole.cs index ce46aa24..ad4b3aff 100644 --- a/src/Discord.Net.WebSocket/Entities/Roles/SocketRole.cs +++ b/src/Discord.Net.WebSocket/Entities/Roles/SocketRole.cs @@ -1,5 +1,4 @@ -using Discord.API.Rest; -using Discord.Rest; +using Discord.Rest; using System; using System.Diagnostics; using System.Threading.Tasks; diff --git a/src/Discord.Net.WebSocket/Entities/Users/SocketGuildUser.cs b/src/Discord.Net.WebSocket/Entities/Users/SocketGuildUser.cs index 720f39c0..23e0768d 100644 --- a/src/Discord.Net.WebSocket/Entities/Users/SocketGuildUser.cs +++ b/src/Discord.Net.WebSocket/Entities/Users/SocketGuildUser.cs @@ -1,5 +1,4 @@ -using Discord.API.Rest; -using Discord.Rest; +using Discord.Rest; using System; using System.Collections.Generic; using System.Collections.Immutable; diff --git a/src/Discord.Net.WebSocket/Entities/Users/SocketSelfUser.cs b/src/Discord.Net.WebSocket/Entities/Users/SocketSelfUser.cs index fbfdc4cb..0f6d4e4f 100644 --- a/src/Discord.Net.WebSocket/Entities/Users/SocketSelfUser.cs +++ b/src/Discord.Net.WebSocket/Entities/Users/SocketSelfUser.cs @@ -1,5 +1,4 @@ -using Discord.API.Rest; -using Discord.Rest; +using Discord.Rest; using System; using System.Diagnostics; using System.Threading.Tasks;