Update version

Co-authored-by: Oleksii Holub <1935960+Tyrrrz@users.noreply.github.com>

.docs/Linux.md

@@ -15,6 +15,12 @@ Please follow the [instructions provided here](https://github.com/Tyrrrz/Discord
 dotnet DiscordChatExporter.Cli.dll export -t TOKEN -c CHANNEL
 ```
 
+If the above command throws a "Permission denied" error, execute this command to fix the permissions:
+
+```console
+chmod 644 *.dll DiscordChatExporter.*
+```
+
 > [How to get Token and Channel IDs](https://github.com/Tyrrrz/DiscordChatExporter/blob/master/.docs/Token-and-IDs.md).
 
 There's much more you can do with DCE.CLI! Read the [CLI explained](https://github.com/Tyrrrz/DiscordChatExporter/blob/master/.docs/Getting-started.md#dcecli-commands-) page to get started.

.github/workflows/docker.yml

@@ -3,6 +3,8 @@ name: docker
 on: [push, pull_request]
 
 jobs:
+  # Outputs from this job aren't really used, but it's here to verify that
+  # the Dockerfile builds correctly on pull requests.
   build:
     runs-on: ubuntu-latest
     permissions:
@@ -30,8 +32,9 @@ jobs:
           name: DiscordChatExporter.Cli.Docker
           path: DiscordChatExporter.Cli.Docker.tar
 
-  deploy-latest:
+  deploy:
-    if: ${{ github.event_name == 'push' && github.ref_type == 'branch' && github.ref_name == 'master' }}
+    # Deploy to DockerHub only on tag push or master branch push
+    if: ${{ github.event_name == 'push' && (github.ref_type == 'tag' || github.ref_type == 'branch' && github.ref_name == 'master') }}
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -55,32 +58,6 @@ jobs:
           --platform linux/amd64,linux/arm64
           --push
           --tag tyrrrz/discordchatexporter:latest
+          ${{ github.ref_type == 'tag' && '--tag tyrrrz/discordchatexporter:$GITHUB_REF_NAME' || '' }}
+          ${{ github.ref_type == 'tag' && '--tag tyrrrz/discordchatexporter:stable' || '' }}
           .
-
-  deploy-stable:
-    if: ${{ github.event_name == 'push' && github.ref_type == 'tag' }}
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # 4.1.0
-
-      - name: Install Docker Buildx
-        uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # 3.0.0
-
-      - name: Login to DockerHub
-        run: >
-          echo ${{ secrets.DOCKER_TOKEN }} |
-          docker login --username tyrrrz --password-stdin
-
-      - name: Build & push image
-        run: >
-          docker buildx build
-          --file DiscordChatExporter.Cli.dockerfile
-          --platform linux/amd64,linux/arm64
-          --push
-          --tag tyrrrz/discordchatexporter:stable
-          --tag tyrrrz/discordchatexporter:${{ github.ref_name }}
-          .

.github/workflows/main.yml

@@ -25,6 +25,8 @@ jobs:
       - name: Run tests
         # Tests need access to secrets, so we can't run them against PRs because of limited trust
         if: ${{ github.event_name != 'pull_request' }}
+        env:
+          DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }}
         run: >
           dotnet test
           --configuration Release
@@ -33,8 +35,6 @@ jobs:
           --
           RunConfiguration.CollectSourceInformation=true
           DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.Format=opencover
-        env:
-          DISCORD_TOKEN: ${{ secrets.DISCORD_TOKEN }}
 
       - name: Upload coverage
         uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # 3.1.4
@@ -42,6 +42,12 @@ jobs:
           token: ${{ secrets.CODECOV_TOKEN }}
 
   pack:
+    strategy:
+      matrix:
+        app:
+          - DiscordChatExporter.Cli
+          - DiscordChatExporter.Gui
+
     runs-on: windows-latest
     permissions:
       actions: write
@@ -56,80 +62,78 @@ jobs:
         with:
           dotnet-version: 7.0.x
 
-      - name: Publish (CLI)
+      - name: Publish app
         run: >
-          dotnet publish DiscordChatExporter.Cli
+          dotnet publish ${{ matrix.app }}
-          --output DiscordChatExporter.Cli/publish/
+          --output ${{ matrix.app }}/bin/publish/
           --configuration Release
 
-      - name: Publish (GUI)
+      - name: Upload artifacts
-        run: >
-          dotnet publish DiscordChatExporter.Gui
-          --output DiscordChatExporter.Gui/publish/
-          --configuration Release
-
-      - name: Upload artifacts (CLI)
         uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # 3.1.3
         with:
-          name: DiscordChatExporter.Cli
+          name: ${{ matrix.app }}
-          path: DiscordChatExporter.Cli/publish/
+          path: ${{ matrix.app }}/bin/publish/
 
-      - name: Upload artifacts (GUI)
+  release:
-        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # 3.1.3
-        with:
-          name: DiscordChatExporter
-          path: DiscordChatExporter.Gui/publish/
-
-  deploy:
     if: ${{ github.event_name == 'push' && github.ref_type == 'tag' }}
+
     needs:
       - test
       - pack
+
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+
+    steps:
+      - name: Create release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: >
+          gh release create "${{ github.ref_name }}"
+          --repo "${{ github.event.repository.full_name }}"
+          --title "${{ github.ref_name }}"
+          --notes "[Changelog](${{ github.event.repository.html_url }}/blob/${{ github.ref_name }}/Changelog.md)"
+          --verify-tag
+
+  deploy:
+    strategy:
+      matrix:
+        app:
+          - DiscordChatExporter.Cli
+          - DiscordChatExporter.Gui
+        include:
+          - app: DiscordChatExporter.Cli
+            asset: DiscordChatExporter.Cli
+          - app: DiscordChatExporter.Gui
+            # GUI asset isn't suffixed, unlike the CLI asset
+            asset: DiscordChatExporter
+
+    needs: release
     runs-on: ubuntu-latest
     permissions:
       actions: read
       contents: write
 
     steps:
-      - name: Download artifacts (CLI)
+      - name: Download artifacts
         uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # 3.0.2
         with:
-          name: DiscordChatExporter.Cli
+          name: ${{ matrix.app }}
-          path: DiscordChatExporter.Cli
+          path: ${{ matrix.app }}/
 
-      - name: Download artifacts (GUI)
+      - name: Create package
-        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # 3.0.2
+        # Change into the artifacts directory to avoid including the directory itself in the zip archive
-        with:
+        working-directory: ${{ matrix.app }}/
-          name: DiscordChatExporter
+        run: zip -r ../${{ matrix.asset }}.zip .
-          path: DiscordChatExporter.Gui
-
-      - name: Create package (CLI)
-        shell: pwsh
-        run: >
-          Compress-Archive
-          -Path DiscordChatExporter.Cli/*
-          -DestinationPath DiscordChatExporter.Cli.zip
-          -Force
-
-      - name: Create package (GUI)
-        shell: pwsh
-        run: >
-          Compress-Archive
-          -Path DiscordChatExporter.Gui/*
-          -DestinationPath DiscordChatExporter.zip
-          -Force
 
       - name: Create release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: >
-          gh release create "${{ github.ref_name }}"
+          gh release upload "${{ github.ref_name }}"
-          "DiscordChatExporter.Cli.zip"
+          "${{ matrix.asset }}.zip"
-          "DiscordChatExporter.zip"
           --repo "${{ github.event.repository.full_name }}"
-          --title "${{ github.ref_name }}"
-          --notes "[Changelog](${{ github.event.repository.html_url }}/blob/${{ github.ref_name }}/Changelog.md)"
-          --verify-tag
 
   notify:
     needs: deploy
@@ -148,6 +152,6 @@ jobs:
           body: |
             {
               "avatar_url": "https://raw.githubusercontent.com/${{ github.event.repository.full_name }}/${{ github.ref_name }}/favicon.png",
-              "content": "**${{ github.event.repository.name }}** new version released!\nVersion: `${{ github.ref_name }}`\nDownload: <${{ github.event.repository.html_url }}/releases/tag/${{ github.ref_name }}>\nChangelog: <${{ github.event.repository.html_url }}/blob/${{ github.ref_name }}/Changelog.md>"
+              "content": "**${{ github.event.repository.name }}** v${{ github.ref_name }} has been released!\n🔗 [Download](<${{ github.event.repository.html_url }}/releases/tag/${{ github.ref_name }}>) • [Changelog](<${{ github.event.repository.html_url }}/blob/${{ github.ref_name }}/Changelog.md>)"
             }
           retry-count: 5

Changelog.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## v2.42.2 (26-Oct-2023)
+
+- General changes:
+  - Fixed an issue where trying to export a channel that contained application interactions with empty command names crashed the application.
+
+## v2.42.1 (19-Oct-2023)
+
+- General changes:
+  - Improved the error message shown when trying to export a forum channel. Such channels cannot be exported directly, you need to fetch and export their individual threads instead.
+- CLI changes:
+  - Fixed an issue where fetching threads with `[` or `]` in their name crashed the application.
+
 ## v2.42 (12-Oct-2023)
 
 - General changes:

Directory.Build.props

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
-    <Version>2.42</Version>
+    <Version>2.42.2</Version>
     <Company>Tyrrrz</Company>
     <Copyright>Copyright (c) Oleksii Holub</Copyright>
     <LangVersion>preview</LangVersion>

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

@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AngleSharp" Version="1.0.4" />
+    <PackageReference Include="AngleSharp" Version="1.0.5" />
     <PackageReference Include="coverlet.collector" Version="6.0.0" PrivateAssets="all" />
     <PackageReference Include="CSharpier.MsBuild" Version="0.25.0" PrivateAssets="all" />
     <PackageReference Include="FluentAssertions" Version="6.12.0" />
@@ -22,8 +22,8 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="7.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="ReflectionMagic" Version="5.0.0" />
-    <PackageReference Include="xunit" Version="2.5.1" />
+    <PackageReference Include="xunit" Version="2.5.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.1" PrivateAssets="all" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

DiscordChatExporter.Cli/Commands/Base/ExportCommandBase.cs

@@ -200,7 +200,7 @@ public abstract class ExportCommandBase : DiscordCommandBase
                         try
                         {
                             await ctx.StartTaskAsync(
-                                channel.GetHierarchicalName(),
+                                Markup.Escape(channel.GetHierarchicalName()),
                                 async progress =>
                                 {
                                     var guild = await Discord.GetGuildAsync(

DiscordChatExporter.Cli/Commands/ExportAllCommand.cs

@@ -80,7 +80,10 @@ public class ExportAllCommand : ExportCommandBase
 
                                 channels.Add(channel);
 
-                                ctx.Status($"Fetched '{channel.GetHierarchicalName()}'.");
+                                ctx.Status(
+                                    Markup.Escape($"Fetched '{channel.GetHierarchicalName()}'.")
+                                );
+
                                 fetchedChannelsCount++;
                             }
                         }
@@ -114,7 +117,10 @@ public class ExportAllCommand : ExportCommandBase
                                 {
                                     channels.Add(thread);
 
-                                    ctx.Status($"Fetched '{thread.GetHierarchicalName()}'.");
+                                    ctx.Status(
+                                        Markup.Escape($"Fetched '{thread.GetHierarchicalName()}'.")
+                                    );
+
                                     fetchedThreadsCount++;
                                 }
                             }
@@ -142,7 +148,11 @@ public class ExportAllCommand : ExportCommandBase
                     {
                         foreach (var dumpChannel in dump.Channels)
                         {
-                            ctx.Status($"Fetching '{dumpChannel.Name}' ({dumpChannel.Id})...");
+                            ctx.Status(
+                                Markup.Escape(
+                                    $"Fetching '{dumpChannel.Name}' ({dumpChannel.Id})..."
+                                )
+                            );
 
                             try
                             {

DiscordChatExporter.Cli/Commands/ExportGuildCommand.cs

@@ -58,7 +58,8 @@ public class ExportGuildCommand : ExportCommandBase
 
                         channels.Add(channel);
 
-                        ctx.Status($"Fetched '{channel.GetHierarchicalName()}'.");
+                        ctx.Status(Markup.Escape($"Fetched '{channel.GetHierarchicalName()}'."));
+
                         fetchedChannelsCount++;
                     }
                 }
@@ -90,7 +91,8 @@ public class ExportGuildCommand : ExportCommandBase
                         {
                             channels.Add(thread);
 
-                            ctx.Status($"Fetched '{thread.GetHierarchicalName()}'.");
+                            ctx.Status(Markup.Escape($"Fetched '{thread.GetHierarchicalName()}'."));
+
                             fetchedThreadsCount++;
                         }
                     }

DiscordChatExporter.Cli/Utils/Extensions/ConsoleExtensions.cs

@@ -44,8 +44,7 @@ internal static class ConsoleExtensions
         var actualDescription = !string.IsNullOrWhiteSpace(description) ? description : "...";
 
         var progressTask = context.AddTask(
-            // Don't recognize random square brackets as style tags
+            actualDescription,
-            Markup.Escape(actualDescription),
             new ProgressTaskSettings { MaxValue = 1 }
         );
 

DiscordChatExporter.Core/Discord/Data/Interaction.cs

@@ -10,7 +10,7 @@ public record Interaction(Snowflake Id, string Name, User User)
     public static Interaction Parse(JsonElement json)
     {
         var id = json.GetProperty("id").GetNonWhiteSpaceString().Pipe(Snowflake.Parse);
-        var name = json.GetProperty("name").GetNonWhiteSpaceString();
+        var name = json.GetProperty("name").GetNonNullString(); // may be empty, but not null
         var user = json.GetProperty("user").Pipe(User.Parse);
 
         return new Interaction(id, name, user);

DiscordChatExporter.Core/DiscordChatExporter.Core.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
-    <PackageReference Include="AsyncKeyedLock" Version="6.2.1" />
+    <PackageReference Include="AsyncKeyedLock" Version="6.2.2" />
     <PackageReference Include="CSharpier.MsBuild" Version="0.25.0" PrivateAssets="all" />
     <PackageReference Include="Gress" Version="2.1.1" />
     <PackageReference Include="JsonExtensions" Version="1.2.0" />
@@ -9,7 +9,7 @@
     <PackageReference Include="RazorBlade" Version="0.4.4" />
     <PackageReference Include="Superpower" Version="3.0.0" />
     <PackageReference Include="WebMarkupMin.Core" Version="2.14.0" />
-    <PackageReference Include="YoutubeExplode" Version="6.3.4" />
+    <PackageReference Include="YoutubeExplode" Version="6.3.6" />
   </ItemGroup>
 
 </Project>

DiscordChatExporter.Core/Exporting/ChannelExporter.cs

@@ -22,11 +22,18 @@ public class ChannelExporter
     {
         // Forum channels don't have messages, they are just a list of threads
         if (request.Channel.Kind == ChannelKind.GuildForum)
-            throw new DiscordChatExporterException("Channel is a forum.");
+        {
+            throw new DiscordChatExporterException(
+                "Channel is a forum and cannot be exported directly. "
+                    + "You need to pull its threads and export them individually."
+            );
+        }
 
         // Check if the channel is empty
         if (request.Channel.IsEmpty)
+        {
             throw new DiscordChatExporterException("Channel does not contain any messages.");
+        }
 
         // Check if the 'after' boundary is valid
         if (request.After is not null && !request.Channel.MayHaveMessagesAfter(request.After.Value))

DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj

@@ -13,14 +13,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Cogwheel" Version="2.0.3" />
+    <PackageReference Include="Cogwheel" Version="2.0.4" />
     <PackageReference Include="CSharpier.MsBuild" Version="0.25.0" PrivateAssets="all" />
     <PackageReference Include="Deorcify" Version="1.0.2" PrivateAssets="all" />
     <PackageReference Include="DotnetRuntimeBootstrapper" Version="2.5.1" PrivateAssets="all" />
     <PackageReference Include="Gress" Version="2.1.1" />
     <PackageReference Include="MaterialDesignColors" Version="2.1.4" />
     <PackageReference Include="MaterialDesignThemes" Version="4.9.0" />
-    <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
+    <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.75" />
     <PackageReference Include="Ookii.Dialogs.Wpf" Version="5.0.1" />
     <PackageReference Include="Onova" Version="2.6.10" />
     <PackageReference Include="PropertyChanged.Fody" Version="4.1.0" PrivateAssets="all" />

Readme.md

@@ -23,7 +23,8 @@
 **DiscordChatExporter** is an application that can be used to export message history from any [Discord](https://discord.com) channel to a file.
 It works with direct messages, group messages, and server channels, and supports Discord's dialect of markdown as well as most other rich media features.
 
-> ❔ If you have questions or issues, **please refer to the [docs](.docs)**.
+<!-- Can't use a relative link here due to a bug in markdown parsing -->
+> ❔ If you have questions or issues, **please refer to the [docs](https://github.com/Tyrrrz/DiscordChatExporter/tree/master/.docs)**.
 
 > 💬 If you want to chat, **join my [Discord server](https://discord.gg/2SUWKFnHSm)**.
 
@@ -57,7 +58,7 @@ The following table lists all available download options:
       <td>
         <ul>
           <li>🟢 <b><a href="https://github.com/Tyrrrz/DiscordChatExporter/releases/latest">Stable release</a></b> (<code>DiscordChatExporter.zip</code>)</li>
-          <li>🟠 <a href="https://github.com/Tyrrrz/DiscordChatExporter/actions/workflows/main.yml">CI build</a> (<code>DiscordChatExporter.zip</code>)</li>
+          <li>🟠 <a href="https://github.com/Tyrrrz/DiscordChatExporter/actions/workflows/main.yml">CI build</a> (<code>DiscordChatExporter.Gui.zip</code>)</li>
         </ul>
       </td>
       <td>
@@ -70,8 +71,8 @@ The following table lists all available download options:
       <td><b>CLI</b></td>
       <td>
         <ul>
-          <li>🟢 <b><a href="https://github.com/Tyrrrz/DiscordChatExporter/releases/latest">Stable release</a></b> (<code>DiscordChatExporter.CLI.zip</code></li>
+          <li>🟢 <b><a href="https://github.com/Tyrrrz/DiscordChatExporter/releases/latest">Stable release</a></b> (<code>DiscordChatExporter.Cli.zip</code></li>
-          <li>🟠 <a href="https://github.com/Tyrrrz/DiscordChatExporter/actions/workflows/main.yml">CI build</a> (<code>DiscordChatExporter.CLI.zip</code>)</li>
+          <li>🟠 <a href="https://github.com/Tyrrrz/DiscordChatExporter/actions/workflows/main.yml">CI build</a> (<code>DiscordChatExporter.Cli.zip</code>)</li>
           <li>🐋 <a href="https://hub.docker.com/r/tyrrrz/discordchatexporter">Docker</a> (<code>tyrrrz/discordchatexporter</code>)</li>
           <li>📦 <a href="https://aur.archlinux.org/packages/discord-chat-exporter-cli">AUR</a> (<code>discord-chat-exporter-cli</code>)</li>
           <li>📦 <a href="https://search.nixos.org/packages?query=discordchatexporter-cli">Nix</a> (<code>discordchatexporter-cli</code>)</li>