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

Fixed handling of invalid roles

Browse Source
This commit is contained in:
RogueException
2016-06-12 13:50:36 -03:00
parent 15d7fcf46d
commit f3f4ba7d66
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Discord.Net/DiscordSocketClient.cs
View File

@@ -114,6 +114,11 @@ namespace Discord
#endif #endif
_serializer = new JsonSerializer { ContractResolver = new DiscordContractResolver() }; _serializer = new JsonSerializer { ContractResolver = new DiscordContractResolver() };
_serializer.Error += (s, e) =>
{
_gatewayLogger.WarningAsync(e.ErrorContext.Error).GetAwaiter().GetResult();
e.ErrorContext.Handled = true;
};
ApiClient.SentGatewayMessage += async opCode => await _gatewayLogger.DebugAsync($"Sent {(GatewayOpCode)opCode}").ConfigureAwait(false); ApiClient.SentGatewayMessage += async opCode => await _gatewayLogger.DebugAsync($"Sent {(GatewayOpCode)opCode}").ConfigureAwait(false);
ApiClient.ReceivedGatewayEvent += ProcessMessageAsync; ApiClient.ReceivedGatewayEvent += ProcessMessageAsync;

6
src/Discord.Net/Entities/Users/GuildUser.cs
View File

@@ -62,7 +62,11 @@ namespace Discord
var roles = ImmutableArray.CreateBuilder<Role>(value.Length + 1); var roles = ImmutableArray.CreateBuilder<Role>(value.Length + 1);
roles.Add(Guild.EveryoneRole); roles.Add(Guild.EveryoneRole);
for (int i = 0; i < value.Length; i++) for (int i = 0; i < value.Length; i++)
roles.Add(Guild.GetRole(value[i])); {
var role = Guild.GetRole(value[i]);
if (role != null)
roles.Add(role);
}
Roles = roles.ToImmutable(); Roles = roles.ToImmutable();
GuildPermissions = new GuildPermissions(Permissions.ResolveGuild(this)); GuildPermissions = new GuildPermissions(Permissions.ResolveGuild(this));
} }