@@ -87,8 +87,9 @@ namespace Discord.Webhook | |||||
/// <summary> Sends a message to the channel for this webhook. </summary> | /// <summary> Sends a message to the channel for this webhook. </summary> | ||||
/// <returns> Returns the ID of the created message. </returns> | /// <returns> Returns the ID of the created message. </returns> | ||||
public Task<ulong> SendMessageAsync(string text = null, bool isTTS = false, IEnumerable<Embed> embeds = null, | public Task<ulong> SendMessageAsync(string text = null, bool isTTS = false, IEnumerable<Embed> embeds = null, | ||||
string username = null, string avatarUrl = null, RequestOptions options = null, AllowedMentions allowedMentions = null, MessageComponent components = null) | |||||
=> WebhookClientHelper.SendMessageAsync(this, text, isTTS, embeds, username, avatarUrl, allowedMentions, options, components); | |||||
string username = null, string avatarUrl = null, RequestOptions options = null, AllowedMentions allowedMentions = null, | |||||
MessageComponent components = null, MessageFlags flags = MessageFlags.None) | |||||
=> WebhookClientHelper.SendMessageAsync(this, text, isTTS, embeds, username, avatarUrl, allowedMentions, options, components, flags); | |||||
/// <summary> | /// <summary> | ||||
/// Modifies a message posted using this webhook. | /// Modifies a message posted using this webhook. | ||||
@@ -124,33 +125,35 @@ namespace Discord.Webhook | |||||
public Task<ulong> SendFileAsync(string filePath, string text, bool isTTS = false, | public Task<ulong> SendFileAsync(string filePath, string text, bool isTTS = false, | ||||
IEnumerable<Embed> embeds = null, string username = null, string avatarUrl = null, | IEnumerable<Embed> embeds = null, string username = null, string avatarUrl = null, | ||||
RequestOptions options = null, bool isSpoiler = false, AllowedMentions allowedMentions = null, | RequestOptions options = null, bool isSpoiler = false, AllowedMentions allowedMentions = null, | ||||
MessageComponent components = null) | |||||
MessageComponent components = null, MessageFlags flags = MessageFlags.None) | |||||
=> WebhookClientHelper.SendFileAsync(this, filePath, text, isTTS, embeds, username, avatarUrl, | => WebhookClientHelper.SendFileAsync(this, filePath, text, isTTS, embeds, username, avatarUrl, | ||||
allowedMentions, options, isSpoiler, components); | |||||
allowedMentions, options, isSpoiler, components, flags); | |||||
/// <summary> Sends a message to the channel for this webhook with an attachment. </summary> | /// <summary> Sends a message to the channel for this webhook with an attachment. </summary> | ||||
/// <returns> Returns the ID of the created message. </returns> | /// <returns> Returns the ID of the created message. </returns> | ||||
public Task<ulong> SendFileAsync(Stream stream, string filename, string text, bool isTTS = false, | public Task<ulong> SendFileAsync(Stream stream, string filename, string text, bool isTTS = false, | ||||
IEnumerable<Embed> embeds = null, string username = null, string avatarUrl = null, | IEnumerable<Embed> embeds = null, string username = null, string avatarUrl = null, | ||||
RequestOptions options = null, bool isSpoiler = false, AllowedMentions allowedMentions = null, | RequestOptions options = null, bool isSpoiler = false, AllowedMentions allowedMentions = null, | ||||
MessageComponent components = null) | |||||
MessageComponent components = null, MessageFlags flags = MessageFlags.None) | |||||
=> WebhookClientHelper.SendFileAsync(this, stream, filename, text, isTTS, embeds, username, | => WebhookClientHelper.SendFileAsync(this, stream, filename, text, isTTS, embeds, username, | ||||
avatarUrl, allowedMentions, options, isSpoiler, components); | |||||
avatarUrl, allowedMentions, options, isSpoiler, components, flags); | |||||
/// <summary> Sends a message to the channel for this webhook with an attachment. </summary> | /// <summary> Sends a message to the channel for this webhook with an attachment. </summary> | ||||
/// <returns> Returns the ID of the created message. </returns> | /// <returns> Returns the ID of the created message. </returns> | ||||
public Task<ulong> SendFileAsync(FileAttachment attachment, string text, bool isTTS = false, | public Task<ulong> SendFileAsync(FileAttachment attachment, string text, bool isTTS = false, | ||||
IEnumerable<Embed> embeds = null, string username = null, string avatarUrl = null, | IEnumerable<Embed> embeds = null, string username = null, string avatarUrl = null, | ||||
RequestOptions options = null, AllowedMentions allowedMentions = null, MessageComponent components = null) | |||||
RequestOptions options = null, AllowedMentions allowedMentions = null, MessageComponent components = null, | |||||
MessageFlags flags = MessageFlags.None) | |||||
=> WebhookClientHelper.SendFileAsync(this, attachment, text, isTTS, embeds, username, | => WebhookClientHelper.SendFileAsync(this, attachment, text, isTTS, embeds, username, | ||||
avatarUrl, allowedMentions, components, options); | |||||
avatarUrl, allowedMentions, components, options, flags); | |||||
/// <summary> Sends a message to the channel for this webhook with an attachment. </summary> | /// <summary> Sends a message to the channel for this webhook with an attachment. </summary> | ||||
/// <returns> Returns the ID of the created message. </returns> | /// <returns> Returns the ID of the created message. </returns> | ||||
public Task<ulong> SendFilesAsync(IEnumerable<FileAttachment> attachments, string text, bool isTTS = false, | public Task<ulong> SendFilesAsync(IEnumerable<FileAttachment> attachments, string text, bool isTTS = false, | ||||
IEnumerable<Embed> embeds = null, string username = null, string avatarUrl = null, | IEnumerable<Embed> embeds = null, string username = null, string avatarUrl = null, | ||||
RequestOptions options = null, AllowedMentions allowedMentions = null, MessageComponent components = null) | |||||
RequestOptions options = null, AllowedMentions allowedMentions = null, MessageComponent components = null, | |||||
MessageFlags flags = MessageFlags.None) | |||||
=> WebhookClientHelper.SendFilesAsync(this, attachments, text, isTTS, embeds, username, avatarUrl, | => WebhookClientHelper.SendFilesAsync(this, attachments, text, isTTS, embeds, username, avatarUrl, | ||||
allowedMentions, components, options); | |||||
allowedMentions, components, options, flags); | |||||
/// <summary> Modifies the properties of this webhook. </summary> | /// <summary> Modifies the properties of this webhook. </summary> | ||||
@@ -21,12 +21,14 @@ namespace Discord.Webhook | |||||
return RestInternalWebhook.Create(client, model); | return RestInternalWebhook.Create(client, model); | ||||
} | } | ||||
public static async Task<ulong> SendMessageAsync(DiscordWebhookClient client, | public static async Task<ulong> SendMessageAsync(DiscordWebhookClient client, | ||||
string text, bool isTTS, IEnumerable<Embed> embeds, string username, string avatarUrl, AllowedMentions allowedMentions, RequestOptions options, MessageComponent components) | |||||
string text, bool isTTS, IEnumerable<Embed> embeds, string username, string avatarUrl, | |||||
AllowedMentions allowedMentions, RequestOptions options, MessageComponent components, MessageFlags flags) | |||||
{ | { | ||||
var args = new CreateWebhookMessageParams | var args = new CreateWebhookMessageParams | ||||
{ | { | ||||
Content = text, | Content = text, | ||||
IsTTS = isTTS | |||||
IsTTS = isTTS, | |||||
Flags = flags | |||||
}; | }; | ||||
if (embeds != null) | if (embeds != null) | ||||
@@ -40,6 +42,9 @@ namespace Discord.Webhook | |||||
if (components != null) | if (components != null) | ||||
args.Components = components?.Components.Select(x => new API.ActionRowComponent(x)).ToArray(); | args.Components = components?.Components.Select(x => new API.ActionRowComponent(x)).ToArray(); | ||||
if (flags is not MessageFlags.None and not MessageFlags.SuppressEmbeds) | |||||
throw new ArgumentException("The only valid MessageFlags are SuppressEmbeds and none.", nameof(flags)); | |||||
var model = await client.ApiClient.CreateWebhookMessageAsync(client.Webhook.Id, args, options: options).ConfigureAwait(false); | var model = await client.ApiClient.CreateWebhookMessageAsync(client.Webhook.Id, args, options: options).ConfigureAwait(false); | ||||
return model.Id; | return model.Id; | ||||
} | } | ||||
@@ -97,22 +102,27 @@ namespace Discord.Webhook | |||||
await client.ApiClient.DeleteWebhookMessageAsync(client.Webhook.Id, messageId, options).ConfigureAwait(false); | await client.ApiClient.DeleteWebhookMessageAsync(client.Webhook.Id, messageId, options).ConfigureAwait(false); | ||||
} | } | ||||
public static async Task<ulong> SendFileAsync(DiscordWebhookClient client, string filePath, string text, bool isTTS, | public static async Task<ulong> SendFileAsync(DiscordWebhookClient client, string filePath, string text, bool isTTS, | ||||
IEnumerable<Embed> embeds, string username, string avatarUrl, AllowedMentions allowedMentions, RequestOptions options, bool isSpoiler, MessageComponent components) | |||||
IEnumerable<Embed> embeds, string username, string avatarUrl, AllowedMentions allowedMentions, RequestOptions options, | |||||
bool isSpoiler, MessageComponent components, MessageFlags flags = MessageFlags.None) | |||||
{ | { | ||||
string filename = Path.GetFileName(filePath); | string filename = Path.GetFileName(filePath); | ||||
using (var file = File.OpenRead(filePath)) | using (var file = File.OpenRead(filePath)) | ||||
return await SendFileAsync(client, file, filename, text, isTTS, embeds, username, avatarUrl, allowedMentions, options, isSpoiler, components).ConfigureAwait(false); | |||||
return await SendFileAsync(client, file, filename, text, isTTS, embeds, username, avatarUrl, allowedMentions, options, isSpoiler, components, flags).ConfigureAwait(false); | |||||
} | } | ||||
public static Task<ulong> SendFileAsync(DiscordWebhookClient client, Stream stream, string filename, string text, bool isTTS, | public static Task<ulong> SendFileAsync(DiscordWebhookClient client, Stream stream, string filename, string text, bool isTTS, | ||||
IEnumerable<Embed> embeds, string username, string avatarUrl, AllowedMentions allowedMentions, RequestOptions options, bool isSpoiler, | IEnumerable<Embed> embeds, string username, string avatarUrl, AllowedMentions allowedMentions, RequestOptions options, bool isSpoiler, | ||||
MessageComponent components) | |||||
=> SendFileAsync(client, new FileAttachment(stream, filename, isSpoiler: isSpoiler), text, isTTS, embeds, username, avatarUrl, allowedMentions, components, options); | |||||
MessageComponent components, MessageFlags flags) | |||||
=> SendFileAsync(client, new FileAttachment(stream, filename, isSpoiler: isSpoiler), text, isTTS, embeds, username, avatarUrl, allowedMentions, components, options, flags); | |||||
public static Task<ulong> SendFileAsync(DiscordWebhookClient client, FileAttachment attachment, string text, bool isTTS, IEnumerable<Embed> embeds, string username, string avatarUrl, AllowedMentions allowedMentions, MessageComponent components, RequestOptions options) | |||||
=> SendFilesAsync(client, new FileAttachment[] { attachment }, text, isTTS, embeds, username, avatarUrl, allowedMentions, components, options); | |||||
public static Task<ulong> SendFileAsync(DiscordWebhookClient client, FileAttachment attachment, string text, bool isTTS, | |||||
IEnumerable<Embed> embeds, string username, string avatarUrl, AllowedMentions allowedMentions, | |||||
MessageComponent components, RequestOptions options, MessageFlags flags) | |||||
=> SendFilesAsync(client, new FileAttachment[] { attachment }, text, isTTS, embeds, username, avatarUrl, allowedMentions, components, options, flags); | |||||
public static async Task<ulong> SendFilesAsync(DiscordWebhookClient client, | public static async Task<ulong> SendFilesAsync(DiscordWebhookClient client, | ||||
IEnumerable<FileAttachment> attachments, string text, bool isTTS, IEnumerable<Embed> embeds, string username, string avatarUrl, AllowedMentions allowedMentions, MessageComponent components, RequestOptions options) | |||||
IEnumerable<FileAttachment> attachments, string text, bool isTTS, IEnumerable<Embed> embeds, string username, | |||||
string avatarUrl, AllowedMentions allowedMentions, MessageComponent components, RequestOptions options, | |||||
MessageFlags flags) | |||||
{ | { | ||||
embeds ??= Array.Empty<Embed>(); | embeds ??= Array.Empty<Embed>(); | ||||
@@ -141,7 +151,19 @@ namespace Discord.Webhook | |||||
} | } | ||||
} | } | ||||
var args = new UploadWebhookFileParams(attachments.ToArray()) {AvatarUrl = avatarUrl, Username = username, Content = text, IsTTS = isTTS, Embeds = embeds.Any() ? embeds.Select(x => x.ToModel()).ToArray() : Optional<API.Embed[]>.Unspecified, AllowedMentions = allowedMentions?.ToModel() ?? Optional<API.AllowedMentions>.Unspecified, MessageComponents = components?.Components.Select(x => new API.ActionRowComponent(x)).ToArray() ?? Optional<API.ActionRowComponent[]>.Unspecified }; | |||||
if (flags is not MessageFlags.None and not MessageFlags.SuppressEmbeds) | |||||
throw new ArgumentException("The only valid MessageFlags are SuppressEmbeds and none.", nameof(flags)); | |||||
var args = new UploadWebhookFileParams(attachments.ToArray()) | |||||
{ | |||||
AvatarUrl = avatarUrl, | |||||
Username = username, Content = text, | |||||
IsTTS = isTTS, | |||||
Embeds = embeds.Any() ? embeds.Select(x => x.ToModel()).ToArray() : Optional<API.Embed[]>.Unspecified, | |||||
AllowedMentions = allowedMentions?.ToModel() ?? Optional<API.AllowedMentions>.Unspecified, | |||||
MessageComponents = components?.Components.Select(x => new API.ActionRowComponent(x)).ToArray() ?? Optional<API.ActionRowComponent[]>.Unspecified, | |||||
Flags = flags | |||||
}; | |||||
var msg = await client.ApiClient.UploadWebhookFileAsync(client.Webhook.Id, args, options).ConfigureAwait(false); | var msg = await client.ApiClient.UploadWebhookFileAsync(client.Webhook.Id, args, options).ConfigureAwait(false); | ||||
return msg.Id; | return msg.Id; | ||||
} | } | ||||