From 62ba1b3877b9dc2dddcc7e732e389147b7a413b6 Mon Sep 17 00:00:00 2001 From: RogueException Date: Thu, 5 Nov 2015 21:09:15 -0400 Subject: [PATCH] Renamed ServerCreated, ServerDestroyed, UserAdded and UserRemoved to JoinedServer, LeftServer, UserJoined and UserLeft --- src/Discord.Net/DiscordClient.Servers.cs | 16 +++++----- src/Discord.Net/DiscordClient.Users.cs | 40 ++++++++++++------------ src/Discord.Net/DiscordClient.cs | 16 +++++----- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/Discord.Net/DiscordClient.Servers.cs b/src/Discord.Net/DiscordClient.Servers.cs index 2066be5b7..70bc285a3 100644 --- a/src/Discord.Net/DiscordClient.Servers.cs +++ b/src/Discord.Net/DiscordClient.Servers.cs @@ -25,17 +25,17 @@ namespace Discord public partial class DiscordClient { - public event EventHandler ServerCreated; - private void RaiseServerCreated(Server server) + public event EventHandler JoinedServer; + private void RaiseJoinedServer(Server server) { - if (ServerCreated != null) - RaiseEvent(nameof(ServerCreated), () => ServerCreated(this, new ServerEventArgs(server))); + if (JoinedServer != null) + RaiseEvent(nameof(JoinedServer), () => JoinedServer(this, new ServerEventArgs(server))); } - public event EventHandler ServerDestroyed; - private void RaiseServerDestroyed(Server server) + public event EventHandler LeftServer; + private void RaiseLeftServer(Server server) { - if (ServerDestroyed != null) - RaiseEvent(nameof(ServerDestroyed), () => ServerDestroyed(this, new ServerEventArgs(server))); + if (LeftServer != null) + RaiseEvent(nameof(LeftServer), () => LeftServer(this, new ServerEventArgs(server))); } public event EventHandler ServerUpdated; private void RaiseServerUpdated(Server server) diff --git a/src/Discord.Net/DiscordClient.Users.cs b/src/Discord.Net/DiscordClient.Users.cs index aa7e931b1..dd0068309 100644 --- a/src/Discord.Net/DiscordClient.Users.cs +++ b/src/Discord.Net/DiscordClient.Users.cs @@ -59,29 +59,17 @@ namespace Discord public partial class DiscordClient { - public event EventHandler UserIsTypingUpdated; - private void RaiseUserIsTyping(User user, Channel channel) - { - if (UserIsTypingUpdated != null) - RaiseEvent(nameof(UserIsTypingUpdated), () => UserIsTypingUpdated(this, new UserChannelEventArgs(user, channel))); - } - public event EventHandler UserIsSpeakingUpdated; - private void RaiseUserIsSpeaking(User user, Channel channel, bool isSpeaking) - { - if (UserIsSpeakingUpdated != null) - RaiseEvent(nameof(UserIsSpeakingUpdated), () => UserIsSpeakingUpdated(this, new UserIsSpeakingEventArgs(user, channel, isSpeaking))); - } - public event EventHandler UserAdded; - private void RaiseUserAdded(User user) + public event EventHandler UserJoined; + private void RaiseUserJoined(User user) { - if (UserAdded != null) - RaiseEvent(nameof(UserAdded), () => UserAdded(this, new UserEventArgs(user))); + if (UserJoined != null) + RaiseEvent(nameof(UserJoined), () => UserJoined(this, new UserEventArgs(user))); } - public event EventHandler UserRemoved; - private void RaiseUserRemoved(User user) + public event EventHandler UserLeft; + private void RaiseUserLeft(User user) { - if (UserRemoved != null) - RaiseEvent(nameof(UserRemoved), () => UserRemoved(this, new UserEventArgs(user))); + if (UserLeft != null) + RaiseEvent(nameof(UserLeft), () => UserLeft(this, new UserEventArgs(user))); } public event EventHandler UserUpdated; private void RaiseUserUpdated(User user) @@ -101,6 +89,18 @@ namespace Discord if (UserVoiceStateUpdated != null) RaiseEvent(nameof(UserVoiceStateUpdated), () => UserVoiceStateUpdated(this, new UserEventArgs(user))); } + public event EventHandler UserIsTypingUpdated; + private void RaiseUserIsTyping(User user, Channel channel) + { + if (UserIsTypingUpdated != null) + RaiseEvent(nameof(UserIsTypingUpdated), () => UserIsTypingUpdated(this, new UserChannelEventArgs(user, channel))); + } + public event EventHandler UserIsSpeakingUpdated; + private void RaiseUserIsSpeaking(User user, Channel channel, bool isSpeaking) + { + if (UserIsSpeakingUpdated != null) + RaiseEvent(nameof(UserIsSpeakingUpdated), () => UserIsSpeakingUpdated(this, new UserIsSpeakingEventArgs(user, channel, isSpeaking))); + } public event EventHandler ProfileUpdated; private void RaiseProfileUpdated() { diff --git a/src/Discord.Net/DiscordClient.cs b/src/Discord.Net/DiscordClient.cs index 8dbb33b96..bc0ad7b85 100644 --- a/src/Discord.Net/DiscordClient.cs +++ b/src/Discord.Net/DiscordClient.cs @@ -75,9 +75,9 @@ namespace Discord if (_config.LogLevel >= LogMessageSeverity.Info) { - ServerCreated += (s, e) => RaiseOnLog(LogMessageSeverity.Info, LogMessageSource.Client, + JoinedServer += (s, e) => RaiseOnLog(LogMessageSeverity.Info, LogMessageSource.Client, $"Server Created: {e.Server?.Name ?? "[Private]"}"); - ServerDestroyed += (s, e) => RaiseOnLog(LogMessageSeverity.Info, LogMessageSource.Client, + LeftServer += (s, e) => RaiseOnLog(LogMessageSeverity.Info, LogMessageSource.Client, $"Server Destroyed: {e.Server?.Name ?? "[Private]"}"); ServerUpdated += (s, e) => RaiseOnLog(LogMessageSeverity.Info, LogMessageSource.Client, $"Server Updated: {e.Server?.Name ?? "[Private]"}"); @@ -107,9 +107,9 @@ namespace Discord $"Banned User: {e.Server?.Name ?? "[Private]" }/{e.UserId}"); UserUnbanned += (s, e) => RaiseOnLog(LogMessageSeverity.Info, LogMessageSource.Client, $"Unbanned User: {e.Server?.Name ?? "[Private]"}/{e.UserId}"); - UserAdded += (s, e) => RaiseOnLog(LogMessageSeverity.Info, LogMessageSource.Client, + UserJoined += (s, e) => RaiseOnLog(LogMessageSeverity.Info, LogMessageSource.Client, $"User Joined: {e.Server?.Name ?? "[Private]"}/{e.User.Name}"); - UserRemoved += (s, e) => RaiseOnLog(LogMessageSeverity.Info, LogMessageSource.Client, + UserLeft += (s, e) => RaiseOnLog(LogMessageSeverity.Info, LogMessageSource.Client, $"User Left: {e.Server?.Name ?? "[Private]"}/{e.User.Name}"); UserUpdated += (s, e) => RaiseOnLog(LogMessageSeverity.Info, LogMessageSource.Client, $"User Updated: {e.Server?.Name ?? "[Private]"}/{e.User.Name}"); @@ -340,7 +340,7 @@ namespace Discord if (data.Unavailable == false) RaiseServerAvailable(server); else - RaiseServerCreated(server); + RaiseJoinedServer(server); } } break; @@ -364,7 +364,7 @@ namespace Discord if (data.Unavailable == true) RaiseServerAvailable(server); else - RaiseServerDestroyed(server); + RaiseLeftServer(server); } } break; @@ -414,7 +414,7 @@ namespace Discord user.Update(data); if (Config.TrackActivity) user.UpdateActivity(); - RaiseUserAdded(user); + RaiseUserJoined(user); } break; case "GUILD_MEMBER_UPDATE": @@ -433,7 +433,7 @@ namespace Discord var data = e.Payload.ToObject(_serializer); var user = _users.TryRemove(data.UserId, data.GuildId); if (user != null) - RaiseUserRemoved(user); + RaiseUserLeft(user); } break; case "GUILD_MEMBERS_CHUNK":