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

Consistency in parsing

Browse source
This commit is contained in:
Tyrrrz 2023-06-09 01:20:39 +03:00
parent 11d34109a7
commit c99355dec3
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -45,7 +45,7 @@ public partial record Embed
EmbedKind.Rich; EmbedKind.Rich;
var url = json.GetPropertyOrNull("url")?.GetNonWhiteSpaceStringOrNull(); var url = json.GetPropertyOrNull("url")?.GetNonWhiteSpaceStringOrNull();
var timestamp = json.GetPropertyOrNull("timestamp")?.GetDateTimeOffset(); var timestamp = json.GetPropertyOrNull("timestamp")?.GetDateTimeOffsetOrNull();
var color = json var color = json
.GetPropertyOrNull("color")? .GetPropertyOrNull("color")?

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

@ -108,15 +108,16 @@ public partial record Message
{ {
var id = json.GetProperty("id").GetNonWhiteSpaceString().Pipe(Snowflake.Parse); var id = json.GetProperty("id").GetNonWhiteSpaceString().Pipe(Snowflake.Parse);
var kind = (MessageKind)json.GetProperty("type").GetInt32(); var kind = (MessageKind)json.GetProperty("type").GetInt32();
var flags = (MessageFlags?)json.GetPropertyOrNull("flags")?.GetInt32() ?? MessageFlags.None; var flags = (MessageFlags?)json.GetPropertyOrNull("flags")?.GetInt32OrNull() ?? MessageFlags.None;
var author = json.GetProperty("author").Pipe(User.Parse); var author = json.GetProperty("author").Pipe(User.Parse);
var timestamp = json.GetProperty("timestamp").GetDateTimeOffset(); var timestamp = json.GetProperty("timestamp").GetDateTimeOffset();
var editedTimestamp = json.GetPropertyOrNull("edited_timestamp")?.GetDateTimeOffset(); var editedTimestamp = json.GetPropertyOrNull("edited_timestamp")?.GetDateTimeOffsetOrNull();
var callEndedTimestamp = json var callEndedTimestamp = json
.GetPropertyOrNull("call")? .GetPropertyOrNull("call")?
.GetPropertyOrNull("ended_timestamp")? .GetPropertyOrNull("ended_timestamp")?
.GetDateTimeOffset(); .GetDateTimeOffsetOrNull();
var isPinned = json.GetPropertyOrNull("pinned")?.GetBooleanOrNull() ?? false; var isPinned = json.GetPropertyOrNull("pinned")?.GetBooleanOrNull() ?? false;
var content = json.GetPropertyOrNull("content")?.GetStringOrNull() ?? ""; var content = json.GetPropertyOrNull("content")?.GetStringOrNull() ?? "";

2
DiscordChatExporter.Core/Discord/Data/Role.cs
View file

@ -17,7 +17,7 @@ public record Role(Snowflake Id, string Name, int Position, Color? Color) : IHas
var color = json var color = json
.GetPropertyOrNull("color")? .GetPropertyOrNull("color")?
.GetInt32() .GetInt32OrNull()?
.Pipe(System.Drawing.Color.FromArgb) .Pipe(System.Drawing.Color.FromArgb)
.ResetAlpha() .ResetAlpha()
.NullIf(c => c.ToRgb() <= 0); .NullIf(c => c.ToRgb() <= 0);