Update version

Closes #977

.github/workflows/main.yml

@@ -18,8 +18,7 @@ jobs:
       - name: Install .NET
         uses: actions/setup-dotnet@v2
         with:
-          # Fixed version, workaround for https://github.com/dotnet/core/issues/7176
-          dotnet-version: 6.0.100
+          dotnet-version: 7.0.x
 
       - name: Run tests
         # Tests need access to secrets, so we can't run them against PRs because of limited trust
@@ -50,8 +49,7 @@ jobs:
       - name: Install .NET
         uses: actions/setup-dotnet@v2
         with:
-          # Fixed version, workaround for https://github.com/dotnet/core/issues/7176
-          dotnet-version: 6.0.100
+          dotnet-version: 7.0.x
 
       - name: Publish (CLI)
         run: dotnet publish DiscordChatExporter.Cli/ -o DiscordChatExporter.Cli/bin/Publish/ --configuration Release
@@ -151,4 +149,4 @@ jobs:
           payload: |
             {
               "content": "**DiscordChatExporter** new version released!\nVersion: `${{ steps.get_version.outputs.tag }}`\nChangelog: <https://github.com/Tyrrrz/DiscordChatExporter/blob/${{ steps.get_version.outputs.tag }}/Changelog.md>"
-            }
+            }

.gitignore

@@ -5,6 +5,7 @@
 *.sln.docstates
 .idea/
 .vs/
+.vscode/
 
 # Build results
 [Dd]ebug/

Changelog.md

@@ -1,3 +1,39 @@
+### v2.37 (08-Jan-2023)
+
+- Switched from .NET 6.0 to .NET 7.0. If running on Windows, the application should update all required prerequisites automatically. Alternatively, you can download the latest version of the runtime for your system [here](https://dotnet.microsoft.com/download/dotnet/7.0).
+- Updated rate limit handling to adjust automatically based on the response headers. This may result in exports taking longer than before on bot accounts, but it makes it less likely for Discord to throttle you. Exports with user accounts shouldn't be affected too much by this change.
+- Optimized snowflake parsing by removing unnecessary checks. (Thanks [@Kuba_Z2](https://github.com/KubaZ2))
+- [Docker] Optimized the Docker image size by using the Alpine base image and publishing a self-contained distribution. (Thanks [@Velithris](https://github.com/Zireael-N))
+- Fixed an issue where exporting a channel whose name ends with a dot would fail on Windows with default output path. The dots are now trimmed in file and directory names to match the behavior of Windows Explorer.
+
+### v2.36.4 (29-Oct-2022)
+
+- Changed all mentions of "media" in the context of "download media" or "reuse media" to "assets". CLI options will retain their existing names for backwards compatibility.
+- [HTML] Fixed an issue which prevented emoji used inside message content from being downloaded when "download assets" option is enabled. (Thanks [@Roberto Blázquez](https://github.com/xBaank))
+
+### v2.36.3 (21-Oct-2022)
+
+- [GUI] Fixed an issue where opening a dialog did not prevent user interactions with background UI elements using keyboard. This sometimes caused the application to crash in weird ways.
+- [Docker] Fixed an issue where DiscordChatExporter was running as root inside the container, making the exported files inaccessible to the host. (Thanks [@Benjamin Just](https://github.com/BamButz))
+
+### v2.36.2 (08-Oct-2022)
+
+- Removed the message content intent check because the heuristics turned out to be not reliable enough.
+- Fixed an issue where the runtime manifest included the wrong target runtime version. This resulted in the application failing to launch for some users when upgrading from earlier versions.
+
+### v2.36.1 (24-Sep-2022)
+
+- Added a check which will trigger an error if the provided bot account does not have the message content intent enabled. Note, however, that this check is based on heuristics which may result in false negatives.
+- Fixed an issue where certain transient HTTP errors were not retried.
+- Fixed an issue which caused the export process to fail with the `IndexOutOfRangeException` exception on certain automated messages.
+- Fixed an issue which caused the export process to fail on unrecognized embed types.
+
+### v2.36 (16-Sep-2022)
+
+- [HTML] Added support for rendering GIFV embeds. They will now render as videos that automatically play when you hover your mouse over them. (Thanks [@gan-of-culture](https://github.com/gan-of-culture))
+- [HTML] Added support for rendering system notification messages, such as when a user joins a server or when a messages gets pinned. Previously, such messages were rendered as regular text messages, but now they look similar to how they're presented in the Discord client. (Thanks [@gan-of-culture](https://github.com/gan-of-culture))
+- [CLI] Improved the wording of the error message that's shown when exporting multiple channels and the provided output path is ambiguous. It now mentions that you can resolve the ambiguity by adding a slash at the end of the path.
+
 ### v2.35.2 (08-Sep-2022)
 
 - Updated usage guide to mention the need to enable "Message Content Intent" to use a bot as a medium for exporting messages.
@@ -434,4 +470,4 @@ Please note that CSV export is most likely not going to receive future updates a
 - Added support for user and role mentions.
 - Added support for channel mentions.
 - Fixed text in pre blocks not being wrapped correctly.
-- Added workaround for non-default message types.
+- Added workaround for non-default message types.

Directory.Build.props

@@ -1,8 +1,8 @@
 <Project>
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <Version>2.35.2</Version>
+    <TargetFramework>net7.0</TargetFramework>
+    <Version>2.37</Version>
     <Company>Tyrrrz</Company>
     <Copyright>Copyright (c) Oleksii Holub</Copyright>
     <LangVersion>preview</LangVersion>

DiscordChatExporter.Cli.Tests/DiscordChatExporter.Cli.Tests.csproj

@@ -12,14 +12,14 @@
 
   <ItemGroup>
     <PackageReference Include="AngleSharp" Version="0.17.1" />
-    <PackageReference Include="FluentAssertions" Version="6.7.0" />
+    <PackageReference Include="FluentAssertions" Version="6.8.0" />
     <PackageReference Include="GitHubActionsTestLogger" Version="2.0.1" PrivateAssets="all" />
     <PackageReference Include="JsonExtensions" Version="1.2.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
     <PackageReference Include="System.Reactive" Version="5.0.0" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" PrivateAssets="all" />
-    <PackageReference Include="coverlet.collector" Version="3.1.2" PrivateAssets="all" />
+    <PackageReference Include="coverlet.collector" Version="3.2.0" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

DiscordChatExporter.Cli.Tests/Specs/HtmlWriting/EmbedSpecs.cs

@@ -54,8 +54,9 @@ public class EmbedSpecs : IClassFixture<ExportWrapperFixture>
         message
             .QuerySelectorAll("img")
             .Select(e => e.GetAttribute("src"))
+            .Where(s => s?.EndsWith("i.redd.it/f8w05ja8s4e61.png") ?? false)
             .Should()
-            .Contain("https://i.redd.it/f8w05ja8s4e61.png");
+            .ContainSingle();
     }
 
     [Fact]
@@ -74,6 +75,38 @@ public class EmbedSpecs : IClassFixture<ExportWrapperFixture>
         content.Should().BeNullOrEmpty();
     }
 
+    [Fact]
+    public async Task Message_containing_a_gifv_link_is_rendered_with_a_video_embed()
+    {
+        // Act
+        var message = await _exportWrapper.GetMessageAsHtmlAsync(
+            ChannelIds.EmbedTestCases,
+            Snowflake.Parse("1019234520349814794")
+        );
+
+        // Assert
+        message
+            .QuerySelectorAll("source")
+            .Select(e => e.GetAttribute("src"))
+            .Where(s => s?.EndsWith("media.tenor.com/DDAJeW6BQKkAAAPo/tooncasm-test-copy.mp4") ?? false)
+            .Should()
+            .ContainSingle();
+    }
+
+    [Fact]
+    public async Task Message_containing_a_gifv_link_and_nothing_else_is_rendered_without_text_content()
+    {
+        // Act
+        var message = await _exportWrapper.GetMessageAsHtmlAsync(
+            ChannelIds.EmbedTestCases,
+            Snowflake.Parse("1019234520349814794")
+        );
+
+        // Assert
+        var content = message.QuerySelector(".chatlog__content")?.Text();
+        content.Should().BeNullOrEmpty();
+    }
+
     [Fact]
     public async Task Message_containing_a_Spotify_track_link_is_rendered_with_a_track_embed()
     {

DiscordChatExporter.Cli.Tests/Specs/SelfContainedSpecs.cs

@@ -36,7 +36,7 @@ public class SelfContainedSpecs : IClassFixture<TempOutputFixture>
             ChannelIds = new[] { ChannelIds.SelfContainedTestCases },
             ExportFormat = ExportFormat.HtmlDark,
             OutputPath = filePath,
-            ShouldDownloadMedia = true
+            ShouldDownloadAssets = true
         }.ExecuteAsync(new FakeConsole());
 
         // Assert

DiscordChatExporter.Cli.dockerfile

@@ -1,5 +1,7 @@
-# Build
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
+# -- Build
+FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine AS build
+
+WORKDIR /build
 
 COPY favicon.ico ./
 COPY NuGet.config ./
@@ -7,12 +9,36 @@ COPY Directory.Build.props ./
 COPY DiscordChatExporter.Core ./DiscordChatExporter.Core
 COPY DiscordChatExporter.Cli ./DiscordChatExporter.Cli
 
-RUN dotnet publish DiscordChatExporter.Cli -c Release -o ./publish
+RUN dotnet publish DiscordChatExporter.Cli \
+    --self-contained \
+    --use-current-runtime \
+    --configuration Release \
+    --output ./publish
 
-# Run
-FROM mcr.microsoft.com/dotnet/runtime:6.0 AS run
+# -- Run
+FROM mcr.microsoft.com/dotnet/runtime-deps:7.0-alpine
 
-COPY --from=build ./publish ./
+# Alpine dotnet image doesn't include timezone data, which is needed
+# for certain date/time operations.
+RUN apk add --no-cache tzdata
 
-WORKDIR ./out
-ENTRYPOINT ["dotnet", "/DiscordChatExporter.Cli.dll"]
+# Create a non-root user to run the app, so that the output files
+# can be accessed by the host.
+# https://github.com/Tyrrrz/DiscordChatExporter/issues/851
+RUN adduser \
+    --disabled-password \
+    --no-create-home \
+    dce
+
+USER dce
+
+COPY --from=build /build/publish /opt/dce
+
+# Need to keep this as /out for backwards compatibility with documentation.
+# A lot of people have this directory mounted in their scripts files, so
+# changing it would break existing workflows.
+WORKDIR /out
+
+# Add the app directory to PATH so that it's easier to debug using a shell
+ENV PATH="$PATH:/opt/dce"
+ENTRYPOINT ["DiscordChatExporter.Cli"]

DiscordChatExporter.Cli/Commands/Base/ExportCommandBase.cs

@@ -31,7 +31,7 @@ public abstract class ExportCommandBase : TokenCommandBase
     public string OutputPath
     {
         get => _outputPath;
-        // Handle ~/ in paths on *nix systems
+        // Handle ~/ in paths on Unix systems
         // https://github.com/Tyrrrz/DiscordChatExporter/pull/903
         init => _outputPath = Path.GetFullPath(value);
     }
@@ -76,15 +76,15 @@ public abstract class ExportCommandBase : TokenCommandBase
 
     [CommandOption(
         "media",
-        Description = "Download referenced media content."
+        Description = "Download assets referenced by the export (user avatars, attached files, embedded images, etc.)."
     )]
-    public bool ShouldDownloadMedia { get; init; }
+    public bool ShouldDownloadAssets { get; init; }
 
     [CommandOption(
         "reuse-media",
-        Description = "Reuse already existing media content to skip redundant downloads."
+        Description = "Reuse previously downloaded assets to avoid redundant requests."
     )]
-    public bool ShouldReuseMedia { get; init; }
+    public bool ShouldReuseAssets { get; init; }
 
     [CommandOption(
         "dateformat",
@@ -97,9 +97,9 @@ public abstract class ExportCommandBase : TokenCommandBase
 
     protected async ValueTask ExecuteAsync(IConsole console, IReadOnlyList<Channel> channels)
     {
-        // Reuse media option should only be used when the media option is set.
+        // Reuse assets option should only be used when the download assets option is set.
         // https://github.com/Tyrrrz/DiscordChatExporter/issues/425
-        if (ShouldReuseMedia && !ShouldDownloadMedia)
+        if (ShouldReuseAssets && !ShouldDownloadAssets)
         {
             throw new CommandException(
                 "Option --reuse-media cannot be used without --media."
@@ -121,7 +121,8 @@ public abstract class ExportCommandBase : TokenCommandBase
         if (!isValidOutputPath)
         {
             throw new CommandException(
-                "Attempted to export multiple channels, but the output path is neither a directory nor a template."
+                "Attempted to export multiple channels, but the output path is neither a directory nor a template. " +
+                "If the provided output path is meant to be treated as a directory, make sure it ends with a slash."
             );
         }
 
@@ -157,8 +158,8 @@ public abstract class ExportCommandBase : TokenCommandBase
                                     Before,
                                     PartitionLimit,
                                     MessageFilter,
-                                    ShouldDownloadMedia,
-                                    ShouldReuseMedia,
+                                    ShouldDownloadAssets,
+                                    ShouldReuseAssets,
                                     DateFormat
                                 );
 
@@ -235,8 +236,8 @@ public abstract class ExportCommandBase : TokenCommandBase
     {
         // War in Ukraine message
         console.Output.WriteLine("========================================================================");
-        console.Output.WriteLine("||   Ukraine is at war! Support my country in its fight for freedom~  ||");
-        console.Output.WriteLine("||   Learn more on my website: https://tyrrrz.me                      ||");
+        console.Output.WriteLine("||   Ukraine is at war! Support my country in its fight for freedom   ||");
+        console.Output.WriteLine("||   Learn more: https://tyrrrz.me/ukraine                            ||");
         console.Output.WriteLine("========================================================================");
         console.Output.WriteLine("");
 

DiscordChatExporter.Cli/Commands/Base/TokenCommandBase.cs

@@ -12,11 +12,10 @@ public abstract class TokenCommandBase : ICommand
     [CommandOption(
         "token",
         't',
-        IsRequired = true,
         EnvironmentVariable = "DISCORD_TOKEN",
         Description = "Authentication token."
     )]
-    public string Token { get; init; } = "";
+    public required string Token { get; init; }
 
     [Obsolete("This option doesn't do anything. Kept for backwards compatibility.")]
     [CommandOption(

DiscordChatExporter.Cli/Commands/ExportChannelsCommand.cs

@@ -15,10 +15,9 @@ public class ExportChannelsCommand : ExportCommandBase
     [CommandOption(
         "channel",
         'c',
-        IsRequired = true,
         Description = "Channel ID(s)."
     )]
-    public IReadOnlyList<Snowflake> ChannelIds { get; init; } = Array.Empty<Snowflake>();
+    public required IReadOnlyList<Snowflake> ChannelIds { get; init; }
 
     public override async ValueTask ExecuteAsync(IConsole console)
     {

DiscordChatExporter.Cli/Commands/ExportGuildCommand.cs

@@ -15,10 +15,9 @@ public class ExportGuildCommand : ExportCommandBase
     [CommandOption(
         "guild",
         'g',
-        IsRequired = true,
         Description = "Guild ID."
     )]
-    public Snowflake GuildId { get; init; }
+    public required Snowflake GuildId { get; init; }
 
     public override async ValueTask ExecuteAsync(IConsole console)
     {

DiscordChatExporter.Cli/Commands/GetChannelsCommand.cs

@@ -16,10 +16,9 @@ public class GetChannelsCommand : TokenCommandBase
     [CommandOption(
         "guild",
         'g',
-        IsRequired = true,
         Description = "Guild ID."
     )]
-    public Snowflake GuildId { get; init; }
+    public required Snowflake GuildId { get; init; }
 
     public override async ValueTask ExecuteAsync(IConsole console)
     {

DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj

@@ -6,10 +6,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CliFx" Version="2.3.0" />
-    <PackageReference Include="Spectre.Console" Version="0.44.0" />
+    <PackageReference Include="CliFx" Version="2.3.1" />
+    <PackageReference Include="Spectre.Console" Version="0.45.0" />
     <PackageReference Include="Gress" Version="2.0.1" />
-    <PackageReference Include="DotnetRuntimeBootstrapper" Version="2.3.1" PrivateAssets="all" />
+    <PackageReference Include="DotnetRuntimeBootstrapper" Version="2.4.0" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

DiscordChatExporter.Cli/Sanctions.cs

@@ -0,0 +1,51 @@
+using System;
+using System.Globalization;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using Microsoft.Win32;
+
+namespace DiscordChatExporter.Cli;
+
+public static class Sanctions
+{
+    [ModuleInitializer]
+    internal static void Verify()
+    {
+        var isSkipped = string.Equals(
+            Environment.GetEnvironmentVariable("RUSNI"),
+            "PYZDA",
+            StringComparison.OrdinalIgnoreCase
+        );
+
+        if (isSkipped)
+            return;
+
+        var locale = CultureInfo.CurrentCulture.Name;
+
+        var region =
+            RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
+                ? Registry.CurrentUser
+                    .OpenSubKey(@"Control Panel\International\Geo", false)?
+                    .GetValue("Name") as string
+                : null;
+
+        var isSanctioned =
+            locale.EndsWith("-ru", StringComparison.OrdinalIgnoreCase) ||
+            locale.EndsWith("-by", StringComparison.OrdinalIgnoreCase) ||
+            string.Equals(region, "ru", StringComparison.OrdinalIgnoreCase) ||
+            string.Equals(region, "by", StringComparison.OrdinalIgnoreCase);
+
+        if (!isSanctioned)
+            return;
+
+        Console.ForegroundColor = ConsoleColor.Red;
+        Console.Error.WriteLine(
+            "You cannot use this software on the territory of a terrorist state. " +
+            "Set the environment variable `RUSNI=PYZDA` if you wish to override this check."
+        );
+
+        Console.ResetColor();
+
+        Environment.Exit(0xFACC);
+    }
+}

DiscordChatExporter.Core/Discord/Data/Common/FileSize.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
 
 namespace DiscordChatExporter.Core.Discord.Data.Common;
 
@@ -39,7 +40,8 @@ public readonly partial record struct FileSize(long TotalBytes)
     }
 
     [ExcludeFromCodeCoverage]
-    public override string ToString() => $"{GetLargestWholeNumberValue():0.##} {GetLargestWholeNumberSymbol()}";
+    public override string ToString() =>
+        string.Create(CultureInfo.InvariantCulture, $"{GetLargestWholeNumberValue():0.##} {GetLargestWholeNumberSymbol()}");
 }
 
 public partial record struct FileSize

DiscordChatExporter.Core/Discord/Data/Embeds/Embed.cs

@@ -11,6 +11,7 @@ namespace DiscordChatExporter.Core.Discord.Data.Embeds;
 // https://discord.com/developers/docs/resources/channel#embed-object
 public partial record Embed(
     string? Title,
+    EmbedKind Kind,
     string? Url,
     DateTimeOffset? Timestamp,
     Color? Color,
@@ -19,11 +20,9 @@ public partial record Embed(
     IReadOnlyList<EmbedField> Fields,
     EmbedImage? Thumbnail,
     IReadOnlyList<EmbedImage> Images,
+    EmbedVideo? Video,
     EmbedFooter? Footer)
 {
-    public PlainImageEmbedProjection? TryGetPlainImage() =>
-        PlainImageEmbedProjection.TryResolve(this);
-
     public SpotifyTrackEmbedProjection? TryGetSpotifyTrack() =>
         SpotifyTrackEmbedProjection.TryResolve(this);
 
@@ -36,9 +35,20 @@ public partial record Embed
     public static Embed Parse(JsonElement json)
     {
         var title = json.GetPropertyOrNull("title")?.GetStringOrNull();
+
+        var kind =
+            json.GetPropertyOrNull("type")?.GetStringOrNull()?.ParseEnumOrNull<EmbedKind>() ??
+            EmbedKind.Rich;
+
         var url = json.GetPropertyOrNull("url")?.GetNonWhiteSpaceStringOrNull();
         var timestamp = json.GetPropertyOrNull("timestamp")?.GetDateTimeOffset();
-        var color = json.GetPropertyOrNull("color")?.GetInt32OrNull()?.Pipe(System.Drawing.Color.FromArgb).ResetAlpha();
+
+        var color = json
+            .GetPropertyOrNull("color")?
+            .GetInt32OrNull()?
+            .Pipe(System.Drawing.Color.FromArgb)
+            .ResetAlpha();
+
         var author = json.GetPropertyOrNull("author")?.Pipe(EmbedAuthor.Parse);
         var description = json.GetPropertyOrNull("description")?.GetStringOrNull();
 
@@ -59,10 +69,13 @@ public partial record Embed
             json.GetPropertyOrNull("image")?.Pipe(EmbedImage.Parse).Enumerate().ToArray() ??
             Array.Empty<EmbedImage>();
 
+        var video = json.GetPropertyOrNull("video")?.Pipe(EmbedVideo.Parse);
+
         var footer = json.GetPropertyOrNull("footer")?.Pipe(EmbedFooter.Parse);
 
         return new Embed(
             title,
+            kind,
             url,
             timestamp,
             color,
@@ -71,6 +84,7 @@ public partial record Embed
             fields,
             thumbnail,
             images,
+            video,
             footer
         );
     }

DiscordChatExporter.Core/Discord/Data/Embeds/EmbedKind.cs

@@ -0,0 +1,11 @@
+namespace DiscordChatExporter.Core.Discord.Data.Embeds;
+
+// https://discord.com/developers/docs/resources/channel#embed-object-embed-types
+public enum EmbedKind
+{
+    Rich,
+    Image,
+    Video,
+    Gifv,
+    Link
+}

DiscordChatExporter.Core/Discord/Data/Embeds/EmbedVideo.cs

@@ -0,0 +1,22 @@
+using JsonExtensions.Reading;
+using System.Text.Json;
+
+namespace DiscordChatExporter.Core.Discord.Data.Embeds;
+
+// https://discord.com/developers/docs/resources/channel#embed-object-embed-video-structure
+public record EmbedVideo(
+    string? Url,
+    string? ProxyUrl,
+    int? Width,
+    int? Height)
+{
+    public static EmbedVideo Parse(JsonElement json)
+    {
+        var url = json.GetPropertyOrNull("url")?.GetNonWhiteSpaceStringOrNull();
+        var proxyUrl = json.GetPropertyOrNull("proxy_url")?.GetNonWhiteSpaceStringOrNull();
+        var width = json.GetPropertyOrNull("width")?.GetInt32OrNull();
+        var height = json.GetPropertyOrNull("height")?.GetInt32OrNull();
+
+        return new EmbedVideo(url, proxyUrl, width, height);
+    }
+}

DiscordChatExporter.Core/Discord/Data/Embeds/PlainImageEmbedProjection.cs

@@ -1,33 +0,0 @@
-using System.IO;
-using System.Linq;
-using System.Text.RegularExpressions;
-using DiscordChatExporter.Core.Utils;
-
-namespace DiscordChatExporter.Core.Discord.Data.Embeds;
-
-public record PlainImageEmbedProjection(string Url)
-{
-    public static PlainImageEmbedProjection? TryResolve(Embed embed)
-    {
-        if (string.IsNullOrWhiteSpace(embed.Url))
-            return null;
-
-        // Has to be an embed without any data (except URL and image)
-        if (!string.IsNullOrWhiteSpace(embed.Title) ||
-            embed.Timestamp is not null ||
-            embed.Author is not null ||
-            !string.IsNullOrWhiteSpace(embed.Description) ||
-            embed.Fields.Any() ||
-            embed.Footer is not null)
-        {
-            return null;
-        }
-
-        // Has to be an image file
-        var fileName = Regex.Match(embed.Url, @".+/([^?]*)").Groups[1].Value;
-        if (string.IsNullOrWhiteSpace(fileName) || !FileFormat.IsImage(Path.GetExtension(fileName)))
-            return null;
-
-        return new PlainImageEmbedProjection(embed.Url);
-    }
-}

DiscordChatExporter.Core/Discord/Data/Embeds/SpotifyTrackEmbedProjection.cs

@@ -21,6 +21,9 @@ public partial record SpotifyTrackEmbedProjection
 
     public static SpotifyTrackEmbedProjection? TryResolve(Embed embed)
     {
+        if (embed.Kind != EmbedKind.Link)
+            return null;
+
         if (string.IsNullOrWhiteSpace(embed.Url))
             return null;
 

DiscordChatExporter.Core/Discord/Data/Embeds/YouTubeVideoEmbedProjection.cs

@@ -42,6 +42,9 @@ public partial record YouTubeVideoEmbedProjection
 
     public static YouTubeVideoEmbedProjection? TryResolve(Embed embed)
     {
+        if (embed.Kind != EmbedKind.Video)
+            return null;
+
         if (string.IsNullOrWhiteSpace(embed.Url))
             return null;
 

DiscordChatExporter.Core/Discord/Data/Message.cs

@@ -44,7 +44,7 @@ public record Message(
         {
             var embed = embeds[i];
 
-            if (embed.Url?.Contains("://twitter.com/") == true)
+            if (embed.Url?.Contains("://twitter.com/", StringComparison.OrdinalIgnoreCase) == true)
             {
                 // Find embeds with the same URL that only contain a single image and nothing else
                 var trailingEmbeds = embeds
@@ -107,6 +107,7 @@ public record Message(
             MessageKind.ChannelNameChange => "Changed the channel name.",
             MessageKind.ChannelIconChange => "Changed the channel icon.",
             MessageKind.ChannelPinnedMessage => "Pinned a message.",
+            MessageKind.ThreadCreated => "Started a thread.",
             MessageKind.GuildMemberJoin => "Joined the server.",
             _ => json.GetPropertyOrNull("content")?.GetStringOrNull() ?? ""
         };

DiscordChatExporter.Core/Discord/Data/MessageKind.cs

@@ -11,5 +11,11 @@ public enum MessageKind
     ChannelIconChange = 5,
     ChannelPinnedMessage = 6,
     GuildMemberJoin = 7,
+    ThreadCreated = 18,
     Reply = 19
+}
+
+public static class MessageKindExtensions
+{
+    public static bool IsSystemNotification(this MessageKind c) => (int)c is >= 1 and <= 18;
 }

DiscordChatExporter.Core/Discord/DiscordClient.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
@@ -22,65 +23,99 @@ public class DiscordClient
     private readonly string _token;
     private readonly Uri _baseUri = new("https://discord.com/api/v9/", UriKind.Absolute);
 
-    private TokenKind _tokenKind = TokenKind.Unknown;
+    private TokenKind? _resolvedTokenKind;
 
     public DiscordClient(string token) => _token = token;
 
     private async ValueTask<HttpResponseMessage> GetResponseAsync(
         string url,
-        bool isBot,
+        TokenKind tokenKind,
         CancellationToken cancellationToken = default)
     {
-        using var request = new HttpRequestMessage(HttpMethod.Get, new Uri(_baseUri, url));
+        return await Http.ResponseResiliencePolicy.ExecuteAsync(async innerCancellationToken =>
+        {
+            using var request = new HttpRequestMessage(HttpMethod.Get, new Uri(_baseUri, url));
 
-        // Don't validate because token can have invalid characters
-        // https://github.com/Tyrrrz/DiscordChatExporter/issues/828
-        request.Headers.TryAddWithoutValidation(
-            "Authorization",
-            isBot ? $"Bot {_token}" : _token
-        );
+            // Don't validate because the token can have special characters
+            // https://github.com/Tyrrrz/DiscordChatExporter/issues/828
+            request.Headers.TryAddWithoutValidation(
+                "Authorization",
+                tokenKind == TokenKind.Bot
+                    ? $"Bot {_token}"
+                    : _token
+            );
 
-        return await Http.Client.SendAsync(
-            request,
-            HttpCompletionOption.ResponseHeadersRead,
+            var response = await Http.Client.SendAsync(
+                request,
+                HttpCompletionOption.ResponseHeadersRead,
+                innerCancellationToken
+            );
+
+            // If this was the last request available before hitting the rate limit,
+            // wait out the reset time so that future requests can succeed.
+            // This may add an unnecessary delay in case the user doesn't intend to
+            // make any more requests, but implementing a smarter solution would
+            // require properly keeping track of Discord's global/per-route/per-resource
+            // rate limits and that's just way too much effort.
+            // https://discord.com/developers/docs/topics/rate-limits
+            var remainingRequestCount = response
+                .Headers
+                .TryGetValue("X-RateLimit-Remaining")?
+                .Pipe(s => int.Parse(s, CultureInfo.InvariantCulture));
+
+            var resetAfterDelay = response
+                .Headers
+                .TryGetValue("X-RateLimit-Reset-After")?
+                .Pipe(s => TimeSpan.FromSeconds(double.Parse(s, CultureInfo.InvariantCulture)));
+
+            if (remainingRequestCount <= 0 && resetAfterDelay is not null)
+            {
+                var delay =
+                    // Adding a small buffer to the reset time reduces the chance of getting
+                    // rate limited again, because it allows for more requests to be released.
+                    (resetAfterDelay.Value + TimeSpan.FromSeconds(1))
+                    // Sometimes Discord returns an absurdly high value for the reset time, which
+                    // is not actually enforced by the server. So we cap it at a reasonable value.
+                    .Clamp(TimeSpan.Zero, TimeSpan.FromSeconds(60));
+
+                await Task.Delay(delay, innerCancellationToken);
+            }
+
+            return response;
+        }, cancellationToken);
+    }
+
+    private async ValueTask<TokenKind> GetTokenKindAsync(CancellationToken cancellationToken = default)
+    {
+        // Try authenticating as a user
+        using var userResponse = await GetResponseAsync(
+            "users/@me",
+            TokenKind.User,
             cancellationToken
         );
+
+        if (userResponse.StatusCode != HttpStatusCode.Unauthorized)
+            return TokenKind.User;
+
+        // Try authenticating as a bot
+        using var botResponse = await GetResponseAsync(
+            "users/@me",
+            TokenKind.Bot,
+            cancellationToken
+        );
+
+        if (botResponse.StatusCode != HttpStatusCode.Unauthorized)
+            return TokenKind.Bot;
+
+        throw DiscordChatExporterException.Unauthorized();
     }
 
     private async ValueTask<HttpResponseMessage> GetResponseAsync(
         string url,
         CancellationToken cancellationToken = default)
     {
-        return await Http.ResponseResiliencePolicy.ExecuteAsync(async innerCancellationToken =>
-        {
-            if (_tokenKind == TokenKind.User)
-                return await GetResponseAsync(url, false, innerCancellationToken);
-
-            if (_tokenKind == TokenKind.Bot)
-                return await GetResponseAsync(url, true, innerCancellationToken);
-
-            // Try to authenticate as user
-            var userResponse = await GetResponseAsync(url, false, innerCancellationToken);
-            if (userResponse.StatusCode != HttpStatusCode.Unauthorized)
-            {
-                _tokenKind = TokenKind.User;
-                return userResponse;
-            }
-
-            userResponse.Dispose();
-
-            // Otherwise, try to authenticate as bot
-            var botResponse = await GetResponseAsync(url, true, innerCancellationToken);
-            if (botResponse.StatusCode != HttpStatusCode.Unauthorized)
-            {
-                _tokenKind = TokenKind.Bot;
-                return botResponse;
-            }
-
-            // The token is probably invalid altogether.
-            // Return the last response anyway, upstream should handle the error.
-            return botResponse;
-        }, cancellationToken);
+        var tokenKind = _resolvedTokenKind ??= await GetTokenKindAsync(cancellationToken);
+        return await GetResponseAsync(url, tokenKind, cancellationToken);
     }
 
     private async ValueTask<JsonElement> GetJsonResponseAsync(

DiscordChatExporter.Core/Discord/Snowflake.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
-using System.Text.RegularExpressions;
 
 namespace DiscordChatExporter.Core.Discord;
 
@@ -29,7 +28,7 @@ public partial record struct Snowflake
             return null;
 
         // As number
-        if (Regex.IsMatch(str, @"^\d+$") && ulong.TryParse(str, NumberStyles.Number, formatProvider, out var value))
+        if (ulong.TryParse(str, NumberStyles.None, formatProvider, out var value))
         {
             return new Snowflake(value);
         }

DiscordChatExporter.Core/Discord/TokenKind.cs

@@ -2,7 +2,6 @@
 
 public enum TokenKind
 {
-    Unknown,
     User,
     Bot
 }

DiscordChatExporter.Core/DiscordChatExporter.Core.csproj

@@ -7,14 +7,14 @@
   <ItemGroup>
     <PackageReference Include="Gress" Version="2.0.1" />
     <PackageReference Include="JsonExtensions" Version="1.2.0" />
-    <PackageReference Include="MiniRazor.CodeGen" Version="2.2.1" />
     <PackageReference Include="Polly" Version="7.2.3" />
+    <PackageReference Include="RazorBlade" Version="0.4.1" />
     <PackageReference Include="Superpower" Version="3.0.0" />
-    <PackageReference Include="WebMarkupMin.Core" Version="2.12.0" />
+    <PackageReference Include="WebMarkupMin.Core" Version="2.13.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <AdditionalFiles Include="Exporting\Writers\Html\*.cshtml" IsRazorTemplate="true" />
+    <RazorBlade Include="Exporting\Writers\Html\*.cshtml" />
   </ItemGroup>
 
 </Project>

DiscordChatExporter.Core/Exporting/ExportAssetDownloader.cs

@@ -12,18 +12,18 @@ using DiscordChatExporter.Core.Utils.Extensions;
 
 namespace DiscordChatExporter.Core.Exporting;
 
-internal partial class MediaDownloader
+internal partial class ExportAssetDownloader
 {
     private readonly string _workingDirPath;
-    private readonly bool _reuseMedia;
+    private readonly bool _reuse;
 
-    // File paths of already downloaded media
+    // File paths of the previously downloaded assets
     private readonly Dictionary<string, string> _pathCache = new(StringComparer.Ordinal);
 
-    public MediaDownloader(string workingDirPath, bool reuseMedia)
+    public ExportAssetDownloader(string workingDirPath, bool reuse)
     {
         _workingDirPath = workingDirPath;
-        _reuseMedia = reuseMedia;
+        _reuse = reuse;
     }
 
     public async ValueTask<string> DownloadAsync(string url, CancellationToken cancellationToken = default)
@@ -35,7 +35,7 @@ internal partial class MediaDownloader
         var filePath = Path.Combine(_workingDirPath, fileName);
 
         // Reuse existing files if we're allowed to
-        if (!_reuseMedia || !File.Exists(filePath))
+        if (!_reuse || !File.Exists(filePath))
         {
             Directory.CreateDirectory(_workingDirPath);
 
@@ -76,7 +76,7 @@ internal partial class MediaDownloader
     }
 }
 
-internal partial class MediaDownloader
+internal partial class ExportAssetDownloader
 {
     private static string GetUrlHash(string url)
     {

DiscordChatExporter.Core/Exporting/ExportContext.cs

@@ -14,7 +14,7 @@ namespace DiscordChatExporter.Core.Exporting;
 
 internal class ExportContext
 {
-    private readonly MediaDownloader _mediaDownloader;
+    private readonly ExportAssetDownloader _assetDownloader;
 
     public ExportRequest Request { get; }
 
@@ -35,14 +35,14 @@ internal class ExportContext
         Channels = channels;
         Roles = roles;
 
-        _mediaDownloader = new MediaDownloader(request.OutputMediaDirPath, request.ShouldReuseMedia);
+        _assetDownloader = new ExportAssetDownloader(request.OutputAssetsDirPath, request.ShouldReuseAssets);
     }
 
     public string FormatDate(DateTimeOffset date) => Request.DateFormat switch
     {
         "unix" => date.ToUnixTimeSeconds().ToString(),
         "unixms" => date.ToUnixTimeMilliseconds().ToString(),
-        var dateFormat => date.ToLocalString(dateFormat)
+        var format => date.ToLocalString(format)
     };
 
     public Member? TryGetMember(Snowflake id) => Members.FirstOrDefault(m => m.Id == id);
@@ -63,14 +63,14 @@ internal class ExportContext
             .FirstOrDefault();
     }
 
-    public async ValueTask<string> ResolveMediaUrlAsync(string url, CancellationToken cancellationToken = default)
+    public async ValueTask<string> ResolveAssetUrlAsync(string url, CancellationToken cancellationToken = default)
     {
-        if (!Request.ShouldDownloadMedia)
+        if (!Request.ShouldDownloadAssets)
             return url;
 
         try
         {
-            var filePath = await _mediaDownloader.DownloadAsync(url, cancellationToken);
+            var filePath = await _assetDownloader.DownloadAsync(url, cancellationToken);
 
             // We want relative path so that the output files can be copied around without breaking.
             // Base directory path may be null if the file is stored at the root or relative to working directory.

DiscordChatExporter.Core/Exporting/ExportRequest.cs

@@ -19,8 +19,8 @@ public partial record ExportRequest(
     Snowflake? Before,
     PartitionLimit PartitionLimit,
     MessageFilter MessageFilter,
-    bool ShouldDownloadMedia,
-    bool ShouldReuseMedia,
+    bool ShouldDownloadAssets,
+    bool ShouldReuseAssets,
     string DateFormat)
 {
     private string? _outputBaseFilePath;
@@ -35,50 +35,11 @@ public partial record ExportRequest(
 
     public string OutputBaseDirPath => Path.GetDirectoryName(OutputBaseFilePath) ?? OutputPath;
 
-    public string OutputMediaDirPath => $"{OutputBaseFilePath}_Files{Path.DirectorySeparatorChar}";
+    public string OutputAssetsDirPath => $"{OutputBaseFilePath}_Files{Path.DirectorySeparatorChar}";
 }
 
 public partial record ExportRequest
 {
-    private static string GetOutputBaseFilePath(
-        Guild guild,
-        Channel channel,
-        string outputPath,
-        ExportFormat format,
-        Snowflake? after = null,
-        Snowflake? before = null)
-    {
-        // Formats path
-        outputPath = Regex.Replace(outputPath, "%.", m =>
-            PathEx.EscapeFileName(m.Value switch
-            {
-                "%g" => guild.Id.ToString(),
-                "%G" => guild.Name,
-                "%t" => channel.Category.Id.ToString(),
-                "%T" => channel.Category.Name,
-                "%c" => channel.Id.ToString(),
-                "%C" => channel.Name,
-                "%p" => channel.Position?.ToString() ?? "0",
-                "%P" => channel.Category.Position?.ToString() ?? "0",
-                "%a" => after?.ToDate().ToString("yyyy-MM-dd") ?? "",
-                "%b" => before?.ToDate().ToString("yyyy-MM-dd") ?? "",
-                "%d" => DateTimeOffset.Now.ToString("yyyy-MM-dd"),
-                "%%" => "%",
-                _ => m.Value
-            })
-        );
-
-        // Output is a directory
-        if (Directory.Exists(outputPath) || string.IsNullOrWhiteSpace(Path.GetExtension(outputPath)))
-        {
-            var fileName = GetDefaultOutputFileName(guild, channel, format, after, before);
-            return Path.Combine(outputPath, fileName);
-        }
-
-        // Output is a file
-        return outputPath;
-    }
-
     public static string GetDefaultOutputFileName(
         Guild guild,
         Channel channel,
@@ -120,4 +81,45 @@ public partial record ExportRequest
 
         return PathEx.EscapeFileName(buffer.ToString());
     }
+
+    private static string GetOutputBaseFilePath(
+        Guild guild,
+        Channel channel,
+        string outputPath,
+        ExportFormat format,
+        Snowflake? after = null,
+        Snowflake? before = null)
+    {
+        // Format path
+        var actualOutputPath = Regex.Replace(
+            outputPath,
+            "%.",
+            m => PathEx.EscapeFileName(m.Value switch
+            {
+                "%g" => guild.Id.ToString(),
+                "%G" => guild.Name,
+                "%t" => channel.Category.Id.ToString(),
+                "%T" => channel.Category.Name,
+                "%c" => channel.Id.ToString(),
+                "%C" => channel.Name,
+                "%p" => channel.Position?.ToString() ?? "0",
+                "%P" => channel.Category.Position?.ToString() ?? "0",
+                "%a" => after?.ToDate().ToString("yyyy-MM-dd") ?? "",
+                "%b" => before?.ToDate().ToString("yyyy-MM-dd") ?? "",
+                "%d" => DateTimeOffset.Now.ToString("yyyy-MM-dd"),
+                "%%" => "%",
+                _ => m.Value
+            })
+        );
+
+        // Output is a directory
+        if (Directory.Exists(actualOutputPath) || string.IsNullOrWhiteSpace(Path.GetExtension(actualOutputPath)))
+        {
+            var fileName = GetDefaultOutputFileName(guild, channel, format, after, before);
+            return Path.Combine(actualOutputPath, fileName);
+        }
+
+        // Output is a file
+        return actualOutputPath;
+    }
 }

DiscordChatExporter.Core/Exporting/Writers/CsvMessageWriter.cs

@@ -19,8 +19,10 @@ internal partial class CsvMessageWriter : MessageWriter
         _writer = new StreamWriter(stream);
     }
 
-    private string FormatMarkdown(string? markdown) =>
-        PlainTextMarkdownVisitor.Format(Context, markdown ?? "");
+    private ValueTask<string> FormatMarkdownAsync(
+        string markdown,
+        CancellationToken cancellationToken = default) =>
+        PlainTextMarkdownVisitor.FormatAsync(Context, markdown, cancellationToken);
 
     public override async ValueTask WritePreambleAsync(CancellationToken cancellationToken = default) =>
         await _writer.WriteLineAsync("AuthorID,Author,Date,Content,Attachments,Reactions");
@@ -37,7 +39,7 @@ internal partial class CsvMessageWriter : MessageWriter
 
             buffer
                 .AppendIfNotEmpty(',')
-                .Append(await Context.ResolveMediaUrlAsync(attachment.Url, cancellationToken));
+                .Append(await Context.ResolveAssetUrlAsync(attachment.Url, cancellationToken));
         }
 
         await _writer.WriteAsync(CsvEncode(buffer.ToString()));
@@ -84,7 +86,7 @@ internal partial class CsvMessageWriter : MessageWriter
         await _writer.WriteAsync(',');
 
         // Message content
-        await _writer.WriteAsync(CsvEncode(FormatMarkdown(message.Content)));
+        await _writer.WriteAsync(CsvEncode(await FormatMarkdownAsync(message.Content, cancellationToken)));
         await _writer.WriteAsync(',');
 
         // Attachments

DiscordChatExporter.Core/Exporting/Writers/Html/MessageExtensions.cs

@@ -0,0 +1,22 @@
+using System;
+using DiscordChatExporter.Core.Discord.Data;
+using DiscordChatExporter.Core.Discord.Data.Embeds;
+
+namespace DiscordChatExporter.Core.Exporting.Writers.Html;
+
+internal static class MessageExtensions
+{
+    // Message content is hidden if it's a link to an embedded media
+    // https://github.com/Tyrrrz/DiscordChatExporter/issues/682
+    public static bool IsContentHidden(this Message message)
+    {
+        if (message.Embeds.Count != 1)
+            return false;
+
+        var embed = message.Embeds[0];
+
+        return
+            string.Equals(message.Content.Trim(), embed.Url, StringComparison.OrdinalIgnoreCase) &&
+            embed.Kind is EmbedKind.Image or EmbedKind.Gifv;
+    }
+}

DiscordChatExporter.Core/Exporting/Writers/Html/MessageGroupTemplate.cshtml

@@ -1,39 +1,52 @@
 @using System
+@using System.Collections.Generic
 @using System.Linq
+@using System.Threading
 @using System.Threading.Tasks
 @using DiscordChatExporter.Core.Discord.Data
 @using DiscordChatExporter.Core.Discord.Data.Embeds
-@using DiscordChatExporter.Core.Exporting.Writers.Html;
+@using DiscordChatExporter.Core.Exporting
+@using DiscordChatExporter.Core.Exporting.Writers.Html
+@using DiscordChatExporter.Core.Exporting.Writers.MarkdownVisitors
 @using DiscordChatExporter.Core.Utils.Extensions
 
-@namespace DiscordChatExporter.Core.Exporting.Writers.Html
-@inherits MiniRazor.TemplateBase<MessageGroupTemplateContext>
+@inherits RazorBlade.HtmlTemplate
+
+@functions {
+    public required ExportContext ExportContext { get; init; }
+
+    public required IReadOnlyList<Message> Messages { get; init; }
+}
 
 @{
-    var firstMessage = Model.Messages.First();
+    ValueTask<string> ResolveAssetUrlAsync(string url) =>
+        ExportContext.ResolveAssetUrlAsync(url, CancellationToken);
 
-    ValueTask<string> ResolveUrlAsync(string url) => Model.ExportContext.ResolveMediaUrlAsync(url);
+    string FormatDate(DateTimeOffset date) =>
+        ExportContext.FormatDate(date);
 
-    string FormatDate(DateTimeOffset date) => Model.ExportContext.FormatDate(date);
+    ValueTask<string> FormatMarkdownAsync(string markdown) =>
+        HtmlMarkdownVisitor.FormatAsync(ExportContext, markdown, true, CancellationToken);
 
-    string FormatMarkdown(string markdown) => Model.FormatMarkdown(markdown);
+    ValueTask<string> FormatEmbedMarkdownAsync(string markdown) =>
+        HtmlMarkdownVisitor.FormatAsync(ExportContext, markdown, false, CancellationToken);
 
-    string FormatEmbedMarkdown(string markdown) => Model.FormatMarkdown(markdown, false);
+    var firstMessage = Messages.First();
 
-    var userMember = Model.ExportContext.TryGetMember(firstMessage.Author.Id);
+    var userMember = ExportContext.TryGetMember(firstMessage.Author.Id);
 
-    var userColor = Model.ExportContext.TryGetUserColor(firstMessage.Author.Id);
+    var userColor = ExportContext.TryGetUserColor(firstMessage.Author.Id);
 
     var userNick = firstMessage.Author.IsBot
         ? firstMessage.Author.Name
         : userMember?.Nick ?? firstMessage.Author.Name;
 
     var referencedUserMember = firstMessage.ReferencedMessage is not null
-        ? Model.ExportContext.TryGetMember(firstMessage.ReferencedMessage.Author.Id)
+        ? ExportContext.TryGetMember(firstMessage.ReferencedMessage.Author.Id)
         : null;
 
     var referencedUserColor = firstMessage.ReferencedMessage is not null
-        ? Model.ExportContext.TryGetUserColor(firstMessage.ReferencedMessage.Author.Id)
+        ? ExportContext.TryGetUserColor(firstMessage.ReferencedMessage.Author.Id)
         : null;
 
     var referencedUserNick = firstMessage.ReferencedMessage is not null
@@ -44,442 +57,482 @@
 }
 
 <div class="chatlog__message-group">
-@foreach (var (message, i) in Model.Messages.WithIndex())
+@foreach (var (message, i) in Messages.WithIndex())
 {
     var isFirst = i == 0;
 
-    // Hide message content if it only contains a link to an image which is embedded, and nothing else
-    var isContentHidden =
-        message.Embeds.Count == 1 &&
-        message.Content.Trim() == PlainImageEmbedProjection.TryResolve(message.Embeds.Single())?.Url;
-
-    var isReferencedContentHidden =
-        message.ReferencedMessage is not null &&
-        message.ReferencedMessage.Embeds.Count == 1 &&
-        message.ReferencedMessage.Content.Trim() == PlainImageEmbedProjection.TryResolve(message.ReferencedMessage.Embeds.Single())?.Url;
-
     <div id="chatlog__message-container-@message.Id" class="chatlog__message-container @(message.IsPinned ? "chatlog__message-container--pinned" : null)" data-message-id="@message.Id">
         <div class="chatlog__message">
-            @{/* Left side */}
-            <div class="chatlog__message-aside">
-                @if (isFirst)
-                {
-                    // Reference symbol
-                    if (message.Reference is not null)
-                    {
-                        <div class="chatlog__reference-symbol"></div>
-                    }
+            @{/* System notification */}
+            @if (message.Kind.IsSystemNotification())
+            {
+                // System notifications are grouped even if the message author is different.
+                // That's why we have to update the user values with the author of the current message.
+                userMember = ExportContext.TryGetMember(message.Author.Id);
+                userColor = ExportContext.TryGetUserColor(message.Author.Id);
+                userNick = message.Author.IsBot
+                    ? message.Author.Name
+                    : userMember?.Nick ?? message.Author.Name;
 
-                    // Avatar
-                    <img class="chatlog__avatar" src="@await ResolveUrlAsync(message.Author.AvatarUrl)" alt="Avatar" loading="lazy">
-                }
-                else
-                {
-                    <div class="chatlog__short-timestamp" title="@FormatDate(message.Timestamp)">@message.Timestamp.ToLocalString("t")</div>
-                }
-            </div>
+                <div class="chatlog__message-aside">
+                    <svg class="chatlog__system-notification-icon"><use href="#@message.Kind.ToString().ToDashCase().ToLowerInvariant()-icon"></use></svg>
+                </div>
 
-            @{/* Right side */}
-            <div class="chatlog__message-primary">
-                @if (isFirst)
-                {
-                    // Reference
-                    if (message.Reference is not null)
-                    {
-                        <div class="chatlog__reference">
-                            @if (message.ReferencedMessage is not null)
-                            {
-                                <img class="chatlog__reference-avatar" src="@await ResolveUrlAsync(message.ReferencedMessage.Author.AvatarUrl)" alt="Avatar" loading="lazy">
-                                <div class="chatlog__reference-author" style="@(referencedUserColor is not null ? $"color: rgb({referencedUserColor.Value.R}, {referencedUserColor.Value.G}, {referencedUserColor.Value.B})" : null)" title="@message.ReferencedMessage.Author.FullName">@referencedUserNick</div>
-                                <div class="chatlog__reference-content">
-                                    <span class="chatlog__reference-link" onclick="scrollToMessage(event, '@message.ReferencedMessage.Id')">
-                                        @if (!string.IsNullOrWhiteSpace(message.ReferencedMessage.Content) && !isReferencedContentHidden)
-                                        {
-                                            <!--wmm:ignore-->@Raw(FormatEmbedMarkdown(message.ReferencedMessage.Content))<!--/wmm:ignore-->
-                                        }
-                                        else if (message.ReferencedMessage.Attachments.Any() || message.ReferencedMessage.Embeds.Any())
-                                        {
-                                            <em>Click to see attachment</em>
-                                            <span>🖼️</span>
-                                        }
-                                        else
-                                        {
-                                            <em>Click to see original message</em>
-                                        }
-                                    </span>
+                <div class="chatlog__message-primary">
+                    @{/* Author name */}
+                    <span class="chatlog__system-notification-author" style="@(userColor is not null ? $"color: rgb({userColor.Value.R}, {userColor.Value.G}, {userColor.Value.B})" : null)" title="@message.Author.FullName" data-user-id="@message.Author.Id">@userNick</span>
 
-                                    @if (message.ReferencedMessage.EditedTimestamp is not null)
-                                    {
-                                        <span class="chatlog__reference-edited-timestamp" title="@FormatDate(message.ReferencedMessage.EditedTimestamp.Value)">(edited)</span>
-                                    }
-                                </div>
-                            }
-                            else
-                            {
-                                <div class="chatlog__reference-unknown">
-                                    Original message was deleted or could not be loaded.
-                                </div>
-                            }
-                        </div>
-                    }
-
-                    // Header
-                    <div class="chatlog__header">
-                        @{/* Author name */}
-                        <span class="chatlog__author" style="@(userColor is not null ? $"color: rgb({userColor.Value.R}, {userColor.Value.G}, {userColor.Value.B})" : null)" title="@message.Author.FullName" data-user-id="@message.Author.Id">@userNick</span>
-
-                        @{/* Bot label */}
-                        @if (message.Author.IsBot)
+                    @{/* System notification content */}
+                    <span class="chatlog__system-notification-content">
+                        @if (message.Kind == MessageKind.ChannelPinnedMessage && message.Reference is not null)
                         {
-                            <span class="chatlog__bot-label">BOT</span>
-                        }
-
-                        @{/* Timestamp */}
-                        <span class="chatlog__timestamp"><a href="#chatlog__message-container-@message.Id">@FormatDate(message.Timestamp)</a></span>
-                    </div>
-                }
-
-                @{/* Content */}
-                @if (!string.IsNullOrWhiteSpace(message.Content) || message.EditedTimestamp is not null)
-                {
-                    <div class="chatlog__content chatlog__markdown">
-                        @{/* Text */}
-                        @if (!isContentHidden)
-                        {
-                            <span class="chatlog__markdown-preserve"><!--wmm:ignore-->@Raw(FormatMarkdown(message.Content))<!--/wmm:ignore--></span>
-                        }
-
-                        @{/* Edited timestamp */}
-                        @if (message.EditedTimestamp is not null)
-                        {
-                            <span class="chatlog__edited-timestamp" title="@FormatDate(message.EditedTimestamp.Value)">(edited)</span>
-                        }
-                    </div>
-                }
-
-                @{/* Attachments */}
-                @foreach (var attachment in message.Attachments)
-                {
-                    <div class="chatlog__attachment @(attachment.IsSpoiler ? "chatlog__attachment--hidden" : null)" onclick="@(attachment.IsSpoiler ? "showSpoiler(event, this)" : null)">
-                        @{/* Spoiler caption */}
-                        @if (attachment.IsSpoiler)
-                        {
-                            <div class="chatlog__attachment-spoiler-caption">SPOILER</div>
-                        }
-
-                        @{/* Attachment preview */}
-                        @if (attachment.IsImage)
-                        {
-                            <a href="@await ResolveUrlAsync(attachment.Url)">
-                                <img class="chatlog__attachment-media" src="@await ResolveUrlAsync(attachment.Url)" alt="@(attachment.Description ?? "Image attachment")" title="Image: @attachment.FileName (@attachment.FileSize)" loading="lazy">
-                            </a>
-                        }
-                        else if (attachment.IsVideo)
-                        {
-                            <video class="chatlog__attachment-media" controls>
-                                <source src="@await ResolveUrlAsync(attachment.Url)" alt="@(attachment.Description ?? "Video attachment")" title="Video: @attachment.FileName (@attachment.FileSize)">
-                            </video>
-                        }
-                        else if (attachment.IsAudio)
-                        {
-                            <audio class="chatlog__attachment-media" controls>
-                                <source src="@await ResolveUrlAsync(attachment.Url)" alt="@(attachment.Description ?? "Audio attachment")" title="Audio: @attachment.FileName (@attachment.FileSize)">
-                            </audio>
+                            <span> pinned</span>
+                            <a class="chatlog__system-notification-link" href="#chatlog__message-container-@message.Reference.MessageId"> a message</a>
+                            <span> to this channel.</span>
                         }
                         else
                         {
-                            <div class="chatlog__attachment-generic">
-                                <svg class="chatlog__attachment-generic-icon">
-                                    <use href="#attachment-icon"/>
-                                </svg>
-                                <div class="chatlog__attachment-generic-name">
-                                    <a href="@await ResolveUrlAsync(attachment.Url)">
-                                        @attachment.FileName
-                                    </a>
-                                </div>
-                                <div class="chatlog__attachment-generic-size">
-                                    @attachment.FileSize
-                                </div>
+                            <span>@message.Content.ToLowerInvariant()</span>
+                        }
+                    </span>
+
+                    @{/* Timestamp */}
+                    <span class="chatlog__system-notification-timestamp">
+                        <a href="#chatlog__message-container-@message.Id">@FormatDate(message.Timestamp)</a>
+                    </span>
+                </div>
+            }
+            // Regular message
+            else
+            {
+                <div class="chatlog__message-aside">
+                    @if (isFirst)
+                    {
+                        // Reference symbol
+                        if (message.Reference is not null)
+                        {
+                            <div class="chatlog__reference-symbol"></div>
+                        }
+
+                        // Avatar
+                        <img class="chatlog__avatar" src="@await ResolveAssetUrlAsync(message.Author.AvatarUrl)" alt="Avatar" loading="lazy">
+                    }
+                    else
+                    {
+                        <div class="chatlog__short-timestamp" title="@FormatDate(message.Timestamp)">@message.Timestamp.ToLocalString("t")</div>
+                    }
+                </div>
+
+                <div class="chatlog__message-primary">
+                    @if (isFirst)
+                    {
+                        // Reference
+                        if (message.Reference is not null)
+                        {
+                            <div class="chatlog__reference">
+                                @if (message.ReferencedMessage is not null)
+                                {
+                                    <img class="chatlog__reference-avatar" src="@await ResolveAssetUrlAsync(message.ReferencedMessage.Author.AvatarUrl)" alt="Avatar" loading="lazy">
+                                    <div class="chatlog__reference-author" style="@(referencedUserColor is not null ? $"color: rgb({referencedUserColor.Value.R}, {referencedUserColor.Value.G}, {referencedUserColor.Value.B})" : null)" title="@message.ReferencedMessage.Author.FullName">@referencedUserNick</div>
+                                    <div class="chatlog__reference-content">
+                                        <span class="chatlog__reference-link" onclick="scrollToMessage(event, '@message.ReferencedMessage.Id')">
+                                            @if (!string.IsNullOrWhiteSpace(message.ReferencedMessage.Content) && !message.ReferencedMessage.IsContentHidden())
+                                            {
+                                                <!--wmm:ignore-->@Html.Raw(await FormatEmbedMarkdownAsync(message.ReferencedMessage.Content))<!--/wmm:ignore-->
+                                            }
+                                            else if (message.ReferencedMessage.Attachments.Any() || message.ReferencedMessage.Embeds.Any())
+                                            {
+                                                <em>Click to see attachment</em>
+                                                <span>🖼️</span>
+                                            }
+                                            else
+                                            {
+                                                <em>Click to see original message</em>
+                                            }
+                                        </span>
+
+                                        @if (message.ReferencedMessage.EditedTimestamp is not null)
+                                        {
+                                            <span class="chatlog__reference-edited-timestamp" title="@FormatDate(message.ReferencedMessage.EditedTimestamp.Value)">(edited)</span>
+                                        }
+                                    </div>
+                                }
+                                else
+                                {
+                                    <div class="chatlog__reference-unknown">
+                                        Original message was deleted or could not be loaded.
+                                    </div>
+                                }
                             </div>
                         }
-                    </div>
-                }
 
-                @{/* Embeds */}
-                @foreach (var embed in message.Embeds)
-                {
-                    // Plain image embed
-                    if (embed.TryGetPlainImage() is { } plainImageEmbed)
-                    {
-                        <div class="chatlog__embed">
-                            <a href="@await ResolveUrlAsync(plainImageEmbed.Url)">
-                                <img class="chatlog__embed-plainimage" src="@await ResolveUrlAsync(plainImageEmbed.Url)" alt="Embedded image" loading="lazy">
-                            </a>
-                        </div>
-                    }
-                    // Spotify embed
-                    else if (embed.TryGetSpotifyTrack() is { } spotifyTrackEmbed)
-                    {
-                        <div class="chatlog__embed">
-                            <div class="chatlog__embed-spotify-container">
-                                <iframe class="chatlog__embed-spotify" src="@spotifyTrackEmbed.Url" width="400" height="80" allowtransparency="true" allow="encrypted-media"></iframe>
-                            </div>
-                        </div>
-                    }
-                    // YouTube embed
-                    else if (embed.TryGetYouTubeVideo() is { } youTubeVideoEmbed)
-                    {
-                        <div class="chatlog__embed">
-                            @{/* Color pill */}
-                            @if (embed.Color is not null)
+                        // Header
+                        <div class="chatlog__header">
+                            @{/* Author name */}
+                            <span class="chatlog__author" style="@(userColor is not null ? $"color: rgb({userColor.Value.R}, {userColor.Value.G}, {userColor.Value.B})" : null)" title="@message.Author.FullName" data-user-id="@message.Author.Id">@userNick</span>
+
+                            @{/* Bot label */}
+                            @if (message.Author.IsBot)
                             {
-                                <div class="chatlog__embed-color-pill" style="background-color: rgba(@embed.Color.Value.R, @embed.Color.Value.G, @embed.Color.Value.B, @embed.Color.Value.A)"></div>
+                                <span class="chatlog__bot-label">BOT</span>
+                            }
+
+                            @{/* Timestamp */}
+                            <span class="chatlog__timestamp"><a href="#chatlog__message-container-@message.Id">@FormatDate(message.Timestamp)</a></span>
+                        </div>
+                    }
+
+                    @{/* Content */}
+                    @if ((!string.IsNullOrWhiteSpace(message.Content) && !message.IsContentHidden()) || message.EditedTimestamp is not null)
+                    {
+                        <div class="chatlog__content chatlog__markdown">
+                            @{/* Text */}
+                            @if (!string.IsNullOrWhiteSpace(message.Content) && !message.IsContentHidden())
+                            {
+                                <span class="chatlog__markdown-preserve"><!--wmm:ignore-->@Html.Raw(await FormatMarkdownAsync(message.Content))<!--/wmm:ignore--></span>
+                            }
+
+                            @{/* Edited timestamp */}
+                            @if (message.EditedTimestamp is not null)
+                            {
+                                <span class="chatlog__edited-timestamp" title="@FormatDate(message.EditedTimestamp.Value)">(edited)</span>
+                            }
+                        </div>
+                    }
+
+                    @{/* Attachments */}
+                    @foreach (var attachment in message.Attachments)
+                    {
+                        <div class="chatlog__attachment @(attachment.IsSpoiler ? "chatlog__attachment--hidden" : null)" onclick="@(attachment.IsSpoiler ? "showSpoiler(event, this)" : null)">
+                            @{/* Spoiler caption */}
+                            @if (attachment.IsSpoiler)
+                            {
+                                <div class="chatlog__attachment-spoiler-caption">SPOILER</div>
+                            }
+
+                            @{/* Attachment preview */}
+                            @if (attachment.IsImage)
+                            {
+                                <a href="@await ResolveAssetUrlAsync(attachment.Url)">
+                                    <img class="chatlog__attachment-media" src="@await ResolveAssetUrlAsync(attachment.Url)" alt="@(attachment.Description ?? "Image attachment")" title="Image: @attachment.FileName (@attachment.FileSize)" loading="lazy">
+                                </a>
+                            }
+                            else if (attachment.IsVideo)
+                            {
+                                <video class="chatlog__attachment-media" controls>
+                                    <source src="@await ResolveAssetUrlAsync(attachment.Url)" alt="@(attachment.Description ?? "Video attachment")" title="Video: @attachment.FileName (@attachment.FileSize)">
+                                </video>
+                            }
+                            else if (attachment.IsAudio)
+                            {
+                                <audio class="chatlog__attachment-media" controls>
+                                    <source src="@await ResolveAssetUrlAsync(attachment.Url)" alt="@(attachment.Description ?? "Audio attachment")" title="Audio: @attachment.FileName (@attachment.FileSize)">
+                                </audio>
                             }
                             else
                             {
-                                <div class="chatlog__embed-color-pill chatlog__embed-color-pill--default"></div>
+                                <div class="chatlog__attachment-generic">
+                                    <svg class="chatlog__attachment-generic-icon">
+                                        <use href="#attachment-icon"/>
+                                    </svg>
+                                    <div class="chatlog__attachment-generic-name">
+                                        <a href="@await ResolveAssetUrlAsync(attachment.Url)">
+                                            @attachment.FileName
+                                        </a>
+                                    </div>
+                                    <div class="chatlog__attachment-generic-size">
+                                        @attachment.FileSize
+                                    </div>
+                                </div>
                             }
+                        </div>
+                    }
 
-                            <div class="chatlog__embed-content-container">
-                                <div class="chatlog__embed-content">
-                                    <div class="chatlog__embed-text">
-                                        @{/* Embed author */}
-                                        @if (embed.Author is not null)
-                                        {
-                                            <div class="chatlog__embed-author-container">
-                                                @if (!string.IsNullOrWhiteSpace(embed.Author.IconUrl))
-                                                {
-                                                    <img class="chatlog__embed-author-icon" src="@await ResolveUrlAsync(embed.Author.IconProxyUrl ?? embed.Author.IconUrl)" alt="Author icon" loading="lazy" onerror="this.style.visibility='hidden'">
-                                                }
+                    @{/* Embeds */}
+                    @foreach (var embed in message.Embeds)
+                    {
+                        // Spotify embed
+                        if (embed.TryGetSpotifyTrack() is { } spotifyTrackEmbed)
+                        {
+                            <div class="chatlog__embed">
+                                <div class="chatlog__embed-spotify-container">
+                                    <iframe class="chatlog__embed-spotify" src="@spotifyTrackEmbed.Url" width="400" height="80" allowtransparency="true" allow="encrypted-media"></iframe>
+                                </div>
+                            </div>
+                        }
+                        // YouTube embed
+                        else if (embed.TryGetYouTubeVideo() is { } youTubeVideoEmbed)
+                        {
+                            <div class="chatlog__embed">
+                                @{/* Color pill */}
+                                @if (embed.Color is not null)
+                                {
+                                    <div class="chatlog__embed-color-pill" style="background-color: rgba(@embed.Color.Value.R, @embed.Color.Value.G, @embed.Color.Value.B, @embed.Color.Value.A)"></div>
+                                }
+                                else
+                                {
+                                    <div class="chatlog__embed-color-pill chatlog__embed-color-pill--default"></div>
+                                }
 
-                                                @if (!string.IsNullOrWhiteSpace(embed.Author.Name))
-                                                {
-                                                    if (!string.IsNullOrWhiteSpace(embed.Author.Url))
+                                <div class="chatlog__embed-content-container">
+                                    <div class="chatlog__embed-content">
+                                        <div class="chatlog__embed-text">
+                                            @{/* Embed author */}
+                                            @if (embed.Author is not null)
+                                            {
+                                                <div class="chatlog__embed-author-container">
+                                                    @if (!string.IsNullOrWhiteSpace(embed.Author.IconUrl))
                                                     {
-                                                        <a class="chatlog__embed-author-link" href="@embed.Author.Url">
+                                                        <img class="chatlog__embed-author-icon" src="@await ResolveAssetUrlAsync(embed.Author.IconProxyUrl ?? embed.Author.IconUrl)" alt="Author icon" loading="lazy" onerror="this.style.visibility='hidden'">
+                                                    }
+
+                                                    @if (!string.IsNullOrWhiteSpace(embed.Author.Name))
+                                                    {
+                                                        if (!string.IsNullOrWhiteSpace(embed.Author.Url))
+                                                        {
+                                                            <a class="chatlog__embed-author-link" href="@embed.Author.Url">
+                                                                <div class="chatlog__embed-author">@embed.Author.Name</div>
+                                                            </a>
+                                                        }
+                                                        else
+                                                        {
                                                             <div class="chatlog__embed-author">@embed.Author.Name</div>
+                                                        }
+                                                    }
+                                                </div>
+                                            }
+
+                                            @{/* Embed title */}
+                                            @if (!string.IsNullOrWhiteSpace(embed.Title))
+                                            {
+                                                <div class="chatlog__embed-title">
+                                                    @if (!string.IsNullOrWhiteSpace(embed.Url))
+                                                    {
+                                                        <a class="chatlog__embed-title-link" href="@embed.Url">
+                                                            <div class="chatlog__markdown chatlog__markdown-preserve"><!--wmm:ignore-->@Html.Raw(await FormatEmbedMarkdownAsync(embed.Title))<!--/wmm:ignore--></div>
                                                         </a>
                                                     }
                                                     else
                                                     {
-                                                        <div class="chatlog__embed-author">@embed.Author.Name</div>
+                                                        <div class="chatlog__markdown chatlog__markdown-preserve"><!--wmm:ignore-->@Html.Raw(await FormatEmbedMarkdownAsync(embed.Title))<!--/wmm:ignore--></div>
                                                     }
-                                                }
-                                            </div>
-                                        }
+                                                </div>
+                                            }
 
-                                        @{/* Embed title */}
-                                        @if (!string.IsNullOrWhiteSpace(embed.Title))
-                                        {
-                                            <div class="chatlog__embed-title">
-                                                @if (!string.IsNullOrWhiteSpace(embed.Url))
-                                                {
-                                                    <a class="chatlog__embed-title-link" href="@embed.Url">
-                                                        <div class="chatlog__markdown chatlog__markdown-preserve"><!--wmm:ignore-->@Raw(FormatEmbedMarkdown(embed.Title))<!--/wmm:ignore--></div>
-                                                    </a>
-                                                }
-                                                else
-                                                {
-                                                    <div class="chatlog__markdown chatlog__markdown-preserve"><!--wmm:ignore-->@Raw(FormatEmbedMarkdown(embed.Title))<!--/wmm:ignore--></div>
-                                                }
+                                            @{/* Video player */}
+                                            <div class="chatlog__embed-youtube-container">
+                                                <iframe class="chatlog__embed-youtube" src="@youTubeVideoEmbed.Url" width="400" height="225"></iframe>
                                             </div>
-                                        }
-
-                                        @{/* Video player */}
-                                        <div class="chatlog__embed-youtube-container">
-                                            <iframe class="chatlog__embed-youtube" src="@youTubeVideoEmbed.Url" width="400" height="225"></iframe>
                                         </div>
                                     </div>
                                 </div>
                             </div>
-                        </div>
-                    }
-                    // Generic embed
-                    else
-                    {
-                        <div class="chatlog__embed">
-                            @{/* Color pill */}
-                            @if (embed.Color is not null)
-                            {
-                                <div class="chatlog__embed-color-pill" style="background-color: rgba(@embed.Color.Value.R, @embed.Color.Value.G, @embed.Color.Value.B, @embed.Color.Value.A)"></div>
-                            }
-                            else
-                            {
-                                <div class="chatlog__embed-color-pill chatlog__embed-color-pill--default"></div>
-                            }
+                        }
+                        // Generic image embed
+                        else if (embed.Kind == EmbedKind.Image && !string.IsNullOrWhiteSpace(embed.Url))
+                        {
+                            <div class="chatlog__embed">
+                                <a href="@await ResolveAssetUrlAsync(embed.Url)">
+                                    <img class="chatlog__embed-generic-image" src="@await ResolveAssetUrlAsync(embed.Url)" alt="Embedded image" loading="lazy">
+                                </a>
+                            </div>
+                        }
+                        // Generic gifv embed
+                        else if (embed.Kind == EmbedKind.Gifv && !string.IsNullOrWhiteSpace(embed.Video?.Url))
+                        {
+                            <div class="chatlog__embed">
+                                <video class="chatlog__embed-generic-gifv" loop width="@embed.Video.Width" height="@embed.Video.Height" onmouseover="this.play()" onmouseout="this.pause()">
+                                    <source src="@await ResolveAssetUrlAsync(embed.Video.ProxyUrl ?? embed.Video.Url)" alt="Embedded video">
+                                </video>
+                            </div>
+                        }
+                        // Rich embed
+                        else
+                        {
+                            <div class="chatlog__embed">
+                                @{/* Color pill */}
+                                @if (embed.Color is not null)
+                                {
+                                    <div class="chatlog__embed-color-pill" style="background-color: rgba(@embed.Color.Value.R, @embed.Color.Value.G, @embed.Color.Value.B, @embed.Color.Value.A)"></div>
+                                }
+                                else
+                                {
+                                    <div class="chatlog__embed-color-pill chatlog__embed-color-pill--default"></div>
+                                }
 
-                            <div class="chatlog__embed-content-container">
-                                <div class="chatlog__embed-content">
-                                    <div class="chatlog__embed-text">
-                                        @{/* Embed author */}
-                                        @if (embed.Author is not null)
-                                        {
-                                            <div class="chatlog__embed-author-container">
-                                                @if (!string.IsNullOrWhiteSpace(embed.Author.IconUrl))
-                                                {
-                                                    <img class="chatlog__embed-author-icon" src="@await ResolveUrlAsync(embed.Author.IconProxyUrl ?? embed.Author.IconUrl)" alt="Author icon" loading="lazy" onerror="this.style.visibility='hidden'">
-                                                }
-
-                                                @if (!string.IsNullOrWhiteSpace(embed.Author.Name))
-                                                {
-                                                    if (!string.IsNullOrWhiteSpace(embed.Author.Url))
+                                <div class="chatlog__embed-content-container">
+                                    <div class="chatlog__embed-content">
+                                        <div class="chatlog__embed-text">
+                                            @{/* Embed author */}
+                                            @if (embed.Author is not null)
+                                            {
+                                                <div class="chatlog__embed-author-container">
+                                                    @if (!string.IsNullOrWhiteSpace(embed.Author.IconUrl))
                                                     {
-                                                        <a class="chatlog__embed-author-link" href="@embed.Author.Url">
+                                                        <img class="chatlog__embed-author-icon" src="@await ResolveAssetUrlAsync(embed.Author.IconProxyUrl ?? embed.Author.IconUrl)" alt="Author icon" loading="lazy" onerror="this.style.visibility='hidden'">
+                                                    }
+
+                                                    @if (!string.IsNullOrWhiteSpace(embed.Author.Name))
+                                                    {
+                                                        if (!string.IsNullOrWhiteSpace(embed.Author.Url))
+                                                        {
+                                                            <a class="chatlog__embed-author-link" href="@embed.Author.Url">
+                                                                <div class="chatlog__embed-author">@embed.Author.Name</div>
+                                                            </a>
+                                                        }
+                                                        else
+                                                        {
                                                             <div class="chatlog__embed-author">@embed.Author.Name</div>
+                                                        }
+                                                    }
+                                                </div>
+                                            }
+
+                                            @{/* Embed title */}
+                                            @if (!string.IsNullOrWhiteSpace(embed.Title))
+                                            {
+                                                <div class="chatlog__embed-title">
+                                                    @if (!string.IsNullOrWhiteSpace(embed.Url))
+                                                    {
+                                                        <a class="chatlog__embed-title-link" href="@embed.Url">
+                                                            <div class="chatlog__markdown chatlog__markdown-preserve"><!--wmm:ignore-->@Html.Raw(await FormatEmbedMarkdownAsync(embed.Title))<!--/wmm:ignore--></div>
                                                         </a>
                                                     }
                                                     else
                                                     {
-                                                        <div class="chatlog__embed-author">@embed.Author.Name</div>
+                                                        <div class="chatlog__markdown chatlog__markdown-preserve"><!--wmm:ignore-->@Html.Raw(await FormatEmbedMarkdownAsync(embed.Title))<!--/wmm:ignore--></div>
                                                     }
-                                                }
-                                            </div>
-                                        }
+                                                </div>
+                                            }
 
-                                        @{/* Embed title */}
-                                        @if (!string.IsNullOrWhiteSpace(embed.Title))
+                                            @{/* Embed description */}
+                                            @if (!string.IsNullOrWhiteSpace(embed.Description))
+                                            {
+                                                <div class="chatlog__embed-description">
+                                                    <div class="chatlog__markdown chatlog__markdown-preserve"><!--wmm:ignore-->@Html.Raw(await FormatEmbedMarkdownAsync(embed.Description))<!--/wmm:ignore--></div>
+                                                </div>
+                                            }
+
+                                            @{/* Embed fields */}
+                                            @if (embed.Fields.Any())
+                                            {
+                                                <div class="chatlog__embed-fields">
+                                                    @foreach (var field in embed.Fields)
+                                                    {
+                                                        <div class="chatlog__embed-field @(field.IsInline ? "chatlog__embed-field--inline" : null)">
+                                                            @if (!string.IsNullOrWhiteSpace(field.Name))
+                                                            {
+                                                                <div class="chatlog__embed-field-name">
+                                                                    <div class="chatlog__markdown chatlog__markdown-preserve"><!--wmm:ignore-->@Html.Raw(await FormatEmbedMarkdownAsync(field.Name))<!--/wmm:ignore--></div>
+                                                                </div>
+                                                            }
+
+                                                            @if (!string.IsNullOrWhiteSpace(field.Value))
+                                                            {
+                                                                <div class="chatlog__embed-field-value">
+                                                                    <div class="chatlog__markdown chatlog__markdown-preserve"><!--wmm:ignore-->@Html.Raw(await FormatEmbedMarkdownAsync(field.Value))<!--/wmm:ignore--></div>
+                                                                </div>
+                                                            }
+                                                        </div>
+                                                    }
+                                                </div>
+                                            }
+                                        </div>
+
+                                        @{/* Embed content */}
+                                        @if (embed.Thumbnail is not null && !string.IsNullOrWhiteSpace(embed.Thumbnail.Url))
                                         {
-                                            <div class="chatlog__embed-title">
-                                                @if (!string.IsNullOrWhiteSpace(embed.Url))
-                                                {
-                                                    <a class="chatlog__embed-title-link" href="@embed.Url">
-                                                        <div class="chatlog__markdown chatlog__markdown-preserve"><!--wmm:ignore-->@Raw(FormatEmbedMarkdown(embed.Title))<!--/wmm:ignore--></div>
-                                                    </a>
-                                                }
-                                                else
-                                                {
-                                                    <div class="chatlog__markdown chatlog__markdown-preserve"><!--wmm:ignore-->@Raw(FormatEmbedMarkdown(embed.Title))<!--/wmm:ignore--></div>
-                                                }
-                                            </div>
-                                        }
-
-                                        @{/* Embed description */}
-                                        @if (!string.IsNullOrWhiteSpace(embed.Description))
-                                        {
-                                            <div class="chatlog__embed-description">
-                                                <div class="chatlog__markdown chatlog__markdown-preserve"><!--wmm:ignore-->@Raw(FormatEmbedMarkdown(embed.Description))<!--/wmm:ignore--></div>
-                                            </div>
-                                        }
-
-                                        @{/* Embed fields */}
-                                        @if (embed.Fields.Any())
-                                        {
-                                            <div class="chatlog__embed-fields">
-                                                @foreach (var field in embed.Fields)
-                                                {
-                                                    <div class="chatlog__embed-field @(field.IsInline ? "chatlog__embed-field--inline" : null)">
-                                                        @if (!string.IsNullOrWhiteSpace(field.Name))
-                                                        {
-                                                            <div class="chatlog__embed-field-name">
-                                                                <div class="chatlog__markdown chatlog__markdown-preserve"><!--wmm:ignore-->@Raw(FormatEmbedMarkdown(field.Name))<!--/wmm:ignore--></div>
-                                                            </div>
-                                                        }
-
-                                                        @if (!string.IsNullOrWhiteSpace(field.Value))
-                                                        {
-                                                            <div class="chatlog__embed-field-value">
-                                                                <div class="chatlog__markdown chatlog__markdown-preserve"><!--wmm:ignore-->@Raw(FormatEmbedMarkdown(field.Value))<!--/wmm:ignore--></div>
-                                                            </div>
-                                                        }
-                                                    </div>
-                                                }
+                                            <div class="chatlog__embed-thumbnail-container">
+                                                <a class="chatlog__embed-thumbnail-link" href="@await ResolveAssetUrlAsync(embed.Thumbnail.ProxyUrl ?? embed.Thumbnail.Url)">
+                                                    <img class="chatlog__embed-thumbnail" src="@await ResolveAssetUrlAsync(embed.Thumbnail.ProxyUrl ?? embed.Thumbnail.Url)" alt="Thumbnail" loading="lazy">
+                                                </a>
                                             </div>
                                         }
                                     </div>
 
-                                    @{/* Embed content */}
-                                    @if (embed.Thumbnail is not null && !string.IsNullOrWhiteSpace(embed.Thumbnail.Url))
+                                    @{/* Embed images */}
+                                    @if (embed.Images.Any())
                                     {
-                                        <div class="chatlog__embed-thumbnail-container">
-                                            <a class="chatlog__embed-thumbnail-link" href="@await ResolveUrlAsync(embed.Thumbnail.ProxyUrl ?? embed.Thumbnail.Url)">
-                                                <img class="chatlog__embed-thumbnail" src="@await ResolveUrlAsync(embed.Thumbnail.ProxyUrl ?? embed.Thumbnail.Url)" alt="Thumbnail" loading="lazy">
-                                            </a>
+                                        <div class="chatlog__embed-images @(embed.Images.Count == 1 ? "chatlog__embed-images--single" : null)">
+                                            @foreach (var image in embed.Images)
+                                            {
+                                                if (!string.IsNullOrWhiteSpace(image.Url))
+                                                {
+                                                    <div class="chatlog__embed-image-container">
+                                                        <a class="chatlog__embed-image-link" href="@await ResolveAssetUrlAsync(image.ProxyUrl ?? image.Url)">
+                                                            <img class="chatlog__embed-image" src="@await ResolveAssetUrlAsync(image.ProxyUrl ?? image.Url)" alt="Image" loading="lazy">
+                                                        </a>
+                                                    </div>
+                                                }
+                                            }
+                                        </div>
+                                    }
+
+                                    @{/* Embed footer & icon */}
+                                    @if (embed.Footer is not null || embed.Timestamp is not null)
+                                    {
+                                        <div class="chatlog__embed-footer">
+                                            @{/* Footer icon */}
+                                            @if (!string.IsNullOrWhiteSpace(embed.Footer?.IconUrl))
+                                            {
+                                                <img class="chatlog__embed-footer-icon" src="@await ResolveAssetUrlAsync(embed.Footer.IconProxyUrl ?? embed.Footer.IconUrl)" alt="Footer icon" loading="lazy">
+                                            }
+
+                                            <span class="chatlog__embed-footer-text">
+                                                @{/* Footer text */}
+                                                @if (!string.IsNullOrWhiteSpace(embed.Footer?.Text))
+                                                {
+                                                    @embed.Footer.Text
+                                                }
+
+                                                @if (!string.IsNullOrWhiteSpace(embed.Footer?.Text) && embed.Timestamp is not null)
+                                                {
+                                                    @(" • ")
+                                                }
+
+                                                @{/* Embed timestamp */}
+                                                @if (embed.Timestamp is not null)
+                                                {
+                                                    @FormatDate(embed.Timestamp.Value)
+                                                }
+                                            </span>
                                         </div>
                                     }
                                 </div>
-
-                                @{/* Embed images */}
-                                @if (embed.Images.Any())
-                                {
-                                    <div class="chatlog__embed-images @(embed.Images.Count == 1 ? "chatlog__embed-images--single" : null)">
-                                        @foreach (var image in embed.Images)
-                                        {
-                                            if (!string.IsNullOrWhiteSpace(image.Url))
-                                            {
-                                                <div class="chatlog__embed-image-container">
-                                                    <a class="chatlog__embed-image-link" href="@await ResolveUrlAsync(image.ProxyUrl ?? image.Url)">
-                                                        <img class="chatlog__embed-image" src="@await ResolveUrlAsync(image.ProxyUrl ?? image.Url)" alt="Image" loading="lazy">
-                                                    </a>
-                                                </div>
-                                            }
-                                        }
-                                    </div>
-                                }
-
-                                @{/* Embed footer & icon */}
-                                @if (embed.Footer is not null || embed.Timestamp is not null)
-                                {
-                                    <div class="chatlog__embed-footer">
-                                        @{/* Footer icon */}
-                                        @if (!string.IsNullOrWhiteSpace(embed.Footer?.IconUrl))
-                                        {
-                                            <img class="chatlog__embed-footer-icon" src="@await ResolveUrlAsync(embed.Footer.IconProxyUrl ?? embed.Footer.IconUrl)" alt="Footer icon" loading="lazy">
-                                        }
-
-                                        <span class="chatlog__embed-footer-text">
-                                            @{/* Footer text */}
-                                            @if (!string.IsNullOrWhiteSpace(embed.Footer?.Text))
-                                            {
-                                                @embed.Footer.Text
-                                            }
-
-                                            @if (!string.IsNullOrWhiteSpace(embed.Footer?.Text) && embed.Timestamp is not null)
-                                            {
-                                                @(" • ")
-                                            }
-
-                                            @{/* Embed timestamp */}
-                                            @if (embed.Timestamp is not null)
-                                            {
-                                                @FormatDate(embed.Timestamp.Value)
-                                            }
-                                        </span>
-                                    </div>
-                                }
                             </div>
+                        }
+                    }
+
+                    @{/* Stickers */}
+                    @foreach (var sticker in message.Stickers)
+                    {
+                        <div class="chatlog__sticker" title="@sticker.Name">
+                            @if (sticker.Format is StickerFormat.Png or StickerFormat.PngAnimated)
+                            {
+                                <img class="chatlog__sticker--media" src="@await ResolveAssetUrlAsync(sticker.SourceUrl)" alt="Sticker">
+                            }
+                            else if (sticker.Format == StickerFormat.Lottie)
+                            {
+                                <div class="chatlog__sticker--media" data-source="@await ResolveAssetUrlAsync(sticker.SourceUrl)"></div>
+                            }
                         </div>
                     }
-                }
 
-                @{/* Stickers */}
-                @foreach (var sticker in message.Stickers)
-                {
-                    <div class="chatlog__sticker" title="@sticker.Name">
-                        @if (sticker.Format is StickerFormat.Png or StickerFormat.PngAnimated)
-                        {
-                            <img class="chatlog__sticker--media" src="@await ResolveUrlAsync(sticker.SourceUrl)" alt="Sticker">
-                        }
-                        else if (sticker.Format == StickerFormat.Lottie)
-                        {
-                            <div class="chatlog__sticker--media" data-source="@await ResolveUrlAsync(sticker.SourceUrl)"></div>
-                        }
-                    </div>
-                }
-
-                @{/* Message reactions */}
-                @if (message.Reactions.Any())
-                {
-                    <div class="chatlog__reactions">
-                        @foreach (var reaction in message.Reactions)
-                        {
-                            <div class="chatlog__reaction" title="@reaction.Emoji.Code">
-                                <img class="chatlog__emoji chatlog__emoji--small" alt="@reaction.Emoji.Name" src="@await ResolveUrlAsync(reaction.Emoji.ImageUrl)" loading="lazy">
-                                <span class="chatlog__reaction-count">@reaction.Count</span>
-                            </div>
-                        }
-                    </div>
-                }
-            </div>
+                    @{/* Message reactions */}
+                    @if (message.Reactions.Any())
+                    {
+                        <div class="chatlog__reactions">
+                            @foreach (var reaction in message.Reactions)
+                            {
+                                <div class="chatlog__reaction" title="@reaction.Emoji.Code">
+                                    <img class="chatlog__emoji chatlog__emoji--small" alt="@reaction.Emoji.Name" src="@await ResolveAssetUrlAsync(reaction.Emoji.ImageUrl)" loading="lazy">
+                                    <span class="chatlog__reaction-count">@reaction.Count</span>
+                                </div>
+                            }
+                        </div>
+                    }
+                </div>
+            }
         </div>
     </div>
 }

DiscordChatExporter.Core/Exporting/Writers/Html/MessageGroupTemplateContext.cs

@@ -1,21 +0,0 @@
-using System.Collections.Generic;
-using DiscordChatExporter.Core.Discord.Data;
-using DiscordChatExporter.Core.Exporting.Writers.MarkdownVisitors;
-
-namespace DiscordChatExporter.Core.Exporting.Writers.Html;
-
-internal class MessageGroupTemplateContext
-{
-    public ExportContext ExportContext { get; }
-
-    public IReadOnlyList<Message> Messages { get; }
-
-    public MessageGroupTemplateContext(ExportContext exportContext, IReadOnlyList<Message> messages)
-    {
-        ExportContext = exportContext;
-        Messages = messages;
-    }
-
-    public string FormatMarkdown(string? markdown, bool isJumboAllowed = true) =>
-        HtmlMarkdownVisitor.Format(ExportContext, markdown ?? "", isJumboAllowed);
-}

DiscordChatExporter.Core/Exporting/Writers/Html/PostambleTemplate.cshtml

@@ -1,15 +1,23 @@
-@using DiscordChatExporter.Core.Exporting.Writers.Html;
+@using System.Threading
+@using DiscordChatExporter.Core.Exporting
 
-@namespace DiscordChatExporter.Core.Exporting.Writers.Html
-@inherits MiniRazor.TemplateBase<PostambleTemplateContext>
+@inherits RazorBlade.HtmlTemplate
 
-@{/* Close elements opened by preamble */}
+@functions {
+    public required ExportContext ExportContext { get; init; }
+
+    public required long MessagesWritten { get; init; }
+}
+
+@{
+    /* Close elements opened by preamble */
+}
 <!--wmm:ignore-->
 </div>
 <!--/wmm:ignore-->
 
 <div class="postamble">
-    <div class="postamble__entry">Exported @Model.MessagesWritten.ToString("N0") message(s)</div>
+    <div class="postamble__entry">Exported @MessagesWritten.ToString("N0") message(s)</div>
 </div>
 
 </body>

DiscordChatExporter.Core/Exporting/Writers/Html/PostambleTemplateContext.cs

@@ -1,14 +0,0 @@
-namespace DiscordChatExporter.Core.Exporting.Writers.Html;
-
-internal class PostambleTemplateContext
-{
-    public ExportContext ExportContext { get; }
-
-    public long MessagesWritten { get; }
-
-    public PostambleTemplateContext(ExportContext exportContext, long messagesWritten)
-    {
-        ExportContext = exportContext;
-        MessagesWritten = messagesWritten;
-    }
-}

DiscordChatExporter.Core/Exporting/Writers/Html/PreambleTemplate.cshtml

@@ -1,62 +1,72 @@
 @using System
+@using System.Threading
 @using System.Threading.Tasks
-@using DiscordChatExporter.Core.Exporting.Writers.Html;
+@using DiscordChatExporter.Core.Exporting
+@using DiscordChatExporter.Core.Exporting.Writers.MarkdownVisitors
 
-@namespace DiscordChatExporter.Core.Exporting.Writers.Html
-@inherits MiniRazor.TemplateBase<PreambleTemplateContext>
+@inherits RazorBlade.HtmlTemplate
+
+@functions {
+    public required ExportContext ExportContext { get; init; }
+
+    public required string ThemeName { get; init; }
+}
 
 @{
     string Themed(string darkVariant, string lightVariant) =>
-        string.Equals(Model.ThemeName, "Dark", StringComparison.OrdinalIgnoreCase)
+        string.Equals(ThemeName, "Dark", StringComparison.OrdinalIgnoreCase)
             ? darkVariant
             : lightVariant;
 
     string GetFontUrl(int weight) =>
         $"https://cdn.jsdelivr.net/gh/Tyrrrz/DiscordFonts@master/whitney-{weight}.woff";
 
-    ValueTask<string> ResolveUrlAsync(string url) => Model.ExportContext.ResolveMediaUrlAsync(url, CancellationToken);
+    ValueTask<string> ResolveAssetUrlAsync(string url) =>
+        ExportContext.ResolveAssetUrlAsync(url, CancellationToken);
 
-    string FormatDate(DateTimeOffset date) => Model.ExportContext.FormatDate(date);
+    string FormatDate(DateTimeOffset date) =>
+        ExportContext.FormatDate(date);
 
-    string FormatMarkdown(string markdown) => Model.FormatMarkdown(markdown);
+    ValueTask<string> FormatMarkdownAsync(string markdown) =>
+        HtmlMarkdownVisitor.FormatAsync(ExportContext, markdown, true, CancellationToken);
 }
 
 <!DOCTYPE html>
 <html lang="en">
 
 <head>
-    <title>@Model.ExportContext.Request.Guild.Name - @Model.ExportContext.Request.Channel.Name</title>
+    <title>@ExportContext.Request.Guild.Name - @ExportContext.Request.Channel.Name</title>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width">
 
     @{/* Styling */}
     <style>
         @@font-face {
-            src: url(@await ResolveUrlAsync(GetFontUrl(300)));
+            src: url(@await ResolveAssetUrlAsync(GetFontUrl(300)));
             font-family: Whitney;
             font-weight: 300;
         }
 
         @@font-face {
-            src: url(@await ResolveUrlAsync(GetFontUrl(400)));
+            src: url(@await ResolveAssetUrlAsync(GetFontUrl(400)));
             font-family: Whitney;
             font-weight: 400;
         }
 
         @@font-face {
-            src: url(@await ResolveUrlAsync(GetFontUrl(500)));
+            src: url(@await ResolveAssetUrlAsync(GetFontUrl(500)));
             font-family: Whitney;
             font-weight: 500;
         }
 
         @@font-face {
-            src: url(@await ResolveUrlAsync(GetFontUrl(600)));
+            src: url(@await ResolveAssetUrlAsync(GetFontUrl(600)));
             font-family: Whitney;
             font-weight: 600;
         }
 
         @@font-face {
-            src: url(@await ResolveUrlAsync(GetFontUrl(700)));
+            src: url(@await ResolveAssetUrlAsync(GetFontUrl(700)));
             font-family: Whitney;
             font-weight: 700;
         }
@@ -69,6 +79,7 @@
             font-family: Whitney, "Helvetica Neue", Helvetica, Arial, sans-serif;
             font-size: 17px;
             font-weight: @Themed("400", "500");
+            scroll-behavior: smooth;
         }
 
         a {
@@ -254,6 +265,38 @@
             unicode-bidi: bidi-override;
         }
 
+        .chatlog__system-notification-icon {
+            width: 18px;
+            height: 18px;
+        }
+
+        .chatlog__system-notification-author {
+            font-weight: @Themed("500", "600");
+            color: @Themed("#ffffff", "#2f3136");
+        }
+
+        .chatlog__system-notification-content {
+            color: @Themed("#96989d", "#5e6772")
+        }
+
+        .chatlog__system-notification-link {
+            font-weight: 500;
+            color: @Themed("#ffffff", "#2f3136");
+        }
+
+        .chatlog__system-notification-timestamp {
+            margin-left: 0.3rem;
+            color: @Themed("#a3a6aa", "#5e6772");
+            font-size: 0.75rem;
+            font-weight: 500;
+            direction: ltr;
+            unicode-bidi: bidi-override;
+        }
+
+        .chatlog__system-notification-timestamp a {
+            color: inherit;
+        }
+
         .chatlog__header {
             margin-bottom: 0.1rem;
         }
@@ -286,7 +329,7 @@
         }
 
         .chatlog__timestamp a {
-            color: @Themed("#a3a6aa", "#5e6772");
+            color: inherit;
         }
 
         .chatlog__content {
@@ -540,7 +583,14 @@
             font-weight: 500;
         }
 
-        .chatlog__embed-plainimage {
+        .chatlog__embed-generic-image {
+            max-width: 45vw;
+            max-height: 500px;
+            vertical-align: top;
+            border-radius: 3px;
+        }
+
+        .chatlog__embed-generic-gifv {
             max-width: 45vw;
             max-height: 500px;
             vertical-align: top;
@@ -712,8 +762,8 @@
     </style>
 
     @{/* Syntax highlighting */}
-    <link rel="stylesheet" href="@await ResolveUrlAsync($"https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.15.6/styles/solarized-{Model.ThemeName.ToLowerInvariant()}.min.css")">
-    <script src="@await ResolveUrlAsync("https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.15.6/highlight.min.js")"></script>
+    <link rel="stylesheet" href="@await ResolveAssetUrlAsync($"https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.15.6/styles/solarized-{ThemeName.ToLowerInvariant()}.min.css")">
+    <script src="@await ResolveAssetUrlAsync("https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.15.6/highlight.min.js")"></script>
     <script>
         document.addEventListener('DOMContentLoaded', () => {
             document.querySelectorAll('.chatlog__markdown-pre--multiline').forEach(e => hljs.highlightBlock(e));
@@ -721,7 +771,7 @@
     </script>
 
     @{/* Lottie animation support */}
-    <script src="@await ResolveUrlAsync("https://cdnjs.cloudflare.com/ajax/libs/lottie-web/5.8.1/lottie.min.js")"></script>
+    <script src="@await ResolveAssetUrlAsync("https://cdnjs.cloudflare.com/ajax/libs/lottie-web/5.8.1/lottie.min.js")"></script>
     <script>
         document.addEventListener('DOMContentLoaded', () => {
             document.querySelectorAll('.chatlog__sticker--media[data-source]').forEach(e => {
@@ -779,44 +829,55 @@
     </script>
 
     @{/* Icons */}
-    <svg style="display: none">
-        <symbol id="attachment-icon" viewBox="0 0 720 960">
-            <path fill="#f4f5fb" d="M50,935a25,25,0,0,1-25-25V50A25,25,0,0,1,50,25H519.6L695,201.32V910a25,25,0,0,1-25,25Z"/>
-            <path fill="#7789c4" d="M509.21,50,670,211.63V910H50V50H509.21M530,0H50A50,50,0,0,0,0,50V910a50,50,0,0,0,50,50H670a50,50,0,0,0,50-50h0V191Z"/>
-            <path fill="#f4f5fb" d="M530,215a25,25,0,0,1-25-25V50a25,25,0,0,1,16.23-23.41L693.41,198.77A25,25,0,0,1,670,215Z"/>
-            <path fill="#7789c4" d="M530,70.71,649.29,190H530V70.71M530,0a50,50,0,0,0-50,50V190a50,50,0,0,0,50,50H670a50,50,0,0,0,50-50Z"/>
-        </symbol>
+    <svg style="display: none" xmlns="http://www.w3.org/2000/svg">
+        <defs>
+            <symbol id="attachment-icon" viewBox="0 0 720 960">
+                <path fill="#f4f5fb" d="M50,935a25,25,0,0,1-25-25V50A25,25,0,0,1,50,25H519.6L695,201.32V910a25,25,0,0,1-25,25Z" />
+                <path fill="#7789c4" d="M509.21,50,670,211.63V910H50V50H509.21M530,0H50A50,50,0,0,0,0,50V910a50,50,0,0,0,50,50H670a50,50,0,0,0,50-50h0V191Z" />
+                <path fill="#f4f5fb" d="M530,215a25,25,0,0,1-25-25V50a25,25,0,0,1,16.23-23.41L693.41,198.77A25,25,0,0,1,670,215Z" />
+                <path fill="#7789c4" d="M530,70.71,649.29,190H530V70.71M530,0a50,50,0,0,0-50,50V190a50,50,0,0,0,50,50H670a50,50,0,0,0,50-50Z" />
+            </symbol>
+            <symbol id="channel-pinned-message-icon" viewBox="0 0 18 18">
+                <path fill="#b9bbbe" d="m16.908 8.39684-8.29587-8.295827-1.18584 1.184157 1.18584 1.18584-4.14834 4.1475v.00167l-1.18583-1.18583-1.185 1.18583 3.55583 3.55502-4.740831 4.74 1.185001 1.185 4.74083-4.74 3.55581 3.555 1.185-1.185-1.185-1.185 4.1475-4.14836h.0009l1.185 1.185z" />
+            </symbol>
+            <symbol id="call-icon" viewBox="0 0 18 18">
+                <path fill="#3ba55c" fill-rule="evenodd" d="M17.7163041 15.36645368c-.0190957.02699568-1.9039523 2.6680735-2.9957762 2.63320406-3.0676659-.09785935-6.6733809-3.07188394-9.15694343-5.548738C3.08002193 9.9740657.09772497 6.3791404 0 3.3061316v-.024746C0 2.2060575 2.61386252.3152347 2.64082114.2972376c.7110335-.4971705 1.4917101-.3149497 1.80959713.1372281.19320342.2744561 2.19712724 3.2811005 2.42290565 3.6489167.09884826.1608492.14714912.3554431.14714912.5702838 0 .2744561-.07975258.5770327-.23701117.8751101-.1527655.2902036-.65262318 1.1664385-.89862055 1.594995.2673396.3768148.94804468 1.26429792 2.351016 2.66357424 1.39173858 1.39027775 2.28923588 2.07641807 2.67002628 2.34187563.4302146-.2452108 1.3086162-.74238132 1.5972981-.89423205.5447887-.28682915 1.0907006-.31944893 1.4568885-.08661115.3459689.2182151 3.3383754 2.21027167 3.6225641 2.41611376.2695862.19234426.4144887.5399137.4144887.91672846 0 .2969525-.089862.61190215-.2808189.88523346" />
+            </symbol>
+            <symbol id="guild-member-join-icon" viewBox="0 0 18 18">
+                <path fill="#3ba55c" d="m0 8h14.2l-3.6-3.6 1.4-1.4 6 6-6 6-1.4-1.4 3.6-3.6h-14.2" />
+            </symbol>
+        </defs>
     </svg>
 </head>
 <body>
 
 <div class="preamble">
     <div class="preamble__guild-icon-container">
-        <img class="preamble__guild-icon" src="@await ResolveUrlAsync(Model.ExportContext.Request.Guild.IconUrl)" alt="Guild icon" loading="lazy">
+        <img class="preamble__guild-icon" src="@await ResolveAssetUrlAsync(ExportContext.Request.Guild.IconUrl)" alt="Guild icon" loading="lazy">
     </div>
     <div class="preamble__entries-container">
-        <div class="preamble__entry">@Model.ExportContext.Request.Guild.Name</div>
-        <div class="preamble__entry">@Model.ExportContext.Request.Channel.Category.Name / @Model.ExportContext.Request.Channel.Name</div>
+        <div class="preamble__entry">@ExportContext.Request.Guild.Name</div>
+        <div class="preamble__entry">@ExportContext.Request.Channel.Category.Name / @ExportContext.Request.Channel.Name</div>
 
-        @if (!string.IsNullOrWhiteSpace(Model.ExportContext.Request.Channel.Topic))
+        @if (!string.IsNullOrWhiteSpace(ExportContext.Request.Channel.Topic))
         {
-            <div class="preamble__entry preamble__entry--small">@Raw(FormatMarkdown(Model.ExportContext.Request.Channel.Topic))</div>
+            <div class="preamble__entry preamble__entry--small">@Html.Raw(await FormatMarkdownAsync(ExportContext.Request.Channel.Topic))</div>
         }
 
-        @if (Model.ExportContext.Request.After is not null || Model.ExportContext.Request.Before is not null)
+        @if (ExportContext.Request.After is not null || ExportContext.Request.Before is not null)
         {
             <div class="preamble__entry preamble__entry--small">
-                @if (Model.ExportContext.Request.After is not null && Model.ExportContext.Request.Before is not null)
+                @if (ExportContext.Request.After is not null && ExportContext.Request.Before is not null)
                 {
-                    @($"Between {FormatDate(Model.ExportContext.Request.After.Value.ToDate())} and {FormatDate(Model.ExportContext.Request.Before.Value.ToDate())}")
+                    @($"Between {FormatDate(ExportContext.Request.After.Value.ToDate())} and {FormatDate(ExportContext.Request.Before.Value.ToDate())}")
                 }
-                else if (Model.ExportContext.Request.After is not null)
+                else if (ExportContext.Request.After is not null)
                 {
-                    @($"After {FormatDate(Model.ExportContext.Request.After.Value.ToDate())}")
+                    @($"After {FormatDate(ExportContext.Request.After.Value.ToDate())}")
                 }
-                else if (Model.ExportContext.Request.Before is not null)
+                else if (ExportContext.Request.Before is not null)
                 {
-                    @($"Before {FormatDate(Model.ExportContext.Request.Before.Value.ToDate())}")
+                    @($"Before {FormatDate(ExportContext.Request.Before.Value.ToDate())}")
                 }
             </div>
         }

DiscordChatExporter.Core/Exporting/Writers/Html/PreambleTemplateContext.cs

@@ -1,19 +0,0 @@
-using DiscordChatExporter.Core.Exporting.Writers.MarkdownVisitors;
-
-namespace DiscordChatExporter.Core.Exporting.Writers.Html;
-
-internal class PreambleTemplateContext
-{
-    public ExportContext ExportContext { get; }
-
-    public string ThemeName { get; }
-
-    public PreambleTemplateContext(ExportContext exportContext, string themeName)
-    {
-        ExportContext = exportContext;
-        ThemeName = themeName;
-    }
-
-    public string FormatMarkdown(string? markdown, bool isJumboAllowed = true) =>
-        HtmlMarkdownVisitor.Format(ExportContext, markdown ?? "", isJumboAllowed);
-}

DiscordChatExporter.Core/Exporting/Writers/HtmlMessageWriter.cs

@@ -25,32 +25,62 @@ internal class HtmlMessageWriter : MessageWriter
         _themeName = themeName;
     }
 
-    private bool CanJoinGroup(Message message) =>
-        // First message in the group can always join
-        _messageGroup.LastOrDefault() is not { } lastMessage ||
-        // Must be from the same author
-        lastMessage.Author.Id == message.Author.Id &&
-        // Author's name must not have changed between messages
-        string.Equals(lastMessage.Author.FullName, message.Author.FullName, StringComparison.Ordinal) &&
-        // Duration between messages must be 7 minutes or less
-        (message.Timestamp - lastMessage.Timestamp).Duration().TotalMinutes <= 7 &&
-        // Other message must not be a reply
-        message.Reference is null;
+    private bool CanJoinGroup(Message message)
+    {
+        // If the group is empty, any message can join it
+        if (_messageGroup.LastOrDefault() is not { } lastMessage)
+            return true;
+
+        // Reply messages cannot join existing groups because they need to appear first
+        if (message.Kind == MessageKind.Reply)
+            return false;
+
+        // Grouping for system notifications
+        if (message.Kind.IsSystemNotification())
+        {
+            // Can only be grouped with other system notifications
+            if (!lastMessage.Kind.IsSystemNotification())
+                return false;
+        }
+        // Grouping for normal messages
+        else
+        {
+            // Can only be grouped with other normal messages
+            if (lastMessage.Kind.IsSystemNotification())
+                return false;
+
+            // Messages must be within 7 minutes of each other
+            if ((message.Timestamp - lastMessage.Timestamp).Duration().TotalMinutes > 7)
+                return false;
+
+            // Messages must be from the same author
+            if (message.Author.Id != lastMessage.Author.Id)
+                return false;
+
+            // If the user changed their name after the last message, their new messages
+            // cannot join an existing group.
+            if (!string.Equals(message.Author.FullName, lastMessage.Author.FullName, StringComparison.Ordinal))
+                return false;
+        }
+
+        return true;
+    }
 
     // Use <!--wmm:ignore--> to preserve blocks of code inside the templates
     private string Minify(string html) => _minifier
         .Minify(html, false)
         .MinifiedContent;
 
-    public override async ValueTask WritePreambleAsync(CancellationToken cancellationToken = default)
+    public override async ValueTask WritePreambleAsync(
+        CancellationToken cancellationToken = default)
     {
-        var templateContext = new PreambleTemplateContext(Context, _themeName);
-
-        // We are not writing directly to output because Razor
-        // does not actually do asynchronous writes to stream.
         await _writer.WriteLineAsync(
             Minify(
-                await PreambleTemplate.RenderAsync(templateContext, cancellationToken)
+                await new PreambleTemplate
+                {
+                    ExportContext = Context,
+                    ThemeName = _themeName
+                }.RenderAsync(cancellationToken)
             )
         );
     }
@@ -59,13 +89,13 @@ internal class HtmlMessageWriter : MessageWriter
         IReadOnlyList<Message> messages,
         CancellationToken cancellationToken = default)
     {
-        var templateContext = new MessageGroupTemplateContext(Context, messages);
-
-        // We are not writing directly to output because Razor
-        // does not actually do asynchronous writes to stream.
         await _writer.WriteLineAsync(
             Minify(
-                await MessageGroupTemplate.RenderAsync(templateContext, cancellationToken)
+                await new MessageGroupTemplate
+                {
+                    ExportContext = Context,
+                    Messages = messages
+                }.RenderAsync(cancellationToken)
             )
         );
     }
@@ -77,7 +107,7 @@ internal class HtmlMessageWriter : MessageWriter
         await base.WriteMessageAsync(message, cancellationToken);
 
         // If the message can be grouped, buffer it for now
-        if (CanJoinGroup( message))
+        if (CanJoinGroup(message))
         {
             _messageGroup.Add(message);
         }
@@ -97,13 +127,13 @@ internal class HtmlMessageWriter : MessageWriter
         if (_messageGroup.Any())
             await WriteMessageGroupAsync(_messageGroup, cancellationToken);
 
-        var templateContext = new PostambleTemplateContext(Context, MessagesWritten);
-
-        // We are not writing directly to output because Razor
-        // does not actually do asynchronous writes to stream.
         await _writer.WriteLineAsync(
             Minify(
-                await PostambleTemplate.RenderAsync(templateContext, cancellationToken)
+                await new PostambleTemplate
+                {
+                    ExportContext = Context,
+                    MessagesWritten = MessagesWritten
+                }.RenderAsync(cancellationToken)
             )
         );
     }

DiscordChatExporter.Core/Exporting/Writers/JsonMessageWriter.cs

@@ -29,8 +29,10 @@ internal class JsonMessageWriter : MessageWriter
         });
     }
 
-    private string FormatMarkdown(string? markdown) =>
-        PlainTextMarkdownVisitor.Format(Context, markdown ?? "");
+    private ValueTask<string> FormatMarkdownAsync(
+        string markdown,
+        CancellationToken cancellationToken = default) =>
+        PlainTextMarkdownVisitor.FormatAsync(Context, markdown, cancellationToken);
 
     private async ValueTask WriteAttachmentAsync(
         Attachment attachment,
@@ -39,7 +41,7 @@ internal class JsonMessageWriter : MessageWriter
         _writer.WriteStartObject();
 
         _writer.WriteString("id", attachment.Id.ToString());
-        _writer.WriteString("url", await Context.ResolveMediaUrlAsync(attachment.Url, cancellationToken));
+        _writer.WriteString("url", await Context.ResolveAssetUrlAsync(attachment.Url, cancellationToken));
         _writer.WriteString("fileName", attachment.FileName);
         _writer.WriteNumber("fileSizeBytes", attachment.FileSize.TotalBytes);
 
@@ -57,7 +59,12 @@ internal class JsonMessageWriter : MessageWriter
         _writer.WriteString("url", embedAuthor.Url);
 
         if (!string.IsNullOrWhiteSpace(embedAuthor.IconUrl))
-            _writer.WriteString("iconUrl", await Context.ResolveMediaUrlAsync(embedAuthor.IconProxyUrl ?? embedAuthor.IconUrl, cancellationToken));
+        {
+            _writer.WriteString(
+                "iconUrl",
+                await Context.ResolveAssetUrlAsync(embedAuthor.IconProxyUrl ?? embedAuthor.IconUrl, cancellationToken)
+            );
+        }
 
         _writer.WriteEndObject();
         await _writer.FlushAsync(cancellationToken);
@@ -70,7 +77,12 @@ internal class JsonMessageWriter : MessageWriter
         _writer.WriteStartObject();
 
         if (!string.IsNullOrWhiteSpace(embedImage.Url))
-            _writer.WriteString("url", await Context.ResolveMediaUrlAsync(embedImage.ProxyUrl ?? embedImage.Url, cancellationToken));
+        {
+            _writer.WriteString(
+                "url",
+                await Context.ResolveAssetUrlAsync(embedImage.ProxyUrl ?? embedImage.Url, cancellationToken)
+            );
+        }
 
         _writer.WriteNumber("width", embedImage.Width);
         _writer.WriteNumber("height", embedImage.Height);
@@ -88,7 +100,12 @@ internal class JsonMessageWriter : MessageWriter
         _writer.WriteString("text", embedFooter.Text);
 
         if (!string.IsNullOrWhiteSpace(embedFooter.IconUrl))
-            _writer.WriteString("iconUrl", await Context.ResolveMediaUrlAsync(embedFooter.IconProxyUrl ?? embedFooter.IconUrl, cancellationToken));
+        {
+            _writer.WriteString(
+                "iconUrl",
+                await Context.ResolveAssetUrlAsync(embedFooter.IconProxyUrl ?? embedFooter.IconUrl, cancellationToken)
+            );
+        }
 
         _writer.WriteEndObject();
         await _writer.FlushAsync(cancellationToken);
@@ -100,8 +117,8 @@ internal class JsonMessageWriter : MessageWriter
     {
         _writer.WriteStartObject();
 
-        _writer.WriteString("name", FormatMarkdown(embedField.Name));
-        _writer.WriteString("value", FormatMarkdown(embedField.Value));
+        _writer.WriteString("name", await FormatMarkdownAsync(embedField.Name, cancellationToken));
+        _writer.WriteString("value", await FormatMarkdownAsync(embedField.Value, cancellationToken));
         _writer.WriteBoolean("isInline", embedField.IsInline);
 
         _writer.WriteEndObject();
@@ -114,10 +131,10 @@ internal class JsonMessageWriter : MessageWriter
     {
         _writer.WriteStartObject();
 
-        _writer.WriteString("title", FormatMarkdown(embed.Title));
+        _writer.WriteString("title", await FormatMarkdownAsync(embed.Title ?? "", cancellationToken));
         _writer.WriteString("url", embed.Url);
         _writer.WriteString("timestamp", embed.Timestamp);
-        _writer.WriteString("description", FormatMarkdown(embed.Description));
+        _writer.WriteString("description", await FormatMarkdownAsync(embed.Description ?? "", cancellationToken));
 
         if (embed.Color is not null)
             _writer.WriteString("color", embed.Color.Value.ToHex());
@@ -176,7 +193,7 @@ internal class JsonMessageWriter : MessageWriter
         _writer.WriteString("id", sticker.Id.ToString());
         _writer.WriteString("name", sticker.Name);
         _writer.WriteString("format", sticker.Format.ToString());
-        _writer.WriteString("sourceUrl", await Context.ResolveMediaUrlAsync(sticker.SourceUrl, cancellationToken));
+        _writer.WriteString("sourceUrl", await Context.ResolveAssetUrlAsync(sticker.SourceUrl, cancellationToken));
 
         _writer.WriteEndObject();
         await _writer.FlushAsync(cancellationToken);
@@ -193,7 +210,7 @@ internal class JsonMessageWriter : MessageWriter
         _writer.WriteString("id", reaction.Emoji.Id.ToString());
         _writer.WriteString("name", reaction.Emoji.Name);
         _writer.WriteBoolean("isAnimated", reaction.Emoji.IsAnimated);
-        _writer.WriteString("imageUrl", await Context.ResolveMediaUrlAsync(reaction.Emoji.ImageUrl, cancellationToken));
+        _writer.WriteString("imageUrl", await Context.ResolveAssetUrlAsync(reaction.Emoji.ImageUrl, cancellationToken));
         _writer.WriteEndObject();
 
         _writer.WriteNumber("count", reaction.Count);
@@ -227,7 +244,7 @@ internal class JsonMessageWriter : MessageWriter
         _writer.WriteStartObject("guild");
         _writer.WriteString("id", Context.Request.Guild.Id.ToString());
         _writer.WriteString("name", Context.Request.Guild.Name);
-        _writer.WriteString("iconUrl", await Context.ResolveMediaUrlAsync(Context.Request.Guild.IconUrl, cancellationToken));
+        _writer.WriteString("iconUrl", await Context.ResolveAssetUrlAsync(Context.Request.Guild.IconUrl, cancellationToken));
         _writer.WriteEndObject();
 
         // Channel
@@ -268,7 +285,7 @@ internal class JsonMessageWriter : MessageWriter
         _writer.WriteBoolean("isPinned", message.IsPinned);
 
         // Content
-        _writer.WriteString("content", FormatMarkdown(message.Content));
+        _writer.WriteString("content", await FormatMarkdownAsync(message.Content, cancellationToken));
 
         // Author
         _writer.WriteStartObject("author");
@@ -278,7 +295,7 @@ internal class JsonMessageWriter : MessageWriter
         _writer.WriteString("nickname", Context.TryGetMember(message.Author.Id)?.Nick ?? message.Author.Name);
         _writer.WriteString("color", Context.TryGetUserColor(message.Author.Id)?.ToHex());
         _writer.WriteBoolean("isBot", message.Author.IsBot);
-        _writer.WriteString("avatarUrl", await Context.ResolveMediaUrlAsync(message.Author.AvatarUrl, cancellationToken));
+        _writer.WriteString("avatarUrl", await Context.ResolveAssetUrlAsync(message.Author.AvatarUrl, cancellationToken));
         _writer.WriteEndObject();
 
         // Attachments

DiscordChatExporter.Core/Exporting/Writers/MarkdownVisitors/HtmlMarkdownVisitor.cs

@@ -3,6 +3,8 @@ using System.Linq;
 using System.Net;
 using System.Text;
 using System.Text.RegularExpressions;
+using System.Threading;
+using System.Threading.Tasks;
 using DiscordChatExporter.Core.Discord.Data;
 using DiscordChatExporter.Core.Markdown;
 using DiscordChatExporter.Core.Markdown.Parsing;
@@ -23,15 +25,19 @@ internal partial class HtmlMarkdownVisitor : MarkdownVisitor
         _isJumbo = isJumbo;
     }
 
-    protected override MarkdownNode VisitText(TextNode text)
+    protected override async ValueTask<MarkdownNode> VisitTextAsync(
+        TextNode text,
+        CancellationToken cancellationToken = default)
     {
         _buffer.Append(HtmlEncode(text.Text));
-        return base.VisitText(text);
+        return await base.VisitTextAsync(text, cancellationToken);
     }
 
-    protected override MarkdownNode VisitFormatting(FormattingNode formatting)
+    protected override async ValueTask<MarkdownNode> VisitFormattingAsync(
+        FormattingNode formatting,
+        CancellationToken cancellationToken = default)
     {
-        var (tagOpen, tagClose) = formatting.Kind switch
+        var (openingTag, closingTag) = formatting.Kind switch
         {
             FormattingKind.Bold => (
                 "<strong>",
@@ -66,24 +72,28 @@ internal partial class HtmlMarkdownVisitor : MarkdownVisitor
             _ => throw new InvalidOperationException($"Unknown formatting kind '{formatting.Kind}'.")
         };
 
-        _buffer.Append(tagOpen);
-        var result = base.VisitFormatting(formatting);
-        _buffer.Append(tagClose);
+        _buffer.Append(openingTag);
+        var result = await base.VisitFormattingAsync(formatting, cancellationToken);
+        _buffer.Append(closingTag);
 
         return result;
     }
 
-    protected override MarkdownNode VisitInlineCodeBlock(InlineCodeBlockNode inlineCodeBlock)
+    protected override async ValueTask<MarkdownNode> VisitInlineCodeBlockAsync(
+        InlineCodeBlockNode inlineCodeBlock,
+        CancellationToken cancellationToken = default)
     {
         _buffer
             .Append("<code class=\"chatlog__markdown-pre chatlog__markdown-pre--inline\">")
             .Append(HtmlEncode(inlineCodeBlock.Code))
             .Append("</code>");
 
-        return base.VisitInlineCodeBlock(inlineCodeBlock);
+        return await base.VisitInlineCodeBlockAsync(inlineCodeBlock, cancellationToken);
     }
 
-    protected override MarkdownNode VisitMultiLineCodeBlock(MultiLineCodeBlockNode multiLineCodeBlock)
+    protected override async ValueTask<MarkdownNode> VisitMultiLineCodeBlockAsync(
+        MultiLineCodeBlockNode multiLineCodeBlock,
+        CancellationToken cancellationToken = default)
     {
         var highlightCssClass = !string.IsNullOrWhiteSpace(multiLineCodeBlock.Language)
             ? $"language-{multiLineCodeBlock.Language}"
@@ -94,10 +104,12 @@ internal partial class HtmlMarkdownVisitor : MarkdownVisitor
             .Append(HtmlEncode(multiLineCodeBlock.Code))
             .Append("</code>");
 
-        return base.VisitMultiLineCodeBlock(multiLineCodeBlock);
+        return await base.VisitMultiLineCodeBlockAsync(multiLineCodeBlock, cancellationToken);
     }
 
-    protected override MarkdownNode VisitLink(LinkNode link)
+    protected override async ValueTask<MarkdownNode> VisitLinkAsync(
+        LinkNode link,
+        CancellationToken cancellationToken = default)
     {
         // Try to extract message ID if the link refers to a Discord message
         var linkedMessageId = Regex.Match(
@@ -111,24 +123,35 @@ internal partial class HtmlMarkdownVisitor : MarkdownVisitor
                 : $"<a href=\"{HtmlEncode(link.Url)}\">"
         );
 
-        var result = base.VisitLink(link);
+        var result = await base.VisitLinkAsync(link, cancellationToken);
         _buffer.Append("</a>");
 
         return result;
     }
 
-    protected override MarkdownNode VisitEmoji(EmojiNode emoji)
+    protected override async ValueTask<MarkdownNode> VisitEmojiAsync(
+        EmojiNode emoji,
+        CancellationToken cancellationToken = default)
     {
         var emojiImageUrl = Emoji.GetImageUrl(emoji.Id, emoji.Name, emoji.IsAnimated);
         var jumboClass = _isJumbo ? "chatlog__emoji--large" : "";
 
-        _buffer
-            .Append($"<img loading=\"lazy\" class=\"chatlog__emoji {jumboClass}\" alt=\"{emoji.Name}\" title=\"{emoji.Code}\" src=\"{emojiImageUrl}\">");
+        _buffer.Append(
+            $"<img " +
+            $"loading=\"lazy\" " +
+            $"class=\"chatlog__emoji {jumboClass}\" " +
+            $"alt=\"{emoji.Name}\" " +
+            $"title=\"{emoji.Code}\" " +
+            $"src=\"{await _context.ResolveAssetUrlAsync(emojiImageUrl, cancellationToken)}\"" +
+            $">"
+        );
 
-        return base.VisitEmoji(emoji);
+        return await base.VisitEmojiAsync(emoji, cancellationToken);
     }
 
-    protected override MarkdownNode VisitMention(MentionNode mention)
+    protected override async ValueTask<MarkdownNode> VisitMentionAsync(
+        MentionNode mention,
+        CancellationToken cancellationToken = default)
     {
         if (mention.Kind == MentionKind.Everyone)
         {
@@ -183,10 +206,12 @@ internal partial class HtmlMarkdownVisitor : MarkdownVisitor
                 .Append("</span>");
         }
 
-        return base.VisitMention(mention);
+        return await base.VisitMentionAsync(mention, cancellationToken);
     }
 
-    protected override MarkdownNode VisitUnixTimestamp(UnixTimestampNode timestamp)
+    protected override async ValueTask<MarkdownNode> VisitUnixTimestampAsync(
+        UnixTimestampNode timestamp,
+        CancellationToken cancellationToken = default)
     {
         var dateString = timestamp.Date is not null
             ? _context.FormatDate(timestamp.Date.Value)
@@ -202,7 +227,7 @@ internal partial class HtmlMarkdownVisitor : MarkdownVisitor
             .Append(HtmlEncode(dateString))
             .Append("</span>");
 
-        return base.VisitUnixTimestamp(timestamp);
+        return await base.VisitUnixTimestampAsync(timestamp, cancellationToken);
     }
 }
 
@@ -210,7 +235,11 @@ internal partial class HtmlMarkdownVisitor
 {
     private static string HtmlEncode(string text) => WebUtility.HtmlEncode(text);
 
-    public static string Format(ExportContext context, string markdown, bool isJumboAllowed = true)
+    public static async ValueTask<string> FormatAsync(
+        ExportContext context,
+        string markdown,
+        bool isJumboAllowed = true,
+        CancellationToken cancellationToken = default)
     {
         var nodes = MarkdownParser.Parse(markdown);
 
@@ -220,7 +249,8 @@ internal partial class HtmlMarkdownVisitor
 
         var buffer = new StringBuilder();
 
-        new HtmlMarkdownVisitor(context, buffer, isJumbo).Visit(nodes);
+        await new HtmlMarkdownVisitor(context, buffer, isJumbo)
+            .VisitAsync(nodes, cancellationToken);
 
         return buffer.ToString();
     }

DiscordChatExporter.Core/Exporting/Writers/MarkdownVisitors/PlainTextMarkdownVisitor.cs

@@ -1,4 +1,6 @@
 using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
 using DiscordChatExporter.Core.Markdown;
 using DiscordChatExporter.Core.Markdown.Parsing;
 using DiscordChatExporter.Core.Utils.Extensions;
@@ -16,13 +18,17 @@ internal partial class PlainTextMarkdownVisitor : MarkdownVisitor
         _buffer = buffer;
     }
 
-    protected override MarkdownNode VisitText(TextNode text)
+    protected override async ValueTask<MarkdownNode> VisitTextAsync(
+        TextNode text,
+        CancellationToken cancellationToken = default)
     {
         _buffer.Append(text.Text);
-        return base.VisitText(text);
+        return await base.VisitTextAsync(text, cancellationToken);
     }
 
-    protected override MarkdownNode VisitEmoji(EmojiNode emoji)
+    protected override async ValueTask<MarkdownNode> VisitEmojiAsync(
+        EmojiNode emoji,
+        CancellationToken cancellationToken = default)
     {
         _buffer.Append(
             emoji.IsCustomEmoji
@@ -30,10 +36,12 @@ internal partial class PlainTextMarkdownVisitor : MarkdownVisitor
                 : emoji.Name
         );
 
-        return base.VisitEmoji(emoji);
+        return await base.VisitEmojiAsync(emoji, cancellationToken);
     }
 
-    protected override MarkdownNode VisitMention(MentionNode mention)
+    protected override async ValueTask<MarkdownNode> VisitMentionAsync(
+        MentionNode mention,
+        CancellationToken cancellationToken = default)
     {
         if (mention.Kind == MentionKind.Everyone)
         {
@@ -69,10 +77,12 @@ internal partial class PlainTextMarkdownVisitor : MarkdownVisitor
             _buffer.Append($"@{name}");
         }
 
-        return base.VisitMention(mention);
+        return await base.VisitMentionAsync(mention, cancellationToken);
     }
 
-    protected override MarkdownNode VisitUnixTimestamp(UnixTimestampNode timestamp)
+    protected override async ValueTask<MarkdownNode> VisitUnixTimestampAsync(
+        UnixTimestampNode timestamp,
+        CancellationToken cancellationToken = default)
     {
         _buffer.Append(
             timestamp.Date is not null
@@ -80,18 +90,22 @@ internal partial class PlainTextMarkdownVisitor : MarkdownVisitor
                 : "Invalid date"
         );
 
-        return base.VisitUnixTimestamp(timestamp);
+        return await base.VisitUnixTimestampAsync(timestamp, cancellationToken);
     }
 }
 
 internal partial class PlainTextMarkdownVisitor
 {
-    public static string Format(ExportContext context, string markdown)
+    public static async ValueTask<string> FormatAsync(
+        ExportContext context,
+        string markdown,
+        CancellationToken cancellationToken = default)
     {
         var nodes = MarkdownParser.ParseMinimal(markdown);
         var buffer = new StringBuilder();
 
-        new PlainTextMarkdownVisitor(context, buffer).Visit(nodes);
+        await new PlainTextMarkdownVisitor(context, buffer)
+            .VisitAsync(nodes, cancellationToken);
 
         return buffer.ToString();
     }

DiscordChatExporter.Core/Exporting/Writers/PlainTextMessageWriter.cs

@@ -19,8 +19,10 @@ internal class PlainTextMessageWriter : MessageWriter
         _writer = new StreamWriter(stream);
     }
 
-    private string FormatMarkdown(string? markdown) =>
-        PlainTextMarkdownVisitor.Format(Context, markdown ?? "");
+    private ValueTask<string> FormatMarkdownAsync(
+        string markdown,
+        CancellationToken cancellationToken = default) =>
+        PlainTextMarkdownVisitor.FormatAsync(Context, markdown, cancellationToken);
 
     private async ValueTask WriteMessageHeaderAsync(Message message)
     {
@@ -48,7 +50,9 @@ internal class PlainTextMessageWriter : MessageWriter
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            await _writer.WriteLineAsync(await Context.ResolveMediaUrlAsync(attachment.Url, cancellationToken));
+            await _writer.WriteLineAsync(
+                await Context.ResolveAssetUrlAsync(attachment.Url, cancellationToken)
+            );
         }
 
         await _writer.WriteLineAsync();
@@ -65,37 +69,73 @@ internal class PlainTextMessageWriter : MessageWriter
             await _writer.WriteLineAsync("{Embed}");
 
             if (!string.IsNullOrWhiteSpace(embed.Author?.Name))
+            {
                 await _writer.WriteLineAsync(embed.Author.Name);
+            }
 
             if (!string.IsNullOrWhiteSpace(embed.Url))
+            {
                 await _writer.WriteLineAsync(embed.Url);
+            }
 
             if (!string.IsNullOrWhiteSpace(embed.Title))
-                await _writer.WriteLineAsync(FormatMarkdown(embed.Title));
+            {
+                await _writer.WriteLineAsync(
+                    await FormatMarkdownAsync(embed.Title, cancellationToken)
+                );
+            }
 
             if (!string.IsNullOrWhiteSpace(embed.Description))
-                await _writer.WriteLineAsync(FormatMarkdown(embed.Description));
+            {
+                await _writer.WriteLineAsync(
+                    await FormatMarkdownAsync(embed.Description, cancellationToken)
+                );
+            }
 
             foreach (var field in embed.Fields)
             {
                 if (!string.IsNullOrWhiteSpace(field.Name))
-                    await _writer.WriteLineAsync(FormatMarkdown(field.Name));
+                {
+                    await _writer.WriteLineAsync(
+                        await FormatMarkdownAsync(field.Name, cancellationToken)
+                    );
+                }
 
                 if (!string.IsNullOrWhiteSpace(field.Value))
-                    await _writer.WriteLineAsync(FormatMarkdown(field.Value));
+                {
+                    await _writer.WriteLineAsync(
+                        await FormatMarkdownAsync(field.Value, cancellationToken)
+                    );
+                }
             }
 
             if (!string.IsNullOrWhiteSpace(embed.Thumbnail?.Url))
-                await _writer.WriteLineAsync(await Context.ResolveMediaUrlAsync(embed.Thumbnail.ProxyUrl ?? embed.Thumbnail.Url, cancellationToken));
+            {
+                await _writer.WriteLineAsync(
+                    await Context.ResolveAssetUrlAsync(
+                        embed.Thumbnail.ProxyUrl ?? embed.Thumbnail.Url,
+                        cancellationToken
+                    )
+                );
+            }
 
             foreach (var image in embed.Images)
             {
                 if (!string.IsNullOrWhiteSpace(image.Url))
-                    await _writer.WriteLineAsync(await Context.ResolveMediaUrlAsync(image.ProxyUrl ?? image.Url, cancellationToken));
+                {
+                    await _writer.WriteLineAsync(
+                        await Context.ResolveAssetUrlAsync(
+                            image.ProxyUrl ?? image.Url,
+                            cancellationToken
+                        )
+                    );
+                }
             }
 
             if (!string.IsNullOrWhiteSpace(embed.Footer?.Text))
+            {
                 await _writer.WriteLineAsync(embed.Footer.Text);
+            }
 
             await _writer.WriteLineAsync();
         }
@@ -114,7 +154,9 @@ internal class PlainTextMessageWriter : MessageWriter
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            await _writer.WriteLineAsync(await Context.ResolveMediaUrlAsync(sticker.SourceUrl, cancellationToken));
+            await _writer.WriteLineAsync(
+                await Context.ResolveAssetUrlAsync(sticker.SourceUrl, cancellationToken)
+            );
         }
 
         await _writer.WriteLineAsync();
@@ -136,7 +178,9 @@ internal class PlainTextMessageWriter : MessageWriter
             await _writer.WriteAsync(reaction.Emoji.Name);
 
             if (reaction.Count > 1)
+            {
                 await _writer.WriteAsync($" ({reaction.Count})");
+            }
 
             await _writer.WriteAsync(' ');
         }
@@ -151,13 +195,19 @@ internal class PlainTextMessageWriter : MessageWriter
         await _writer.WriteLineAsync($"Channel: {Context.Request.Channel.Category.Name} / {Context.Request.Channel.Name}");
 
         if (!string.IsNullOrWhiteSpace(Context.Request.Channel.Topic))
+        {
             await _writer.WriteLineAsync($"Topic: {Context.Request.Channel.Topic}");
+        }
 
         if (Context.Request.After is not null)
+        {
             await _writer.WriteLineAsync($"After: {Context.FormatDate(Context.Request.After.Value.ToDate())}");
+        }
 
         if (Context.Request.Before is not null)
+        {
             await _writer.WriteLineAsync($"Before: {Context.FormatDate(Context.Request.Before.Value.ToDate())}");
+        }
 
         await _writer.WriteLineAsync(new string('=', 62));
         await _writer.WriteLineAsync();
@@ -174,7 +224,11 @@ internal class PlainTextMessageWriter : MessageWriter
 
         // Content
         if (!string.IsNullOrWhiteSpace(message.Content))
-            await _writer.WriteLineAsync(FormatMarkdown(message.Content));
+        {
+            await _writer.WriteLineAsync(
+                await FormatMarkdownAsync(message.Content, cancellationToken)
+            );
+        }
 
         await _writer.WriteLineAsync();
 

DiscordChatExporter.Core/Markdown/Parsing/MarkdownVisitor.cs

@@ -1,56 +1,94 @@
 using System;
 using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace DiscordChatExporter.Core.Markdown.Parsing;
 
 internal abstract class MarkdownVisitor
 {
-    protected virtual MarkdownNode VisitText(TextNode text) =>
-        text;
+    protected virtual ValueTask<MarkdownNode> VisitTextAsync(
+        TextNode text,
+        CancellationToken cancellationToken = default) =>
+        new(text);
 
-    protected virtual MarkdownNode VisitFormatting(FormattingNode formatting)
+    protected virtual async ValueTask<MarkdownNode> VisitFormattingAsync(
+        FormattingNode formatting,
+        CancellationToken cancellationToken = default)
     {
-        Visit(formatting.Children);
+        await VisitAsync(formatting.Children, cancellationToken);
         return formatting;
     }
 
-    protected virtual MarkdownNode VisitInlineCodeBlock(InlineCodeBlockNode inlineCodeBlock) =>
-        inlineCodeBlock;
+    protected virtual ValueTask<MarkdownNode> VisitInlineCodeBlockAsync(
+        InlineCodeBlockNode inlineCodeBlock,
+        CancellationToken cancellationToken = default) =>
+        new(inlineCodeBlock);
 
-    protected virtual MarkdownNode VisitMultiLineCodeBlock(MultiLineCodeBlockNode multiLineCodeBlock) =>
-        multiLineCodeBlock;
+    protected virtual ValueTask<MarkdownNode> VisitMultiLineCodeBlockAsync(
+        MultiLineCodeBlockNode multiLineCodeBlock,
+        CancellationToken cancellationToken = default) =>
+        new(multiLineCodeBlock);
 
-    protected virtual MarkdownNode VisitLink(LinkNode link)
+    protected virtual async ValueTask<MarkdownNode> VisitLinkAsync(
+        LinkNode link,
+        CancellationToken cancellationToken = default)
     {
-        Visit(link.Children);
+        await VisitAsync(link.Children, cancellationToken);
         return link;
     }
 
-    protected virtual MarkdownNode VisitEmoji(EmojiNode emoji) =>
-        emoji;
+    protected virtual ValueTask<MarkdownNode> VisitEmojiAsync(
+        EmojiNode emoji,
+        CancellationToken cancellationToken = default) =>
+        new(emoji);
 
-    protected virtual MarkdownNode VisitMention(MentionNode mention) =>
-        mention;
+    protected virtual ValueTask<MarkdownNode> VisitMentionAsync(
+        MentionNode mention,
+        CancellationToken cancellationToken = default) =>
+        new(mention);
 
-    protected virtual MarkdownNode VisitUnixTimestamp(UnixTimestampNode timestamp) =>
-        timestamp;
+    protected virtual ValueTask<MarkdownNode> VisitUnixTimestampAsync(
+        UnixTimestampNode timestamp,
+        CancellationToken cancellationToken = default) =>
+        new(timestamp);
 
-    public MarkdownNode Visit(MarkdownNode node) => node switch
-    {
-        TextNode text => VisitText(text),
-        FormattingNode formatting => VisitFormatting(formatting),
-        InlineCodeBlockNode inlineCodeBlock => VisitInlineCodeBlock(inlineCodeBlock),
-        MultiLineCodeBlockNode multiLineCodeBlock => VisitMultiLineCodeBlock(multiLineCodeBlock),
-        LinkNode link => VisitLink(link),
-        EmojiNode emoji => VisitEmoji(emoji),
-        MentionNode mention => VisitMention(mention),
-        UnixTimestampNode timestamp => VisitUnixTimestamp(timestamp),
-        _ => throw new ArgumentOutOfRangeException(nameof(node))
-    };
+    public async ValueTask<MarkdownNode> VisitAsync(
+        MarkdownNode node,
+        CancellationToken cancellationToken = default) => node switch
+        {
+            TextNode text =>
+                await VisitTextAsync(text, cancellationToken),
 
-    public void Visit(IEnumerable<MarkdownNode> nodes)
+            FormattingNode formatting =>
+                await VisitFormattingAsync(formatting, cancellationToken),
+
+            InlineCodeBlockNode inlineCodeBlock =>
+                await VisitInlineCodeBlockAsync(inlineCodeBlock, cancellationToken),
+
+            MultiLineCodeBlockNode multiLineCodeBlock =>
+                await VisitMultiLineCodeBlockAsync(multiLineCodeBlock, cancellationToken),
+
+            LinkNode link =>
+                await VisitLinkAsync(link, cancellationToken),
+
+            EmojiNode emoji =>
+                await VisitEmojiAsync(emoji, cancellationToken),
+
+            MentionNode mention =>
+                await VisitMentionAsync(mention, cancellationToken),
+
+            UnixTimestampNode timestamp =>
+                await VisitUnixTimestampAsync(timestamp, cancellationToken),
+
+            _ => throw new ArgumentOutOfRangeException(nameof(node))
+        };
+
+    public async ValueTask VisitAsync(
+        IEnumerable<MarkdownNode> nodes,
+        CancellationToken cancellationToken = default)
     {
         foreach (var node in nodes)
-            Visit(node);
+            await VisitAsync(node, cancellationToken);
     }
 }

DiscordChatExporter.Core/Utils/Extensions/ExceptionExtensions.cs

@@ -1,9 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Net;
-using System.Net.Http;
-using System.Text.RegularExpressions;
 
 namespace DiscordChatExporter.Core.Utils.Extensions;
 
@@ -32,13 +28,4 @@ public static class ExceptionExtensions
         PopulateChildren(exception, children);
         return children;
     }
-
-    public static HttpStatusCode? TryGetStatusCode(this HttpRequestException ex) =>
-        // This is extremely frail, but there's no other way
-        Regex
-            .Match(ex.Message, @": (\d+) \(")
-            .Groups[1]
-            .Value
-            .NullIfWhiteSpace()?
-            .Pipe(s => (HttpStatusCode) int.Parse(s, CultureInfo.InvariantCulture));
 }

DiscordChatExporter.Core/Utils/Extensions/HttpExtensions.cs

@@ -1,11 +1,24 @@
-using System.Net.Http.Headers;
+using System.Globalization;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Text.RegularExpressions;
 
 namespace DiscordChatExporter.Core.Utils.Extensions;
 
 public static class HttpExtensions
 {
-    public static string? TryGetValue(this HttpContentHeaders headers, string name) =>
+    public static string? TryGetValue(this HttpHeaders headers, string name) =>
         headers.TryGetValues(name, out var values)
             ? string.Concat(values)
             : null;
+
+    public static HttpStatusCode? TryGetStatusCode(this HttpRequestException ex) =>
+        // This is extremely frail, but there's no other way
+        Regex
+            .Match(ex.Message, @": (\d+) \(")
+            .Groups[1]
+            .Value
+            .NullIfWhiteSpace()?
+            .Pipe(s => (HttpStatusCode) int.Parse(s, CultureInfo.InvariantCulture));
 }

DiscordChatExporter.Core/Utils/Extensions/StringExtensions.cs

@@ -1,5 +1,7 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Text;
+using System.Text.RegularExpressions;
 
 namespace DiscordChatExporter.Core.Utils.Extensions;
 
@@ -25,6 +27,14 @@ public static class StringExtensions
         }
     }
 
+    public static string ToDashCase(this string str) =>
+        Regex.Replace(str, @"(\p{Ll})(\p{Lu})", "$1-$2");
+
+    public static T? ParseEnumOrNull<T>(this string str, bool ignoreCase = true) where T : struct, Enum =>
+        Enum.TryParse<T>(str, ignoreCase, out var result)
+            ? result
+            : null;
+
     public static StringBuilder AppendIfNotEmpty(this StringBuilder builder, char value) =>
         builder.Length > 0
             ? builder.Append(value)

DiscordChatExporter.Core/Utils/Extensions/TimeSpanExtensions.cs

@@ -0,0 +1,17 @@
+using System;
+
+namespace DiscordChatExporter.Core.Utils.Extensions;
+
+public static class TimeSpanExtensions
+{
+    public static TimeSpan Clamp(this TimeSpan value, TimeSpan min, TimeSpan max)
+    {
+        if (value < min)
+            return min;
+
+        if (value > max)
+            return max;
+
+        return value;
+    }
+}

DiscordChatExporter.Core/Utils/Http.cs

@@ -3,6 +3,7 @@ using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Net.Sockets;
+using System.Security.Authentication;
 using System.Threading.Tasks;
 using DiscordChatExporter.Core.Utils.Extensions;
 using Polly;
@@ -21,7 +22,7 @@ public static class Http
 
     private static bool IsRetryableException(Exception exception) =>
         exception.GetSelfAndChildren().Any(ex =>
-            ex is TimeoutException or SocketException ||
+            ex is TimeoutException or SocketException or AuthenticationException ||
             ex is HttpRequestException hrex && IsRetryableStatusCode(hrex.TryGetStatusCode() ?? HttpStatusCode.OK)
         );
 
@@ -38,18 +39,11 @@ public static class Http
                 8,
                 (i, result, _) =>
                 {
-                    // If rate-limited, use retry-after as a guide
-                    if (result.Result?.StatusCode == HttpStatusCode.TooManyRequests)
+                    // If rate-limited, use retry-after header as the guide
+                    if (result.Result.Headers.RetryAfter?.Delta is { } retryAfter)
                     {
-                        // Only start respecting retry-after after a few attempts, because
-                        // Discord often sends unreasonable (20+ minutes) retry-after
-                        // on the very first request.
-                        if (i > 3)
-                        {
-                            var retryAfterDelay = result.Result.Headers.RetryAfter?.Delta;
-                            if (retryAfterDelay is not null)
-                                return retryAfterDelay.Value + TimeSpan.FromSeconds(1); // margin just in case
-                        }
+                        // Add some buffer just in case
+                        return retryAfter + TimeSpan.FromSeconds(1);
                     }
 
                     return TimeSpan.FromSeconds(Math.Pow(2, i) + 1);

DiscordChatExporter.Core/Utils/PathEx.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.IO;
+using System.Runtime.InteropServices;
 using System.Text;
 
 namespace DiscordChatExporter.Core.Utils;
@@ -15,6 +16,14 @@ public static class PathEx
         foreach (var c in path)
             buffer.Append(!InvalidFileNameChars.Contains(c) ? c : '_');
 
+        // File names cannot end with a dot on Windows
+        // https://github.com/Tyrrrz/DiscordChatExporter/issues/977
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+        {
+            while (buffer.Length > 0 && buffer[^1] == '.')
+                buffer.Remove(buffer.Length - 1, 1);
+        }
+
         return buffer.ToString();
     }
 

DiscordChatExporter.Gui/Bootstrapper.cs

@@ -9,37 +9,41 @@ using System.Windows;
 using System.Windows.Threading;
 #endif
 
-namespace DiscordChatExporter.Gui
+namespace DiscordChatExporter.Gui;
+
+public class Bootstrapper : Bootstrapper<RootViewModel>
 {
-    public class Bootstrapper : Bootstrapper<RootViewModel>
+    protected override void OnStart()
     {
-        protected override void OnStart()
-        {
-            base.OnStart();
+        base.OnStart();
 
-            // Set default theme
-            // (preferred theme will be chosen later, once the settings are loaded)
-            App.SetLightTheme();
-        }
+        // Set default theme
+        // (preferred theme will be set later, once the settings are loaded)
+        App.SetLightTheme();
+    }
 
-        protected override void ConfigureIoC(IStyletIoCBuilder builder)
-        {
-            base.ConfigureIoC(builder);
+    protected override void ConfigureIoC(IStyletIoCBuilder builder)
+    {
+        base.ConfigureIoC(builder);
 
-            // Bind settings as singleton
-            builder.Bind<SettingsService>().ToSelf().InSingletonScope();
+        // Bind settings as singleton
+        builder.Bind<SettingsService>().ToSelf().InSingletonScope();
 
-            // Bind view model factory
-            builder.Bind<IViewModelFactory>().ToAbstractFactory();
-        }
+        // Bind view model factory
+        builder.Bind<IViewModelFactory>().ToAbstractFactory();
+    }
 
 #if !DEBUG
-        protected override void OnUnhandledException(DispatcherUnhandledExceptionEventArgs e)
-        {
-            base.OnUnhandledException(e);
+    protected override void OnUnhandledException(DispatcherUnhandledExceptionEventArgs e)
+    {
+        base.OnUnhandledException(e);
 
-            MessageBox.Show(e.Exception.ToString(), "Error occured", MessageBoxButton.OK, MessageBoxImage.Error);
-        }
-#endif
+        MessageBox.Show(
+            e.Exception.ToString(),
+            "Error occured",
+            MessageBoxButton.OK,
+            MessageBoxImage.Error
+        );
     }
+#endif
 }

DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj

@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$(TargetFramework)-windows</TargetFramework>
     <OutputType>WinExe</OutputType>
+    <TargetFramework>$(TargetFramework)-windows</TargetFramework>
     <AssemblyName>DiscordChatExporter</AssemblyName>
     <UseWPF>true</UseWPF>
     <ApplicationIcon>../favicon.ico</ApplicationIcon>
@@ -14,15 +14,15 @@
 
   <ItemGroup>
     <PackageReference Include="Gress" Version="2.0.1" />
-    <PackageReference Include="MaterialDesignColors" Version="2.0.6" />
-    <PackageReference Include="MaterialDesignThemes" Version="4.5.0" />
+    <PackageReference Include="MaterialDesignColors" Version="2.0.9" />
+    <PackageReference Include="MaterialDesignThemes" Version="4.6.1" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
     <PackageReference Include="Ookii.Dialogs.Wpf" Version="5.0.1" />
-    <PackageReference Include="Onova" Version="2.6.2" />
+    <PackageReference Include="Onova" Version="2.6.3" />
     <PackageReference Include="Stylet" Version="1.3.6" />
     <PackageReference Include="Tyrrrz.Settings" Version="1.3.4" />
-    <PackageReference Include="PropertyChanged.Fody" Version="3.4.1" PrivateAssets="all" />
-    <PackageReference Include="DotnetRuntimeBootstrapper" Version="2.3.1" PrivateAssets="all" />
+    <PackageReference Include="PropertyChanged.Fody" Version="4.1.0" PrivateAssets="all" />
+    <PackageReference Include="DotnetRuntimeBootstrapper" Version="2.4.0" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

DiscordChatExporter.Gui/Sanctions.cs

@@ -0,0 +1,48 @@
+using System;
+using System.Globalization;
+using System.Runtime.CompilerServices;
+using System.Windows;
+using Microsoft.Win32;
+
+namespace DiscordChatExporter.Gui;
+
+public static class Sanctions
+{
+    [ModuleInitializer]
+    internal static void Verify()
+    {
+        var isSkipped = string.Equals(
+            Environment.GetEnvironmentVariable("RUSNI"),
+            "PYZDA",
+            StringComparison.OrdinalIgnoreCase
+        );
+
+        if (isSkipped)
+            return;
+
+        var locale = CultureInfo.CurrentCulture.Name;
+
+        var region = Registry.CurrentUser
+            .OpenSubKey(@"Control Panel\International\Geo", false)?
+            .GetValue("Name") as string;
+
+        var isSanctioned =
+            locale.EndsWith("-ru", StringComparison.OrdinalIgnoreCase) ||
+            locale.EndsWith("-by", StringComparison.OrdinalIgnoreCase) ||
+            string.Equals(region, "ru", StringComparison.OrdinalIgnoreCase) ||
+            string.Equals(region, "by", StringComparison.OrdinalIgnoreCase);
+
+        if (!isSanctioned)
+            return;
+
+        MessageBox.Show(
+            "You cannot use this software on the territory of a terrorist state. " +
+            "Set the environment variable `RUSNI=PYZDA` if you wish to override this check.",
+            "Sanctioned region",
+            MessageBoxButton.OK,
+            MessageBoxImage.Error
+        );
+
+        Environment.Exit(0xFACC);
+    }
+}

DiscordChatExporter.Gui/Services/SettingsService.cs

@@ -16,7 +16,7 @@ public partial class SettingsService : SettingsManager
 
     public int ParallelLimit { get; set; } = 1;
 
-    public bool ShouldReuseMedia { get; set; }
+    public bool ShouldReuseAssets { get; set; }
 
     public string? LastToken { get; set; }
 
@@ -26,7 +26,7 @@ public partial class SettingsService : SettingsManager
 
     public string? LastMessageFilterValue { get; set; }
 
-    public bool LastShouldDownloadMedia { get; set; }
+    public bool LastShouldDownloadAssets { get; set; }
 
     public SettingsService()
     {

DiscordChatExporter.Gui/ViewModels/Components/DashboardViewModel.cs

@@ -186,8 +186,8 @@ public class DashboardViewModel : PropertyChangedBase
                             dialog.Before?.Pipe(Snowflake.FromDate),
                             dialog.PartitionLimit,
                             dialog.MessageFilter,
-                            dialog.ShouldDownloadMedia,
-                            _settingsService.ShouldReuseMedia,
+                            dialog.ShouldDownloadAssets,
+                            _settingsService.ShouldReuseAssets,
                             _settingsService.DateFormat
                         );
 

DiscordChatExporter.Gui/ViewModels/Dialogs/ExportSetupViewModel.cs

@@ -59,7 +59,7 @@ public class ExportSetupViewModel : DialogScreen
         ? MessageFilter.Parse(MessageFilterValue)
         : MessageFilter.Null;
 
-    public bool ShouldDownloadMedia { get; set; }
+    public bool ShouldDownloadAssets { get; set; }
 
     public bool IsAdvancedSectionDisplayed { get; set; }
 
@@ -72,7 +72,7 @@ public class ExportSetupViewModel : DialogScreen
         SelectedFormat = _settingsService.LastExportFormat;
         PartitionLimitValue = _settingsService.LastPartitionLimitValue;
         MessageFilterValue = _settingsService.LastMessageFilterValue;
-        ShouldDownloadMedia = _settingsService.LastShouldDownloadMedia;
+        ShouldDownloadAssets = _settingsService.LastShouldDownloadAssets;
 
         // Show the "advanced options" section by default if any
         // of the advanced options are set to non-default values.
@@ -81,7 +81,7 @@ public class ExportSetupViewModel : DialogScreen
             Before != default ||
             !string.IsNullOrWhiteSpace(PartitionLimitValue) ||
             !string.IsNullOrWhiteSpace(MessageFilterValue) ||
-            ShouldDownloadMedia != default;
+            ShouldDownloadAssets != default;
     }
 
     public void ToggleAdvancedSection() => IsAdvancedSectionDisplayed = !IsAdvancedSectionDisplayed;
@@ -92,7 +92,7 @@ public class ExportSetupViewModel : DialogScreen
         _settingsService.LastExportFormat = SelectedFormat;
         _settingsService.LastPartitionLimitValue = PartitionLimitValue;
         _settingsService.LastMessageFilterValue = MessageFilterValue;
-        _settingsService.LastShouldDownloadMedia = ShouldDownloadMedia;
+        _settingsService.LastShouldDownloadAssets = ShouldDownloadAssets;
 
         // If single channel - prompt file path
         if (IsSingleChannel)

DiscordChatExporter.Gui/ViewModels/Dialogs/SettingsViewModel.cs

@@ -38,10 +38,10 @@ public class SettingsViewModel : DialogScreen
         set => _settingsService.ParallelLimit = Math.Clamp(value, 1, 10);
     }
 
-    public bool ShouldReuseMedia
+    public bool ShouldReuseAssets
     {
-        get => _settingsService.ShouldReuseMedia;
-        set => _settingsService.ShouldReuseMedia = value;
+        get => _settingsService.ShouldReuseAssets;
+        set => _settingsService.ShouldReuseAssets = value;
     }
 
     public SettingsViewModel(SettingsService settingsService) =>

DiscordChatExporter.Gui/ViewModels/RootViewModel.cs

@@ -17,9 +17,9 @@ public class RootViewModel : Screen, IHandle<NotificationMessage>, IDisposable
     private readonly DialogManager _dialogManager;
     private readonly SettingsService _settingsService;
     private readonly UpdateService _updateService;
-    
+
     public SnackbarMessageQueue Notifications { get; } = new(TimeSpan.FromSeconds(5));
-    
+
     public DashboardViewModel Dashboard { get; }
 
     public RootViewModel(
@@ -33,9 +33,9 @@ public class RootViewModel : Screen, IHandle<NotificationMessage>, IDisposable
         _dialogManager = dialogManager;
         _settingsService = settingsService;
         _updateService = updateService;
-        
+
         eventAggregator.Subscribe(this);
-        
+
         Dashboard = _viewModelFactory.CreateDashboardViewModel();
 
         DisplayName = $"{App.Name} v{App.VersionString}";
@@ -54,10 +54,10 @@ Press LEARN MORE to find ways that you can help.".Trim(),
 
         if (await _dialogManager.ShowDialogAsync(dialog) == true)
         {
-            ProcessEx.StartShellExecute("https://tyrrrz.me");
+            ProcessEx.StartShellExecute("https://tyrrrz.me/ukraine?source=discordchatexporter");
         }
     }
-    
+
     private async ValueTask CheckForUpdatesAsync()
     {
         try
@@ -84,7 +84,7 @@ Press LEARN MORE to find ways that you can help.".Trim(),
             Notifications.Enqueue("Failed to perform application update");
         }
     }
-    
+
     public async void OnViewFullyLoaded()
     {
         await ShowWarInUkraineMessageAsync();
@@ -115,7 +115,7 @@ Press LEARN MORE to find ways that you can help.".Trim(),
         _updateService.FinalizeUpdate(false);
     }
 
-    public void Handle(NotificationMessage message) => 
+    public void Handle(NotificationMessage message) =>
         Notifications.Enqueue(message.Text);
 
     public void Dispose() => Notifications.Dispose();

DiscordChatExporter.Gui/Views/Components/DashboardView.xaml

@@ -181,7 +181,7 @@
                         <LineBreak />
                         <Run Text="7. Select the" />
                         <Run FontWeight="SemiBold" Text="Headers" />
-                        <Run Text=" tab on the right" />
+                        <Run Text="tab on the right" />
                         <LineBreak />
                         <Run Text="8. Scroll down to the" />
                         <Run FontWeight="SemiBold" Text="Request Headers" />

DiscordChatExporter.Gui/Views/Dialogs/ExportSetupView.xaml

@@ -167,8 +167,8 @@
                             Text="{Binding MessageFilterValue}"
                             ToolTip="Only include messages that satisfy this filter (e.g. 'from:foo#1234' or 'has:image')." />
 
-                        <!--  Download media  -->
-                        <Grid Margin="16,16" ToolTip="Download referenced media content (user avatars, attached files, embedded images, etc)">
+                        <!--  Download assets  -->
+                        <Grid Margin="16,16" ToolTip="Download assets referenced by the export (user avatars, attached files, embedded images, etc.)">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="*" />
                                 <ColumnDefinition Width="Auto" />
@@ -177,12 +177,12 @@
                             <TextBlock
                                 Grid.Column="0"
                                 VerticalAlignment="Center"
-                                Text="Download media" />
+                                Text="Download assets" />
                             <ToggleButton
                                 Grid.Column="1"
                                 HorizontalAlignment="Right"
                                 VerticalAlignment="Center"
-                                IsChecked="{Binding ShouldDownloadMedia}" />
+                                IsChecked="{Binding ShouldDownloadAssets}" />
                         </Grid>
                     </StackPanel>
                 </StackPanel>

DiscordChatExporter.Gui/Views/Dialogs/SettingsView.xaml

@@ -82,20 +82,20 @@
                             IsChecked="{Binding IsTokenPersisted}" />
                     </DockPanel>
 
-                    <!--  Reuse media  -->
+                    <!--  Reuse assets  -->
                     <DockPanel
                         Margin="16,8"
                         Background="Transparent"
                         LastChildFill="False"
-                        ToolTip="Reuse already existing media content to skip redundant downloads">
+                        ToolTip="Reuse previously downloaded assets to avoid redundant requests">
                         <TextBlock
                             VerticalAlignment="Center"
                             DockPanel.Dock="Left"
-                            Text="Reuse downloaded media" />
+                            Text="Reuse downloaded assets" />
                         <ToggleButton
                             VerticalAlignment="Center"
                             DockPanel.Dock="Right"
-                            IsChecked="{Binding ShouldReuseMedia}" />
+                            IsChecked="{Binding ShouldReuseAssets}" />
                     </DockPanel>
 
                     <!--  Date format  -->

DiscordChatExporter.Gui/Views/RootView.xaml

@@ -7,6 +7,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:s="https://github.com/canton7/Stylet"
     xmlns:viewModels="clr-namespace:DiscordChatExporter.Gui.ViewModels"
+    xmlns:converters="clr-namespace:DiscordChatExporter.Gui.Converters"
     Width="600"
     Height="550"
     MinWidth="325"
@@ -21,10 +22,11 @@
     </Window.TaskbarItemInfo>
 
     <materialDesign:DialogHost
+        x:Name="DialogHost"
         Loaded="{s:Action OnViewFullyLoaded}"
         SnackbarMessageQueue="{Binding Notifications}"
         Style="{DynamicResource MaterialDesignEmbeddedDialogHost}">
-        <Grid>
+        <Grid IsEnabled="{Binding IsOpen, ElementName=DialogHost, Converter={x:Static converters:InverseBoolConverter.Instance}}">
             <ContentControl s:View.Model="{Binding Dashboard}" />
             <materialDesign:Snackbar MessageQueue="{Binding Notifications}" />
         </Grid>

License.txt

@@ -1,5 +1,5 @@
  DiscordChatExporter
- Copyright (C) 2017-2022 Oleksii Holub
+ Copyright (C) 2017-2023 Oleksii Holub
 
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by

Readme.md

@@ -1,7 +1,7 @@
 # DiscordChatExporter
 
 [![Made in Ukraine](https://img.shields.io/badge/made_in-ukraine-ffd700.svg?labelColor=0057b7)](https://vshymanskyy.github.io/StandWithUkraine)
-[![Build](https://img.shields.io/github/workflow/status/Tyrrrz/DiscordChatExporter/main/master)](https://github.com/Tyrrrz/DiscordChatExporter/actions)
+[![Build](https://img.shields.io/github/actions/workflow/status/Tyrrrz/DiscordChatExporter/main.yml?branch=master)](https://github.com/Tyrrrz/DiscordChatExporter/actions)
 [![Coverage](https://img.shields.io/codecov/c/github/Tyrrrz/DiscordChatExporter/master)](https://codecov.io/gh/Tyrrrz/DiscordChatExporter)
 [![Release](https://img.shields.io/github/release/Tyrrrz/DiscordChatExporter.svg)](https://github.com/Tyrrrz/DiscordChatExporter/releases)
 [![Downloads](https://img.shields.io/github/downloads/Tyrrrz/DiscordChatExporter/total.svg)](https://github.com/Tyrrrz/DiscordChatExporter/releases)
@@ -65,6 +65,7 @@ The following table lists all available download options:
           <li>🟠 <a href="https://github.com/Tyrrrz/DiscordChatExporter/actions/workflows/main.yml">CI build</a> (<code>DiscordChatExporter.CLI.zip</code>)</li>
           <li>🐋 <a href="https://hub.docker.com/r/tyrrrz/discordchatexporter">Docker</a> (<code>tyrrrz/discordchatexporter</code>)</li>
           <li>📦 <a href="https://aur.archlinux.org/packages/discord-chat-exporter-cli">AUR</a> (<code>discord-chat-exporter-cli</code>)</li>
+          <li>📦 <a href="https://search.nixos.org/packages?query=discordchatexporter-cli">Nix</a> (<code>discordchatexporter-cli</code>)</li>
         </ul>
       </td>
       <td>
@@ -79,15 +80,19 @@ The following table lists all available download options:
 </table>
 
 > **Note**:
-> **DiscordChatExporter**'s AUR package is maintained by the community.
+> AUR and Nix packages linked above are maintained by the community.
+> If you have any issues with them, please contact the corresponding maintainers.
 
 > **Warning**:
-> To run **DiscordChatExporter** on macOS or Linux, you will need to additionally install **.NET Runtime v6**:
-> - [.NET Runtime v6 for **macOS x64**](https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-6.0.6-macos-x64-installer)
-> - [.NET Runtime v6 for **macOS Arm64**](https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-6.0.6-macos-arm64-installer)
-> - [.NET Runtime v6 for **Linux**](https://docs.microsoft.com/en-us/dotnet/core/install/linux) (find the correct download for your distro)
+> To run **DiscordChatExporter** on macOS and Linux, you need to make sure that **.NET 7.0 Runtime** is installed.
+> You can download it here:
 >
-> This is not required if you installed **DiscordChatExporter** using a package manager, or if you plan to run **DiscordChatExporter** via Docker.
+> - [.NET 7.0 Runtime for **macOS x64**](https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/sdk-7.0.101-macos-x64-installer)
+> - [.NET 7.0 Runtime for **macOS Arm64**](https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/sdk-7.0.101-macos-arm64-installer)
+> - [.NET 7.0 Runtime for **Linux**](https://docs.microsoft.com/en-us/dotnet/core/install/linux) (find the correct download for your distro)
+>
+> This should not be necessary if you install **DiscordChatExporter** using a package manager, as it should take care of the dependencies for you.
+> This is also not necessary if you are running **DiscordChatExporter** via Docker, because the image already contains the runtime.
 
 ## Features
 
@@ -102,4 +107,9 @@ The following table lists all available download options:
 ## Screenshots
 
 ![channel list](.assets/list.png)
-![rendered output](.assets/output.png)
+![rendered output](.assets/output.png)
+
+## Related projects
+
+- [**Chat Analytics**](https://github.com/mlomb/chat-analytics) — solution for analyzing chat patterns of Discord users, using exports produced by **DiscordChatExporter**.
+- [**DiscordChatExporter-frontend**](https://github.com/slatinsky/DiscordChatExporter-frontend) — convenient viewer for exports produced by **DiscordChatExporter**.