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 --- src/Discord.Net/API/Client/Rest/AcceptInvite.cs | 1 - src/Discord.Net/API/Client/Rest/AckMessage.cs | 1 - .../API/Client/Rest/AddChannelPermission.cs | 1 - src/Discord.Net/API/Client/Rest/AddGuildBan.cs | 1 - src/Discord.Net/API/Client/Rest/CreateChannel.cs | 1 - src/Discord.Net/API/Client/Rest/CreateGuild.cs | 1 - src/Discord.Net/API/Client/Rest/CreateInvite.cs | 1 - .../API/Client/Rest/CreatePrivateChannel.cs | 1 - src/Discord.Net/API/Client/Rest/CreateRole.cs | 1 - src/Discord.Net/API/Client/Rest/DeleteChannel.cs | 1 - src/Discord.Net/API/Client/Rest/DeleteGuild.cs | 1 - src/Discord.Net/API/Client/Rest/DeleteInvite.cs | 1 - src/Discord.Net/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 - src/Discord.Net/API/Client/Rest/GetMessages.cs | 1 - src/Discord.Net/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 - src/Discord.Net/API/Client/Rest/PruneMembers.cs | 1 - .../API/Client/Rest/RemoveChannelPermission.cs | 1 - src/Discord.Net/API/Client/Rest/RemoveGuildBan.cs | 1 - src/Discord.Net/API/Client/Rest/ReorderChannels.cs | 1 - src/Discord.Net/API/Client/Rest/ReorderRoles.cs | 1 - src/Discord.Net/API/Client/Rest/SendFile.cs | 1 - src/Discord.Net/API/Client/Rest/SendIsTyping.cs | 1 - src/Discord.Net/API/Client/Rest/SendMessage.cs | 1 - src/Discord.Net/API/Client/Rest/UpdateChannel.cs | 1 - src/Discord.Net/API/Client/Rest/UpdateGuild.cs | 1 - src/Discord.Net/API/Client/Rest/UpdateMember.cs | 1 - src/Discord.Net/API/Client/Rest/UpdateMessage.cs | 1 - src/Discord.Net/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 - src/Discord.Net/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 865e37c2d..2940c98ac 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 1678ed34b..4cf238b72 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 c7a9f57ac..44d08b4bf 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 7699a74e4..3e0b165f5 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 0dc45bc43..0d3309701 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 baa1f455e..a18d2bee9 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 a55b9c7e9..73f15c248 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 2d413a8d9..e1087dc36 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 87715490d..3978c6aaa 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 6443c2387..ae56934b5 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 d55c6d989..44df5892e 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 5de8b348b..4bfe1e0d7 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 33921cd1a..3f781a756 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 650ece9f2..56faf3d33 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 ef9486ca1..02dd71008 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 ee07cb242..714cdbaf8 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 27de264f0..2531ac26a 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 079c54ef5..2b4f2f5fe 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 b72b05c8b..1beadb9a9 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 7dc97ef31..df21cc203 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 3b1006358..0437a8b6b 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 96804ff6b..4808f8543 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 df210ad70..99fd8cbe7 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 ab7efc31b..f9c89c717 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 78f8059e5..9f4443c51 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 41771f7d6..e80498bb1 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 c704eadbc..b453cba49 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 c6d48c944..5a8f4f796 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 c481eda43..c13f8b21c 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 23d73541f..300176a76 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 8d072d0e3..4b59e1a11 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 aab017c67..4c56da0be 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 6c6d1ae10..9caca991d 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 cccd4b096..86a35a605 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 4ff530554..f36b18d9f 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 019c4ee99..ce1649bdd 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 df3ca46c0..fc055b2bc 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 08f28d868..0f0cdb313 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 7aac774b7..4bea0b52b 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 b8c7b818c..af520370d 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 638c176a5..639f85f08 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 81a82ce51..9575bbd43 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 1665dde75..3cff11c23 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 afc812cc9..803a8a630 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 51d35ed90..1b474ca5d 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 cb404a2f0..47853f8a4 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 f0052f29a..aa2c9a98b 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); }