From 212890a147d52aecdb78122b5cff75699440e0ef Mon Sep 17 00:00:00 2001 From: RogueException Date: Wed, 17 Feb 2016 01:44:26 -0400 Subject: [PATCH] Removed raw input/output from Debug logging --- .../API/Client/Rest/AcceptInvite.cs | 1 - src/Discord.Net/API/Client/Rest/AckMessage.cs | 1 - .../API/Client/Rest/AddChannelPermission.cs | 1 - .../API/Client/Rest/AddGuildBan.cs | 1 - .../API/Client/Rest/CreateChannel.cs | 1 - .../API/Client/Rest/CreateGuild.cs | 1 - .../API/Client/Rest/CreateInvite.cs | 1 - .../API/Client/Rest/CreatePrivateChannel.cs | 1 - src/Discord.Net/API/Client/Rest/CreateRole.cs | 1 - .../API/Client/Rest/DeleteChannel.cs | 1 - .../API/Client/Rest/DeleteGuild.cs | 1 - .../API/Client/Rest/DeleteInvite.cs | 1 - .../API/Client/Rest/DeleteMessage.cs | 1 - src/Discord.Net/API/Client/Rest/DeleteRole.cs | 1 - src/Discord.Net/API/Client/Rest/Gateway.cs | 1 - src/Discord.Net/API/Client/Rest/GetBans.cs | 1 - src/Discord.Net/API/Client/Rest/GetInvite.cs | 1 - src/Discord.Net/API/Client/Rest/GetInvites.cs | 1 - .../API/Client/Rest/GetMessages.cs | 1 - .../API/Client/Rest/GetVoiceRegions.cs | 1 - src/Discord.Net/API/Client/Rest/GetWidget.cs | 1 - src/Discord.Net/API/Client/Rest/KickMember.cs | 1 - src/Discord.Net/API/Client/Rest/LeaveGuild.cs | 1 - src/Discord.Net/API/Client/Rest/Login.cs | 1 - src/Discord.Net/API/Client/Rest/Logout.cs | 1 - .../API/Client/Rest/PruneMembers.cs | 1 - .../Client/Rest/RemoveChannelPermission.cs | 1 - .../API/Client/Rest/RemoveGuildBan.cs | 1 - .../API/Client/Rest/ReorderChannels.cs | 1 - .../API/Client/Rest/ReorderRoles.cs | 1 - src/Discord.Net/API/Client/Rest/SendFile.cs | 1 - .../API/Client/Rest/SendIsTyping.cs | 1 - .../API/Client/Rest/SendMessage.cs | 1 - .../API/Client/Rest/UpdateChannel.cs | 1 - .../API/Client/Rest/UpdateGuild.cs | 1 - .../API/Client/Rest/UpdateMember.cs | 1 - .../API/Client/Rest/UpdateMessage.cs | 1 - .../API/Client/Rest/UpdateProfile.cs | 1 - src/Discord.Net/API/Client/Rest/UpdateRole.cs | 1 - src/Discord.Net/API/IRestRequest.cs | 1 - .../API/Status/Rest/ActiveMaintenances.cs | 1 - .../API/Status/Rest/AllIncidents.cs | 1 - .../API/Status/Rest/UnresolvedIncidents.cs | 1 - .../API/Status/Rest/UpcomingMaintenances.cs | 1 - src/Discord.Net/DiscordClient.cs | 12 +++++----- src/Discord.Net/Net/Rest/RestClient.cs | 22 ++----------------- src/Discord.Net/Net/WebSockets/WebSocket.cs | 4 ---- 47 files changed, 8 insertions(+), 74 deletions(-) diff --git a/src/Discord.Net/API/Client/Rest/AcceptInvite.cs b/src/Discord.Net/API/Client/Rest/AcceptInvite.cs index 865e37c2..2940c98a 100644 --- a/src/Discord.Net/API/Client/Rest/AcceptInvite.cs +++ b/src/Discord.Net/API/Client/Rest/AcceptInvite.cs @@ -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; } diff --git a/src/Discord.Net/API/Client/Rest/AckMessage.cs b/src/Discord.Net/API/Client/Rest/AckMessage.cs index 1678ed34..4cf238b7 100644 --- a/src/Discord.Net/API/Client/Rest/AckMessage.cs +++ b/src/Discord.Net/API/Client/Rest/AckMessage.cs @@ -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; } diff --git a/src/Discord.Net/API/Client/Rest/AddChannelPermission.cs b/src/Discord.Net/API/Client/Rest/AddChannelPermission.cs index c7a9f57a..44d08b4b 100644 --- a/src/Discord.Net/API/Client/Rest/AddChannelPermission.cs +++ b/src/Discord.Net/API/Client/Rest/AddChannelPermission.cs @@ -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; } diff --git a/src/Discord.Net/API/Client/Rest/AddGuildBan.cs b/src/Discord.Net/API/Client/Rest/AddGuildBan.cs index 7699a74e..3e0b165f 100644 --- a/src/Discord.Net/API/Client/Rest/AddGuildBan.cs +++ b/src/Discord.Net/API/Client/Rest/AddGuildBan.cs @@ -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; } diff --git a/src/Discord.Net/API/Client/Rest/CreateChannel.cs b/src/Discord.Net/API/Client/Rest/CreateChannel.cs index 0dc45bc4..0d330970 100644 --- a/src/Discord.Net/API/Client/Rest/CreateChannel.cs +++ b/src/Discord.Net/API/Client/Rest/CreateChannel.cs @@ -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; } diff --git a/src/Discord.Net/API/Client/Rest/CreateGuild.cs b/src/Discord.Net/API/Client/Rest/CreateGuild.cs index baa1f455..a18d2bee 100644 --- a/src/Discord.Net/API/Client/Rest/CreateGuild.cs +++ b/src/Discord.Net/API/Client/Rest/CreateGuild.cs @@ -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; } diff --git a/src/Discord.Net/API/Client/Rest/CreateInvite.cs b/src/Discord.Net/API/Client/Rest/CreateInvite.cs index a55b9c7e..73f15c24 100644 --- a/src/Discord.Net/API/Client/Rest/CreateInvite.cs +++ b/src/Discord.Net/API/Client/Rest/CreateInvite.cs @@ -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; } diff --git a/src/Discord.Net/API/Client/Rest/CreatePrivateChannel.cs b/src/Discord.Net/API/Client/Rest/CreatePrivateChannel.cs index 2d413a8d..e1087dc3 100644 --- a/src/Discord.Net/API/Client/Rest/CreatePrivateChannel.cs +++ b/src/Discord.Net/API/Client/Rest/CreatePrivateChannel.cs @@ -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; } diff --git a/src/Discord.Net/API/Client/Rest/CreateRole.cs b/src/Discord.Net/API/Client/Rest/CreateRole.cs index 87715490..3978c6aa 100644 --- a/src/Discord.Net/API/Client/Rest/CreateRole.cs +++ b/src/Discord.Net/API/Client/Rest/CreateRole.cs @@ -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; } diff --git a/src/Discord.Net/API/Client/Rest/DeleteChannel.cs b/src/Discord.Net/API/Client/Rest/DeleteChannel.cs index 6443c238..ae56934b 100644 --- a/src/Discord.Net/API/Client/Rest/DeleteChannel.cs +++ b/src/Discord.Net/API/Client/Rest/DeleteChannel.cs @@ -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; } diff --git a/src/Discord.Net/API/Client/Rest/DeleteGuild.cs b/src/Discord.Net/API/Client/Rest/DeleteGuild.cs index d55c6d98..44df5892 100644 --- a/src/Discord.Net/API/Client/Rest/DeleteGuild.cs +++ b/src/Discord.Net/API/Client/Rest/DeleteGuild.cs @@ -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; } diff --git a/src/Discord.Net/API/Client/Rest/DeleteInvite.cs b/src/Discord.Net/API/Client/Rest/DeleteInvite.cs index 5de8b348..4bfe1e0d 100644 --- a/src/Discord.Net/API/Client/Rest/DeleteInvite.cs +++ b/src/Discord.Net/API/Client/Rest/DeleteInvite.cs @@ -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; } diff --git a/src/Discord.Net/API/Client/Rest/DeleteMessage.cs b/src/Discord.Net/API/Client/Rest/DeleteMessage.cs index 33921cd1..3f781a75 100644 --- a/src/Discord.Net/API/Client/Rest/DeleteMessage.cs +++ b/src/Discord.Net/API/Client/Rest/DeleteMessage.cs @@ -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; } diff --git a/src/Discord.Net/API/Client/Rest/DeleteRole.cs b/src/Discord.Net/API/Client/Rest/DeleteRole.cs index 650ece9f..56faf3d3 100644 --- a/src/Discord.Net/API/Client/Rest/DeleteRole.cs +++ b/src/Discord.Net/API/Client/Rest/DeleteRole.cs @@ -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; } diff --git a/src/Discord.Net/API/Client/Rest/Gateway.cs b/src/Discord.Net/API/Client/Rest/Gateway.cs index ef9486ca..02dd7100 100644 --- a/src/Discord.Net/API/Client/Rest/Gateway.cs +++ b/src/Discord.Net/API/Client/Rest/Gateway.cs @@ -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 diff --git a/src/Discord.Net/API/Client/Rest/GetBans.cs b/src/Discord.Net/API/Client/Rest/GetBans.cs index ee07cb24..714cdbaf 100644 --- a/src/Discord.Net/API/Client/Rest/GetBans.cs +++ b/src/Discord.Net/API/Client/Rest/GetBans.cs @@ -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; } diff --git a/src/Discord.Net/API/Client/Rest/GetInvite.cs b/src/Discord.Net/API/Client/Rest/GetInvite.cs index 27de264f..2531ac26 100644 --- a/src/Discord.Net/API/Client/Rest/GetInvite.cs +++ b/src/Discord.Net/API/Client/Rest/GetInvite.cs @@ -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; } diff --git a/src/Discord.Net/API/Client/Rest/GetInvites.cs b/src/Discord.Net/API/Client/Rest/GetInvites.cs index 079c54ef..2b4f2f5f 100644 --- a/src/Discord.Net/API/Client/Rest/GetInvites.cs +++ b/src/Discord.Net/API/Client/Rest/GetInvites.cs @@ -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; } diff --git a/src/Discord.Net/API/Client/Rest/GetMessages.cs b/src/Discord.Net/API/Client/Rest/GetMessages.cs index b72b05c8..1beadb9a 100644 --- a/src/Discord.Net/API/Client/Rest/GetMessages.cs +++ b/src/Discord.Net/API/Client/Rest/GetMessages.cs @@ -19,7 +19,6 @@ namespace Discord.API.Client.Rest } } object IRestRequest.Payload => null; - bool IRestRequest.IsPrivate => false; public ulong ChannelId { get; set; } diff --git a/src/Discord.Net/API/Client/Rest/GetVoiceRegions.cs b/src/Discord.Net/API/Client/Rest/GetVoiceRegions.cs index 7dc97ef3..df21cc20 100644 --- a/src/Discord.Net/API/Client/Rest/GetVoiceRegions.cs +++ b/src/Discord.Net/API/Client/Rest/GetVoiceRegions.cs @@ -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 diff --git a/src/Discord.Net/API/Client/Rest/GetWidget.cs b/src/Discord.Net/API/Client/Rest/GetWidget.cs index 3b100635..0437a8b6 100644 --- a/src/Discord.Net/API/Client/Rest/GetWidget.cs +++ b/src/Discord.Net/API/Client/Rest/GetWidget.cs @@ -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; } diff --git a/src/Discord.Net/API/Client/Rest/KickMember.cs b/src/Discord.Net/API/Client/Rest/KickMember.cs index 96804ff6..4808f854 100644 --- a/src/Discord.Net/API/Client/Rest/KickMember.cs +++ b/src/Discord.Net/API/Client/Rest/KickMember.cs @@ -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; } diff --git a/src/Discord.Net/API/Client/Rest/LeaveGuild.cs b/src/Discord.Net/API/Client/Rest/LeaveGuild.cs index df210ad7..99fd8cbe 100644 --- a/src/Discord.Net/API/Client/Rest/LeaveGuild.cs +++ b/src/Discord.Net/API/Client/Rest/LeaveGuild.cs @@ -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; } diff --git a/src/Discord.Net/API/Client/Rest/Login.cs b/src/Discord.Net/API/Client/Rest/Login.cs index ab7efc31..f9c89c71 100644 --- a/src/Discord.Net/API/Client/Rest/Login.cs +++ b/src/Discord.Net/API/Client/Rest/Login.cs @@ -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; } diff --git a/src/Discord.Net/API/Client/Rest/Logout.cs b/src/Discord.Net/API/Client/Rest/Logout.cs index 78f8059e..9f4443c5 100644 --- a/src/Discord.Net/API/Client/Rest/Logout.cs +++ b/src/Discord.Net/API/Client/Rest/Logout.cs @@ -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; } } diff --git a/src/Discord.Net/API/Client/Rest/PruneMembers.cs b/src/Discord.Net/API/Client/Rest/PruneMembers.cs index 41771f7d..e80498bb 100644 --- a/src/Discord.Net/API/Client/Rest/PruneMembers.cs +++ b/src/Discord.Net/API/Client/Rest/PruneMembers.cs @@ -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; } diff --git a/src/Discord.Net/API/Client/Rest/RemoveChannelPermission.cs b/src/Discord.Net/API/Client/Rest/RemoveChannelPermission.cs index c704eadb..b453cba4 100644 --- a/src/Discord.Net/API/Client/Rest/RemoveChannelPermission.cs +++ b/src/Discord.Net/API/Client/Rest/RemoveChannelPermission.cs @@ -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; } diff --git a/src/Discord.Net/API/Client/Rest/RemoveGuildBan.cs b/src/Discord.Net/API/Client/Rest/RemoveGuildBan.cs index c6d48c94..5a8f4f79 100644 --- a/src/Discord.Net/API/Client/Rest/RemoveGuildBan.cs +++ b/src/Discord.Net/API/Client/Rest/RemoveGuildBan.cs @@ -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; } diff --git a/src/Discord.Net/API/Client/Rest/ReorderChannels.cs b/src/Discord.Net/API/Client/Rest/ReorderChannels.cs index c481eda4..c13f8b21 100644 --- a/src/Discord.Net/API/Client/Rest/ReorderChannels.cs +++ b/src/Discord.Net/API/Client/Rest/ReorderChannels.cs @@ -17,7 +17,6 @@ namespace Discord.API.Client.Rest return ChannelIds.Select(x => new Channel(x, pos++)); } } - bool IRestRequest.IsPrivate => false; public class Channel { diff --git a/src/Discord.Net/API/Client/Rest/ReorderRoles.cs b/src/Discord.Net/API/Client/Rest/ReorderRoles.cs index 23d73541..300176a7 100644 --- a/src/Discord.Net/API/Client/Rest/ReorderRoles.cs +++ b/src/Discord.Net/API/Client/Rest/ReorderRoles.cs @@ -17,7 +17,6 @@ namespace Discord.API.Client.Rest return RoleIds.Select(x => new Role(x, pos++)); } } - bool IRestRequest.IsPrivate => false; public class Role { diff --git a/src/Discord.Net/API/Client/Rest/SendFile.cs b/src/Discord.Net/API/Client/Rest/SendFile.cs index 8d072d0e..4b59e1a1 100644 --- a/src/Discord.Net/API/Client/Rest/SendFile.cs +++ b/src/Discord.Net/API/Client/Rest/SendFile.cs @@ -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; diff --git a/src/Discord.Net/API/Client/Rest/SendIsTyping.cs b/src/Discord.Net/API/Client/Rest/SendIsTyping.cs index aab017c6..4c56da0b 100644 --- a/src/Discord.Net/API/Client/Rest/SendIsTyping.cs +++ b/src/Discord.Net/API/Client/Rest/SendIsTyping.cs @@ -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; } diff --git a/src/Discord.Net/API/Client/Rest/SendMessage.cs b/src/Discord.Net/API/Client/Rest/SendMessage.cs index 6c6d1ae1..9caca991 100644 --- a/src/Discord.Net/API/Client/Rest/SendMessage.cs +++ b/src/Discord.Net/API/Client/Rest/SendMessage.cs @@ -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; } diff --git a/src/Discord.Net/API/Client/Rest/UpdateChannel.cs b/src/Discord.Net/API/Client/Rest/UpdateChannel.cs index cccd4b09..86a35a60 100644 --- a/src/Discord.Net/API/Client/Rest/UpdateChannel.cs +++ b/src/Discord.Net/API/Client/Rest/UpdateChannel.cs @@ -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; } diff --git a/src/Discord.Net/API/Client/Rest/UpdateGuild.cs b/src/Discord.Net/API/Client/Rest/UpdateGuild.cs index 4ff53055..f36b18d9 100644 --- a/src/Discord.Net/API/Client/Rest/UpdateGuild.cs +++ b/src/Discord.Net/API/Client/Rest/UpdateGuild.cs @@ -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; } diff --git a/src/Discord.Net/API/Client/Rest/UpdateMember.cs b/src/Discord.Net/API/Client/Rest/UpdateMember.cs index 019c4ee9..ce1649bd 100644 --- a/src/Discord.Net/API/Client/Rest/UpdateMember.cs +++ b/src/Discord.Net/API/Client/Rest/UpdateMember.cs @@ -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; } diff --git a/src/Discord.Net/API/Client/Rest/UpdateMessage.cs b/src/Discord.Net/API/Client/Rest/UpdateMessage.cs index df3ca46c..fc055b2b 100644 --- a/src/Discord.Net/API/Client/Rest/UpdateMessage.cs +++ b/src/Discord.Net/API/Client/Rest/UpdateMessage.cs @@ -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; } diff --git a/src/Discord.Net/API/Client/Rest/UpdateProfile.cs b/src/Discord.Net/API/Client/Rest/UpdateProfile.cs index 08f28d86..0f0cdb31 100644 --- a/src/Discord.Net/API/Client/Rest/UpdateProfile.cs +++ b/src/Discord.Net/API/Client/Rest/UpdateProfile.cs @@ -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; } diff --git a/src/Discord.Net/API/Client/Rest/UpdateRole.cs b/src/Discord.Net/API/Client/Rest/UpdateRole.cs index 7aac774b..4bea0b52 100644 --- a/src/Discord.Net/API/Client/Rest/UpdateRole.cs +++ b/src/Discord.Net/API/Client/Rest/UpdateRole.cs @@ -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; } diff --git a/src/Discord.Net/API/IRestRequest.cs b/src/Discord.Net/API/IRestRequest.cs index b8c7b818..af520370 100644 --- a/src/Discord.Net/API/IRestRequest.cs +++ b/src/Discord.Net/API/IRestRequest.cs @@ -7,7 +7,6 @@ namespace Discord.API string Method { get; } string Endpoint { get; } object Payload { get; } - bool IsPrivate { get; } } public interface IRestRequest : IRestRequest where ResponseT : class diff --git a/src/Discord.Net/API/Status/Rest/ActiveMaintenances.cs b/src/Discord.Net/API/Status/Rest/ActiveMaintenances.cs index 638c176a..639f85f0 100644 --- a/src/Discord.Net/API/Status/Rest/ActiveMaintenances.cs +++ b/src/Discord.Net/API/Status/Rest/ActiveMaintenances.cs @@ -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; } } diff --git a/src/Discord.Net/API/Status/Rest/AllIncidents.cs b/src/Discord.Net/API/Status/Rest/AllIncidents.cs index 81a82ce5..9575bbd4 100644 --- a/src/Discord.Net/API/Status/Rest/AllIncidents.cs +++ b/src/Discord.Net/API/Status/Rest/AllIncidents.cs @@ -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; } } diff --git a/src/Discord.Net/API/Status/Rest/UnresolvedIncidents.cs b/src/Discord.Net/API/Status/Rest/UnresolvedIncidents.cs index 1665dde7..3cff11c2 100644 --- a/src/Discord.Net/API/Status/Rest/UnresolvedIncidents.cs +++ b/src/Discord.Net/API/Status/Rest/UnresolvedIncidents.cs @@ -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; } } diff --git a/src/Discord.Net/API/Status/Rest/UpcomingMaintenances.cs b/src/Discord.Net/API/Status/Rest/UpcomingMaintenances.cs index afc812cc..803a8a63 100644 --- a/src/Discord.Net/API/Status/Rest/UpcomingMaintenances.cs +++ b/src/Discord.Net/API/Status/Rest/UpcomingMaintenances.cs @@ -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; } } diff --git a/src/Discord.Net/DiscordClient.cs b/src/Discord.Net/DiscordClient.cs index 51d35ed9..1b474ca5 100644 --- a/src/Discord.Net/DiscordClient.cs +++ b/src/Discord.Net/DiscordClient.cs @@ -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}"); diff --git a/src/Discord.Net/Net/Rest/RestClient.cs b/src/Discord.Net/Net/Rest/RestClient.cs index cb404a2f..47853f8a 100644 --- a/src/Discord.Net/Net/Rest/RestClient.cs +++ b/src/Discord.Net/Net/Rest/RestClient.cs @@ -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 Send(IRestRequest request) diff --git a/src/Discord.Net/Net/WebSockets/WebSocket.cs b/src/Discord.Net/Net/WebSockets/WebSocket.cs index f0052f29..aa2c9a98 100644 --- a/src/Discord.Net/Net/WebSockets/WebSocket.cs +++ b/src/Discord.Net/Net/WebSockets/WebSocket.cs @@ -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); }