From 5b84c8d8d0e15cba5c3ff871310e0ff9a7b798b7 Mon Sep 17 00:00:00 2001
From: Macintosh II <95250141+mctaylors@users.noreply.github.com>
Date: Thu, 26 Oct 2023 17:41:47 +0300
Subject: [PATCH] Add more info output to /delremind (#173)

_There are times when you want to be sure of what you've destroyed._

Therefore, in this PR I added the output of the text of the deleted
reminder along with its position in the list, because you can make a
mistake with deleting a reminder and forget about what you needed to be
reminded about.

---------

Signed-off-by: mctaylors <mctaylxrs@outlook.com>
---
 locale/Messages.resx               |  4 ++--
 locale/Messages.ru.resx            |  4 ++--
 locale/Messages.tt-ru.resx         |  4 ++--
 src/Commands/RemindCommandGroup.cs | 11 +++++++++--
 src/Messages.Designer.cs           |  4 ++--
 5 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/locale/Messages.resx b/locale/Messages.resx
index 31ed7b3..0a072c3 100644
--- a/locale/Messages.resx
+++ b/locale/Messages.resx
@@ -477,8 +477,8 @@
   <data name="ReminderPosition" xml:space="preserve">
       <value>Position in list: {0}</value>
   </data>
-  <data name="ReminderWillBeSentOn" xml:space="preserve">
-    <value>The reminder will be sent on: {0}</value>
+  <data name="ReminderTime" xml:space="preserve">
+      <value>Reminder send time: {0}</value>
   </data>
   <data name="ReminderText" xml:space="preserve">
     <value>Reminder text: {0}</value>
diff --git a/locale/Messages.ru.resx b/locale/Messages.ru.resx
index cb65749..92d4c60 100644
--- a/locale/Messages.ru.resx
+++ b/locale/Messages.ru.resx
@@ -477,8 +477,8 @@
   <data name="ReminderPosition" xml:space="preserve">
       <value>Позиция в списке: {0}</value>
   </data>
-  <data name="ReminderWillBeSentOn" xml:space="preserve">
-    <value>Напоминание будет отправлено: {0}</value>
+  <data name="ReminderTime" xml:space="preserve">
+      <value>Время отправки напоминания: {0}</value>
   </data>
   <data name="ReminderText" xml:space="preserve">
     <value>Текст напоминания: {0}</value>
diff --git a/locale/Messages.tt-ru.resx b/locale/Messages.tt-ru.resx
index b5f6ad1..9c5d487 100644
--- a/locale/Messages.tt-ru.resx
+++ b/locale/Messages.tt-ru.resx
@@ -477,8 +477,8 @@
   <data name="ReminderPosition" xml:space="preserve">
       <value>номер в списке: {0}</value>
   </data>
-  <data name="ReminderWillBeSentOn" xml:space="preserve">
-    <value>я пну тебе это: {0}</value>
+  <data name="ReminderTime" xml:space="preserve">
+      <value>время отправки: {0}</value>
   </data>
   <data name="ReminderText" xml:space="preserve">
     <value>че там в напоминалке: {0}</value>
diff --git a/src/Commands/RemindCommandGroup.cs b/src/Commands/RemindCommandGroup.cs
index 4a4f6a1..eb46d7c 100644
--- a/src/Commands/RemindCommandGroup.cs
+++ b/src/Commands/RemindCommandGroup.cs
@@ -92,7 +92,7 @@ public class RemindCommandGroup : CommandGroup
             builder.Append("- ").AppendLine(string.Format(Messages.ReminderPosition, Markdown.InlineCode((i + 1).ToString())))
                 .Append(" - ").AppendLine(string.Format(Messages.ReminderText, Markdown.InlineCode(reminder.Text)))
                 .Append(" - ")
-                .AppendLine(string.Format(Messages.ReminderWillBeSentOn, Markdown.Timestamp(reminder.At)));
+                .AppendLine(string.Format(Messages.ReminderTime, Markdown.Timestamp(reminder.At)));
         }
 
         var embed = new EmbedBuilder().WithSmallTitle(
@@ -155,7 +155,7 @@ public class RemindCommandGroup : CommandGroup
 
         var builder = new StringBuilder().Append("- ").AppendLine(string.Format(
                 Messages.ReminderText, Markdown.InlineCode(text)))
-            .Append("- ").Append(string.Format(Messages.ReminderWillBeSentOn, Markdown.Timestamp(remindAt)));
+            .Append("- ").Append(string.Format(Messages.ReminderTime, Markdown.Timestamp(remindAt)));
 
         var embed = new EmbedBuilder().WithSmallTitle(
                 string.Format(Messages.ReminderCreated, executor.GetTag()), executor)
@@ -210,9 +210,16 @@ public class RemindCommandGroup : CommandGroup
             return await _feedback.SendContextualEmbedResultAsync(failedEmbed, ct);
         }
 
+        var reminder = data.Reminders[index];
+
+        var description = new StringBuilder()
+            .Append("- ").AppendLine(string.Format(Messages.ReminderText, Markdown.InlineCode(reminder.Text)))
+            .Append("- ").AppendLine(string.Format(Messages.ReminderTime, Markdown.Timestamp(reminder.At)));
+
         data.Reminders.RemoveAt(index);
 
         var embed = new EmbedBuilder().WithSmallTitle(Messages.ReminderDeleted, bot)
+            .WithDescription(description.ToString())
             .WithColour(ColorsList.Green)
             .Build();
 
diff --git a/src/Messages.Designer.cs b/src/Messages.Designer.cs
index 4a771d0..898528c 100644
--- a/src/Messages.Designer.cs
+++ b/src/Messages.Designer.cs
@@ -786,9 +786,9 @@ namespace Octobot {
             }
         }
 
-        internal static string ReminderWillBeSentOn {
+        internal static string ReminderTime {
             get {
-                return ResourceManager.GetString("ReminderWillBeSentOn", resourceCulture);
+                return ResourceManager.GetString("ReminderTime", resourceCulture);
             }
         }