Refactor

Signed-off-by: dependabot[bot] <support@github.com>

.docs/Docker.md

@@ -16,7 +16,7 @@ $ docker pull tyrrrz/discordchatexporter:stable
 Note the `:stable` tag. DiscordChatExporter images are tagged according to the following patterns:
 
 - `stable` — latest stable version release. This tag is updated with each release of a new project version. Recommended for personal use.
-- `x.y.z` (e.g. `2.30.1`) — specific stable version release. This tag is pushed when the corresponding version is released and never updated thereafter. Recommended for use in automation scenarios.
+- `x.y.z` (e.g., `2.30.1`) — specific stable version release. This tag is pushed when the corresponding version is released and never updated thereafter. Recommended for use in automation scenarios.
 - `latest` — latest (potentially unstable) build. This tag is updated with each new commit to the `prime` branch. Not recommended, unless you want to test a new feature that has not been released in a stable version yet.
 
 You can see all available tags [here](https://hub.docker.com/r/tyrrrz/discordchatexporter/tags?ordering=name).

.docs/Scheduling-Linux.md

@@ -64,9 +64,9 @@ exit 0
 
 - `tokenhere` with your [Token](Token-and-IDs.md).
 - `channelhere` with a [Channel ID](Token-and-IDs.md).
-- `dceFOLDERpathhere` with DCE's **directory path** (e.g. `/path/to/folder`, NOT `/path/to/folder/DiscordChatExporter.dll`).
+- `dceFOLDERpathhere` with DCE's **directory path** (e.g., `/path/to/folder`, NOT `/path/to/folder/DiscordChatExporter.dll`).
 - `filenamehere` with the exported channel's filename, without spaces.
-- `dirhere` with the export directory (e.g. /home/user/Documents/Discord\ Exports).
+- `dirhere` with the export directory (e.g., /home/user/Documents/Discord\ Exports).
 - `formathere` with one of the available export formats.
 
 > **Note**:

.docs/Scheduling-MacOS.md

@@ -68,9 +68,9 @@ exit 0
 
 - `tokenhere` with your [Token](Token-and-IDs.md)
 - `channelhere` with a [Channel ID](Token-and-IDs.md)
-- `dceFOLDERpathhere` with DCE's **directory's path** (e.g. `/Users/user/Desktop/DiscordChatExporterFolder`, NOT `/Users/user/Desktop/DiscordChatExporterFolder/DiscordChatExporter.DLL`)
+- `dceFOLDERpathhere` with DCE's **directory's path** (e.g., `/Users/user/Desktop/DiscordChatExporterFolder`, NOT `/Users/user/Desktop/DiscordChatExporterFolder/DiscordChatExporter.DLL`)
 - `filenamehere` with the exported channel's filename, without spaces
-- `dirhere` with the directory you want the files to be saved at (e.g. `/Users/user/Documents/Discord\ Exports`)
+- `dirhere` with the directory you want the files to be saved at (e.g., `/Users/user/Documents/Discord\ Exports`)
 - `formathere` with one of the available export formats
 
 To quickly get file or folder paths, select the file/folder, then hit Command+I (⌘I) and copy what's after `Where:`.

.docs/Scheduling-Windows.md

@@ -33,9 +33,9 @@ exit
 
 - `tokenhere` with your [Token](Token-and-IDs.md)
 - `channelhere` with a [Channel ID](Token-and-IDs.md)
-- `exefolderhere` with the .exe **directory's path** (e.g. C:\Users\User\Desktop\DiscordChatExporter)
+- `exefolderhere` with the .exe **directory's path** (e.g., C:\Users\User\Desktop\DiscordChatExporter)
 - `filenamehere` with a filename without spaces
-- `dirhere` with the export directory (e.g. C:\Users\User\Documents\Exports)
+- `dirhere` with the export directory (e.g., C:\Users\User\Documents\Exports)
 - `formathere` with one of the available export formats
 
 Make sure not to delete the quotes (")

.docs/Using-the-CLI.md

@@ -77,7 +77,7 @@ format is `HtmlDark`.
 
 #### Changing the output filename
 
-You can change the filename by using `-o name.ext`. e.g. for the `HTML` format:
+You can change the filename by using `-o name.ext`. e.g., for the `HTML` format:
 
 ```console
 ./DiscordChatExporter.Cli export -t "mfa.Ifrn" -c 53555 -o myserver.html
@@ -186,21 +186,21 @@ locales. The default locale is `en-US`.
 #### Date ranges
 
 **Messages sent before a date**
-Use `--before` to export messages sent before the provided date. E.g. messages sent before September 18th, 2019:
+Use `--before` to export messages sent before the provided date. e.g., messages sent before September 18th, 2019:
 
 ```console
 ./DiscordChatExporter.Cli export -t "mfa.Ifrn" -c 53555 --before 2019-09-18
 ```
 
 **Messages sent after a date**
-Use `--after` to export messages sent after the provided date. E.g. messages sent after September 17th, 2019 11:34 PM:
+Use `--after` to export messages sent after the provided date. e.g., messages sent after September 17th, 2019 11:34 PM:
 
 ```console
 ./DiscordChatExporter.Cli export -t "mfa.Ifrn" -c 53555 --after "2019-09-17 23:34"
 ```
 
 **Messages sent in a date range**
-Use `--before` and `--after` to export messages sent during the provided date range. E.g. messages sent between
+Use `--before` and `--after` to export messages sent during the provided date range. e.g., messages sent between
 September 17th, 2019 11:34 PM and September 18th:
 
 ```console

.docs/Using-the-GUI.md

@@ -56,10 +56,11 @@ In this screen you can customize the following:
 - **Export format** - HTML (Dark), HTML (Light), TXT, CSV and JSON
 
 - **Date range (after/before)** (Optional) - If set, only messages sent in the provided date range will be exported. Only one value (either after or before) is required if you want to use this option.
+
   > **Note**:
   > Please note that the time defaults to **12:00 AM** (midnight/00:00). This means that if you choose to export between Sep 17th and Sep 18th, messages from Sep 18th won't be exported.
 
-- **Partition limit** (Optional) - Split output into partitions, each limited to this number of messages (e.g. 100) or file size (e.g. 10mb). For example, a channel with 36 messages set to be partitioned every 10 messages will output 4 files.
+- **Partition limit** (Optional) - Split output into partitions, each limited to this number of messages (e.g., 100) or file size (e.g., 10mb). For example, a channel with 36 messages set to be partitioned every 10 messages will output 4 files.
 
 - **Message Filter** (Optional) - Special notation for filtering the messages that get included in the export. See [Message filters](Message-filters.md) for more info.
 
@@ -77,29 +78,28 @@ In this screen you can customize the following:
 ## Settings
 
 - **Auto-update** - Perform automatic updates on every launch.
-Default: Enabled
+  Default: Enabled
 
   > **Note**:
   > Keep this option enabled to receive the latest features and bug fixes!
 
 - **Dark mode** - Use darker colors in the UI (User Interface).
-Default: Disabled
+  Default: Disabled
 
 - **Persist token** - Persist last used token between sessions.
-Default: Enabled
+  Default: Enabled
 
 - **Show threads** - Controls whether threads are shown in the channel list.
-Default: none
+  Default: none
 
 - **Locale** - Customize how dates are formatted in the exported files.
 
 - **Date format** - Customize how dates are formatted in the exported files in the settings menu ().
 
 - **Parallel limit** - The number of channels that will be exported at the same time.
-Default: 1
+  Default: 1
 
   > **Note**:
   > Try to keep this number low so that your account doesn't get flagged.
 
 - **Normalize to UTC** - Convert all dates to UTC before exporting.
-

.github/workflows/docker.yml

@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
       - name: Install Docker Buildx
         uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0
@@ -55,7 +55,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
       - name: Install Docker Buildx
         uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4.1.0

.github/workflows/main.yml

@@ -26,10 +26,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
       - name: Install .NET
-        uses: actions/setup-dotnet@9a946fdbd5fb07b82b2f5a4466058b876ab72bb2 # v5.3.0
+        uses: actions/setup-dotnet@26b0ec14cb23fa6904739307f278c14f94c95bf1 # v5.4.0
 
       # Build the project separately to discern between build and format errors
       - name: Build
@@ -62,10 +62,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
       - name: Install .NET
-        uses: actions/setup-dotnet@9a946fdbd5fb07b82b2f5a4466058b876ab72bb2 # v5.3.0
+        uses: actions/setup-dotnet@26b0ec14cb23fa6904739307f278c14f94c95bf1 # v5.4.0
 
       - name: Run tests
         env:
@@ -81,7 +81,7 @@ jobs:
           DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=opencover
 
       - name: Upload coverage
-        uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1
+        uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
 
@@ -117,10 +117,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
       - name: Install .NET
-        uses: actions/setup-dotnet@9a946fdbd5fb07b82b2f5a4466058b876ab72bb2 # v5.3.0
+        uses: actions/setup-dotnet@26b0ec14cb23fa6904739307f278c14f94c95bf1 # v5.4.0
 
       - name: Publish app
         run: >

Directory.Packages.props

@@ -4,38 +4,38 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageVersion Include="AngleSharp" Version="1.4.0" />
+    <PackageVersion Include="AngleSharp" Version="1.5.1" />
     <PackageVersion Include="AsyncImageLoader.Avalonia" Version="3.8.0" />
     <PackageVersion Include="AsyncKeyedLock" Version="8.0.2" />
-    <PackageVersion Include="Avalonia" Version="12.0.4" />
+    <PackageVersion Include="Avalonia" Version="12.0.5" />
-    <PackageVersion Include="Avalonia.Desktop" Version="12.0.4" />
+    <PackageVersion Include="Avalonia.Desktop" Version="12.0.5" />
     <PackageVersion Include="CliFx" Version="3.0.0" />
     <PackageVersion Include="Cogwheel" Version="2.1.1" />
     <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.2" />
     <PackageVersion Include="coverlet.collector" Version="10.0.1" />
-    <PackageVersion Include="CSharpier.MsBuild" Version="1.2.6" />
+    <PackageVersion Include="CSharpier.MsBuild" Version="1.3.0" />
-    <PackageVersion Include="Deorcify" Version="1.1.0" />
+    <PackageVersion Include="Deorcify" Version="2.0.1" />
     <PackageVersion Include="DialogHost.Avalonia" Version="0.12.2" />
     <PackageVersion Include="FluentAssertions" Version="8.10.0" />
     <PackageVersion Include="GitHubActionsTestLogger" Version="3.0.4" />
     <PackageVersion Include="Gress" Version="2.2.0" />
-    <PackageVersion Include="JsonExtensions" Version="1.2.0" />
+    <PackageVersion Include="JsonExtensions" Version="1.2.3" />
-    <PackageVersion Include="Markdig" Version="1.2.0" />
+    <PackageVersion Include="Markdig" Version="1.3.2" />
     <PackageVersion Include="Material.Avalonia" Version="3.16.1" />
     <PackageVersion Include="Material.Icons.Avalonia" Version="3.0.2" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.8" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.9" />
     <PackageVersion
       Include="Microsoft.Extensions.Configuration.EnvironmentVariables"
-      Version="10.0.8"
+      Version="10.0.9"
     />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.8" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.9" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.8" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.9" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.6.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.7.0" />
     <PackageVersion Include="Onova" Version="2.6.13" />
-    <PackageVersion Include="Polly" Version="8.6.6" />
+    <PackageVersion Include="Polly" Version="8.7.0" />
-    <PackageVersion Include="PowerKit" Version="1.2.0" />
+    <PackageVersion Include="PowerKit" Version="2.0.2" />
     <PackageVersion Include="RazorBlade" Version="1.0.0" />
-    <PackageVersion Include="Spectre.Console" Version="0.55.2" />
+    <PackageVersion Include="Spectre.Console" Version="0.57.1" />
     <PackageVersion Include="Superpower" Version="3.1.0" />
     <PackageVersion Include="ThisAssembly.Project" Version="2.1.2" />
     <PackageVersion Include="WebMarkupMin.Core" Version="2.21.0" />

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

@@ -14,13 +14,13 @@
     <PackageReference Include="coverlet.collector" PrivateAssets="all" />
     <PackageReference Include="CSharpier.MsBuild" PrivateAssets="all" />
     <PackageReference Include="FluentAssertions" />
-    <PackageReference Include="GitHubActionsTestLogger" PrivateAssets="all" />
+    <PackageReference Include="GitHubActionsTestLogger" />
     <PackageReference Include="JsonExtensions" />
     <PackageReference Include="Microsoft.Extensions.Configuration" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="PowerKit" PrivateAssets="all" />
+    <PackageReference Include="PowerKit" />
     <PackageReference Include="xunit" />
     <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="all" />
   </ItemGroup>

DiscordChatExporter.Cli.Tests/Specs/DateRangeSpecs.cs

@@ -60,6 +60,52 @@ public class DateRangeSpecs
             );
     }
 
+    [Fact]
+    public async Task I_can_filter_the_reverse_export_to_only_include_messages_sent_after_the_specified_date()
+    {
+        // Arrange
+        var after = new DateTimeOffset(2021, 07, 24, 0, 0, 0, TimeSpan.Zero);
+        using var file = TempFile.Create();
+
+        // Act
+        await new ExportChannelsCommand
+        {
+            Token = Secrets.DiscordToken,
+            ChannelIds = [ChannelIds.DateRangeTestCases],
+            ExportFormat = ExportFormat.Json,
+            OutputPath = file.Path,
+            After = Snowflake.FromDate(after),
+            IsReverseMessageOrder = true,
+        }.ExecuteAsync(new FakeConsole());
+
+        // Assert
+        var timestamps = Json.Parse(await File.ReadAllTextAsync(file.Path))
+            .GetProperty("messages")
+            .EnumerateArray()
+            .Select(j => j.GetProperty("timestamp").GetDateTimeOffset())
+            .ToArray();
+
+        timestamps.All(t => t > after).Should().BeTrue();
+        timestamps.Should().BeInDescendingOrder();
+
+        timestamps
+            .Should()
+            .BeEquivalentTo(
+                [
+                    new DateTimeOffset(2021, 09, 08, 14, 26, 35, TimeSpan.Zero),
+                    new DateTimeOffset(2021, 07, 24, 14, 52, 40, TimeSpan.Zero),
+                    new DateTimeOffset(2021, 07, 24, 14, 52, 39, TimeSpan.Zero),
+                    new DateTimeOffset(2021, 07, 24, 14, 52, 38, TimeSpan.Zero),
+                    new DateTimeOffset(2021, 07, 24, 13, 49, 13, TimeSpan.Zero),
+                ],
+                o =>
+                    o.Using<DateTimeOffset>(ctx =>
+                            ctx.Subject.Should().BeCloseTo(ctx.Expectation, TimeSpan.FromSeconds(1))
+                        )
+                        .WhenTypeIs<DateTimeOffset>()
+            );
+    }
+
     [Fact]
     public async Task I_can_filter_the_export_to_only_include_messages_sent_before_the_specified_date()
     {

DiscordChatExporter.Cli/Commands/Base/DiscordCommandBase.cs

@@ -30,7 +30,7 @@ public abstract class DiscordCommandBase : ICommand
     [CommandOption(
         "respect-rate-limits",
         Description = "Whether to respect advisory rate limits. "
-            + "If disabled, only hard rate limits (i.e. 429 responses) will be respected."
+            + "If disabled, only hard rate limits (i.e., 429 responses) will be respected."
     )]
     public bool ShouldRespectRateLimits { get; set; } = true;
 

DiscordChatExporter.Cli/Commands/Base/ExportCommandBase.cs

@@ -59,7 +59,7 @@ public abstract class ExportCommandBase : DiscordCommandBase
         "partition",
         'p',
         Description = "Split the output into partitions, each limited to the specified "
-            + "number of messages (e.g. '100') or file size (e.g. '10mb')."
+            + "number of messages (e.g., '100') or file size (e.g., '10mb')."
     )]
     public PartitionLimit PartitionLimit { get; set; } = PartitionLimit.Null;
 
@@ -165,6 +165,37 @@ public abstract class ExportCommandBase : DiscordCommandBase
             throw new CommandException("Option --media-dir cannot be used without --media.");
         }
 
+        // Make sure the user does not try to export multiple channels into one file.
+        // Output path must either be a directory or contain template tokens for this to work.
+        // Validate this up-front, before fetching threads, because thread fetching can take a
+        // long time and it's frustrating to fail only after it completes.
+        // https://github.com/Tyrrrz/DiscordChatExporter/issues/799
+        // https://github.com/Tyrrrz/DiscordChatExporter/issues/917
+        // https://github.com/Tyrrrz/DiscordChatExporter/issues/1549
+        var mayExportMultipleChannels =
+            // Multiple channels were provided explicitly
+            channels.Count > 1
+            // Thread inclusion can add more channels to the export
+            || ThreadInclusionMode != ThreadInclusionMode.None;
+
+        var isValidOutputPath =
+            // Anything is valid when exporting a single channel
+            !mayExportMultipleChannels
+            // When using template tokens, assume the user knows what they're doing
+            || OutputPath.Contains('%')
+            // Otherwise, require an existing directory or an unambiguous directory path
+            || Directory.Exists(OutputPath)
+            || Path.EndsInDirectorySeparator(OutputPath);
+
+        if (!isValidOutputPath)
+        {
+            throw new CommandException(
+                "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. "
+                    + $"Provided output path: '{OutputPath}'."
+            );
+        }
+
         var unwrappedChannels = new List<Channel>(channels);
 
         // Unwrap threads
@@ -205,28 +236,6 @@ public abstract class ExportCommandBase : DiscordCommandBase
             await console.Output.WriteLineAsync($"Fetched {fetchedThreadsCount} thread(s).");
         }
 
-        // Make sure the user does not try to export multiple channels into one file.
-        // Output path must either be a directory or contain template tokens for this to work.
-        // https://github.com/Tyrrrz/DiscordChatExporter/issues/799
-        // https://github.com/Tyrrrz/DiscordChatExporter/issues/917
-        var isValidOutputPath =
-            // Anything is valid when exporting a single channel
-            unwrappedChannels.Count <= 1
-            // When using template tokens, assume the user knows what they're doing
-            || OutputPath.Contains('%')
-            // Otherwise, require an existing directory or an unambiguous directory path
-            || Directory.Exists(OutputPath)
-            || Path.EndsInDirectorySeparator(OutputPath);
-
-        if (!isValidOutputPath)
-        {
-            throw new CommandException(
-                "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. "
-                    + $"Provided output path: '{OutputPath}'."
-            );
-        }
-
         // Export
         var errorsByChannel = new ConcurrentDictionary<Channel, string>();
         var warningsByChannel = new ConcurrentDictionary<Channel, string>();

DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj

@@ -9,9 +9,9 @@
   <ItemGroup>
     <PackageReference Include="CliFx" />
     <PackageReference Include="CSharpier.MsBuild" PrivateAssets="all" />
-    <PackageReference Include="Deorcify" PrivateAssets="all" />
+    <PackageReference Include="Deorcify" />
     <PackageReference Include="Gress" />
-    <PackageReference Include="PowerKit" PrivateAssets="all" />
+    <PackageReference Include="PowerKit" />
     <PackageReference Include="Spectre.Console" />
   </ItemGroup>
 

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

@@ -72,7 +72,7 @@ public partial record Embed
 
         // Under the Discord API model, embeds can only have at most one image.
         // Because of that, embeds that are rendered with multiple images on the client
-        // (e.g. tweet embeds), are exposed from the API as multiple separate embeds.
+        // (e.g., tweet embeds), are exposed from the API as multiple separate embeds.
         // Our embed model is consistent with the user-facing side of Discord, so images
         // are stored as an array. The API will only ever return one image, but we deal
         // with this by merging related embeds at the end of the message parsing process.

DiscordChatExporter.Core/Discord/Data/Emoji.cs

@@ -10,14 +10,14 @@ namespace DiscordChatExporter.Core.Discord.Data;
 public partial record Emoji(
     // Only present on custom emoji
     Snowflake? Id,
-    // Name of a custom emoji (e.g. LUL) or actual representation of a standard emoji (e.g. 🙂)
+    // Name of a custom emoji (e.g., LUL) or actual representation of a standard emoji (e.g., 🙂)
     string Name,
     bool IsAnimated
 )
 {
     public bool IsCustomEmoji { get; } = Id is not null;
 
-    // Name of a custom emoji (e.g. LUL) or name of a standard emoji (e.g. slight_smile)
+    // Name of a custom emoji (e.g., LUL) or name of a standard emoji (e.g., slight_smile)
     public string Code { get; } = Id is not null ? Name : EmojiIndex.TryGetCode(Name) ?? Name;
 
     public string ImageUrl { get; } =

DiscordChatExporter.Core/Discord/Data/MessageKind.cs

@@ -13,4 +13,5 @@ public enum MessageKind
     GuildMemberJoin = 7,
     ThreadCreated = 18,
     Reply = 19,
+    ThreadStarterMessage = 21,
 }

DiscordChatExporter.Core/Discord/DiscordClient.cs

@@ -30,9 +30,8 @@ public class DiscordClient(
         string url,
         TokenKind tokenKind,
         CancellationToken cancellationToken = default
-    )
+    ) =>
-    {
+        await Http.ResponseResiliencePipeline.ExecuteAsync(
-        return await Http.ResponseResiliencePipeline.ExecuteAsync(
             async innerCancellationToken =>
             {
                 using var request = new HttpRequestMessage(HttpMethod.Get, new Uri(_baseUri, url));
@@ -91,7 +90,6 @@ public class DiscordClient(
             },
             cancellationToken
         );
-    }
 
     private async ValueTask<TokenKind> ResolveTokenKindAsync(
         CancellationToken cancellationToken = default
@@ -364,6 +362,7 @@ public class DiscordClient(
             $"guilds/{guildId}/members/{memberId}",
             cancellationToken
         );
+
         return response?.Pipe(j => Member.Parse(j, guildId));
     }
 
@@ -412,14 +411,12 @@ public class DiscordClient(
             ?.GetNonWhiteSpaceStringOrNull()
             ?.Pipe(Snowflake.Parse);
 
-        Channel? parent = null;
-        if (parentId is not null)
-        {
         // It's possible for the parent channel to be inaccessible, despite the
         // child channel being accessible.
         // https://github.com/Tyrrrz/DiscordChatExporter/issues/1108
-            parent = await TryGetChannelAsync(parentId.Value, cancellationToken);
+        var parent = parentId is not null
-        }
+            ? await TryGetChannelAsync(parentId.Value, cancellationToken)
+            : null;
 
         return Channel.Parse(response.Value, parent);
     }
@@ -595,6 +592,33 @@ public class DiscordClient(
         }
     }
 
+    public async ValueTask<Message?> TryGetMessageAsync(
+        Snowflake channelId,
+        Snowflake messageId,
+        CancellationToken cancellationToken = default
+    )
+    {
+        // Use the regular message listing endpoint with the 'around' parameter instead of the
+        // dedicated single-message endpoint, because the latter is not accessible to user tokens.
+        var url = new UrlBuilder()
+            .SetPath($"channels/{channelId}/messages")
+            .SetQueryParameter("around", messageId.ToString())
+            .SetQueryParameter("limit", "1")
+            .Build();
+
+        // Can be null on channels that the user cannot access
+        var response = await TryGetJsonResponseAsync(url, cancellationToken);
+        if (response is null)
+            return null;
+
+        // The endpoint returns messages around the requested ID, so make sure to only return
+        // the message that exactly matches it (it may be absent if it has been deleted).
+        return response
+            .Value.EnumerateArray()
+            .Select(Message.Parse)
+            .FirstOrDefault(m => m.Id == messageId);
+    }
+
     private async ValueTask<Message?> TryGetFirstMessageAsync(
         Snowflake channelId,
         Snowflake? after = null,
@@ -607,8 +631,12 @@ public class DiscordClient(
             .SetQueryParameter("after", (after ?? Snowflake.Zero).ToString())
             .Build();
 
-        var response = await GetJsonResponseAsync(url, cancellationToken);
+        // Can be null on channels that the user cannot access
-        var message = response.EnumerateArray().Select(Message.Parse).FirstOrDefault();
+        var response = await TryGetJsonResponseAsync(url, cancellationToken);
+        if (response is null)
+            return null;
+
+        var message = response.Value.EnumerateArray().Select(Message.Parse).FirstOrDefault();
 
         return message;
     }
@@ -625,36 +653,64 @@ public class DiscordClient(
             .SetQueryParameter("before", before?.ToString())
             .Build();
 
-        var response = await GetJsonResponseAsync(url, cancellationToken);
+        // Can be null on channels that the user cannot access
-        return response.EnumerateArray().Select(Message.Parse).LastOrDefault();
+        var response = await TryGetJsonResponseAsync(url, cancellationToken);
+        if (response is null)
+            return null;
+
+        return response.Value.EnumerateArray().Select(Message.Parse).LastOrDefault();
     }
 
-    public async IAsyncEnumerable<Message> GetMessagesAsync(
+    private async IAsyncEnumerable<Message> GetMessagesAsync(
         Snowflake channelId,
-        Snowflake? after = null,
+        Snowflake? after,
-        Snowflake? before = null,
+        Snowflake? before,
-        IProgress<Percentage>? progress = null,
+        IProgress<Percentage>? progress,
-        [EnumeratorCancellation] CancellationToken cancellationToken = default
+        bool isReverse,
+        [EnumeratorCancellation] CancellationToken cancellationToken
+    )
+    {
+        // To keep the understanding of message history independent of the fetching direction,
+        // we'll refer to the two ends of the range as Alpha and Omega.
+        // Depending on the direction, these are either 'before' and 'after', or 'after' and 'before'.
+        //
+        // Chronological order:
+        // <after> Alpha [----->----->----] Omega <before>
+        // Reverse chronological order:
+        // <after> Omega [-----<-----<----] Alpha <before>
+
+        // Because Discord API doesn't allow us to provide both 'after' and 'before' parameters
+        // at the same time, we have to establish at least one end of the boundary manually.
+        // To do that, we'll fetch the Omega message, which will be the terminal message in the range:
+        // last message in chronological order, or first message in reverse chronological order.
+        // This snapshotting also has the side benefit of allowing us to calculate progress by comparing
+        // the timestamps of the Alpha message, Omega message, and the message being currently processed.
+        var omegaMessage = !isReverse
+            ? await TryGetLastMessageAsync(channelId, before, cancellationToken)
+            : await TryGetFirstMessageAsync(channelId, after, cancellationToken);
+
+        // If the Omega doesn't exist or falls outside of the range, then there are simply no messages
+        // satisfying the specified range.
+        if (
+            omegaMessage is null
+            || (!isReverse && omegaMessage.Timestamp < after?.ToDate())
+            || (isReverse && omegaMessage.Timestamp > before?.ToDate())
         )
         {
-        // Get the last message in the specified range, so we can later calculate the
-        // progress based on the difference between message timestamps.
-        // This also snapshots the boundaries, which means that messages posted after
-        // the export started will not appear in the output.
-        var lastMessage = await TryGetLastMessageAsync(channelId, before, cancellationToken);
-        if (lastMessage is null || lastMessage.Timestamp < after?.ToDate())
             yield break;
+        }
 
-        // Keep track of the first message in range in order to calculate the progress
+        // Persist the Alpha message as soon as we fetch the initial batch of messages.
-        var firstMessage = default(Message);
+        // This is only used for calculating progress.
+        var alphaMessage = default(Message);
 
-        var currentAfter = after ?? Snowflake.Zero;
+        var currentBoundary = !isReverse ? after ?? Snowflake.Zero : before;
         while (true)
         {
             var url = new UrlBuilder()
                 .SetPath($"channels/{channelId}/messages")
                 .SetQueryParameter("limit", "100")
-                .SetQueryParameter("after", currentAfter.ToString())
+                .SetQueryParameter(!isReverse ? "after" : "before", currentBoundary?.ToString())
                 .Build();
 
             var response = await GetJsonResponseAsync(url, cancellationToken);
@@ -662,8 +718,8 @@ public class DiscordClient(
             var messages = response
                 .EnumerateArray()
                 .Select(Message.Parse)
-                // Messages are returned from newest to oldest, so we need to reverse them
+                // Messages in batches are always returned from newest to oldest, so reverse if needed
-                .Reverse()
+                .Pipe(messages => isReverse ? messages : messages.Reverse())
                 .ToArray();
 
             // Break if there are no messages (can happen if messages are deleted during execution)
@@ -678,32 +734,78 @@ public class DiscordClient(
 
             foreach (var message in messages)
             {
-                firstMessage ??= message;
+                // Ensure that we're still in range by checking against the Omega
-
+                if (!isReverse ? message.Id > omegaMessage.Id : message.Id < omegaMessage.Id)
-                // Ensure that the messages are in range
+                {
-                if (message.Timestamp > lastMessage.Timestamp)
                     yield break;
+                }
+
+                alphaMessage ??= message;
 
                 // Report progress based on timestamps
                 if (progress is not null)
                 {
-                    var exportedDuration = (message.Timestamp - firstMessage.Timestamp).Duration();
+                    var fetchedDuration = isReverse
-                    var totalDuration = (lastMessage.Timestamp - firstMessage.Timestamp).Duration();
+                        ? alphaMessage.Timestamp - message.Timestamp
+                        : message.Timestamp - alphaMessage.Timestamp;
+
+                    var totalDuration = isReverse
+                        ? alphaMessage.Timestamp - omegaMessage.Timestamp
+                        : omegaMessage.Timestamp - alphaMessage.Timestamp;
 
                     progress.Report(
                         Percentage.FromFraction(
                             // Avoid division by zero if all messages have the exact same timestamp
                             // (which happens when there's only one message in the channel)
                             totalDuration > TimeSpan.Zero
-                                ? exportedDuration / totalDuration
+                                ? fetchedDuration / totalDuration
                                 : 1
                         )
                     );
                 }
 
-                yield return message;
+                // Some messages, for example thread starter messages, are returned by the API as content-less references.
-                currentAfter = message.Id;
+                // Try to resolve them to the actual message so that they appear as they do in the Discord client.
+                var actualMessage =
+                    message.Kind == MessageKind.ThreadStarterMessage
+                    && message.Reference?.ChannelId is { } referencedChannelId
+                    && message.Reference?.MessageId is { } referencedMessageId
+                        ? await TryGetMessageAsync(
+                            referencedChannelId,
+                            referencedMessageId,
+                            cancellationToken
+                        )
+                        : null;
+
+                yield return actualMessage ?? message;
             }
+
+            // The new boundary is always determined by the last message in the batch,
+            // because we order the messages based on fetching direction.
+            currentBoundary = messages.Last().Id;
+        }
+    }
+
+    public async IAsyncEnumerable<Message> GetMessagesAsync(
+        Snowflake channelId,
+        Snowflake? after = null,
+        Snowflake? before = null,
+        IProgress<Percentage>? progress = null,
+        [EnumeratorCancellation] CancellationToken cancellationToken = default
+    )
+    {
+        await foreach (
+            var message in GetMessagesAsync(
+                channelId,
+                after,
+                before,
+                progress,
+                false,
+                cancellationToken
+            )
+        )
+        {
+            yield return message;
         }
     }
 
@@ -715,65 +817,19 @@ public class DiscordClient(
         [EnumeratorCancellation] CancellationToken cancellationToken = default
     )
     {
-        // Get the first message in the specified range, so we can later calculate the
+        await foreach (
-        // progress based on the difference between message timestamps.
+            var message in GetMessagesAsync(
-        // Snapshotting is not necessary here because new messages can't appear in the past.
+                channelId,
-        var firstMessage = await TryGetFirstMessageAsync(channelId, after, cancellationToken);
+                after,
-        if (firstMessage is null || firstMessage.Timestamp > before?.ToDate())
+                before,
-            yield break;
+                progress,
-
+                true,
-        // Keep track of the last message in range in order to calculate the progress
+                cancellationToken
-        var lastMessage = default(Message);
-
-        var currentBefore = before;
-        while (true)
-        {
-            var url = new UrlBuilder()
-                .SetPath($"channels/{channelId}/messages")
-                .SetQueryParameter("limit", "100")
-                .SetQueryParameter("before", currentBefore?.ToString())
-                .Build();
-
-            var response = await GetJsonResponseAsync(url, cancellationToken);
-
-            var messages = response.EnumerateArray().Select(Message.Parse).ToArray();
-
-            // Break if there are no messages (can happen if messages are deleted during execution)
-            if (!messages.Any())
-                yield break;
-
-            // If all messages are empty, make sure that it's not because the bot account doesn't
-            // have the MESSAGE_CONTENT intent enabled.
-            // https://github.com/Tyrrrz/DiscordChatExporter/issues/1106#issuecomment-1741548959
-            if (messages.All(m => m.IsEmpty))
-                await EnsureMessageContentIntentAsync(cancellationToken);
-
-            foreach (var message in messages)
-            {
-                lastMessage ??= message;
-
-                // Report progress based on timestamps
-                if (progress is not null)
-                {
-                    var exportedDuration = (lastMessage.Timestamp - message.Timestamp).Duration();
-                    var totalDuration = (lastMessage.Timestamp - firstMessage.Timestamp).Duration();
-
-                    progress.Report(
-                        Percentage.FromFraction(
-                            // Avoid division by zero if all messages have the exact same timestamp
-                            // (which happens when there's only one message in the channel)
-                            totalDuration > TimeSpan.Zero
-                                ? exportedDuration / totalDuration
-                                : 1
             )
-                    );
+        )
-                }
+        {
-
             yield return message;
         }
-
-            currentBefore = messages.Last().Id;
-        }
     }
 
     public async IAsyncEnumerable<User> GetMessageReactionsAsync(

DiscordChatExporter.Core/DiscordChatExporter.Core.csproj

@@ -6,7 +6,7 @@
     <PackageReference Include="Gress" />
     <PackageReference Include="JsonExtensions" />
     <PackageReference Include="Polly" />
-    <PackageReference Include="PowerKit" PrivateAssets="all" />
+    <PackageReference Include="PowerKit" />
     <PackageReference Include="RazorBlade" />
     <PackageReference Include="Superpower" />
     <PackageReference Include="WebMarkupMin.Core" />

DiscordChatExporter.Core/Exporting/ExportAssetDownloader.cs

@@ -38,17 +38,21 @@ internal partial class ExportAssetDownloader(string workingDirPath, bool reuse)
             return _previousPathsByUrl[url] = filePath;
 
         // Check for a file cached by the legacy naming scheme (5-char hash) and rename it
-        // to the new naming scheme to preserve backwards compatibility with existing exports
+        // to the new naming scheme to preserve backwards compatibility with existing exports.
+        // This will catch both the 5-char lowercase hash and the 5-char uppercase hash variants.
         if (reuse)
         {
-            var legacyFilePath = Path.Combine(workingDirPath, GetLegacyFileNameFromUrl(url));
+            var legacyFileNames = GetLegacyFileNamesFromUrl(url);
+            foreach (var legacyFileName in legacyFileNames)
+            {
+                var legacyFilePath = Path.Combine(workingDirPath, legacyFileName);
                 if (File.Exists(legacyFilePath))
                 {
                     // Overwrite in case the destination file was created concurrently between our
                     // earlier existence check and this move operation
                     try
                     {
-                    File.Move(legacyFilePath, filePath, overwrite: true);
+                        File.Move(legacyFilePath, filePath, true);
                         return _previousPathsByUrl[url] = filePath;
                     }
                     catch (IOException)
@@ -58,6 +62,7 @@ internal partial class ExportAssetDownloader(string workingDirPath, bool reuse)
                     }
                 }
             }
+        }
 
         Directory.CreateDirectory(workingDirPath);
 
@@ -87,10 +92,16 @@ internal partial class ExportAssetDownloader
 {
     private static string NormalizeUrl(string url)
     {
-        // Remove signature parameters from Discord CDN URLs to normalize them
+        // Remove signature parameters from Discord CDN/media URLs to normalize them
         var uri = new Uri(url);
-        if (!string.Equals(uri.Host, "cdn.discordapp.com", StringComparison.OrdinalIgnoreCase))
+
+        if (
+            !string.Equals(uri.Host, "cdn.discordapp.com", StringComparison.OrdinalIgnoreCase)
+            && !string.Equals(uri.Host, "media.discordapp.net", StringComparison.OrdinalIgnoreCase)
+        )
+        {
             return url;
+        }
 
         var query = HttpUtility.ParseQueryString(uri.Query);
         query.Remove("ex");
@@ -137,13 +148,16 @@ internal partial class ExportAssetDownloader
         );
 
     // Legacy naming used a 5-char hash, kept for backwards compatibility with existing exports
-    private static string GetLegacyFileNameFromUrl(string url) =>
+    private static IReadOnlyList<string> GetLegacyFileNamesFromUrl(string url)
-        GetFileNameFromUrl(
+    {
-            url,
+        var hashData = SHA256.HashData(Encoding.UTF8.GetBytes(NormalizeUrl(url)));
-            SHA256
+
-                .HashData(Encoding.UTF8.GetBytes(NormalizeUrl(url)))
+        return
-                .Pipe(Convert.ToHexStringLower)
+        [
-                // 5 chars = 20 bits, reaches 1% collision probability at ~145 files
+            // Lowercase variant (introduced in 2.46.1)
-                .Truncate(5)
+            GetFileNameFromUrl(url, Convert.ToHexStringLower(hashData).Truncate(5)),
-        );
+            // Uppercase variant (original)
+            GetFileNameFromUrl(url, Convert.ToHexString(hashData).Truncate(5)),
+        ];
+    }
 }

DiscordChatExporter.Core/Exporting/ExportRequest.cs

@@ -206,10 +206,15 @@ public partial class ExportRequest
     {
         var actualOutputPath = FormatPath(outputPath, guild, channel, after, before);
 
-        // Output is a directory
+        // Determine whether the output path refers to a directory or a file.
+        // The extension-based heuristic is evaluated on the original, unsubstituted path,
+        // because the value of a template token (e.g., a guild or channel name) may contain
+        // a period that would otherwise be mistaken for a file extension, incorrectly causing
+        // a directory path to be treated as a file.
+        // https://github.com/Tyrrrz/DiscordChatExporter/issues/1502
         if (
             Directory.Exists(actualOutputPath)
-            || string.IsNullOrWhiteSpace(Path.GetExtension(actualOutputPath))
+            || string.IsNullOrWhiteSpace(Path.GetExtension(outputPath))
         )
         {
             var fileName = GetDefaultOutputFileName(guild, channel, format, after, before);

DiscordChatExporter.Core/Markdown/EmojiNode.cs

@@ -6,7 +6,7 @@ namespace DiscordChatExporter.Core.Markdown;
 internal record EmojiNode(
     // Only present on custom emoji
     Snowflake? Id,
-    // Name of a custom emoji (e.g. LUL) or actual representation of a standard emoji (e.g. 🙂)
+    // Name of a custom emoji (e.g., LUL) or actual representation of a standard emoji (e.g., 🙂)
     string Name,
     bool IsAnimated
 ) : MarkdownNode
@@ -20,7 +20,7 @@ internal record EmojiNode(
 
     public bool IsCustomEmoji => _emoji.IsCustomEmoji;
 
-    // Name of a custom emoji (e.g. LUL) or name of a standard emoji (e.g. slight_smile)
+    // Name of a custom emoji (e.g., LUL) or name of a standard emoji (e.g., slight_smile)
     public string Code => _emoji.Code;
 
     public string ImageUrl => _emoji.ImageUrl;

DiscordChatExporter.Core/Markdown/LinkNode.cs

@@ -2,7 +2,7 @@ using System.Collections.Generic;
 
 namespace DiscordChatExporter.Core.Markdown;
 
-// Named links can contain child nodes (e.g. [**bold URL**](https://test.com))
+// Named links can contain child nodes (e.g., [**bold URL**](https://test.com))
 internal record LinkNode(string Url, IReadOnlyList<MarkdownNode> Children)
     : MarkdownNode,
         IContainerNode

DiscordChatExporter.Core/Markdown/Parsing/MarkdownParser.cs

@@ -209,7 +209,7 @@ internal static partial class MarkdownParser
         new RegexMatcher<MarkdownContext, MarkdownNode>(
             new Regex(
                 // Build a pattern from all known emoji, sorted longest-first so that compound
-                // emoji (e.g. sequences with ZWJ or skin-tone modifiers) are matched before
+                // emoji (e.g., sequences with ZWJ or skin-tone modifiers) are matched before
                 // their individual components.
                 "("
                     + string.Join(
@@ -264,7 +264,7 @@ internal static partial class MarkdownParser
     private static readonly IMatcher<MarkdownContext, MarkdownNode> MaskedLinkNodeMatcher =
         new RegexMatcher<MarkdownContext, MarkdownNode>(
             // Capture [title](link)
-            new Regex(@"\[(.+?)\]\((.+?)\)", DefaultRegexOptions),
+            new Regex(@"\[(.+?)\]\((https?://\S*[^\.,:;""'\s])\)", DefaultRegexOptions),
             (c, s, m) => new LinkNode(m.Groups[2].Value, Parse(c, s.Relocate(m.Groups[1])))
         );
 
@@ -408,7 +408,7 @@ internal static partial class MarkdownParser
             TimestampNodeMatcher
         );
 
-    // Minimal set of matchers for non-multimedia formats (e.g. plain text)
+    // Minimal set of matchers for non-multimedia formats (e.g., plain text)
     private static readonly IMatcher<MarkdownContext, MarkdownNode> MinimalNodeMatcher =
         new AggregateMatcher<MarkdownContext, MarkdownNode>(
             // Mentions

DiscordChatExporter.Core/Utils/UrlBuilder.cs

@@ -20,9 +20,9 @@ public class UrlBuilder
         return this;
     }
 
-    public UrlBuilder SetQueryParameter(string key, string? value, bool ignoreUnsetValue = true)
+    public UrlBuilder SetQueryParameter(string key, string? value, bool ignoreIfEmptyValue = true)
     {
-        if (ignoreUnsetValue && string.IsNullOrWhiteSpace(value))
+        if (ignoreIfEmptyValue && string.IsNullOrWhiteSpace(value))
             return this;
 
         var keyEncoded = Uri.EscapeDataString(key);

DiscordChatExporter.Gui/App.axaml

@@ -9,7 +9,8 @@
   xmlns:materialIcons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
   xmlns:materialStyles="clr-namespace:Material.Styles.Themes;assembly=Material.Styles"
   Name="DiscordChatExporter"
-    ActualThemeVariantChanged="Application_OnActualThemeVariantChanged">
+  ActualThemeVariantChanged="Application_OnActualThemeVariantChanged"
+>
   <Application.DataTemplates>
     <framework:ViewManager />
   </Application.DataTemplates>
@@ -19,7 +20,8 @@
     <materialStyles:MaterialTheme
       BaseTheme="Light"
       PrimaryColor="Grey"
-            SecondaryColor="DeepOrange" />
+      SecondaryColor="DeepOrange"
+    />
     <materialIcons:MaterialIconStyles />
     <dialogHostAvalonia:DialogHostStyles />
 
@@ -133,7 +135,10 @@
 
     <!--  Toggle switch  -->
     <Style Selector="ToggleSwitch">
-            <Setter Property="materialAssists:ToggleSwitchAssist.SwitchThumbOffBackground" Value="{DynamicResource ToggleBackgroundBrush}" />
+      <Setter
+        Property="materialAssists:ToggleSwitchAssist.SwitchThumbOffBackground"
+        Value="{DynamicResource ToggleBackgroundBrush}"
+      />
     </Style>
 
     <!--  Tooltip  -->

DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj

@@ -31,7 +31,7 @@
     <PackageReference Include="Cogwheel" />
     <PackageReference Include="CommunityToolkit.Mvvm" />
     <PackageReference Include="CSharpier.MsBuild" PrivateAssets="all" />
-    <PackageReference Include="Deorcify" PrivateAssets="all" />
+    <PackageReference Include="Deorcify" />
     <PackageReference Include="DialogHost.Avalonia" />
     <PackageReference Include="Gress" />
     <PackageReference Include="Markdig" />
@@ -39,7 +39,7 @@
     <PackageReference Include="Material.Icons.Avalonia" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
     <PackageReference Include="Onova" />
-    <PackageReference Include="PowerKit" PrivateAssets="all" />
+    <PackageReference Include="PowerKit" />
     <PackageReference Include="ThisAssembly.Project" PrivateAssets="all" />
   </ItemGroup>
 

DiscordChatExporter.Gui/Framework/DialogManager.cs

@@ -40,7 +40,7 @@ public class DialogManager : IDisposable
             );
 
             // Yield to allow DialogHost to fully reset its state before
-            // another dialog is shown (e.g. when dialogs are shown sequentially).
+            // another dialog is shown (e.g., when dialogs are shown sequentially).
             await Task.Yield();
 
             return dialog.DialogResult;

DiscordChatExporter.Gui/Localization/LocalizationManager.English.cs

@@ -58,7 +58,7 @@ public partial class LocalizationManager
                 """,
             [nameof(RateLimitPreferenceLabel)] = "Rate limit preference",
             [nameof(RateLimitPreferenceTooltip)] =
-                "Whether to respect advisory rate limits. If disabled, only hard rate limits (i.e. 429 responses) will be respected.",
+                "Whether to respect advisory rate limits. If disabled, only hard rate limits (i.e., 429 responses) will be respected.",
             [nameof(ShowThreadsLabel)] = "Show threads",
             [nameof(ShowThreadsTooltip)] = "Which types of threads to show in the channel list",
             [nameof(LocaleLabel)] = "Locale",
@@ -102,10 +102,10 @@ public partial class LocalizationManager
             [nameof(BeforeTimeTooltip)] = "Only include messages sent before this time",
             [nameof(PartitionLimitLabel)] = "Partition limit",
             [nameof(PartitionLimitTooltip)] =
-                "Split the output into partitions, each limited to the specified number of messages (e.g. '100') or file size (e.g. '10mb')",
+                "Split the output into partitions, each limited to the specified number of messages (e.g., '100') or file size (e.g., '10mb')",
             [nameof(MessageFilterLabel)] = "Message filter",
             [nameof(MessageFilterTooltip)] =
-                "Only include messages that satisfy this filter (e.g. 'from:foo#1234' or 'has:image'). See the documentation for more info.",
+                "Only include messages that satisfy this filter (e.g., 'from:foo#1234' or 'has:image'). See the documentation for more info.",
             [nameof(ReverseMessageOrderLabel)] = "Reverse messages",
             [nameof(ReverseMessageOrderTooltip)] =
                 "Export messages in reverse chronological order (newest first)",

DiscordChatExporter.Gui/PublishMacOSBundle.csx

@@ -21,10 +21,10 @@ public partial class PublishMacOSBundleCommand : ICommand
     [CommandOption("icons-file", Description = "Path to the .icns icons file.")]
     public required string IconsFilePath { get; set; }
 
-    [CommandOption("full-version", Description = "Full version string (e.g. '1.2.3.4').")]
+    [CommandOption("full-version", Description = "Full version string (e.g., '1.2.3.4').")]
     public required string FullVersion { get; set; }
 
-    [CommandOption("short-version", Description = "Short version string (e.g. '1.2.3').")]
+    [CommandOption("short-version", Description = "Short version string (e.g., '1.2.3').")]
     public required string ShortVersion { get; set; }
 
     public async ValueTask ExecuteAsync(IConsole console)

DiscordChatExporter.Gui/Views/Components/DashboardView.axaml

@@ -9,13 +9,15 @@
   xmlns:materialStyles="clr-namespace:Material.Styles.Controls;assembly=Material.Styles"
   x:Name="UserControl"
   x:DataType="components:DashboardViewModel"
-    Loaded="UserControl_OnLoaded">
+  Loaded="UserControl_OnLoaded"
+>
   <DockPanel>
     <!--  Header  -->
     <StackPanel
       Background="{DynamicResource MaterialDarkBackgroundBrush}"
       DockPanel.Dock="Top"
-            Orientation="Vertical">
+      Orientation="Vertical"
+    >
       <Grid Margin="12,12,8,12" ColumnDefinitions="*,Auto">
         <materialStyles:Card Grid.Column="0">
           <!--  Token  -->
@@ -26,7 +28,8 @@
             PlaceholderText="{Binding LocalizationManager.TokenPlaceholderText}"
             RevealPassword="{Binding $self.IsFocused}"
             Text="{Binding Token}"
-                        Theme="{DynamicResource SoloTextBox}">
+            Theme="{DynamicResource SoloTextBox}"
+          >
             <TextBox.InnerLeftContent>
               <materialIcons:MaterialIcon
                 Grid.Column="0"
@@ -34,7 +37,8 @@
                 Height="24"
                 Margin="4,0,8,0"
                 Foreground="{DynamicResource PrimaryHueMidBrush}"
-                                Kind="Key" />
+                Kind="Key"
+              />
             </TextBox.InnerLeftContent>
             <TextBox.InnerRightContent>
               <Button
@@ -44,11 +48,9 @@
                 Command="{Binding PullGuildsCommand}"
                 IsDefault="True"
                 Theme="{DynamicResource MaterialFlatButton}"
-                                ToolTip.Tip="{Binding LocalizationManager.PullGuildsTooltip}">
+                ToolTip.Tip="{Binding LocalizationManager.PullGuildsTooltip}"
-                                <materialIcons:MaterialIcon
+              >
-                                    Width="24"
+                <materialIcons:MaterialIcon Width="24" Height="24" Kind="ArrowRight" />
-                                    Height="24"
-                                    Kind="ArrowRight" />
               </Button>
             </TextBox.InnerRightContent>
           </TextBox>
@@ -63,11 +65,9 @@
           Command="{Binding ShowSettingsCommand}"
           Foreground="{DynamicResource MaterialDarkForegroundBrush}"
           Theme="{DynamicResource MaterialFlatButton}"
-                    ToolTip.Tip="{Binding LocalizationManager.SettingsTooltip}">
+          ToolTip.Tip="{Binding LocalizationManager.SettingsTooltip}"
-                    <materialIcons:MaterialIcon
+        >
-                        Width="24"
+          <materialIcons:MaterialIcon Width="24" Height="24" Kind="Settings" />
-                        Height="24"
-                        Kind="Settings" />
         </Button>
       </Grid>
 
@@ -76,14 +76,16 @@
         Height="2"
         Background="Transparent"
         IsIndeterminate="{Binding IsProgressIndeterminate}"
-                Value="{Binding Progress.Current.Fraction, Mode=OneWay}" />
+        Value="{Binding Progress.Current.Fraction, Mode=OneWay}"
+      />
     </StackPanel>
 
     <!--  Body  -->
     <Panel
       Background="{DynamicResource MaterialCardBackgroundBrush}"
       DockPanel.Dock="Bottom"
-            IsEnabled="{Binding !IsBusy}">
+      IsEnabled="{Binding !IsBusy}"
+    >
       <Panel.Styles>
         <Style Selector="Panel">
           <Style Selector="^:disabled">
@@ -97,14 +99,16 @@
         <Border
           Grid.Column="0"
           BorderBrush="{DynamicResource MaterialDividerBrush}"
-                    BorderThickness="0,0,1,0">
+          BorderThickness="0,0,1,0"
+        >
           <ListBox
             x:Name="AvailableGuildsListBox"
             ItemsSource="{Binding AvailableGuilds}"
             ScrollViewer.VerticalScrollBarVisibility="Hidden"
             SelectedItem="{Binding SelectedGuild}"
             SelectionChanged="AvailableGuildsListBox_OnSelectionChanged"
-                        SelectionMode="Single">
+            SelectionMode="Single"
+          >
             <ListBox.Styles>
               <Style Selector="ListBox">
                 <Style Selector="^ ListBoxItem">
@@ -121,13 +125,11 @@
                     Width="48"
                     Height="48"
                     Margin="12"
-                                        Fill="{DynamicResource MaterialDividerBrush}" />
+                    Fill="{DynamicResource MaterialDividerBrush}"
+                  />
 
                   <!--  Guild icon  -->
-                                    <Ellipse
+                  <Ellipse Width="48" Height="48" Margin="12">
-                                        Width="48"
-                                        Height="48"
-                                        Margin="12">
                     <Ellipse.Fill>
                       <ImageBrush asyncImageLoader:ImageBrushLoader.Source="{Binding IconUrl}" />
                     </Ellipse.Fill>
@@ -146,7 +148,8 @@
             SelectedItems="{Binding SelectedChannels}"
             SelectionChanged="AvailableChannelsTreeView_OnSelectionChanged"
             SelectionMode="Multiple"
-                        TextSearch.Text="Name">
+            TextSearch.Text="Name"
+          >
             <TreeView.Styles>
               <Style Selector="TreeView">
                 <Style Selector="^ TreeViewItem">
@@ -161,7 +164,8 @@
                   Background="Transparent"
                   Classes.category="{Binding Channel.IsCategory}"
                   ColumnDefinitions="Auto,*,Auto"
-                                    DoubleTapped="ChannelGrid_OnDoubleTapped">
+                  DoubleTapped="ChannelGrid_OnDoubleTapped"
+                >
                   <Grid.Styles>
                     <Style Selector="Grid">
                       <Style Selector="^:not(.category)">
@@ -169,7 +173,10 @@
                           <Template>
                             <TextBlock>
                               <Run Text="{Binding #UserControl.DataContext.LocalizationManager.LastMessageSentTooltip}" />
-                                                            <Run FontWeight="SemiBold" Text="{Binding Channel.LastMessageId, Converter={x:Static converters:SnowflakeToTimestampStringConverter.Instance}, TargetNullValue=never, Mode=OneWay}" />
+                              <Run
+                                FontWeight="SemiBold"
+                                Text="{Binding Channel.LastMessageId, Converter={x:Static converters:SnowflakeToTimestampStringConverter.Instance}, TargetNullValue=never, Mode=OneWay}"
+                              />
                             </TextBlock>
                           </Template>
                         </Setter>
@@ -182,7 +189,8 @@
                     Grid.Column="0"
                     Margin="0,0,4,0"
                     Classes.voice="{Binding Channel.IsVoice}"
-                                        IsVisible="{Binding !Channel.IsCategory}">
+                    IsVisible="{Binding !Channel.IsCategory}"
+                  >
                     <materialIcons:MaterialIcon.Styles>
                       <Style Selector="materialIcons|MaterialIcon">
                         <Setter Property="Kind" Value="Pound" />
@@ -199,7 +207,8 @@
                     Grid.Column="1"
                     Margin="0,12"
                     FontSize="14"
-                                        Text="{Binding Channel.Name, Mode=OneWay}" />
+                    Text="{Binding Channel.Name, Mode=OneWay}"
+                  />
 
                   <!--  Checkmark  -->
                   <materialIcons:MaterialIcon
@@ -208,7 +217,8 @@
                     Height="24"
                     Margin="16,0"
                     IsVisible="{Binding $parent[TreeViewItem].IsSelected}"
-                                        Kind="Check" />
+                    Kind="Check"
+                  />
                 </Grid>
               </TreeDataTemplate>
             </TreeView.ItemTemplate>
@@ -227,13 +237,15 @@
                   Width="18"
                   Height="18"
                   Foreground="{DynamicResource PrimaryHueMidBrush}"
-                                    Kind="Account" />
+                  Kind="Account"
+                />
               </InlineUIContainer>
               <Run Text="" />
               <Run
                 FontSize="16"
                 FontWeight="SemiBold"
-                                Text="{Binding LocalizationManager.TokenPersonalHeader}" />
+                Text="{Binding LocalizationManager.TokenPersonalHeader}"
+              />
             </TextBlock>
 
             <TextBlock
@@ -241,14 +253,16 @@
               FontWeight="Light"
               Inlines="{Binding LocalizationManager.TokenPersonalTosWarning, Converter={x:Static converters:MarkdownToInlinesConverter.Instance}}"
               LineHeight="23"
-                            TextWrapping="Wrap" />
+              TextWrapping="Wrap"
+            />
 
             <TextBlock
               FontSize="14"
               FontWeight="Light"
               Inlines="{Binding LocalizationManager.TokenPersonalInstructions, Converter={x:Static converters:MarkdownToInlinesConverter.Instance}}"
               LineHeight="23"
-                            TextWrapping="Wrap" />
+              TextWrapping="Wrap"
+            />
 
             <!--  Bot token  -->
             <TextBlock Margin="0,12,0,0">
@@ -257,13 +271,15 @@
                   Width="18"
                   Height="18"
                   Foreground="{DynamicResource PrimaryHueMidBrush}"
-                                    Kind="Robot" />
+                  Kind="Robot"
+                />
               </InlineUIContainer>
               <Run Text="" />
               <Run
                 FontSize="16"
                 FontWeight="SemiBold"
-                                Text="{Binding LocalizationManager.TokenBotHeader}" />
+                Text="{Binding LocalizationManager.TokenBotHeader}"
+              />
             </TextBlock>
 
             <TextBlock
@@ -271,7 +287,8 @@
               FontWeight="Light"
               Inlines="{Binding LocalizationManager.TokenBotInstructions, Converter={x:Static converters:MarkdownToInlinesConverter.Instance}}"
               LineHeight="23"
-                            TextWrapping="Wrap" />
+              TextWrapping="Wrap"
+            />
 
             <TextBlock
               Margin="0,12,0,0"
@@ -279,7 +296,8 @@
               FontWeight="Light"
               Inlines="{Binding LocalizationManager.TokenHelpText, Converter={x:Static converters:MarkdownToInlinesConverter.Instance}}"
               LineHeight="23"
-                            TextWrapping="Wrap" />
+              TextWrapping="Wrap"
+            />
           </StackPanel>
         </ScrollViewer>
       </Panel>
@@ -296,11 +314,9 @@
         Command="{Binding ExportCommand}"
         Foreground="{DynamicResource MaterialSecondaryMidForegroundBrush}"
         IsVisible="{Binding $self.IsEffectivelyEnabled}"
-                Theme="{DynamicResource MaterialIconButton}">
+        Theme="{DynamicResource MaterialIconButton}"
-                <materialIcons:MaterialIcon
+      >
-                    Width="32"
+        <materialIcons:MaterialIcon Width="32" Height="32" Kind="Download" />
-                    Height="32"
-                    Kind="Download" />
       </Button>
     </Panel>
   </DockPanel>

DiscordChatExporter.Gui/Views/Controls/HyperLink.axaml

@@ -2,13 +2,15 @@
   x:Class="DiscordChatExporter.Gui.Views.Controls.HyperLink"
   xmlns="https://github.com/avaloniaui"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:DiscordChatExporter.Gui.Views.Controls">
+  xmlns:controls="clr-namespace:DiscordChatExporter.Gui.Views.Controls"
+>
   <TextBlock
     x:Name="TextBlock"
     Cursor="Hand"
     Foreground="{DynamicResource MaterialSecondaryDarkBrush}"
     PointerReleased="TextBlock_OnPointerReleased"
-        Text="{Binding $parent[controls:HyperLink].Text, Mode=OneWay}">
+    Text="{Binding $parent[controls:HyperLink].Text, Mode=OneWay}"
+  >
     <TextBlock.Styles>
       <Style Selector="TextBlock">
         <Style Selector="^:pointerover">

DiscordChatExporter.Gui/Views/Dialogs/ExportSetupView.axaml

@@ -10,18 +10,13 @@
   xmlns:utils="clr-namespace:DiscordChatExporter.Gui.Utils"
   x:Name="UserControl"
   Width="380"
-    x:DataType="dialogs:ExportSetupViewModel">
+  x:DataType="dialogs:ExportSetupViewModel"
+>
   <Grid RowDefinitions="Auto,*,Auto">
     <!--  Guild/channel info  -->
-        <Grid
+    <Grid Grid.Row="0" Margin="16" ColumnDefinitions="Auto,*">
-            Grid.Row="0"
-            Margin="16"
-            ColumnDefinitions="Auto,*">
       <!--  Guild icon  -->
-            <Ellipse
+      <Ellipse Grid.Column="0" Width="32" Height="32">
-                Grid.Column="0"
-                Width="32"
-                Height="32">
         <Ellipse.Fill>
           <ImageBrush asyncImageLoader:ImageBrushLoader.Source="{Binding Guild.IconUrl}" />
         </Ellipse.Fill>
@@ -35,7 +30,8 @@
         FontSize="19"
         FontWeight="Light"
         IsVisible="{Binding !IsSingleChannel}"
-                TextTrimming="CharacterEllipsis">
+        TextTrimming="CharacterEllipsis"
+      >
         <Run Text="{Binding Channels.Count, FallbackValue=0, Mode=OneWay}" />
         <Run Text="{Binding LocalizationManager.ChannelsSelectedText}" />
       </TextBlock>
@@ -49,8 +45,10 @@
         FontWeight="Light"
         IsVisible="{Binding IsSingleChannel}"
         TextTrimming="CharacterEllipsis"
-                ToolTip.Tip="{Binding Channels[0], Converter={x:Static converters:ChannelToHierarchicalNameStringConverter.Instance}}">
+        ToolTip.Tip="{Binding Channels[0], Converter={x:Static converters:ChannelToHierarchicalNameStringConverter.Instance}}"
-                <Run Text="{Binding Channels[0].Parent.Name, StringFormat='{}{0} / ', FallbackValue='', TargetNullValue='', Mode=OneWay}" /><Run FontWeight="SemiBold" Text="{Binding Channels[0].Name, Mode=OneWay}" />
+      >
+        <Run Text="{Binding Channels[0].Parent.Name, StringFormat='{}{0} / ', FallbackValue='', TargetNullValue='', Mode=OneWay}" />
+        <Run FontWeight="SemiBold" Text="{Binding Channels[0].Name, Mode=OneWay}" />
       </TextBlock>
     </Grid>
 
@@ -58,7 +56,8 @@
       Grid.Row="1"
       Padding="0,8"
       BorderBrush="{DynamicResource MaterialDividerBrush}"
-            BorderThickness="0,1">
+      BorderThickness="0,1"
+    >
       <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
         <StackPanel Orientation="Vertical">
           <!--  Output path  -->
@@ -66,12 +65,14 @@
             Margin="16,8"
             materialAssists:TextFieldAssist.Label="{Binding LocalizationManager.OutputPathLabel}"
             Text="{Binding OutputPath}"
-                        Theme="{DynamicResource FilledTextBox}">
+            Theme="{DynamicResource FilledTextBox}"
+          >
             <ToolTip.Tip>
               <TextBlock
                 MaxWidth="400"
                 Inlines="{Binding LocalizationManager.OutputPathTooltip, Converter={x:Static converters:MarkdownToInlinesConverter.Instance}}"
-                                TextWrapping="Wrap" />
+                TextWrapping="Wrap"
+              />
             </ToolTip.Tip>
             <TextBox.InnerRightContent>
               <Button
@@ -79,11 +80,9 @@
                 Padding="8"
                 VerticalAlignment="Center"
                 Command="{Binding ShowOutputPathPromptCommand}"
-                                Theme="{DynamicResource MaterialFlatButton}">
+                Theme="{DynamicResource MaterialFlatButton}"
-                                <materialIcons:MaterialIcon
+              >
-                                    Width="20"
+                <materialIcons:MaterialIcon Width="20" Height="20" Kind="FolderOpen" />
-                                    Height="20"
-                                    Kind="FolderOpen" />
               </Button>
             </TextBox.InnerRightContent>
           </TextBox>
@@ -95,7 +94,8 @@
             ItemsSource="{Binding AvailableFormats}"
             SelectedItem="{Binding SelectedFormat}"
             Theme="{DynamicResource MaterialFilledComboBox}"
-                        ToolTip.Tip="{Binding LocalizationManager.FormatTooltip}">
+            ToolTip.Tip="{Binding LocalizationManager.FormatTooltip}"
+          >
             <ComboBox.ItemTemplate>
               <DataTemplate>
                 <TextBlock Text="{Binding Converter={x:Static converters:ExportFormatToStringConverter.Instance}}" />
@@ -108,19 +108,17 @@
             Margin="16,8"
             IsVisible="{Binding IsAdvancedSectionDisplayed}"
             Orientation="Vertical"
-                        Spacing="16">
+            Spacing="16"
+          >
             <!--  Date limits  -->
-                        <Grid
+            <Grid ColumnDefinitions="*,*" ColumnSpacing="16" RowDefinitions="*,*" RowSpacing="16">
-                            ColumnDefinitions="*,*"
-                            ColumnSpacing="16"
-                            RowDefinitions="*,*"
-                            RowSpacing="16">
               <DatePicker
                 Grid.Row="0"
                 Grid.Column="0"
                 materialAssists:TextFieldAssist.Label="{Binding LocalizationManager.AfterDateLabel}"
                 SelectedDate="{Binding AfterDate}"
-                                ToolTip.Tip="{Binding LocalizationManager.AfterDateTooltip}">
+                ToolTip.Tip="{Binding LocalizationManager.AfterDateTooltip}"
+              >
                 <DatePicker.Styles>
                   <Style Selector="DatePicker">
                     <Style Selector="^ /template/ TextBox#DisplayTextBox">
@@ -134,7 +132,8 @@
                 Grid.Column="1"
                 materialAssists:TextFieldAssist.Label="{Binding LocalizationManager.BeforeDateLabel}"
                 SelectedDate="{Binding BeforeDate}"
-                                ToolTip.Tip="{Binding LocalizationManager.BeforeDateTooltip}">
+                ToolTip.Tip="{Binding LocalizationManager.BeforeDateTooltip}"
+              >
                 <DatePicker.Styles>
                   <Style Selector="DatePicker">
                     <Style Selector="^ /template/ TextBox#DisplayTextBox">
@@ -152,7 +151,8 @@
                 ClockIdentifier="{x:Static utils:Internationalization.AvaloniaClockIdentifier}"
                 IsEnabled="{Binding IsAfterDateSet}"
                 SelectedTime="{Binding AfterTime}"
-                                ToolTip.Tip="{Binding LocalizationManager.AfterTimeTooltip}">
+                ToolTip.Tip="{Binding LocalizationManager.AfterTimeTooltip}"
+              >
                 <TimePicker.Styles>
                   <Style Selector="TimePicker">
                     <Style Selector="^ /template/ TextBox#PART_DisplayTextBox">
@@ -168,7 +168,8 @@
                 ClockIdentifier="{x:Static utils:Internationalization.AvaloniaClockIdentifier}"
                 IsEnabled="{Binding IsBeforeDateSet}"
                 SelectedTime="{Binding BeforeTime}"
-                                ToolTip.Tip="{Binding LocalizationManager.BeforeTimeTooltip}">
+                ToolTip.Tip="{Binding LocalizationManager.BeforeTimeTooltip}"
+              >
                 <TimePicker.Styles>
                   <Style Selector="TimePicker">
                     <Style Selector="^ /template/ TextBox#PART_DisplayTextBox">
@@ -184,30 +185,50 @@
               materialAssists:TextFieldAssist.Label="{Binding LocalizationManager.PartitionLimitLabel}"
               Text="{Binding PartitionLimitValue}"
               Theme="{DynamicResource FilledTextBox}"
-                            ToolTip.Tip="{Binding LocalizationManager.PartitionLimitTooltip}" />
+              ToolTip.Tip="{Binding LocalizationManager.PartitionLimitTooltip}"
+            />
 
             <!--  Filtering  -->
             <TextBox
               materialAssists:TextFieldAssist.Label="{Binding LocalizationManager.MessageFilterLabel}"
               Text="{Binding MessageFilterValue}"
               Theme="{DynamicResource FilledTextBox}"
-                            ToolTip.Tip="{Binding LocalizationManager.MessageFilterTooltip}" />
+              ToolTip.Tip="{Binding LocalizationManager.MessageFilterTooltip}"
+            />
 
             <!--  Reverse message order  -->
-                        <DockPanel LastChildFill="False" ToolTip.Tip="{Binding LocalizationManager.ReverseMessageOrderTooltip}">
+            <DockPanel
-                            <TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.ReverseMessageOrderLabel}" />
+              LastChildFill="False"
+              ToolTip.Tip="{Binding LocalizationManager.ReverseMessageOrderTooltip}"
+            >
+              <TextBlock
+                DockPanel.Dock="Left"
+                Text="{Binding LocalizationManager.ReverseMessageOrderLabel}"
+              />
               <ToggleSwitch DockPanel.Dock="Right" IsChecked="{Binding IsReverseMessageOrder}" />
             </DockPanel>
 
             <!--  Markdown formatting  -->
-                        <DockPanel LastChildFill="False" ToolTip.Tip="{Binding LocalizationManager.FormatMarkdownTooltip}">
+            <DockPanel
-                            <TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.FormatMarkdownLabel}" />
+              LastChildFill="False"
+              ToolTip.Tip="{Binding LocalizationManager.FormatMarkdownTooltip}"
+            >
+              <TextBlock
+                DockPanel.Dock="Left"
+                Text="{Binding LocalizationManager.FormatMarkdownLabel}"
+              />
               <ToggleSwitch DockPanel.Dock="Right" IsChecked="{Binding ShouldFormatMarkdown}" />
             </DockPanel>
 
             <!--  Download assets  -->
-                        <DockPanel LastChildFill="False" ToolTip.Tip="{Binding LocalizationManager.DownloadAssetsTooltip}">
+            <DockPanel
-                            <TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.DownloadAssetsLabel}" />
+              LastChildFill="False"
+              ToolTip.Tip="{Binding LocalizationManager.DownloadAssetsTooltip}"
+            >
+              <TextBlock
+                DockPanel.Dock="Left"
+                Text="{Binding LocalizationManager.DownloadAssetsLabel}"
+              />
               <ToggleSwitch DockPanel.Dock="Right" IsChecked="{Binding ShouldDownloadAssets}" />
             </DockPanel>
 
@@ -215,8 +236,12 @@
             <DockPanel
               IsEnabled="{Binding ShouldDownloadAssets}"
               LastChildFill="False"
-                            ToolTip.Tip="{Binding LocalizationManager.ReuseAssetsTooltip}">
+              ToolTip.Tip="{Binding LocalizationManager.ReuseAssetsTooltip}"
-                            <TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.ReuseAssetsLabel}" />
+            >
+              <TextBlock
+                DockPanel.Dock="Left"
+                Text="{Binding LocalizationManager.ReuseAssetsLabel}"
+              />
               <ToggleSwitch DockPanel.Dock="Right" IsChecked="{Binding ShouldReuseAssets}" />
             </DockPanel>
 
@@ -226,18 +251,17 @@
               IsEnabled="{Binding ShouldDownloadAssets}"
               Text="{Binding AssetsDirPath}"
               Theme="{DynamicResource FilledTextBox}"
-                            ToolTip.Tip="{Binding LocalizationManager.AssetsDirPathTooltip}">
+              ToolTip.Tip="{Binding LocalizationManager.AssetsDirPathTooltip}"
+            >
               <TextBox.InnerRightContent>
                 <Button
                   Margin="8,8,8,6"
                   Padding="8"
                   VerticalAlignment="Center"
                   Command="{Binding ShowAssetsDirPathPromptCommand}"
-                                    Theme="{DynamicResource MaterialFlatButton}">
+                  Theme="{DynamicResource MaterialFlatButton}"
-                                    <materialIcons:MaterialIcon
+                >
-                                        Width="20"
+                  <materialIcons:MaterialIcon Width="20" Height="20" Kind="FolderOpen" />
-                                        Height="20"
-                                        Kind="FolderOpen" />
                 </Button>
               </TextBox.InnerRightContent>
             </TextBox>
@@ -247,16 +271,13 @@
     </Border>
 
     <!--  Buttons  -->
-        <Grid
+    <Grid Grid.Row="2" Margin="16" ColumnDefinitions="Auto,*,Auto,Auto" ColumnSpacing="8">
-            Grid.Row="2"
-            Margin="16"
-            ColumnDefinitions="Auto,*,Auto,Auto"
-            ColumnSpacing="8">
       <ToggleButton
         Grid.Column="0"
         IsChecked="{Binding IsAdvancedSectionDisplayed}"
         Theme="{DynamicResource MaterialOutlineButton}"
-                ToolTip.Tip="{Binding LocalizationManager.AdvancedOptionsTooltip}">
+        ToolTip.Tip="{Binding LocalizationManager.AdvancedOptionsTooltip}"
+      >
         <Button.Styles>
           <Style Selector="ToggleButton">
             <Setter Property="Content" Value="MORE" />
@@ -273,13 +294,15 @@
         Command="{Binding ConfirmCommand}"
         Content="{Binding LocalizationManager.ExportButton}"
         IsDefault="True"
-                Theme="{DynamicResource MaterialOutlineButton}" />
+        Theme="{DynamicResource MaterialOutlineButton}"
+      />
       <Button
         Grid.Column="3"
         Command="{Binding CloseCommand}"
         Content="{Binding LocalizationManager.CancelButton}"
         IsCancel="True"
-                Theme="{DynamicResource MaterialOutlineButton}" />
+        Theme="{DynamicResource MaterialOutlineButton}"
+      />
     </Grid>
   </Grid>
 </UserControl>

DiscordChatExporter.Gui/Views/Dialogs/MessageBoxView.axaml

@@ -5,7 +5,8 @@
   xmlns:dialogs="clr-namespace:DiscordChatExporter.Gui.ViewModels.Dialogs"
   xmlns:system="clr-namespace:System;assembly=System.Runtime"
   Width="500"
-    x:DataType="dialogs:MessageBoxViewModel">
+  x:DataType="dialogs:MessageBoxViewModel"
+>
   <Grid RowDefinitions="Auto,*,Auto">
     <!--  Title  -->
     <TextBlock
@@ -15,26 +16,22 @@
       FontWeight="Light"
       Text="{Binding Title}"
       TextTrimming="CharacterEllipsis"
-            ToolTip.Tip="{Binding Title}" />
+      ToolTip.Tip="{Binding Title}"
+    />
 
     <!--  Message  -->
     <Border
       Grid.Row="1"
       Padding="0,8"
       BorderBrush="{DynamicResource MaterialDividerBrush}"
-            BorderThickness="0,1">
+      BorderThickness="0,1"
+    >
       <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
-                <TextBlock
+        <TextBlock Margin="16,8" Text="{Binding Message}" TextWrapping="Wrap" />
-                    Margin="16,8"
-                    Text="{Binding Message}"
-                    TextWrapping="Wrap" />
       </ScrollViewer>
     </Border>
 
-        <UniformGrid
+    <UniformGrid Grid.Row="2" Margin="8" Columns="{Binding ButtonsCount}">
-            Grid.Row="2"
-            Margin="8"
-            Columns="{Binding ButtonsCount}">
       <!--  OK  -->
       <Button
         Margin="8"
@@ -43,14 +40,16 @@
         IsDefault="True"
         IsVisible="{Binding IsDefaultButtonVisible}"
         Theme="{DynamicResource MaterialOutlineButton}"
-                ToolTip.Tip="{Binding DefaultButtonText}">
+        ToolTip.Tip="{Binding DefaultButtonText}"
+      >
         <Button.CommandParameter>
           <system:Boolean>True</system:Boolean>
         </Button.CommandParameter>
         <TextBlock
           Text="{Binding DefaultButtonText}"
           TextAlignment="Center"
-                    TextTrimming="CharacterEllipsis" />
+          TextTrimming="CharacterEllipsis"
+        />
       </Button>
 
       <!--  Cancel  -->
@@ -61,11 +60,13 @@
         IsCancel="True"
         IsVisible="{Binding IsCancelButtonVisible}"
         Theme="{DynamicResource MaterialOutlineButton}"
-                ToolTip.Tip="{Binding CancelButtonText}">
+        ToolTip.Tip="{Binding CancelButtonText}"
+      >
         <TextBlock
           Text="{Binding CancelButtonText}"
           TextAlignment="Center"
-                    TextTrimming="CharacterEllipsis" />
+          TextTrimming="CharacterEllipsis"
+        />
       </Button>
     </UniformGrid>
   </Grid>

DiscordChatExporter.Gui/Views/Dialogs/SettingsView.axaml

@@ -5,25 +5,25 @@
   xmlns:converters="clr-namespace:DiscordChatExporter.Gui.Converters"
   xmlns:dialogs="clr-namespace:DiscordChatExporter.Gui.ViewModels.Dialogs"
   Width="380"
-    x:DataType="dialogs:SettingsViewModel">
+  x:DataType="dialogs:SettingsViewModel"
+>
   <Grid RowDefinitions="Auto,*,Auto">
     <TextBlock
       Grid.Row="0"
       Margin="16"
       FontSize="19"
       FontWeight="Light"
-            Text="{Binding LocalizationManager.SettingsTitle}" />
+      Text="{Binding LocalizationManager.SettingsTitle}"
+    />
 
     <Border
       Grid.Row="1"
       Padding="0,8"
       BorderBrush="{DynamicResource MaterialDividerBrush}"
-            BorderThickness="0,1">
+      BorderThickness="0,1"
+    >
       <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
-                <StackPanel
+        <StackPanel Margin="16,8" Orientation="Vertical" Spacing="16">
-                    Margin="16,8"
-                    Orientation="Vertical"
-                    Spacing="16">
           <!--  Theme  -->
           <DockPanel LastChildFill="False" ToolTip.Tip="{Binding LocalizationManager.ThemeTooltip}">
             <TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.ThemeLabel}" />
@@ -31,24 +31,30 @@
               Width="150"
               DockPanel.Dock="Right"
               ItemsSource="{Binding AvailableThemes}"
-                            SelectedItem="{Binding Theme}" />
+              SelectedItem="{Binding Theme}"
+            />
           </DockPanel>
 
           <!--  Language  -->
-                    <DockPanel LastChildFill="False" ToolTip.Tip="{Binding LocalizationManager.LanguageTooltip}">
+          <DockPanel
+            LastChildFill="False"
+            ToolTip.Tip="{Binding LocalizationManager.LanguageTooltip}"
+          >
             <TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.LanguageLabel}" />
             <ComboBox
               Width="150"
               DockPanel.Dock="Right"
               ItemsSource="{Binding AvailableLanguages}"
-                            SelectedItem="{Binding Language}" />
+              SelectedItem="{Binding Language}"
+            />
           </DockPanel>
 
           <!--  Auto-updates  -->
           <DockPanel
             IsVisible="{Binding IsAutoUpdateAvailable}"
             LastChildFill="False"
-                        ToolTip.Tip="{Binding LocalizationManager.AutoUpdateTooltip}">
+            ToolTip.Tip="{Binding LocalizationManager.AutoUpdateTooltip}"
+          >
             <TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.AutoUpdateLabel}" />
             <ToggleSwitch DockPanel.Dock="Right" IsChecked="{Binding IsAutoUpdateEnabled}" />
           </DockPanel>
@@ -59,20 +65,31 @@
               <TextBlock
                 MaxWidth="400"
                 Inlines="{Binding LocalizationManager.PersistTokenTooltip, Converter={x:Static converters:MarkdownToInlinesConverter.Instance}}"
-                                TextWrapping="Wrap" />
+                TextWrapping="Wrap"
+              />
             </ToolTip.Tip>
-                        <TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.PersistTokenLabel}" />
+            <TextBlock
+              DockPanel.Dock="Left"
+              Text="{Binding LocalizationManager.PersistTokenLabel}"
+            />
             <ToggleSwitch DockPanel.Dock="Right" IsChecked="{Binding IsTokenPersisted}" />
           </DockPanel>
 
           <!--  Rate limit preference  -->
-                    <DockPanel LastChildFill="False" ToolTip.Tip="{Binding LocalizationManager.RateLimitPreferenceTooltip}">
+          <DockPanel
-                        <TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.RateLimitPreferenceLabel}" />
+            LastChildFill="False"
+            ToolTip.Tip="{Binding LocalizationManager.RateLimitPreferenceTooltip}"
+          >
+            <TextBlock
+              DockPanel.Dock="Left"
+              Text="{Binding LocalizationManager.RateLimitPreferenceLabel}"
+            />
             <ComboBox
               Width="150"
               DockPanel.Dock="Right"
               ItemsSource="{Binding AvailableRateLimitPreferences}"
-                            SelectedItem="{Binding RateLimitPreference}">
+              SelectedItem="{Binding RateLimitPreference}"
+            >
               <ComboBox.ItemTemplate>
                 <DataTemplate>
                   <TextBlock Text="{Binding Converter={x:Static converters:RateLimitPreferenceToStringConverter.Instance}}" />
@@ -82,23 +99,34 @@
           </DockPanel>
 
           <!--  Thread inclusion mode  -->
-                    <DockPanel LastChildFill="False" ToolTip.Tip="{Binding LocalizationManager.ShowThreadsTooltip}">
+          <DockPanel
-                        <TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.ShowThreadsLabel}" />
+            LastChildFill="False"
+            ToolTip.Tip="{Binding LocalizationManager.ShowThreadsTooltip}"
+          >
+            <TextBlock
+              DockPanel.Dock="Left"
+              Text="{Binding LocalizationManager.ShowThreadsLabel}"
+            />
             <ComboBox
               Width="150"
               DockPanel.Dock="Right"
               ItemsSource="{Binding AvailableThreadInclusionModes}"
-                            SelectedItem="{Binding ThreadInclusionMode}" />
+              SelectedItem="{Binding ThreadInclusionMode}"
+            />
           </DockPanel>
 
           <!--  Locale  -->
-                    <DockPanel LastChildFill="False" ToolTip.Tip="{Binding LocalizationManager.LocaleTooltip}">
+          <DockPanel
+            LastChildFill="False"
+            ToolTip.Tip="{Binding LocalizationManager.LocaleTooltip}"
+          >
             <TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.LocaleLabel}" />
             <ComboBox
               Width="150"
               DockPanel.Dock="Right"
               ItemsSource="{Binding AvailableLocales}"
-                            SelectedItem="{Binding Locale}">
+              SelectedItem="{Binding Locale}"
+            >
               <ComboBox.ItemTemplate>
                 <DataTemplate>
                   <TextBlock Text="{Binding Converter={x:Static converters:LocaleToDisplayNameStringConverter.Instance}}" />
@@ -108,18 +136,27 @@
           </DockPanel>
 
           <!--  UTC normalization  -->
-                    <DockPanel LastChildFill="False" ToolTip.Tip="{Binding LocalizationManager.NormalizeToUtcTooltip}">
+          <DockPanel
-                        <TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.NormalizeToUtcLabel}" />
+            LastChildFill="False"
+            ToolTip.Tip="{Binding LocalizationManager.NormalizeToUtcTooltip}"
+          >
+            <TextBlock
+              DockPanel.Dock="Left"
+              Text="{Binding LocalizationManager.NormalizeToUtcLabel}"
+            />
             <ToggleSwitch DockPanel.Dock="Right" IsChecked="{Binding IsUtcNormalizationEnabled}" />
           </DockPanel>
 
           <!--  Parallel limit  -->
-                    <DockPanel LastChildFill="False" ToolTip.Tip="{Binding LocalizationManager.ParallelLimitTooltip}">
+          <DockPanel
-                        <TextBlock DockPanel.Dock="Left" Text="{Binding LocalizationManager.ParallelLimitLabel}" />
+            LastChildFill="False"
-                        <StackPanel
+            ToolTip.Tip="{Binding LocalizationManager.ParallelLimitTooltip}"
-                            DockPanel.Dock="Right"
+          >
-                            Orientation="Horizontal"
+            <TextBlock
-                            Spacing="10">
+              DockPanel.Dock="Left"
+              Text="{Binding LocalizationManager.ParallelLimitLabel}"
+            />
+            <StackPanel DockPanel.Dock="Right" Orientation="Horizontal" Spacing="10">
               <TextBlock Text="{Binding ParallelLimit}" />
               <Slider
                 Width="150"
@@ -127,7 +164,8 @@
                 Maximum="10"
                 Minimum="1"
                 TickFrequency="1"
-                                Value="{Binding ParallelLimit}" />
+                Value="{Binding ParallelLimit}"
+              />
             </StackPanel>
           </DockPanel>
         </StackPanel>
@@ -143,6 +181,7 @@
       Content="{Binding LocalizationManager.CloseButton}"
       IsCancel="True"
       IsDefault="True"
-            Theme="{DynamicResource MaterialOutlineButton}" />
+      Theme="{DynamicResource MaterialOutlineButton}"
+    />
   </Grid>
 </UserControl>

DiscordChatExporter.Gui/Views/MainView.axaml

@@ -13,7 +13,8 @@
   x:DataType="viewModels:MainViewModel"
   Icon="/favicon.ico"
   RenderOptions.BitmapInterpolationMode="HighQuality"
-    WindowStartupLocation="CenterScreen">
+  WindowStartupLocation="CenterScreen"
+>
   <dialogHostAvalonia:DialogHost x:Name="DialogHost" CloseOnClickAway="False">
     <materialStyles:SnackbarHost HostName="Root" SnackbarMaxCounts="3">
       <ContentControl Content="{Binding Dashboard}" />