Removed raw input/output from Debug logging

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; }
 

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; }

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; }
 

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; }

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; }
 

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; }

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; }
 

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; }

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; }
 

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; }
 

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; }
 

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; }
 

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; }

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; }

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

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; }
 

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; }
 

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; }
 

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; }
 

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

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; }
 

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; }

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; }
 

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; }

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;
     }
 }

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; }
 

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; }

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; }

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
         {

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
         {

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;
 

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; }
 

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; }
 

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; }
 

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; }
 

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; }

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; }

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; }

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; }

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<ResponseT> : IRestRequest
         where ResponseT : class

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;
     }
 }

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;
     }
 }

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;
     }
 }

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;
     }
 }

src/Discord.Net/DiscordClient.cs

@@ -920,8 +920,8 @@ namespace Discord
 
                             if (user != null)
                             {
-                                /*if (Config.LogLevel == LogSeverity.Debug)
+                                if (Config.LogLevel == LogSeverity.Debug)
-                                    Logger.Debug($"PRESENCE_UPDATE: {user.Path}");*/
+                                    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)
+                                    if (Config.LogLevel == LogSeverity.Debug)
-                                        Logger.Debug($"TYPING_START: {channel.Path} ({user.Name})");*/
+                                        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)
+                                    if (Config.LogLevel == LogSeverity.Debug)
-                                        Logger.Debug($"VOICE_STATE_UPDATE: {user.Path}");*/
+                                        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}");

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)
+            if (logger != null && logger.Level >= LogSeverity.Verbose)
-            {
+                SentRequest += (s, e) => _logger.Verbose($"{e.Request.Method} {e.Request.Endpoint}: {e.Milliseconds} ms");
-                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);
-                };
-            }
         }
 
         public async Task<ResponseT> Send<ResponseT>(IRestRequest<ResponseT> request)

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);
 		}