From e0cc74a7125b8b721d2efe9997fdd0749f47db95 Mon Sep 17 00:00:00 2001 From: Ske Date: Thu, 14 Jan 2021 03:21:56 +0100 Subject: [PATCH] Don't attempt to create a reply embed when message fetching fails --- PluralKit.Bot/Proxy/ProxyService.cs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/PluralKit.Bot/Proxy/ProxyService.cs b/PluralKit.Bot/Proxy/ProxyService.cs index 3ec2b7d7..2e1af75c 100644 --- a/PluralKit.Bot/Proxy/ProxyService.cs +++ b/PluralKit.Bot/Proxy/ProxyService.cs @@ -102,9 +102,14 @@ namespace PluralKit.Bot if (trigger.Reference?.Channel?.Id == trigger.ChannelId) { var repliedTo = await FetchReplyOriginalMessage(trigger.Reference); - var embed = await CreateReplyEmbed(repliedTo); - if (embed != null) - embeds.Add(embed); + if (repliedTo != null) + { + var embed = CreateReplyEmbed(repliedTo); + if (embed != null) + embeds.Add(embed); + } + + // TODO: have a clean error for when message can't be fetched instead of just being silent } // Send the webhook @@ -137,7 +142,7 @@ namespace PluralKit.Bot return null; } - private async Task CreateReplyEmbed(DiscordMessage original) + private DiscordEmbed CreateReplyEmbed(DiscordMessage original) { var content = new StringBuilder();