From 5ed01a30b6c25da65e5c401bf6b7ed8fbb939926 Mon Sep 17 00:00:00 2001 From: Paulo Date: Thu, 26 Nov 2020 14:30:58 -0300 Subject: [PATCH] fix: UserMentions throwing NullRef --- .../Entities/Messages/SocketUserMessage.cs | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/Discord.Net.WebSocket/Entities/Messages/SocketUserMessage.cs b/src/Discord.Net.WebSocket/Entities/Messages/SocketUserMessage.cs index 4f876ed6f2..6d85812918 100644 --- a/src/Discord.Net.WebSocket/Entities/Messages/SocketUserMessage.cs +++ b/src/Discord.Net.WebSocket/Entities/Messages/SocketUserMessage.cs @@ -118,11 +118,14 @@ internal override void Update(ClientState state, Model model) for (int i = 0; i < value.Length; i++) { var val = value[i]; - var guildUser = guild.GetUser(val.Id); - if (guildUser != null) - newMentions.Add(guildUser); - else if (val.Object != null) - newMentions.Add(SocketUnknownUser.Create(Discord, state, val.Object)); + if (val.Object != null) + { + var user = Channel.GetUserAsync(val.Object.Id, CacheMode.CacheOnly).GetAwaiter().GetResult() as SocketUser; + if (user != null) + newMentions.Add(user); + else + newMentions.Add(SocketUnknownUser.Create(Discord, state, val.Object)); + } } _userMentions = newMentions.ToImmutable(); }