Merge branch 'master' into copilot/enable-export-setup-on-double-click

# Conflicts:
#	DiscordChatExporter.Gui/Views/Components/DashboardView.axaml

DiscordChatExporter.Cli.Tests/Infra/ChannelIds.cs

@@ -1,4 +1,4 @@
-using DiscordChatExporter.Core.Discord;
+using DiscordChatExporter.Core.Discord;
 
 namespace DiscordChatExporter.Cli.Tests.Infra;
 
@@ -15,7 +15,7 @@ public static class ChannelIds
     public static Snowflake GroupingTestCases { get; } = Snowflake.Parse("992092091545034842");
 
     public static Snowflake FilterTestCases { get; } = Snowflake.Parse("866744075033641020");
-    
+
     public static Snowflake ForwardTestCases { get; } = Snowflake.Parse("1455202357204877477");
 
     public static Snowflake MarkdownTestCases { get; } = Snowflake.Parse("866459526819348521");

DiscordChatExporter.Cli.Tests/Specs/HtmlForwardSpecs.cs

@@ -19,9 +19,6 @@ public class HtmlForwardSpecs
         );
 
         // Assert
-        message
+        message.Text().Should().ContainAll("Forwarded", @"¯\_(ツ)_/¯", "December 29, 2025");
-            .Text()
-            .Should()
-            .ContainAll("Forwarded", @"¯\_(ツ)_/¯", "December 29, 2025");
     }
 }

DiscordChatExporter.Cli.Tests/Specs/JsonForwardSpecs.cs

@@ -24,7 +24,6 @@ public class JsonForwardSpecs
 
         var forwardedMessage = message.GetProperty("forwardedMessage");
         forwardedMessage.GetProperty("content").GetString().Should().Contain(@"¯\_(ツ)_/¯");
-        forwardedMessage.GetProperty("timestamp").GetString().Should().StartWith("2025-12-29");
+        forwardedMessage.GetProperty("timestamp").GetString().Should().StartWith("2025-12-28T22:52:42.175+00:00");
     }
 }
-

DiscordChatExporter.Cli.Tests/Specs/PlainTextForwardSpecs.cs

@@ -14,8 +14,6 @@ public class PlainTextForwardSpecs
         var document = await ExportWrapper.ExportAsPlainTextAsync(ChannelIds.ForwardTestCases);
 
         // Assert
-        document
+        document.Should().ContainAll("{Forwarded Message}", @"¯\_(ツ)_/¯", "12/28/2025 10:52 PM");
-            .Should()
-            .ContainAll("{Forwarded Message}", @"¯\_(ツ)_/¯", "December 29, 2025");
     }
 }

DiscordChatExporter.Core/Discord/Data/MessageSnapshot.cs

@@ -8,7 +8,6 @@ using JsonExtensions.Reading;
 namespace DiscordChatExporter.Core.Discord.Data;
 
 // https://docs.discord.com/developers/resources/message#message-snapshot-object
-// Message snapshots contain a subset of message fields for forwarded messages
 public record MessageSnapshot(
     DateTimeOffset Timestamp,
     DateTimeOffset? EditedTimestamp,

DiscordChatExporter.Core/Exporting/MessageGroupTemplate.cshtml

@@ -262,7 +262,7 @@
                         </div>
                     }
 
-                    @* Forwarded message content *@
+                    @* Forwarded message *@
                     @if (message is { IsForwarded: true, ForwardedMessage: not null })
                     {
                         <div class="chatlog__forwarded">
@@ -273,7 +273,7 @@
                                 <em>Forwarded</em>
                             </div>
 
-                            @* Forwarded text content *@
+                            @* Forwarded content *@
                             @if (!string.IsNullOrWhiteSpace(message.ForwardedMessage.Content))
                             {
                                 <div class="chatlog__forwarded-content chatlog__markdown">

DiscordChatExporter.Core/Markdown/Parsing/MarkdownParser.cs

@@ -275,7 +275,7 @@ internal static partial class MarkdownParser
             // Capture the shrug kaomoji.
             // This escapes it from matching for formatting.
             @"¯\_(ツ)_/¯",
-            (s, _) => new TextNode(s.ToString())
+            (_, s) => new TextNode(s.ToString())
         );
 
     private static readonly IMatcher<MarkdownContext, MarkdownNode> IgnoredEmojiTextNodeMatcher =

DiscordChatExporter.Gui/App.axaml

@@ -116,6 +116,11 @@
             </Style>
         </Style>
 
+        <!--  Run  -->
+        <Style Selector="Run">
+            <Setter Property="BaselineAlignment" Value="Center" />
+        </Style>
+
         <!--  Text box  -->
         <Style Selector="TextBox">
             <Setter Property="FontSize" Value="14" />

DiscordChatExporter.Gui/Converters/MarkdownToInlinesConverter.cs

@@ -33,10 +33,7 @@ public class MarkdownToInlinesConverter : IValueConverter
         {
             case LiteralInline literal:
             {
-                var run = new Run(literal.Content.ToString())
+                var run = new Run(literal.Content.ToString());
-                {
-                    BaselineAlignment = BaselineAlignment.Center,
-                };
 
                 if (fontWeight is not null)
                     run.FontWeight = fontWeight.Value;
@@ -142,9 +139,7 @@ public class MarkdownToInlinesConverter : IValueConverter
 
                         var prefix = list.IsOrdered ? $"{itemOrder++}. " : $"{list.BulletType}  ";
 
-                        inlines.Add(
+                        inlines.Add(new Run(prefix));
-                            new Run(prefix) { BaselineAlignment = BaselineAlignment.Center }
-                        );
 
                         foreach (var subBlock in listItem.OfType<ParagraphBlock>())
                         {

DiscordChatExporter.Gui/Views/Components/DashboardView.axaml

@@ -1,54 +1,54 @@
 <UserControl
-    Loaded="UserControl_OnLoaded"
     x:Class="DiscordChatExporter.Gui.Views.Components.DashboardView"
-    x:DataType="components:DashboardViewModel"
-    x:Name="UserControl"
     xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:asyncImageLoader="clr-namespace:AsyncImageLoader;assembly=AsyncImageLoader.Avalonia"
     xmlns:components="clr-namespace:DiscordChatExporter.Gui.ViewModels.Components"
     xmlns:converters="clr-namespace:DiscordChatExporter.Gui.Converters"
     xmlns:materialIcons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
     xmlns:materialStyles="clr-namespace:Material.Styles.Controls;assembly=Material.Styles"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    x:Name="UserControl"
+    x:DataType="components:DashboardViewModel"
+    Loaded="UserControl_OnLoaded">
     <DockPanel>
         <!--  Header  -->
         <StackPanel
             Background="{DynamicResource MaterialDarkBackgroundBrush}"
             DockPanel.Dock="Top"
             Orientation="Vertical">
-            <Grid ColumnDefinitions="*,Auto" Margin="12,12,8,12">
+            <Grid Margin="12,12,8,12" ColumnDefinitions="*,Auto">
                 <materialStyles:Card Grid.Column="0">
                     <!--  Token  -->
                     <TextBox
+                        x:Name="TokenValueTextBox"
                         FontSize="16"
                         PasswordChar="*"
                         RevealPassword="{Binding $self.IsFocused}"
                         Text="{Binding Token}"
                         Theme="{DynamicResource SoloTextBox}"
-                        Watermark="{Binding LocalizationManager.TokenWatermark}"
+                        Watermark="{Binding LocalizationManager.TokenWatermark}">
-                        x:Name="TokenValueTextBox">
                         <TextBox.InnerLeftContent>
                             <materialIcons:MaterialIcon
-                                Foreground="{DynamicResource PrimaryHueMidBrush}"
                                 Grid.Column="0"
+                                Width="24"
                                 Height="24"
-                                Kind="Key"
                                 Margin="4,0,8,0"
-                                Width="24" />
+                                Foreground="{DynamicResource PrimaryHueMidBrush}"
+                                Kind="Key" />
                         </TextBox.InnerLeftContent>
                         <TextBox.InnerRightContent>
                             <Button
-                                Command="{Binding PullGuildsCommand}"
                                 Grid.Column="2"
-                                IsDefault="True"
                                 Margin="8,0,0,0"
                                 Padding="4"
+                                Command="{Binding PullGuildsCommand}"
+                                IsDefault="True"
                                 Theme="{DynamicResource MaterialFlatButton}"
                                 ToolTip.Tip="{Binding LocalizationManager.PullGuildsTooltip}">
                                 <materialIcons:MaterialIcon
+                                    Width="24"
                                     Height="24"
-                                    Kind="ArrowRight"
+                                    Kind="ArrowRight" />
-                                    Width="24" />
                             </Button>
                         </TextBox.InnerRightContent>
                     </TextBox>
@@ -56,25 +56,25 @@
 
                 <!--  Settings button  -->
                 <Button
-                    Command="{Binding ShowSettingsCommand}"
-                    Foreground="{DynamicResource MaterialDarkForegroundBrush}"
                     Grid.Column="1"
                     Margin="8,0,0,0"
                     Padding="8"
+                    VerticalAlignment="Center"
+                    Command="{Binding ShowSettingsCommand}"
+                    Foreground="{DynamicResource MaterialDarkForegroundBrush}"
                     Theme="{DynamicResource MaterialFlatButton}"
-                    ToolTip.Tip="{Binding LocalizationManager.SettingsTooltip}"
+                    ToolTip.Tip="{Binding LocalizationManager.SettingsTooltip}">
-                    VerticalAlignment="Center">
                     <materialIcons:MaterialIcon
+                        Width="24"
                         Height="24"
-                        Kind="Settings"
+                        Kind="Settings" />
-                        Width="24" />
                 </Button>
             </Grid>
 
             <!--  Progress  -->
             <ProgressBar
-                Background="Transparent"
                 Height="2"
+                Background="Transparent"
                 IsIndeterminate="{Binding IsProgressIndeterminate}"
                 Value="{Binding Progress.Current.Fraction, Mode=OneWay}" />
         </StackPanel>
@@ -95,17 +95,17 @@
             <Grid ColumnDefinitions="Auto,*" IsVisible="{Binding !!AvailableGuilds.Count}">
                 <!--  Guilds  -->
                 <Border
+                    Grid.Column="0"
                     BorderBrush="{DynamicResource MaterialDividerBrush}"
-                    BorderThickness="0,0,1,0"
+                    BorderThickness="0,0,1,0">
-                    Grid.Column="0">
                     <ListBox
+                        x:Name="AvailableGuildsListBox"
                         DoubleTapped="AvailableGuildsListBox_OnDoubleTapped"
                         ItemsSource="{Binding AvailableGuilds}"
                         ScrollViewer.VerticalScrollBarVisibility="Hidden"
                         SelectedItem="{Binding SelectedGuild}"
                         SelectionChanged="AvailableGuildsListBox_OnSelectionChanged"
-                        SelectionMode="Single"
+                        SelectionMode="Single">
-                        x:Name="AvailableGuildsListBox">
                         <ListBox.Styles>
                             <Style Selector="ListBox">
                                 <Style Selector="^ ListBoxItem">
@@ -119,16 +119,16 @@
                                 <Panel Background="Transparent" ToolTip.Tip="{Binding Name}">
                                     <!--  Guild icon placeholder  -->
                                     <Ellipse
-                                        Fill="{DynamicResource MaterialDividerBrush}"
+                                        Width="48"
                                         Height="48"
                                         Margin="12"
-                                        Width="48" />
+                                        Fill="{DynamicResource MaterialDividerBrush}" />
 
                                     <!--  Guild icon  -->
                                     <Ellipse
+                                        Width="48"
                                         Height="48"
-                                        Margin="12"
+                                        Margin="12">
-                                        Width="48">
                                         <Ellipse.Fill>
                                             <ImageBrush asyncImageLoader:ImageBrushLoader.Source="{Binding IconUrl}" />
                                         </Ellipse.Fill>
@@ -142,12 +142,12 @@
                 <!--  Channels  -->
                 <Border Grid.Column="1">
                     <TreeView
+                        x:Name="AvailableChannelsTreeView"
                         ItemsSource="{Binding AvailableChannels}"
                         SelectedItems="{Binding SelectedChannels}"
                         SelectionChanged="AvailableChannelsTreeView_OnSelectionChanged"
                         SelectionMode="Multiple"
-                        TextSearch.Text="Name"
+                        TextSearch.Text="Name">
-                        x:Name="AvailableChannelsTreeView">
                         <TreeView.Styles>
                             <Style Selector="TreeView">
                                 <Style Selector="^ TreeViewItem">
@@ -179,10 +179,10 @@
 
                                     <!--  Channel icon  -->
                                     <materialIcons:MaterialIcon
-                                        Classes.voice="{Binding Channel.IsVoice}"
                                         Grid.Column="0"
-                                        IsVisible="{Binding !Channel.IsCategory}"
+                                        Margin="0,0,4,0"
-                                        Margin="0,0,4,0">
+                                        Classes.voice="{Binding Channel.IsVoice}"
+                                        IsVisible="{Binding !Channel.IsCategory}">
                                         <materialIcons:MaterialIcon.Styles>
                                             <Style Selector="materialIcons|MaterialIcon">
                                                 <Setter Property="Kind" Value="Pound" />
@@ -196,19 +196,19 @@
 
                                     <!--  Channel name  -->
                                     <TextBlock
-                                        FontSize="14"
                                         Grid.Column="1"
                                         Margin="0,12"
+                                        FontSize="14"
                                         Text="{Binding Channel.Name, Mode=OneWay}" />
 
                                     <!--  Checkmark  -->
                                     <materialIcons:MaterialIcon
                                         Grid.Column="2"
+                                        Width="24"
                                         Height="24"
-                                        IsVisible="{Binding $parent[TreeViewItem].IsSelected}"
-                                        Kind="Check"
                                         Margin="16,0"
-                                        Width="24" />
+                                        IsVisible="{Binding $parent[TreeViewItem].IsSelected}"
+                                        Kind="Check" />
                                 </Grid>
                             </TreeDataTemplate>
                         </TreeView.ItemTemplate>
@@ -224,14 +224,13 @@
                         <TextBlock>
                             <InlineUIContainer>
                                 <materialIcons:MaterialIcon
-                                    Foreground="{DynamicResource PrimaryHueMidBrush}"
+                                    Width="18"
                                     Height="18"
-                                    Kind="Account"
+                                    Foreground="{DynamicResource PrimaryHueMidBrush}"
-                                    Width="18" />
+                                    Kind="Account" />
                             </InlineUIContainer>
-                            <Run BaselineAlignment="Center" Text="" />
+                            <Run Text="" />
                             <Run
-                                BaselineAlignment="Center"
                                 FontSize="16"
                                 FontWeight="SemiBold"
                                 Text="{Binding LocalizationManager.TokenPersonalHeader}" />
@@ -255,14 +254,13 @@
                         <TextBlock Margin="0,12,0,0">
                             <InlineUIContainer>
                                 <materialIcons:MaterialIcon
-                                    Foreground="{DynamicResource PrimaryHueMidBrush}"
+                                    Width="18"
                                     Height="18"
-                                    Kind="Robot"
+                                    Foreground="{DynamicResource PrimaryHueMidBrush}"
-                                    Width="18" />
+                                    Kind="Robot" />
                             </InlineUIContainer>
-                            <Run BaselineAlignment="Center" Text="" />
+                            <Run Text="" />
                             <Run
-                                BaselineAlignment="Center"
                                 FontSize="16"
                                 FontWeight="SemiBold"
                                 Text="{Binding LocalizationManager.TokenBotHeader}" />
@@ -276,11 +274,11 @@
                             TextWrapping="Wrap" />
 
                         <TextBlock
+                            Margin="0,12,0,0"
                             FontSize="14"
                             FontWeight="Light"
                             Inlines="{Binding LocalizationManager.TokenHelpText, Converter={x:Static converters:MarkdownToInlinesConverter.Instance}}"
                             LineHeight="23"
-                            Margin="0,12,0,0"
                             TextWrapping="Wrap" />
                     </StackPanel>
                 </ScrollViewer>
@@ -288,21 +286,21 @@
 
             <!--  Export button  -->
             <Button
+                Width="56"
+                Height="56"
+                Margin="32,24"
+                Padding="0"
+                HorizontalAlignment="Right"
+                VerticalAlignment="Bottom"
                 Background="{DynamicResource MaterialSecondaryMidBrush}"
                 Command="{Binding ExportCommand}"
                 Foreground="{DynamicResource MaterialSecondaryMidForegroundBrush}"
-                Height="56"
-                HorizontalAlignment="Right"
                 IsVisible="{Binding $self.IsEffectivelyEnabled}"
-                Margin="32,24"
+                Theme="{DynamicResource MaterialIconButton}">
-                Padding="0"
-                Theme="{DynamicResource MaterialIconButton}"
-                VerticalAlignment="Bottom"
-                Width="56">
                 <materialIcons:MaterialIcon
+                    Width="32"
                     Height="32"
-                    Kind="Download"
+                    Kind="Download" />
-                    Width="32" />
             </Button>
         </Panel>
     </DockPanel>