minster586/nadekobot
1
0
Fork 0
mirror of https://gitlab.com/Kwoth/nadekobot.git synced 2025-11-03 16:24:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

Reverted smarttext to newtonsoft to relax the allowed json rules. Upped version to 4.1.3

Browse Source
This commit is contained in:
Kwoth
2022-05-05 05:00:47 +02:00
parent 5b5bc278ff
commit 9a96ef76ba
2 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,6 @@
#nullable disable #nullable disable
using System.Text.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
namespace NadekoBot; namespace NadekoBot;
@@ -14,12 +15,6 @@ public abstract record SmartText
public bool IsEmbedArray public bool IsEmbedArray
=> this is SmartEmbedTextArray; => this is SmartEmbedTextArray;
private static readonly JsonSerializerOptions _opts = new JsonSerializerOptions()
{
PropertyNameCaseInsensitive = true,
PropertyNamingPolicy = JsonNamingPolicy.CamelCase
};
public static SmartText operator +(SmartText text, string input) public static SmartText operator +(SmartText text, string input)
=> text switch => text switch
{ {
@@ -58,13 +53,13 @@ public abstract record SmartText
try try
{ {
var doc = JsonDocument.Parse(input); var doc = JObject.Parse(input);
var root = doc.RootElement; var root = doc.Root;
if (root.ValueKind == JsonValueKind.Object) if (root.Type == JTokenType.Object)
{ {
if (root.TryGetProperty("embeds", out _)) if (((JObject)root).TryGetValue("embeds", out _))
{ {
var arr = root.Deserialize<SmartEmbedTextArray>(_opts); var arr = root.ToObject<SmartEmbedTextArray>();
if (arr is null) if (arr is null)
return new SmartPlainText(input); return new SmartPlainText(input);
@@ -73,7 +68,7 @@ public abstract record SmartText
return arr; return arr;
} }
var obj = root.Deserialize<SmartEmbedText>(_opts); var obj = root.ToObject<SmartEmbedText>();
if (obj is null) if (obj is null)
return new SmartPlainText(input); return new SmartPlainText(input);

2
src/NadekoBot/Services/Impl/StatsService.cs
View File

@@ -7,7 +7,7 @@ namespace NadekoBot.Services;
public sealed class StatsService : IStatsService, IReadyExecutor, INService public sealed class StatsService : IStatsService, IReadyExecutor, INService
{ {
public const string BOT_VERSION = "4.1.2"; public const string BOT_VERSION = "4.1.3";
public string Author public string Author
=> "Kwoth#2452"; => "Kwoth#2452";