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

Added Server.ChannelCount, UserCount, RoleCount. Updated several GatewaySocket API models.

Browse Source
This commit is contained in:
RogueException
2016-02-13 17:53:41 -04:00
parent 720e202cb6
commit b8b4935614
10 changed files with 50 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Discord.Net.Net45/Discord.Net.csproj
View File

@@ -67,6 +67,9 @@
<Compile Include="..\Discord.Net\API\Client\Common\ExtendedGuild.cs">
<Link>API\Client\Common\ExtendedGuild.cs</Link>
</Compile>
<Compile Include="..\Discord.Net\API\Client\Common\ExtendedMember.cs">
<Link>API\Client\Common\ExtendedMember.cs</Link>
</Compile>
<Compile Include="..\Discord.Net\API\Client\Common\Guild.cs">
<Link>API\Client\Common\Guild.cs</Link>
</Compile>

27
src/Discord.Net/API/Client/Common/ExtendedGuild.cs
View File

@@ -4,25 +4,20 @@ namespace Discord.API.Client
{
public class ExtendedGuild : Guild
{
public class ExtendedMemberInfo : Member
{
[JsonProperty("mute")]
public bool? IsServerMuted { get; set; }
[JsonProperty("deaf")]
public bool? IsServerDeafened { get; set; }
}
[JsonProperty("channels")]
public Channel[] Channels { get; set; }
[JsonProperty("members")]
public ExtendedMemberInfo[] Members { get; set; }
[JsonProperty("presences")]
public MemberPresence[] Presences { get; set; }
[JsonProperty("voice_states")]
public MemberVoiceState[] VoiceStates { get; set; }
[JsonProperty("member_count")]
public int? MemberCount { get; set; }
[JsonProperty("large")]
public bool IsLarge { get; set; }
[JsonProperty("unavailable")]
public bool? Unavailable { get; set; }
[JsonProperty("channels")]
public Channel[] Channels { get; set; }
[JsonProperty("members")]
public ExtendedMember[] Members { get; set; }
[JsonProperty("presences")]
public MemberPresence[] Presences { get; set; }
[JsonProperty("voice_states")]
public MemberVoiceState[] VoiceStates { get; set; }
}
}

12
src/Discord.Net/API/Client/Common/ExtendedMember.cs Normal file
View File

@@ -0,0 +1,12 @@
using Newtonsoft.Json;
namespace Discord.API.Client
{
public class ExtendedMember : Member
{
[JsonProperty("mute")]
public bool? IsServerMuted { get; set; }
[JsonProperty("deaf")]
public bool? IsServerDeafened { get; set; }
}
}

2
src/Discord.Net/API/Client/Common/Guild.cs
View File

@@ -44,5 +44,7 @@ namespace Discord.API.Client
public EmojiData[] Emojis { get; set; }
[JsonProperty("splash")]
public string Splash { get; set; }
[JsonProperty("verification_level")]
public int VerificationLevel { get; set; }
}
}

2
src/Discord.Net/API/Client/GatewaySocket/Events/GuildMembersChunk.cs
View File

@@ -8,6 +8,6 @@ namespace Discord.API.Client.GatewaySocket
[JsonProperty("guild_id"), JsonConverter(typeof(LongStringConverter))]
public ulong GuildId { get; set; }
[JsonProperty("members")]
public Member[] Members { get; set; }
public ExtendedMember[] Members { get; set; }
}
}

2
src/Discord.Net/API/Client/GatewaySocket/Events/Ready.cs
View File

@@ -34,5 +34,7 @@ namespace Discord.API.Client.GatewaySocket
public object UserSettings { get; set; }
[JsonProperty("user_guild_settings")]
public object UserGuildSettings { get; set; }
[JsonProperty("tutorial")]
public object Tutorial { get; set; }
}
}

4
src/Discord.Net/Models/Channel.cs
View File

@@ -72,7 +72,7 @@ namespace Discord
public IEnumerable<Message> Messages => _messages?.Values ?? Enumerable.Empty<Message>();
/// <summary> Gets a collection of all custom permissions used for this channel. </summary>
public IEnumerable<PermissionOverwrite> PermissionOverwrites => _permissionOverwrites.Select(x => x.Value);
/// <summary> Gets a collection of all users with read access to this channel. </summary>
public IEnumerable<User> Users
{
@@ -104,7 +104,7 @@ namespace Discord
return Enumerable.Empty<User>();
}
}
internal Channel(DiscordClient client, ulong id, Server server)
: this(client, id)
{

14
src/Discord.Net/Models/Server.cs
View File

@@ -51,6 +51,7 @@ namespace Discord
private readonly ConcurrentDictionary<ulong, Channel> _channels;
private ulong _ownerId;
private ulong? _afkChannelId;
private int _userCount;
public DiscordClient Client { get; }
@@ -101,7 +102,14 @@ namespace Discord
public IEnumerable<User> Users => _users.Select(x => x.Value.User);
/// <summary> Gets a collection of all roles in this server. </summary>
public IEnumerable<Role> Roles => _roles.Select(x => x.Value);
/// <summary> Gets the number of channels in this server. </summary>
public int ChannelCount => _channels.Count;
/// <summary> Gets the number of users in this server. </summary>
public int UserCount => _userCount;
/// <summary> Gets the number of roles in this server. </summary>
public int RoleCount => _channels.Count;
internal Server(DiscordClient client, ulong id)
{
Client = client;
@@ -179,6 +187,8 @@ namespace Discord
foreach (var subModel in model.Presences)
GetUser(subModel.User.Id)?.Update(subModel);
}
if (model.MemberCount != null)
_userCount = model.MemberCount.Value;
}
/// <summary> Edits this server, changing only non-null attributes. </summary>
@@ -436,6 +446,7 @@ namespace Discord
#region Users
internal User AddUser(ulong id)
{
_userCount++;
Member member = new Member(new User(Client, id, this), ServerPermissions.None);
if (id == Client.CurrentUser.Id)
{
@@ -452,6 +463,7 @@ namespace Discord
}
internal User RemoveUser(ulong id)
{
_userCount--;
Member member;
if (_users.TryRemove(id, out member))
{

2
src/Discord.Net/Models/User.cs
View File

@@ -169,7 +169,7 @@ namespace Discord
if (model.Roles != null)
UpdateRoles(model.Roles.Select(x => Server.GetRole(x)));
}
internal void Update(ExtendedGuild.ExtendedMemberInfo model)
internal void Update(ExtendedMember model)
{
Update(model as APIMember);

3
src/Discord.Net/Net/Rest/JsonRestClient.cs
View File

@@ -1,5 +1,8 @@
using Discord.Logging;
using Newtonsoft.Json;
#if TEST_RESPONSES
using System;
#endif
using System.IO;
namespace Discord.Net.Rest