diff --git a/src/Discord.Net/DiscordClient.API.cs b/src/Discord.Net/DiscordClient.API.cs index ed75930af..7aa04e29f 100644 --- a/src/Discord.Net/DiscordClient.API.cs +++ b/src/Discord.Net/DiscordClient.API.cs @@ -272,7 +272,7 @@ namespace Discord var model = await _api.SendMessage(channelId, blockText, mentions, nonce).ConfigureAwait(false); var msg = _messages.GetOrAdd(model.Id, channelId, model.Author.Id); msg.Update(model); - try { RaiseMessageSent(result[i]); } catch { } + RaiseEvent(nameof(MessageSent), () => RaiseMessageSent(msg)); } await Task.Delay(1000).ConfigureAwait(false); } diff --git a/src/Discord.Net/DiscordClient.cs b/src/Discord.Net/DiscordClient.cs index e7311d598..a4167130d 100644 --- a/src/Discord.Net/DiscordClient.cs +++ b/src/Discord.Net/DiscordClient.cs @@ -296,7 +296,7 @@ namespace Discord var data = e.Payload.ToObject(_serializer); var member = _members.TryRemove(data.UserId, data.GuildId); if (member != null) - try { RaiseMemberRemoved(member); } catch { } + RaiseEvent(nameof(MemberRemoved), () => RaiseMemberRemoved(member)); } break; @@ -474,7 +474,7 @@ namespace Discord if (user != null) { user.Update(data); - try { RaiseUserUpdated(user); } catch { } + RaiseEvent(nameof(UserUpdated), () => RaiseUserUpdated(user)); } } break; @@ -709,8 +709,8 @@ namespace Discord } msg.IsQueued = false; msg.HasFailed = hasFailed; - try { RaiseMessageSent(msg); } catch { } - } + RaiseEvent(nameof(MessageSent), () => RaiseMessageSent(msg)); + } await Task.Delay(interval).ConfigureAwait(false); } });