github/Discord.Net
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed ServerCreated, ServerDestroyed, UserAdded and UserRemoved to JoinedServer, LeftServer, UserJoined and UserLeft

Browse Source
This commit is contained in:
RogueException
2015-11-05 21:09:15 -04:00
parent e2084be6c7
commit 62ba1b3877
3 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Discord.Net/DiscordClient.Servers.cs
View File

@@ -25,17 +25,17 @@ namespace Discord
public partial class DiscordClient public partial class DiscordClient
{ {
public event EventHandler<ServerEventArgs> ServerCreated; public event EventHandler<ServerEventArgs> JoinedServer;
private void RaiseServerCreated(Server server) private void RaiseJoinedServer(Server server)
{ {
if (ServerCreated != null) if (JoinedServer != null)
RaiseEvent(nameof(ServerCreated), () => ServerCreated(this, new ServerEventArgs(server))); RaiseEvent(nameof(JoinedServer), () => JoinedServer(this, new ServerEventArgs(server)));
} }
public event EventHandler<ServerEventArgs> ServerDestroyed; public event EventHandler<ServerEventArgs> LeftServer;
private void RaiseServerDestroyed(Server server) private void RaiseLeftServer(Server server)
{ {
if (ServerDestroyed != null) if (LeftServer != null)
RaiseEvent(nameof(ServerDestroyed), () => ServerDestroyed(this, new ServerEventArgs(server))); RaiseEvent(nameof(LeftServer), () => LeftServer(this, new ServerEventArgs(server)));
} }
public event EventHandler<ServerEventArgs> ServerUpdated; public event EventHandler<ServerEventArgs> ServerUpdated;
private void RaiseServerUpdated(Server server) private void RaiseServerUpdated(Server server)

40
src/Discord.Net/DiscordClient.Users.cs
View File

@@ -59,29 +59,17 @@ namespace Discord
public partial class DiscordClient public partial class DiscordClient
{ {
public event EventHandler<UserChannelEventArgs> UserIsTypingUpdated; public event EventHandler<UserEventArgs> UserJoined;
private void RaiseUserIsTyping(User user, Channel channel) private void RaiseUserJoined(User user)
{ {
if (UserIsTypingUpdated != null) if (UserJoined != null)
RaiseEvent(nameof(UserIsTypingUpdated), () => UserIsTypingUpdated(this, new UserChannelEventArgs(user, channel))); RaiseEvent(nameof(UserJoined), () => UserJoined(this, new UserEventArgs(user)));
} }
public event EventHandler<UserIsSpeakingEventArgs> UserIsSpeakingUpdated; public event EventHandler<UserEventArgs> UserLeft;
private void RaiseUserIsSpeaking(User user, Channel channel, bool isSpeaking) private void RaiseUserLeft(User user)
{ {
if (UserIsSpeakingUpdated != null) if (UserLeft != null)
RaiseEvent(nameof(UserIsSpeakingUpdated), () => UserIsSpeakingUpdated(this, new UserIsSpeakingEventArgs(user, channel, isSpeaking))); RaiseEvent(nameof(UserLeft), () => UserLeft(this, new UserEventArgs(user)));
}
public event EventHandler<UserEventArgs> UserAdded;
private void RaiseUserAdded(User user)
{
if (UserAdded != null)
RaiseEvent(nameof(UserAdded), () => UserAdded(this, new UserEventArgs(user)));
}
public event EventHandler<UserEventArgs> UserRemoved;
private void RaiseUserRemoved(User user)
{
if (UserRemoved != null)
RaiseEvent(nameof(UserRemoved), () => UserRemoved(this, new UserEventArgs(user)));
} }
public event EventHandler<UserEventArgs> UserUpdated; public event EventHandler<UserEventArgs> UserUpdated;
private void RaiseUserUpdated(User user) private void RaiseUserUpdated(User user)
@@ -101,6 +89,18 @@ namespace Discord
if (UserVoiceStateUpdated != null) if (UserVoiceStateUpdated != null)
RaiseEvent(nameof(UserVoiceStateUpdated), () => UserVoiceStateUpdated(this, new UserEventArgs(user))); RaiseEvent(nameof(UserVoiceStateUpdated), () => UserVoiceStateUpdated(this, new UserEventArgs(user)));
} }
public event EventHandler<UserChannelEventArgs> UserIsTypingUpdated;
private void RaiseUserIsTyping(User user, Channel channel)
{
if (UserIsTypingUpdated != null)
RaiseEvent(nameof(UserIsTypingUpdated), () => UserIsTypingUpdated(this, new UserChannelEventArgs(user, channel)));
}
public event EventHandler<UserIsSpeakingEventArgs> 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; public event EventHandler ProfileUpdated;
private void RaiseProfileUpdated() private void RaiseProfileUpdated()
{ {

16
src/Discord.Net/DiscordClient.cs
View File

@@ -75,9 +75,9 @@ namespace Discord
if (_config.LogLevel >= LogMessageSeverity.Info) 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]"}"); $"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]"}"); $"Server Destroyed: {e.Server?.Name ?? "[Private]"}");
ServerUpdated += (s, e) => RaiseOnLog(LogMessageSeverity.Info, LogMessageSource.Client, ServerUpdated += (s, e) => RaiseOnLog(LogMessageSeverity.Info, LogMessageSource.Client,
$"Server Updated: {e.Server?.Name ?? "[Private]"}"); $"Server Updated: {e.Server?.Name ?? "[Private]"}");
@@ -107,9 +107,9 @@ namespace Discord
$"Banned User: {e.Server?.Name ?? "[Private]" }/{e.UserId}"); $"Banned User: {e.Server?.Name ?? "[Private]" }/{e.UserId}");
UserUnbanned += (s, e) => RaiseOnLog(LogMessageSeverity.Info, LogMessageSource.Client, UserUnbanned += (s, e) => RaiseOnLog(LogMessageSeverity.Info, LogMessageSource.Client,
$"Unbanned User: {e.Server?.Name ?? "[Private]"}/{e.UserId}"); $"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}"); $"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}"); $"User Left: {e.Server?.Name ?? "[Private]"}/{e.User.Name}");
UserUpdated += (s, e) => RaiseOnLog(LogMessageSeverity.Info, LogMessageSource.Client, UserUpdated += (s, e) => RaiseOnLog(LogMessageSeverity.Info, LogMessageSource.Client,
$"User Updated: {e.Server?.Name ?? "[Private]"}/{e.User.Name}"); $"User Updated: {e.Server?.Name ?? "[Private]"}/{e.User.Name}");
@@ -340,7 +340,7 @@ namespace Discord
if (data.Unavailable == false) if (data.Unavailable == false)
RaiseServerAvailable(server); RaiseServerAvailable(server);
else else
RaiseServerCreated(server); RaiseJoinedServer(server);
} }
} }
break; break;
@@ -364,7 +364,7 @@ namespace Discord
if (data.Unavailable == true) if (data.Unavailable == true)
RaiseServerAvailable(server); RaiseServerAvailable(server);
else else
RaiseServerDestroyed(server); RaiseLeftServer(server);
} }
} }
break; break;
@@ -414,7 +414,7 @@ namespace Discord
user.Update(data); user.Update(data);
if (Config.TrackActivity) if (Config.TrackActivity)
user.UpdateActivity(); user.UpdateActivity();
RaiseUserAdded(user); RaiseUserJoined(user);
} }
break; break;
case "GUILD_MEMBER_UPDATE": case "GUILD_MEMBER_UPDATE":
@@ -433,7 +433,7 @@ namespace Discord
var data = e.Payload.ToObject<MemberRemoveEvent>(_serializer); var data = e.Payload.ToObject<MemberRemoveEvent>(_serializer);
var user = _users.TryRemove(data.UserId, data.GuildId); var user = _users.TryRemove(data.UserId, data.GuildId);
if (user != null) if (user != null)
RaiseUserRemoved(user); RaiseUserLeft(user);
} }
break; break;
case "GUILD_MEMBERS_CHUNK": case "GUILD_MEMBERS_CHUNK":