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

Merge pull request #350 from LassieME/issues/342

Browse Source 
Fix nullref during CreateRoleAsync
This commit is contained in:
RogueException
2016-11-12 00:58:14 -04:00
committed by GitHub
parent 9fcf88b7ac a6f89b7c36
commit fa7c60865d
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Discord.Net.Rest/Entities/Guilds/GuildHelper.cs
View File

@@ -142,7 +142,7 @@ namespace Discord.Rest
if (name == null) throw new ArgumentNullException(nameof(name));
var model = await client.ApiClient.CreateGuildRoleAsync(guild.Id, options).ConfigureAwait(false);
var role = RestRole.Create(client, model);
var role = RestRole.Create(guild, client, model);
await role.ModifyAsync(x =>
{

2
src/Discord.Net.Rest/Entities/Guilds/RestGuild.cs
View File

@@ -87,7 +87,7 @@ namespace Discord.Rest
if (model.Roles != null)
{
for (int i = 0; i < model.Roles.Length; i++)
roles[model.Roles[i].Id] = RestRole.Create(Discord, model.Roles[i]);
roles[model.Roles[i].Id] = RestRole.Create(this, Discord, model.Roles[i]);
}
_roles = roles.ToImmutable();

9
src/Discord.Net.Rest/Entities/Roles/RestRole.cs
View File

@@ -9,7 +9,7 @@ namespace Discord.Rest
[DebuggerDisplay(@"{DebuggerDisplay,nq}")]
public class RestRole : RestEntity<ulong>, IRole
{
public RestGuild Guild { get; }
public IGuild Guild { get; }
public Color Color { get; private set; }
public bool IsHoisted { get; private set; }
public bool IsManaged { get; private set; }
@@ -22,13 +22,14 @@ namespace Discord.Rest
public bool IsEveryone => Id == Guild.Id;
public string Mention => MentionUtils.MentionRole(Id);
internal RestRole(BaseDiscordClient discord, ulong id)
internal RestRole(IGuild guild, BaseDiscordClient discord, ulong id)
: base(discord, id)
{
Guild = guild;
}
internal static RestRole Create(BaseDiscordClient discord, Model model)
internal static RestRole Create(IGuild guild, BaseDiscordClient discord, Model model)
{
var entity = new RestRole(discord, model.Id);
var entity = new RestRole(guild, discord, model.Id);
entity.Update(model);
return entity;
}