calvin.erfmann/DiscordChatExporter
1
0
Fork 0
mirror of https://github.com/Tyrrrz/DiscordChatExporter.git synced 2026-01-28 22:01:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ignore invalid timestamp formats

Browse Source 
Closes #1156
This commit is contained in:
Tyrrrz
2023-11-18 23:45:57 +02:00
parent b2ac5d8b45
commit b2a22ab2a9
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
DiscordChatExporter.Core/Markdown/Parsing/MarkdownParser.cs
View File

@@ -340,13 +340,25 @@ internal static partial class MarkdownParser
)
);
// https://discord.com/developers/docs/reference#message-formatting-timestamp-styles
var format = m.Groups[2].Value.NullIfWhiteSpace() switch
{
// Ignore the 'relative' format because it doesn't make sense in a static export
// Known formats
"t" => "t",
"T" => "T",
"d" => "d",
"D" => "D",
"f" => "f",
"F" => "F",
// Relative format: ignore because it doesn't make sense in a static export
"r" => null,
"R" => null,
// Discord's date formats are (mostly) compatible with .NET's date formats
var f => f
// Unknown format: throw an exception to consider this timestamp invalid
// https://github.com/Tyrrrz/DiscordChatExporter/issues/1156
var f
=> throw new InvalidOperationException(
$"Unknown timestamp format '{f}'."
)
};
return new TimestampNode(instant, format);
@@ -354,7 +366,12 @@ internal static partial class MarkdownParser
// https://github.com/Tyrrrz/DiscordChatExporter/issues/681
// https://github.com/Tyrrrz/DiscordChatExporter/issues/766
catch (Exception ex)
when (ex is FormatException or ArgumentOutOfRangeException or OverflowException)
when (ex
is FormatException
or ArgumentOutOfRangeException
or OverflowException
or InvalidOperationException
)
{
// For invalid timestamps, Discord renders "Invalid Date" instead of ignoring the markdown
return TimestampNode.Invalid;