Merge branch 'v4' into v5

This commit is contained in:
Kwoth
2023-07-03 05:02:56 +02:00
11 changed files with 66 additions and 25 deletions

View File

@@ -1,5 +1,6 @@
#nullable disable warnings
using SixLabors.ImageSharp.PixelFormats;
using System.Text.Json.Serialization;
namespace NadekoBot;
@@ -7,14 +8,14 @@ public sealed record SmartEmbedArrayElementText : SmartEmbedTextBase
{
public string Color { get; init; } = string.Empty;
public SmartEmbedArrayElementText() : base()
public SmartEmbedArrayElementText()
{
}
public SmartEmbedArrayElementText(IEmbed eb) : base(eb)
{
Color = eb.Color is { } c ? new Rgba32(c.R, c.G, c.B).ToHex() : string.Empty;
}
protected override EmbedBuilder GetEmbedInternal()
@@ -63,6 +64,7 @@ public abstract record SmartEmbedTextBase : SmartText
public SmartTextEmbedFooter Footer { get; init; }
public SmartTextEmbedField[] Fields { get; init; }
[JsonIgnore]
public bool IsValid
=> !string.IsNullOrWhiteSpace(Title)
|| !string.IsNullOrWhiteSpace(Description)
@@ -100,7 +102,7 @@ public abstract record SmartEmbedTextBase : SmartText
IconUrl = ef.IconUrl
}
: null;
if (eb.Fields.Length > 0)
{
Fields = eb.Fields.Select(field

View File

@@ -1,4 +1,6 @@
#nullable disable
using System.Text.Json.Serialization;
namespace NadekoBot;
public sealed record SmartEmbedTextArray : SmartText
@@ -6,6 +8,7 @@ public sealed record SmartEmbedTextArray : SmartText
public string Content { get; set; }
public SmartEmbedArrayElementText[] Embeds { get; set; }
[JsonIgnore]
public bool IsValid
=> Embeds?.All(x => x.IsValid) ?? false;

View File

@@ -1,16 +1,20 @@
#nullable disable
using Newtonsoft.Json.Linq;
using System.Text.Json.Serialization;
namespace NadekoBot;
public abstract record SmartText
{
[JsonIgnore]
public bool IsEmbed
=> this is SmartEmbedText;
[JsonIgnore]
public bool IsPlainText
=> this is SmartPlainText;
[JsonIgnore]
public bool IsEmbedArray
=> this is SmartEmbedTextArray;