From c020e9353f8d9081751de6607ce5eb7eb1822e1c Mon Sep 17 00:00:00 2001 From: Sheldan <5037282+Sheldan@users.noreply.github.com> Date: Thu, 6 Oct 2022 00:37:21 +0200 Subject: [PATCH] [AB-71] fixing spoiled attachments not being considered when embedding, we now spoil the link text instead --- .../resources/en_US/listener/message_embed_embed_en_US.ftl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abstracto-modules/link-embed/src/main/resources/en_US/listener/message_embed_embed_en_US.ftl b/abstracto-modules/link-embed/src/main/resources/en_US/listener/message_embed_embed_en_US.ftl index 2565d4bf..4097033a 100644 --- a/abstracto-modules/link-embed/src/main/resources/en_US/listener/message_embed_embed_en_US.ftl +++ b/abstracto-modules/link-embed/src/main/resources/en_US/listener/message_embed_embed_en_US.ftl @@ -18,7 +18,7 @@ ", - <#if embeddedMessage.attachments?size gt 0> + <#if embeddedMessage.attachments?size gt 0 && !embeddedMessage.attachments[0].spoiler> "imageUrl": "${embeddedMessage.attachments[0].proxyUrl}", <#elseif embeddedMessage.attachments?size = 0 && embeddedMessage.embeds?size gt 0 && embeddedMessage.embeds[0].cachedThumbnail??> "imageUrl": "${embeddedMessage.embeds[0].cachedThumbnail.proxyUrl}", @@ -58,6 +58,9 @@ } ] + <#if embeddedMessage.attachments?size gt 0 && embeddedMessage.attachments[0].spoiler> + ,"additionalMessage": "||${embeddedMessage.attachments[0].proxyUrl?json_string}||" + <#if referencedMessageId?has_content && mentionsReferencedMessage?has_content> ,"referencedMessageId": "${referencedMessageId?c}", "messageConfig": {