From a2480ebaebec490a9246aa4d926d53147a17b538 Mon Sep 17 00:00:00 2001 From: RogueException Date: Sun, 18 Oct 2015 09:38:25 -0300 Subject: [PATCH] Added more JsonIgnores --- src/Discord.Net/Models/Member.cs | 2 ++ src/Discord.Net/Models/Role.cs | 2 ++ src/Discord.Net/Models/Server.cs | 1 + src/Discord.Net/Models/User.cs | 4 ++++ 4 files changed, 9 insertions(+) diff --git a/src/Discord.Net/Models/Member.cs b/src/Discord.Net/Models/Member.cs index 4360465de..f2ede0b59 100644 --- a/src/Discord.Net/Models/Member.cs +++ b/src/Discord.Net/Models/Member.cs @@ -61,9 +61,11 @@ namespace Discord public IEnumerable Roles => RoleIds.Select(x => _client.Roles[x]); /// Returns a collection of all messages this user has sent on this server that are still in cache. + [JsonIgnore] public IEnumerable Messages => _client.Messages.Where(x => x.UserId == UserId && x.ServerId == ServerId); /// Returns a collection of all channels this user is a member of. + [JsonIgnore] public IEnumerable Channels => _client.Channels.Where(x => x.ServerId == ServerId && x.UserIds.Contains(UserId)); internal Member(DiscordClient client, string userId, string serverId) diff --git a/src/Discord.Net/Models/Role.cs b/src/Discord.Net/Models/Role.cs index 678bb31e1..ebd40a146 100644 --- a/src/Discord.Net/Models/Role.cs +++ b/src/Discord.Net/Models/Role.cs @@ -34,8 +34,10 @@ namespace Discord /// Returns true if this is the role representing all users in a server. public bool IsEveryone { get; } /// Returns a list of the ids of all members in this role. + [JsonIgnore] public IEnumerable MemberIds => IsEveryone ? Server.UserIds : Server.Members.Where(x => x.RoleIds.Contains(Id)).Select(x => x.UserId); /// Returns a list of all members in this role. + [JsonIgnore] public IEnumerable Members => IsEveryone ? Server.Members : Server.Members.Where(x => x.RoleIds.Contains(Id)); internal Role(DiscordClient client, string id, string serverId, bool isEveryone) diff --git a/src/Discord.Net/Models/Server.cs b/src/Discord.Net/Models/Server.cs index c3f59fd45..c5dbff92c 100644 --- a/src/Discord.Net/Models/Server.cs +++ b/src/Discord.Net/Models/Server.cs @@ -85,6 +85,7 @@ namespace Discord /// Return the id of the role representing all users in a server. public string EveryoneRoleId { get; private set; } /// Return the the role representing all users in a server. + [JsonIgnore] public Role EveryoneRole => _client.Roles[EveryoneRoleId]; /// Returns a collection of the ids of all roles within this server. [JsonIgnore] diff --git a/src/Discord.Net/Models/User.cs b/src/Discord.Net/Models/User.cs index a0104bcb3..1cf3787dc 100644 --- a/src/Discord.Net/Models/User.cs +++ b/src/Discord.Net/Models/User.cs @@ -42,12 +42,16 @@ namespace Discord public Channel PrivateChannel => _client.Channels[PrivateChannelId]; /// Returns a collection of all server-specific data for every server this user is a member of. + [JsonIgnore] public IEnumerable Memberships => _servers.Select(x => _client.GetMember(x.Key, Id)); /// Returns a collection of all servers this user is a member of. + [JsonIgnore] public IEnumerable Servers => _servers.Select(x => _client.GetServer(x.Key)); /// Returns a collection of the ids of all servers this user is a member of. + [JsonIgnore] public IEnumerable ServersIds => _servers.Select(x => x.Key); /// Returns a collection of all messages this user has sent that are still in cache. + [JsonIgnore] public IEnumerable Messages => _client.Messages.Where(x => x.UserId == Id); /// Returns the id for the game this user is currently playing.