mirrors/DiscordChatExporter
1
0
Fork 0
mirror of https://github.com/Tyrrrz/DiscordChatExporter.git synced 2024-09-19 20:28:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use JsonExtensions package

Browse source
This commit is contained in:
Tyrrrz 2020-11-29 00:17:58 +02:00
parent 9df98b0405
commit d72fe594b4
18 changed files with 18 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
DiscordChatExporter.Domain/Discord/DiscordClient.cs
View file

@ -9,6 +9,8 @@ using DiscordChatExporter.Domain.Discord.Models;
using DiscordChatExporter.Domain.Exceptions;
using DiscordChatExporter.Domain.Internal;
using DiscordChatExporter.Domain.Internal.Extensions;
using JsonExtensions.Http;
using JsonExtensions.Reading;
namespace DiscordChatExporter.Domain.Discord
{
@ -52,7 +54,7 @@ namespace DiscordChatExporter.Domain.Discord
};
}
return await response.Content.ReadAsJsonAsync();
return await response.Content.ReadAsJsonAsync(default);
}
private async ValueTask<JsonElement?> TryGetJsonResponseAsync(string url)
@ -60,7 +62,7 @@ namespace DiscordChatExporter.Domain.Discord
using var response = await GetResponseAsync(url);
return response.IsSuccessStatusCode
? await response.Content.ReadAsJsonAsync()
? await response.Content.ReadAsJsonAsync(default)
: (JsonElement?) null;
}

1
DiscordChatExporter.Domain/Discord/Models/Attachment.cs
View file

@ -4,6 +4,7 @@ using System.IO;
using System.Text.Json;
using DiscordChatExporter.Domain.Discord.Models.Common;
using DiscordChatExporter.Domain.Internal.Extensions;
using JsonExtensions.Reading;
namespace DiscordChatExporter.Domain.Discord.Models
{

2
DiscordChatExporter.Domain/Discord/Models/Channel.cs
View file

@ -1,7 +1,7 @@
using System.Linq;
using System.Text.Json;
using DiscordChatExporter.Domain.Discord.Models.Common;
using DiscordChatExporter.Domain.Internal.Extensions;
using JsonExtensions.Reading;
using Tyrrrz.Extensions;
namespace DiscordChatExporter.Domain.Discord.Models

1
DiscordChatExporter.Domain/Discord/Models/Embed.cs
View file

@ -4,6 +4,7 @@ using System.Drawing;
using System.Linq;
using System.Text.Json;
using DiscordChatExporter.Domain.Internal.Extensions;
using JsonExtensions.Reading;
namespace DiscordChatExporter.Domain.Discord.Models
{

2
DiscordChatExporter.Domain/Discord/Models/EmbedAuthor.cs
View file

@ -1,5 +1,5 @@
using System.Text.Json;
using DiscordChatExporter.Domain.Internal.Extensions;
using JsonExtensions.Reading;
namespace DiscordChatExporter.Domain.Discord.Models
{

2
DiscordChatExporter.Domain/Discord/Models/EmbedField.cs
View file

@ -1,5 +1,5 @@
using System.Text.Json;
using DiscordChatExporter.Domain.Internal.Extensions;
using JsonExtensions.Reading;
namespace DiscordChatExporter.Domain.Discord.Models
{

2
DiscordChatExporter.Domain/Discord/Models/EmbedFooter.cs
View file

@ -1,5 +1,5 @@
using System.Text.Json;
using DiscordChatExporter.Domain.Internal.Extensions;
using JsonExtensions.Reading;
namespace DiscordChatExporter.Domain.Discord.Models
{

2
DiscordChatExporter.Domain/Discord/Models/EmbedImage.cs
View file

@ -1,5 +1,5 @@
using System.Text.Json;
using DiscordChatExporter.Domain.Internal.Extensions;
using JsonExtensions.Reading;
namespace DiscordChatExporter.Domain.Discord.Models
{

2
DiscordChatExporter.Domain/Discord/Models/Emoji.cs
View file

@ -2,7 +2,7 @@
using System.Linq;
using System.Text;
using System.Text.Json;
using DiscordChatExporter.Domain.Internal.Extensions;
using JsonExtensions.Reading;
using Tyrrrz.Extensions;
namespace DiscordChatExporter.Domain.Discord.Models

1
DiscordChatExporter.Domain/Discord/Models/Member.cs
View file

@ -4,6 +4,7 @@ using System.Linq;
using System.Text.Json;
using DiscordChatExporter.Domain.Discord.Models.Common;
using DiscordChatExporter.Domain.Internal.Extensions;
using JsonExtensions.Reading;
namespace DiscordChatExporter.Domain.Discord.Models
{

1
DiscordChatExporter.Domain/Discord/Models/Message.cs
View file

@ -4,6 +4,7 @@ using System.Linq;
using System.Text.Json;
using DiscordChatExporter.Domain.Discord.Models.Common;
using DiscordChatExporter.Domain.Internal.Extensions;
using JsonExtensions.Reading;
namespace DiscordChatExporter.Domain.Discord.Models
{

1
DiscordChatExporter.Domain/Discord/Models/Role.cs
View file

@ -1,6 +1,7 @@
using System.Drawing;
using System.Text.Json;
using DiscordChatExporter.Domain.Internal.Extensions;
using JsonExtensions.Reading;
namespace DiscordChatExporter.Domain.Discord.Models
{

1
DiscordChatExporter.Domain/Discord/Models/User.cs
View file

@ -2,6 +2,7 @@
using System.Text.Json;
using DiscordChatExporter.Domain.Discord.Models.Common;
using DiscordChatExporter.Domain.Internal.Extensions;
using JsonExtensions.Reading;
namespace DiscordChatExporter.Domain.Discord.Models
{

1
DiscordChatExporter.Domain/DiscordChatExporter.Domain.csproj
View file

@ -2,6 +2,7 @@
<Import Project="../DiscordChatExporter.props" />
<ItemGroup>
<PackageReference Include="JsonExtensions" Version="1.0.0" />
<PackageReference Include="MiniRazor" Version="1.1.0" />
<PackageReference Include="Polly" Version="7.2.1" />
<PackageReference Include="Tyrrrz.Extensions" Version="1.6.5" />

2
DiscordChatExporter.Domain/Exporting/Writers/JsonMessageWriter.cs
View file

@ -4,7 +4,7 @@ using System.Threading.Tasks;
using DiscordChatExporter.Domain.Discord.Models;
using DiscordChatExporter.Domain.Exporting.Writers.MarkdownVisitors;
using DiscordChatExporter.Domain.Internal.Extensions;
using DiscordChatExporter.Domain.Markdown.Ast;
using JsonExtensions.Writing;
namespace DiscordChatExporter.Domain.Exporting.Writers
{

9
DiscordChatExporter.Domain/Internal/Extensions/HttpClientExtensions.cs
View file

@ -1,6 +1,5 @@
using System.IO;
using System.Net.Http;
using System.Text.Json;
using System.Threading.Tasks;
namespace DiscordChatExporter.Domain.Internal.Extensions
@ -15,13 +14,5 @@ namespace DiscordChatExporter.Domain.Internal.Extensions
await input.CopyToAsync(output);
await output.DisposeAsync();
}
public static async ValueTask<JsonElement> ReadAsJsonAsync(this HttpContent content)
{
await using var stream = await content.ReadAsStreamAsync();
using var doc = await JsonDocument.ParseAsync(stream);
return doc.RootElement.Clone();
}
}
}

12
DiscordChatExporter.Domain/Internal/Extensions/JsonElementExtensions.cs
View file

@ -1,12 +0,0 @@
using System.Text.Json;
namespace DiscordChatExporter.Domain.Internal.Extensions
{
internal static class JsonElementExtensions
{
public static JsonElement? GetPropertyOrNull(this JsonElement element, string propertyName) =>
element.TryGetProperty(propertyName, out var result) && result.ValueKind != JsonValueKind.Null
? result
: (JsonElement?) null;
}
}

28
DiscordChatExporter.Domain/Internal/Extensions/Utf8JsonWriterExtensions.cs
View file

@ -1,28 +0,0 @@
using System;
using System.Text.Json;
namespace DiscordChatExporter.Domain.Internal.Extensions
{
internal static class Utf8JsonWriterExtensions
{
public static void WriteString(this Utf8JsonWriter writer, string propertyName, DateTimeOffset? value)
{
writer.WritePropertyName(propertyName);
if (value != null)
writer.WriteStringValue(value.Value);
else
writer.WriteNullValue();
}
public static void WriteNumber(this Utf8JsonWriter writer, string propertyName, int? value)
{
writer.WritePropertyName(propertyName);
if (value != null)
writer.WriteNumberValue(value.Value);
else
writer.WriteNullValue();
}
}
}