* Initial implementation * Remove blocking webhooks * add safeguard for tiv * fix testspull/2289/head
@@ -6,7 +6,7 @@ namespace Discord | |||||
/// <summary> | /// <summary> | ||||
/// Represents a generic voice channel in a guild. | /// Represents a generic voice channel in a guild. | ||||
/// </summary> | /// </summary> | ||||
public interface IVoiceChannel : INestedChannel, IAudioChannel, IMentionable | |||||
public interface IVoiceChannel : IMessageChannel, INestedChannel, IAudioChannel, IMentionable | |||||
{ | { | ||||
/// <summary> | /// <summary> | ||||
/// Gets the bit-rate that the clients in this voice channel are requested to use. | /// Gets the bit-rate that the clients in this voice channel are requested to use. | ||||
@@ -12,7 +12,11 @@ namespace Discord.Rest | |||||
public class RestStageChannel : RestVoiceChannel, IStageChannel | public class RestStageChannel : RestVoiceChannel, IStageChannel | ||||
{ | { | ||||
/// <inheritdoc/> | /// <inheritdoc/> | ||||
public string Topic { get; private set; } | |||||
/// <remarks> | |||||
/// This field is always false for stage channels. | |||||
/// </remarks> | |||||
public override bool IsTextInVoice | |||||
=> false; | |||||
/// <inheritdoc/> | /// <inheritdoc/> | ||||
public StagePrivacyLevel? PrivacyLevel { get; private set; } | public StagePrivacyLevel? PrivacyLevel { get; private set; } | ||||
@@ -37,13 +41,11 @@ namespace Discord.Rest | |||||
IsLive = isLive; | IsLive = isLive; | ||||
if(isLive) | if(isLive) | ||||
{ | { | ||||
Topic = model.Topic; | |||||
PrivacyLevel = model.PrivacyLevel; | PrivacyLevel = model.PrivacyLevel; | ||||
IsDiscoverableDisabled = model.DiscoverableDisabled; | IsDiscoverableDisabled = model.DiscoverableDisabled; | ||||
} | } | ||||
else | else | ||||
{ | { | ||||
Topic = null; | |||||
PrivacyLevel = null; | PrivacyLevel = null; | ||||
IsDiscoverableDisabled = null; | IsDiscoverableDisabled = null; | ||||
} | } | ||||
@@ -86,25 +86,25 @@ namespace Discord.Rest | |||||
=> ChannelHelper.GetUsersAsync(this, Guild, Discord, null, null, options); | => ChannelHelper.GetUsersAsync(this, Guild, Discord, null, null, options); | ||||
/// <inheritdoc /> | /// <inheritdoc /> | ||||
public Task<RestMessage> GetMessageAsync(ulong id, RequestOptions options = null) | |||||
public virtual Task<RestMessage> GetMessageAsync(ulong id, RequestOptions options = null) | |||||
=> ChannelHelper.GetMessageAsync(this, Discord, id, options); | => ChannelHelper.GetMessageAsync(this, Discord, id, options); | ||||
/// <inheritdoc /> | /// <inheritdoc /> | ||||
public IAsyncEnumerable<IReadOnlyCollection<RestMessage>> GetMessagesAsync(int limit = DiscordConfig.MaxMessagesPerBatch, RequestOptions options = null) | |||||
public virtual IAsyncEnumerable<IReadOnlyCollection<RestMessage>> GetMessagesAsync(int limit = DiscordConfig.MaxMessagesPerBatch, RequestOptions options = null) | |||||
=> ChannelHelper.GetMessagesAsync(this, Discord, null, Direction.Before, limit, options); | => ChannelHelper.GetMessagesAsync(this, Discord, null, Direction.Before, limit, options); | ||||
/// <inheritdoc /> | /// <inheritdoc /> | ||||
public IAsyncEnumerable<IReadOnlyCollection<RestMessage>> GetMessagesAsync(ulong fromMessageId, Direction dir, int limit = DiscordConfig.MaxMessagesPerBatch, RequestOptions options = null) | |||||
public virtual IAsyncEnumerable<IReadOnlyCollection<RestMessage>> GetMessagesAsync(ulong fromMessageId, Direction dir, int limit = DiscordConfig.MaxMessagesPerBatch, RequestOptions options = null) | |||||
=> ChannelHelper.GetMessagesAsync(this, Discord, fromMessageId, dir, limit, options); | => ChannelHelper.GetMessagesAsync(this, Discord, fromMessageId, dir, limit, options); | ||||
/// <inheritdoc /> | /// <inheritdoc /> | ||||
public IAsyncEnumerable<IReadOnlyCollection<RestMessage>> GetMessagesAsync(IMessage fromMessage, Direction dir, int limit = DiscordConfig.MaxMessagesPerBatch, RequestOptions options = null) | |||||
public virtual IAsyncEnumerable<IReadOnlyCollection<RestMessage>> GetMessagesAsync(IMessage fromMessage, Direction dir, int limit = DiscordConfig.MaxMessagesPerBatch, RequestOptions options = null) | |||||
=> ChannelHelper.GetMessagesAsync(this, Discord, fromMessage.Id, dir, limit, options); | => ChannelHelper.GetMessagesAsync(this, Discord, fromMessage.Id, dir, limit, options); | ||||
/// <inheritdoc /> | /// <inheritdoc /> | ||||
public Task<IReadOnlyCollection<RestMessage>> GetPinnedMessagesAsync(RequestOptions options = null) | |||||
public virtual Task<IReadOnlyCollection<RestMessage>> GetPinnedMessagesAsync(RequestOptions options = null) | |||||
=> ChannelHelper.GetPinnedMessagesAsync(this, Discord, options); | => ChannelHelper.GetPinnedMessagesAsync(this, Discord, options); | ||||
/// <inheritdoc /> | /// <inheritdoc /> | ||||
/// <exception cref="ArgumentOutOfRangeException">Message content is too long, length must be less or equal to <see cref="DiscordConfig.MaxMessageSize"/>.</exception> | /// <exception cref="ArgumentOutOfRangeException">Message content is too long, length must be less or equal to <see cref="DiscordConfig.MaxMessageSize"/>.</exception> | ||||
/// <exception cref="ArgumentException">The only valid <see cref="MessageFlags"/> are <see cref="MessageFlags.SuppressEmbeds"/> and <see cref="MessageFlags.None"/>.</exception> | /// <exception cref="ArgumentException">The only valid <see cref="MessageFlags"/> are <see cref="MessageFlags.SuppressEmbeds"/> and <see cref="MessageFlags.None"/>.</exception> | ||||
public Task<RestUserMessage> SendMessageAsync(string text = null, bool isTTS = false, Embed embed = null, | |||||
public virtual Task<RestUserMessage> SendMessageAsync(string text = null, bool isTTS = false, Embed embed = null, | |||||
RequestOptions options = null, AllowedMentions allowedMentions = null, MessageReference messageReference = null, | RequestOptions options = null, AllowedMentions allowedMentions = null, MessageReference messageReference = null, | ||||
MessageComponent components = null, ISticker[] stickers = null, Embed[] embeds = null, MessageFlags flags = MessageFlags.None) | MessageComponent components = null, ISticker[] stickers = null, Embed[] embeds = null, MessageFlags flags = MessageFlags.None) | ||||
=> ChannelHelper.SendMessageAsync(this, Discord, text, isTTS, embed, allowedMentions, messageReference, | => ChannelHelper.SendMessageAsync(this, Discord, text, isTTS, embed, allowedMentions, messageReference, | ||||
@@ -136,7 +136,7 @@ namespace Discord.Rest | |||||
/// <exception cref="IOException">An I/O error occurred while opening the file.</exception> | /// <exception cref="IOException">An I/O error occurred while opening the file.</exception> | ||||
/// <exception cref="ArgumentOutOfRangeException">Message content is too long, length must be less or equal to <see cref="DiscordConfig.MaxMessageSize"/>.</exception> | /// <exception cref="ArgumentOutOfRangeException">Message content is too long, length must be less or equal to <see cref="DiscordConfig.MaxMessageSize"/>.</exception> | ||||
/// <exception cref="ArgumentException">The only valid <see cref="MessageFlags"/> are <see cref="MessageFlags.SuppressEmbeds"/> and <see cref="MessageFlags.None"/>.</exception> | /// <exception cref="ArgumentException">The only valid <see cref="MessageFlags"/> are <see cref="MessageFlags.SuppressEmbeds"/> and <see cref="MessageFlags.None"/>.</exception> | ||||
public Task<RestUserMessage> SendFileAsync(string filePath, string text, bool isTTS = false, Embed embed = null, | |||||
public virtual Task<RestUserMessage> SendFileAsync(string filePath, string text, bool isTTS = false, Embed embed = null, | |||||
RequestOptions options = null, bool isSpoiler = false, AllowedMentions allowedMentions = null, | RequestOptions options = null, bool isSpoiler = false, AllowedMentions allowedMentions = null, | ||||
MessageReference messageReference = null, MessageComponent components = null, ISticker[] stickers = null, | MessageReference messageReference = null, MessageComponent components = null, ISticker[] stickers = null, | ||||
Embed[] embeds = null, MessageFlags flags = MessageFlags.None) | Embed[] embeds = null, MessageFlags flags = MessageFlags.None) | ||||
@@ -146,7 +146,7 @@ namespace Discord.Rest | |||||
/// <inheritdoc /> | /// <inheritdoc /> | ||||
/// <exception cref="ArgumentOutOfRangeException">Message content is too long, length must be less or equal to <see cref="DiscordConfig.MaxMessageSize"/>.</exception> | /// <exception cref="ArgumentOutOfRangeException">Message content is too long, length must be less or equal to <see cref="DiscordConfig.MaxMessageSize"/>.</exception> | ||||
/// <exception cref="ArgumentException">The only valid <see cref="MessageFlags"/> are <see cref="MessageFlags.SuppressEmbeds"/> and <see cref="MessageFlags.None"/>.</exception> | /// <exception cref="ArgumentException">The only valid <see cref="MessageFlags"/> are <see cref="MessageFlags.SuppressEmbeds"/> and <see cref="MessageFlags.None"/>.</exception> | ||||
public Task<RestUserMessage> SendFileAsync(Stream stream, string filename, string text, bool isTTS = false, | |||||
public virtual Task<RestUserMessage> SendFileAsync(Stream stream, string filename, string text, bool isTTS = false, | |||||
Embed embed = null, RequestOptions options = null, bool isSpoiler = false, AllowedMentions allowedMentions = null, | Embed embed = null, RequestOptions options = null, bool isSpoiler = false, AllowedMentions allowedMentions = null, | ||||
MessageReference messageReference = null, MessageComponent components = null, ISticker[] stickers = null, | MessageReference messageReference = null, MessageComponent components = null, ISticker[] stickers = null, | ||||
Embed[] embeds = null, MessageFlags flags = MessageFlags.None) | Embed[] embeds = null, MessageFlags flags = MessageFlags.None) | ||||
@@ -156,7 +156,7 @@ namespace Discord.Rest | |||||
/// <inheritdoc /> | /// <inheritdoc /> | ||||
/// <exception cref="ArgumentOutOfRangeException">Message content is too long, length must be less or equal to <see cref="DiscordConfig.MaxMessageSize"/>.</exception> | /// <exception cref="ArgumentOutOfRangeException">Message content is too long, length must be less or equal to <see cref="DiscordConfig.MaxMessageSize"/>.</exception> | ||||
/// <exception cref="ArgumentException">The only valid <see cref="MessageFlags"/> are <see cref="MessageFlags.SuppressEmbeds"/> and <see cref="MessageFlags.None"/>.</exception> | /// <exception cref="ArgumentException">The only valid <see cref="MessageFlags"/> are <see cref="MessageFlags.SuppressEmbeds"/> and <see cref="MessageFlags.None"/>.</exception> | ||||
public Task<RestUserMessage> SendFileAsync(FileAttachment attachment, string text, bool isTTS = false, | |||||
public virtual Task<RestUserMessage> SendFileAsync(FileAttachment attachment, string text, bool isTTS = false, | |||||
Embed embed = null, RequestOptions options = null, AllowedMentions allowedMentions = null, | Embed embed = null, RequestOptions options = null, AllowedMentions allowedMentions = null, | ||||
MessageReference messageReference = null, MessageComponent components = null, ISticker[] stickers = null, | MessageReference messageReference = null, MessageComponent components = null, ISticker[] stickers = null, | ||||
Embed[] embeds = null, MessageFlags flags = MessageFlags.None) | Embed[] embeds = null, MessageFlags flags = MessageFlags.None) | ||||
@@ -166,35 +166,35 @@ namespace Discord.Rest | |||||
/// <inheritdoc /> | /// <inheritdoc /> | ||||
/// <exception cref="ArgumentOutOfRangeException">Message content is too long, length must be less or equal to <see cref="DiscordConfig.MaxMessageSize"/>.</exception> | /// <exception cref="ArgumentOutOfRangeException">Message content is too long, length must be less or equal to <see cref="DiscordConfig.MaxMessageSize"/>.</exception> | ||||
/// <exception cref="ArgumentException">The only valid <see cref="MessageFlags"/> are <see cref="MessageFlags.SuppressEmbeds"/> and <see cref="MessageFlags.None"/>.</exception> | /// <exception cref="ArgumentException">The only valid <see cref="MessageFlags"/> are <see cref="MessageFlags.SuppressEmbeds"/> and <see cref="MessageFlags.None"/>.</exception> | ||||
public Task<RestUserMessage> SendFilesAsync(IEnumerable<FileAttachment> attachments, string text, bool isTTS = false, | |||||
public virtual Task<RestUserMessage> SendFilesAsync(IEnumerable<FileAttachment> attachments, string text, bool isTTS = false, | |||||
Embed embed = null, RequestOptions options = null, AllowedMentions allowedMentions = null, | Embed embed = null, RequestOptions options = null, AllowedMentions allowedMentions = null, | ||||
MessageReference messageReference = null, MessageComponent components = null, ISticker[] stickers = null, | MessageReference messageReference = null, MessageComponent components = null, ISticker[] stickers = null, | ||||
Embed[] embeds = null, MessageFlags flags = MessageFlags.None) | Embed[] embeds = null, MessageFlags flags = MessageFlags.None) | ||||
=> ChannelHelper.SendFilesAsync(this, Discord, attachments, text, isTTS, embed, allowedMentions, messageReference, components, stickers, options, embeds, flags); | => ChannelHelper.SendFilesAsync(this, Discord, attachments, text, isTTS, embed, allowedMentions, messageReference, components, stickers, options, embeds, flags); | ||||
/// <inheritdoc /> | /// <inheritdoc /> | ||||
public Task DeleteMessageAsync(ulong messageId, RequestOptions options = null) | |||||
public virtual Task DeleteMessageAsync(ulong messageId, RequestOptions options = null) | |||||
=> ChannelHelper.DeleteMessageAsync(this, messageId, Discord, options); | => ChannelHelper.DeleteMessageAsync(this, messageId, Discord, options); | ||||
/// <inheritdoc /> | /// <inheritdoc /> | ||||
public Task DeleteMessageAsync(IMessage message, RequestOptions options = null) | |||||
public virtual Task DeleteMessageAsync(IMessage message, RequestOptions options = null) | |||||
=> ChannelHelper.DeleteMessageAsync(this, message.Id, Discord, options); | => ChannelHelper.DeleteMessageAsync(this, message.Id, Discord, options); | ||||
/// <inheritdoc /> | /// <inheritdoc /> | ||||
public Task DeleteMessagesAsync(IEnumerable<IMessage> messages, RequestOptions options = null) | |||||
public virtual Task DeleteMessagesAsync(IEnumerable<IMessage> messages, RequestOptions options = null) | |||||
=> ChannelHelper.DeleteMessagesAsync(this, Discord, messages.Select(x => x.Id), options); | => ChannelHelper.DeleteMessagesAsync(this, Discord, messages.Select(x => x.Id), options); | ||||
/// <inheritdoc /> | /// <inheritdoc /> | ||||
public Task DeleteMessagesAsync(IEnumerable<ulong> messageIds, RequestOptions options = null) | |||||
public virtual Task DeleteMessagesAsync(IEnumerable<ulong> messageIds, RequestOptions options = null) | |||||
=> ChannelHelper.DeleteMessagesAsync(this, Discord, messageIds, options); | => ChannelHelper.DeleteMessagesAsync(this, Discord, messageIds, options); | ||||
/// <inheritdoc /> | /// <inheritdoc /> | ||||
public async Task<IUserMessage> ModifyMessageAsync(ulong messageId, Action<MessageProperties> func, RequestOptions options = null) | |||||
public virtual async Task<IUserMessage> ModifyMessageAsync(ulong messageId, Action<MessageProperties> func, RequestOptions options = null) | |||||
=> await ChannelHelper.ModifyMessageAsync(this, messageId, func, Discord, options).ConfigureAwait(false); | => await ChannelHelper.ModifyMessageAsync(this, messageId, func, Discord, options).ConfigureAwait(false); | ||||
/// <inheritdoc /> | /// <inheritdoc /> | ||||
public Task TriggerTypingAsync(RequestOptions options = null) | |||||
public virtual Task TriggerTypingAsync(RequestOptions options = null) | |||||
=> ChannelHelper.TriggerTypingAsync(this, Discord, options); | => ChannelHelper.TriggerTypingAsync(this, Discord, options); | ||||
/// <inheritdoc /> | /// <inheritdoc /> | ||||
public IDisposable EnterTypingState(RequestOptions options = null) | |||||
public virtual IDisposable EnterTypingState(RequestOptions options = null) | |||||
=> ChannelHelper.EnterTypingState(this, Discord, options); | => ChannelHelper.EnterTypingState(this, Discord, options); | ||||
/// <summary> | /// <summary> | ||||
@@ -232,38 +232,6 @@ namespace Discord.Rest | |||||
=> ChannelHelper.GetWebhooksAsync(this, Discord, options); | => ChannelHelper.GetWebhooksAsync(this, Discord, options); | ||||
/// <summary> | /// <summary> | ||||
/// Gets the parent (category) channel of this channel. | |||||
/// </summary> | |||||
/// <param name="options">The options to be used when sending the request.</param> | |||||
/// <returns> | |||||
/// A task that represents the asynchronous get operation. The task result contains the category channel | |||||
/// representing the parent of this channel; <c>null</c> if none is set. | |||||
/// </returns> | |||||
public virtual Task<ICategoryChannel> GetCategoryAsync(RequestOptions options = null) | |||||
=> ChannelHelper.GetCategoryAsync(this, Discord, options); | |||||
/// <inheritdoc /> | |||||
public Task SyncPermissionsAsync(RequestOptions options = null) | |||||
=> ChannelHelper.SyncPermissionsAsync(this, Discord, options); | |||||
#endregion | |||||
#region Invites | |||||
/// <inheritdoc /> | |||||
public virtual async Task<IInviteMetadata> CreateInviteAsync(int? maxAge = 86400, int? maxUses = null, bool isTemporary = false, bool isUnique = false, RequestOptions options = null) | |||||
=> await ChannelHelper.CreateInviteAsync(this, Discord, maxAge, maxUses, isTemporary, isUnique, options).ConfigureAwait(false); | |||||
public virtual async Task<IInviteMetadata> CreateInviteToApplicationAsync(ulong applicationId, int? maxAge = 86400, int? maxUses = default(int?), bool isTemporary = false, bool isUnique = false, RequestOptions options = null) | |||||
=> await ChannelHelper.CreateInviteToApplicationAsync(this, Discord, maxAge, maxUses, isTemporary, isUnique, applicationId, options); | |||||
/// <inheritdoc /> | |||||
public virtual async Task<IInviteMetadata> CreateInviteToApplicationAsync(DefaultApplications application, int? maxAge = 86400, int? maxUses = default(int?), bool isTemporary = false, bool isUnique = false, RequestOptions options = null) | |||||
=> await ChannelHelper.CreateInviteToApplicationAsync(this, Discord, maxAge, maxUses, isTemporary, isUnique, (ulong)application, options); | |||||
public virtual Task<IInviteMetadata> CreateInviteToStreamAsync(IUser user, int? maxAge, int? maxUses = default(int?), bool isTemporary = false, bool isUnique = false, RequestOptions options = null) | |||||
=> throw new NotImplementedException(); | |||||
/// <inheritdoc /> | |||||
public virtual async Task<IReadOnlyCollection<IInviteMetadata>> GetInvitesAsync(RequestOptions options = null) | |||||
=> await ChannelHelper.GetInvitesAsync(this, Discord, options).ConfigureAwait(false); | |||||
private string DebuggerDisplay => $"{Name} ({Id}, Text)"; | |||||
/// <summary> | |||||
/// Creates a thread within this <see cref="ITextChannel"/>. | /// Creates a thread within this <see cref="ITextChannel"/>. | ||||
/// </summary> | /// </summary> | ||||
/// <remarks> | /// <remarks> | ||||
@@ -299,6 +267,38 @@ namespace Discord.Rest | |||||
var model = await ThreadHelper.CreateThreadAsync(Discord, this, name, type, autoArchiveDuration, message, invitable, slowmode, options); | var model = await ThreadHelper.CreateThreadAsync(Discord, this, name, type, autoArchiveDuration, message, invitable, slowmode, options); | ||||
return RestThreadChannel.Create(Discord, Guild, model); | return RestThreadChannel.Create(Discord, Guild, model); | ||||
} | } | ||||
/// <summary> | |||||
/// Gets the parent (category) channel of this channel. | |||||
/// </summary> | |||||
/// <param name="options">The options to be used when sending the request.</param> | |||||
/// <returns> | |||||
/// A task that represents the asynchronous get operation. The task result contains the category channel | |||||
/// representing the parent of this channel; <c>null</c> if none is set. | |||||
/// </returns> | |||||
public virtual Task<ICategoryChannel> GetCategoryAsync(RequestOptions options = null) | |||||
=> ChannelHelper.GetCategoryAsync(this, Discord, options); | |||||
/// <inheritdoc /> | |||||
public Task SyncPermissionsAsync(RequestOptions options = null) | |||||
=> ChannelHelper.SyncPermissionsAsync(this, Discord, options); | |||||
#endregion | |||||
#region Invites | |||||
/// <inheritdoc /> | |||||
public virtual async Task<IInviteMetadata> CreateInviteAsync(int? maxAge = 86400, int? maxUses = null, bool isTemporary = false, bool isUnique = false, RequestOptions options = null) | |||||
=> await ChannelHelper.CreateInviteAsync(this, Discord, maxAge, maxUses, isTemporary, isUnique, options).ConfigureAwait(false); | |||||
public virtual async Task<IInviteMetadata> CreateInviteToApplicationAsync(ulong applicationId, int? maxAge = 86400, int? maxUses = default(int?), bool isTemporary = false, bool isUnique = false, RequestOptions options = null) | |||||
=> await ChannelHelper.CreateInviteToApplicationAsync(this, Discord, maxAge, maxUses, isTemporary, isUnique, applicationId, options); | |||||
/// <inheritdoc /> | |||||
public virtual async Task<IInviteMetadata> CreateInviteToApplicationAsync(DefaultApplications application, int? maxAge = 86400, int? maxUses = default(int?), bool isTemporary = false, bool isUnique = false, RequestOptions options = null) | |||||
=> await ChannelHelper.CreateInviteToApplicationAsync(this, Discord, maxAge, maxUses, isTemporary, isUnique, (ulong)application, options); | |||||
public virtual Task<IInviteMetadata> CreateInviteToStreamAsync(IUser user, int? maxAge, int? maxUses = default(int?), bool isTemporary = false, bool isUnique = false, RequestOptions options = null) | |||||
=> throw new NotImplementedException(); | |||||
/// <inheritdoc /> | |||||
public virtual async Task<IReadOnlyCollection<IInviteMetadata>> GetInvitesAsync(RequestOptions options = null) | |||||
=> await ChannelHelper.GetInvitesAsync(this, Discord, options).ConfigureAwait(false); | |||||
private string DebuggerDisplay => $"{Name} ({Id}, Text)"; | |||||
#endregion | #endregion | ||||
#region ITextChannel | #region ITextChannel | ||||
@@ -2,6 +2,7 @@ using Discord.Audio; | |||||
using System; | using System; | ||||
using System.Collections.Generic; | using System.Collections.Generic; | ||||
using System.Diagnostics; | using System.Diagnostics; | ||||
using System.IO; | |||||
using System.Linq; | using System.Linq; | ||||
using System.Threading.Tasks; | using System.Threading.Tasks; | ||||
using Model = Discord.API.Channel; | using Model = Discord.API.Channel; | ||||
@@ -12,21 +13,21 @@ namespace Discord.Rest | |||||
/// Represents a REST-based voice channel in a guild. | /// Represents a REST-based voice channel in a guild. | ||||
/// </summary> | /// </summary> | ||||
[DebuggerDisplay(@"{DebuggerDisplay,nq}")] | [DebuggerDisplay(@"{DebuggerDisplay,nq}")] | ||||
public class RestVoiceChannel : RestGuildChannel, IVoiceChannel, IRestAudioChannel | |||||
public class RestVoiceChannel : RestTextChannel, IVoiceChannel, IRestAudioChannel | |||||
{ | { | ||||
#region RestVoiceChannel | #region RestVoiceChannel | ||||
/// <summary> | |||||
/// Gets whether or not the guild has Text-In-Voice enabled and the voice channel is a TiV channel. | |||||
/// </summary> | |||||
public virtual bool IsTextInVoice | |||||
=> Guild.Features.HasTextInVoice; | |||||
/// <inheritdoc /> | /// <inheritdoc /> | ||||
public int Bitrate { get; private set; } | public int Bitrate { get; private set; } | ||||
/// <inheritdoc /> | /// <inheritdoc /> | ||||
public int? UserLimit { get; private set; } | public int? UserLimit { get; private set; } | ||||
/// <inheritdoc /> | |||||
public ulong? CategoryId { get; private set; } | |||||
/// <inheritdoc/> | /// <inheritdoc/> | ||||
public string RTCRegion { get; private set; } | public string RTCRegion { get; private set; } | ||||
/// <inheritdoc /> | |||||
public string Mention => MentionUtils.MentionChannel(Id); | |||||
internal RestVoiceChannel(BaseDiscordClient discord, IGuild guild, ulong id) | internal RestVoiceChannel(BaseDiscordClient discord, IGuild guild, ulong id) | ||||
: base(discord, guild, id) | : base(discord, guild, id) | ||||
{ | { | ||||
@@ -41,7 +42,6 @@ namespace Discord.Rest | |||||
internal override void Update(Model model) | internal override void Update(Model model) | ||||
{ | { | ||||
base.Update(model); | base.Update(model); | ||||
CategoryId = model.CategoryId; | |||||
if(model.Bitrate.IsSpecified) | if(model.Bitrate.IsSpecified) | ||||
Bitrate = model.Bitrate.Value; | Bitrate = model.Bitrate.Value; | ||||
@@ -59,41 +59,185 @@ namespace Discord.Rest | |||||
Update(model); | Update(model); | ||||
} | } | ||||
/// <summary> | |||||
/// Gets the parent (category) channel of this channel. | |||||
/// </summary> | |||||
/// <param name="options">The options to be used when sending the request.</param> | |||||
/// <returns> | |||||
/// A task that represents the asynchronous get operation. The task result contains the category channel | |||||
/// representing the parent of this channel; <c>null</c> if none is set. | |||||
/// </returns> | |||||
public Task<ICategoryChannel> GetCategoryAsync(RequestOptions options = null) | |||||
=> ChannelHelper.GetCategoryAsync(this, Discord, options); | |||||
/// <inheritdoc /> | |||||
public Task SyncPermissionsAsync(RequestOptions options = null) | |||||
=> ChannelHelper.SyncPermissionsAsync(this, Discord, options); | |||||
#endregion | |||||
/// <inheritdoc/> | |||||
/// <exception cref="InvalidOperationException">Cannot modify text channel properties of a voice channel.</exception> | |||||
public override Task ModifyAsync(Action<TextChannelProperties> func, RequestOptions options = null) | |||||
=> throw new InvalidOperationException("Cannot modify text channel properties of a voice channel"); | |||||
#region Invites | |||||
/// <inheritdoc /> | |||||
public async Task<IInviteMetadata> CreateInviteAsync(int? maxAge = 86400, int? maxUses = null, bool isTemporary = false, bool isUnique = false, RequestOptions options = null) | |||||
=> await ChannelHelper.CreateInviteAsync(this, Discord, maxAge, maxUses, isTemporary, isUnique, options).ConfigureAwait(false); | |||||
/// <inheritdoc /> | |||||
public async Task<IInviteMetadata> CreateInviteToApplicationAsync(ulong applicationId, int? maxAge, int? maxUses = default(int?), bool isTemporary = false, bool isUnique = false, RequestOptions options = null) | |||||
=> await ChannelHelper.CreateInviteToApplicationAsync(this, Discord, maxAge, maxUses, isTemporary, isUnique, applicationId, options).ConfigureAwait(false); | |||||
/// <inheritdoc /> | |||||
public virtual async Task<IInviteMetadata> CreateInviteToApplicationAsync(DefaultApplications application, int? maxAge = 86400, int? maxUses = default(int?), bool isTemporary = false, bool isUnique = false, RequestOptions options = null) | |||||
=> await ChannelHelper.CreateInviteToApplicationAsync(this, Discord, maxAge, maxUses, isTemporary, isUnique, (ulong)application, options); | |||||
/// <inheritdoc /> | |||||
public async Task<IInviteMetadata> CreateInviteToStreamAsync(IUser user, int? maxAge, int? maxUses = default(int?), bool isTemporary = false, bool isUnique = false, RequestOptions options = null) | |||||
=> await ChannelHelper.CreateInviteToStreamAsync(this, Discord, maxAge, maxUses, isTemporary, isUnique, user, options).ConfigureAwait(false); | |||||
/// <inheritdoc /> | |||||
public async Task<IReadOnlyCollection<IInviteMetadata>> GetInvitesAsync(RequestOptions options = null) | |||||
=> await ChannelHelper.GetInvitesAsync(this, Discord, options).ConfigureAwait(false); | |||||
/// <inheritdoc/> | |||||
/// <exception cref="InvalidOperationException">Cannot create a thread within a voice channel.</exception> | |||||
public override Task<RestThreadChannel> CreateThreadAsync(string name, ThreadType type = ThreadType.PublicThread, ThreadArchiveDuration autoArchiveDuration = ThreadArchiveDuration.OneDay, IMessage message = null, bool? invitable = null, int? slowmode = null, RequestOptions options = null) | |||||
=> throw new InvalidOperationException("Cannot create a thread within a voice channel"); | |||||
#endregion | |||||
private string DebuggerDisplay => $"{Name} ({Id}, Voice)"; | private string DebuggerDisplay => $"{Name} ({Id}, Voice)"; | ||||
#region TextOverrides | |||||
/// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception> | |||||
public override Task<RestMessage> GetMessageAsync(ulong id, RequestOptions options = null) | |||||
{ | |||||
if (!IsTextInVoice) | |||||
throw new NotSupportedException("This function is only supported in Text-In-Voice channels"); | |||||
return base.GetMessageAsync(id, options); | |||||
} | |||||
/// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception> | |||||
public override Task DeleteMessageAsync(IMessage message, RequestOptions options = null) | |||||
{ | |||||
if (!IsTextInVoice) | |||||
throw new NotSupportedException("This function is only supported in Text-In-Voice channels"); | |||||
return base.DeleteMessageAsync(message, options); | |||||
} | |||||
/// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception> | |||||
public override Task DeleteMessageAsync(ulong messageId, RequestOptions options = null) | |||||
{ | |||||
if (!IsTextInVoice) | |||||
throw new NotSupportedException("This function is only supported in Text-In-Voice channels"); | |||||
return base.DeleteMessageAsync(messageId, options); | |||||
} | |||||
/// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception> | |||||
public override Task DeleteMessagesAsync(IEnumerable<IMessage> messages, RequestOptions options = null) | |||||
{ | |||||
if (!IsTextInVoice) | |||||
throw new NotSupportedException("This function is only supported in Text-In-Voice channels"); | |||||
return base.DeleteMessagesAsync(messages, options); | |||||
} | |||||
/// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception> | |||||
public override Task DeleteMessagesAsync(IEnumerable<ulong> messageIds, RequestOptions options = null) | |||||
{ | |||||
if (!IsTextInVoice) | |||||
throw new NotSupportedException("This function is only supported in Text-In-Voice channels"); | |||||
return base.DeleteMessagesAsync(messageIds, options); | |||||
} | |||||
/// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception> | |||||
public override IDisposable EnterTypingState(RequestOptions options = null) | |||||
{ | |||||
if (!IsTextInVoice) | |||||
throw new NotSupportedException("This function is only supported in Text-In-Voice channels"); | |||||
return base.EnterTypingState(options); | |||||
} | |||||
/// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception> | |||||
public override IAsyncEnumerable<IReadOnlyCollection<RestMessage>> GetMessagesAsync(IMessage fromMessage, Direction dir, int limit = 100, RequestOptions options = null) | |||||
{ | |||||
if (!IsTextInVoice) | |||||
throw new NotSupportedException("This function is only supported in Text-In-Voice channels"); | |||||
return base.GetMessagesAsync(fromMessage, dir, limit, options); | |||||
} | |||||
/// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception> | |||||
public override IAsyncEnumerable<IReadOnlyCollection<RestMessage>> GetMessagesAsync(int limit = 100, RequestOptions options = null) | |||||
{ | |||||
if (!IsTextInVoice) | |||||
throw new NotSupportedException("This function is only supported in Text-In-Voice channels"); | |||||
return base.GetMessagesAsync(limit, options); | |||||
} | |||||
/// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception> | |||||
public override IAsyncEnumerable<IReadOnlyCollection<RestMessage>> GetMessagesAsync(ulong fromMessageId, Direction dir, int limit = 100, RequestOptions options = null) | |||||
{ | |||||
if (!IsTextInVoice) | |||||
throw new NotSupportedException("This function is only supported in Text-In-Voice channels"); | |||||
return base.GetMessagesAsync(fromMessageId, dir, limit, options); | |||||
} | |||||
/// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception> | |||||
public override Task<IReadOnlyCollection<RestMessage>> GetPinnedMessagesAsync(RequestOptions options = null) | |||||
{ | |||||
if (!IsTextInVoice) | |||||
throw new NotSupportedException("This function is only supported in Text-In-Voice channels"); | |||||
return base.GetPinnedMessagesAsync(options); | |||||
} | |||||
/// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception> | |||||
public override Task<RestWebhook> GetWebhookAsync(ulong id, RequestOptions options = null) | |||||
{ | |||||
if (!IsTextInVoice) | |||||
throw new NotSupportedException("This function is only supported in Text-In-Voice channels"); | |||||
return base.GetWebhookAsync(id, options); | |||||
} | |||||
/// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception> | |||||
public override Task<IReadOnlyCollection<RestWebhook>> GetWebhooksAsync(RequestOptions options = null) | |||||
{ | |||||
if (!IsTextInVoice) | |||||
throw new NotSupportedException("This function is only supported in Text-In-Voice channels"); | |||||
return base.GetWebhooksAsync(options); | |||||
} | |||||
/// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception> | |||||
public override Task<RestWebhook> CreateWebhookAsync(string name, Stream avatar = null, RequestOptions options = null) | |||||
{ | |||||
if (!IsTextInVoice) | |||||
throw new NotSupportedException("This function is only supported in Text-In-Voice channels"); | |||||
return base.CreateWebhookAsync(name, avatar, options); | |||||
} | |||||
/// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception> | |||||
public override Task<IUserMessage> ModifyMessageAsync(ulong messageId, Action<MessageProperties> func, RequestOptions options = null) | |||||
{ | |||||
if (!IsTextInVoice) | |||||
throw new NotSupportedException("This function is only supported in Text-In-Voice channels"); | |||||
return base.ModifyMessageAsync(messageId, func, options); | |||||
} | |||||
/// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception> | |||||
public override Task<RestUserMessage> SendFileAsync(FileAttachment attachment, string text, bool isTTS = false, Embed embed = null, RequestOptions options = null, AllowedMentions allowedMentions = null, MessageReference messageReference = null, MessageComponent components = null, ISticker[] stickers = null, Embed[] embeds = null, MessageFlags flags = MessageFlags.None) | |||||
{ | |||||
if (!IsTextInVoice) | |||||
throw new NotSupportedException("This function is only supported in Text-In-Voice channels"); | |||||
return base.SendFileAsync(attachment, text, isTTS, embed, options, allowedMentions, messageReference, components, stickers, embeds, flags); | |||||
} | |||||
/// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception> | |||||
public override Task<RestUserMessage> SendFileAsync(Stream stream, string filename, string text, bool isTTS = false, Embed embed = null, RequestOptions options = null, bool isSpoiler = false, AllowedMentions allowedMentions = null, MessageReference messageReference = null, MessageComponent components = null, ISticker[] stickers = null, Embed[] embeds = null, MessageFlags flags = MessageFlags.None) | |||||
{ | |||||
if (!IsTextInVoice) | |||||
throw new NotSupportedException("This function is only supported in Text-In-Voice channels"); | |||||
return base.SendFileAsync(stream, filename, text, isTTS, embed, options, isSpoiler, allowedMentions, messageReference, components, stickers, embeds, flags); | |||||
} | |||||
/// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception> | |||||
public override Task<RestUserMessage> SendFileAsync(string filePath, string text, bool isTTS = false, Embed embed = null, RequestOptions options = null, bool isSpoiler = false, AllowedMentions allowedMentions = null, MessageReference messageReference = null, MessageComponent components = null, ISticker[] stickers = null, Embed[] embeds = null, MessageFlags flags = MessageFlags.None) | |||||
{ | |||||
if (!IsTextInVoice) | |||||
throw new NotSupportedException("This function is only supported in Text-In-Voice channels"); | |||||
return base.SendFileAsync(filePath, text, isTTS, embed, options, isSpoiler, allowedMentions, messageReference, components, stickers, embeds, flags); | |||||
} | |||||
/// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception> | |||||
public override Task<RestUserMessage> SendFilesAsync(IEnumerable<FileAttachment> attachments, string text, bool isTTS = false, Embed embed = null, RequestOptions options = null, AllowedMentions allowedMentions = null, MessageReference messageReference = null, MessageComponent components = null, ISticker[] stickers = null, Embed[] embeds = null, MessageFlags flags = MessageFlags.None) | |||||
{ | |||||
if (!IsTextInVoice) | |||||
throw new NotSupportedException("This function is only supported in Text-In-Voice channels"); | |||||
return base.SendFilesAsync(attachments, text, isTTS, embed, options, allowedMentions, messageReference, components, stickers, embeds, flags); | |||||
} | |||||
/// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception> | |||||
public override Task<RestUserMessage> SendMessageAsync(string text = null, bool isTTS = false, Embed embed = null, RequestOptions options = null, AllowedMentions allowedMentions = null, MessageReference messageReference = null, MessageComponent components = null, ISticker[] stickers = null, Embed[] embeds = null, MessageFlags flags = MessageFlags.None) | |||||
{ | |||||
if (!IsTextInVoice) | |||||
throw new NotSupportedException("This function is only supported in Text-In-Voice channels"); | |||||
return base.SendMessageAsync(text, isTTS, embed, options, allowedMentions, messageReference, components, stickers, embeds, flags); | |||||
} | |||||
/// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception> | |||||
public override Task TriggerTypingAsync(RequestOptions options = null) | |||||
{ | |||||
if (!IsTextInVoice) | |||||
throw new NotSupportedException("This function is only supported in Text-In-Voice channels"); | |||||
return base.TriggerTypingAsync(options); | |||||
} | |||||
#endregion | #endregion | ||||
#region IAudioChannel | #region IAudioChannel | ||||
/// <inheritdoc /> | /// <inheritdoc /> | ||||
/// <exception cref="NotSupportedException">Connecting to a REST-based channel is not supported.</exception> | /// <exception cref="NotSupportedException">Connecting to a REST-based channel is not supported.</exception> | ||||
@@ -222,6 +222,8 @@ namespace Discord.WebSocket | |||||
#region IChannel | #region IChannel | ||||
/// <inheritdoc /> | /// <inheritdoc /> | ||||
string IChannel.Name => Name; | |||||
/// <inheritdoc /> | |||||
IAsyncEnumerable<IReadOnlyCollection<IUser>> IChannel.GetUsersAsync(CacheMode mode, RequestOptions options) | IAsyncEnumerable<IReadOnlyCollection<IUser>> IChannel.GetUsersAsync(CacheMode mode, RequestOptions options) | ||||
=> ImmutableArray.Create<IReadOnlyCollection<IUser>>(Users).ToAsyncEnumerable(); //Overridden in Text/Voice | => ImmutableArray.Create<IReadOnlyCollection<IUser>>(Users).ToAsyncEnumerable(); //Overridden in Text/Voice | ||||
/// <inheritdoc /> | /// <inheritdoc /> | ||||
@@ -15,7 +15,11 @@ namespace Discord.WebSocket | |||||
public class SocketStageChannel : SocketVoiceChannel, IStageChannel | public class SocketStageChannel : SocketVoiceChannel, IStageChannel | ||||
{ | { | ||||
/// <inheritdoc/> | /// <inheritdoc/> | ||||
public string Topic { get; private set; } | |||||
/// <remarks> | |||||
/// This field is always false for stage channels. | |||||
/// </remarks> | |||||
public override bool IsTextInVoice | |||||
=> false; | |||||
/// <inheritdoc/> | /// <inheritdoc/> | ||||
public StagePrivacyLevel? PrivacyLevel { get; private set; } | public StagePrivacyLevel? PrivacyLevel { get; private set; } | ||||
@@ -49,19 +53,16 @@ namespace Discord.WebSocket | |||||
entity.Update(state, model); | entity.Update(state, model); | ||||
return entity; | return entity; | ||||
} | } | ||||
internal void Update(StageInstance model, bool isLive = false) | internal void Update(StageInstance model, bool isLive = false) | ||||
{ | { | ||||
IsLive = isLive; | IsLive = isLive; | ||||
if (isLive) | if (isLive) | ||||
{ | { | ||||
Topic = model.Topic; | |||||
PrivacyLevel = model.PrivacyLevel; | PrivacyLevel = model.PrivacyLevel; | ||||
IsDiscoverableDisabled = model.DiscoverableDisabled; | IsDiscoverableDisabled = model.DiscoverableDisabled; | ||||
} | } | ||||
else | else | ||||
{ | { | ||||
Topic = null; | |||||
PrivacyLevel = null; | PrivacyLevel = null; | ||||
IsDiscoverableDisabled = null; | IsDiscoverableDisabled = null; | ||||
} | } | ||||
@@ -128,7 +128,7 @@ namespace Discord.WebSocket | |||||
#region Messages | #region Messages | ||||
/// <inheritdoc /> | /// <inheritdoc /> | ||||
public SocketMessage GetCachedMessage(ulong id) | |||||
public virtual SocketMessage GetCachedMessage(ulong id) | |||||
=> _messages?.Get(id); | => _messages?.Get(id); | ||||
/// <summary> | /// <summary> | ||||
/// Gets a message from this message channel. | /// Gets a message from this message channel. | ||||
@@ -143,7 +143,7 @@ namespace Discord.WebSocket | |||||
/// A task that represents an asynchronous get operation for retrieving the message. The task result contains | /// A task that represents an asynchronous get operation for retrieving the message. The task result contains | ||||
/// the retrieved message; <c>null</c> if no message is found with the specified identifier. | /// the retrieved message; <c>null</c> if no message is found with the specified identifier. | ||||
/// </returns> | /// </returns> | ||||
public async Task<IMessage> GetMessageAsync(ulong id, RequestOptions options = null) | |||||
public virtual async Task<IMessage> GetMessageAsync(ulong id, RequestOptions options = null) | |||||
{ | { | ||||
IMessage msg = _messages?.Get(id); | IMessage msg = _messages?.Get(id); | ||||
if (msg == null) | if (msg == null) | ||||
@@ -163,7 +163,7 @@ namespace Discord.WebSocket | |||||
/// <returns> | /// <returns> | ||||
/// Paged collection of messages. | /// Paged collection of messages. | ||||
/// </returns> | /// </returns> | ||||
public IAsyncEnumerable<IReadOnlyCollection<IMessage>> GetMessagesAsync(int limit = DiscordConfig.MaxMessagesPerBatch, RequestOptions options = null) | |||||
public virtual IAsyncEnumerable<IReadOnlyCollection<IMessage>> GetMessagesAsync(int limit = DiscordConfig.MaxMessagesPerBatch, RequestOptions options = null) | |||||
=> SocketChannelHelper.GetMessagesAsync(this, Discord, _messages, null, Direction.Before, limit, CacheMode.AllowDownload, options); | => SocketChannelHelper.GetMessagesAsync(this, Discord, _messages, null, Direction.Before, limit, CacheMode.AllowDownload, options); | ||||
/// <summary> | /// <summary> | ||||
/// Gets a collection of messages in this channel. | /// Gets a collection of messages in this channel. | ||||
@@ -179,7 +179,7 @@ namespace Discord.WebSocket | |||||
/// <returns> | /// <returns> | ||||
/// Paged collection of messages. | /// Paged collection of messages. | ||||
/// </returns> | /// </returns> | ||||
public IAsyncEnumerable<IReadOnlyCollection<IMessage>> GetMessagesAsync(ulong fromMessageId, Direction dir, int limit = DiscordConfig.MaxMessagesPerBatch, RequestOptions options = null) | |||||
public virtual IAsyncEnumerable<IReadOnlyCollection<IMessage>> GetMessagesAsync(ulong fromMessageId, Direction dir, int limit = DiscordConfig.MaxMessagesPerBatch, RequestOptions options = null) | |||||
=> SocketChannelHelper.GetMessagesAsync(this, Discord, _messages, fromMessageId, dir, limit, CacheMode.AllowDownload, options); | => SocketChannelHelper.GetMessagesAsync(this, Discord, _messages, fromMessageId, dir, limit, CacheMode.AllowDownload, options); | ||||
/// <summary> | /// <summary> | ||||
/// Gets a collection of messages in this channel. | /// Gets a collection of messages in this channel. | ||||
@@ -195,25 +195,25 @@ namespace Discord.WebSocket | |||||
/// <returns> | /// <returns> | ||||
/// Paged collection of messages. | /// Paged collection of messages. | ||||
/// </returns> | /// </returns> | ||||
public IAsyncEnumerable<IReadOnlyCollection<IMessage>> GetMessagesAsync(IMessage fromMessage, Direction dir, int limit = DiscordConfig.MaxMessagesPerBatch, RequestOptions options = null) | |||||
public virtual IAsyncEnumerable<IReadOnlyCollection<IMessage>> GetMessagesAsync(IMessage fromMessage, Direction dir, int limit = DiscordConfig.MaxMessagesPerBatch, RequestOptions options = null) | |||||
=> SocketChannelHelper.GetMessagesAsync(this, Discord, _messages, fromMessage.Id, dir, limit, CacheMode.AllowDownload, options); | => SocketChannelHelper.GetMessagesAsync(this, Discord, _messages, fromMessage.Id, dir, limit, CacheMode.AllowDownload, options); | ||||
/// <inheritdoc /> | /// <inheritdoc /> | ||||
public IReadOnlyCollection<SocketMessage> GetCachedMessages(int limit = DiscordConfig.MaxMessagesPerBatch) | |||||
public virtual IReadOnlyCollection<SocketMessage> GetCachedMessages(int limit = DiscordConfig.MaxMessagesPerBatch) | |||||
=> SocketChannelHelper.GetCachedMessages(this, Discord, _messages, null, Direction.Before, limit); | => SocketChannelHelper.GetCachedMessages(this, Discord, _messages, null, Direction.Before, limit); | ||||
/// <inheritdoc /> | /// <inheritdoc /> | ||||
public IReadOnlyCollection<SocketMessage> GetCachedMessages(ulong fromMessageId, Direction dir, int limit = DiscordConfig.MaxMessagesPerBatch) | |||||
public virtual IReadOnlyCollection<SocketMessage> GetCachedMessages(ulong fromMessageId, Direction dir, int limit = DiscordConfig.MaxMessagesPerBatch) | |||||
=> SocketChannelHelper.GetCachedMessages(this, Discord, _messages, fromMessageId, dir, limit); | => SocketChannelHelper.GetCachedMessages(this, Discord, _messages, fromMessageId, dir, limit); | ||||
/// <inheritdoc /> | /// <inheritdoc /> | ||||
public IReadOnlyCollection<SocketMessage> GetCachedMessages(IMessage fromMessage, Direction dir, int limit = DiscordConfig.MaxMessagesPerBatch) | |||||
public virtual IReadOnlyCollection<SocketMessage> GetCachedMessages(IMessage fromMessage, Direction dir, int limit = DiscordConfig.MaxMessagesPerBatch) | |||||
=> SocketChannelHelper.GetCachedMessages(this, Discord, _messages, fromMessage.Id, dir, limit); | => SocketChannelHelper.GetCachedMessages(this, Discord, _messages, fromMessage.Id, dir, limit); | ||||
/// <inheritdoc /> | /// <inheritdoc /> | ||||
public Task<IReadOnlyCollection<RestMessage>> GetPinnedMessagesAsync(RequestOptions options = null) | |||||
public virtual Task<IReadOnlyCollection<RestMessage>> GetPinnedMessagesAsync(RequestOptions options = null) | |||||
=> ChannelHelper.GetPinnedMessagesAsync(this, Discord, options); | => ChannelHelper.GetPinnedMessagesAsync(this, Discord, options); | ||||
/// <inheritdoc /> | /// <inheritdoc /> | ||||
/// <exception cref="ArgumentOutOfRangeException">Message content is too long, length must be less or equal to <see cref="DiscordConfig.MaxMessageSize"/>.</exception> | /// <exception cref="ArgumentOutOfRangeException">Message content is too long, length must be less or equal to <see cref="DiscordConfig.MaxMessageSize"/>.</exception> | ||||
/// <exception cref="ArgumentException">The only valid <see cref="MessageFlags"/> are <see cref="MessageFlags.SuppressEmbeds"/> and <see cref="MessageFlags.None"/>.</exception> | /// <exception cref="ArgumentException">The only valid <see cref="MessageFlags"/> are <see cref="MessageFlags.SuppressEmbeds"/> and <see cref="MessageFlags.None"/>.</exception> | ||||
public Task<RestUserMessage> SendMessageAsync(string text = null, bool isTTS = false, Embed embed = null, | |||||
public virtual Task<RestUserMessage> SendMessageAsync(string text = null, bool isTTS = false, Embed embed = null, | |||||
RequestOptions options = null, AllowedMentions allowedMentions = null, MessageReference messageReference = null, | RequestOptions options = null, AllowedMentions allowedMentions = null, MessageReference messageReference = null, | ||||
MessageComponent components = null, ISticker[] stickers = null, Embed[] embeds = null, MessageFlags flags = MessageFlags.None) | MessageComponent components = null, ISticker[] stickers = null, Embed[] embeds = null, MessageFlags flags = MessageFlags.None) | ||||
=> ChannelHelper.SendMessageAsync(this, Discord, text, isTTS, embed, allowedMentions, messageReference, | => ChannelHelper.SendMessageAsync(this, Discord, text, isTTS, embed, allowedMentions, messageReference, | ||||
@@ -221,7 +221,7 @@ namespace Discord.WebSocket | |||||
/// <inheritdoc /> | /// <inheritdoc /> | ||||
/// <exception cref="ArgumentException">The only valid <see cref="MessageFlags"/> are <see cref="MessageFlags.SuppressEmbeds"/> and <see cref="MessageFlags.None"/>.</exception> | /// <exception cref="ArgumentException">The only valid <see cref="MessageFlags"/> are <see cref="MessageFlags.SuppressEmbeds"/> and <see cref="MessageFlags.None"/>.</exception> | ||||
public Task<RestUserMessage> SendFileAsync(string filePath, string text, bool isTTS = false, Embed embed = null, | |||||
public virtual Task<RestUserMessage> SendFileAsync(string filePath, string text, bool isTTS = false, Embed embed = null, | |||||
RequestOptions options = null, bool isSpoiler = false, AllowedMentions allowedMentions = null, | RequestOptions options = null, bool isSpoiler = false, AllowedMentions allowedMentions = null, | ||||
MessageReference messageReference = null, MessageComponent components = null, ISticker[] stickers = null, | MessageReference messageReference = null, MessageComponent components = null, ISticker[] stickers = null, | ||||
Embed[] embeds = null, MessageFlags flags = MessageFlags.None) | Embed[] embeds = null, MessageFlags flags = MessageFlags.None) | ||||
@@ -230,7 +230,7 @@ namespace Discord.WebSocket | |||||
/// <inheritdoc /> | /// <inheritdoc /> | ||||
/// <exception cref="ArgumentOutOfRangeException">Message content is too long, length must be less or equal to <see cref="DiscordConfig.MaxMessageSize"/>.</exception> | /// <exception cref="ArgumentOutOfRangeException">Message content is too long, length must be less or equal to <see cref="DiscordConfig.MaxMessageSize"/>.</exception> | ||||
/// <exception cref="ArgumentException">The only valid <see cref="MessageFlags"/> are <see cref="MessageFlags.SuppressEmbeds"/> and <see cref="MessageFlags.None"/>.</exception> | /// <exception cref="ArgumentException">The only valid <see cref="MessageFlags"/> are <see cref="MessageFlags.SuppressEmbeds"/> and <see cref="MessageFlags.None"/>.</exception> | ||||
public Task<RestUserMessage> SendFileAsync(Stream stream, string filename, string text, bool isTTS = false, | |||||
public virtual Task<RestUserMessage> SendFileAsync(Stream stream, string filename, string text, bool isTTS = false, | |||||
Embed embed = null, RequestOptions options = null, bool isSpoiler = false, AllowedMentions allowedMentions = null, | Embed embed = null, RequestOptions options = null, bool isSpoiler = false, AllowedMentions allowedMentions = null, | ||||
MessageReference messageReference = null, MessageComponent components = null, ISticker[] stickers = null, | MessageReference messageReference = null, MessageComponent components = null, ISticker[] stickers = null, | ||||
Embed[] embeds = null, MessageFlags flags = MessageFlags.None) | Embed[] embeds = null, MessageFlags flags = MessageFlags.None) | ||||
@@ -239,7 +239,7 @@ namespace Discord.WebSocket | |||||
/// <inheritdoc /> | /// <inheritdoc /> | ||||
/// <exception cref="ArgumentOutOfRangeException">Message content is too long, length must be less or equal to <see cref="DiscordConfig.MaxMessageSize"/>.</exception> | /// <exception cref="ArgumentOutOfRangeException">Message content is too long, length must be less or equal to <see cref="DiscordConfig.MaxMessageSize"/>.</exception> | ||||
/// <exception cref="ArgumentException">The only valid <see cref="MessageFlags"/> are <see cref="MessageFlags.SuppressEmbeds"/> and <see cref="MessageFlags.None"/>.</exception> | /// <exception cref="ArgumentException">The only valid <see cref="MessageFlags"/> are <see cref="MessageFlags.SuppressEmbeds"/> and <see cref="MessageFlags.None"/>.</exception> | ||||
public Task<RestUserMessage> SendFileAsync(FileAttachment attachment, string text, bool isTTS = false, | |||||
public virtual Task<RestUserMessage> SendFileAsync(FileAttachment attachment, string text, bool isTTS = false, | |||||
Embed embed = null, RequestOptions options = null, AllowedMentions allowedMentions = null, | Embed embed = null, RequestOptions options = null, AllowedMentions allowedMentions = null, | ||||
MessageReference messageReference = null, MessageComponent components = null, ISticker[] stickers = null, | MessageReference messageReference = null, MessageComponent components = null, ISticker[] stickers = null, | ||||
Embed[] embeds = null, MessageFlags flags = MessageFlags.None) | Embed[] embeds = null, MessageFlags flags = MessageFlags.None) | ||||
@@ -248,7 +248,7 @@ namespace Discord.WebSocket | |||||
/// <inheritdoc /> | /// <inheritdoc /> | ||||
/// <exception cref="ArgumentOutOfRangeException">Message content is too long, length must be less or equal to <see cref="DiscordConfig.MaxMessageSize"/>.</exception> | /// <exception cref="ArgumentOutOfRangeException">Message content is too long, length must be less or equal to <see cref="DiscordConfig.MaxMessageSize"/>.</exception> | ||||
/// <exception cref="ArgumentException">The only valid <see cref="MessageFlags"/> are <see cref="MessageFlags.SuppressEmbeds"/> and <see cref="MessageFlags.None"/>.</exception> | /// <exception cref="ArgumentException">The only valid <see cref="MessageFlags"/> are <see cref="MessageFlags.SuppressEmbeds"/> and <see cref="MessageFlags.None"/>.</exception> | ||||
public Task<RestUserMessage> SendFilesAsync(IEnumerable<FileAttachment> attachments, string text, bool isTTS = false, | |||||
public virtual Task<RestUserMessage> SendFilesAsync(IEnumerable<FileAttachment> attachments, string text, bool isTTS = false, | |||||
Embed embed = null, RequestOptions options = null, AllowedMentions allowedMentions = null, | Embed embed = null, RequestOptions options = null, AllowedMentions allowedMentions = null, | ||||
MessageReference messageReference = null, MessageComponent components = null, ISticker[] stickers = null, | MessageReference messageReference = null, MessageComponent components = null, ISticker[] stickers = null, | ||||
Embed[] embeds = null, MessageFlags flags = MessageFlags.None) | Embed[] embeds = null, MessageFlags flags = MessageFlags.None) | ||||
@@ -256,28 +256,28 @@ namespace Discord.WebSocket | |||||
messageReference, components, stickers, options, embeds, flags); | messageReference, components, stickers, options, embeds, flags); | ||||
/// <inheritdoc /> | /// <inheritdoc /> | ||||
public Task DeleteMessagesAsync(IEnumerable<IMessage> messages, RequestOptions options = null) | |||||
public virtual Task DeleteMessagesAsync(IEnumerable<IMessage> messages, RequestOptions options = null) | |||||
=> ChannelHelper.DeleteMessagesAsync(this, Discord, messages.Select(x => x.Id), options); | => ChannelHelper.DeleteMessagesAsync(this, Discord, messages.Select(x => x.Id), options); | ||||
/// <inheritdoc /> | /// <inheritdoc /> | ||||
public Task DeleteMessagesAsync(IEnumerable<ulong> messageIds, RequestOptions options = null) | |||||
public virtual Task DeleteMessagesAsync(IEnumerable<ulong> messageIds, RequestOptions options = null) | |||||
=> ChannelHelper.DeleteMessagesAsync(this, Discord, messageIds, options); | => ChannelHelper.DeleteMessagesAsync(this, Discord, messageIds, options); | ||||
/// <inheritdoc /> | /// <inheritdoc /> | ||||
public async Task<IUserMessage> ModifyMessageAsync(ulong messageId, Action<MessageProperties> func, RequestOptions options = null) | |||||
public virtual async Task<IUserMessage> ModifyMessageAsync(ulong messageId, Action<MessageProperties> func, RequestOptions options = null) | |||||
=> await ChannelHelper.ModifyMessageAsync(this, messageId, func, Discord, options).ConfigureAwait(false); | => await ChannelHelper.ModifyMessageAsync(this, messageId, func, Discord, options).ConfigureAwait(false); | ||||
/// <inheritdoc /> | /// <inheritdoc /> | ||||
public Task DeleteMessageAsync(ulong messageId, RequestOptions options = null) | |||||
public virtual Task DeleteMessageAsync(ulong messageId, RequestOptions options = null) | |||||
=> ChannelHelper.DeleteMessageAsync(this, messageId, Discord, options); | => ChannelHelper.DeleteMessageAsync(this, messageId, Discord, options); | ||||
/// <inheritdoc /> | /// <inheritdoc /> | ||||
public Task DeleteMessageAsync(IMessage message, RequestOptions options = null) | |||||
public virtual Task DeleteMessageAsync(IMessage message, RequestOptions options = null) | |||||
=> ChannelHelper.DeleteMessageAsync(this, message.Id, Discord, options); | => ChannelHelper.DeleteMessageAsync(this, message.Id, Discord, options); | ||||
/// <inheritdoc /> | /// <inheritdoc /> | ||||
public Task TriggerTypingAsync(RequestOptions options = null) | |||||
public virtual Task TriggerTypingAsync(RequestOptions options = null) | |||||
=> ChannelHelper.TriggerTypingAsync(this, Discord, options); | => ChannelHelper.TriggerTypingAsync(this, Discord, options); | ||||
/// <inheritdoc /> | /// <inheritdoc /> | ||||
public IDisposable EnterTypingState(RequestOptions options = null) | |||||
public virtual IDisposable EnterTypingState(RequestOptions options = null) | |||||
=> ChannelHelper.EnterTypingState(this, Discord, options); | => ChannelHelper.EnterTypingState(this, Discord, options); | ||||
internal void AddMessage(SocketMessage msg) | internal void AddMessage(SocketMessage msg) | ||||
@@ -4,6 +4,7 @@ using System; | |||||
using System.Collections.Generic; | using System.Collections.Generic; | ||||
using System.Collections.Immutable; | using System.Collections.Immutable; | ||||
using System.Diagnostics; | using System.Diagnostics; | ||||
using System.IO; | |||||
using System.Linq; | using System.Linq; | ||||
using System.Threading.Tasks; | using System.Threading.Tasks; | ||||
using Model = Discord.API.Channel; | using Model = Discord.API.Channel; | ||||
@@ -14,33 +15,21 @@ namespace Discord.WebSocket | |||||
/// Represents a WebSocket-based voice channel in a guild. | /// Represents a WebSocket-based voice channel in a guild. | ||||
/// </summary> | /// </summary> | ||||
[DebuggerDisplay(@"{DebuggerDisplay,nq}")] | [DebuggerDisplay(@"{DebuggerDisplay,nq}")] | ||||
public class SocketVoiceChannel : SocketGuildChannel, IVoiceChannel, ISocketAudioChannel | |||||
public class SocketVoiceChannel : SocketTextChannel, IVoiceChannel, ISocketAudioChannel | |||||
{ | { | ||||
#region SocketVoiceChannel | #region SocketVoiceChannel | ||||
/// <inheritdoc /> | |||||
public int Bitrate { get; private set; } | |||||
/// <inheritdoc /> | |||||
public int? UserLimit { get; private set; } | |||||
/// <inheritdoc/> | |||||
public string RTCRegion { get; private set; } | |||||
/// <inheritdoc /> | |||||
public ulong? CategoryId { get; private set; } | |||||
/// <summary> | /// <summary> | ||||
/// Gets the parent (category) channel of this channel. | |||||
/// Gets whether or not the guild has Text-In-Voice enabled and the voice channel is a TiV channel. | |||||
/// </summary> | /// </summary> | ||||
/// <returns> | |||||
/// A category channel representing the parent of this channel; <c>null</c> if none is set. | |||||
/// </returns> | |||||
public ICategoryChannel Category | |||||
=> CategoryId.HasValue ? Guild.GetChannel(CategoryId.Value) as ICategoryChannel : null; | |||||
public virtual bool IsTextInVoice | |||||
=> Guild.Features.HasTextInVoice; | |||||
/// <inheritdoc /> | /// <inheritdoc /> | ||||
public string Mention => MentionUtils.MentionChannel(Id); | |||||
public int Bitrate { get; private set; } | |||||
/// <inheritdoc /> | |||||
public int? UserLimit { get; private set; } | |||||
/// <inheritdoc /> | /// <inheritdoc /> | ||||
public Task SyncPermissionsAsync(RequestOptions options = null) | |||||
=> ChannelHelper.SyncPermissionsAsync(this, Discord, options); | |||||
public string RTCRegion { get; private set; } | |||||
/// <summary> | /// <summary> | ||||
/// Gets a collection of users that are currently connected to this voice channel. | /// Gets a collection of users that are currently connected to this voice channel. | ||||
@@ -48,7 +37,7 @@ namespace Discord.WebSocket | |||||
/// <returns> | /// <returns> | ||||
/// A read-only collection of users that are currently connected to this voice channel. | /// A read-only collection of users that are currently connected to this voice channel. | ||||
/// </returns> | /// </returns> | ||||
public override IReadOnlyCollection<SocketGuildUser> Users | |||||
public IReadOnlyCollection<SocketGuildUser> ConnectedUsers | |||||
=> Guild.Users.Where(x => x.VoiceChannel?.Id == Id).ToImmutableArray(); | => Guild.Users.Where(x => x.VoiceChannel?.Id == Id).ToImmutableArray(); | ||||
internal SocketVoiceChannel(DiscordSocketClient discord, ulong id, SocketGuild guild) | internal SocketVoiceChannel(DiscordSocketClient discord, ulong id, SocketGuild guild) | ||||
@@ -65,7 +54,6 @@ namespace Discord.WebSocket | |||||
internal override void Update(ClientState state, Model model) | internal override void Update(ClientState state, Model model) | ||||
{ | { | ||||
base.Update(state, model); | base.Update(state, model); | ||||
CategoryId = model.CategoryId; | |||||
Bitrate = model.Bitrate.Value; | Bitrate = model.Bitrate.Value; | ||||
UserLimit = model.UserLimit.Value != 0 ? model.UserLimit.Value : (int?)null; | UserLimit = model.UserLimit.Value != 0 ? model.UserLimit.Value : (int?)null; | ||||
RTCRegion = model.RTCRegion.GetValueOrDefault(null); | RTCRegion = model.RTCRegion.GetValueOrDefault(null); | ||||
@@ -99,28 +87,215 @@ namespace Discord.WebSocket | |||||
return user; | return user; | ||||
return null; | return null; | ||||
} | } | ||||
#endregion | |||||
#region Invites | |||||
/// <inheritdoc /> | |||||
public async Task<IInviteMetadata> CreateInviteAsync(int? maxAge = 86400, int? maxUses = null, bool isTemporary = false, bool isUnique = false, RequestOptions options = null) | |||||
=> await ChannelHelper.CreateInviteAsync(this, Discord, maxAge, maxUses, isTemporary, isUnique, options).ConfigureAwait(false); | |||||
/// <inheritdoc /> | |||||
public async Task<IInviteMetadata> CreateInviteToApplicationAsync(ulong applicationId, int? maxAge, int? maxUses = default(int?), bool isTemporary = false, bool isUnique = false, RequestOptions options = null) | |||||
=> await ChannelHelper.CreateInviteToApplicationAsync(this, Discord, maxAge, maxUses, isTemporary, isUnique, applicationId, options).ConfigureAwait(false); | |||||
/// <inheritdoc /> | |||||
public virtual async Task<IInviteMetadata> CreateInviteToApplicationAsync(DefaultApplications application, int? maxAge = 86400, int? maxUses = default(int?), bool isTemporary = false, bool isUnique = false, RequestOptions options = null) | |||||
=> await ChannelHelper.CreateInviteToApplicationAsync(this, Discord, maxAge, maxUses, isTemporary, isUnique, (ulong)application, options); | |||||
/// <inheritdoc /> | |||||
public async Task<IInviteMetadata> CreateInviteToStreamAsync(IUser user, int? maxAge, int? maxUses = default(int?), bool isTemporary = false, bool isUnique = false, RequestOptions options = null) | |||||
=> await ChannelHelper.CreateInviteToStreamAsync(this, Discord, maxAge, maxUses, isTemporary, isUnique, user, options).ConfigureAwait(false); | |||||
/// <inheritdoc /> | |||||
public async Task<IReadOnlyCollection<IInviteMetadata>> GetInvitesAsync(RequestOptions options = null) | |||||
=> await ChannelHelper.GetInvitesAsync(this, Discord, options).ConfigureAwait(false); | |||||
/// <inheritdoc/> <exception cref="InvalidOperationException">Cannot create threads in voice channels.</exception> | |||||
public override Task<SocketThreadChannel> CreateThreadAsync(string name, ThreadType type = ThreadType.PublicThread, ThreadArchiveDuration autoArchiveDuration = ThreadArchiveDuration.OneDay, IMessage message = null, bool? invitable = null, int? slowmode = null, RequestOptions options = null) | |||||
=> throw new InvalidOperationException("Voice channels cannot contain threads."); | |||||
/// <inheritdoc/> <exception cref="InvalidOperationException">Cannot modify text channel properties for voice channels.</exception> | |||||
public override Task ModifyAsync(Action<TextChannelProperties> func, RequestOptions options = null) | |||||
=> throw new InvalidOperationException("Cannot modify text channel properties for voice channels."); | |||||
#endregion | |||||
#region TextOverrides | |||||
/// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception> | |||||
public override Task<IMessage> GetMessageAsync(ulong id, RequestOptions options = null) | |||||
{ | |||||
if (!IsTextInVoice) | |||||
throw new NotSupportedException("This function is only supported in Text-In-Voice channels"); | |||||
return base.GetMessageAsync(id, options); | |||||
} | |||||
/// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception> | |||||
public override Task DeleteMessageAsync(IMessage message, RequestOptions options = null) | |||||
{ | |||||
if (!IsTextInVoice) | |||||
throw new NotSupportedException("This function is only supported in Text-In-Voice channels"); | |||||
return base.DeleteMessageAsync(message, options); | |||||
} | |||||
/// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception> | |||||
public override Task DeleteMessageAsync(ulong messageId, RequestOptions options = null) | |||||
{ | |||||
if (!IsTextInVoice) | |||||
throw new NotSupportedException("This function is only supported in Text-In-Voice channels"); | |||||
return base.DeleteMessageAsync(messageId, options); | |||||
} | |||||
/// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception> | |||||
public override Task DeleteMessagesAsync(IEnumerable<IMessage> messages, RequestOptions options = null) | |||||
{ | |||||
if (!IsTextInVoice) | |||||
throw new NotSupportedException("This function is only supported in Text-In-Voice channels"); | |||||
return base.DeleteMessagesAsync(messages, options); | |||||
} | |||||
/// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception> | |||||
public override Task DeleteMessagesAsync(IEnumerable<ulong> messageIds, RequestOptions options = null) | |||||
{ | |||||
if (!IsTextInVoice) | |||||
throw new NotSupportedException("This function is only supported in Text-In-Voice channels"); | |||||
return base.DeleteMessagesAsync(messageIds, options); | |||||
} | |||||
/// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception> | |||||
public override IDisposable EnterTypingState(RequestOptions options = null) | |||||
{ | |||||
if (!IsTextInVoice) | |||||
throw new NotSupportedException("This function is only supported in Text-In-Voice channels"); | |||||
return base.EnterTypingState(options); | |||||
} | |||||
/// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception> | |||||
public override SocketMessage GetCachedMessage(ulong id) | |||||
{ | |||||
if (!IsTextInVoice) | |||||
throw new NotSupportedException("This function is only supported in Text-In-Voice channels"); | |||||
return base.GetCachedMessage(id); | |||||
} | |||||
/// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception> | |||||
public override IReadOnlyCollection<SocketMessage> GetCachedMessages(IMessage fromMessage, Direction dir, int limit = 100) | |||||
{ | |||||
if (!IsTextInVoice) | |||||
throw new NotSupportedException("This function is only supported in Text-In-Voice channels"); | |||||
return base.GetCachedMessages(fromMessage, dir, limit); | |||||
} | |||||
/// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception> | |||||
public override IReadOnlyCollection<SocketMessage> GetCachedMessages(int limit = 100) | |||||
{ | |||||
if (!IsTextInVoice) | |||||
throw new NotSupportedException("This function is only supported in Text-In-Voice channels"); | |||||
return base.GetCachedMessages(limit); | |||||
} | |||||
/// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception> | |||||
public override IReadOnlyCollection<SocketMessage> GetCachedMessages(ulong fromMessageId, Direction dir, int limit = 100) | |||||
{ | |||||
if (!IsTextInVoice) | |||||
throw new NotSupportedException("This function is only supported in Text-In-Voice channels"); | |||||
return base.GetCachedMessages(fromMessageId, dir, limit); | |||||
} | |||||
/// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception> | |||||
public override IAsyncEnumerable<IReadOnlyCollection<IMessage>> GetMessagesAsync(IMessage fromMessage, Direction dir, int limit = 100, RequestOptions options = null) | |||||
{ | |||||
if (!IsTextInVoice) | |||||
throw new NotSupportedException("This function is only supported in Text-In-Voice channels"); | |||||
return base.GetMessagesAsync(fromMessage, dir, limit, options); | |||||
} | |||||
/// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception> | |||||
public override IAsyncEnumerable<IReadOnlyCollection<IMessage>> GetMessagesAsync(int limit = 100, RequestOptions options = null) | |||||
{ | |||||
if (!IsTextInVoice) | |||||
throw new NotSupportedException("This function is only supported in Text-In-Voice channels"); | |||||
return base.GetMessagesAsync(limit, options); | |||||
} | |||||
/// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception> | |||||
public override IAsyncEnumerable<IReadOnlyCollection<IMessage>> GetMessagesAsync(ulong fromMessageId, Direction dir, int limit = 100, RequestOptions options = null) | |||||
{ | |||||
if (!IsTextInVoice) | |||||
throw new NotSupportedException("This function is only supported in Text-In-Voice channels"); | |||||
return base.GetMessagesAsync(fromMessageId, dir, limit, options); | |||||
} | |||||
/// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception> | |||||
public override Task<IReadOnlyCollection<RestMessage>> GetPinnedMessagesAsync(RequestOptions options = null) | |||||
{ | |||||
if (!IsTextInVoice) | |||||
throw new NotSupportedException("This function is only supported in Text-In-Voice channels"); | |||||
return base.GetPinnedMessagesAsync(options); | |||||
} | |||||
/// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception> | |||||
public override Task<RestWebhook> GetWebhookAsync(ulong id, RequestOptions options = null) | |||||
{ | |||||
if (!IsTextInVoice) | |||||
throw new NotSupportedException("This function is only supported in Text-In-Voice channels"); | |||||
return base.GetWebhookAsync(id, options); | |||||
} | |||||
/// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception> | |||||
public override Task<IReadOnlyCollection<RestWebhook>> GetWebhooksAsync(RequestOptions options = null) | |||||
{ | |||||
if (!IsTextInVoice) | |||||
throw new NotSupportedException("This function is only supported in Text-In-Voice channels"); | |||||
return base.GetWebhooksAsync(options); | |||||
} | |||||
/// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception> | |||||
public override Task<RestWebhook> CreateWebhookAsync(string name, Stream avatar = null, RequestOptions options = null) | |||||
{ | |||||
if (!IsTextInVoice) | |||||
throw new NotSupportedException("This function is only supported in Text-In-Voice channels"); | |||||
return base.CreateWebhookAsync(name, avatar, options); | |||||
} | |||||
/// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception> | |||||
public override Task<IUserMessage> ModifyMessageAsync(ulong messageId, Action<MessageProperties> func, RequestOptions options = null) | |||||
{ | |||||
if (!IsTextInVoice) | |||||
throw new NotSupportedException("This function is only supported in Text-In-Voice channels"); | |||||
return base.ModifyMessageAsync(messageId, func, options); | |||||
} | |||||
/// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception> | |||||
public override Task<RestUserMessage> SendFileAsync(FileAttachment attachment, string text, bool isTTS = false, Embed embed = null, RequestOptions options = null, AllowedMentions allowedMentions = null, MessageReference messageReference = null, MessageComponent components = null, ISticker[] stickers = null, Embed[] embeds = null, MessageFlags flags = MessageFlags.None) | |||||
{ | |||||
if (!IsTextInVoice) | |||||
throw new NotSupportedException("This function is only supported in Text-In-Voice channels"); | |||||
return base.SendFileAsync(attachment, text, isTTS, embed, options, allowedMentions, messageReference, components, stickers, embeds, flags); | |||||
} | |||||
/// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception> | |||||
public override Task<RestUserMessage> SendFileAsync(Stream stream, string filename, string text, bool isTTS = false, Embed embed = null, RequestOptions options = null, bool isSpoiler = false, AllowedMentions allowedMentions = null, MessageReference messageReference = null, MessageComponent components = null, ISticker[] stickers = null, Embed[] embeds = null, MessageFlags flags = MessageFlags.None) | |||||
{ | |||||
if (!IsTextInVoice) | |||||
throw new NotSupportedException("This function is only supported in Text-In-Voice channels"); | |||||
return base.SendFileAsync(stream, filename, text, isTTS, embed, options, isSpoiler, allowedMentions, messageReference, components, stickers, embeds, flags); | |||||
} | |||||
/// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception> | |||||
public override Task<RestUserMessage> SendFileAsync(string filePath, string text, bool isTTS = false, Embed embed = null, RequestOptions options = null, bool isSpoiler = false, AllowedMentions allowedMentions = null, MessageReference messageReference = null, MessageComponent components = null, ISticker[] stickers = null, Embed[] embeds = null, MessageFlags flags = MessageFlags.None) | |||||
{ | |||||
if (!IsTextInVoice) | |||||
throw new NotSupportedException("This function is only supported in Text-In-Voice channels"); | |||||
return base.SendFileAsync(filePath, text, isTTS, embed, options, isSpoiler, allowedMentions, messageReference, components, stickers, embeds, flags); | |||||
} | |||||
/// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception> | |||||
public override Task<RestUserMessage> SendFilesAsync(IEnumerable<FileAttachment> attachments, string text, bool isTTS = false, Embed embed = null, RequestOptions options = null, AllowedMentions allowedMentions = null, MessageReference messageReference = null, MessageComponent components = null, ISticker[] stickers = null, Embed[] embeds = null, MessageFlags flags = MessageFlags.None) | |||||
{ | |||||
if (!IsTextInVoice) | |||||
throw new NotSupportedException("This function is only supported in Text-In-Voice channels"); | |||||
return base.SendFilesAsync(attachments, text, isTTS, embed, options, allowedMentions, messageReference, components, stickers, embeds, flags); | |||||
} | |||||
/// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception> | |||||
public override Task<RestUserMessage> SendMessageAsync(string text = null, bool isTTS = false, Embed embed = null, RequestOptions options = null, AllowedMentions allowedMentions = null, MessageReference messageReference = null, MessageComponent components = null, ISticker[] stickers = null, Embed[] embeds = null, MessageFlags flags = MessageFlags.None) | |||||
{ | |||||
if (!IsTextInVoice) | |||||
throw new NotSupportedException("This function is only supported in Text-In-Voice channels"); | |||||
return base.SendMessageAsync(text, isTTS, embed, options, allowedMentions, messageReference, components, stickers, embeds, flags); | |||||
} | |||||
/// <inheritdoc/> <exception cref="NotSupportedException">This function is only supported in Text-In-Voice channels.</exception> | |||||
public override Task TriggerTypingAsync(RequestOptions options = null) | |||||
{ | |||||
if (!IsTextInVoice) | |||||
throw new NotSupportedException("This function is only supported in Text-In-Voice channels"); | |||||
return base.TriggerTypingAsync(options); | |||||
} | |||||
#endregion | |||||
private string DebuggerDisplay => $"{Name} ({Id}, Voice)"; | private string DebuggerDisplay => $"{Name} ({Id}, Voice)"; | ||||
internal new SocketVoiceChannel Clone() => MemberwiseClone() as SocketVoiceChannel; | internal new SocketVoiceChannel Clone() => MemberwiseClone() as SocketVoiceChannel; | ||||
#endregion | |||||
#region IGuildChannel | #region IGuildChannel | ||||
/// <inheritdoc /> | /// <inheritdoc /> | ||||
@@ -1,5 +1,6 @@ | |||||
using System; | using System; | ||||
using System.Collections.Generic; | using System.Collections.Generic; | ||||
using System.IO; | |||||
using System.Text; | using System.Text; | ||||
using System.Threading.Tasks; | using System.Threading.Tasks; | ||||
using Discord.Audio; | using Discord.Audio; | ||||
@@ -12,8 +13,6 @@ namespace Discord | |||||
public int? UserLimit => throw new NotImplementedException(); | public int? UserLimit => throw new NotImplementedException(); | ||||
public string Mention => throw new NotImplementedException(); | |||||
public ulong? CategoryId => throw new NotImplementedException(); | public ulong? CategoryId => throw new NotImplementedException(); | ||||
public int Position => throw new NotImplementedException(); | public int Position => throw new NotImplementedException(); | ||||
@@ -24,116 +23,53 @@ namespace Discord | |||||
public IReadOnlyCollection<Overwrite> PermissionOverwrites => throw new NotImplementedException(); | public IReadOnlyCollection<Overwrite> PermissionOverwrites => throw new NotImplementedException(); | ||||
public string RTCRegion => throw new NotImplementedException(); | |||||
public string Name => throw new NotImplementedException(); | public string Name => throw new NotImplementedException(); | ||||
public DateTimeOffset CreatedAt => throw new NotImplementedException(); | public DateTimeOffset CreatedAt => throw new NotImplementedException(); | ||||
public ulong Id => throw new NotImplementedException(); | |||||
public string RTCRegion => throw new NotImplementedException(); | |||||
public Task AddPermissionOverwriteAsync(IRole role, OverwritePermissions permissions, RequestOptions options = null) | |||||
{ | |||||
throw new NotImplementedException(); | |||||
} | |||||
public Task AddPermissionOverwriteAsync(IUser user, OverwritePermissions permissions, RequestOptions options = null) | |||||
{ | |||||
throw new NotImplementedException(); | |||||
} | |||||
public ulong Id => throw new NotImplementedException(); | |||||
public Task<IAudioClient> ConnectAsync(bool selfDeaf = false, bool selfMute = false, bool external = false) | |||||
{ | |||||
throw new NotImplementedException(); | |||||
} | |||||
public string Mention => throw new NotImplementedException(); | |||||
public Task<IInviteMetadata> CreateInviteAsync(int? maxAge = 86400, int? maxUses = null, bool isTemporary = false, bool isUnique = false, RequestOptions options = null) | |||||
{ | |||||
throw new NotImplementedException(); | |||||
} | |||||
public Task<IInviteMetadata> CreateInviteToApplicationAsync(ulong applicationId, int? maxAge, int? maxUses = default(int?), bool isTemporary = false, bool isUnique = false, RequestOptions options = null) | |||||
=> throw new NotImplementedException(); | |||||
public Task AddPermissionOverwriteAsync(IRole role, OverwritePermissions permissions, RequestOptions options = null) => throw new NotImplementedException(); | |||||
public Task AddPermissionOverwriteAsync(IUser user, OverwritePermissions permissions, RequestOptions options = null) => throw new NotImplementedException(); | |||||
public Task<IAudioClient> ConnectAsync(bool selfDeaf = false, bool selfMute = false, bool external = false) => throw new NotImplementedException(); | |||||
public Task<IInviteMetadata> CreateInviteAsync(int? maxAge = 86400, int? maxUses = null, bool isTemporary = false, bool isUnique = false, RequestOptions options = null) => throw new NotImplementedException(); | |||||
public Task<IInviteMetadata> CreateInviteToApplicationAsync(ulong applicationId, int? maxAge = 86400, int? maxUses = null, bool isTemporary = false, bool isUnique = false, RequestOptions options = null) => throw new NotImplementedException(); | |||||
public Task<IInviteMetadata> CreateInviteToApplicationAsync(DefaultApplications application, int? maxAge = 86400, int? maxUses = null, bool isTemporary = false, bool isUnique = false, RequestOptions options = null) => throw new NotImplementedException(); | public Task<IInviteMetadata> CreateInviteToApplicationAsync(DefaultApplications application, int? maxAge = 86400, int? maxUses = null, bool isTemporary = false, bool isUnique = false, RequestOptions options = null) => throw new NotImplementedException(); | ||||
public Task<IInviteMetadata> CreateInviteToStreamAsync(IUser user, int? maxAge, int? maxUses = default(int?), bool isTemporary = false, bool isUnique = false, RequestOptions options = null) | |||||
=> throw new NotImplementedException(); | |||||
public Task DeleteAsync(RequestOptions options = null) | |||||
{ | |||||
throw new NotImplementedException(); | |||||
} | |||||
public Task DisconnectAsync() | |||||
{ | |||||
throw new NotImplementedException(); | |||||
} | |||||
public Task ModifyAsync(Action<AudioChannelProperties> func, RequestOptions options) | |||||
{ | |||||
throw new NotImplementedException(); | |||||
} | |||||
public Task<ICategoryChannel> GetCategoryAsync(CacheMode mode = CacheMode.AllowDownload, RequestOptions options = null) | |||||
{ | |||||
throw new NotImplementedException(); | |||||
} | |||||
public Task<IReadOnlyCollection<IInviteMetadata>> GetInvitesAsync(RequestOptions options = null) | |||||
{ | |||||
throw new NotImplementedException(); | |||||
} | |||||
public OverwritePermissions? GetPermissionOverwrite(IRole role) | |||||
{ | |||||
throw new NotImplementedException(); | |||||
} | |||||
public OverwritePermissions? GetPermissionOverwrite(IUser user) | |||||
{ | |||||
throw new NotImplementedException(); | |||||
} | |||||
public Task<IGuildUser> GetUserAsync(ulong id, CacheMode mode = CacheMode.AllowDownload, RequestOptions options = null) | |||||
{ | |||||
throw new NotImplementedException(); | |||||
} | |||||
public IAsyncEnumerable<IReadOnlyCollection<IGuildUser>> GetUsersAsync(CacheMode mode = CacheMode.AllowDownload, RequestOptions options = null) | |||||
{ | |||||
throw new NotImplementedException(); | |||||
} | |||||
public Task ModifyAsync(Action<VoiceChannelProperties> func, RequestOptions options = null) | |||||
{ | |||||
throw new NotImplementedException(); | |||||
} | |||||
public Task ModifyAsync(Action<GuildChannelProperties> func, RequestOptions options = null) | |||||
{ | |||||
throw new NotImplementedException(); | |||||
} | |||||
public Task RemovePermissionOverwriteAsync(IRole role, RequestOptions options = null) | |||||
{ | |||||
throw new NotImplementedException(); | |||||
} | |||||
public Task RemovePermissionOverwriteAsync(IUser user, RequestOptions options = null) | |||||
{ | |||||
throw new NotImplementedException(); | |||||
} | |||||
public Task SyncPermissionsAsync(RequestOptions options = null) | |||||
{ | |||||
throw new NotImplementedException(); | |||||
} | |||||
Task<IUser> IChannel.GetUserAsync(ulong id, CacheMode mode, RequestOptions options) | |||||
{ | |||||
throw new NotImplementedException(); | |||||
} | |||||
IAsyncEnumerable<IReadOnlyCollection<IUser>> IChannel.GetUsersAsync(CacheMode mode, RequestOptions options) | |||||
{ | |||||
throw new NotImplementedException(); | |||||
} | |||||
public Task<IInviteMetadata> CreateInviteToStreamAsync(IUser user, int? maxAge = 86400, int? maxUses = null, bool isTemporary = false, bool isUnique = false, RequestOptions options = null) => throw new NotImplementedException(); | |||||
public Task DeleteAsync(RequestOptions options = null) => throw new NotImplementedException(); | |||||
public Task DeleteMessageAsync(ulong messageId, RequestOptions options = null) => throw new NotImplementedException(); | |||||
public Task DeleteMessageAsync(IMessage message, RequestOptions options = null) => throw new NotImplementedException(); | |||||
public Task DisconnectAsync() => throw new NotImplementedException(); | |||||
public IDisposable EnterTypingState(RequestOptions options = null) => throw new NotImplementedException(); | |||||
public Task<ICategoryChannel> GetCategoryAsync(CacheMode mode = CacheMode.AllowDownload, RequestOptions options = null) => throw new NotImplementedException(); | |||||
public Task<IReadOnlyCollection<IInviteMetadata>> GetInvitesAsync(RequestOptions options = null) => throw new NotImplementedException(); | |||||
public Task<IMessage> GetMessageAsync(ulong id, CacheMode mode = CacheMode.AllowDownload, RequestOptions options = null) => throw new NotImplementedException(); | |||||
public IAsyncEnumerable<IReadOnlyCollection<IMessage>> GetMessagesAsync(int limit = 100, CacheMode mode = CacheMode.AllowDownload, RequestOptions options = null) => throw new NotImplementedException(); | |||||
public IAsyncEnumerable<IReadOnlyCollection<IMessage>> GetMessagesAsync(ulong fromMessageId, Direction dir, int limit = 100, CacheMode mode = CacheMode.AllowDownload, RequestOptions options = null) => throw new NotImplementedException(); | |||||
public IAsyncEnumerable<IReadOnlyCollection<IMessage>> GetMessagesAsync(IMessage fromMessage, Direction dir, int limit = 100, CacheMode mode = CacheMode.AllowDownload, RequestOptions options = null) => throw new NotImplementedException(); | |||||
public OverwritePermissions? GetPermissionOverwrite(IRole role) => throw new NotImplementedException(); | |||||
public OverwritePermissions? GetPermissionOverwrite(IUser user) => throw new NotImplementedException(); | |||||
public Task<IReadOnlyCollection<IMessage>> GetPinnedMessagesAsync(RequestOptions options = null) => throw new NotImplementedException(); | |||||
public Task<IGuildUser> GetUserAsync(ulong id, CacheMode mode = CacheMode.AllowDownload, RequestOptions options = null) => throw new NotImplementedException(); | |||||
public IAsyncEnumerable<IReadOnlyCollection<IGuildUser>> GetUsersAsync(CacheMode mode = CacheMode.AllowDownload, RequestOptions options = null) => throw new NotImplementedException(); | |||||
public Task ModifyAsync(Action<VoiceChannelProperties> func, RequestOptions options = null) => throw new NotImplementedException(); | |||||
public Task ModifyAsync(Action<GuildChannelProperties> func, RequestOptions options = null) => throw new NotImplementedException(); | |||||
public Task ModifyAsync(Action<AudioChannelProperties> func, RequestOptions options = null) => throw new NotImplementedException(); | |||||
public Task<IUserMessage> ModifyMessageAsync(ulong messageId, Action<MessageProperties> func, RequestOptions options = null) => throw new NotImplementedException(); | |||||
public Task RemovePermissionOverwriteAsync(IRole role, RequestOptions options = null) => throw new NotImplementedException(); | |||||
public Task RemovePermissionOverwriteAsync(IUser user, RequestOptions options = null) => throw new NotImplementedException(); | |||||
public Task<IUserMessage> SendFileAsync(string filePath, string text = null, bool isTTS = false, Embed embed = null, RequestOptions options = null, bool isSpoiler = false, AllowedMentions allowedMentions = null, MessageReference messageReference = null, MessageComponent components = null, ISticker[] stickers = null, Embed[] embeds = null, MessageFlags flags = MessageFlags.None) => throw new NotImplementedException(); | |||||
public Task<IUserMessage> SendFileAsync(Stream stream, string filename, string text = null, bool isTTS = false, Embed embed = null, RequestOptions options = null, bool isSpoiler = false, AllowedMentions allowedMentions = null, MessageReference messageReference = null, MessageComponent components = null, ISticker[] stickers = null, Embed[] embeds = null, MessageFlags flags = MessageFlags.None) => throw new NotImplementedException(); | |||||
public Task<IUserMessage> SendFileAsync(FileAttachment attachment, string text = null, bool isTTS = false, Embed embed = null, RequestOptions options = null, AllowedMentions allowedMentions = null, MessageReference messageReference = null, MessageComponent components = null, ISticker[] stickers = null, Embed[] embeds = null, MessageFlags flags = MessageFlags.None) => throw new NotImplementedException(); | |||||
public Task<IUserMessage> SendFilesAsync(IEnumerable<FileAttachment> attachments, string text = null, bool isTTS = false, Embed embed = null, RequestOptions options = null, AllowedMentions allowedMentions = null, MessageReference messageReference = null, MessageComponent components = null, ISticker[] stickers = null, Embed[] embeds = null, MessageFlags flags = MessageFlags.None) => throw new NotImplementedException(); | |||||
public Task<IUserMessage> SendMessageAsync(string text = null, bool isTTS = false, Embed embed = null, RequestOptions options = null, AllowedMentions allowedMentions = null, MessageReference messageReference = null, MessageComponent components = null, ISticker[] stickers = null, Embed[] embeds = null, MessageFlags flags = MessageFlags.None) => throw new NotImplementedException(); | |||||
public Task SyncPermissionsAsync(RequestOptions options = null) => throw new NotImplementedException(); | |||||
public Task TriggerTypingAsync(RequestOptions options = null) => throw new NotImplementedException(); | |||||
Task<IUser> IChannel.GetUserAsync(ulong id, CacheMode mode, RequestOptions options) => throw new NotImplementedException(); | |||||
IAsyncEnumerable<IReadOnlyCollection<IUser>> IChannel.GetUsersAsync(CacheMode mode, RequestOptions options) => throw new NotImplementedException(); | |||||
} | } | ||||
} | } |