From ecff2ebf17f2e32ab993828d5520f208c321b55f Mon Sep 17 00:00:00 2001 From: RogueException Date: Sun, 25 Oct 2015 06:21:34 -0300 Subject: [PATCH] Renamed some events --- src/Discord.Net.Commands/CommandsPlugin.cs | 2 +- src/Discord.Net/DiscordClient.Bans.cs | 16 ++++++------- src/Discord.Net/DiscordClient.Messages.cs | 18 +++++++-------- src/Discord.Net/DiscordClient.Users.cs | 26 ++++++++++++---------- src/Discord.Net/DiscordClient.cs | 18 +++++++-------- test/Discord.Net.Tests/Tests.cs | 4 ++-- 6 files changed, 42 insertions(+), 42 deletions(-) diff --git a/src/Discord.Net.Commands/CommandsPlugin.cs b/src/Discord.Net.Commands/CommandsPlugin.cs index 80e682162..d9d35f916 100644 --- a/src/Discord.Net.Commands/CommandsPlugin.cs +++ b/src/Discord.Net.Commands/CommandsPlugin.cs @@ -28,7 +28,7 @@ namespace Discord.Commands RequireCommandCharInPublic = true; RequireCommandCharInPrivate = true; - client.MessageCreated += async (s, e) => + client.MessageReceived += async (s, e) => { //If commands aren't being used, don't bother processing them if (_commands.Count == 0) diff --git a/src/Discord.Net/DiscordClient.Bans.cs b/src/Discord.Net/DiscordClient.Bans.cs index af4d52457..e910d4bf6 100644 --- a/src/Discord.Net/DiscordClient.Bans.cs +++ b/src/Discord.Net/DiscordClient.Bans.cs @@ -18,17 +18,17 @@ namespace Discord public partial class DiscordClient { - public event EventHandler BanAdded; - private void RaiseBanAdded(string userId, Server server) + public event EventHandler UserBanned; + private void RaiseUserBanned(string userId, Server server) { - if (BanAdded != null) - RaiseEvent(nameof(BanAdded), () => BanAdded(this, new BanEventArgs(userId, server))); + if (UserBanned != null) + RaiseEvent(nameof(UserBanned), () => UserBanned(this, new BanEventArgs(userId, server))); } - public event EventHandler BanRemoved; - private void RaiseBanRemoved(string userId, Server server) + public event EventHandler UserUnbanned; + private void RaiseUserUnbanned(string userId, Server server) { - if (BanRemoved != null) - RaiseEvent(nameof(BanRemoved), () => BanRemoved(this, new BanEventArgs(userId, server))); + if (UserUnbanned != null) + RaiseEvent(nameof(UserUnbanned), () => UserUnbanned(this, new BanEventArgs(userId, server))); } /// Bans a user from the provided server. diff --git a/src/Discord.Net/DiscordClient.Messages.cs b/src/Discord.Net/DiscordClient.Messages.cs index c23823af0..8a6780b52 100644 --- a/src/Discord.Net/DiscordClient.Messages.cs +++ b/src/Discord.Net/DiscordClient.Messages.cs @@ -45,11 +45,17 @@ namespace Discord { public const int MaxMessageSize = 2000; - public event EventHandler MessageCreated; + public event EventHandler MessageReceived; private void RaiseMessageCreated(Message msg) { - if (MessageCreated != null) - RaiseEvent(nameof(MessageCreated), () => MessageCreated(this, new MessageEventArgs(msg))); + if (MessageReceived != null) + RaiseEvent(nameof(MessageReceived), () => MessageReceived(this, new MessageEventArgs(msg))); + } + public event EventHandler MessageSent; + private void RaiseMessageSent(Message msg) + { + if (MessageSent != null) + RaiseEvent(nameof(MessageSent), () => MessageSent(this, new MessageEventArgs(msg))); } public event EventHandler MessageDeleted; private void RaiseMessageDeleted(Message msg) @@ -69,12 +75,6 @@ namespace Discord if (MessageReadRemotely != null) RaiseEvent(nameof(MessageReadRemotely), () => MessageReadRemotely(this, new MessageEventArgs(msg))); } - public event EventHandler MessageSent; - private void RaiseMessageSent(Message msg) - { - if (MessageSent != null) - RaiseEvent(nameof(MessageSent), () => MessageSent(this, new MessageEventArgs(msg))); - } internal Messages Messages => _messages; private readonly Messages _messages; diff --git a/src/Discord.Net/DiscordClient.Users.cs b/src/Discord.Net/DiscordClient.Users.cs index e04618dd5..3c2a813a3 100644 --- a/src/Discord.Net/DiscordClient.Users.cs +++ b/src/Discord.Net/DiscordClient.Users.cs @@ -60,17 +60,17 @@ namespace Discord public partial class DiscordClient { - public event EventHandler UserIsTyping; + public event EventHandler UserIsTypingUpdated; private void RaiseUserIsTyping(User user, Channel channel) { - if (UserIsTyping != null) - RaiseEvent(nameof(UserIsTyping), () => UserIsTyping(this, new UserChannelEventArgs(user, channel))); + if (UserIsTypingUpdated != null) + RaiseEvent(nameof(UserIsTypingUpdated), () => UserIsTypingUpdated(this, new UserChannelEventArgs(user, channel))); } - public event EventHandler UserIsSpeaking; + public event EventHandler UserIsSpeakingUpdated; private void RaiseUserIsSpeaking(User user, Channel channel, bool isSpeaking) { - if (UserIsSpeaking != null) - RaiseEvent(nameof(UserIsSpeaking), () => UserIsSpeaking(this, new UserIsSpeakingEventArgs(user, channel, isSpeaking))); + if (UserIsSpeakingUpdated != null) + RaiseEvent(nameof(UserIsSpeakingUpdated), () => UserIsSpeakingUpdated(this, new UserIsSpeakingEventArgs(user, channel, isSpeaking))); } public event EventHandler UserAdded; private void RaiseUserAdded(User user) @@ -84,12 +84,6 @@ namespace Discord if (UserRemoved != null) RaiseEvent(nameof(UserRemoved), () => UserRemoved(this, new UserEventArgs(user))); } - public event EventHandler ProfileUpdated; - private void RaiseProfileUpdated() - { - if (ProfileUpdated != null) - RaiseEvent(nameof(ProfileUpdated), () => ProfileUpdated(this, EventArgs.Empty)); - } public event EventHandler UserUpdated; private void RaiseMemberUpdated(User user) { @@ -108,7 +102,15 @@ namespace Discord if (UserVoiceStateUpdated != null) RaiseEvent(nameof(UserVoiceStateUpdated), () => UserVoiceStateUpdated(this, new UserEventArgs(user))); } + public event EventHandler ProfileUpdated; + private void RaiseProfileUpdated() + { + if (ProfileUpdated != null) + RaiseEvent(nameof(ProfileUpdated), () => ProfileUpdated(this, EventArgs.Empty)); + } + /// Returns the current logged-in user. + public User CurrentUser => _currentUser; private User _currentUser; /// Returns a collection of all users this client can currently see. diff --git a/src/Discord.Net/DiscordClient.cs b/src/Discord.Net/DiscordClient.cs index fe6a7beec..f8ad4e223 100644 --- a/src/Discord.Net/DiscordClient.cs +++ b/src/Discord.Net/DiscordClient.cs @@ -22,14 +22,12 @@ namespace Discord private UserStatus _status; private int? _gameId; + /// Returns the configuration object used to make this client. Note that this object cannot be edited directly - to change the configuration of this client, use the DiscordClient(DiscordClientConfig config) constructor. public new DiscordClientConfig Config => _config as DiscordClientConfig; /// Gives direct access to the underlying DiscordAPIClient. This can be used to modify objects not in cache. public DiscordAPIClient API => _api; - - /// Returns the current logged-in user. - public User CurrentUser => _currentUser; - + /// Initializes a new instance of the DiscordClient class. public DiscordClient(DiscordClientConfig config = null) : base(config ?? new DiscordClientConfig()) @@ -91,7 +89,7 @@ namespace Discord $"Channel Destroyed: {e.Server?.Name ?? "[Private]"}/{e.Channel?.Name}"); ChannelUpdated += (s, e) => RaiseOnLog(LogMessageSeverity.Info, LogMessageSource.Client, $"Channel Updated: {e.Server?.Name ?? "[Private]"}/{e.Channel?.Name}"); - MessageCreated += (s, e) => RaiseOnLog(LogMessageSeverity.Info, LogMessageSource.Client, + MessageReceived += (s, e) => RaiseOnLog(LogMessageSeverity.Info, LogMessageSource.Client, $"Message Created: {e.Server?.Name ?? "[Private]"}/{e.Channel?.Name}/{e.Message?.Id}"); MessageDeleted += (s, e) => RaiseOnLog(LogMessageSeverity.Info, LogMessageSource.Client, $"Message Deleted: {e.Server?.Name ?? "[Private]"}/{e.Channel?.Name}/{e.Message?.Id}"); @@ -103,9 +101,9 @@ namespace Discord $"Role Updated: {e.Server?.Name ?? "[Private]"}/{e.Role?.Name}"); RoleDeleted += (s, e) => RaiseOnLog(LogMessageSeverity.Info, LogMessageSource.Client, $"Role Deleted: {e.Server?.Name ?? "[Private]"}/{e.Role?.Name}"); - BanAdded += (s, e) => RaiseOnLog(LogMessageSeverity.Info, LogMessageSource.Client, + UserBanned += (s, e) => RaiseOnLog(LogMessageSeverity.Info, LogMessageSource.Client, $"Banned User: {e.Server?.Name ?? "[Private]" }/{e.UserId}"); - BanRemoved += (s, e) => RaiseOnLog(LogMessageSeverity.Info, LogMessageSource.Client, + UserUnbanned += (s, e) => RaiseOnLog(LogMessageSeverity.Info, LogMessageSource.Client, $"Unbanned User: {e.Server?.Name ?? "[Private]"}/{e.UserId}"); UserAdded += (s, e) => RaiseOnLog(LogMessageSeverity.Info, LogMessageSource.Client, $"User Joined: {e.Server?.Name ?? "[Private]"}/{e.User.Id}"); @@ -120,7 +118,7 @@ namespace Discord } if (_config.LogLevel >= LogMessageSeverity.Verbose) { - UserIsTyping += (s, e) => RaiseOnLog(LogMessageSeverity.Verbose, LogMessageSource.Client, + UserIsTypingUpdated += (s, e) => RaiseOnLog(LogMessageSeverity.Verbose, LogMessageSource.Client, $"Updated User (Is Typing): {e.Server?.Name ?? "[Private]"}/{e.Channel?.Name}/{e.User?.Name}"); MessageReadRemotely += (s, e) => RaiseOnLog(LogMessageSeverity.Verbose, LogMessageSource.Client, $"Read Message (Remotely): {e.Server?.Name ?? "[Private]"}/{e.Channel?.Name}/{e.Message?.Id}"); @@ -465,7 +463,7 @@ namespace Discord if (server != null) { server.AddBan(data.User?.Id); - RaiseBanAdded(data.User?.Id, server); + RaiseUserBanned(data.User?.Id, server); } } break; @@ -474,7 +472,7 @@ namespace Discord var data = e.Payload.ToObject(_serializer); var server = _servers[data.GuildId]; if (server != null && server.RemoveBan(data.User?.Id)) - RaiseBanRemoved(data.User?.Id, server); + RaiseUserUnbanned(data.User?.Id, server); } break; diff --git a/test/Discord.Net.Tests/Tests.cs b/test/Discord.Net.Tests/Tests.cs index 56cf7e15f..ed5a5f890 100644 --- a/test/Discord.Net.Tests/Tests.cs +++ b/test/Discord.Net.Tests/Tests.cs @@ -101,8 +101,8 @@ namespace Discord.Tests AssertEvent( "MessageCreated event never received", () => _hostClient.SendMessage(_testServerChannel, text), - x => _targetBot.MessageCreated += x, - x => _targetBot.MessageCreated -= x, + x => _targetBot.MessageReceived += x, + x => _targetBot.MessageReceived -= x, (s, e) => e.Message.Text == text); }