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

Fixed several issues in ref entities

Browse Source
This commit is contained in:
RogueException
2016-02-28 04:48:32 -04:00
parent 6b3c1410e9
commit 19e02e923d
29 changed files with 146 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ref/Entities/Channels/IPublicChannel.cs
View File

@@ -3,32 +3,34 @@ using System.Threading.Tasks;
namespace Discord
{
public struct PermissionOverwriteEntry
{
public PermissionTarget TargetType { get; }
public ulong TargetId { get; }
public OverwritePermissions Permissions { get; }
}
public interface IPublicChannel : IChannel
{
/// <summary> Gets the server this channel is a member of. </summary>
Server Server { get; }
/// <summary> Gets a collection of permission overwrites for this channel. </summary>
IEnumerable<PermissionOverwrite> PermissionOverwrites { get; }
IEnumerable<PermissionOverwriteEntry> PermissionOverwrites { get; }
/// <summary> Gets the name of this public channel. </summary>
string Name { get; }
/// <summary> Gets the position of this public channel relative to others of the same type. </summary>
int Position { get; }
int Position { get; }
/// <summary> Gets the permission overwrite for a specific user, or null if one does not exist. </summary>
PermissionOverwrite? GetPermissionOverwrite(User user);
OverwritePermissions? GetPermissionOverwrite(User user);
/// <summary> Gets the permission overwrite for a specific role, or null if one does not exist. </summary>
PermissionOverwrite? GetPermissionOverwrite(Role role);
OverwritePermissions? GetPermissionOverwrite(Role role);
/// <summary> Downloads a collection of all invites to this server. </summary>
Task<IEnumerable<Invite>> GetInvites();
/// <summary> Adds or updates the permission overwrite for the given user. </summary>
Task UpdatePermissionOverwrite(User user, ChannelPermissions allow, ChannelPermissions deny);
/// <summary> Adds or updates the permission overwrite for the given user. </summary>
Task UpdatePermissionOverwrite(User user, TriStateChannelPermissions permissions);
Task UpdatePermissionOverwrite(User user, OverwritePermissions permissions);
/// <summary> Adds or updates the permission overwrite for the given role. </summary>
Task UpdatePermissionOverwrite(Role role, ChannelPermissions allow, ChannelPermissions deny);
/// <summary> Adds or updates the permission overwrite for the given role. </summary>
Task UpdatePermissionOverwrite(Role role, TriStateChannelPermissions permissions);
Task UpdatePermissionOverwrite(Role role, OverwritePermissions permissions);
/// <summary> Removes the permission overwrite for the given user, if one exists. </summary>
Task RemovePermissionOverwrite(User user);
/// <summary> Removes the permission overwrite for the given role, if one exists. </summary>

14
ref/Entities/Channels/PrivateChannel.cs
View File

@@ -11,7 +11,7 @@ namespace Discord
/// <inheritdoc />
public DiscordClient Discord { get; }
/// <inheritdoc />
public ModelState State { get; }
public EntityState State { get; }
/// <inheritdoc />
public ChannelType Type { get; }
/// <inheritdoc />
@@ -22,14 +22,12 @@ namespace Discord
public bool IsText => true;
/// <inheritdoc />
public bool IsVoice => false;
/// <inheritdoc />
public Server Server { get; }
/// <inheritdoc />
public User Recipient { get; }
/// <inheritdoc />
public Task<IEnumerable<User>> GetUsers();
public Task<IEnumerable<User>> GetUsers() => null;
/// <inheritdoc />
public Task<Message> GetMessage(ulong id) => null;
/// <inheritdoc />
@@ -46,10 +44,10 @@ namespace Discord
/// <inheritdoc />
public Task SendIsTyping() => null;
/// <inheritdoc />
public Task Delete() => null;
/// <inheritdoc />
public Task Update() => null;
/// <inheritdoc />
public Task Delete() => null;
}
}

22
ref/Entities/Channels/TextChannel.cs
View File

@@ -19,7 +19,7 @@ namespace Discord
/// <inheritdoc />
public DiscordClient Discord { get; }
/// <inheritdoc />
public ModelState State { get; }
public EntityState State { get; }
/// <inheritdoc />
public ChannelType Type => ChannelType.Public | ChannelType.Text;
/// <inheritdoc />
@@ -42,14 +42,14 @@ namespace Discord
/// <inheritdoc />
public Server Server { get; }
/// <inheritdoc />
public IEnumerable<PermissionOverwrite> PermissionOverwrites { get; }
public IEnumerable<PermissionOverwriteEntry> PermissionOverwrites { get; }
/// <inheritdoc />
public IEnumerable<User> Users { get; }
/// <inheritdoc />
public PermissionOverwrite? GetPermissionOverwrite(User user) => null;
public OverwritePermissions? GetPermissionOverwrite(User user) => null;
/// <inheritdoc />
public PermissionOverwrite? GetPermissionOverwrite(Role role) => null;
public OverwritePermissions? GetPermissionOverwrite(Role role) => null;
/// <inheritdoc />
public Task<IEnumerable<User>> GetUsers() => null;
/// <inheritdoc />
@@ -60,15 +60,11 @@ namespace Discord
public Task<IEnumerable<Message>> GetMessages(int limit = 100, ulong? relativeMessageId = null, Relative relativeDir = Relative.Before) => null;
/// <inheritdoc />
public Task<IEnumerable<Invite>> GetInvites() => null;
/// <inheritdoc />
public Task UpdatePermissionOverwrite(User user, ChannelPermissions allow, ChannelPermissions deny) => null;
public Task UpdatePermissionOverwrite(User user, OverwritePermissions permissions) => null;
/// <inheritdoc />
public Task UpdatePermissionOverwrite(User user, TriStateChannelPermissions permissions) => null;
/// <inheritdoc />
public Task UpdatePermissionOverwrite(Role role, ChannelPermissions allow, ChannelPermissions deny) => null;
/// <inheritdoc />
public Task UpdatePermissionOverwrite(Role role, TriStateChannelPermissions permissions) => null;
public Task UpdatePermissionOverwrite(Role role, OverwritePermissions permissions) => null;
/// <inheritdoc />
public Task RemovePermissionOverwrite(User user) => null;
/// <inheritdoc />
@@ -87,11 +83,11 @@ namespace Discord
/// <inheritdoc />
public Task<Invite> CreateInvite(int? maxAge = 1800, int? maxUses = null, bool tempMembership = false, bool withXkcd = false) => null;
/// <inheritdoc />
public Task Delete() => null;
/// <inheritdoc />
public Task Update() => null;
/// <inheritdoc />
public Task Modify(Action<Properties> func) => null;
/// <inheritdoc />
public Task Delete() => null;
}
}

20
ref/Entities/Channels/VoiceChannel.cs
View File

@@ -18,7 +18,7 @@ namespace Discord
/// <inheritdoc />
public DiscordClient Discord { get; }
/// <inheritdoc />
public ModelState State { get; }
public EntityState State { get; }
/// <inheritdoc />
public ChannelType Type { get; }
/// <inheritdoc />
@@ -39,25 +39,21 @@ namespace Discord
/// <inheritdoc />
public Server Server { get; }
/// <inheritdoc />
public IEnumerable<PermissionOverwrite> PermissionOverwrites { get; }
public IEnumerable<PermissionOverwriteEntry> PermissionOverwrites { get; }
/// <inheritdoc />
public PermissionOverwrite? GetPermissionOverwrite(User user) => null;
public OverwritePermissions? GetPermissionOverwrite(User user) => null;
/// <inheritdoc />
public PermissionOverwrite? GetPermissionOverwrite(Role role) => null;
public OverwritePermissions? GetPermissionOverwrite(Role role) => null;
/// <inheritdoc />
public Task<IEnumerable<User>> GetUsers() => null;
/// <inheritdoc />
public Task<IEnumerable<Invite>> GetInvites() => null;
/// <inheritdoc />
public Task UpdatePermissionOverwrite(User user, ChannelPermissions allow, ChannelPermissions deny) => null;
public Task UpdatePermissionOverwrite(User user, OverwritePermissions permissions) => null;
/// <inheritdoc />
public Task UpdatePermissionOverwrite(User user, TriStateChannelPermissions permissions) => null;
/// <inheritdoc />
public Task UpdatePermissionOverwrite(Role role, ChannelPermissions allow, ChannelPermissions deny) => null;
/// <inheritdoc />
public Task UpdatePermissionOverwrite(Role role, TriStateChannelPermissions permissions) => null;
public Task UpdatePermissionOverwrite(Role role, OverwritePermissions permissions) => null;
/// <inheritdoc />
public Task RemovePermissionOverwrite(User user) => null;
/// <inheritdoc />
@@ -66,11 +62,11 @@ namespace Discord
/// <inheritdoc />
public Task<Invite> CreateInvite(int? maxAge = 1800, int? maxUses = null, bool tempMembership = false, bool withXkcd = false) => null;
/// <inheritdoc />
public Task Delete() => null;
/// <inheritdoc />
public Task Update() => null;
/// <inheritdoc />
public Task Modify(Action<Properties> func) => null;
/// <inheritdoc />
public Task Delete() => null;
}
}