Add missing REST Webhook implemenation (#843)
* Add Webhook API models, REST implementation, and Socket bridges. * Remove token overrides from REST. Leaving that as a Webhook package only feature. * Add Webhook API models, REST implementation, and Socket bridges. * Remove token overrides from REST. Leaving that as a Webhook package only feature. * Webhook core implementation. * Webhook REST implementation. * Webhook client implementation. * Add channel bucket id.
This commit is contained in:
Alex Gravely
committed by
Christopher F
Christopher F
parent
a19ff188e9
commit
7b2ddd027c
@@ -1,32 +1,49 @@
|
||||
using Discord.API.Rest;
|
||||
using Discord.Rest;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Threading.Tasks;
|
||||
using System.Linq;
|
||||
using Discord.Logging;
|
||||
using Discord.Rest;
|
||||
|
||||
namespace Discord.Webhook
|
||||
{
|
||||
public partial class DiscordWebhookClient
|
||||
public class DiscordWebhookClient : IDisposable
|
||||
{
|
||||
public event Func<LogMessage, Task> Log { add { _logEvent.Add(value); } remove { _logEvent.Remove(value); } }
|
||||
internal readonly AsyncEvent<Func<LogMessage, Task>> _logEvent = new AsyncEvent<Func<LogMessage, Task>>();
|
||||
|
||||
private readonly ulong _webhookId;
|
||||
internal IWebhook Webhook;
|
||||
internal readonly Logger _restLogger;
|
||||
|
||||
internal API.DiscordRestApiClient ApiClient { get; }
|
||||
internal LogManager LogManager { get; }
|
||||
|
||||
/// <summary> Creates a new Webhook discord client. </summary>
|
||||
public DiscordWebhookClient(IWebhook webhook)
|
||||
: this(webhook.Id, webhook.Token, new DiscordRestConfig()) { }
|
||||
/// <summary> Creates a new Webhook discord client. </summary>
|
||||
public DiscordWebhookClient(ulong webhookId, string webhookToken)
|
||||
: this(webhookId, webhookToken, new DiscordRestConfig()) { }
|
||||
|
||||
/// <summary> Creates a new Webhook discord client. </summary>
|
||||
public DiscordWebhookClient(ulong webhookId, string webhookToken, DiscordRestConfig config)
|
||||
: this(config)
|
||||
{
|
||||
_webhookId = webhookId;
|
||||
ApiClient.LoginAsync(TokenType.Webhook, webhookToken).GetAwaiter().GetResult();
|
||||
Webhook = WebhookClientHelper.GetWebhookAsync(this, webhookId).GetAwaiter().GetResult();
|
||||
}
|
||||
/// <summary> Creates a new Webhook discord client. </summary>
|
||||
public DiscordWebhookClient(IWebhook webhook, DiscordRestConfig config)
|
||||
: this(config)
|
||||
{
|
||||
Webhook = webhook;
|
||||
_webhookId = Webhook.Id;
|
||||
}
|
||||
|
||||
private DiscordWebhookClient(DiscordRestConfig config)
|
||||
{
|
||||
ApiClient = CreateApiClient(config);
|
||||
LogManager = new LogManager(config.LogLevel);
|
||||
LogManager.Message += async msg => await _logEvent.InvokeAsync(msg).ConfigureAwait(false);
|
||||
@@ -41,42 +58,40 @@ namespace Discord.Webhook
|
||||
await _restLogger.WarningAsync($"Rate limit triggered: {id ?? "null"}").ConfigureAwait(false);
|
||||
};
|
||||
ApiClient.SentRequest += async (method, endpoint, millis) => await _restLogger.VerboseAsync($"{method} {endpoint}: {millis} ms").ConfigureAwait(false);
|
||||
ApiClient.LoginAsync(TokenType.Webhook, webhookToken).GetAwaiter().GetResult();
|
||||
}
|
||||
private static API.DiscordRestApiClient CreateApiClient(DiscordRestConfig config)
|
||||
=> new API.DiscordRestApiClient(config.RestClientProvider, DiscordRestConfig.UserAgent);
|
||||
|
||||
public async Task SendMessageAsync(string text, bool isTTS = false, Embed[] embeds = null,
|
||||
|
||||
/// <summary> Sends a message using to the channel for this webhook. Returns the ID of the created message. </summary>
|
||||
public Task<ulong> SendMessageAsync(string text, bool isTTS = false, IEnumerable<Embed> embeds = null,
|
||||
string username = null, string avatarUrl = null, RequestOptions options = null)
|
||||
{
|
||||
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;
|
||||
await ApiClient.CreateWebhookMessageAsync(_webhookId, args, options).ConfigureAwait(false);
|
||||
}
|
||||
=> WebhookClientHelper.SendMessageAsync(this, text, isTTS, embeds, username, avatarUrl, options);
|
||||
|
||||
#if FILESYSTEM
|
||||
public async Task SendFileAsync(string filePath, string text, bool isTTS = false,
|
||||
string username = null, string avatarUrl = null, RequestOptions options = null)
|
||||
{
|
||||
string filename = Path.GetFileName(filePath);
|
||||
using (var file = File.OpenRead(filePath))
|
||||
await SendFileAsync(file, filename, text, isTTS, username, avatarUrl, options).ConfigureAwait(false);
|
||||
}
|
||||
/// <summary> Send a message to the channel for this webhook with an attachment. Returns the ID of the created message. </summary>
|
||||
public Task<ulong> SendFileAsync(string filePath, string text, bool isTTS = false,
|
||||
IEnumerable<Embed> embeds = null, string username = null, string avatarUrl = null, RequestOptions options = null)
|
||||
=> WebhookClientHelper.SendFileAsync(this, filePath, text, isTTS, embeds, username, avatarUrl, options);
|
||||
#endif
|
||||
public async Task SendFileAsync(Stream stream, string filename, string text, bool isTTS = false,
|
||||
string username = null, string avatarUrl = null, RequestOptions options = null)
|
||||
/// <summary> Send a message to the channel for this webhook with an attachment. Returns the ID of the created message. </summary>
|
||||
public Task<ulong> SendFileAsync(Stream stream, string filename, string text, bool isTTS = false,
|
||||
IEnumerable<Embed> embeds = null, string username = null, string avatarUrl = null, RequestOptions options = null)
|
||||
=> WebhookClientHelper.SendFileAsync(this, stream, filename, text, isTTS, embeds, username, avatarUrl, options);
|
||||
|
||||
/// <summary> Modifies the properties of this webhook. </summary>
|
||||
public Task ModifyWebhookAsync(Action<WebhookProperties> func, RequestOptions options = null)
|
||||
=> Webhook.ModifyAsync(func, options);
|
||||
|
||||
/// <summary> Deletes this webhook from Discord and disposes the client. </summary>
|
||||
public async Task DeleteWebhookAsync(RequestOptions options = null)
|
||||
{
|
||||
var args = new UploadWebhookFileParams(stream) { Filename = filename, Content = text, IsTTS = isTTS };
|
||||
if (username != null)
|
||||
args.Username = username;
|
||||
if (avatarUrl != null)
|
||||
args.AvatarUrl = username;
|
||||
await ApiClient.UploadWebhookFileAsync(_webhookId, args, options).ConfigureAwait(false);
|
||||
await Webhook.DeleteAsync(options).ConfigureAwait(false);
|
||||
Dispose();
|
||||
}
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
ApiClient?.Dispose();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,66 @@
|
||||
using System;
|
||||
using System.Diagnostics;
|
||||
using System.Threading.Tasks;
|
||||
using Model = Discord.API.Webhook;
|
||||
|
||||
namespace Discord.Webhook
|
||||
{
|
||||
[DebuggerDisplay(@"{DebuggerDisplay,nq}")]
|
||||
internal class RestInternalWebhook : IWebhook
|
||||
{
|
||||
private DiscordWebhookClient _client;
|
||||
|
||||
public ulong Id { get; }
|
||||
public ulong ChannelId { get; }
|
||||
public string Token { get; }
|
||||
|
||||
public string Name { get; private set; }
|
||||
public string AvatarId { get; private set; }
|
||||
public ulong? GuildId { get; private set; }
|
||||
|
||||
public DateTimeOffset CreatedAt => SnowflakeUtils.FromSnowflake(Id);
|
||||
|
||||
internal RestInternalWebhook(DiscordWebhookClient apiClient, Model model)
|
||||
{
|
||||
_client = apiClient;
|
||||
Id = model.Id;
|
||||
ChannelId = model.Id;
|
||||
Token = model.Token;
|
||||
}
|
||||
internal static RestInternalWebhook Create(DiscordWebhookClient client, Model model)
|
||||
{
|
||||
var entity = new RestInternalWebhook(client, model);
|
||||
entity.Update(model);
|
||||
return entity;
|
||||
}
|
||||
|
||||
internal void Update(Model model)
|
||||
{
|
||||
if (model.Avatar.IsSpecified)
|
||||
AvatarId = model.Avatar.Value;
|
||||
if (model.GuildId.IsSpecified)
|
||||
GuildId = model.GuildId.Value;
|
||||
if (model.Name.IsSpecified)
|
||||
Name = model.Name.Value;
|
||||
}
|
||||
|
||||
public string GetAvatarUrl(ImageFormat format = ImageFormat.Auto, ushort size = 128)
|
||||
=> CDN.GetUserAvatarUrl(Id, AvatarId, size, format);
|
||||
|
||||
public async Task ModifyAsync(Action<WebhookProperties> func, RequestOptions options = null)
|
||||
{
|
||||
var model = await WebhookClientHelper.ModifyAsync(_client, func, options);
|
||||
Update(model);
|
||||
}
|
||||
|
||||
public Task DeleteAsync(RequestOptions options = null)
|
||||
=> WebhookClientHelper.DeleteAsync(_client, options);
|
||||
|
||||
public override string ToString() => $"Webhook: {Name}:{Id}";
|
||||
private string DebuggerDisplay => $"Webhook: {Name} ({Id})";
|
||||
|
||||
IUser IWebhook.Creator => null;
|
||||
ITextChannel IWebhook.Channel => null;
|
||||
IGuild IWebhook.Guild => null;
|
||||
}
|
||||
}
|
||||
81
src/Discord.Net.Webhook/WebhookClientHelper.cs
Normal file
81
src/Discord.Net.Webhook/WebhookClientHelper.cs
Normal file
@@ -0,0 +1,81 @@
|
||||
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
|
||||
{
|
||||
public static async Task<RestInternalWebhook> GetWebhookAsync(DiscordWebhookClient client, ulong webhookId)
|
||||
{
|
||||
var model = await client.ApiClient.GetWebhookAsync(webhookId);
|
||||
if (model == null)
|
||||
throw new InvalidOperationException("Could not find a webhook for 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;
|
||||
}
|
||||
#if FILESYSTEM
|
||||
public static async Task<ulong> SendFileAsync(DiscordWebhookClient client, string filePath, string text, bool isTTS,
|
||||
IEnumerable<Embed> embeds, string username, string avatarUrl, RequestOptions options)
|
||||
{
|
||||
string filename = Path.GetFileName(filePath);
|
||||
using (var file = File.OpenRead(filePath))
|
||||
return await SendFileAsync(client, file, filename, text, isTTS, embeds, username, avatarUrl, options).ConfigureAwait(false);
|
||||
}
|
||||
#endif
|
||||
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)
|
||||
{
|
||||
var args = new UploadWebhookFileParams(stream) { Filename = filename, Content = text, IsTTS = isTTS };
|
||||
if (username != null)
|
||||
args.Username = username;
|
||||
if (avatarUrl != null)
|
||||
args.AvatarUrl = username;
|
||||
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);
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user