From db936fdffecf2a366b5cae831d78fb6fcf780271 Mon Sep 17 00:00:00 2001
From: Lan <50151341+Lannnnnnnnn@users.noreply.github.com>
Date: Mon, 4 May 2020 15:59:37 +0300
Subject: [PATCH] reminder edits

---
 Kehyeedra3/Commands/Stuff.cs           | 66 ++++++++++++++++++--------
 Kehyeedra3/Services/ReminderService.cs |  5 +-
 2 files changed, 51 insertions(+), 20 deletions(-)

diff --git a/Kehyeedra3/Commands/Stuff.cs b/Kehyeedra3/Commands/Stuff.cs
index b0117b3..4e7d8d3 100644
--- a/Kehyeedra3/Commands/Stuff.cs
+++ b/Kehyeedra3/Commands/Stuff.cs
@@ -2,6 +2,7 @@
 using Discord.Addons.Interactive;
 using Discord.Commands;
 using Kehyeedra3.Services.Models;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion.Internal;
 using System;
 using System.Collections.Generic;
 using System.Data;
@@ -103,15 +104,19 @@ namespace Kehyeedra3.Commands
             await Context.Channel.SendMessageAsync($"{Context.User.Mention}\n{output+1}");
         }
         [Command("remind"), Summary("Reminds you in a given time. (days, hours, minutes) Eg. 'remind 1 2 3 wash hands' would remind you in 1 day, 2 hours, 3 minutes to wash your hands")]
-        public async Task Reminder(ulong d, ulong h, ulong m, [Remainder] string r)
+        public async Task Reminder(ulong d, ulong h, ulong m, [Remainder] string r = null)
         {
-            DateTime dt = DateTime.UtcNow;
-
-            string time = dt.ToString("dd/MM/yyyy HH:mm");
             string remin = "";
+            string refix = "";
+            string resuff = "";
             ulong sen = (d * 86400) + (h * 3600) + (m * 60);
             ulong yeedraStamp = DateTime.UtcNow.ToYeedraStamp();
 
+            if (r == null)
+            {
+                r = "Fill the text field next time you make a reminder.";
+            }
+
             while (m > 59)
             {
                 h += 1;
@@ -123,12 +128,48 @@ namespace Kehyeedra3.Commands
                 h -= 24;
             }
 
+            if (d > 0)
+            {
+                remin += $" {d} day";
+                if (d > 1)
+                {
+                    remin += $"s";
+                }
+            }
+            if (h > 0)
+            {
+                remin += $" {h} hour";
+                if (h > 1)
+                {
+                    remin += $"s";
+                }
+            }
+            if (m > 0)
+            {
+                remin += $" {m} minute";
+                if (m > 1)
+                {
+                    remin += $"s";
+                }
+            }
+
+            if (d == 0 && h == 0 && m == 0)
+            {
+                refix += "right now";
+                resuff += " just now";
+            }
+            else
+            {
+                refix += "in";
+                resuff += " ago";
+            }
+
             if (sen < 63072000)
             {
                 var reminder = new Reminder
                 {
                     UserId = Context.User.Id,
-                    Message = ($"At **UTC {time}** you wanted me to remind you:\n**'{r}'**"),
+                    Message = $"**Reminder from{remin}{resuff}:**\n\n''{r}''",
                     Created = yeedraStamp,
                     Send = sen + yeedraStamp
                 };
@@ -146,20 +187,7 @@ namespace Kehyeedra3.Commands
                 return;
             }
 
-
-            if (d > 0)
-            {
-                remin += $" {d} days";
-            }
-            if (h > 0)
-            {
-                remin += $" {h} hours";
-            }
-            if (m > 0)
-            {
-                remin += $" {m} minutes";
-            }
-            await Context.Channel.SendMessageAsync($"{Context.User.Mention}\n Ok, I'll remind you in{remin}.");
+            await Context.Channel.SendMessageAsync($"{Context.User.Mention}\n Ok, I'll remind you {refix}{remin}.");
         }
 
         [Command("dab"), Summary("Dabs a person")]
diff --git a/Kehyeedra3/Services/ReminderService.cs b/Kehyeedra3/Services/ReminderService.cs
index f9a43ce..968fa1f 100644
--- a/Kehyeedra3/Services/ReminderService.cs
+++ b/Kehyeedra3/Services/ReminderService.cs
@@ -11,7 +11,10 @@ namespace Kehyeedra3.Services
         private static async Task SendReminderAsync(Reminder reminder)
         {
             var dmchannel = await Bot._bot.GetUser(reminder.UserId).GetOrCreateDMChannelAsync();
-            await dmchannel.SendMessageAsync(reminder.Message);
+            if (dmchannel != null)
+            {
+                await dmchannel.SendMessageAsync(reminder.Message);
+            }
         }
         public async Task Tick()
         {