Update version

Closes #805

.github/FUNDING.yml

@@ -1,3 +0,0 @@
-github: Tyrrrz
-patreon: Tyrrrz
-custom: ['buymeacoffee.com/Tyrrrz', 'tyrrrz.me/donate']

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,17 +0,0 @@
-<!--
-
-**Important:**
-
-Please make sure that there is an existing issue that describes the problem solved by your pull request. If there isn't one, consider creating it first.
-An open issue offers a good place to iron out requirements, discuss possible solutions, and ask questions.
-
-Remember to also:
-
-- Keep your pull request focused and as small as possible. If you want to contribute multiple unrelated changes, please create separate pull requests for them.
-- Follow the coding style and conventions already established by the project. When in doubt about which style to use, ask in the comments to your pull request.
-- If you want to start a discussion regarding a specific change you've made, add a review comment to your own code. This can be used to highlight something important or to seek further input from others.
-
--->
-
-<!-- Please specify the issue addressed by this pull request -->
-Closes #ISSUE_NUMBER

.github/workflows/CD.yml

@@ -20,7 +20,8 @@ jobs:
       - name: Install .NET
         uses: actions/setup-dotnet@v1.7.2
         with:
-          dotnet-version: 6.0.x
+          # Fixed version, workaround for https://github.com/dotnet/core/issues/7176
+          dotnet-version: 6.0.100
 
       - name: Build & publish (CLI)
         run: dotnet publish DiscordChatExporter.Cli/ -o DiscordChatExporter.Cli/bin/Publish/ --configuration Release

.github/workflows/CI.yml

@@ -13,12 +13,13 @@ jobs:
       - name: Install .NET
         uses: actions/setup-dotnet@v1.7.2
         with:
-          dotnet-version: 6.0.x
+          # Fixed version, workaround for https://github.com/dotnet/core/issues/7176
+          dotnet-version: 6.0.100
 
       - name: Build & test
         # Tests need access to secrets, so we can't run them against PRs because of limited trust
         if: ${{ github.event_name != 'pull_request' }}
-        run: dotnet test --configuration Release --logger GitHubActions
+        run: dotnet test --configuration Release --logger GitHubActions --collect:"XPlat Code Coverage" -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=opencover
         env:
           DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }}
           DISCORD_TOKEN_BOT: true

Changelog.md

@@ -1,3 +1,46 @@
+### v2.34 (10-Apr-2022)
+
+- [HTML] Reworked layout to be more consistent with Discord.
+- [HTML] Changed user profile picture dimensions from `128x128` to `512x512`. (Thanks [@Chris Helder](https://github.com/TheDude53))
+- [HTML] Improved image scaling for Chromium-based browsers. This should result in higher quality images across the entire export.
+- [HTML] Hovering over messages will now show short timestamps on the left, indicating the time that the individual messages of the group were sent.
+- [HTML] Using "download media" option will now also download scripts, styles, fonts, and other similar resources used by the export.
+- [HTML] Image attachments will now use the provided description as alt text.
+- [HTML] Fixed a few layout inconsistencies related to embeds.
+- [GUI] Added a few clickable links to the usage guide to make the process of locating tokens easier.
+
+### v2.33.2 (07-Mar-2022)
+
+- Actually fixed it this time.
+
+### v2.33.1 (07-Mar-2022)
+
+- Fixed an issue where the application silently failed to run if the system didn't have .NET Runtime 6.0.2 installed. If you continue seeing this issue, please uninstall all existing .NET runtimes from your computer and then try running the application again.
+
+### v2.33 (06-Mar-2022)
+
+- Added messages informing about war in Ukraine and available ways to help.
+- Added support for rendering stickers in HTML and JSON. Lottie-based stickers currently cannot be displayed in HTML exports (see [#803](https://github.com/Tyrrrz/DiscordChatExporter/issues/803)).
+- Added a new `reaction:` message filter which can be used to check if someone reacted to a message with a specific emoji. You can either pass the emoji name (e.g. `reaction:LUL`) or its ID (e.g. `reaction:41771983429993937`).
+- [GUI] Added auto-detection for dark mode. If your system is configured to prefer dark mode in applications, DiscordChatExporter will use it by default instead of light mode.
+- Fixed an issue which caused the export process to crash when downloading media files with extremely long file extensions. (Thanks [@Tomlacko](https://github.com/Tomlacko))
+- Fixed an issue which caused the export process to crash on invalid mentions.
+- [GUI] Fixed an issue where the time pickers used to specify export ranges always displayed time in 12-hour format, instead of respecting the system locale.
+
+### v2.32 (27-Jan-2022)
+
+- Token kind (user or bot) is now detected automatically. Removed the button to switch token kind in GUI. Option `-b|--bot` in CLI is now deprecated and does nothing.
+- Updated user token extraction guide to reflect the fact that devtools are no longer accessible in the desktop version of Discord client. The recommended workaround is to open Discord in browser. (Thanks [@Dhananjay-JSR](https://github.com/Dhananjay-JSR))
+- Fixed an issue which caused an error when parsing invalid date timestamps. Such timestamps are now rendered as "Invalid date", similarly to how the Discord client does it.
+- Fixed an issue which caused an error when parsing certain embed fields.
+- Fixed an issue which caused an error when parsing a mention to a user that has no username.
+- [GUI] Minor visual fixes.
+
+### v2.31.1 (15-Dec-2021)
+
+- Fixed an issue which caused an error when parsing certain custom emoji reactions.
+- [GUI] Improved user interface.
+
 ### v2.31 (06-Dec-2021)
 
 - Changed target runtime of the application (both GUI and CLI) from .NET 3.1 to .NET 6. Those using the GUI version will not need to take any action as the application should install the necessary prerequisites automatically. Those using the CLI version will need to download and install .NET 6 runtime manually [from here](https://dotnet.microsoft.com/download/dotnet/6.0) (look for ".NET Runtime 6.0.x" section on the right and choose the distribution appropriate for your system).

Directory.Build.props

@@ -2,9 +2,9 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <Version>2.31</Version>
+    <Version>2.34</Version>
     <Company>Tyrrrz</Company>
-    <Copyright>Copyright (c) Alexey Golub</Copyright>
+    <Copyright>Copyright (c) Oleksii Holub</Copyright>
     <LangVersion>preview</LangVersion>
     <Nullable>enable</Nullable>
     <WarningsAsErrors>nullable</WarningsAsErrors>

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

@@ -3,8 +3,6 @@
   <PropertyGroup>
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
-    <CollectCoverage>true</CollectCoverage>
-    <CoverletOutputFormat>opencover</CoverletOutputFormat>
     <NoWarn>$(NoWarn);xUnit1013</NoWarn>
   </PropertyGroup>
 
@@ -15,14 +13,14 @@
 
   <ItemGroup>
     <PackageReference Include="AngleSharp" Version="0.16.1" />
-    <PackageReference Include="FluentAssertions" Version="6.2.0" />
+    <PackageReference Include="FluentAssertions" Version="6.6.0" />
-    <PackageReference Include="GitHubActionsTestLogger" Version="1.2.0" />
+    <PackageReference Include="GitHubActionsTestLogger" Version="1.3.0" PrivateAssets="all" />
     <PackageReference Include="JsonExtensions" Version="1.2.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-    <PackageReference Include="coverlet.msbuild" Version="3.1.0" PrivateAssets="all" />
     <PackageReference Include="System.Reactive" Version="5.0.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" PrivateAssets="all" />
+    <PackageReference Include="coverlet.collector" Version="3.1.2" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

DiscordChatExporter.Cli.Tests/Fixtures/ExportWrapperFixture.cs

@@ -14,8 +14,8 @@ using DiscordChatExporter.Core.Discord;
 using DiscordChatExporter.Core.Exporting;
 using JsonExtensions;
 
-namespace DiscordChatExporter.Cli.Tests.Fixtures
+namespace DiscordChatExporter.Cli.Tests.Fixtures;
-{
+
 public class ExportWrapperFixture : IDisposable
 {
     private string DirPath { get; } = Path.Combine(
@@ -36,8 +36,7 @@ namespace DiscordChatExporter.Cli.Tests.Fixtures
         {
             await new ExportChannelsCommand
             {
-                    TokenValue = Secrets.DiscordToken,
+                Token = Secrets.DiscordToken,
-                    IsBotToken = Secrets.IsDiscordTokenBot,
                 ChannelIds = new[] { channelId },
                 ExportFormat = format,
                 OutputPath = filePath
@@ -129,4 +128,3 @@ namespace DiscordChatExporter.Cli.Tests.Fixtures
 
     public void Dispose() => DirectoryEx.DeleteIfExists(DirPath);
 }
-}

DiscordChatExporter.Cli.Tests/Fixtures/TempOutputFixture.cs

@@ -2,8 +2,8 @@
 using System.IO;
 using DiscordChatExporter.Cli.Tests.Utils;
 
-namespace DiscordChatExporter.Cli.Tests.Fixtures
+namespace DiscordChatExporter.Cli.Tests.Fixtures;
-{
+
 public class TempOutputFixture : IDisposable
 {
     public string DirPath { get; } = Path.Combine(
@@ -20,4 +20,3 @@ namespace DiscordChatExporter.Cli.Tests.Fixtures
 
     public void Dispose() => DirectoryEx.DeleteIfExists(DirPath);
 }
-}

DiscordChatExporter.Cli.Tests/Infra/Secrets.cs

@@ -1,8 +1,8 @@
 using System;
 using System.IO;
 
-namespace DiscordChatExporter.Cli.Tests.Infra
+namespace DiscordChatExporter.Cli.Tests.Infra;
-{
+
 internal static class Secrets
 {
     private static readonly Lazy<string> DiscordTokenLazy = new(() =>
@@ -22,25 +22,5 @@ namespace DiscordChatExporter.Cli.Tests.Infra
         throw new InvalidOperationException("Discord token not provided for tests.");
     });
 
-        private static readonly Lazy<bool> IsDiscordTokenBotLazy = new(() =>
-        {
-            var fromEnvironment = Environment.GetEnvironmentVariable("DISCORD_TOKEN_BOT");
-            if (!string.IsNullOrWhiteSpace(fromEnvironment))
-                return string.Equals(fromEnvironment, "true", StringComparison.OrdinalIgnoreCase);
-
-            var secretFilePath = Path.Combine(
-                Path.GetDirectoryName(typeof(Secrets).Assembly.Location) ?? Directory.GetCurrentDirectory(),
-                "DiscordTokenBot.secret"
-            );
-
-            if (File.Exists(secretFilePath))
-                return true;
-
-            return false;
-        });
-
     public static string DiscordToken => DiscordTokenLazy.Value;
-
-        public static bool IsDiscordTokenBot => IsDiscordTokenBotLazy.Value;
-    }
 }

DiscordChatExporter.Cli.Tests/Specs/CsvWriting/ContentSpecs.cs

@@ -4,8 +4,8 @@ using DiscordChatExporter.Cli.Tests.TestData;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.CsvWriting
+namespace DiscordChatExporter.Cli.Tests.Specs.CsvWriting;
-{
+
 public record ContentSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
 {
     [Fact]
@@ -28,4 +28,3 @@ namespace DiscordChatExporter.Cli.Tests.Specs.CsvWriting
         );
     }
 }
-}

DiscordChatExporter.Cli.Tests/Specs/DateRangeSpecs.cs

@@ -13,8 +13,8 @@ using FluentAssertions;
 using JsonExtensions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs
+namespace DiscordChatExporter.Cli.Tests.Specs;
-{
+
 public record DateRangeSpecs(TempOutputFixture TempOutput) : IClassFixture<TempOutputFixture>
 {
     [Fact]
@@ -27,8 +27,7 @@ namespace DiscordChatExporter.Cli.Tests.Specs
         // Act
         await new ExportChannelsCommand
         {
-                TokenValue = Secrets.DiscordToken,
+            Token = Secrets.DiscordToken,
-                IsBotToken = Secrets.IsDiscordTokenBot,
             ChannelIds = new[] { ChannelIds.DateRangeTestCases },
             ExportFormat = ExportFormat.Json,
             OutputPath = filePath,
@@ -74,8 +73,7 @@ namespace DiscordChatExporter.Cli.Tests.Specs
         // Act
         await new ExportChannelsCommand
         {
-                TokenValue = Secrets.DiscordToken,
+            Token = Secrets.DiscordToken,
-                IsBotToken = Secrets.IsDiscordTokenBot,
             ChannelIds = new[] { ChannelIds.DateRangeTestCases },
             ExportFormat = ExportFormat.Json,
             OutputPath = filePath,
@@ -120,8 +118,7 @@ namespace DiscordChatExporter.Cli.Tests.Specs
         // Act
         await new ExportChannelsCommand
         {
-                TokenValue = Secrets.DiscordToken,
+            Token = Secrets.DiscordToken,
-                IsBotToken = Secrets.IsDiscordTokenBot,
             ChannelIds = new[] { ChannelIds.DateRangeTestCases },
             ExportFormat = ExportFormat.Json,
             OutputPath = filePath,
@@ -157,4 +154,3 @@ namespace DiscordChatExporter.Cli.Tests.Specs
         });
     }
 }
-}

DiscordChatExporter.Cli.Tests/Specs/FilterSpecs.cs

@@ -12,8 +12,8 @@ using FluentAssertions;
 using JsonExtensions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs
+namespace DiscordChatExporter.Cli.Tests.Specs;
-{
+
 public record FilterSpecs(TempOutputFixture TempOutput) : IClassFixture<TempOutputFixture>
 {
     [Fact]
@@ -25,8 +25,7 @@ namespace DiscordChatExporter.Cli.Tests.Specs
         // Act
         await new ExportChannelsCommand
         {
-                TokenValue = Secrets.DiscordToken,
+            Token = Secrets.DiscordToken,
-                IsBotToken = Secrets.IsDiscordTokenBot,
             ChannelIds = new[] { ChannelIds.FilterTestCases },
             ExportFormat = ExportFormat.Json,
             OutputPath = filePath,
@@ -54,8 +53,7 @@ namespace DiscordChatExporter.Cli.Tests.Specs
         // Act
         await new ExportChannelsCommand
         {
-                TokenValue = Secrets.DiscordToken,
+            Token = Secrets.DiscordToken,
-                IsBotToken = Secrets.IsDiscordTokenBot,
             ChannelIds = new[] { ChannelIds.FilterTestCases },
             ExportFormat = ExportFormat.Json,
             OutputPath = filePath,
@@ -83,8 +81,7 @@ namespace DiscordChatExporter.Cli.Tests.Specs
         // Act
         await new ExportChannelsCommand
         {
-                TokenValue = Secrets.DiscordToken,
+            Token = Secrets.DiscordToken,
-                IsBotToken = Secrets.IsDiscordTokenBot,
             ChannelIds = new[] { ChannelIds.FilterTestCases },
             ExportFormat = ExportFormat.Json,
             OutputPath = filePath,
@@ -112,8 +109,7 @@ namespace DiscordChatExporter.Cli.Tests.Specs
         // Act
         await new ExportChannelsCommand
         {
-                TokenValue = Secrets.DiscordToken,
+            Token = Secrets.DiscordToken,
-                IsBotToken = Secrets.IsDiscordTokenBot,
             ChannelIds = new[] { ChannelIds.FilterTestCases },
             ExportFormat = ExportFormat.Json,
             OutputPath = filePath,
@@ -132,4 +128,3 @@ namespace DiscordChatExporter.Cli.Tests.Specs
             .ContainSingle("This has mention");
     }
 }
-}

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

@@ -6,8 +6,8 @@ using DiscordChatExporter.Core.Discord;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting
+namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting;
-{
+
 public record AttachmentSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
 {
     [Fact]
@@ -42,7 +42,7 @@ namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting
             Snowflake.Parse("885654862656843786")
         );
 
-            var imageUrl = message.QuerySelector("img")?.GetAttribute("src");
+        var imageUrl = message.QuerySelector(".chatlog__attachment img")?.GetAttribute("src");
 
         // Assert
         message.Text().Should().Contain("Image attachment");
@@ -90,4 +90,3 @@ namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting
         );
     }
 }
-}

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

@@ -6,8 +6,8 @@ using DiscordChatExporter.Cli.Tests.TestData;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting
+namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting;
-{
+
 public record ContentSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
 {
     [Fact]
@@ -40,4 +40,3 @@ namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting
         );
     }
 }
-}

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

@@ -6,8 +6,8 @@ using DiscordChatExporter.Core.Discord;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting
+namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting;
-{
+
 public record EmbedSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
 {
     [Fact]
@@ -61,4 +61,3 @@ namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting
         iframeSrc.Should().StartWithEquivalentOf("https://www.youtube.com/embed/qOWW4OlgbvE");
     }
 }
-}

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

@@ -6,8 +6,8 @@ using DiscordChatExporter.Core.Discord;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting
+namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting;
-{
+
 public record MentionSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
 {
     [Fact]
@@ -20,7 +20,7 @@ namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting
         );
 
         // Assert
-            message.Text().Trim().Should().Be("User mention: @Tyrrrz");
+        message.Text().Trim().Should().Contain("User mention: @Tyrrrz");
         message.InnerHtml.Should().Contain("Tyrrrz#5447");
     }
 
@@ -34,7 +34,7 @@ namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting
         );
 
         // Assert
-            message.Text().Trim().Should().Be("Text channel mention: #mention-tests");
+        message.Text().Trim().Should().Contain("Text channel mention: #mention-tests");
     }
 
     [Fact]
@@ -47,7 +47,7 @@ namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting
         );
 
         // Assert
-            message.Text().Trim().Should().Be("Voice channel mention: 🔊chaos-vc");
+        message.Text().Trim().Should().Contain("Voice channel mention: 🔊chaos-vc");
     }
 
     [Fact]
@@ -60,7 +60,6 @@ namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting
         );
 
         // Assert
-            message.Text().Trim().Should().Be("Role mention: @Role 1");
+        message.Text().Trim().Should().Contain("Role mention: @Role 1");
-        }
     }
 }

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

@@ -6,8 +6,8 @@ using DiscordChatExporter.Core.Discord;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting
+namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting;
-{
+
 public record ReplySpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
 {
     [Fact]
@@ -20,8 +20,8 @@ namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting
         );
 
         // Assert
-            message.Text().Trim().Should().Be("reply to original");
+        message.Text().Trim().Should().Contain("reply to original");
-            message.QuerySelector(".chatlog__reference-link")?.Text().Trim().Should().Be("original");
+        message.QuerySelector(".chatlog__reference-link")?.Text().Trim().Should().Contain("original");
     }
 
     [Fact]
@@ -34,13 +34,13 @@ namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting
         );
 
         // Assert
-            message.Text().Trim().Should().Be("reply to deleted");
+        message.Text().Trim().Should().Contain("reply to deleted");
         message.QuerySelector(".chatlog__reference-link")?.Text().Trim().Should()
-                .Be("Original message was deleted or could not be loaded.");
+            .Contain("Original message was deleted or could not be loaded.");
     }
 
     [Fact]
-        public async Task Reply_to_a_empty_message_with_attachment_is_rendered_correctly()
+    public async Task Reply_to_an_empty_message_with_attachment_is_rendered_correctly()
     {
         // Act
         var message = await ExportWrapper.GetMessageAsHtmlAsync(
@@ -49,9 +49,8 @@ namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting
         );
 
         // Assert
-            message.Text().Trim().Should().Be("reply to attachment");
+        message.Text().Trim().Should().Contain("reply to attachment");
         message.QuerySelector(".chatlog__reference-link")?.Text().Trim().Should()
-                .Be("Click to see attachment 🖼️");
+            .Contain("Click to see attachment");
-        }
     }
 }

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

@@ -0,0 +1,45 @@
+using System.Threading.Tasks;
+using DiscordChatExporter.Cli.Tests.Fixtures;
+using DiscordChatExporter.Cli.Tests.TestData;
+using DiscordChatExporter.Core.Discord;
+using FluentAssertions;
+using Xunit;
+
+namespace DiscordChatExporter.Cli.Tests.Specs.HtmlWriting;
+
+public record StickerSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
+{
+    [Fact]
+    public async Task Message_with_a_PNG_based_sticker_is_rendered_correctly()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+            ChannelIds.StickerTestCases,
+            Snowflake.Parse("939670623158943754")
+        );
+
+        var container = message.QuerySelector("[title='rock']");
+        var sourceUrl = container?.QuerySelector("img")?.GetAttribute("src");
+
+        // Assert
+        container.Should().NotBeNull();
+        sourceUrl.Should().Be("https://discord.com/stickers/904215665597120572.png");
+    }
+
+    [Fact]
+    public async Task Message_with_a_Lottie_based_sticker_is_rendered_correctly()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsHtmlAsync(
+            ChannelIds.StickerTestCases,
+            Snowflake.Parse("939670526517997590")
+        );
+
+        var container = message.QuerySelector("[title='Yikes']");
+        var sourceUrl = container?.QuerySelector("div[data-source]")?.GetAttribute("data-source");
+
+        // Assert
+        container.Should().NotBeNull();
+        sourceUrl.Should().Be("https://discord.com/stickers/816087132447178774.json");
+    }
+}

DiscordChatExporter.Cli.Tests/Specs/JsonWriting/AttachmentSpecs.cs

@@ -6,8 +6,8 @@ using DiscordChatExporter.Core.Discord;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.JsonWriting
+namespace DiscordChatExporter.Cli.Tests.Specs.JsonWriting;
-{
+
 public record AttachmentSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
 {
     [Fact]
@@ -98,4 +98,3 @@ namespace DiscordChatExporter.Cli.Tests.Specs.JsonWriting
         attachments.Single().GetProperty("fileSizeBytes").GetInt64().Should().Be(1087849);
     }
 }
-}

DiscordChatExporter.Cli.Tests/Specs/JsonWriting/ContentSpecs.cs

@@ -5,8 +5,8 @@ using DiscordChatExporter.Cli.Tests.TestData;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.JsonWriting
+namespace DiscordChatExporter.Cli.Tests.Specs.JsonWriting;
-{
+
 public record ContentSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
 {
     [Fact]
@@ -39,4 +39,3 @@ namespace DiscordChatExporter.Cli.Tests.Specs.JsonWriting
         );
     }
 }
-}

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

@@ -6,8 +6,8 @@ using DiscordChatExporter.Core.Discord;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.JsonWriting
+namespace DiscordChatExporter.Cli.Tests.Specs.JsonWriting;
-{
+
 public record EmbedSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
 {
     [Fact]
@@ -55,4 +55,3 @@ namespace DiscordChatExporter.Cli.Tests.Specs.JsonWriting
         embedFields[2].GetProperty("isInline").GetBoolean().Should().BeTrue();
     }
 }
-}

DiscordChatExporter.Cli.Tests/Specs/JsonWriting/MentionSpecs.cs

@@ -6,8 +6,8 @@ using DiscordChatExporter.Core.Discord;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.JsonWriting
+namespace DiscordChatExporter.Cli.Tests.Specs.JsonWriting;
-{
+
 public record MentionSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
 {
     [Fact]
@@ -68,4 +68,3 @@ namespace DiscordChatExporter.Cli.Tests.Specs.JsonWriting
         message.GetProperty("content").GetString().Should().Be("Role mention: @Role 1");
     }
 }
-}

DiscordChatExporter.Cli.Tests/Specs/JsonWriting/StickerSpecs.cs

@@ -0,0 +1,54 @@
+using System.Linq;
+using System.Threading.Tasks;
+using DiscordChatExporter.Cli.Tests.Fixtures;
+using DiscordChatExporter.Cli.Tests.TestData;
+using DiscordChatExporter.Core.Discord;
+using FluentAssertions;
+using Xunit;
+
+namespace DiscordChatExporter.Cli.Tests.Specs.JsonWriting;
+
+public record StickerSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
+{
+    [Fact]
+    public async Task Message_with_a_PNG_based_sticker_is_rendered_correctly()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsJsonAsync(
+            ChannelIds.StickerTestCases,
+            Snowflake.Parse("939670623158943754")
+        );
+
+        var sticker = message
+            .GetProperty("stickers")
+            .EnumerateArray()
+            .Single();
+
+        // Assert
+        sticker.GetProperty("id").GetString().Should().Be("904215665597120572");
+        sticker.GetProperty("name").GetString().Should().Be("rock");
+        sticker.GetProperty("format").GetString().Should().Be("PngAnimated");
+        sticker.GetProperty("sourceUrl").GetString().Should().Be("https://discord.com/stickers/904215665597120572.png");
+    }
+
+    [Fact]
+    public async Task Message_with_a_Lottie_based_sticker_is_rendered_correctly()
+    {
+        // Act
+        var message = await ExportWrapper.GetMessageAsJsonAsync(
+            ChannelIds.StickerTestCases,
+            Snowflake.Parse("939670526517997590")
+        );
+
+        var sticker = message
+            .GetProperty("stickers")
+            .EnumerateArray()
+            .Single();
+
+        // Assert
+        sticker.GetProperty("id").GetString().Should().Be("816087132447178774");
+        sticker.GetProperty("name").GetString().Should().Be("Yikes");
+        sticker.GetProperty("format").GetString().Should().Be("Lottie");
+        sticker.GetProperty("sourceUrl").GetString().Should().Be("https://discord.com/stickers/816087132447178774.json");
+    }
+}

DiscordChatExporter.Cli.Tests/Specs/PartitioningSpecs.cs

@@ -10,8 +10,8 @@ using DiscordChatExporter.Core.Exporting.Partitioning;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs
+namespace DiscordChatExporter.Cli.Tests.Specs;
-{
+
 public record PartitioningSpecs(TempOutputFixture TempOutput) : IClassFixture<TempOutputFixture>
 {
     [Fact]
@@ -25,8 +25,7 @@ namespace DiscordChatExporter.Cli.Tests.Specs
         // Act
         await new ExportChannelsCommand
         {
-                TokenValue = Secrets.DiscordToken,
+            Token = Secrets.DiscordToken,
-                IsBotToken = Secrets.IsDiscordTokenBot,
             ChannelIds = new[] { ChannelIds.DateRangeTestCases },
             ExportFormat = ExportFormat.HtmlDark,
             OutputPath = filePath,
@@ -50,8 +49,7 @@ namespace DiscordChatExporter.Cli.Tests.Specs
         // Act
         await new ExportChannelsCommand
         {
-                TokenValue = Secrets.DiscordToken,
+            Token = Secrets.DiscordToken,
-                IsBotToken = Secrets.IsDiscordTokenBot,
             ChannelIds = new[] { ChannelIds.DateRangeTestCases },
             ExportFormat = ExportFormat.HtmlDark,
             OutputPath = filePath,
@@ -61,7 +59,6 @@ namespace DiscordChatExporter.Cli.Tests.Specs
         // Assert
         Directory.EnumerateFiles(dirPath, fileNameWithoutExt + "*")
             .Should()
-                .HaveCount(2);
+            .HaveCount(8);
-        }
     }
 }

DiscordChatExporter.Cli.Tests/Specs/PlainTextWriting/ContentSpecs.cs

@@ -4,8 +4,8 @@ using DiscordChatExporter.Cli.Tests.TestData;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.PlainTextWriting
+namespace DiscordChatExporter.Cli.Tests.Specs.PlainTextWriting;
-{
+
 public record ContentSpecs(ExportWrapperFixture ExportWrapper) : IClassFixture<ExportWrapperFixture>
 {
     [Fact]
@@ -28,4 +28,3 @@ namespace DiscordChatExporter.Cli.Tests.Specs.PlainTextWriting
         );
     }
 }
-}

DiscordChatExporter.Cli.Tests/Specs/SelfContainedSpecs.cs

@@ -11,8 +11,8 @@ using DiscordChatExporter.Core.Exporting;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs
+namespace DiscordChatExporter.Cli.Tests.Specs;
-{
+
 public record SelfContainedSpecs(TempOutputFixture TempOutput) : IClassFixture<TempOutputFixture>
 {
     [Fact]
@@ -25,8 +25,7 @@ namespace DiscordChatExporter.Cli.Tests.Specs
         // Act
         await new ExportChannelsCommand
         {
-                TokenValue = Secrets.DiscordToken,
+            Token = Secrets.DiscordToken,
-                IsBotToken = Secrets.IsDiscordTokenBot,
             ChannelIds = new[] { ChannelIds.SelfContainedTestCases },
             ExportFormat = ExportFormat.HtmlDark,
             OutputPath = filePath,
@@ -46,4 +45,3 @@ namespace DiscordChatExporter.Cli.Tests.Specs
             .BeTrue();
     }
 }
-}

DiscordChatExporter.Cli.Tests/TestData/ChannelIds.cs

@@ -1,7 +1,7 @@
 using DiscordChatExporter.Core.Discord;
 
-namespace DiscordChatExporter.Cli.Tests.TestData
+namespace DiscordChatExporter.Cli.Tests.TestData;
-{
+
 public static class ChannelIds
 {
     public static Snowflake AttachmentTestCases { get; } = Snowflake.Parse("885587741654536192");
@@ -10,6 +10,8 @@ namespace DiscordChatExporter.Cli.Tests.TestData
 
     public static Snowflake EmbedTestCases { get; } = Snowflake.Parse("866472452459462687");
 
+    public static Snowflake StickerTestCases { get; } = Snowflake.Parse("939668868253769729");
+
     public static Snowflake FilterTestCases { get; } = Snowflake.Parse("866744075033641020");
 
     public static Snowflake MentionTestCases { get; } = Snowflake.Parse("866458801389174794");
@@ -18,4 +20,3 @@ namespace DiscordChatExporter.Cli.Tests.TestData
 
     public static Snowflake SelfContainedTestCases { get; } = Snowflake.Parse("887441432678379560");
 }
-}

DiscordChatExporter.Cli.Tests/Utils/DirectoryEx.cs

@@ -1,7 +1,7 @@
 using System.IO;
 
-namespace DiscordChatExporter.Cli.Tests.Utils
+namespace DiscordChatExporter.Cli.Tests.Utils;
-{
+
 internal static class DirectoryEx
 {
     public static void DeleteIfExists(string dirPath, bool recursive = true)
@@ -21,4 +21,3 @@ namespace DiscordChatExporter.Cli.Tests.Utils
         Directory.CreateDirectory(dirPath);
     }
 }
-}

DiscordChatExporter.Cli.Tests/Utils/Html.cs

@@ -1,12 +1,11 @@
 using AngleSharp.Html.Dom;
 using AngleSharp.Html.Parser;
 
-namespace DiscordChatExporter.Cli.Tests.Utils
+namespace DiscordChatExporter.Cli.Tests.Utils;
-{
+
 internal static class Html
 {
     private static readonly IHtmlParser Parser = new HtmlParser();
 
     public static IHtmlDocument Parse(string source) => Parser.ParseDocument(source);
 }
-}

DiscordChatExporter.Cli/Commands/Base/ExportCommandBase.cs

@@ -14,10 +14,10 @@ using DiscordChatExporter.Core.Exceptions;
 using DiscordChatExporter.Core.Exporting;
 using DiscordChatExporter.Core.Exporting.Filtering;
 using DiscordChatExporter.Core.Exporting.Partitioning;
-using DiscordChatExporter.Core.Utils.Extensions;
+using Gress;
+
+namespace DiscordChatExporter.Cli.Commands.Base;
 
-namespace DiscordChatExporter.Cli.Commands.Base
-{
 public abstract class ExportCommandBase : TokenCommandBase
 {
     [CommandOption("output", 'o', Description = "Output file or directory path.")]
@@ -68,13 +68,21 @@ namespace DiscordChatExporter.Cli.Commands.Base
         await console.Output.WriteLineAsync($"Exporting {channels.Count} channel(s)...");
         await console.CreateProgressTicker().StartAsync(async progressContext =>
         {
-                await channels.ParallelForEachAsync(async channel =>
+            await Parallel.ForEachAsync(
+                channels,
+                new ParallelOptions
+                {
+                    MaxDegreeOfParallelism = Math.Max(1, ParallelLimit),
+                    CancellationToken = cancellationToken
+                },
+                async (channel, innerCancellationToken) =>
                 {
                     try
                     {
-                        await progressContext.StartTaskAsync($"{channel.Category.Name} / {channel.Name}", async progress =>
+                        await progressContext.StartTaskAsync($"{channel.Category.Name} / {channel.Name}",
+                            async progress =>
                             {
-                            var guild = await Discord.GetGuildAsync(channel.GuildId, cancellationToken);
+                                var guild = await Discord.GetGuildAsync(channel.GuildId, innerCancellationToken);
 
                                 var request = new ExportRequest(
                                     guild,
@@ -90,14 +98,20 @@ namespace DiscordChatExporter.Cli.Commands.Base
                                     DateFormat
                                 );
 
-                            await Exporter.ExportChannelAsync(request, progress, cancellationToken);
+                                await Exporter.ExportChannelAsync(
-                        });
+                                    request,
+                                    progress.ToPercentageBased(),
+                                    innerCancellationToken
+                                );
+                            }
+                        );
                     }
                     catch (DiscordChatExporterException ex) when (!ex.IsFatal)
                     {
                         errors[channel] = ex.Message;
                     }
-                }, Math.Max(ParallelLimit, 1), cancellationToken);
+                }
+            );
         });
 
         // Print result
@@ -152,5 +166,16 @@ namespace DiscordChatExporter.Cli.Commands.Base
 
         await ExecuteAsync(console, channels);
     }
+
+    public override ValueTask ExecuteAsync(IConsole console)
+    {
+        // 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: https://tyrrrz.me                                    ||");
+        console.Output.WriteLine("========================================================================");
+        console.Output.WriteLine("");
+
+        return default;
     }
 }

DiscordChatExporter.Cli/Commands/Base/TokenCommandBase.cs

@@ -1,30 +1,23 @@
-using System.Threading.Tasks;
+using System;
+using System.Threading.Tasks;
 using CliFx;
 using CliFx.Attributes;
 using CliFx.Infrastructure;
 using DiscordChatExporter.Core.Discord;
 
-namespace DiscordChatExporter.Cli.Commands.Base
+namespace DiscordChatExporter.Cli.Commands.Base;
-{
+
 public abstract class TokenCommandBase : ICommand
 {
     [CommandOption("token", 't', IsRequired = true, EnvironmentVariable = "DISCORD_TOKEN", Description = "Authentication token.")]
-        public string TokenValue { get; init; } = "";
+    public string Token { get; init; } = "";
 
-        [CommandOption("bot", 'b', EnvironmentVariable = "DISCORD_TOKEN_BOT", Description = "Authenticate as a bot.")]
+    [CommandOption("bot", 'b', EnvironmentVariable = "DISCORD_TOKEN_BOT", Description = "This option doesn't do anything. Kept for backwards compatibility.")]
+    [Obsolete("This option doesn't do anything. Kept for backwards compatibility.")]
     public bool IsBotToken { get; init; }
 
-        private AuthToken? _authToken;
-        private AuthToken AuthToken => _authToken ??= new AuthToken(
-            IsBotToken
-                ? AuthTokenKind.Bot
-                : AuthTokenKind.User,
-            TokenValue
-        );
-
     private DiscordClient? _discordClient;
-        protected DiscordClient Discord => _discordClient ??= new DiscordClient(AuthToken);
+    protected DiscordClient Discord => _discordClient ??= new DiscordClient(Token);
 
     public abstract ValueTask ExecuteAsync(IConsole console);
 }
-}

DiscordChatExporter.Cli/Commands/ExportAllCommand.cs

@@ -5,8 +5,8 @@ using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands.Base;
 using DiscordChatExporter.Core.Discord.Data;
 
-namespace DiscordChatExporter.Cli.Commands
+namespace DiscordChatExporter.Cli.Commands;
-{
+
 [Command("exportall", Description = "Export all accessible channels.")]
 public class ExportAllCommand : ExportCommandBase
 {
@@ -15,6 +15,8 @@ namespace DiscordChatExporter.Cli.Commands
 
     public override async ValueTask ExecuteAsync(IConsole console)
     {
+        await base.ExecuteAsync(console);
+
         var cancellationToken = console.RegisterCancellationHandler();
         var channels = new List<Channel>();
 
@@ -38,4 +40,3 @@ namespace DiscordChatExporter.Cli.Commands
         await base.ExecuteAsync(console, channels);
     }
 }
-}

DiscordChatExporter.Cli/Commands/ExportChannelsCommand.cs

@@ -6,8 +6,8 @@ using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands.Base;
 using DiscordChatExporter.Core.Discord;
 
-namespace DiscordChatExporter.Cli.Commands
+namespace DiscordChatExporter.Cli.Commands;
-{
+
 [Command("export", Description = "Export one or multiple channels.")]
 public class ExportChannelsCommand : ExportCommandBase
 {
@@ -15,7 +15,9 @@ namespace DiscordChatExporter.Cli.Commands
     [CommandOption("channel", 'c', IsRequired = true, Description = "Channel ID(s).")]
     public IReadOnlyList<Snowflake> ChannelIds { get; init; } = Array.Empty<Snowflake>();
 
-        public override async ValueTask ExecuteAsync(IConsole console) =>
+    public override async ValueTask ExecuteAsync(IConsole console)
+    {
+        await base.ExecuteAsync(console);
         await base.ExecuteAsync(console, ChannelIds);
     }
 }

DiscordChatExporter.Cli/Commands/ExportDirectMessagesCommand.cs

@@ -6,13 +6,15 @@ using DiscordChatExporter.Cli.Commands.Base;
 using DiscordChatExporter.Core.Discord.Data;
 using DiscordChatExporter.Core.Utils.Extensions;
 
-namespace DiscordChatExporter.Cli.Commands
+namespace DiscordChatExporter.Cli.Commands;
-{
+
 [Command("exportdm", Description = "Export all direct message channels.")]
 public class ExportDirectMessagesCommand : ExportCommandBase
 {
     public override async ValueTask ExecuteAsync(IConsole console)
     {
+        await base.ExecuteAsync(console);
+
         var cancellationToken = console.RegisterCancellationHandler();
 
         await console.Output.WriteLineAsync("Fetching channels...");
@@ -22,4 +24,3 @@ namespace DiscordChatExporter.Cli.Commands
         await base.ExecuteAsync(console, textChannels);
     }
 }
-}

DiscordChatExporter.Cli/Commands/ExportGuildCommand.cs

@@ -6,8 +6,8 @@ using DiscordChatExporter.Cli.Commands.Base;
 using DiscordChatExporter.Core.Discord;
 using DiscordChatExporter.Core.Utils.Extensions;
 
-namespace DiscordChatExporter.Cli.Commands
+namespace DiscordChatExporter.Cli.Commands;
-{
+
 [Command("exportguild", Description = "Export all channels within specified guild.")]
 public class ExportGuildCommand : ExportCommandBase
 {
@@ -16,6 +16,8 @@ namespace DiscordChatExporter.Cli.Commands
 
     public override async ValueTask ExecuteAsync(IConsole console)
     {
+        await base.ExecuteAsync(console);
+
         var cancellationToken = console.RegisterCancellationHandler();
 
         await console.Output.WriteLineAsync("Fetching channels...");
@@ -25,4 +27,3 @@ namespace DiscordChatExporter.Cli.Commands
         await base.ExecuteAsync(console, textChannels);
     }
 }
-}

DiscordChatExporter.Cli/Commands/GetChannelsCommand.cs

@@ -7,8 +7,8 @@ using DiscordChatExporter.Cli.Commands.Base;
 using DiscordChatExporter.Core.Discord;
 using DiscordChatExporter.Core.Utils.Extensions;
 
-namespace DiscordChatExporter.Cli.Commands
+namespace DiscordChatExporter.Cli.Commands;
-{
+
 [Command("channels", Description = "Get the list of channels in a guild.")]
 public class GetChannelsCommand : TokenCommandBase
 {
@@ -42,4 +42,3 @@ namespace DiscordChatExporter.Cli.Commands
         }
     }
 }
-}

DiscordChatExporter.Cli/Commands/GetDirectMessageChannelsCommand.cs

@@ -7,8 +7,8 @@ using DiscordChatExporter.Cli.Commands.Base;
 using DiscordChatExporter.Core.Discord.Data;
 using DiscordChatExporter.Core.Utils.Extensions;
 
-namespace DiscordChatExporter.Cli.Commands
+namespace DiscordChatExporter.Cli.Commands;
-{
+
 [Command("dm", Description = "Get the list of direct message channels.")]
 public class GetDirectMessageChannelsCommand : TokenCommandBase
 {
@@ -39,4 +39,3 @@ namespace DiscordChatExporter.Cli.Commands
         }
     }
 }
-}

DiscordChatExporter.Cli/Commands/GetGuildsCommand.cs

@@ -6,8 +6,8 @@ using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands.Base;
 using DiscordChatExporter.Core.Utils.Extensions;
 
-namespace DiscordChatExporter.Cli.Commands
+namespace DiscordChatExporter.Cli.Commands;
-{
+
 [Command("guilds", Description = "Get the list of accessible guilds.")]
 public class GetGuildsCommand : TokenCommandBase
 {
@@ -32,4 +32,3 @@ namespace DiscordChatExporter.Cli.Commands
         }
     }
 }
-}

DiscordChatExporter.Cli/Commands/GuideCommand.cs

@@ -4,8 +4,8 @@ using CliFx;
 using CliFx.Attributes;
 using CliFx.Infrastructure;
 
-namespace DiscordChatExporter.Cli.Commands
+namespace DiscordChatExporter.Cli.Commands;
-{
+
 [Command("guide", Description = "Explains how to obtain token, guild or channel ID.")]
 public class GuideCommand : ICommand
 {
@@ -15,7 +15,7 @@ namespace DiscordChatExporter.Cli.Commands
         using (console.WithForegroundColor(ConsoleColor.White))
             console.Output.WriteLine("To get user token:");
 
-            console.Output.WriteLine(" 1. Open Discord");
+        console.Output.WriteLine(" 1. Open Discord in your web browser and login");
         console.Output.WriteLine(" 2. Press Ctrl+Shift+I to show developer tools");
         console.Output.WriteLine(" 3. Press Ctrl+Shift+M to toggle device toolbar");
         console.Output.WriteLine(" 4. Navigate to the Application tab");
@@ -61,11 +61,10 @@ namespace DiscordChatExporter.Cli.Commands
 
         // Wiki link
         using (console.WithForegroundColor(ConsoleColor.White))
-                console.Output.WriteLine("For more information, check out the wiki:");
+            console.Output.WriteLine("If you have questions or issues, please refer to the wiki:");
         using (console.WithForegroundColor(ConsoleColor.DarkCyan))
             console.Output.WriteLine("https://github.com/Tyrrrz/DiscordChatExporter/wiki");
 
         return default;
     }
 }
-}

DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj

@@ -6,9 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CliFx" Version="2.0.6" />
+    <PackageReference Include="CliFx" Version="2.2.2" />
-    <PackageReference Include="Spectre.Console" Version="0.43.0" />
+    <PackageReference Include="Spectre.Console" Version="0.44.0" />
-    <PackageReference Include="Gress" Version="1.2.0" />
+    <PackageReference Include="Gress" Version="2.0.1" />
   </ItemGroup>
 
   <ItemGroup>

DiscordChatExporter.Cli/Program.cs

@@ -1,14 +1,6 @@
-using System.Threading.Tasks;
+using CliFx;
-using CliFx;
 
-namespace DiscordChatExporter.Cli
+return await new CliApplicationBuilder()
-{
-    public static class Program
-    {
-        public static async Task<int> Main(string[] args) =>
-            await new CliApplicationBuilder()
     .AddCommandsFromThisAssembly()
     .Build()
     .RunAsync(args);
-    }
-}

DiscordChatExporter.Cli/Utils/Extensions/ConsoleExtensions.cs

@@ -3,8 +3,8 @@ using System.Threading.Tasks;
 using CliFx.Infrastructure;
 using Spectre.Console;
 
-namespace DiscordChatExporter.Cli.Utils.Extensions
+namespace DiscordChatExporter.Cli.Utils.Extensions;
-{
+
 internal static class ConsoleExtensions
 {
     public static IAnsiConsole CreateAnsiConsole(this IConsole console) =>
@@ -48,4 +48,3 @@ namespace DiscordChatExporter.Cli.Utils.Extensions
         }
     }
 }
-}

DiscordChatExporter.Core/Discord/AuthToken.cs

@@ -1,13 +0,0 @@
-using System.Net.Http.Headers;
-
-namespace DiscordChatExporter.Core.Discord
-{
-    public record AuthToken(AuthTokenKind Kind, string Value)
-    {
-        public AuthenticationHeaderValue GetAuthenticationHeader() => Kind switch
-        {
-            AuthTokenKind.Bot => new AuthenticationHeaderValue("Bot", Value),
-            _ => new AuthenticationHeaderValue(Value)
-        };
-    }
-}

DiscordChatExporter.Core/Discord/AuthTokenKind.cs

@@ -1,8 +0,0 @@
-namespace DiscordChatExporter.Core.Discord
-{
-    public enum AuthTokenKind
-    {
-        User,
-        Bot
-    }
-}

DiscordChatExporter.Core/Discord/Data/Attachment.cs

@@ -6,13 +6,14 @@ using DiscordChatExporter.Core.Utils;
 using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
 
-namespace DiscordChatExporter.Core.Discord.Data
+namespace DiscordChatExporter.Core.Discord.Data;
-{
+
 // https://discord.com/developers/docs/resources/channel#attachment-object
 public partial record Attachment(
     Snowflake Id,
     string Url,
     string FileName,
+    string? Description,
     int? Width,
     int? Height,
     FileSize FileSize) : IHasId
@@ -34,12 +35,12 @@ namespace DiscordChatExporter.Core.Discord.Data
     {
         var id = json.GetProperty("id").GetNonWhiteSpaceString().Pipe(Snowflake.Parse);
         var url = json.GetProperty("url").GetNonWhiteSpaceString();
-            var width = json.GetPropertyOrNull("width")?.GetInt32();
+        var width = json.GetPropertyOrNull("width")?.GetInt32OrNull();
-            var height = json.GetPropertyOrNull("height")?.GetInt32();
+        var height = json.GetPropertyOrNull("height")?.GetInt32OrNull();
-            var fileName = json.GetProperty("filename").GetNonWhiteSpaceString();
+        var fileName = json.GetProperty("filename").GetNonNullString();
+        var description = json.GetPropertyOrNull("description")?.GetNonWhiteSpaceStringOrNull();
         var fileSize = json.GetProperty("size").GetInt64().Pipe(FileSize.FromBytes);
 
-            return new Attachment(id, url, fileName, width, height, fileSize);
+        return new Attachment(id, url, fileName, description, width, height, fileSize);
-        }
     }
 }

DiscordChatExporter.Core/Discord/Data/Channel.cs

@@ -4,8 +4,8 @@ using DiscordChatExporter.Core.Discord.Data.Common;
 using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
 
-namespace DiscordChatExporter.Core.Discord.Data
+namespace DiscordChatExporter.Core.Discord.Data;
-{
+
 // https://discord.com/developers/docs/resources/channel#channel-object
 public partial record Channel(
     Snowflake Id,
@@ -42,31 +42,37 @@ namespace DiscordChatExporter.Core.Discord.Data
         null
     );
 
-        public static Channel Parse(JsonElement json, ChannelCategory? category = null, int? position = null)
+    public static Channel Parse(JsonElement json, ChannelCategory? category = null, int? positionHint = null)
     {
         var id = json.GetProperty("id").GetNonWhiteSpaceString().Pipe(Snowflake.Parse);
-            var guildId = json.GetPropertyOrNull("guild_id")?.GetNonWhiteSpaceString().Pipe(Snowflake.Parse);
+        var guildId = json.GetPropertyOrNull("guild_id")?.GetNonWhiteSpaceStringOrNull()?.Pipe(Snowflake.Parse);
         var topic = json.GetPropertyOrNull("topic")?.GetStringOrNull();
         var kind = (ChannelKind)json.GetProperty("type").GetInt32();
 
         var name =
             // Guild channel
-                json.GetPropertyOrNull("name")?.GetStringOrNull() ??
+            json.GetPropertyOrNull("name")?.GetNonWhiteSpaceStringOrNull() ??
+
             // DM channel
-                json.GetPropertyOrNull("recipients")?.EnumerateArray().Select(User.Parse).Select(u => u.Name)
+            json.GetPropertyOrNull("recipients")?
+                .EnumerateArrayOrNull()?
+                .Select(User.Parse)
+                .Select(u => u.Name)
                 .Pipe(s => string.Join(", ", s)) ??
+
             // Fallback
             id.ToString();
 
+        var position = positionHint ?? json.GetPropertyOrNull("position")?.GetInt32OrNull();
+
         return new Channel(
             id,
             kind,
             guildId ?? Guild.DirectMessages.Id,
             category ?? GetFallbackCategory(kind),
             name,
-                position ?? json.GetPropertyOrNull("position")?.GetInt32(),
+            position,
             topic
         );
     }
 }
-}

DiscordChatExporter.Core/Discord/Data/ChannelCategory.cs

@@ -3,25 +3,21 @@ using DiscordChatExporter.Core.Discord.Data.Common;
 using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
 
-namespace DiscordChatExporter.Core.Discord.Data
+namespace DiscordChatExporter.Core.Discord.Data;
-{
+
 public record ChannelCategory(Snowflake Id, string Name, int? Position) : IHasId
 {
     public static ChannelCategory Unknown { get; } = new(Snowflake.Zero, "<unknown category>", 0);
 
-        public static ChannelCategory Parse(JsonElement json, int? position = null)
+    public static ChannelCategory Parse(JsonElement json, int? positionHint = null)
     {
         var id = json.GetProperty("id").GetNonWhiteSpaceString().Pipe(Snowflake.Parse);
+        var position = positionHint ?? json.GetPropertyOrNull("position")?.GetInt32OrNull();
 
         var name =
-                json.GetPropertyOrNull("name")?.GetStringOrNull() ??
+            json.GetPropertyOrNull("name")?.GetNonWhiteSpaceStringOrNull() ??
             id.ToString();
 
-            return new ChannelCategory(
+        return new ChannelCategory(id, name, position);
-                id,
-                name,
-                position ?? json.GetPropertyOrNull("position")?.GetInt32()
-            );
-        }
     }
 }

DiscordChatExporter.Core/Discord/Data/ChannelKind.cs

@@ -1,5 +1,5 @@
-namespace DiscordChatExporter.Core.Discord.Data
+namespace DiscordChatExporter.Core.Discord.Data;
-{
+
 // https://discord.com/developers/docs/resources/channel#channel-object-channel-types
 // Order of enum fields needs to match the order in the docs.
 public enum ChannelKind
@@ -12,4 +12,3 @@
     GuildNews,
     GuildStore
 }
-}

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

@@ -1,8 +1,8 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 
-namespace DiscordChatExporter.Core.Discord.Data.Common
+namespace DiscordChatExporter.Core.Discord.Data.Common;
-{
+
 // Loosely based on https://github.com/omar/ByteSize (MIT license)
 public readonly partial record struct FileSize(long TotalBytes)
 {
@@ -46,4 +46,3 @@ namespace DiscordChatExporter.Core.Discord.Data.Common
 {
     public static FileSize FromBytes(long bytes) => new(bytes);
 }
-}

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

@@ -1,7 +1,6 @@
-namespace DiscordChatExporter.Core.Discord.Data.Common
+namespace DiscordChatExporter.Core.Discord.Data.Common;
-{
+
 public interface IHasId
 {
     Snowflake Id { get; }
 }
-}

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

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 
-namespace DiscordChatExporter.Core.Discord.Data.Common
+namespace DiscordChatExporter.Core.Discord.Data.Common;
-{
+
 public class IdBasedEqualityComparer : IEqualityComparer<IHasId>
 {
     public static IdBasedEqualityComparer Instance { get; } = new();
@@ -10,4 +10,3 @@ namespace DiscordChatExporter.Core.Discord.Data.Common
 
     public int GetHashCode(IHasId obj) => obj.Id.GetHashCode();
 }
-}

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

@@ -6,8 +6,8 @@ using System.Text.Json;
 using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
 
-namespace DiscordChatExporter.Core.Discord.Data.Embeds
+namespace DiscordChatExporter.Core.Discord.Data.Embeds;
-{
+
 // https://discord.com/developers/docs/resources/channel#embed-object
 public partial record Embed(
     string? Title,
@@ -36,9 +36,9 @@ namespace DiscordChatExporter.Core.Discord.Data.Embeds
     public static Embed Parse(JsonElement json)
     {
         var title = json.GetPropertyOrNull("title")?.GetStringOrNull();
-            var url = json.GetPropertyOrNull("url")?.GetStringOrNull();
+        var url = json.GetPropertyOrNull("url")?.GetNonWhiteSpaceStringOrNull();
         var timestamp = json.GetPropertyOrNull("timestamp")?.GetDateTimeOffset();
-            var color = json.GetPropertyOrNull("color")?.GetInt32().Pipe(System.Drawing.Color.FromArgb).ResetAlpha();
+        var color = json.GetPropertyOrNull("color")?.GetInt32OrNull()?.Pipe(System.Drawing.Color.FromArgb).ResetAlpha();
         var description = json.GetPropertyOrNull("description")?.GetStringOrNull();
 
         var author = json.GetPropertyOrNull("author")?.Pipe(EmbedAuthor.Parse);
@@ -47,7 +47,7 @@ namespace DiscordChatExporter.Core.Discord.Data.Embeds
         var footer = json.GetPropertyOrNull("footer")?.Pipe(EmbedFooter.Parse);
 
         var fields =
-                json.GetPropertyOrNull("fields")?.EnumerateArray().Select(EmbedField.Parse).ToArray() ??
+            json.GetPropertyOrNull("fields")?.EnumerateArrayOrNull()?.Select(EmbedField.Parse).ToArray() ??
             Array.Empty<EmbedField>();
 
         return new Embed(
@@ -64,4 +64,3 @@ namespace DiscordChatExporter.Core.Discord.Data.Embeds
         );
     }
 }
-}

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

@@ -1,8 +1,8 @@
 using System.Text.Json;
 using JsonExtensions.Reading;
 
-namespace DiscordChatExporter.Core.Discord.Data.Embeds
+namespace DiscordChatExporter.Core.Discord.Data.Embeds;
-{
+
 // https://discord.com/developers/docs/resources/channel#embed-object-embed-author-structure
 public record EmbedAuthor(
     string? Name,
@@ -13,11 +13,10 @@ namespace DiscordChatExporter.Core.Discord.Data.Embeds
     public static EmbedAuthor Parse(JsonElement json)
     {
         var name = json.GetPropertyOrNull("name")?.GetStringOrNull();
-            var url = json.GetPropertyOrNull("url")?.GetStringOrNull();
+        var url = json.GetPropertyOrNull("url")?.GetNonWhiteSpaceStringOrNull();
-            var iconUrl = json.GetPropertyOrNull("icon_url")?.GetStringOrNull();
+        var iconUrl = json.GetPropertyOrNull("icon_url")?.GetNonWhiteSpaceStringOrNull();
-            var iconProxyUrl = json.GetPropertyOrNull("proxy_icon_url")?.GetStringOrNull();
+        var iconProxyUrl = json.GetPropertyOrNull("proxy_icon_url")?.GetNonWhiteSpaceStringOrNull();
 
         return new EmbedAuthor(name, url, iconUrl, iconProxyUrl);
     }
 }
-}

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

@@ -1,9 +1,8 @@
 using System.Text.Json;
-using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
 
-namespace DiscordChatExporter.Core.Discord.Data.Embeds
+namespace DiscordChatExporter.Core.Discord.Data.Embeds;
-{
+
 // https://discord.com/developers/docs/resources/channel#embed-object-embed-field-structure
 public record EmbedField(
     string Name,
@@ -12,11 +11,10 @@ namespace DiscordChatExporter.Core.Discord.Data.Embeds
 {
     public static EmbedField Parse(JsonElement json)
     {
-            var name = json.GetProperty("name").GetNonWhiteSpaceString();
+        var name = json.GetProperty("name").GetNonNullString();
-            var value = json.GetProperty("value").GetNonWhiteSpaceString();
+        var value = json.GetProperty("value").GetNonNullString();
-            var isInline = json.GetPropertyOrNull("inline")?.GetBoolean() ?? false;
+        var isInline = json.GetPropertyOrNull("inline")?.GetBooleanOrNull() ?? false;
 
         return new EmbedField(name, value, isInline);
     }
 }
-}

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

@@ -1,9 +1,8 @@
 using System.Text.Json;
-using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
 
-namespace DiscordChatExporter.Core.Discord.Data.Embeds
+namespace DiscordChatExporter.Core.Discord.Data.Embeds;
-{
+
 // https://discord.com/developers/docs/resources/channel#embed-object-embed-footer-structure
 public record EmbedFooter(
     string Text,
@@ -12,11 +11,10 @@ namespace DiscordChatExporter.Core.Discord.Data.Embeds
 {
     public static EmbedFooter Parse(JsonElement json)
     {
-            var text = json.GetProperty("text").GetNonWhiteSpaceString();
+        var text = json.GetProperty("text").GetNonNullString();
-            var iconUrl = json.GetPropertyOrNull("icon_url")?.GetStringOrNull();
+        var iconUrl = json.GetPropertyOrNull("icon_url")?.GetNonWhiteSpaceStringOrNull();
-            var iconProxyUrl = json.GetPropertyOrNull("proxy_icon_url")?.GetStringOrNull();
+        var iconProxyUrl = json.GetPropertyOrNull("proxy_icon_url")?.GetNonWhiteSpaceStringOrNull();
 
         return new EmbedFooter(text, iconUrl, iconProxyUrl);
     }
 }
-}

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

@@ -1,8 +1,8 @@
 using System.Text.Json;
 using JsonExtensions.Reading;
 
-namespace DiscordChatExporter.Core.Discord.Data.Embeds
+namespace DiscordChatExporter.Core.Discord.Data.Embeds;
-{
+
 // https://discord.com/developers/docs/resources/channel#embed-object-embed-image-structure
 public record EmbedImage(
     string? Url,
@@ -12,12 +12,11 @@ namespace DiscordChatExporter.Core.Discord.Data.Embeds
 {
     public static EmbedImage Parse(JsonElement json)
     {
-            var url = json.GetPropertyOrNull("url")?.GetStringOrNull();
+        var url = json.GetPropertyOrNull("url")?.GetNonWhiteSpaceStringOrNull();
-            var proxyUrl = json.GetPropertyOrNull("proxy_url")?.GetStringOrNull();
+        var proxyUrl = json.GetPropertyOrNull("proxy_url")?.GetNonWhiteSpaceStringOrNull();
-            var width = json.GetPropertyOrNull("width")?.GetInt32();
+        var width = json.GetPropertyOrNull("width")?.GetInt32OrNull();
-            var height = json.GetPropertyOrNull("height")?.GetInt32();
+        var height = json.GetPropertyOrNull("height")?.GetInt32OrNull();
 
         return new EmbedImage(url, proxyUrl, width, height);
     }
 }
-}

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

@@ -3,8 +3,8 @@ using System.Linq;
 using System.Text.RegularExpressions;
 using DiscordChatExporter.Core.Utils;
 
-namespace DiscordChatExporter.Core.Discord.Data.Embeds
+namespace DiscordChatExporter.Core.Discord.Data.Embeds;
-{
+
 public record PlainImageEmbedProjection(string Url)
 {
     public static PlainImageEmbedProjection? TryResolve(Embed embed)
@@ -31,4 +31,3 @@ namespace DiscordChatExporter.Core.Discord.Data.Embeds
         return new PlainImageEmbedProjection(embed.Url);
     }
 }
-}

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

@@ -1,7 +1,7 @@
 using System.Text.RegularExpressions;
 
-namespace DiscordChatExporter.Core.Discord.Data.Embeds
+namespace DiscordChatExporter.Core.Discord.Data.Embeds;
-{
+
 public partial record SpotifyTrackEmbedProjection(string TrackId)
 {
     public string Url => $"https://open.spotify.com/embed/track/{TrackId}";
@@ -31,4 +31,3 @@ namespace DiscordChatExporter.Core.Discord.Data.Embeds
         return new SpotifyTrackEmbedProjection(trackId);
     }
 }
-}

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

@@ -1,7 +1,7 @@
 using System.Text.RegularExpressions;
 
-namespace DiscordChatExporter.Core.Discord.Data.Embeds
+namespace DiscordChatExporter.Core.Discord.Data.Embeds;
-{
+
 public partial record YouTubeVideoEmbedProjection(string VideoId)
 {
     public string Url => $"https://www.youtube.com/embed/{VideoId}";
@@ -46,4 +46,3 @@ namespace DiscordChatExporter.Core.Discord.Data.Embeds
         return new YouTubeVideoEmbedProjection(videoId);
     }
 }
-}

DiscordChatExporter.Core/Discord/Data/Emoji.cs

@@ -1,22 +1,23 @@
-using System.Linq;
+using System;
+using System.Linq;
 using System.Text.Json;
 using DiscordChatExporter.Core.Utils;
 using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
 
-namespace DiscordChatExporter.Core.Discord.Data
+namespace DiscordChatExporter.Core.Discord.Data;
-{
+
 // https://discord.com/developers/docs/resources/emoji#emoji-object
 public partial record Emoji(
     // Only present on custom emoji
-        string? Id,
+    Snowflake? Id,
     // Name of custom emoji (e.g. LUL) or actual representation of standard emoji (e.g. 🙂)
     string Name,
     bool IsAnimated,
     string ImageUrl)
 {
     // Name of custom emoji (e.g. LUL) or name of standard emoji (e.g. slight_smile)
-        public string Code => !string.IsNullOrWhiteSpace(Id)
+    public string Code => Id is not null
         ? Name
         : EmojiIndex.TryGetCode(Name) ?? Name;
 }
@@ -31,30 +32,41 @@ namespace DiscordChatExporter.Core.Discord.Data
             .Select(r => r.Value.ToString("x"))
     );
 
-        public static string GetImageUrl(string? id, string name, bool isAnimated)
+    private static string GetImageUrl(Snowflake id, bool isAnimated) => isAnimated
-        {
-            // Custom emoji
-            if (!string.IsNullOrWhiteSpace(id))
-            {
-                return isAnimated
         ? $"https://cdn.discordapp.com/emojis/{id}.gif"
         : $"https://cdn.discordapp.com/emojis/{id}.png";
-            }
+
+    private static string GetImageUrl(string name) =>
+        $"https://twemoji.maxcdn.com/2/svg/{GetTwemojiName(name)}.svg";
+
+    public static string GetImageUrl(Snowflake? id, string? name, bool isAnimated)
+    {
+        // Custom emoji
+        if (id is not null)
+            return GetImageUrl(id.Value, isAnimated);
 
         // Standard emoji
-            var twemojiName = GetTwemojiName(name);
+        if (!string.IsNullOrWhiteSpace(name))
-            return $"https://twemoji.maxcdn.com/2/svg/{twemojiName}.svg";
+            return GetImageUrl(name);
+
+        // Either ID or name should be set
+        throw new ApplicationException("Emoji has neither ID nor name set.");
     }
 
     public static Emoji Parse(JsonElement json)
     {
-            var id = json.GetPropertyOrNull("id")?.GetNonWhiteSpaceString();
+        var id = json.GetPropertyOrNull("id")?.GetNonWhiteSpaceStringOrNull()?.Pipe(Snowflake.Parse);
-            var name = json.GetProperty("name").GetNonWhiteSpaceString();
+        var name = json.GetPropertyOrNull("name")?.GetNonWhiteSpaceStringOrNull();
-            var isAnimated = json.GetPropertyOrNull("animated")?.GetBoolean() ?? false;
+        var isAnimated = json.GetPropertyOrNull("animated")?.GetBooleanOrNull() ?? false;
 
         var imageUrl = GetImageUrl(id, name, isAnimated);
 
-            return new Emoji(id, name, isAnimated, imageUrl);
+        return new Emoji(
-        }
+            id,
+            // Name may be missing if it's an emoji inside a reaction
+            name ?? "<unknown emoji>",
+            isAnimated,
+            imageUrl
+        );
     }
 }

DiscordChatExporter.Core/Discord/Data/Guild.cs

@@ -3,8 +3,8 @@ using DiscordChatExporter.Core.Discord.Data.Common;
 using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
 
-namespace DiscordChatExporter.Core.Discord.Data
+namespace DiscordChatExporter.Core.Discord.Data;
-{
+
 // https://discord.com/developers/docs/resources/guild#guild-object
 public record Guild(Snowflake Id, string Name, string IconUrl) : IHasId
 {
@@ -23,8 +23,8 @@ namespace DiscordChatExporter.Core.Discord.Data
     public static Guild Parse(JsonElement json)
     {
         var id = json.GetProperty("id").GetNonWhiteSpaceString().Pipe(Snowflake.Parse);
-            var name = json.GetProperty("name").GetNonWhiteSpaceString();
+        var name = json.GetProperty("name").GetNonNullString();
-            var iconHash = json.GetPropertyOrNull("icon")?.GetStringOrNull();
+        var iconHash = json.GetPropertyOrNull("icon")?.GetNonWhiteSpaceStringOrNull();
 
         var iconUrl = !string.IsNullOrWhiteSpace(iconHash)
             ? GetIconUrl(id, iconHash)
@@ -33,4 +33,3 @@ namespace DiscordChatExporter.Core.Discord.Data
         return new Guild(id, name, iconUrl);
     }
 }
-}

DiscordChatExporter.Core/Discord/Data/Member.cs

@@ -6,8 +6,8 @@ using DiscordChatExporter.Core.Discord.Data.Common;
 using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
 
-namespace DiscordChatExporter.Core.Discord.Data
+namespace DiscordChatExporter.Core.Discord.Data;
-{
+
 // https://discord.com/developers/docs/resources/guild#guild-member-object
 public partial record Member(
     User User,
@@ -28,7 +28,7 @@ namespace DiscordChatExporter.Core.Discord.Data
     public static Member Parse(JsonElement json)
     {
         var user = json.GetProperty("user").Pipe(User.Parse);
-            var nick = json.GetPropertyOrNull("nick")?.GetStringOrNull();
+        var nick = json.GetPropertyOrNull("nick")?.GetNonWhiteSpaceStringOrNull();
 
         var roleIds = json
             .GetPropertyOrNull("roles")?
@@ -44,4 +44,3 @@ namespace DiscordChatExporter.Core.Discord.Data
         );
     }
 }
-}

DiscordChatExporter.Core/Discord/Data/Message.cs

@@ -7,8 +7,8 @@ using DiscordChatExporter.Core.Discord.Data.Embeds;
 using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
 
-namespace DiscordChatExporter.Core.Discord.Data
+namespace DiscordChatExporter.Core.Discord.Data;
-{
+
 // https://discord.com/developers/docs/resources/channel#message-object
 public record Message(
     Snowflake Id,
@@ -21,6 +21,7 @@ namespace DiscordChatExporter.Core.Discord.Data
     string Content,
     IReadOnlyList<Attachment> Attachments,
     IReadOnlyList<Embed> Embeds,
+    IReadOnlyList<Sticker> Stickers,
     IReadOnlyList<Reaction> Reactions,
     IReadOnlyList<User> MentionedUsers,
     MessageReference? Reference,
@@ -35,7 +36,7 @@ namespace DiscordChatExporter.Core.Discord.Data
         var callEndedTimestamp = json.GetPropertyOrNull("call")?.GetPropertyOrNull("ended_timestamp")
             ?.GetDateTimeOffset();
         var kind = (MessageKind)json.GetProperty("type").GetInt32();
-            var isPinned = json.GetPropertyOrNull("pinned")?.GetBoolean() ?? false;
+        var isPinned = json.GetPropertyOrNull("pinned")?.GetBooleanOrNull() ?? false;
         var messageReference = json.GetPropertyOrNull("message_reference")?.Pipe(MessageReference.Parse);
         var referencedMessage = json.GetPropertyOrNull("referenced_message")?.Pipe(Parse);
 
@@ -53,19 +54,23 @@ namespace DiscordChatExporter.Core.Discord.Data
         };
 
         var attachments =
-                json.GetPropertyOrNull("attachments")?.EnumerateArray().Select(Attachment.Parse).ToArray() ??
+            json.GetPropertyOrNull("attachments")?.EnumerateArrayOrNull()?.Select(Attachment.Parse).ToArray() ??
             Array.Empty<Attachment>();
 
         var embeds =
-                json.GetPropertyOrNull("embeds")?.EnumerateArray().Select(Embed.Parse).ToArray() ??
+            json.GetPropertyOrNull("embeds")?.EnumerateArrayOrNull()?.Select(Embed.Parse).ToArray() ??
             Array.Empty<Embed>();
 
+        var stickers =
+            json.GetPropertyOrNull("sticker_items")?.EnumerateArrayOrNull()?.Select(Sticker.Parse).ToArray() ??
+            Array.Empty<Sticker>();
+
         var reactions =
-                json.GetPropertyOrNull("reactions")?.EnumerateArray().Select(Reaction.Parse).ToArray() ??
+            json.GetPropertyOrNull("reactions")?.EnumerateArrayOrNull()?.Select(Reaction.Parse).ToArray() ??
             Array.Empty<Reaction>();
 
         var mentionedUsers =
-                json.GetPropertyOrNull("mentions")?.EnumerateArray().Select(User.Parse).ToArray() ??
+            json.GetPropertyOrNull("mentions")?.EnumerateArrayOrNull()?.Select(User.Parse).ToArray() ??
             Array.Empty<User>();
 
         return new Message(
@@ -79,6 +84,7 @@ namespace DiscordChatExporter.Core.Discord.Data
             content,
             attachments,
             embeds,
+            stickers,
             reactions,
             mentionedUsers,
             messageReference,
@@ -86,4 +92,3 @@ namespace DiscordChatExporter.Core.Discord.Data
         );
     }
 }
-}

DiscordChatExporter.Core/Discord/Data/MessageKind.cs

@@ -1,5 +1,5 @@
-namespace DiscordChatExporter.Core.Discord.Data
+namespace DiscordChatExporter.Core.Discord.Data;
-{
+
 // https://discord.com/developers/docs/resources/channel#message-object-message-types
 public enum MessageKind
 {
@@ -13,4 +13,3 @@
     GuildMemberJoin = 7,
     Reply = 19
 }
-}

DiscordChatExporter.Core/Discord/Data/MessageReference.cs

@@ -2,18 +2,17 @@ using System.Text.Json;
 using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
 
-namespace DiscordChatExporter.Core.Discord.Data
+namespace DiscordChatExporter.Core.Discord.Data;
-{
+
 // https://discord.com/developers/docs/resources/channel#message-object-message-reference-structure
 public record MessageReference(Snowflake? MessageId, Snowflake? ChannelId, Snowflake? GuildId)
 {
     public static MessageReference Parse(JsonElement json)
     {
-            var messageId = json.GetPropertyOrNull("message_id")?.GetStringOrNull()?.Pipe(Snowflake.Parse);
+        var messageId = json.GetPropertyOrNull("message_id")?.GetNonWhiteSpaceStringOrNull()?.Pipe(Snowflake.Parse);
-            var channelId = json.GetPropertyOrNull("channel_id")?.GetStringOrNull()?.Pipe(Snowflake.Parse);
+        var channelId = json.GetPropertyOrNull("channel_id")?.GetNonWhiteSpaceStringOrNull()?.Pipe(Snowflake.Parse);
-            var guildId = json.GetPropertyOrNull("guild_id")?.GetStringOrNull()?.Pipe(Snowflake.Parse);
+        var guildId = json.GetPropertyOrNull("guild_id")?.GetNonWhiteSpaceStringOrNull()?.Pipe(Snowflake.Parse);
 
         return new MessageReference(messageId, channelId, guildId);
     }
 }
-}

DiscordChatExporter.Core/Discord/Data/Reaction.cs

@@ -1,8 +1,8 @@
 using System.Text.Json;
 using DiscordChatExporter.Core.Utils.Extensions;
 
-namespace DiscordChatExporter.Core.Discord.Data
+namespace DiscordChatExporter.Core.Discord.Data;
-{
+
 // https://discord.com/developers/docs/resources/channel#reaction-object
 public record Reaction(Emoji Emoji, int Count)
 {
@@ -14,4 +14,3 @@ namespace DiscordChatExporter.Core.Discord.Data
         return new Reaction(emoji, count);
     }
 }
-}

DiscordChatExporter.Core/Discord/Data/Role.cs

@@ -4,15 +4,15 @@ using DiscordChatExporter.Core.Discord.Data.Common;
 using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
 
-namespace DiscordChatExporter.Core.Discord.Data
+namespace DiscordChatExporter.Core.Discord.Data;
-{
+
 // https://discord.com/developers/docs/topics/permissions#role-object
 public record Role(Snowflake Id, string Name, int Position, Color? Color) : IHasId
 {
     public static Role Parse(JsonElement json)
     {
         var id = json.GetProperty("id").GetNonWhiteSpaceString().Pipe(Snowflake.Parse);
-            var name = json.GetProperty("name").GetNonWhiteSpaceString();
+        var name = json.GetProperty("name").GetNonNullString();
         var position = json.GetProperty("position").GetInt32();
 
         var color = json
@@ -25,4 +25,3 @@ namespace DiscordChatExporter.Core.Discord.Data
         return new Role(id, name, position, color);
     }
 }
-}

DiscordChatExporter.Core/Discord/Data/Sticker.cs

@@ -0,0 +1,25 @@
+using System.Text.Json;
+using DiscordChatExporter.Core.Utils.Extensions;
+using JsonExtensions.Reading;
+
+namespace DiscordChatExporter.Core.Discord.Data;
+
+public record Sticker(Snowflake Id, string Name, StickerFormat Format, string SourceUrl)
+{
+    private static string GetSourceUrl(Snowflake id, StickerFormat format)
+    {
+        var extension = format == StickerFormat.Lottie ? "json" : "png";
+        return $"https://discord.com/stickers/{id}.{extension}";
+    }
+
+    public static Sticker Parse(JsonElement json)
+    {
+        var id = json.GetProperty("id").GetNonWhiteSpaceString().Pipe(Snowflake.Parse);
+        var name = json.GetProperty("name").GetNonWhiteSpaceString();
+        var format = (StickerFormat)json.GetProperty("format_type").GetInt32();
+
+        var sourceUrl = GetSourceUrl(id, format);
+
+        return new Sticker(id, name, format, sourceUrl);
+    }
+}

DiscordChatExporter.Core/Discord/Data/StickerFormat.cs

@@ -0,0 +1,8 @@
+namespace DiscordChatExporter.Core.Discord.Data;
+
+public enum StickerFormat
+{
+    Png = 1,
+    PngAnimated = 2,
+    Lottie = 3
+}

DiscordChatExporter.Core/Discord/Data/User.cs

@@ -4,8 +4,8 @@ using DiscordChatExporter.Core.Discord.Data.Common;
 using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
 
-namespace DiscordChatExporter.Core.Discord.Data
+namespace DiscordChatExporter.Core.Discord.Data;
-{
+
 // https://discord.com/developers/docs/resources/user#user-object
 public partial record User(
     Snowflake Id,
@@ -30,16 +30,16 @@ namespace DiscordChatExporter.Core.Discord.Data
             ? "gif"
             : "png";
 
-            return $"https://cdn.discordapp.com/avatars/{id}/{avatarHash}.{extension}?size=128";
+        return $"https://cdn.discordapp.com/avatars/{id}/{avatarHash}.{extension}?size=512";
     }
 
     public static User Parse(JsonElement json)
     {
         var id = json.GetProperty("id").GetNonWhiteSpaceString().Pipe(Snowflake.Parse);
-            var isBot = json.GetPropertyOrNull("bot")?.GetBoolean() ?? false;
+        var isBot = json.GetPropertyOrNull("bot")?.GetBooleanOrNull() ?? false;
         var discriminator = json.GetProperty("discriminator").GetNonWhiteSpaceString().Pipe(int.Parse);
-            var name = json.GetProperty("username").GetNonWhiteSpaceString();
+        var name = json.GetProperty("username").GetNonNullString();
-            var avatarHash = json.GetPropertyOrNull("avatar")?.GetStringOrNull();
+        var avatarHash = json.GetPropertyOrNull("avatar")?.GetNonWhiteSpaceStringOrNull();
 
         var avatarUrl = !string.IsNullOrWhiteSpace(avatarHash)
             ? GetAvatarUrl(id, avatarHash)
@@ -48,4 +48,3 @@ namespace DiscordChatExporter.Core.Discord.Data
         return new User(id, isBot, discriminator, name, avatarUrl);
     }
 }
-}

DiscordChatExporter.Core/Discord/DiscordClient.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
+using System.Net.Http.Headers;
 using System.Runtime.CompilerServices;
 using System.Text.Json;
 using System.Threading;
@@ -11,17 +12,41 @@ using DiscordChatExporter.Core.Discord.Data;
 using DiscordChatExporter.Core.Exceptions;
 using DiscordChatExporter.Core.Utils;
 using DiscordChatExporter.Core.Utils.Extensions;
+using Gress;
 using JsonExtensions.Http;
 using JsonExtensions.Reading;
 
-namespace DiscordChatExporter.Core.Discord
+namespace DiscordChatExporter.Core.Discord;
-{
+
 public class DiscordClient
 {
-        private readonly AuthToken _token;
+    private readonly string _token;
-        private readonly Uri _baseUri = new("https://discord.com/api/v8/", UriKind.Absolute);
+    private readonly Uri _baseUri = new("https://discord.com/api/v9/", UriKind.Absolute);
 
-        public DiscordClient(AuthToken token) => _token = token;
+    private TokenKind _tokenKind = TokenKind.Unknown;
+
+    public DiscordClient(string token) => _token = token;
+
+    private async ValueTask<HttpResponseMessage> GetResponseAsync(
+        string url,
+        bool isBot,
+        CancellationToken cancellationToken = default)
+    {
+        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
+        );
+
+        return await Http.Client.SendAsync(
+            request,
+            HttpCompletionOption.ResponseHeadersRead,
+            cancellationToken
+        );
+    }
 
     private async ValueTask<HttpResponseMessage> GetResponseAsync(
         string url,
@@ -29,14 +54,33 @@ namespace DiscordChatExporter.Core.Discord
     {
         return await Http.ResponsePolicy.ExecuteAsync(async innerCancellationToken =>
         {
-                using var request = new HttpRequestMessage(HttpMethod.Get, new Uri(_baseUri, url));
+            if (_tokenKind == TokenKind.User)
-                request.Headers.Authorization = _token.GetAuthenticationHeader();
+                return await GetResponseAsync(url, false, innerCancellationToken);
 
-                return await Http.Client.SendAsync(
+            if (_tokenKind == TokenKind.Bot)
-                    request,
+                return await GetResponseAsync(url, true, innerCancellationToken);
-                    HttpCompletionOption.ResponseHeadersRead,
+
-                    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);
     }
 
@@ -142,7 +186,7 @@ namespace DiscordChatExporter.Core.Discord
 
             foreach (var channelJson in responseOrdered)
             {
-                    var parentId = channelJson.GetPropertyOrNull("parent_id")?.GetStringOrNull();
+                var parentId = channelJson.GetPropertyOrNull("parent_id")?.GetNonWhiteSpaceStringOrNull();
 
                 var category = !string.IsNullOrWhiteSpace(parentId)
                     ? categories.GetValueOrDefault(parentId)
@@ -205,7 +249,7 @@ namespace DiscordChatExporter.Core.Discord
     {
         var response = await GetJsonResponseAsync($"channels/{channelId}", cancellationToken);
 
-            var parentId = response.GetPropertyOrNull("parent_id")?.GetStringOrNull()?.Pipe(Snowflake.Parse);
+        var parentId = response.GetPropertyOrNull("parent_id")?.GetNonWhiteSpaceStringOrNull()?.Pipe(Snowflake.Parse);
 
         var category = parentId is not null
             ? await GetChannelCategoryAsync(parentId.Value, cancellationToken)
@@ -233,7 +277,7 @@ namespace DiscordChatExporter.Core.Discord
         Snowflake channelId,
         Snowflake? after = null,
         Snowflake? before = null,
-            IProgress<double>? progress = null,
+        IProgress<Percentage>? progress = null,
         [EnumeratorCancellation] CancellationToken cancellationToken = default)
     {
         // Get the last message in the specified range.
@@ -282,16 +326,13 @@ namespace DiscordChatExporter.Core.Discord
                     var exportedDuration = (message.Timestamp - firstMessage.Timestamp).Duration();
                     var totalDuration = (lastMessage.Timestamp - firstMessage.Timestamp).Duration();
 
-                        if (totalDuration > TimeSpan.Zero)
+                    progress.Report(Percentage.FromFraction(
-                        {
-                            progress.Report(exportedDuration / totalDuration);
-                        }
                         // Avoid division by zero if all messages have the exact same timestamp
                         // (which may be the case if there's only one message in the channel)
-                        else
+                        totalDuration > TimeSpan.Zero
-                        {
+                            ? exportedDuration / totalDuration
-                            progress.Report(1);
+                            : 1
-                        }
+                    ));
                 }
 
                 yield return message;
@@ -300,4 +341,3 @@ namespace DiscordChatExporter.Core.Discord
         }
     }
 }
-}

DiscordChatExporter.Core/Discord/Snowflake.cs

@@ -3,8 +3,8 @@ using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Text.RegularExpressions;
 
-namespace DiscordChatExporter.Core.Discord
+namespace DiscordChatExporter.Core.Discord;
-{
+
 public readonly partial record struct Snowflake(ulong Value)
 {
     public DateTimeOffset ToDate() => DateTimeOffset.FromUnixTimeMilliseconds(
@@ -53,4 +53,3 @@ namespace DiscordChatExporter.Core.Discord
 {
     public int CompareTo(Snowflake other) => Value.CompareTo(other.Value);
 }
-}

DiscordChatExporter.Core/Discord/TokenKind.cs

@@ -0,0 +1,8 @@
+namespace DiscordChatExporter.Core.Discord;
+
+public enum TokenKind
+{
+    Unknown,
+    User,
+    Bot
+}

DiscordChatExporter.Core/DiscordChatExporter.Core.csproj

@@ -5,9 +5,10 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Gress" Version="2.0.1" />
     <PackageReference Include="JsonExtensions" Version="1.2.0" />
-    <PackageReference Include="MiniRazor.CodeGen" Version="2.2.0" />
+    <PackageReference Include="MiniRazor.CodeGen" Version="2.2.1" />
-    <PackageReference Include="Polly" Version="7.2.2" />
+    <PackageReference Include="Polly" Version="7.2.3" />
     <PackageReference Include="Superpower" Version="3.0.0" />
   </ItemGroup>
 

DiscordChatExporter.Core/Exceptions/DiscordChatExporterException.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Net.Http;
 
-namespace DiscordChatExporter.Core.Exceptions
+namespace DiscordChatExporter.Core.Exceptions;
-{
+
 public partial class DiscordChatExporterException : Exception
 {
     public bool IsFatal { get; }
@@ -42,4 +42,3 @@ Failed to perform an HTTP request.
     internal static DiscordChatExporterException ChannelIsEmpty() =>
         new("No messages found for the specified period.");
 }
-}

DiscordChatExporter.Core/Exporting/ChannelExporter.cs

@@ -8,20 +8,19 @@ using DiscordChatExporter.Core.Discord.Data;
 using DiscordChatExporter.Core.Discord.Data.Common;
 using DiscordChatExporter.Core.Exceptions;
 using DiscordChatExporter.Core.Utils.Extensions;
+using Gress;
+
+namespace DiscordChatExporter.Core.Exporting;
 
-namespace DiscordChatExporter.Core.Exporting
-{
 public class ChannelExporter
 {
     private readonly DiscordClient _discord;
 
     public ChannelExporter(DiscordClient discord) => _discord = discord;
 
-        public ChannelExporter(AuthToken token) : this(new DiscordClient(token)) {}
-
     public async ValueTask ExportChannelAsync(
         ExportRequest request,
-            IProgress<double>? progress = null,
+        IProgress<Percentage>? progress = null,
         CancellationToken cancellationToken = default)
     {
         // Build context
@@ -80,4 +79,3 @@ namespace DiscordChatExporter.Core.Exporting
             throw DiscordChatExporterException.ChannelIsEmpty();
     }
 }
-}

DiscordChatExporter.Core/Exporting/ExportContext.cs

@@ -10,8 +10,8 @@ using DiscordChatExporter.Core.Discord;
 using DiscordChatExporter.Core.Discord.Data;
 using DiscordChatExporter.Core.Utils.Extensions;
 
-namespace DiscordChatExporter.Core.Exporting
+namespace DiscordChatExporter.Core.Exporting;
-{
+
 internal class ExportContext
 {
     private readonly MediaDownloader _mediaDownloader;
@@ -103,4 +103,3 @@ namespace DiscordChatExporter.Core.Exporting
         }
     }
 }
-}

DiscordChatExporter.Core/Exporting/ExportFormat.cs

@@ -1,7 +1,7 @@
 using System;
 
-namespace DiscordChatExporter.Core.Exporting
+namespace DiscordChatExporter.Core.Exporting;
-{
+
 public enum ExportFormat
 {
     PlainText,
@@ -33,4 +33,3 @@ namespace DiscordChatExporter.Core.Exporting
         _ => throw new ArgumentOutOfRangeException(nameof(format))
     };
 }
-}

DiscordChatExporter.Core/Exporting/ExportRequest.cs

@@ -1,5 +1,4 @@
-using System;
+using System.IO;
-using System.IO;
 using System.Text;
 using System.Text.RegularExpressions;
 using DiscordChatExporter.Core.Discord;
@@ -8,8 +7,8 @@ using DiscordChatExporter.Core.Exporting.Filtering;
 using DiscordChatExporter.Core.Exporting.Partitioning;
 using DiscordChatExporter.Core.Utils;
 
-namespace DiscordChatExporter.Core.Exporting
+namespace DiscordChatExporter.Core.Exporting;
-{
+
 public partial record ExportRequest(
     Guild Guild,
     Channel Channel,
@@ -48,10 +47,9 @@ namespace DiscordChatExporter.Core.Exporting
         Snowflake? after = null,
         Snowflake? before = null)
     {
-
         // Formats path
         outputPath = Regex.Replace(outputPath, "%.", m =>
-                PathEx.EscapePath(m.Value switch
+            PathEx.EscapeFileName(m.Value switch
             {
                 "%g" => guild.Id.ToString(),
                 "%G" => guild.Name,
@@ -61,8 +59,8 @@ namespace DiscordChatExporter.Core.Exporting
                 "%C" => channel.Name,
                 "%p" => channel.Position?.ToString() ?? "0",
                 "%P" => channel.Category.Position?.ToString() ?? "0",
-                    "%a" => (after ?? Snowflake.Zero).ToDate().ToString("yyyy-MM-dd"),
+                "%a" => after?.ToDate().ToString("yyyy-MM-dd") ?? "",
-                    "%b" => (before?.ToDate() ?? DateTime.Now).ToString("yyyy-MM-dd"),
+                "%b" => before?.ToDate().ToString("yyyy-MM-dd") ?? "",
                 "%%" => "%",
                 _ => m.Value
             })
@@ -94,7 +92,7 @@ namespace DiscordChatExporter.Core.Exporting
         // Date range
         if (after is not null || before is not null)
         {
-                buffer.Append(" (");
+            buffer.Append(' ').Append('(');
 
             // Both 'after' and 'before' are set
             if (after is not null && before is not null)
@@ -112,16 +110,12 @@ namespace DiscordChatExporter.Core.Exporting
                 buffer.Append($"before {before.Value.ToDate():yyyy-MM-dd}");
             }
 
-                buffer.Append(")");
+            buffer.Append(')');
         }
 
         // File extension
-            buffer.Append($".{format.GetFileExtension()}");
+        buffer.Append('.').Append(format.GetFileExtension());
 
-            // Replace invalid chars
+        return PathEx.EscapeFileName(buffer.ToString());
-            PathEx.EscapePath(buffer);
-
-            return buffer.ToString();
-        }
     }
 }

DiscordChatExporter.Core/Exporting/Filtering/BinaryExpressionKind.cs

@@ -1,8 +1,7 @@
-namespace DiscordChatExporter.Core.Exporting.Filtering
+namespace DiscordChatExporter.Core.Exporting.Filtering;
-{
+
 internal enum BinaryExpressionKind
 {
     Or,
     And
 }
-}

DiscordChatExporter.Core/Exporting/Filtering/BinaryExpressionMessageFilter.cs

@@ -1,8 +1,8 @@
 using System;
 using DiscordChatExporter.Core.Discord.Data;
 
-namespace DiscordChatExporter.Core.Exporting.Filtering
+namespace DiscordChatExporter.Core.Exporting.Filtering;
-{
+
 internal class BinaryExpressionMessageFilter : MessageFilter
 {
     private readonly MessageFilter _first;
@@ -23,4 +23,3 @@ namespace DiscordChatExporter.Core.Exporting.Filtering
         _ => throw new InvalidOperationException($"Unknown binary expression kind '{_kind}'.")
     };
 }
-}

DiscordChatExporter.Core/Exporting/Filtering/ContainsMessageFilter.cs

@@ -2,8 +2,8 @@
 using System.Text.RegularExpressions;
 using DiscordChatExporter.Core.Discord.Data;
 
-namespace DiscordChatExporter.Core.Exporting.Filtering
+namespace DiscordChatExporter.Core.Exporting.Filtering;
-{
+
 internal class ContainsMessageFilter : MessageFilter
 {
     private readonly string _text;
@@ -31,4 +31,3 @@ namespace DiscordChatExporter.Core.Exporting.Filtering
             )
         );
 }
-}

DiscordChatExporter.Core/Exporting/Filtering/FromMessageFilter.cs

@@ -1,8 +1,8 @@
 using System;
 using DiscordChatExporter.Core.Discord.Data;
 
-namespace DiscordChatExporter.Core.Exporting.Filtering
+namespace DiscordChatExporter.Core.Exporting.Filtering;
-{
+
 internal class FromMessageFilter : MessageFilter
 {
     private readonly string _value;
@@ -14,4 +14,3 @@ namespace DiscordChatExporter.Core.Exporting.Filtering
         string.Equals(_value, message.Author.FullName, StringComparison.OrdinalIgnoreCase) ||
         string.Equals(_value, message.Author.Id.ToString(), StringComparison.OrdinalIgnoreCase);
 }
-}

DiscordChatExporter.Core/Exporting/Filtering/HasMessageFilter.cs

@@ -3,8 +3,8 @@ using System.Linq;
 using System.Text.RegularExpressions;
 using DiscordChatExporter.Core.Discord.Data;
 
-namespace DiscordChatExporter.Core.Exporting.Filtering
+namespace DiscordChatExporter.Core.Exporting.Filtering;
-{
+
 internal class HasMessageFilter : MessageFilter
 {
     private readonly MessageContentMatchKind _kind;
@@ -22,4 +22,3 @@ namespace DiscordChatExporter.Core.Exporting.Filtering
         _ => throw new InvalidOperationException($"Unknown message content match kind '{_kind}'.")
     };
 }
-}

DiscordChatExporter.Core/Exporting/Filtering/MentionsMessageFilter.cs

@@ -2,8 +2,8 @@
 using System.Linq;
 using DiscordChatExporter.Core.Discord.Data;
 
-namespace DiscordChatExporter.Core.Exporting.Filtering
+namespace DiscordChatExporter.Core.Exporting.Filtering;
-{
+
 internal class MentionsMessageFilter : MessageFilter
 {
     private readonly string _value;
@@ -16,4 +16,3 @@ namespace DiscordChatExporter.Core.Exporting.Filtering
         string.Equals(_value, user.Id.ToString(), StringComparison.OrdinalIgnoreCase)
     );
 }
-}

DiscordChatExporter.Core/Exporting/Filtering/MessageContentMatchKind.cs

@@ -1,5 +1,5 @@
-namespace DiscordChatExporter.Core.Exporting.Filtering
+namespace DiscordChatExporter.Core.Exporting.Filtering;
-{
+
 internal enum MessageContentMatchKind
 {
     Link,
@@ -9,4 +9,3 @@
     Image,
     Sound
 }
-}

DiscordChatExporter.Core/Exporting/Filtering/MessageFilter.cs

@@ -2,8 +2,8 @@
 using DiscordChatExporter.Core.Exporting.Filtering.Parsing;
 using Superpower;
 
-namespace DiscordChatExporter.Core.Exporting.Filtering
+namespace DiscordChatExporter.Core.Exporting.Filtering;
-{
+
 public abstract partial class MessageFilter
 {
     public abstract bool IsMatch(Message message);
@@ -15,4 +15,3 @@ namespace DiscordChatExporter.Core.Exporting.Filtering
 
     public static MessageFilter Parse(string value) => FilterGrammar.Filter.Parse(value);
 }
-}

DiscordChatExporter.Core/Exporting/Filtering/NegatedMessageFilter.cs

@@ -1,7 +1,7 @@
 using DiscordChatExporter.Core.Discord.Data;
 
-namespace DiscordChatExporter.Core.Exporting.Filtering
+namespace DiscordChatExporter.Core.Exporting.Filtering;
-{
+
 internal class NegatedMessageFilter : MessageFilter
 {
     private readonly MessageFilter _filter;
@@ -10,4 +10,3 @@ namespace DiscordChatExporter.Core.Exporting.Filtering
 
     public override bool IsMatch(Message message) => !_filter.IsMatch(message);
 }
-}

DiscordChatExporter.Core/Exporting/Filtering/NullMessageFilter.cs

@@ -1,9 +1,8 @@
 using DiscordChatExporter.Core.Discord.Data;
 
-namespace DiscordChatExporter.Core.Exporting.Filtering
+namespace DiscordChatExporter.Core.Exporting.Filtering;
-{
+
 internal class NullMessageFilter : MessageFilter
 {
     public override bool IsMatch(Message message) => true;
 }
-}

DiscordChatExporter.Core/Exporting/Filtering/Parsing/FilterGrammar.cs

@@ -2,8 +2,8 @@
 using Superpower;
 using Superpower.Parsers;
 
-namespace DiscordChatExporter.Core.Exporting.Filtering.Parsing
+namespace DiscordChatExporter.Core.Exporting.Filtering.Parsing;
-{
+
 internal static class FilterGrammar
 {
     private static readonly TextParser<char> EscapedCharacter =
@@ -44,6 +44,12 @@ namespace DiscordChatExporter.Core.Exporting.Filtering.Parsing
         .Select(v => (MessageFilter) new MentionsMessageFilter(v))
         .Named("mentions:<value>");
 
+    private static readonly TextParser<MessageFilter> ReactionFilter = Span
+        .EqualToIgnoreCase("reaction:")
+        .IgnoreThen(String)
+        .Select(v => (MessageFilter) new ReactionMessageFilter(v))
+        .Named("reaction:<value>");
+
     private static readonly TextParser<MessageFilter> HasFilter = Span
         .EqualToIgnoreCase("has:")
         .IgnoreThen(Parse.OneOf(
@@ -72,6 +78,7 @@ namespace DiscordChatExporter.Core.Exporting.Filtering.Parsing
         GroupedFilter,
         FromFilter,
         MentionsFilter,
+        ReactionFilter,
         HasFilter,
         ContainsFilter
     );
@@ -99,4 +106,3 @@ namespace DiscordChatExporter.Core.Exporting.Filtering.Parsing
     public static readonly TextParser<MessageFilter> Filter =
         BinaryExpressionFilter.Token().AtEnd();
 }
-}

DiscordChatExporter.Core/Exporting/Filtering/ReactionMessageFilter.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Linq;
+using DiscordChatExporter.Core.Discord.Data;
+
+namespace DiscordChatExporter.Core.Exporting.Filtering;
+
+internal class ReactionMessageFilter : MessageFilter
+{
+    private readonly string _value;
+
+    public ReactionMessageFilter(string value) => _value = value;
+
+    public override bool IsMatch(Message message) => message.Reactions.Any(r =>
+        string.Equals(_value, r.Emoji.Id?.ToString(), StringComparison.OrdinalIgnoreCase) ||
+        string.Equals(_value, r.Emoji.Name, StringComparison.OrdinalIgnoreCase) ||
+        string.Equals(_value, r.Emoji.Code, StringComparison.OrdinalIgnoreCase)
+    );
+}

DiscordChatExporter.Core/Exporting/MediaDownloader.cs

@@ -10,8 +10,8 @@ using System.Threading.Tasks;
 using DiscordChatExporter.Core.Utils;
 using DiscordChatExporter.Core.Utils.Extensions;
 
-namespace DiscordChatExporter.Core.Exporting
+namespace DiscordChatExporter.Core.Exporting;
-{
+
 internal partial class MediaDownloader
 {
     private readonly string _workingDirPath;
@@ -47,7 +47,7 @@ namespace DiscordChatExporter.Core.Exporting
             using var response = await Http.Client.GetAsync(url, cancellationToken);
             await using (var output = File.Create(filePath))
             {
-                    await response.Content.CopyToAsync(output);
+                await response.Content.CopyToAsync(output, cancellationToken);
             }
 
             // Try to set the file date according to the last-modified header
@@ -104,7 +104,14 @@ namespace DiscordChatExporter.Core.Exporting
         var fileNameWithoutExtension = Path.GetFileNameWithoutExtension(fileName);
         var fileExtension = Path.GetExtension(fileName);
 
-            return PathEx.EscapePath(fileNameWithoutExtension.Truncate(42) + '-' + urlHash + fileExtension);
+        // Probably not a file extension, just a dot in a long file name
-        }
+        // https://github.com/Tyrrrz/DiscordChatExporter/issues/708
+        if (fileExtension.Length > 41)
+        {
+            fileNameWithoutExtension = fileName;
+            fileExtension = "";
+        }
+
+        return PathEx.EscapeFileName(fileNameWithoutExtension.Truncate(42) + '-' + urlHash + fileExtension);
     }
 }

DiscordChatExporter.Core/Exporting/MessageExporter.cs

@@ -5,8 +5,8 @@ using System.Threading.Tasks;
 using DiscordChatExporter.Core.Discord.Data;
 using DiscordChatExporter.Core.Exporting.Writers;
 
-namespace DiscordChatExporter.Core.Exporting
+namespace DiscordChatExporter.Core.Exporting;
-{
+
 internal partial class MessageExporter : IAsyncDisposable
 {
     private readonly ExportContext _context;
@@ -102,4 +102,3 @@ namespace DiscordChatExporter.Core.Exporting
         };
     }
 }
-}

DiscordChatExporter.Core/Exporting/Partitioning/FileSizePartitionLimit.cs

@@ -1,5 +1,5 @@
-namespace DiscordChatExporter.Core.Exporting.Partitioning
+namespace DiscordChatExporter.Core.Exporting.Partitioning;
-{
+
 internal class FileSizePartitionLimit : PartitionLimit
 {
     private readonly long _limit;
@@ -9,4 +9,3 @@
     public override bool IsReached(long messagesWritten, long bytesWritten) =>
         bytesWritten >= _limit;
 }
-}

DiscordChatExporter.Core/Exporting/Partitioning/MessageCountPartitionLimit.cs

@@ -1,5 +1,5 @@
-namespace DiscordChatExporter.Core.Exporting.Partitioning
+namespace DiscordChatExporter.Core.Exporting.Partitioning;
-{
+
 internal class MessageCountPartitionLimit : PartitionLimit
 {
     private readonly long _limit;
@@ -9,4 +9,3 @@
     public override bool IsReached(long messagesWritten, long bytesWritten) =>
         messagesWritten >= _limit;
 }
-}

DiscordChatExporter.Core/Exporting/Partitioning/NullPartitionLimit.cs

@@ -1,7 +1,6 @@
-namespace DiscordChatExporter.Core.Exporting.Partitioning
+namespace DiscordChatExporter.Core.Exporting.Partitioning;
-{
+
 internal class NullPartitionLimit : PartitionLimit
 {
     public override bool IsReached(long messagesWritten, long bytesWritten) => false;
 }
-}

DiscordChatExporter.Core/Exporting/Partitioning/PartitionLimit.cs

@@ -2,8 +2,8 @@
 using System.Globalization;
 using System.Text.RegularExpressions;
 
-namespace DiscordChatExporter.Core.Exporting.Partitioning
+namespace DiscordChatExporter.Core.Exporting.Partitioning;
-{
+
 public abstract partial class PartitionLimit
 {
     public abstract bool IsReached(long messagesWritten, long bytesWritten);
@@ -60,4 +60,3 @@ namespace DiscordChatExporter.Core.Exporting.Partitioning
     public static PartitionLimit Parse(string value, IFormatProvider? formatProvider = null) =>
         TryParse(value, formatProvider) ?? throw new FormatException($"Invalid partition limit '{value}'.");
 }
-}