Update version

Changelog.md

@@ -1,3 +1,8 @@
+### v2.37.1 (10-Jan-2023)
+
+- [HTML] Fixed an issue where the export failed because it failed to resolve standard emoji image assets. Switched to a different CDN provider to mitigate this. (Thanks [@Lucas LaBuff](https://github.com/96-LB))
+- [GUI] Fixed an application crash that happened when the user attempted to close the same dialog multiple times in a very short time.
+
 ### v2.37 (08-Jan-2023)
 
 - Switched from .NET 6.0 to .NET 7.0. If running on Windows, the application should update all required prerequisites automatically. Alternatively, you can download the latest version of the runtime for your system [here](https://dotnet.microsoft.com/download/dotnet/7.0).

Directory.Build.props

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

DiscordChatExporter.Cli/Commands/Base/ExportCommandBase.cs

@@ -92,6 +92,12 @@ public abstract class ExportCommandBase : TokenCommandBase
     )]
     public string DateFormat { get; init; } = "dd-MMM-yy hh:mm tt";
 
+    [CommandOption(
+        "fuck-russia",
+        Description = "Don't print the Support Ukraine message to the console."
+    )]
+    public bool IsUkraineSupportMessageDisabled { get; init; }
+
     private ChannelExporter? _channelExporter;
     protected ChannelExporter Exporter => _channelExporter ??= new ChannelExporter(Discord);
 
@@ -234,12 +240,20 @@ public abstract class ExportCommandBase : TokenCommandBase
 
     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/ukraine                            ||");
-        console.Output.WriteLine("========================================================================");
-        console.Output.WriteLine("");
+        // Support Ukraine callout
+        if (!IsUkraineSupportMessageDisabled)
+        {
+            console.Output.WriteLine("┌────────────────────────────────────────────────────────────────────┐");
+            console.Output.WriteLine("│   Thank you for supporting Ukraine <3                              │");
+            console.Output.WriteLine("│                                                                    │");
+            console.Output.WriteLine("│   As Russia wages a genocidal war against my country,              │");
+            console.Output.WriteLine("│   I'm grateful to everyone who continues to                        │");
+            console.Output.WriteLine("│   stand with Ukraine in our fight for freedom.                     │");
+            console.Output.WriteLine("│                                                                    │");
+            console.Output.WriteLine("│   Learn more: https://tyrrrz.me/ukraine                            │");
+            console.Output.WriteLine("└────────────────────────────────────────────────────────────────────┘");
+            console.Output.WriteLine("");
+        }
 
         return default;
     }

DiscordChatExporter.Core/Discord/Data/Emoji.cs

@@ -45,7 +45,7 @@ public partial record Emoji
         : $"https://cdn.discordapp.com/emojis/{id}.png";
 
     private static string GetImageUrl(string name) =>
-        $"https://twemoji.maxcdn.com/v/latest/svg/{GetTwemojiId(name)}.svg";
+        $"https://cdn.jsdelivr.net/gh/twitter/twemoji@latest/assets/svg/{GetTwemojiId(name)}.svg";
 
     public static string GetImageUrl(Snowflake? id, string? name, bool isAnimated)
     {

DiscordChatExporter.Gui/Services/SettingsService.cs

@@ -6,6 +6,8 @@ namespace DiscordChatExporter.Gui.Services;
 
 public partial class SettingsService : SettingsManager
 {
+    public bool IsUkraineSupportMessageEnabled { get; set; } = true;
+
     public bool IsAutoUpdateEnabled { get; set; } = true;
 
     public bool IsDarkModeEnabled { get; set; } = IsDarkModeEnabledByDefault();

DiscordChatExporter.Gui/ViewModels/Framework/DialogManager.cs

@@ -27,7 +27,15 @@ public class DialogManager : IDisposable
         {
             void OnScreenClosed(object? closeSender, EventArgs args)
             {
-                openArgs.Session.Close();
+                try
+                {
+                    openArgs.Session.Close();
+                }
+                catch (InvalidOperationException)
+                {
+                    // Race condition: dialog is already being closed
+                }
+
                 dialogScreen.Closed -= OnScreenClosed;
             }
             dialogScreen.Closed += OnScreenClosed;

DiscordChatExporter.Gui/ViewModels/RootViewModel.cs

@@ -41,17 +41,26 @@ public class RootViewModel : Screen, IHandle<NotificationMessage>, IDisposable
         DisplayName = $"{App.Name} v{App.VersionString}";
     }
 
-    private async Task ShowWarInUkraineMessageAsync()
+    private async Task ShowUkraineSupportMessageAsync()
     {
-        var dialog = _viewModelFactory.CreateMessageBoxViewModel(
-            "Ukraine is at war!", @"
-My country, Ukraine, has been invaded by Russian military forces in an act of aggression that can only be described as genocide.
-Be on the right side of history! Consider supporting Ukraine in its fight for freedom.
+        if (!_settingsService.IsUkraineSupportMessageEnabled)
+            return;
 
-Press LEARN MORE to find ways that you can help.".Trim(),
-            "LEARN MORE", "CLOSE"
+        var dialog = _viewModelFactory.CreateMessageBoxViewModel(
+            "Thank you for supporting Ukraine!",
+            """
+            As Russia wages a genocidal war against my country, I'm grateful to everyone who continues to stand with Ukraine in our fight for freedom.
+
+            Click LEARN MORE to find ways that you can help.
+            """,
+            "LEARN MORE",
+            "CANCEL"
         );
 
+        // Disable this message in the future
+        _settingsService.IsUkraineSupportMessageEnabled = false;
+        _settingsService.Save();
+
         if (await _dialogManager.ShowDialogAsync(dialog) == true)
         {
             ProcessEx.StartShellExecute("https://tyrrrz.me/ukraine?source=discordchatexporter");
@@ -87,7 +96,7 @@ Press LEARN MORE to find ways that you can help.".Trim(),
 
     public async void OnViewFullyLoaded()
     {
-        await ShowWarInUkraineMessageAsync();
+        await ShowUkraineSupportMessageAsync();
         await CheckForUpdatesAsync();
     }