liz/PluralKit
liz/PluralKit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Attempt to fix webhook invocation errors

Browse Source
This commit is contained in:
Ske 2019-08-12 16:38:34 +02:00
parent 5f79aaf960
commit 8396e17a87
2 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
PluralKit.Bot/Services/WebhookCacheService.cs
View File

@ -1,6 +1,7 @@
using System; using System;
using System.Collections.Concurrent; using System.Collections.Concurrent;
using System.Linq; using System.Linq;
using System.Net.Http;
using System.Threading.Tasks; using System.Threading.Tasks;
using Discord; using Discord;
using Discord.Webhook; using Discord.Webhook;
@ -54,14 +55,27 @@ namespace PluralKit.Bot
return await GetWebhook(webhook.Channel); return await GetWebhook(webhook.Channel);
} }
private async Task<IWebhook> GetOrCreateWebhook(ITextChannel channel) => private async Task<IWebhook> GetOrCreateWebhook(ITextChannel channel)
await FindExistingWebhook(channel) ?? await DoCreateWebhook(channel); {
_logger.Debug("Webhook for channel {Channel} not found in cache, trying to fetch", channel.Id);
return await FindExistingWebhook(channel) ?? await DoCreateWebhook(channel);
}
private async Task<IWebhook> FindExistingWebhook(ITextChannel channel) private async Task<IWebhook> FindExistingWebhook(ITextChannel channel)
{ {
_logger.Debug("Finding webhook for channel {Channel}", channel.Id); _logger.Debug("Finding webhook for channel {Channel}", channel.Id);
try
{
return (await channel.GetWebhooksAsync()).FirstOrDefault(IsWebhookMine); return (await channel.GetWebhooksAsync()).FirstOrDefault(IsWebhookMine);
} }
catch (HttpRequestException e)
{
_logger.Warning(e, "Error occurred while fetching webhook list");
// This happens sometimes when Discord returns a malformed request for the webhook list
// Nothing we can do than just assume that none exist and return null.
return null;
}
}
private Task<IWebhook> DoCreateWebhook(ITextChannel channel) private Task<IWebhook> DoCreateWebhook(ITextChannel channel)
{ {

17
PluralKit.Bot/Services/WebhookExecutorService.cs
View File

@ -96,7 +96,22 @@ namespace PluralKit.Bot
// DiscordWebhookClient has a sync network call in its constructor (!!!) // DiscordWebhookClient has a sync network call in its constructor (!!!)
// and we want to punt that onto a task queue, so we do that. // and we want to punt that onto a task queue, so we do that.
return Task.Run(() => new DiscordWebhookClient(webhook)); return Task.Run(async () =>
{
try
{
return new DiscordWebhookClient(webhook);
}
catch (InvalidOperationException)
{
// TODO: does this leak stuff inside the DiscordWebhookClient created above?
// Webhook itself was found in cache, but has been deleted on the channel
// We request a new webhook instead
return new DiscordWebhookClient(await _webhookCache.InvalidateAndRefreshWebhook(webhook));
}
});
} }
private string FixClyde(string name) private string FixClyde(string name)