TeamInklings/Octobot
TeamInklings/Octobot
1
0
Fork 1
mirror of https://github.com/TeamOctolings/Octobot.git synced 2025-04-19 16:33:36 +03:00
Code Issues Wiki Activity

Show what default number is

Browse source 
Signed-off-by: Macintosh II <mctaylxrs@outlook.com>
This commit is contained in:
Macintxsh 2023-10-02 22:43:19 +03:00
parent cbf263622d
commit 6a961dac3d
Signed by: mctaylors
GPG key ID: 361D326747B61E65
5 changed files with 38 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
locale/Messages.resx
View file

@ -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>

3
locale/Messages.ru.resx
View file

@ -660,4 +660,7 @@
<data name="RandomMin" xml:space="preserve">
<value>Минимальное число: {0}</value>
</data>
<data name="Default" xml:space="preserve">
<value>(по умолчанию)</value>
</data>
</root>

3
locale/Messages.tt-ru.resx
View file

@ -660,4 +660,7 @@
<data name="RandomMin" xml:space="preserve">
<value>наименьшее: {0}</value>
</data>
<data name="Default" xml:space="preserve">
<value>(дефолт)</value>
</data>
</root>

29
src/Commands/ToolsCommandGroup.cs
View file

@ -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;
}

7
src/Messages.Designer.cs generated
View file

@ -1149,5 +1149,12 @@ namespace Octobot {
return ResourceManager.GetString("RandomMin", resourceCulture);
}
}
internal static string Default
{
get {
return ResourceManager.GetString("Default", resourceCulture);
}
}
}
}