From dd7e570b6042f08f22b4c91fef44cfa8497b0d21 Mon Sep 17 00:00:00 2001 From: Brandon Smith Date: Tue, 27 Oct 2015 14:55:47 -0300 Subject: [PATCH 1/3] Bumped LargeThreshold up to 100 when enabled, to match client behavor --- src/Discord.Net/Net/WebSockets/DataWebSocket.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Discord.Net/Net/WebSockets/DataWebSocket.cs b/src/Discord.Net/Net/WebSockets/DataWebSocket.cs index 3db1c1a93..7e59565d7 100644 --- a/src/Discord.Net/Net/WebSockets/DataWebSocket.cs +++ b/src/Discord.Net/Net/WebSockets/DataWebSocket.cs @@ -27,7 +27,7 @@ namespace Discord.Net.WebSockets msg.Payload.Token = token; msg.Payload.Properties["$device"] = "Discord.Net"; if (_client.Config.UseLargeThreshold) - msg.Payload.LargeThreshold = 50; + msg.Payload.LargeThreshold = 100; msg.Payload.Compress = true; QueueMessage(msg); } From de1472160c9919b9c192a2f07535be48d238eeb1 Mon Sep 17 00:00:00 2001 From: Brandon Smith Date: Tue, 27 Oct 2015 20:47:34 -0300 Subject: [PATCH 2/3] Dont send the everyone role in EditUser --- src/Discord.Net/DiscordClient.Users.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Discord.Net/DiscordClient.Users.cs b/src/Discord.Net/DiscordClient.Users.cs index dad44fc63..21e257b0a 100644 --- a/src/Discord.Net/DiscordClient.Users.cs +++ b/src/Discord.Net/DiscordClient.Users.cs @@ -169,7 +169,10 @@ namespace Discord if (user == null) throw new ArgumentNullException(nameof(user)); CheckReady(); - return _api.EditUser(user.Server?.Id, user.Id, mute: mute, deaf: deaf, roles: roles.Select(x => x.Id)); + var everyoneId = user.Server.Id; + return _api.EditUser(user.Server?.Id, user.Id, + mute: mute, deaf: deaf, + roles: roles.Select(x => x.Id).Where(x => x != everyoneId)); } public Task KickUser(User user) From 3c0cef43617fc28003e79dacd5cf66d9ae4e3e49 Mon Sep 17 00:00:00 2001 From: Brandon Smith Date: Tue, 27 Oct 2015 20:51:48 -0300 Subject: [PATCH 3/3] Dont nullref if EditUser is called in a private channel. --- src/Discord.Net/DiscordClient.Users.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Discord.Net/DiscordClient.Users.cs b/src/Discord.Net/DiscordClient.Users.cs index 21e257b0a..e63fd04c1 100644 --- a/src/Discord.Net/DiscordClient.Users.cs +++ b/src/Discord.Net/DiscordClient.Users.cs @@ -169,10 +169,10 @@ namespace Discord if (user == null) throw new ArgumentNullException(nameof(user)); CheckReady(); - var everyoneId = user.Server.Id; - return _api.EditUser(user.Server?.Id, user.Id, + var serverId = user.Server?.Id; + return _api.EditUser(serverId, user.Id, mute: mute, deaf: deaf, - roles: roles.Select(x => x.Id).Where(x => x != everyoneId)); + roles: roles.Select(x => x.Id).Where(x => x != serverId)); } public Task KickUser(User user)