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

fix: Fix after message remaining in MessageUpdated if message author wasn't in the payload (#1209)

Browse Source 
* Fix leaving updated message as null when Discords doesn't include a message author in MESSAGE_UPDATE

* Name! That! Parameter!
This commit is contained in:
Alex Gravely
2018-12-02 12:57:38 -05:00
committed by Christopher F
parent f6413bac59
commit 91e0f03bfd
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Discord.Net.WebSocket/DiscordSocketClient.cs
View File

@@ -1218,16 +1218,22 @@ namespace Discord.WebSocket
cachedMsg.Update(State, data); cachedMsg.Update(State, data);
after = cachedMsg; after = cachedMsg;
} }
else if (data.Author.IsSpecified) else
{ {
//Edited message isnt in cache, create a detached one //Edited message isnt in cache, create a detached one
SocketUser author; SocketUser author;
if (guild != null) if (data.Author.IsSpecified)
author = guild.GetUser(data.Author.Value.Id); {
if (guild != null)
author = guild.GetUser(data.Author.Value.Id);
else
author = (channel as SocketChannel).GetUser(data.Author.Value.Id);
if (author == null)
author = SocketUnknownUser.Create(this, State, data.Author.Value);
}
else else
author = (channel as SocketChannel).GetUser(data.Author.Value.Id); // Message author wasn't specified in the payload, so create a completely anonymous unknown user
if (author == null) author = new SocketUnknownUser(this, id: 0);
author = SocketUnknownUser.Create(this, State, data.Author.Value);
after = SocketMessage.Create(this, State, author, channel, data); after = SocketMessage.Create(this, State, author, channel, data);
} }