Browse Source

Fixed MessageDeleted not always being fired

tags/docs-0.9
RogueException 9 years ago
parent
commit
97c4a1cca9
2 changed files with 12 additions and 12 deletions
  1. +0
    -1
      src/Discord.Net/DiscordClient.Channels.cs
  2. +12
    -11
      src/Discord.Net/DiscordClient.Messages.cs

+ 0
- 1
src/Discord.Net/DiscordClient.Channels.cs View File

@@ -200,7 +200,6 @@ namespace Discord

try { await _api.DestroyChannel(channel.Id).ConfigureAwait(false); }
catch (HttpException ex) when (ex.StatusCode == HttpStatusCode.NotFound) { }
//return _channels.TryRemove(channel.Id);
}
}
}

+ 12
- 11
src/Discord.Net/DiscordClient.Messages.cs View File

@@ -188,29 +188,30 @@ namespace Discord
}

/// <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));
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)
{
if (messages == null) throw new ArgumentNullException(nameof(messages));
CheckReady();

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);
_messages.TryRemove(message.Id);
try
{
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) { }
}




Loading…
Cancel
Save