From 34e255b87a81acd802446e55be6e101e9e9677e4 Mon Sep 17 00:00:00 2001
From: Sheldan <5037282+Sheldan@users.noreply.github.com>
Date: Thu, 6 Oct 2022 00:01:36 +0200
Subject: [PATCH] [AB-72] adding joined reminders to reminder list refactored
 reminders model

---
 .../commands/reminders/reminders_response_embed_en_US.ftl | 8 +++++---
 .../commands/reminders/reminder_joined_text_en_US.ftl     | 1 +
 .../en_US/commands/reminders/reminders_due_on_en_US.ftl   | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 translations/remind/src/main/resources/en_US/commands/reminders/reminder_joined_text_en_US.ftl

diff --git a/abstracto-modules/remind/src/main/resources/en_US/commands/reminders/reminders_response_embed_en_US.ftl b/abstracto-modules/remind/src/main/resources/en_US/commands/reminders/reminders_response_embed_en_US.ftl
index 952fe083..7f6b654d 100644
--- a/abstracto-modules/remind/src/main/resources/en_US/commands/reminders/reminders_response_embed_en_US.ftl
+++ b/abstracto-modules/remind/src/main/resources/en_US/commands/reminders/reminders_response_embed_en_US.ftl
@@ -14,10 +14,12 @@
             "fields": [
                 <#list reminders as reminderDisplay><#assign reminderDisplay=reminderDisplay/>
                 {
-                    <#assign id>${reminderDisplay.reminder.id}</#assign>
-                    <#assign reminderTargetDate><@format_instant_date_time instant=reminderDisplay.reminder.targetDate/></#assign>
-                    <#assign reminderText=reminderDisplay.reminder.text/>
+                    <#assign id>${reminderDisplay.id}</#assign>
+                    <#assign reminderTargetDate><@format_instant_date_time instant=reminderDisplay.targetDate/></#assign>
+                    <#assign reminderText=reminderDisplay.text/>
                     <#assign messageLink=reminderDisplay.message.jumpUrl/>
+                    <#assign joined=reminderDisplay.joined/>
+                    <#assign joinedText><#if joined><@safe_include "reminder_joined_text"/></#if></#assign>
                     "name": "<@safe_include "reminders_reminder_field_title"/>",
                     "value": "<@safe_include "reminders_due_on"/>"
                 }
diff --git a/translations/remind/src/main/resources/en_US/commands/reminders/reminder_joined_text_en_US.ftl b/translations/remind/src/main/resources/en_US/commands/reminders/reminder_joined_text_en_US.ftl
new file mode 100644
index 00000000..b77137be
--- /dev/null
+++ b/translations/remind/src/main/resources/en_US/commands/reminders/reminder_joined_text_en_US.ftl
@@ -0,0 +1 @@
+(joined)
\ No newline at end of file
diff --git a/translations/remind/src/main/resources/en_US/commands/reminders/reminders_due_on_en_US.ftl b/translations/remind/src/main/resources/en_US/commands/reminders/reminders_due_on_en_US.ftl
index 08f00f59..8d5d3c28 100644
--- a/translations/remind/src/main/resources/en_US/commands/reminders/reminders_due_on_en_US.ftl
+++ b/translations/remind/src/main/resources/en_US/commands/reminders/reminders_due_on_en_US.ftl
@@ -1 +1 @@
-Due on ${reminderTargetDate} with text `${reminderText}` started [here](${messageLink})
\ No newline at end of file
+Due on ${reminderTargetDate} with text `${reminderText}` started [here](${messageLink}) ${joinedText}
\ No newline at end of file