From 0f94c231e78470241349a102de75465b86335ff2 Mon Sep 17 00:00:00 2001
From: Sheldan <5037282+Sheldan@users.noreply.github.com>
Date: Sun, 4 Apr 2021 23:52:18 +0200
Subject: [PATCH] [AB-221] adding handling of deleted users or not available
 users to link embeds and starboard posts

---
 .../en_US/builtins/deleted_user_author_en_US.ftl          | 1 +
 .../en_US/listener/message_embed_embed_en_US.ftl          | 8 ++++++--
 .../en_US/listener/starboard_post_embed_en_US.ftl         | 8 ++++++--
 .../resources/en_US/general/delete_user_name_en_US.ftl    | 1 +
 4 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 abstracto-modules/core/src/main/resources/en_US/builtins/deleted_user_author_en_US.ftl
 create mode 100644 translations/core/src/main/resources/en_US/general/delete_user_name_en_US.ftl

diff --git a/abstracto-modules/core/src/main/resources/en_US/builtins/deleted_user_author_en_US.ftl b/abstracto-modules/core/src/main/resources/en_US/builtins/deleted_user_author_en_US.ftl
new file mode 100644
index 00000000..947f96c3
--- /dev/null
+++ b/abstracto-modules/core/src/main/resources/en_US/builtins/deleted_user_author_en_US.ftl
@@ -0,0 +1 @@
+"author": { "name": "<@safe_include "delete_user_name"/>", "avatar": "https://discord.com/assets/6debd47ed13483642cf09e832ed0bc1b.png" }
\ No newline at end of file
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 1a893e05..7490f582 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
@@ -1,6 +1,10 @@
 {
-  <#include "user_author">
-  <@user_author user=author/>,
+  <#if author??>
+    <#include "user_author">
+    <@user_author user=author/>
+  <#else>
+    <@safe_include "deleted_user_author"/>
+  </#if>,
   <#include "abstracto_color">,
   <#if embeddedMessage.content?has_content || embeddedMessage.embeds?size gt 0>
    "description": "${embeddedMessage.content?json_string}
diff --git a/abstracto-modules/starboard/src/main/resources/en_US/listener/starboard_post_embed_en_US.ftl b/abstracto-modules/starboard/src/main/resources/en_US/listener/starboard_post_embed_en_US.ftl
index 2e47b0b3..ab88e5bf 100644
--- a/abstracto-modules/starboard/src/main/resources/en_US/listener/starboard_post_embed_en_US.ftl
+++ b/abstracto-modules/starboard/src/main/resources/en_US/listener/starboard_post_embed_en_US.ftl
@@ -1,6 +1,10 @@
 {
-  <#include "user_author">
-  <@user_author user=author/>,
+  <#if author??>
+    <#include "user_author">
+    <@user_author user=author/>
+  <#else>
+    <@safe_include "deleted_user_author"/>
+  </#if>,
   <#include "abstracto_color">,
   <#if message.content?has_content || message.embeds?size gt 0>
    "description": "${message.content?json_string}
diff --git a/translations/core/src/main/resources/en_US/general/delete_user_name_en_US.ftl b/translations/core/src/main/resources/en_US/general/delete_user_name_en_US.ftl
new file mode 100644
index 00000000..ecf88b9e
--- /dev/null
+++ b/translations/core/src/main/resources/en_US/general/delete_user_name_en_US.ftl
@@ -0,0 +1 @@
+Deleted user
\ No newline at end of file