diff --git a/src/Discord.Net.Net45/Discord.Net.csproj b/src/Discord.Net.Net45/Discord.Net.csproj index ab19b24ed..f9f8bc3d6 100644 --- a/src/Discord.Net.Net45/Discord.Net.csproj +++ b/src/Discord.Net.Net45/Discord.Net.csproj @@ -146,8 +146,8 @@ Models\Invite.cs - - Models\Membership.cs + + Models\Member.cs Models\Message.cs diff --git a/src/Discord.Net/DiscordClient.Cache.cs b/src/Discord.Net/DiscordClient.Cache.cs index ca99d4152..ef2012ab8 100644 --- a/src/Discord.Net/DiscordClient.Cache.cs +++ b/src/Discord.Net/DiscordClient.Cache.cs @@ -326,16 +326,16 @@ namespace Discord } /// Returns the user with the specified id, along with their server-specific data, or null if none was found. - public Membership GetMember(string serverId, User user) + public Member GetMember(string serverId, User user) => GetMember(_servers[serverId], user?.Id); /// Returns the user with the specified id, along with their server-specific data, or null if none was found. - public Membership GetMember(string serverId, string userId) + public Member GetMember(string serverId, string userId) => GetMember(_servers[serverId], userId); /// Returns the user with the specified id, along with their server-specific data, or null if none was found. - public Membership GetMember(Server server, User user) + public Member GetMember(Server server, User user) => GetMember(server, user?.Id); /// Returns the user with the specified id, along with their server-specific data, or null if none was found. - public Membership GetMember(Server server, string userId) + public Member GetMember(Server server, string userId) { if (server == null || userId == null) return null; @@ -344,14 +344,14 @@ namespace Discord /// Returns all users in with the specified server and name, along with their server-specific data. /// Name formats supported: Name and @Name. Search is case-insensitive. - public IEnumerable FindMembers(string serverId, string name) + public IEnumerable FindMembers(string serverId, string name) => FindMembers(GetServer(serverId), name); /// Returns all users in with the specified server and name, along with their server-specific data. /// Name formats supported: Name and @Name. Search is case-insensitive. - public IEnumerable FindMembers(Server server, string name) + public IEnumerable FindMembers(Server server, string name) { if (server == null || name == null) - return new Membership[0]; + return new Member[0]; if (name.StartsWith("@")) { diff --git a/src/Discord.Net/DiscordClient.Events.cs b/src/Discord.Net/DiscordClient.Events.cs index 0e2078556..18e586b21 100644 --- a/src/Discord.Net/DiscordClient.Events.cs +++ b/src/Discord.Net/DiscordClient.Events.cs @@ -58,8 +58,8 @@ namespace Discord } public sealed class MemberEventArgs : EventArgs { - public readonly Membership Member; - internal MemberEventArgs(Membership member) { Member = member; } + public readonly Member Member; + internal MemberEventArgs(Member member) { Member = member; } } public sealed class UserTypingEventArgs : EventArgs { @@ -261,7 +261,7 @@ namespace Discord //Member public event EventHandler MemberAdded; - private void RaiseMemberAdded(Membership member) + private void RaiseMemberAdded(Member member) { if (_config.EnableDebug) RaiseOnDebugMessage(DebugMessageType.Event, $"MemberAdded {member.User?.Name} ({member.UserId}) in {member.Server?.Name} ({member.ServerId})"); @@ -269,7 +269,7 @@ namespace Discord MemberAdded(this, new MemberEventArgs(member)); } public event EventHandler MemberRemoved; - private void RaiseMemberRemoved(Membership member) + private void RaiseMemberRemoved(Member member) { if (_config.EnableDebug) RaiseOnDebugMessage(DebugMessageType.Event, $"MemberRemoved {member.User?.Name} ({member.UserId}) in {member.Server?.Name} ({member.ServerId})"); @@ -277,7 +277,7 @@ namespace Discord MemberRemoved(this, new MemberEventArgs(member)); } public event EventHandler MemberUpdated; - private void RaiseMemberUpdated(Membership member) + private void RaiseMemberUpdated(Member member) { if (_config.EnableDebug) RaiseOnDebugMessage(DebugMessageType.Event, $"MemberUpdated {member.User?.Name} ({member.UserId}) in {member.Server?.Name} ({member.ServerId})"); @@ -287,7 +287,7 @@ namespace Discord //Status public event EventHandler PresenceUpdated; - private void RaisePresenceUpdated(Membership member) + private void RaisePresenceUpdated(Member member) { if (_config.EnableDebug) RaiseOnDebugMessage(DebugMessageType.Event, $"PresenceUpdated {member.User?.Name} ({member.UserId}) in {member.Server?.Name} ({member.ServerId})"); @@ -295,7 +295,7 @@ namespace Discord PresenceUpdated(this, new MemberEventArgs(member)); } public event EventHandler VoiceStateUpdated; - private void RaiseVoiceStateUpdated(Membership member) + private void RaiseVoiceStateUpdated(Member member) { if (_config.EnableDebug) RaiseOnDebugMessage(DebugMessageType.Event, $"VoiceStateUpdated {member.User?.Name} ({member.UserId}) in {member.Server?.Name} ({member.ServerId})"); diff --git a/src/Discord.Net/Models/Membership.cs b/src/Discord.Net/Models/Member.cs similarity index 92% rename from src/Discord.Net/Models/Membership.cs rename to src/Discord.Net/Models/Member.cs index c0c5d6045..686d1b88f 100644 --- a/src/Discord.Net/Models/Membership.cs +++ b/src/Discord.Net/Models/Member.cs @@ -5,7 +5,7 @@ using System.Linq; namespace Discord { - public class Membership + public class Member { private readonly DiscordClient _client; @@ -36,7 +36,7 @@ namespace Discord public string[] RoleIds { get; internal set; } public IEnumerable Roles => RoleIds.Select(x => _client.GetRole(x)); - public Membership(string serverId, string userId, DiscordClient client) + public Member(string serverId, string userId, DiscordClient client) { ServerId = serverId; UserId = userId; diff --git a/src/Discord.Net/Models/Message.cs b/src/Discord.Net/Models/Message.cs index dfff1ce44..b66078b8b 100644 --- a/src/Discord.Net/Models/Message.cs +++ b/src/Discord.Net/Models/Message.cs @@ -109,7 +109,7 @@ namespace Discord [JsonIgnore] public User User => _client.GetUser(UserId); [JsonIgnore] - public Membership Member => _client.GetMember(ServerId, UserId); + public Member Member => _client.GetMember(ServerId, UserId); /// Returns true if the current user created this message. public bool IsAuthor => _client.User?.Id == UserId; diff --git a/src/Discord.Net/Models/Server.cs b/src/Discord.Net/Models/Server.cs index f4d650f9b..d8e60fdbd 100644 --- a/src/Discord.Net/Models/Server.cs +++ b/src/Discord.Net/Models/Server.cs @@ -41,9 +41,9 @@ namespace Discord /// Returns the default channel for this server. public Channel DefaultChannel =>_client.GetChannel(DefaultChannelId); - internal AsyncCache _members; + internal AsyncCache _members; /// Returns a collection of all channels within this server. - public IEnumerable Members => _members; + public IEnumerable Members => _members; internal ConcurrentDictionary _bans; /// Returns a collection of all users banned on this server. @@ -66,12 +66,12 @@ namespace Discord Id = id; _client = client; _bans = new ConcurrentDictionary(); - _members = new AsyncCache( + _members = new AsyncCache( (key, parentKey) => { if (_client.IsDebugMode) _client.RaiseOnDebugMessage(DebugMessageType.Cache, $"Created user {key} in server {parentKey}."); - return new Membership(parentKey, key, _client); + return new Member(parentKey, key, _client); }, (member, model) => { @@ -119,17 +119,17 @@ namespace Discord ); } - internal Membership UpdateMember(API.Models.MemberInfo membership) + internal Member UpdateMember(API.Models.MemberInfo membership) { return _members.Update(membership.User?.Id ?? membership.UserId, Id, membership); } - internal Membership RemoveMember(string userId) + internal Member RemoveMember(string userId) { return _members.Remove(userId); } - public Membership GetMembership(User user) + public Member GetMembership(User user) => GetMember(user.Id); - public Membership GetMember(string userId) + public Member GetMember(string userId) { return _members[userId]; }