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

Style cleanup

Browse Source
This commit is contained in:
RogueException
2017-06-29 19:25:21 -03:00
parent fdd38c8d7f
commit 14dfc48df3
6 changed files with 35 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Discord.Net.Commands/Builders/CommandBuilder.cs
View File

@@ -80,7 +80,7 @@ namespace Discord.Commands.Builders
{ {
for (int i = 0; i < aliases.Length; i++) for (int i = 0; i < aliases.Length; i++)
{ {
var alias = aliases[i] ?? ""; string alias = aliases[i] ?? "";
if (!_aliases.Contains(alias)) if (!_aliases.Contains(alias))
_aliases.Add(alias); _aliases.Add(alias);
} }

2
src/Discord.Net.Commands/Builders/ModuleBuilder.cs
View File

@@ -66,7 +66,7 @@ namespace Discord.Commands.Builders
{ {
for (int i = 0; i < aliases.Length; i++) for (int i = 0; i < aliases.Length; i++)
{ {
var alias = aliases[i] ?? ""; string alias = aliases[i] ?? "";
if (!_aliases.Contains(alias)) if (!_aliases.Contains(alias))
_aliases.Add(alias); _aliases.Add(alias);
} }

2
src/Discord.Net.Commands/Builders/ModuleClassBuilder.cs
View File

@@ -20,7 +20,7 @@ namespace Discord.Commands
info.GetCustomAttribute<DontAutoLoadAttribute>() == null; info.GetCustomAttribute<DontAutoLoadAttribute>() == null;
} }
List<TypeInfo> result = new List<TypeInfo>(); var result = new List<TypeInfo>();
foreach (var typeInfo in assembly.DefinedTypes) foreach (var typeInfo in assembly.DefinedTypes)
{ {

4
src/Discord.Net.Commands/Info/CommandInfo.cs
View File

@@ -154,7 +154,7 @@ namespace Discord.Commands
for (int position = 0; position < Parameters.Count; position++) for (int position = 0; position < Parameters.Count; position++)
{ {
var parameter = Parameters[position]; var parameter = Parameters[position];
var argument = args[position]; object argument = args[position];
var result = await parameter.CheckPreconditionsAsync(context, argument, services).ConfigureAwait(false); var result = await parameter.CheckPreconditionsAsync(context, argument, services).ConfigureAwait(false);
if (!result.IsSuccess) if (!result.IsSuccess)
return ExecuteResult.FromError(result); return ExecuteResult.FromError(result);
@@ -232,7 +232,7 @@ namespace Discord.Commands
argCount--; argCount--;
int i = 0; int i = 0;
foreach (var arg in argList) foreach (object arg in argList)
{ {
if (i == argCount) if (i == argCount)
throw new InvalidOperationException("Command was invoked with too many parameters"); throw new InvalidOperationException("Command was invoked with too many parameters");

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

@@ -30,7 +30,7 @@ namespace Discord.API
protected readonly JsonSerializer _serializer; protected readonly JsonSerializer _serializer;
protected readonly SemaphoreSlim _stateLock; protected readonly SemaphoreSlim _stateLock;
private readonly RestClientProvider RestClientProvider; private readonly RestClientProvider _restClientProvider;
protected bool _isDisposed; protected bool _isDisposed;
private CancellationTokenSource _loginCancelToken; private CancellationTokenSource _loginCancelToken;
@@ -48,7 +48,7 @@ namespace Discord.API
public DiscordRestApiClient(RestClientProvider restClientProvider, string userAgent, RetryMode defaultRetryMode = RetryMode.AlwaysRetry, public DiscordRestApiClient(RestClientProvider restClientProvider, string userAgent, RetryMode defaultRetryMode = RetryMode.AlwaysRetry,
JsonSerializer serializer = null) JsonSerializer serializer = null)
{ {
RestClientProvider = restClientProvider; _restClientProvider = restClientProvider;
UserAgent = userAgent; UserAgent = userAgent;
DefaultRetryMode = defaultRetryMode; DefaultRetryMode = defaultRetryMode;
_serializer = serializer ?? new JsonSerializer { DateFormatString = "yyyy-MM-ddTHH:mm:ssZ", ContractResolver = new DiscordContractResolver() }; _serializer = serializer ?? new JsonSerializer { DateFormatString = "yyyy-MM-ddTHH:mm:ssZ", ContractResolver = new DiscordContractResolver() };
@@ -60,7 +60,7 @@ namespace Discord.API
} }
internal void SetBaseUrl(string baseUrl) internal void SetBaseUrl(string baseUrl)
{ {
RestClient = RestClientProvider(baseUrl); RestClient = _restClientProvider(baseUrl);
RestClient.SetHeader("accept", "*/*"); RestClient.SetHeader("accept", "*/*");
RestClient.SetHeader("user-agent", UserAgent); RestClient.SetHeader("user-agent", UserAgent);
RestClient.SetHeader("authorization", GetPrefixedToken(AuthTokenType, AuthToken)); RestClient.SetHeader("authorization", GetPrefixedToken(AuthTokenType, AuthToken));
@@ -189,7 +189,7 @@ namespace Discord.API
options.BucketId = AuthTokenType == TokenType.User ? ClientBucket.Get(clientBucket).Id : bucketId; options.BucketId = AuthTokenType == TokenType.User ? ClientBucket.Get(clientBucket).Id : bucketId;
options.IsClientBucket = AuthTokenType == TokenType.User; options.IsClientBucket = AuthTokenType == TokenType.User;
var json = payload != null ? SerializeJson(payload) : null; string json = payload != null ? SerializeJson(payload) : null;
var request = new JsonRestRequest(RestClient, method, endpoint, json, options); var request = new JsonRestRequest(RestClient, method, endpoint, json, options);
await SendInternalAsync(method, endpoint, request).ConfigureAwait(false); await SendInternalAsync(method, endpoint, request).ConfigureAwait(false);
} }
@@ -233,7 +233,7 @@ namespace Discord.API
options.BucketId = AuthTokenType == TokenType.User ? ClientBucket.Get(clientBucket).Id : bucketId; options.BucketId = AuthTokenType == TokenType.User ? ClientBucket.Get(clientBucket).Id : bucketId;
options.IsClientBucket = AuthTokenType == TokenType.User; options.IsClientBucket = AuthTokenType == TokenType.User;
var json = payload != null ? SerializeJson(payload) : null; string json = payload != null ? SerializeJson(payload) : null;
var request = new JsonRestRequest(RestClient, method, endpoint, json, options); var request = new JsonRestRequest(RestClient, method, endpoint, json, options);
return DeserializeJson<TResponse>(await SendInternalAsync(method, endpoint, request).ConfigureAwait(false)); return DeserializeJson<TResponse>(await SendInternalAsync(method, endpoint, request).ConfigureAwait(false));
} }

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

@@ -34,7 +34,7 @@ namespace Discord.WebSocket
private int _lastSeq; private int _lastSeq;
private ImmutableDictionary<string, RestVoiceRegion> _voiceRegions; private ImmutableDictionary<string, RestVoiceRegion> _voiceRegions;
private Task _heartbeatTask, _guildDownloadTask; private Task _heartbeatTask, _guildDownloadTask;
private int _unavailableGuilds; private int _unavailableGuildCount;
private long _lastGuildAvailableTime, _lastMessageTime; private long _lastGuildAvailableTime, _lastMessageTime;
private int _nextAudioId; private int _nextAudioId;
private DateTimeOffset? _statusSince; private DateTimeOffset? _statusSince;
@@ -60,7 +60,7 @@ namespace Discord.WebSocket
internal int? HandlerTimeout { get; private set; } internal int? HandlerTimeout { get; private set; }
internal new DiscordSocketApiClient ApiClient => base.ApiClient as DiscordSocketApiClient; internal new DiscordSocketApiClient ApiClient => base.ApiClient as DiscordSocketApiClient;
public new SocketSelfUser CurrentUser { get { return base.CurrentUser as SocketSelfUser; } private set { base.CurrentUser = value; } } public new SocketSelfUser CurrentUser { get => base.CurrentUser as SocketSelfUser; private set => base.CurrentUser = value; }
public IReadOnlyCollection<SocketGuild> Guilds => State.Guilds; public IReadOnlyCollection<SocketGuild> Guilds => State.Guilds;
public IReadOnlyCollection<ISocketPrivateChannel> PrivateChannels => State.PrivateChannels; public IReadOnlyCollection<ISocketPrivateChannel> PrivateChannels => State.PrivateChannels;
public IReadOnlyCollection<SocketDMChannel> DMChannels public IReadOnlyCollection<SocketDMChannel> DMChannels
@@ -474,7 +474,7 @@ namespace Discord.WebSocket
AddPrivateChannel(data.PrivateChannels[i], state); AddPrivateChannel(data.PrivateChannels[i], state);
_sessionId = data.SessionId; _sessionId = data.SessionId;
_unavailableGuilds = unavailableGuilds; _unavailableGuildCount = unavailableGuilds;
CurrentUser = currentUser; CurrentUser = currentUser;
State = state; State = state;
} }
@@ -538,9 +538,8 @@ namespace Discord.WebSocket
{ {
guild.Update(State, data); guild.Update(State, data);
var unavailableGuilds = _unavailableGuilds; if (_unavailableGuildCount != 0)
if (unavailableGuilds != 0) _unavailableGuildCount--;
_unavailableGuilds = unavailableGuilds - 1;
await GuildAvailableAsync(guild).ConfigureAwait(false); await GuildAvailableAsync(guild).ConfigureAwait(false);
if (guild.DownloadedMemberCount >= guild.MemberCount && !guild.DownloaderPromise.IsCompleted) if (guild.DownloadedMemberCount >= guild.MemberCount && !guild.DownloaderPromise.IsCompleted)
@@ -622,7 +621,7 @@ namespace Discord.WebSocket
var before = guild.Clone(); var before = guild.Clone();
guild.Update(State, data); guild.Update(State, data);
//This is treated as an extension of GUILD_AVAILABLE //This is treated as an extension of GUILD_AVAILABLE
_unavailableGuilds--; _unavailableGuildCount--;
_lastGuildAvailableTime = Environment.TickCount; _lastGuildAvailableTime = Environment.TickCount;
await GuildAvailableAsync(guild).ConfigureAwait(false); await GuildAvailableAsync(guild).ConfigureAwait(false);
await TimedInvokeAsync(_guildUpdatedEvent, nameof(GuildUpdated), before, guild).ConfigureAwait(false); await TimedInvokeAsync(_guildUpdatedEvent, nameof(GuildUpdated), before, guild).ConfigureAwait(false);
@@ -646,7 +645,7 @@ namespace Discord.WebSocket
if (guild != null) if (guild != null)
{ {
await GuildUnavailableAsync(guild).ConfigureAwait(false); await GuildUnavailableAsync(guild).ConfigureAwait(false);
_unavailableGuilds++; _unavailableGuildCount++;
} }
else else
{ {
@@ -1212,10 +1211,10 @@ namespace Discord.WebSocket
var data = (payload as JToken).ToObject<API.Gateway.Reaction>(_serializer); var data = (payload as JToken).ToObject<API.Gateway.Reaction>(_serializer);
if (State.GetChannel(data.ChannelId) is ISocketMessageChannel channel) if (State.GetChannel(data.ChannelId) is ISocketMessageChannel channel)
{ {
SocketUserMessage cachedMsg = channel.GetCachedMessage(data.MessageId) as SocketUserMessage; var cachedMsg = channel.GetCachedMessage(data.MessageId) as SocketUserMessage;
bool isCached = cachedMsg != null; bool isCached = cachedMsg != null;
var user = await channel.GetUserAsync(data.UserId, CacheMode.CacheOnly); var user = await channel.GetUserAsync(data.UserId, CacheMode.CacheOnly);
SocketReaction reaction = SocketReaction.Create(data, channel, cachedMsg, Optional.Create(user)); var reaction = SocketReaction.Create(data, channel, cachedMsg, Optional.Create(user));
var cacheable = new Cacheable<IUserMessage, ulong>(cachedMsg, data.MessageId, isCached, async () => await channel.GetMessageAsync(data.MessageId) as IUserMessage); var cacheable = new Cacheable<IUserMessage, ulong>(cachedMsg, data.MessageId, isCached, async () => await channel.GetMessageAsync(data.MessageId) as IUserMessage);
cachedMsg?.AddReaction(reaction); cachedMsg?.AddReaction(reaction);
@@ -1236,10 +1235,10 @@ namespace Discord.WebSocket
var data = (payload as JToken).ToObject<API.Gateway.Reaction>(_serializer); var data = (payload as JToken).ToObject<API.Gateway.Reaction>(_serializer);
if (State.GetChannel(data.ChannelId) is ISocketMessageChannel channel) if (State.GetChannel(data.ChannelId) is ISocketMessageChannel channel)
{ {
SocketUserMessage cachedMsg = channel.GetCachedMessage(data.MessageId) as SocketUserMessage; var cachedMsg = channel.GetCachedMessage(data.MessageId) as SocketUserMessage;
bool isCached = cachedMsg != null; bool isCached = cachedMsg != null;
var user = await channel.GetUserAsync(data.UserId, CacheMode.CacheOnly); var user = await channel.GetUserAsync(data.UserId, CacheMode.CacheOnly);
SocketReaction reaction = SocketReaction.Create(data, channel, cachedMsg, Optional.Create(user)); var reaction = SocketReaction.Create(data, channel, cachedMsg, Optional.Create(user));
var cacheable = new Cacheable<IUserMessage, ulong>(cachedMsg, data.MessageId, isCached, async () => await channel.GetMessageAsync(data.MessageId) as IUserMessage); var cacheable = new Cacheable<IUserMessage, ulong>(cachedMsg, data.MessageId, isCached, async () => await channel.GetMessageAsync(data.MessageId) as IUserMessage);
cachedMsg?.RemoveReaction(reaction); cachedMsg?.RemoveReaction(reaction);
@@ -1260,7 +1259,7 @@ namespace Discord.WebSocket
var data = (payload as JToken).ToObject<RemoveAllReactionsEvent>(_serializer); var data = (payload as JToken).ToObject<RemoveAllReactionsEvent>(_serializer);
if (State.GetChannel(data.ChannelId) is ISocketMessageChannel channel) if (State.GetChannel(data.ChannelId) is ISocketMessageChannel channel)
{ {
SocketUserMessage cachedMsg = channel.GetCachedMessage(data.MessageId) as SocketUserMessage; var cachedMsg = channel.GetCachedMessage(data.MessageId) as SocketUserMessage;
bool isCached = cachedMsg != null; bool isCached = cachedMsg != null;
var cacheable = new Cacheable<IUserMessage, ulong>(cachedMsg, data.MessageId, isCached, async () => await channel.GetMessageAsync(data.MessageId) as IUserMessage); var cacheable = new Cacheable<IUserMessage, ulong>(cachedMsg, data.MessageId, isCached, async () => await channel.GetMessageAsync(data.MessageId) as IUserMessage);
@@ -1289,7 +1288,7 @@ namespace Discord.WebSocket
return; return;
} }
foreach (var id in data.Ids) foreach (ulong id in data.Ids)
{ {
var msg = SocketChannelHelper.RemoveMessage(channel, this, id); var msg = SocketChannelHelper.RemoveMessage(channel, this, id);
bool isCached = msg != null; bool isCached = msg != null;
@@ -1542,7 +1541,7 @@ namespace Discord.WebSocket
await _gatewayLogger.DebugAsync("Heartbeat Started").ConfigureAwait(false); await _gatewayLogger.DebugAsync("Heartbeat Started").ConfigureAwait(false);
while (!cancelToken.IsCancellationRequested) while (!cancelToken.IsCancellationRequested)
{ {
var now = Environment.TickCount; int now = Environment.TickCount;
//Did server respond to our last heartbeat, or are we still receiving messages (long load?) //Did server respond to our last heartbeat, or are we still receiving messages (long load?)
if (_heartbeatTimes.Count != 0 && (now - _lastMessageTime) > intervalMillis) if (_heartbeatTimes.Count != 0 && (now - _lastMessageTime) > intervalMillis)
@@ -1589,7 +1588,7 @@ namespace Discord.WebSocket
try try
{ {
await logger.DebugAsync("GuildDownloader Started").ConfigureAwait(false); await logger.DebugAsync("GuildDownloader Started").ConfigureAwait(false);
while ((_unavailableGuilds != 0) && (Environment.TickCount - _lastGuildAvailableTime < 2000)) while ((_unavailableGuildCount != 0) && (Environment.TickCount - _lastGuildAvailableTime < 2000))
await Task.Delay(500, cancelToken).ConfigureAwait(false); await Task.Delay(500, cancelToken).ConfigureAwait(false);
await logger.DebugAsync("GuildDownloader Stopped").ConfigureAwait(false); await logger.DebugAsync("GuildDownloader Stopped").ConfigureAwait(false);
} }
@@ -1750,27 +1749,27 @@ namespace Discord.WebSocket
private async Task UnknownGlobalUserAsync(string evnt, ulong userId) private async Task UnknownGlobalUserAsync(string evnt, ulong userId)
{ {
var details = $"{evnt} User={userId}"; string details = $"{evnt} User={userId}";
await _gatewayLogger.WarningAsync($"Unknown User ({details}).").ConfigureAwait(false); await _gatewayLogger.WarningAsync($"Unknown User ({details}).").ConfigureAwait(false);
} }
private async Task UnknownChannelUserAsync(string evnt, ulong userId, ulong channelId) private async Task UnknownChannelUserAsync(string evnt, ulong userId, ulong channelId)
{ {
var details = $"{evnt} User={userId} Channel={channelId}"; string details = $"{evnt} User={userId} Channel={channelId}";
await _gatewayLogger.WarningAsync($"Unknown User ({details}).").ConfigureAwait(false); await _gatewayLogger.WarningAsync($"Unknown User ({details}).").ConfigureAwait(false);
} }
private async Task UnknownGuildUserAsync(string evnt, ulong userId, ulong guildId) private async Task UnknownGuildUserAsync(string evnt, ulong userId, ulong guildId)
{ {
var details = $"{evnt} User={userId} Guild={guildId}"; string details = $"{evnt} User={userId} Guild={guildId}";
await _gatewayLogger.WarningAsync($"Unknown User ({details}).").ConfigureAwait(false); await _gatewayLogger.WarningAsync($"Unknown User ({details}).").ConfigureAwait(false);
} }
private async Task IncompleteGuildUserAsync(string evnt, ulong userId, ulong guildId) private async Task IncompleteGuildUserAsync(string evnt, ulong userId, ulong guildId)
{ {
var details = $"{evnt} User={userId} Guild={guildId}"; string details = $"{evnt} User={userId} Guild={guildId}";
await _gatewayLogger.DebugAsync($"User has not been downloaded ({details}).").ConfigureAwait(false); await _gatewayLogger.DebugAsync($"User has not been downloaded ({details}).").ConfigureAwait(false);
} }
private async Task UnknownChannelAsync(string evnt, ulong channelId) private async Task UnknownChannelAsync(string evnt, ulong channelId)
{ {
var details = $"{evnt} Channel={channelId}"; string details = $"{evnt} Channel={channelId}";
await _gatewayLogger.WarningAsync($"Unknown Channel ({details}).").ConfigureAwait(false); await _gatewayLogger.WarningAsync($"Unknown Channel ({details}).").ConfigureAwait(false);
} }
private async Task UnknownChannelAsync(string evnt, ulong channelId, ulong guildId) private async Task UnknownChannelAsync(string evnt, ulong channelId, ulong guildId)
@@ -1780,22 +1779,22 @@ namespace Discord.WebSocket
await UnknownChannelAsync(evnt, channelId).ConfigureAwait(false); await UnknownChannelAsync(evnt, channelId).ConfigureAwait(false);
return; return;
} }
var details = $"{evnt} Channel={channelId} Guild={guildId}"; string details = $"{evnt} Channel={channelId} Guild={guildId}";
await _gatewayLogger.WarningAsync($"Unknown Channel ({details}).").ConfigureAwait(false); await _gatewayLogger.WarningAsync($"Unknown Channel ({details}).").ConfigureAwait(false);
} }
private async Task UnknownRoleAsync(string evnt, ulong roleId, ulong guildId) private async Task UnknownRoleAsync(string evnt, ulong roleId, ulong guildId)
{ {
var details = $"{evnt} Role={roleId} Guild={guildId}"; string details = $"{evnt} Role={roleId} Guild={guildId}";
await _gatewayLogger.WarningAsync($"Unknown Role ({details}).").ConfigureAwait(false); await _gatewayLogger.WarningAsync($"Unknown Role ({details}).").ConfigureAwait(false);
} }
private async Task UnknownGuildAsync(string evnt, ulong guildId) private async Task UnknownGuildAsync(string evnt, ulong guildId)
{ {
var details = $"{evnt} Guild={guildId}"; string details = $"{evnt} Guild={guildId}";
await _gatewayLogger.WarningAsync($"Unknown Guild ({details}).").ConfigureAwait(false); await _gatewayLogger.WarningAsync($"Unknown Guild ({details}).").ConfigureAwait(false);
} }
private async Task UnsyncedGuildAsync(string evnt, ulong guildId) private async Task UnsyncedGuildAsync(string evnt, ulong guildId)
{ {
var details = $"{evnt} Guild={guildId}"; string details = $"{evnt} Guild={guildId}";
await _gatewayLogger.DebugAsync($"Unsynced Guild ({details}).").ConfigureAwait(false); await _gatewayLogger.DebugAsync($"Unsynced Guild ({details}).").ConfigureAwait(false);
} }