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

Removed raw input/output from Debug logging

Browse Source
This commit is contained in:
RogueException
2016-02-17 01:44:26 -04:00
parent b9d68b723a
commit 212890a147
47 changed files with 8 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Discord.Net/API/Client/Rest/AcceptInvite.cs
View File

@@ -8,7 +8,6 @@ namespace Discord.API.Client.Rest
string IRestRequest.Method => "POST";
string IRestRequest.Endpoint => $"invite/{InviteId}";
object IRestRequest.Payload => null;
bool IRestRequest.IsPrivate => false;
public string InviteId { get; set; }

1
src/Discord.Net/API/Client/Rest/AckMessage.cs
View File

@@ -8,7 +8,6 @@ namespace Discord.API.Client.Rest
string IRestRequest.Method => "POST";
string IRestRequest.Endpoint => $"channels/{ChannelId}/messages/{MessageId}/ack";
object IRestRequest.Payload => null;
bool IRestRequest.IsPrivate => false;
public ulong ChannelId { get; set; }
public ulong MessageId { get; set; }

1
src/Discord.Net/API/Client/Rest/AddChannelPermission.cs
View File

@@ -9,7 +9,6 @@ namespace Discord.API.Client.Rest
string IRestRequest.Method => "PUT";
string IRestRequest.Endpoint => $"channels/{ChannelId}/permissions/{TargetId}";
object IRestRequest.Payload => this;
bool IRestRequest.IsPrivate => false;
public ulong ChannelId { get; set; }

1
src/Discord.Net/API/Client/Rest/AddGuildBan.cs
View File

@@ -8,7 +8,6 @@ namespace Discord.API.Client.Rest
string IRestRequest.Method => "PUT";
string IRestRequest.Endpoint => $"guilds/{GuildId}/bans/{UserId}?delete-message-days={PruneDays}";
object IRestRequest.Payload => null;
bool IRestRequest.IsPrivate => false;
public ulong GuildId { get; set; }
public ulong UserId { get; set; }

1
src/Discord.Net/API/Client/Rest/CreateChannel.cs
View File

@@ -8,7 +8,6 @@ namespace Discord.API.Client.Rest
string IRestRequest.Method => "POST";
string IRestRequest.Endpoint => $"guilds/{GuildId}/channels";
object IRestRequest.Payload => this;
bool IRestRequest.IsPrivate => false;
public ulong GuildId { get; set; }

1
src/Discord.Net/API/Client/Rest/CreateGuild.cs
View File

@@ -8,7 +8,6 @@ namespace Discord.API.Client.Rest
string IRestRequest.Method => "POST";
string IRestRequest.Endpoint => $"guilds";
object IRestRequest.Payload => this;
bool IRestRequest.IsPrivate => false;
[JsonProperty("name")]
public string Name { get; set; }

1
src/Discord.Net/API/Client/Rest/CreateInvite.cs
View File

@@ -8,7 +8,6 @@ namespace Discord.API.Client.Rest
string IRestRequest.Method => "POST";
string IRestRequest.Endpoint => $"channels/{ChannelId}/invites";
object IRestRequest.Payload => this;
bool IRestRequest.IsPrivate => false;
public ulong ChannelId { get; set; }

1
src/Discord.Net/API/Client/Rest/CreatePrivateChannel.cs
View File

@@ -9,7 +9,6 @@ namespace Discord.API.Client.Rest
string IRestRequest.Method => "POST";
string IRestRequest.Endpoint => $"users/@me/channels";
object IRestRequest.Payload => this;
bool IRestRequest.IsPrivate => false;
[JsonProperty("recipient_id"), JsonConverter(typeof(LongStringConverter))]
public ulong RecipientId { get; set; }

1
src/Discord.Net/API/Client/Rest/CreateRole.cs
View File

@@ -8,7 +8,6 @@ namespace Discord.API.Client.Rest
string IRestRequest.Method => "POST";
string IRestRequest.Endpoint => $"guilds/{GuildId}/roles";
object IRestRequest.Payload => null;
bool IRestRequest.IsPrivate => false;
public ulong GuildId { get; set; }

1
src/Discord.Net/API/Client/Rest/DeleteChannel.cs
View File

@@ -8,7 +8,6 @@ namespace Discord.API.Client.Rest
string IRestRequest.Method => "DELETE";
string IRestRequest.Endpoint => $"channels/{ChannelId}";
object IRestRequest.Payload => null;
bool IRestRequest.IsPrivate => false;
public ulong ChannelId { get; set; }

1
src/Discord.Net/API/Client/Rest/DeleteGuild.cs
View File

@@ -8,7 +8,6 @@ namespace Discord.API.Client.Rest
string IRestRequest.Method => "DELETE";
string IRestRequest.Endpoint => $"guilds/{GuildId}";
object IRestRequest.Payload => null;
bool IRestRequest.IsPrivate => false;
public ulong GuildId { get; set; }

1
src/Discord.Net/API/Client/Rest/DeleteInvite.cs
View File

@@ -8,7 +8,6 @@ namespace Discord.API.Client.Rest
string IRestRequest.Method => "DELETE";
string IRestRequest.Endpoint => $"invite/{InviteCode}";
object IRestRequest.Payload => null;
bool IRestRequest.IsPrivate => false;
public string InviteCode { get; set; }

1
src/Discord.Net/API/Client/Rest/DeleteMessage.cs
View File

@@ -8,7 +8,6 @@ namespace Discord.API.Client.Rest
string IRestRequest.Method => "DELETE";
string IRestRequest.Endpoint => $"channels/{ChannelId}/messages/{MessageId}";
object IRestRequest.Payload => null;
bool IRestRequest.IsPrivate => false;
public ulong ChannelId { get; set; }
public ulong MessageId { get; set; }

1
src/Discord.Net/API/Client/Rest/DeleteRole.cs
View File

@@ -8,7 +8,6 @@ namespace Discord.API.Client.Rest
string IRestRequest.Method => "DELETE";
string IRestRequest.Endpoint => $"guilds/{GuildId}/roles/{RoleId}";
object IRestRequest.Payload => null;
bool IRestRequest.IsPrivate => false;
public ulong GuildId { get; set; }
public ulong RoleId { get; set; }

1
src/Discord.Net/API/Client/Rest/Gateway.cs
View File

@@ -8,7 +8,6 @@ namespace Discord.API.Client.Rest
string IRestRequest.Method => "GET";
string IRestRequest.Endpoint => $"gateway";
object IRestRequest.Payload => null;
bool IRestRequest.IsPrivate => false;
}
public class GatewayResponse

1
src/Discord.Net/API/Client/Rest/GetBans.cs
View File

@@ -8,7 +8,6 @@ namespace Discord.API.Client.Rest
string IRestRequest.Method => "GET";
string IRestRequest.Endpoint => $"guilds/{GuildId}/bans";
object IRestRequest.Payload => null;
bool IRestRequest.IsPrivate => false;
public ulong GuildId { get; set; }

1
src/Discord.Net/API/Client/Rest/GetInvite.cs
View File

@@ -8,7 +8,6 @@ namespace Discord.API.Client.Rest
string IRestRequest.Method => "GET";
string IRestRequest.Endpoint => $"invite/{InviteCode}";
object IRestRequest.Payload => null;
bool IRestRequest.IsPrivate => false;
public string InviteCode { get; set; }

1
src/Discord.Net/API/Client/Rest/GetInvites.cs
View File

@@ -8,7 +8,6 @@ namespace Discord.API.Client.Rest
string IRestRequest.Method => "GET";
string IRestRequest.Endpoint => $"guilds/{GuildId}/invites";
object IRestRequest.Payload => null;
bool IRestRequest.IsPrivate => false;
public ulong GuildId { get; set; }

1
src/Discord.Net/API/Client/Rest/GetMessages.cs
View File

@@ -19,7 +19,6 @@ namespace Discord.API.Client.Rest
}
}
object IRestRequest.Payload => null;
bool IRestRequest.IsPrivate => false;
public ulong ChannelId { get; set; }

1
src/Discord.Net/API/Client/Rest/GetVoiceRegions.cs
View File

@@ -8,7 +8,6 @@ namespace Discord.API.Client.Rest
string IRestRequest.Method => "GET";
string IRestRequest.Endpoint => $"voice/regions";
object IRestRequest.Payload => null;
bool IRestRequest.IsPrivate => false;
}
public class GetVoiceRegionsResponse

1
src/Discord.Net/API/Client/Rest/GetWidget.cs
View File

@@ -9,7 +9,6 @@ namespace Discord.API.Client.Rest
string IRestRequest.Method => "GET";
string IRestRequest.Endpoint => $"servers/{GuildId}/widget.json";
object IRestRequest.Payload => null;
bool IRestRequest.IsPrivate => false;
public ulong GuildId { get; set; }

1
src/Discord.Net/API/Client/Rest/KickMember.cs
View File

@@ -8,7 +8,6 @@ namespace Discord.API.Client.Rest
string IRestRequest.Method => "DELETE";
string IRestRequest.Endpoint => $"guilds/{GuildId}/members/{UserId}";
object IRestRequest.Payload => null;
bool IRestRequest.IsPrivate => false;
public ulong GuildId { get; set; }
public ulong UserId { get; set; }

1
src/Discord.Net/API/Client/Rest/LeaveGuild.cs
View File

@@ -8,7 +8,6 @@ namespace Discord.API.Client.Rest
string IRestRequest.Method => "DELETE";
string IRestRequest.Endpoint => $"users/@me/guilds/{GuildId}";
object IRestRequest.Payload => null;
bool IRestRequest.IsPrivate => false;
public ulong GuildId { get; set; }

1
src/Discord.Net/API/Client/Rest/Login.cs
View File

@@ -8,7 +8,6 @@ namespace Discord.API.Client.Rest
string IRestRequest.Method => Email != null ? "POST" : "GET";
string IRestRequest.Endpoint => $"auth/login";
object IRestRequest.Payload => this;
bool IRestRequest.IsPrivate => false;
[JsonProperty("email", NullValueHandling = NullValueHandling.Ignore)]
public string Email { get; set; }

1
src/Discord.Net/API/Client/Rest/Logout.cs
View File

@@ -8,6 +8,5 @@ namespace Discord.API.Client.Rest
string IRestRequest.Method => "POST";
string IRestRequest.Endpoint => $"auth/logout";
object IRestRequest.Payload => null;
bool IRestRequest.IsPrivate => false;
}
}

1
src/Discord.Net/API/Client/Rest/PruneMembers.cs
View File

@@ -8,7 +8,6 @@ namespace Discord.API.Client.Rest
string IRestRequest.Method => IsSimulation ? "GET" : "POST";
string IRestRequest.Endpoint => $"guilds/{GuildId}/prune?days={Days}";
object IRestRequest.Payload => null;
bool IRestRequest.IsPrivate => false;
public ulong GuildId { get; set; }

1
src/Discord.Net/API/Client/Rest/RemoveChannelPermission.cs
View File

@@ -8,7 +8,6 @@ namespace Discord.API.Client.Rest
string IRestRequest.Method => "DELETE";
string IRestRequest.Endpoint => $"channels/{ChannelId}/permissions/{TargetId}";
object IRestRequest.Payload => null;
bool IRestRequest.IsPrivate => false;
public ulong ChannelId { get; set; }
public ulong TargetId { get; set; }

1
src/Discord.Net/API/Client/Rest/RemoveGuildBan.cs
View File

@@ -8,7 +8,6 @@ namespace Discord.API.Client.Rest
string IRestRequest.Method => "DELETE";
string IRestRequest.Endpoint => $"guilds/{GuildId}/bans/{UserId}";
object IRestRequest.Payload => null;
bool IRestRequest.IsPrivate => false;
public ulong GuildId { get; set; }
public ulong UserId { get; set; }

1
src/Discord.Net/API/Client/Rest/ReorderChannels.cs
View File

@@ -17,7 +17,6 @@ namespace Discord.API.Client.Rest
return ChannelIds.Select(x => new Channel(x, pos++));
}
}
bool IRestRequest.IsPrivate => false;
public class Channel
{

1
src/Discord.Net/API/Client/Rest/ReorderRoles.cs
View File

@@ -17,7 +17,6 @@ namespace Discord.API.Client.Rest
return RoleIds.Select(x => new Role(x, pos++));
}
}
bool IRestRequest.IsPrivate => false;
public class Role
{

1
src/Discord.Net/API/Client/Rest/SendFile.cs
View File

@@ -9,7 +9,6 @@ namespace Discord.API.Client.Rest
string IRestRequest.Method => "POST";
string IRestRequest.Endpoint => $"channels/{ChannelId}/messages";
object IRestRequest.Payload => null;
bool IRestRequest.IsPrivate => false;
string IRestFileRequest.Filename => Filename;
Stream IRestFileRequest.Stream => Stream;

1
src/Discord.Net/API/Client/Rest/SendIsTyping.cs
View File

@@ -8,7 +8,6 @@ namespace Discord.API.Client.Rest
string IRestRequest.Method => "POST";
string IRestRequest.Endpoint => $"channels/{ChannelId}/typing";
object IRestRequest.Payload => null;
bool IRestRequest.IsPrivate => false;
public ulong ChannelId { get; set; }

1
src/Discord.Net/API/Client/Rest/SendMessage.cs
View File

@@ -8,7 +8,6 @@ namespace Discord.API.Client.Rest
string IRestRequest.Method => "POST";
string IRestRequest.Endpoint => $"channels/{ChannelId}/messages";
object IRestRequest.Payload => this;
bool IRestRequest.IsPrivate => false;
public ulong ChannelId { get; set; }

1
src/Discord.Net/API/Client/Rest/UpdateChannel.cs
View File

@@ -8,7 +8,6 @@ namespace Discord.API.Client.Rest
string IRestRequest.Method => "PATCH";
string IRestRequest.Endpoint => $"channels/{ChannelId}";
object IRestRequest.Payload => this;
bool IRestRequest.IsPrivate => false;
public ulong ChannelId { get; set; }

1
src/Discord.Net/API/Client/Rest/UpdateGuild.cs
View File

@@ -9,7 +9,6 @@ namespace Discord.API.Client.Rest
string IRestRequest.Method => "PATCH";
string IRestRequest.Endpoint => $"guilds/{GuildId}";
object IRestRequest.Payload => this;
bool IRestRequest.IsPrivate => false;
public ulong GuildId { get; set; }

1
src/Discord.Net/API/Client/Rest/UpdateMember.cs
View File

@@ -9,7 +9,6 @@ namespace Discord.API.Client.Rest
string IRestRequest.Method => "PATCH";
string IRestRequest.Endpoint => $"guilds/{GuildId}/members/{UserId}";
object IRestRequest.Payload => this;
bool IRestRequest.IsPrivate => false;
public ulong GuildId { get; set; }
public ulong UserId { get; set; }

1
src/Discord.Net/API/Client/Rest/UpdateMessage.cs
View File

@@ -8,7 +8,6 @@ namespace Discord.API.Client.Rest
string IRestRequest.Method => "PATCH";
string IRestRequest.Endpoint => $"channels/{ChannelId}/messages/{MessageId}";
object IRestRequest.Payload => this;
bool IRestRequest.IsPrivate => false;
public ulong ChannelId { get; set; }
public ulong MessageId { get; set; }

1
src/Discord.Net/API/Client/Rest/UpdateProfile.cs
View File

@@ -8,7 +8,6 @@ namespace Discord.API.Client.Rest
string IRestRequest.Method => "PATCH";
string IRestRequest.Endpoint => $"users/@me";
object IRestRequest.Payload => this;
bool IRestRequest.IsPrivate => false;
[JsonProperty("password")]
public string CurrentPassword { get; set; }

1
src/Discord.Net/API/Client/Rest/UpdateRole.cs
View File

@@ -8,7 +8,6 @@ namespace Discord.API.Client.Rest
string IRestRequest.Method => "PATCH";
string IRestRequest.Endpoint => $"guilds/{GuildId}/roles/{RoleId}";
object IRestRequest.Payload => this;
bool IRestRequest.IsPrivate => false;
public ulong GuildId { get; set; }
public ulong RoleId { get; set; }

1
src/Discord.Net/API/IRestRequest.cs
View File

@@ -7,7 +7,6 @@ namespace Discord.API
string Method { get; }
string Endpoint { get; }
object Payload { get; }
bool IsPrivate { get; }
}
public interface IRestRequest<ResponseT> : IRestRequest
where ResponseT : class

1
src/Discord.Net/API/Status/Rest/ActiveMaintenances.cs
View File

@@ -8,6 +8,5 @@ namespace Discord.API.Status.Rest
string IRestRequest.Method => "GET";
string IRestRequest.Endpoint => $"scheduled-maintenances/active.json";
object IRestRequest.Payload => null;
bool IRestRequest.IsPrivate => false;
}
}

1
src/Discord.Net/API/Status/Rest/AllIncidents.cs
View File

@@ -8,6 +8,5 @@ namespace Discord.API.Status.Rest
string IRestRequest.Method => "GET";
string IRestRequest.Endpoint => $"incidents.json";
object IRestRequest.Payload => null;
bool IRestRequest.IsPrivate => false;
}
}

1
src/Discord.Net/API/Status/Rest/UnresolvedIncidents.cs
View File

@@ -8,6 +8,5 @@ namespace Discord.API.Status.Rest
string IRestRequest.Method => "GET";
string IRestRequest.Endpoint => $"incidents/unresolved.json";
object IRestRequest.Payload => null;
bool IRestRequest.IsPrivate => false;
}
}

1
src/Discord.Net/API/Status/Rest/UpcomingMaintenances.cs
View File

@@ -8,6 +8,5 @@ namespace Discord.API.Status.Rest
string IRestRequest.Method => "GET";
string IRestRequest.Endpoint => $"scheduled-maintenances/upcoming.json";
object IRestRequest.Payload => null;
bool IRestRequest.IsPrivate => false;
}
}

12
src/Discord.Net/DiscordClient.cs
View File

@@ -920,8 +920,8 @@ namespace Discord
if (user != null)
{
/*if (Config.LogLevel == LogSeverity.Debug)
Logger.Debug($"PRESENCE_UPDATE: {user.Path}");*/
if (Config.LogLevel == LogSeverity.Debug)
Logger.Debug($"PRESENCE_UPDATE: {user.Path}");
var before = Config.EnablePreUpdateEvents ? user.Clone() : null;
user.Update(data);
OnUserUpdated(before, user);
@@ -948,8 +948,8 @@ namespace Discord
user = channel.Server.GetUser(data.UserId);
if (user != null)
{
/*if (Config.LogLevel == LogSeverity.Debug)
Logger.Debug($"TYPING_START: {channel.Path} ({user.Name})");*/
if (Config.LogLevel == LogSeverity.Debug)
Logger.Debug($"TYPING_START: {channel.Path} ({user.Name})");
OnUserIsTypingUpdated(channel, user);
user.UpdateActivity();
}
@@ -969,8 +969,8 @@ namespace Discord
var user = server.GetUser(data.UserId);
if (user != null)
{
/*if (Config.LogLevel == LogSeverity.Debug)
Logger.Debug($"VOICE_STATE_UPDATE: {user.Path}");*/
if (Config.LogLevel == LogSeverity.Debug)
Logger.Debug($"VOICE_STATE_UPDATE: {user.Path}");
var before = Config.EnablePreUpdateEvents ? user.Clone() : null;
user.Update(data);
//Logger.Verbose($"Voice Updated: {server.Name}/{user.Name}");

22
src/Discord.Net/Net/Rest/RestClient.cs
View File

@@ -63,26 +63,8 @@ namespace Discord.Net.Rest
_engine = new BuiltInEngine(config, baseUrl, logger);
#endif
if (_logger != null && _logger.Level >= LogSeverity.Verbose)
{
this.SentRequest += (s, e) =>
{
string log = $"{e.Request.Method} {e.Request.Endpoint}: {e.Milliseconds} ms";
if (_config.LogLevel >= LogSeverity.Debug)
{
if (e.Request is IRestFileRequest)
log += $" [{(e.Request as IRestFileRequest).Filename}]";
else if (e.Response != null)
{
if (e.Request.IsPrivate)
log += $" [Hidden]";
else
log += $" {e.ResponseJson}";
}
}
_logger.Verbose(log);
};
}
if (logger != null && logger.Level >= LogSeverity.Verbose)
SentRequest += (s, e) => _logger.Verbose($"{e.Request.Method} {e.Request.Endpoint}: {e.Milliseconds} ms");
}
public async Task<ResponseT> Send<ResponseT>(IRestRequest<ResponseT> request)

4
src/Discord.Net/Net/WebSockets/WebSocket.cs
View File

@@ -138,15 +138,11 @@ namespace Discord.Net.WebSockets
protected virtual Task ProcessMessage(string json)
{
if (Logger.Level >= LogSeverity.Debug)
Logger.Debug( $"In: {json}");
return TaskHelper.CompletedTask;
}
protected void QueueMessage(IWebSocketMessage message)
{
string json = JsonConvert.SerializeObject(new WebSocketMessage(message));
if (Logger.Level >= LogSeverity.Debug)
Logger.Debug( $"Out: {json}");
_engine.QueueMessage(json);
}