Fixed MessageDeleted not always being fired
This commit is contained in:
@@ -200,7 +200,6 @@ namespace Discord
|
|||||||
|
|
||||||
try { await _api.DestroyChannel(channel.Id).ConfigureAwait(false); }
|
try { await _api.DestroyChannel(channel.Id).ConfigureAwait(false); }
|
||||||
catch (HttpException ex) when (ex.StatusCode == HttpStatusCode.NotFound) { }
|
catch (HttpException ex) when (ex.StatusCode == HttpStatusCode.NotFound) { }
|
||||||
//return _channels.TryRemove(channel.Id);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -188,29 +188,30 @@ namespace Discord
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary> Deletes the provided message. </summary>
|
/// <summary> Deletes the provided message. </summary>
|
||||||
public Task DeleteMessage(Message message)
|
public async Task DeleteMessage(Message message)
|
||||||
{
|
{
|
||||||
if (message == null) throw new ArgumentNullException(nameof(message));
|
if (message == null) throw new ArgumentNullException(nameof(message));
|
||||||
CheckReady();
|
CheckReady();
|
||||||
|
|
||||||
return DeleteMessageInternal(message);
|
try
|
||||||
}
|
{
|
||||||
|
await _api.DeleteMessage(message.Id, message.Channel.Id).ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
catch (HttpException ex) when (ex.StatusCode == HttpStatusCode.NotFound) { }
|
||||||
|
}
|
||||||
public async Task DeleteMessages(IEnumerable<Message> messages)
|
public async Task DeleteMessages(IEnumerable<Message> messages)
|
||||||
{
|
{
|
||||||
if (messages == null) throw new ArgumentNullException(nameof(messages));
|
if (messages == null) throw new ArgumentNullException(nameof(messages));
|
||||||
CheckReady();
|
CheckReady();
|
||||||
|
|
||||||
foreach (var message in messages)
|
foreach (var message in messages)
|
||||||
await DeleteMessageInternal(message).ConfigureAwait(false);
|
|
||||||
}
|
|
||||||
private async Task DeleteMessageInternal(Message message)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
{
|
||||||
await _api.DeleteMessage(message.Id, message.Channel.Id).ConfigureAwait(false);
|
try
|
||||||
_messages.TryRemove(message.Id);
|
{
|
||||||
|
await _api.DeleteMessage(message.Id, message.Channel.Id).ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
catch (HttpException ex) when (ex.StatusCode == HttpStatusCode.NotFound) { }
|
||||||
}
|
}
|
||||||
catch (HttpException ex) when (ex.StatusCode == HttpStatusCode.NotFound) { }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user