f3b20b2b6d
Resolves #1216. * Add support for spoiler formatting * Implement support for sending message attachments that are spoilers * use consistent naming * update docstring for new isSpoiler param * move extension method to be under core project, make spoiler prefix a const * typo fix * update missing xmldocs * move SpoilerPrefix const outside of interface * Add isSpoiler support to webhook client adds the isSpoiler field to uploading files with a webhook, which will only insert "SPOILER_" to the start of the filename. This does not include other fields in the payload, as this is not in the documentation, and was not observed like in the regular client
81 lines
3.9 KiB
C#
81 lines
3.9 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using System.IO;
|
|
using System.Linq;
|
|
using System.Threading.Tasks;
|
|
using Discord.API.Rest;
|
|
using Discord.Rest;
|
|
using ImageModel = Discord.API.Image;
|
|
using WebhookModel = Discord.API.Webhook;
|
|
|
|
namespace Discord.Webhook
|
|
{
|
|
internal static class WebhookClientHelper
|
|
{
|
|
/// <exception cref="InvalidOperationException">Could not find a webhook with the supplied credentials.</exception>
|
|
public static async Task<RestInternalWebhook> GetWebhookAsync(DiscordWebhookClient client, ulong webhookId)
|
|
{
|
|
var model = await client.ApiClient.GetWebhookAsync(webhookId).ConfigureAwait(false);
|
|
if (model == null)
|
|
throw new InvalidOperationException("Could not find a webhook with the supplied credentials.");
|
|
return RestInternalWebhook.Create(client, model);
|
|
}
|
|
public static async Task<ulong> SendMessageAsync(DiscordWebhookClient client,
|
|
string text, bool isTTS, IEnumerable<Embed> embeds, string username, string avatarUrl, RequestOptions options)
|
|
{
|
|
var args = new CreateWebhookMessageParams(text) { IsTTS = isTTS };
|
|
if (embeds != null)
|
|
args.Embeds = embeds.Select(x => x.ToModel()).ToArray();
|
|
if (username != null)
|
|
args.Username = username;
|
|
if (avatarUrl != null)
|
|
args.AvatarUrl = avatarUrl;
|
|
|
|
var model = await client.ApiClient.CreateWebhookMessageAsync(client.Webhook.Id, args, options: options).ConfigureAwait(false);
|
|
return model.Id;
|
|
}
|
|
public static async Task<ulong> SendFileAsync(DiscordWebhookClient client, string filePath, string text, bool isTTS,
|
|
IEnumerable<Embed> embeds, string username, string avatarUrl, RequestOptions options, bool isSpoiler)
|
|
{
|
|
string filename = Path.GetFileName(filePath);
|
|
using (var file = File.OpenRead(filePath))
|
|
return await SendFileAsync(client, file, filename, text, isTTS, embeds, username, avatarUrl, options, isSpoiler).ConfigureAwait(false);
|
|
}
|
|
public static async Task<ulong> SendFileAsync(DiscordWebhookClient client, Stream stream, string filename, string text, bool isTTS,
|
|
IEnumerable<Embed> embeds, string username, string avatarUrl, RequestOptions options, bool isSpoiler)
|
|
{
|
|
var args = new UploadWebhookFileParams(stream) { Filename = filename, Content = text, IsTTS = isTTS, IsSpoiler = isSpoiler };
|
|
if (username != null)
|
|
args.Username = username;
|
|
if (avatarUrl != null)
|
|
args.AvatarUrl = avatarUrl;
|
|
if (embeds != null)
|
|
args.Embeds = embeds.Select(x => x.ToModel()).ToArray();
|
|
var msg = await client.ApiClient.UploadWebhookFileAsync(client.Webhook.Id, args, options).ConfigureAwait(false);
|
|
return msg.Id;
|
|
}
|
|
|
|
public static async Task<WebhookModel> ModifyAsync(DiscordWebhookClient client,
|
|
Action<WebhookProperties> func, RequestOptions options)
|
|
{
|
|
var args = new WebhookProperties();
|
|
func(args);
|
|
var apiArgs = new ModifyWebhookParams
|
|
{
|
|
Avatar = args.Image.IsSpecified ? args.Image.Value?.ToModel() : Optional.Create<ImageModel?>(),
|
|
Name = args.Name
|
|
};
|
|
|
|
if (!apiArgs.Avatar.IsSpecified && client.Webhook.AvatarId != null)
|
|
apiArgs.Avatar = new ImageModel(client.Webhook.AvatarId);
|
|
|
|
return await client.ApiClient.ModifyWebhookAsync(client.Webhook.Id, apiArgs, options).ConfigureAwait(false);
|
|
}
|
|
|
|
public static async Task DeleteAsync(DiscordWebhookClient client, RequestOptions options)
|
|
{
|
|
await client.ApiClient.DeleteWebhookAsync(client.Webhook.Id, options).ConfigureAwait(false);
|
|
}
|
|
}
|
|
}
|