Update version

Closes #941

Changelog.md

@@ -1,3 +1,13 @@
+### v2.36.3 (21-Oct-2022)
+
+- [GUI] Fixed an issue where opening a dialog did not prevent user interactions with background UI elements using keyboard. This sometimes caused the application to crash in weird ways.
+- [Docker] Fixed an issue where DiscordChatExporter was running as root inside the container, making the exported files inaccessible to the host. (Thanks [@Benjamin Just](https://github.com/BamButz))
+
+### v2.36.2 (08-Oct-2022)
+
+- Removed the message content intent check because the heuristics turned out to be not reliable enough.
+- Fixed an issue where the runtime manifest included the wrong target runtime version. This resulted in the application failing to launch for some users when upgrading from earlier versions.
+
 ### v2.36.1 (24-Sep-2022)
 
 - Added a check which will trigger an error if the provided bot account does not have the message content intent enabled. Note, however, that this check is based on heuristics which may result in false negatives.

Directory.Build.props

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <Version>2.36.1</Version>
+    <Version>2.36.3</Version>
     <Company>Tyrrrz</Company>
     <Copyright>Copyright (c) Oleksii Holub</Copyright>
     <LangVersion>preview</LangVersion>
@@ -10,4 +10,12 @@
     <WarningsAsErrors>nullable</WarningsAsErrors>
   </PropertyGroup>
 
+  <!--
+    Even though the project builds against .NET 6, some dependencies
+    apparently rely on a specific version of the runtime.
+  -->
+  <PropertyGroup>
+    <RuntimeFrameworkVersion>6.0.9</RuntimeFrameworkVersion>
+  </PropertyGroup>
+
 </Project>

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

@@ -15,7 +15,7 @@
     <PackageReference Include="FluentAssertions" Version="6.7.0" />
     <PackageReference Include="GitHubActionsTestLogger" Version="2.0.1" PrivateAssets="all" />
     <PackageReference Include="JsonExtensions" Version="1.2.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
     <PackageReference Include="System.Reactive" Version="5.0.0" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" PrivateAssets="all" />

DiscordChatExporter.Cli.dockerfile

@@ -7,12 +7,16 @@ COPY Directory.Build.props ./
 COPY DiscordChatExporter.Core ./DiscordChatExporter.Core
 COPY DiscordChatExporter.Cli ./DiscordChatExporter.Cli
 
-RUN dotnet publish DiscordChatExporter.Cli -c Release -o ./publish
+RUN dotnet publish DiscordChatExporter.Cli --configuration Release --output ./publish
 
 # Run
 FROM mcr.microsoft.com/dotnet/runtime:6.0 AS run
 
+RUN useradd dce
+USER dce
+
 COPY --from=build ./publish ./
 
 WORKDIR ./out
-ENTRYPOINT ["dotnet", "/DiscordChatExporter.Cli.dll"]
+
+ENTRYPOINT ["dotnet", "../DiscordChatExporter.Cli.dll"]

DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj

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

DiscordChatExporter.Core/Discord/Data/Message.cs

@@ -10,7 +10,7 @@ using JsonExtensions.Reading;
 namespace DiscordChatExporter.Core.Discord.Data;
 
 // https://discord.com/developers/docs/resources/channel#message-object
-public partial record Message(
+public record Message(
     Snowflake Id,
     MessageKind Kind,
     User Author,
@@ -26,16 +26,6 @@ public partial record Message(
     IReadOnlyList<User> MentionedUsers,
     MessageReference? Reference,
     Message? ReferencedMessage) : IHasId
-{
-    public bool IsEmpty =>
-        Kind == MessageKind.Default &&
-        string.IsNullOrEmpty(Content) &&
-        !Attachments.Any() &&
-        !Embeds.Any() &&
-        !Stickers.Any();
-}
-
-public partial record Message
 {
     private static IReadOnlyList<Embed> NormalizeEmbeds(IReadOnlyList<Embed> embeds)
     {

DiscordChatExporter.Core/Discord/DiscordClient.cs

@@ -323,11 +323,6 @@ public class DiscordClient
                 if (message.Timestamp > lastMessage.Timestamp)
                     yield break;
 
-                // Make sure the messages are not empty when exporting via a bot
-                // https://github.com/Tyrrrz/DiscordChatExporter/issues/918
-                if (_resolvedTokenKind == TokenKind.Bot && message.IsEmpty && !message.Author.IsBot)
-                    throw DiscordChatExporterException.MessageContentIntentMissing();
-
                 // Report progress based on the duration of exported messages divided by total
                 if (progress is not null)
                 {

DiscordChatExporter.Core/Exceptions/DiscordChatExporterException.cs

@@ -41,7 +41,4 @@ Failed to perform an HTTP request.
 
     internal static DiscordChatExporterException ChannelIsEmpty() =>
         new("No messages found for the specified period.");
-
-    internal static DiscordChatExporterException MessageContentIntentMissing() =>
-        new("Failed to retrieve message content because the bot doesn't have the Message Content Intent enabled.");
 }

DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj

@@ -14,14 +14,14 @@
 
   <ItemGroup>
     <PackageReference Include="Gress" Version="2.0.1" />
-    <PackageReference Include="MaterialDesignColors" Version="2.0.6" />
-    <PackageReference Include="MaterialDesignThemes" Version="4.5.0" />
+    <PackageReference Include="MaterialDesignColors" Version="2.0.9" />
+    <PackageReference Include="MaterialDesignThemes" Version="4.6.1" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
     <PackageReference Include="Ookii.Dialogs.Wpf" Version="5.0.1" />
     <PackageReference Include="Onova" Version="2.6.2" />
     <PackageReference Include="Stylet" Version="1.3.6" />
     <PackageReference Include="Tyrrrz.Settings" Version="1.3.4" />
-    <PackageReference Include="PropertyChanged.Fody" Version="3.4.1" PrivateAssets="all" />
+    <PackageReference Include="PropertyChanged.Fody" Version="4.0.4" PrivateAssets="all" />
     <PackageReference Include="DotnetRuntimeBootstrapper" Version="2.3.1" PrivateAssets="all" />
   </ItemGroup>
 

DiscordChatExporter.Gui/Views/RootView.xaml

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

Readme.md

@@ -108,3 +108,8 @@ The following table lists all available download options:
 
 ![channel list](.assets/list.png)
 ![rendered output](.assets/output.png)
+
+## Related projects
+
+- [**Chat Analytics**](https://github.com/mlomb/chat-analytics) — solution for analyzing chat patterns of Discord users, using exports produced by **DiscordChatExporter**.
+- [**DiscordChatExporter-frontend**](https://github.com/slatinsky/DiscordChatExporter-frontend) — convenient viewer for exports produced by **DiscordChatExporter**.