minster586/nadekobot
1
0
Fork 0
mirror of https://gitlab.com/Kwoth/nadekobot.git synced 2025-09-13 10:48:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v4' into v5

Browse Source
This commit is contained in:
Kwoth
2023-07-03 05:02:56 +02:00
parent b34cd534c3 ce5e04b398
commit be1d14d095
11 changed files with 66 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Nadeko.Bot.Modules.Utility/Utility.cs
View File

@@ -91,7 +91,7 @@ public partial class Utility : NadekoModule
var rng = new NadekoRandom();
var arr = await Task.Run(() => socketGuild.Users
.Where(u => u.Activities.FirstOrDefault()?.Name?.ToUpperInvariant()
.Where(u => u.Activities.FirstOrDefault()?.Name?.Trim().ToUpperInvariant()
== game)
.Select(u => u.Username)
.OrderBy(_ => rng.Next())
@@ -547,15 +547,20 @@ public partial class Utility : NadekoModule
return;
}
var embed = msg.Embeds.FirstOrDefault();
if (embed is null)
if (!msg.Embeds.Any())
{
await ReplyErrorLocalizedAsync(strs.not_found);
return;
}
var json = SmartEmbedText.FromEmbed(embed, msg.Content).ToJson(_showEmbedSerializerOptions);
await SendConfirmAsync(Format.Sanitize(json).Replace("](", "]\\("));
var json = new SmartEmbedTextArray()
{
Content = msg.Content,
Embeds = msg.Embeds
.Map(x => new SmartEmbedArrayElementText(x))
}.ToJson(_showEmbedSerializerOptions);
await SendConfirmAsync(Format.Code(json, "json").Replace("](", "]\\("));
}
[Cmd]
@@ -631,4 +636,4 @@ public partial class Utility : NadekoModule
else
await ReplyConfirmLocalizedAsync(strs.verbose_errors_disabled);
}
}
}