diff --git a/src/Discord.Net.Modules/ModuleManager.cs b/src/Discord.Net.Modules/ModuleManager.cs index c417dbb63..0a9022efa 100644 --- a/src/Discord.Net.Modules/ModuleManager.cs +++ b/src/Discord.Net.Modules/ModuleManager.cs @@ -86,7 +86,7 @@ namespace Discord.Modules client.MessageSent += (s, e) => { if (MessageSent != null && HasChannel(e.Channel)) MessageSent(s, e); }; client.MessageDeleted += (s, e) => { if (MessageDeleted != null && HasChannel(e.Channel)) MessageDeleted(s, e); }; client.MessageUpdated += (s, e) => { if (MessageUpdated != null && HasChannel(e.Channel)) MessageUpdated(s, e); }; - client.MessageReadRemotely += (s, e) => { if (MessageReadRemotely != null && HasChannel(e.Channel)) MessageReadRemotely(s, e); }; + client.MessageAcknowledged += (s, e) => { if (MessageReadRemotely != null && HasChannel(e.Channel)) MessageReadRemotely(s, e); }; client.RoleCreated += (s, e) => { if (RoleCreated != null && HasIndirectServer(e.Server)) RoleCreated(s, e); }; client.RoleUpdated += (s, e) => { if (RoleUpdated != null && HasIndirectServer(e.Server)) RoleUpdated(s, e); }; diff --git a/src/Discord.Net/DiscordClient.Messages.cs b/src/Discord.Net/DiscordClient.Messages.cs index 759224db7..625d27c3c 100644 --- a/src/Discord.Net/DiscordClient.Messages.cs +++ b/src/Discord.Net/DiscordClient.Messages.cs @@ -88,11 +88,11 @@ namespace Discord if (MessageUpdated != null) EventHelper.Raise(_logger, nameof(MessageUpdated), () => MessageUpdated(this, new MessageEventArgs(msg))); } - public event EventHandler MessageReadRemotely; - private void RaiseMessageReadRemotely(Message msg) + public event EventHandler MessageAcknowledged; + private void RaiseMessageAcknowledged(Message msg) { - if (MessageReadRemotely != null) - EventHelper.Raise(_logger, nameof(MessageReadRemotely), () => MessageReadRemotely(this, new MessageEventArgs(msg))); + if (MessageAcknowledged != null) + EventHelper.Raise(_logger, nameof(MessageAcknowledged), () => MessageAcknowledged(this, new MessageEventArgs(msg))); } internal Messages Messages => _messages; diff --git a/src/Discord.Net/DiscordClient.cs b/src/Discord.Net/DiscordClient.cs index 107600f81..bac5427b1 100644 --- a/src/Discord.Net/DiscordClient.cs +++ b/src/Discord.Net/DiscordClient.cs @@ -217,8 +217,8 @@ namespace Discord { UserIsTypingUpdated += (s, e) => _logger.Log(LogSeverity.Verbose, $"User Updated (Typing): {e.Server?.Name ?? "[Private]"}/{e.Channel?.Name}/{e.User?.Name}"); - MessageReadRemotely += (s, e) => _logger.Log(LogSeverity.Verbose, - $"Read Message (Remotely): {e.Server?.Name ?? "[Private]"}/{e.Channel?.Name}/{e.Message?.Id}"); + MessageAcknowledged += (s, e) => _logger.Log(LogSeverity.Verbose, + $"Ack'd Message: {e.Server?.Name ?? "[Private]"}/{e.Channel?.Name}/{e.Message?.Id}"); MessageSent += (s, e) => _logger.Log(LogSeverity.Verbose, $"Sent Message: {e.Server?.Name ?? "[Private]"}/{e.Channel?.Name}/{e.Message?.Id}"); UserPresenceUpdated += (s, e) => _logger.Log(LogSeverity.Verbose, @@ -729,7 +729,7 @@ namespace Discord var data = e.Payload.ToObject(_webSocket.Serializer); var msg = GetMessage(data.MessageId); if (msg != null) - RaiseMessageReadRemotely(msg); + RaiseMessageAcknowledged(msg); } break;