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

Fixed plaintext-only embeds. closes #360

Browse Source
This commit is contained in:
Kwoth
2022-06-14 14:26:59 +02:00
parent 050eaa48eb
commit 6bec67006c
6 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/NadekoBot/Common/SmartText/SmartEmbedText.cs
View File

@@ -1,6 +1,6 @@
using SixLabors.ImageSharp.PixelFormats; #nullable disable warnings
using SixLabors.ImageSharp.PixelFormats;
#nullable disable
namespace NadekoBot; namespace NadekoBot;
public sealed record SmartEmbedArrayElementText : SmartEmbedTextBase public sealed record SmartEmbedArrayElementText : SmartEmbedTextBase
@@ -37,11 +37,11 @@ public sealed record SmartEmbedText : SmartEmbedTextBase
{ {
} }
private SmartEmbedText(IEmbed eb, string plainText = null) private SmartEmbedText(IEmbed eb, string? plainText = null)
: base(eb) : base(eb)
=> (PlainText, Color) = (plainText, eb.Color?.RawValue ?? 0); => (PlainText, Color) = (plainText, eb.Color?.RawValue ?? 0);
public static SmartEmbedText FromEmbed(IEmbed eb, string plainText = null) public static SmartEmbedText FromEmbed(IEmbed eb, string? plainText = null)
=> new(eb, plainText); => new(eb, plainText);
protected override EmbedBuilder GetEmbedInternal() protected override EmbedBuilder GetEmbedInternal()

5
src/NadekoBot/Common/SmartText/SmartEmbedTextArray.cs
View File

@@ -14,7 +14,10 @@ public sealed record SmartEmbedTextArray : SmartText
if (Embeds is null) if (Embeds is null)
return Array.Empty<EmbedBuilder>(); return Array.Empty<EmbedBuilder>();
return Embeds.Map(em => em.GetEmbed()); return Embeds
.Where(x => x.IsValid)
.Select(em => em.GetEmbed())
.ToArray();
} }
public void NormalizeFields() public void NormalizeFields()

2
src/NadekoBot/Common/SmartText/SmartText.cs
View File

@@ -68,7 +68,7 @@ public abstract record SmartText
var obj = root.ToObject<SmartEmbedText>(); var obj = root.ToObject<SmartEmbedText>();
if (obj is null) if (obj is null || !(obj.IsValid || !string.IsNullOrWhiteSpace(obj.PlainText)))
return new SmartPlainText(input); return new SmartPlainText(input);
obj.NormalizeFields(); obj.NormalizeFields();

2
src/NadekoBot/_Extensions/Extensions.cs
View File

@@ -21,7 +21,7 @@ public static class Extensions
{ {
SmartEmbedText set => msg.ModifyAsync(x => SmartEmbedText set => msg.ModifyAsync(x =>
{ {
x.Embed = set.GetEmbed().Build(); x.Embed = set.IsValid ? set.GetEmbed().Build() : null;
x.Content = set.PlainText?.SanitizeMentions() ?? ""; x.Content = set.PlainText?.SanitizeMentions() ?? "";
}), }),
SmartEmbedTextArray set => msg.ModifyAsync(x => SmartEmbedTextArray set => msg.ModifyAsync(x =>

2
src/NadekoBot/_Extensions/IMessageChannelExtensions.cs
View File

@@ -54,7 +54,7 @@ public static class MessageChannelExtensions
=> text switch => text switch
{ {
SmartEmbedText set => channel.SendAsync(set.PlainText, SmartEmbedText set => channel.SendAsync(set.PlainText,
set.GetEmbed().Build(), set.IsValid ? set.GetEmbed().Build() : null,
sanitizeAll: sanitizeAll), sanitizeAll: sanitizeAll),
SmartPlainText st => channel.SendAsync(st.Text, SmartPlainText st => channel.SendAsync(st.Text,
default(Embed), default(Embed),

2
src/NadekoBot/_Extensions/SocketMessageComponentExtensions.cs
View File

@@ -36,7 +36,7 @@ public static class SocketMessageComponentExtensions
=> text switch => text switch
{ {
SmartEmbedText set => smc.RespondAsync(set.PlainText, SmartEmbedText set => smc.RespondAsync(set.PlainText,
set.GetEmbed().Build(), set.IsValid ? set.GetEmbed().Build() : null,
sanitizeAll: sanitizeAll, sanitizeAll: sanitizeAll,
ephemeral: ephemeral), ephemeral: ephemeral),
SmartPlainText st => smc.RespondAsync(st.Text, SmartPlainText st => smc.RespondAsync(st.Text,