mirrors/DiscordChatExporter
1
0
Fork 0
mirror of https://github.com/Tyrrrz/DiscordChatExporter.git synced 2025-05-22 19:05:09 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

More defensive programming

Browse source
This commit is contained in:
Tyrrrz 2021-12-12 23:45:52 +02:00
parent a06b448f4a
commit b8567d384f
3 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
DiscordChatExporter.Core/Discord/Data/Channel.cs
View file

@ -52,9 +52,14 @@ public partial record Channel
var name = var name =
// Guild channel // Guild channel
json.GetPropertyOrNull("name")?.GetStringOrNull() ?? json.GetPropertyOrNull("name")?.GetStringOrNull() ??
// DM channel // DM channel
json.GetPropertyOrNull("recipients")?.EnumerateArray().Select(User.Parse).Select(u => u.Name) json.GetPropertyOrNull("recipients")?
.EnumerateArrayOrNull()?
.Select(User.Parse)
.Select(u => u.Name)
.Pipe(s => string.Join(", ", s)) ?? .Pipe(s => string.Join(", ", s)) ??
// Fallback // Fallback
id.ToString(); id.ToString();

2
DiscordChatExporter.Core/Discord/Data/Embeds/Embed.cs
View file

@ -47,7 +47,7 @@ public partial record Embed
var footer = json.GetPropertyOrNull("footer")?.Pipe(EmbedFooter.Parse); var footer = json.GetPropertyOrNull("footer")?.Pipe(EmbedFooter.Parse);
var fields = var fields =
json.GetPropertyOrNull("fields")?.EnumerateArray().Select(EmbedField.Parse).ToArray() ?? json.GetPropertyOrNull("fields")?.EnumerateArrayOrNull()?.Select(EmbedField.Parse).ToArray() ??
Array.Empty<EmbedField>(); Array.Empty<EmbedField>();
return new Embed( return new Embed(

8
DiscordChatExporter.Core/Discord/Data/Message.cs
View file

@ -53,19 +53,19 @@ public record Message(
}; };
var attachments = var attachments =
json.GetPropertyOrNull("attachments")?.EnumerateArray().Select(Attachment.Parse).ToArray() ?? json.GetPropertyOrNull("attachments")?.EnumerateArrayOrNull()?.Select(Attachment.Parse).ToArray() ??
Array.Empty<Attachment>(); Array.Empty<Attachment>();
var embeds = var embeds =
json.GetPropertyOrNull("embeds")?.EnumerateArray().Select(Embed.Parse).ToArray() ?? json.GetPropertyOrNull("embeds")?.EnumerateArrayOrNull()?.Select(Embed.Parse).ToArray() ??
Array.Empty<Embed>(); Array.Empty<Embed>();
var reactions = var reactions =
json.GetPropertyOrNull("reactions")?.EnumerateArray().Select(Reaction.Parse).ToArray() ?? json.GetPropertyOrNull("reactions")?.EnumerateArrayOrNull()?.Select(Reaction.Parse).ToArray() ??
Array.Empty<Reaction>(); Array.Empty<Reaction>();
var mentionedUsers = var mentionedUsers =
json.GetPropertyOrNull("mentions")?.EnumerateArray().Select(User.Parse).ToArray() ?? json.GetPropertyOrNull("mentions")?.EnumerateArrayOrNull()?.Select(User.Parse).ToArray() ??
Array.Empty<User>(); Array.Empty<User>();
return new Message( return new Message(