From 6a961dac3d8a736dbf754ec0df6e0c1c8cd9828c Mon Sep 17 00:00:00 2001
From: Macintosh II <mctaylxrs@outlook.com>
Date: Mon, 2 Oct 2023 22:43:19 +0300
Subject: [PATCH] Show what default number is

Signed-off-by: Macintosh II <mctaylxrs@outlook.com>
---
 locale/Messages.resx              |  3 +++
 locale/Messages.ru.resx           |  3 +++
 locale/Messages.tt-ru.resx        |  3 +++
 src/Commands/ToolsCommandGroup.cs | 29 ++++++++++++++++++++++-------
 src/Messages.Designer.cs          |  7 +++++++
 5 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/locale/Messages.resx b/locale/Messages.resx
index 5a18a42..bda56cf 100644
--- a/locale/Messages.resx
+++ b/locale/Messages.resx
@@ -660,4 +660,7 @@
   <data name="RandomMax" xml:space="preserve">
       <value>Maximum number: {0}</value>
   </data>
+  <data name="Default" xml:space="preserve">
+      <value>(default)</value>
+  </data>
 </root>
diff --git a/locale/Messages.ru.resx b/locale/Messages.ru.resx
index 6ca6412..f627842 100644
--- a/locale/Messages.ru.resx
+++ b/locale/Messages.ru.resx
@@ -660,4 +660,7 @@
   <data name="RandomMin" xml:space="preserve">
       <value>Минимальное число: {0}</value>
   </data>
+  <data name="Default" xml:space="preserve">
+      <value>(по умолчанию)</value>
+  </data>
 </root>
diff --git a/locale/Messages.tt-ru.resx b/locale/Messages.tt-ru.resx
index 098fd5a..49e7093 100644
--- a/locale/Messages.tt-ru.resx
+++ b/locale/Messages.tt-ru.resx
@@ -660,4 +660,7 @@
   <data name="RandomMin" xml:space="preserve">
       <value>наименьшее: {0}</value>
   </data>
+  <data name="Default" xml:space="preserve">
+      <value>(дефолт)</value>
+  </data>
 </root>
diff --git a/src/Commands/ToolsCommandGroup.cs b/src/Commands/ToolsCommandGroup.cs
index c5c1fc7..65897b2 100644
--- a/src/Commands/ToolsCommandGroup.cs
+++ b/src/Commands/ToolsCommandGroup.cs
@@ -244,7 +244,7 @@ public class ToolsCommandGroup : CommandGroup
     public async Task<Result> ExecuteRandomAsync(
         [Description("First number")] long first,
         [Description("Second number (Default: 0)")]
-        long second = 0)
+        long? second = null)
     {
         if (!_context.TryGetContextIDs(out var guildId, out _, out var userId))
         {
@@ -263,21 +263,36 @@ public class ToolsCommandGroup : CommandGroup
         return await SendRandomNumberAsync(first, second, user, CancellationToken);
     }
 
-    private async Task<Result> SendRandomNumberAsync(long first, long second, IUser user, CancellationToken ct)
+    private async Task<Result> SendRandomNumberAsync(long first, long? secondNullable,
+        IUser user, CancellationToken ct)
     {
+        var second = secondNullable ?? 0;
+
         var min = Math.Min(first, second);
         var max = Math.Max(first, second);
 
         var i = Random.Shared.NextInt64(min, max + 1);
 
-        var description = new StringBuilder().Append("# ").AppendLine(i.ToString())
-            .Append("- ").AppendLine(string.Format(Messages.RandomMin, Markdown.InlineCode(min.ToString())))
-            .Append("- ").AppendLine(string.Format(Messages.RandomMax, Markdown.InlineCode(max.ToString())));
+        var description = new StringBuilder().Append("# ").Append(i);
+
+        description.AppendLine().Append("- ").Append(string.Format(
+            Messages.RandomMin, Markdown.InlineCode(min.ToString())));
+        if (secondNullable is null && first >= 0)
+        {
+            description.Append(' ').Append(Messages.Default);
+        }
+
+        description.AppendLine().Append("- ").Append(string.Format(
+            Messages.RandomMax, Markdown.InlineCode(max.ToString())));
+        if (secondNullable is null && first < 0)
+        {
+            description.Append(' ').Append(Messages.Default);
+        }
 
         var embedColor = ColorsList.Blue;
-        if (min == max)
+        if (secondNullable is not null && min == max)
         {
-            description.AppendLine(Markdown.Italicise(Messages.RandomMinMaxSame));
+            description.AppendLine().Append(Markdown.Italicise(Messages.RandomMinMaxSame));
             embedColor = ColorsList.Red;
         }
 
diff --git a/src/Messages.Designer.cs b/src/Messages.Designer.cs
index 7c81ab2..7f93fa2 100644
--- a/src/Messages.Designer.cs
+++ b/src/Messages.Designer.cs
@@ -1149,5 +1149,12 @@ namespace Octobot {
                 return ResourceManager.GetString("RandomMin", resourceCulture);
             }
         }
+
+        internal static string Default
+        {
+            get {
+                return ResourceManager.GetString("Default", resourceCulture);
+            }
+        }
     }
 }