diff --git a/src/Discord.Net.Rest/Entities/Channels/RestDMChannel.cs b/src/Discord.Net.Rest/Entities/Channels/RestDMChannel.cs index 71a6b100..8d9af24c 100644 --- a/src/Discord.Net.Rest/Entities/Channels/RestDMChannel.cs +++ b/src/Discord.Net.Rest/Entities/Channels/RestDMChannel.cs @@ -29,23 +29,26 @@ namespace Discord.Rest /// /// Gets a collection that is the current logged-in user and the recipient. /// - public IReadOnlyCollection Users => ImmutableArray.Create(CurrentUser, Recipient); + public IReadOnlyCollection Users => Recipient is null + ? ImmutableArray.Empty + : ImmutableArray.Create(CurrentUser, Recipient); - internal RestDMChannel(BaseDiscordClient discord, ulong id, ulong recipientId) + internal RestDMChannel(BaseDiscordClient discord, ulong id, ulong? recipientId) : base(discord, id) { - Recipient = new RestUser(Discord, recipientId); + Recipient = recipientId.HasValue ? new RestUser(Discord, recipientId.Value) : null; CurrentUser = new RestUser(Discord, discord.CurrentUser.Id); } internal new static RestDMChannel Create(BaseDiscordClient discord, Model model) { - var entity = new RestDMChannel(discord, model.Id, model.Recipients.Value[0].Id); + var entity = new RestDMChannel(discord, model.Id, model.Recipients.GetValueOrDefault(null)?[0].Id); entity.Update(model); return entity; } internal override void Update(Model model) { - Recipient.Update(model.Recipients.Value[0]); + if(model.Recipients.IsSpecified) + Recipient?.Update(model.Recipients.Value[0]); } /// @@ -68,7 +71,7 @@ namespace Discord.Rest /// public RestUser GetUser(ulong id) { - if (id == Recipient.Id) + if (id == Recipient?.Id) return Recipient; else if (id == Discord.CurrentUser.Id) return CurrentUser;