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

Dont error if an uncached message is delete

Browse Source
This commit is contained in:
RogueException
2016-06-26 17:06:18 -03:00
parent 21102e460c
commit 851589f7db
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -948,7 +948,10 @@ namespace Discord
if (channel != null) if (channel != null)
{ {
var msg = channel.RemoveMessage(data.Id); var msg = channel.RemoveMessage(data.Id);
await _messageDeletedEvent.InvokeAsync(data.Id, Optional.Create<IMessage>(msg)).ConfigureAwait(false); if (msg != null)
await _messageDeletedEvent.InvokeAsync(data.Id, Optional.Create<IMessage>(msg)).ConfigureAwait(false);
else
await _messageDeletedEvent.InvokeAsync(data.Id, Optional.Create<IMessage>()).ConfigureAwait(false);
} }
else else
{ {
@@ -968,7 +971,10 @@ namespace Discord
foreach (var id in data.Ids) foreach (var id in data.Ids)
{ {
var msg = channel.RemoveMessage(id); var msg = channel.RemoveMessage(id);
await _messageDeletedEvent.InvokeAsync(msg.Id, Optional.Create<IMessage>(msg)).ConfigureAwait(false); if (msg != null)
await _messageDeletedEvent.InvokeAsync(id, Optional.Create<IMessage>(msg)).ConfigureAwait(false);
else
await _messageDeletedEvent.InvokeAsync(id, Optional.Create<IMessage>()).ConfigureAwait(false);
} }
} }
else else