Update version

Closes #1115

.github/workflows/main.yml

@@ -151,5 +151,6 @@ jobs:
             Content-Type: application/json; charset=UTF-8
           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 }}`\nChangelog: <${{ github.event.repository.html_url }}/blob/${{ github.ref_name }}/Changelog.md>"
             }

Changelog.md

@@ -1,5 +1,37 @@
 # Changelog
 
+## v2.40.4 (11-Aug-2023)
+
+- HTML changes:
+  - Fixed an issue where the "call lasted for X minutes" system message was unnecessarily too precise. Now, it's rounded to the nearest minute.
+  - Fixed an issue where multi-line quote blocks with empty lines in the middle were rendered as separate blocks.
+- JSON changes:
+  - Added the `users` field to the reaction object, containing an array with limited information about the users that reacted with that particular emoji. (Thanks [@slatinsky](https://github.com/slatinsky))
+
+## v2.40.3 (29-Jul-2023)
+
+- GUI changes:
+  - Fixed an issue where guild categories were rendered with blank names.
+
+## v2.40.2 (27-Jul-2023)
+
+- General changes:
+  - Improved error reporting on unexpected HTTP errors.
+- CLI changes:
+  - Fixed an issue which caused a crash when trying to export a private (but accessible) channel inside a private (but not accessible) category.
+
+## v2.40.1 (21-Jul-2023)
+
+- General changes:
+  - Fixed an issue where the fallback avatar (i.e. the avatar used for when the user doesn't have a custom one set) was not resolved properly for users that don't have a discriminator.
+- CLI changes:
+  - Added the `--include-vc` option to `exportall` and `exportguild` commands, which instructs whether to include voice-channel-accompanying text channels in the export. By default, this is set to `true` to match the previous behavior. To disable the option, use `--include-vc false`.
+- GUI changes:
+  - Replaced the blur effect applied to the token text box with a password mask.
+- JSON format changes:
+  - Added the `exportedAt` field to the export metadata, which contains the timestamp corresponding to when the export was created. (Thanks [@slatinsky](https://github.com/slatinsky))
+  - Added the `roles` field to the object describing a user. This field contains an array of objects that describe the roles assigned to the user. (Thanks [@slatinsky](https://github.com/slatinsky))
+
 ## v2.40 (08-Jun-2023)
 
 - General changes:

Directory.Build.props

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

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

@@ -12,17 +12,17 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AngleSharp" Version="1.0.3" />
+    <PackageReference Include="AngleSharp" Version="1.0.4" />
     <PackageReference Include="FluentAssertions" Version="6.11.0" />
     <PackageReference Include="GitHubActionsTestLogger" Version="2.3.2" PrivateAssets="all" />
     <PackageReference Include="JsonExtensions" Version="1.2.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="7.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
-    <PackageReference Include="ReflectionMagic" Version="4.1.0" />
+    <PackageReference Include="ReflectionMagic" Version="5.0.0" />
-    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit" Version="2.5.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" PrivateAssets="all" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0" PrivateAssets="all" />
     <PackageReference Include="coverlet.collector" Version="6.0.0" PrivateAssets="all" />
   </ItemGroup>
 

DiscordChatExporter.Cli.Tests/Infra/ExportWrapper.cs

@@ -48,23 +48,22 @@ public static class ExportWrapper
         var fileName = channelId.ToString() + '.' + format.GetFileExtension();
         var filePath = Path.Combine(DirPath, fileName);
 
-        // Lock separately for each channel and format
+        using var _ = await Locker.LockAsync(filePath);
-        using (await Locker.LockAsync(filePath))
+        using var console = new FakeConsole();
-        {
-            // Perform the export only if it hasn't been done before
-            if (!File.Exists(filePath))
-            {
-                await new ExportChannelsCommand
-                {
-                    Token = Secrets.DiscordToken,
-                    ChannelIds = new[] { channelId },
-                    ExportFormat = format,
-                    OutputPath = filePath
-                }.ExecuteAsync(new FakeConsole());
-            }
 
-            return await File.ReadAllTextAsync(filePath);
+        // Perform the export only if it hasn't been done before
+        if (!File.Exists(filePath))
+        {
+            await new ExportChannelsCommand
+            {
+                Token = Secrets.DiscordToken,
+                ChannelIds = new[] { channelId },
+                ExportFormat = format,
+                OutputPath = filePath
+            }.ExecuteAsync(console);
         }
+
+        return await File.ReadAllTextAsync(filePath);
     }
 
     public static async ValueTask<IHtmlDocument> ExportAsHtmlAsync(Snowflake channelId) => Html.Parse(

DiscordChatExporter.Cli/Commands/Base/ExportCommandBase.cs

@@ -194,7 +194,7 @@ public abstract class ExportCommandBase : DiscordCommandBase
                     try
                     {
                         await progressContext.StartTaskAsync(
-                            $"{channel.Category.Name} / {channel.Name}",
+                            $"{channel.Category} / {channel.Name}",
                             async progress =>
                             {
                                 var guild = await Discord.GetGuildAsync(channel.GuildId, innerCancellationToken);
@@ -253,7 +253,7 @@ public abstract class ExportCommandBase : DiscordCommandBase
 
             foreach (var (channel, error) in errors)
             {
-                await console.Error.WriteAsync($"{channel.Category.Name} / {channel.Name}: ");
+                await console.Error.WriteAsync($"{channel.Category} / {channel.Name}: ");
 
                 using (console.WithForegroundColor(ConsoleColor.Red))
                     await console.Error.WriteLineAsync(error);
@@ -290,7 +290,7 @@ public abstract class ExportCommandBase : DiscordCommandBase
 
                 foreach (var guildChannel in guildChannels)
                 {
-                    if (guildChannel.Category.Id == channel.Id)
+                    if (guildChannel.Parent?.Id == channel.Id)
                         channels.Add(guildChannel);
                 }
 

DiscordChatExporter.Cli/Commands/Converters/TruthyBooleanBindingConverter.cs

@@ -1,5 +1,4 @@
-using System;
+using System.Globalization;
-using System.Globalization;
 using CliFx.Extensibility;
 
 namespace DiscordChatExporter.Cli.Commands.Converters;

DiscordChatExporter.Cli/Commands/ExportAllCommand.cs

@@ -28,6 +28,12 @@ public class ExportAllCommand : ExportCommandBase
     )]
     public bool IncludeGuildChannels { get; init; } = true;
 
+    [CommandOption(
+        "include-vc",
+        Description = "Include voice channels."
+    )]
+    public bool IncludeVoiceChannels { get; init; } = true;
+
     [CommandOption(
         "data-package",
         Description =
@@ -97,6 +103,8 @@ public class ExportAllCommand : ExportCommandBase
             channels.RemoveAll(c => c.Kind.IsDirect());
         if (!IncludeGuildChannels)
             channels.RemoveAll(c => c.Kind.IsGuild());
+        if (!IncludeVoiceChannels)
+            channels.RemoveAll(c => c.Kind.IsVoice());
 
         await base.ExecuteAsync(console, channels);
     }

DiscordChatExporter.Cli/Commands/ExportGuildCommand.cs

@@ -19,6 +19,12 @@ public class ExportGuildCommand : ExportCommandBase
     )]
     public required Snowflake GuildId { get; init; }
 
+    [CommandOption(
+        "include-vc",
+        Description = "Include voice channels."
+    )]
+    public bool IncludeVoiceChannels { get; init; } = true;
+
     public override async ValueTask ExecuteAsync(IConsole console)
     {
         await base.ExecuteAsync(console);
@@ -29,6 +35,7 @@ public class ExportGuildCommand : ExportCommandBase
 
         var channels = (await Discord.GetGuildChannelsAsync(GuildId, cancellationToken))
             .Where(c => c.Kind != ChannelKind.GuildCategory)
+            .Where(c => IncludeVoiceChannels || !c.Kind.IsVoice())
             .ToArray();
 
         await base.ExecuteAsync(console, channels);

DiscordChatExporter.Cli/Commands/GetChannelsCommand.cs

@@ -32,7 +32,7 @@ public class GetChannelsCommand : DiscordCommandBase
 
         var channels = (await Discord.GetGuildChannelsAsync(GuildId, cancellationToken))
             .Where(c => c.Kind != ChannelKind.GuildCategory)
-            .OrderBy(c => c.Category.Position)
+            .OrderBy(c => c.Parent?.Position)
             .ThenBy(c => c.Name)
             .ToArray();
 
@@ -43,7 +43,7 @@ public class GetChannelsCommand : DiscordCommandBase
 
         var threads = IncludeThreads
             ? (await Discord.GetGuildThreadsAsync(GuildId, cancellationToken)).OrderBy(c => c.Name).ToArray()
-            : Array.Empty<ChannelThread>();
+            : Array.Empty<Channel>();
 
         foreach (var channel in channels)
         {
@@ -58,22 +58,22 @@ public class GetChannelsCommand : DiscordCommandBase
 
             // Channel category / name
             using (console.WithForegroundColor(ConsoleColor.White))
-                await console.Output.WriteLineAsync($"{channel.Category.Name} / {channel.Name}");
+                await console.Output.WriteLineAsync($"{channel.Category} / {channel.Name}");
 
-            var channelThreads = threads.Where(t => t.ParentId == channel.Id).ToArray();
+            var channelThreads = threads.Where(t => t.Parent?.Id == channel.Id).ToArray();
             var channelThreadIdMaxLength = channelThreads
                 .Select(t => t.Id.ToString().Length)
                 .OrderDescending()
                 .FirstOrDefault();
 
-            foreach (var thread in channelThreads)
+            foreach (var channelThread in channelThreads)
             {
                 // Indent
                 await console.Output.WriteAsync(" * ");
 
                 // Thread ID
                 await console.Output.WriteAsync(
-                    thread.Id.ToString().PadRight(channelThreadIdMaxLength, ' ')
+                    channelThread.Id.ToString().PadRight(channelThreadIdMaxLength, ' ')
                 );
 
                 // Separator
@@ -82,7 +82,7 @@ public class GetChannelsCommand : DiscordCommandBase
 
                 // Thread name
                 using (console.WithForegroundColor(ConsoleColor.White))
-                    await console.Output.WriteAsync($"Thread / {thread.Name}");
+                    await console.Output.WriteAsync($"Thread / {channelThread.Name}");
 
                 // Separator
                 using (console.WithForegroundColor(ConsoleColor.DarkGray))
@@ -90,7 +90,7 @@ public class GetChannelsCommand : DiscordCommandBase
 
                 // Thread status
                 using (console.WithForegroundColor(ConsoleColor.White))
-                    await console.Output.WriteLineAsync(thread.IsActive ? "Active" : "Archived");
+                    await console.Output.WriteLineAsync(channelThread.IsActive ? "Active" : "Archived");
             }
         }
     }

DiscordChatExporter.Cli/Commands/GetDirectChannelsCommand.cs

@@ -40,7 +40,7 @@ public class GetDirectChannelsCommand : DiscordCommandBase
 
             // Channel category / name
             using (console.WithForegroundColor(ConsoleColor.White))
-                await console.Output.WriteLineAsync($"{channel.Category.Name} / {channel.Name}");
+                await console.Output.WriteLineAsync($"{channel.Category} / {channel.Name}");
         }
     }
 }

DiscordChatExporter.Core/Discord/Data/Channel.cs

@@ -11,19 +11,38 @@ public partial record Channel(
     Snowflake Id,
     ChannelKind Kind,
     Snowflake GuildId,
-    ChannelCategory Category,
+    Channel? Parent,
     string Name,
     int? Position,
     string? IconUrl,
     string? Topic,
+    bool IsActive,
     Snowflake? LastMessageId) : IHasId
 {
-    public bool IsVoice => Kind is ChannelKind.GuildVoiceChat or ChannelKind.GuildStageVoice;
+    // Used for visual backwards-compatibility with old exports, where
+    // channels without a parent (i.e. mostly DM channels) or channels
+    // with an inaccessible parent (i.e. inside private categories) had
+    // a fallback category created for them.
+    public string Category => Parent?.Name ?? Kind switch
+    {
+        ChannelKind.GuildCategory => "Category",
+        ChannelKind.GuildTextChat => "Text",
+        ChannelKind.DirectTextChat => "Private",
+        ChannelKind.DirectGroupTextChat => "Group",
+        ChannelKind.GuildPrivateThread => "Private Thread",
+        ChannelKind.GuildPublicThread => "Public Thread",
+        ChannelKind.GuildNews => "News",
+        ChannelKind.GuildNewsThread => "News Thread",
+        _ => "Default"
+    };
+
+    // Only needed for WPF data binding. Don't use anywhere else.
+    public bool IsVoice => Kind.IsVoice();
 }
 
 public partial record Channel
 {
-    public static Channel Parse(JsonElement json, ChannelCategory? categoryHint = null, int? positionHint = null)
+    public static Channel Parse(JsonElement json, Channel? parent = null, int? positionHint = null)
     {
         var id = json.GetProperty("id").GetNonWhiteSpaceString().Pipe(Snowflake.Parse);
         var kind = (ChannelKind)json.GetProperty("type").GetInt32();
@@ -32,8 +51,6 @@ public partial record Channel
             json.GetPropertyOrNull("guild_id")?.GetNonWhiteSpaceStringOrNull()?.Pipe(Snowflake.Parse) ??
             Guild.DirectMessages.Id;
 
-        var category = categoryHint ?? ChannelCategory.CreateDefault(kind);
-
         var name =
             // Guild channel
             json.GetPropertyOrNull("name")?.GetNonWhiteSpaceStringOrNull() ??
@@ -60,6 +77,11 @@ public partial record Channel
 
         var topic = json.GetPropertyOrNull("topic")?.GetStringOrNull();
 
+        var isActive = !json
+            .GetPropertyOrNull("thread_metadata")?
+            .GetPropertyOrNull("archived")?
+            .GetBooleanOrNull() ?? true;
+
         var lastMessageId = json
             .GetPropertyOrNull("last_message_id")?
             .GetNonWhiteSpaceStringOrNull()?
@@ -69,11 +91,12 @@ public partial record Channel
             id,
             kind,
             guildId,
-            category,
+            parent,
             name,
             position,
             iconUrl,
             topic,
+            isActive,
             lastMessageId
         );
     }

DiscordChatExporter.Core/Discord/Data/ChannelCategory.cs

@@ -1,37 +0,0 @@
-using System.Text.Json;
-using DiscordChatExporter.Core.Discord.Data.Common;
-using DiscordChatExporter.Core.Utils.Extensions;
-using JsonExtensions.Reading;
-
-namespace DiscordChatExporter.Core.Discord.Data;
-
-public record ChannelCategory(Snowflake Id, string Name, int? Position) : IHasId
-{
-    public static ChannelCategory CreateDefault(ChannelKind channelKind) => new(
-        Snowflake.Zero,
-        channelKind switch
-        {
-            ChannelKind.GuildTextChat => "Text",
-            ChannelKind.DirectTextChat => "Private",
-            ChannelKind.DirectGroupTextChat => "Group",
-            ChannelKind.GuildNews => "News",
-            _ => "Default"
-        },
-        null
-    );
-
-    public static ChannelCategory Parse(JsonElement json, int? positionHint = null)
-    {
-        var id = json.GetProperty("id").GetNonWhiteSpaceString().Pipe(Snowflake.Parse);
-
-        var name =
-            json.GetPropertyOrNull("name")?.GetNonWhiteSpaceStringOrNull() ??
-            id.ToString();
-
-        var position =
-            positionHint ??
-            json.GetPropertyOrNull("position")?.GetInt32OrNull();
-
-        return new ChannelCategory(id, name, position);
-    }
-}

DiscordChatExporter.Core/Discord/Data/ChannelKind.cs

@@ -24,4 +24,7 @@ public static class ChannelKindExtensions
 
     public static bool IsGuild(this ChannelKind kind) =>
         !kind.IsDirect();
+
+    public static bool IsVoice(this ChannelKind kind) =>
+        kind is ChannelKind.GuildVoiceChat or ChannelKind.GuildStageVoice;
 }

DiscordChatExporter.Core/Discord/Data/ChannelThread.cs

@@ -1,46 +0,0 @@
-using System.Text.Json;
-using DiscordChatExporter.Core.Discord.Data.Common;
-using DiscordChatExporter.Core.Utils.Extensions;
-using JsonExtensions.Reading;
-
-namespace DiscordChatExporter.Core.Discord.Data;
-
-// https://discord.com/developers/docs/resources/channel#channel-object-example-thread-channel
-public record ChannelThread(
-    Snowflake Id,
-    ChannelKind Kind,
-    Snowflake GuildId,
-    Snowflake ParentId,
-    string Name,
-    bool IsActive,
-    Snowflake? LastMessageId) : IHasId
-{
-    public static ChannelThread Parse(JsonElement json)
-    {
-        var id = json.GetProperty("id").GetNonWhiteSpaceString().Pipe(Snowflake.Parse);
-        var kind = (ChannelKind)json.GetProperty("type").GetInt32();
-        var guildId = json.GetProperty("guild_id").GetNonWhiteSpaceString().Pipe(Snowflake.Parse);
-        var parentId = json.GetProperty("parent_id").GetNonWhiteSpaceString().Pipe(Snowflake.Parse);
-        var name = json.GetProperty("name").GetNonWhiteSpaceString();
-
-        var isActive = !json
-            .GetPropertyOrNull("thread_metadata")?
-            .GetPropertyOrNull("archived")?
-            .GetBooleanOrNull() ?? true;
-
-        var lastMessageId = json
-            .GetPropertyOrNull("last_message_id")?
-            .GetNonWhiteSpaceStringOrNull()?
-            .Pipe(Snowflake.Parse);
-
-        return new ChannelThread(
-            id,
-            kind,
-            guildId,
-            parentId,
-            name,
-            isActive,
-            lastMessageId
-        );
-    }
-}

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

@@ -47,8 +47,8 @@ public static class ImageCdn
             ? $"https://cdn.discordapp.com/avatars/{userId}/{avatarHash}.gif?size={size}"
             : $"https://cdn.discordapp.com/avatars/{userId}/{avatarHash}.png?size={size}";
 
-    public static string GetFallbackUserAvatarUrl(int discriminator) =>
+    public static string GetFallbackUserAvatarUrl(int index = 0) =>
-        $"https://cdn.discordapp.com/embed/avatars/{discriminator % 5}.png";
+        $"https://cdn.discordapp.com/embed/avatars/{index}.png";
 
     public static string GetMemberAvatarUrl(Snowflake guildId, Snowflake userId, string avatarHash, int size = 512) =>
         avatarHash.StartsWith("a_", StringComparison.Ordinal)

DiscordChatExporter.Core/Discord/Data/Guild.cs

@@ -12,7 +12,7 @@ public record Guild(Snowflake Id, string Name, string IconUrl) : IHasId
     public static Guild DirectMessages { get; } = new(
         Snowflake.Zero,
         "Direct Messages",
-        ImageCdn.GetFallbackUserAvatarUrl(0)
+        ImageCdn.GetFallbackUserAvatarUrl()
     );
 
     public static Guild Parse(JsonElement json)
@@ -25,7 +25,7 @@ public record Guild(Snowflake Id, string Name, string IconUrl) : IHasId
                 .GetPropertyOrNull("icon")?
                 .GetNonWhiteSpaceStringOrNull()?
                 .Pipe(h => ImageCdn.GetGuildIconUrl(id, h)) ??
-            ImageCdn.GetFallbackUserAvatarUrl(0);
+            ImageCdn.GetFallbackUserAvatarUrl();
 
         return new Guild(id, name, iconUrl);
     }

DiscordChatExporter.Core/Discord/Data/Member.cs

@@ -20,7 +20,8 @@ public partial record Member(
 
 public partial record Member
 {
-    public static Member CreateDefault(User user) => new(user, null, null, Array.Empty<Snowflake>());
+    public static Member CreateFallback(User user) =>
+        new(user, null, null, Array.Empty<Snowflake>());
 
     public static Member Parse(JsonElement json, Snowflake? guildId = null)
     {

DiscordChatExporter.Core/Discord/Data/User.cs

@@ -45,12 +45,14 @@ public partial record User
         var name = json.GetProperty("username").GetNonNullString();
         var displayName = json.GetPropertyOrNull("global_name")?.GetNonWhiteSpaceStringOrNull() ?? name;
 
+        var avatarIndex = discriminator % 5 ?? (int)((id.Value >> 22) % 6);
+
         var avatarUrl =
             json
                 .GetPropertyOrNull("avatar")?
                 .GetNonWhiteSpaceStringOrNull()?
                 .Pipe(h => ImageCdn.GetUserAvatarUrl(id, h)) ??
-            ImageCdn.GetFallbackUserAvatarUrl(discriminator ?? 0);
+            ImageCdn.GetFallbackUserAvatarUrl(avatarIndex);
 
         return new User(id, isBot, discriminator, name, displayName, avatarUrl);
     }

DiscordChatExporter.Core/Discord/DiscordClient.cs

@@ -108,7 +108,7 @@ public class DiscordClient
         if (botResponse.StatusCode != HttpStatusCode.Unauthorized)
             return TokenKind.Bot;
 
-        throw DiscordChatExporterException.Unauthorized();
+        throw new DiscordChatExporterException("Authentication token is invalid.", true);
     }
 
     private async ValueTask<HttpResponseMessage> GetResponseAsync(
@@ -129,10 +129,26 @@ public class DiscordClient
         {
             throw response.StatusCode switch
             {
-                HttpStatusCode.Unauthorized => DiscordChatExporterException.Unauthorized(),
+                HttpStatusCode.Unauthorized => throw new DiscordChatExporterException(
-                HttpStatusCode.Forbidden => DiscordChatExporterException.Forbidden(),
+                    "Authentication token is invalid.",
-                HttpStatusCode.NotFound => DiscordChatExporterException.NotFound(url),
+                    true
-                _ => DiscordChatExporterException.FailedHttpRequest(response)
+                ),
+
+                HttpStatusCode.Forbidden => throw new DiscordChatExporterException(
+                    $"Request to '{url}' failed: forbidden."
+                ),
+
+                HttpStatusCode.NotFound => throw new DiscordChatExporterException(
+                    $"Request to '{url}' failed: not found."
+                ),
+
+                _ => throw new DiscordChatExporterException(
+                    $"""
+                    Request to '{url}' failed: {response.StatusCode.ToString().ToSpaceSeparatedWords().ToLowerInvariant()}.
+                    Response content: {await response.Content.ReadAsStringAsync(cancellationToken)}
+                    """,
+                    true
+                )
             };
         }
 
@@ -173,17 +189,17 @@ public class DiscordClient
 
             var response = await GetJsonResponseAsync(url, cancellationToken);
 
-            var isEmpty = true;
+            var count = 0;
             foreach (var guildJson in response.EnumerateArray())
             {
                 var guild = Guild.Parse(guildJson);
                 yield return guild;
 
                 currentAfter = guild.Id;
-                isEmpty = false;
+                count++;
             }
 
-            if (isEmpty)
+            if (count <= 0)
                 yield break;
         }
     }
@@ -219,10 +235,10 @@ public class DiscordClient
                 .ThenBy(j => j.GetProperty("id").GetNonWhiteSpaceString().Pipe(Snowflake.Parse))
                 .ToArray();
 
-            var categories = channelsJson
+            var parentsById = channelsJson
                 .Where(j => j.GetProperty("type").GetInt32() == (int)ChannelKind.GuildCategory)
-                .Select((j, index) => ChannelCategory.Parse(j, index + 1))
+                .Select((j, i) => Channel.Parse(j, null, i + 1))
-                .ToDictionary(j => j.Id.ToString(), StringComparer.Ordinal);
+                .ToDictionary(j => j.Id);
 
             // Discord channel positions are relative, so we need to normalize them
             // so that the user may refer to them more easily in file name templates.
@@ -230,21 +246,19 @@ public class DiscordClient
 
             foreach (var channelJson in channelsJson)
             {
-                var parentId = channelJson
+                var parent = channelJson
                     .GetPropertyOrNull("parent_id")?
-                    .GetNonWhiteSpaceStringOrNull();
+                    .GetNonWhiteSpaceStringOrNull()?
+                    .Pipe(Snowflake.Parse)
+                    .Pipe(parentsById.GetValueOrDefault);
 
-                var category = !string.IsNullOrWhiteSpace(parentId)
+                yield return Channel.Parse(channelJson, parent, position);
-                    ? categories.GetValueOrDefault(parentId)
-                    : null;
-
-                yield return Channel.Parse(channelJson, category, position);
                 position++;
             }
         }
     }
 
-    public async IAsyncEnumerable<ChannelThread> GetGuildThreadsAsync(
+    public async IAsyncEnumerable<Channel> GetGuildThreadsAsync(
         Snowflake guildId,
         [EnumeratorCancellation] CancellationToken cancellationToken = default)
     {
@@ -264,13 +278,14 @@ public class DiscordClient
                         .SetQueryParameter("offset", currentOffset.ToString())
                         .Build();
 
+                    // Can be null on channels that the user cannot access
                     var response = await TryGetJsonResponseAsync(url, cancellationToken);
                     if (response is null)
                         break;
 
                     foreach (var threadJson in response.Value.GetProperty("threads").EnumerateArray())
                     {
-                        yield return ChannelThread.Parse(threadJson);
+                        yield return Channel.Parse(threadJson, channel);
                         currentOffset++;
                     }
 
@@ -284,9 +299,19 @@ public class DiscordClient
         {
             // Active threads
             {
+                var parentsById = channels.ToDictionary(c => c.Id);
+
                 var response = await GetJsonResponseAsync($"guilds/{guildId}/threads/active", cancellationToken);
                 foreach (var threadJson in response.GetProperty("threads").EnumerateArray())
-                    yield return ChannelThread.Parse(threadJson);
+                {
+                    var parent = threadJson
+                        .GetPropertyOrNull("parent_id")?
+                        .GetNonWhiteSpaceStringOrNull()?
+                        .Pipe(Snowflake.Parse)
+                        .Pipe(parentsById.GetValueOrDefault);
+
+                    yield return Channel.Parse(threadJson, parent);
+                }
             }
 
             foreach (var channel in channels)
@@ -299,7 +324,7 @@ public class DiscordClient
                     );
 
                     foreach (var threadJson in response.GetProperty("threads").EnumerateArray())
-                        yield return ChannelThread.Parse(threadJson);
+                        yield return Channel.Parse(threadJson, channel);
                 }
 
                 // Private archived threads
@@ -310,7 +335,7 @@ public class DiscordClient
                     );
 
                     foreach (var threadJson in response.GetProperty("threads").EnumerateArray())
-                        yield return ChannelThread.Parse(threadJson);
+                        yield return Channel.Parse(threadJson, channel);
                 }
             }
         }
@@ -340,7 +365,7 @@ public class DiscordClient
         return response?.Pipe(j => Member.Parse(j, guildId));
     }
 
-    public async ValueTask<Invite?> TryGetGuildInviteAsync(
+    public async ValueTask<Invite?> TryGetInviteAsync(
         string code,
         CancellationToken cancellationToken = default)
     {
@@ -348,23 +373,6 @@ public class DiscordClient
         return response?.Pipe(Invite.Parse);
     }
 
-    public async ValueTask<ChannelCategory> GetChannelCategoryAsync(
-        Snowflake channelId,
-        CancellationToken cancellationToken = default)
-    {
-        try
-        {
-            var response = await GetJsonResponseAsync($"channels/{channelId}", cancellationToken);
-            return ChannelCategory.Parse(response);
-        }
-        // In some cases, Discord API returns an empty body when requesting a channel.
-        // Use an empty channel category as fallback for these cases.
-        catch (DiscordChatExporterException)
-        {
-            return new ChannelCategory(channelId, "Unknown Category", 0);
-        }
-    }
-
     public async ValueTask<Channel> GetChannelAsync(
         Snowflake channelId,
         CancellationToken cancellationToken = default)
@@ -376,11 +384,21 @@ public class DiscordClient
             .GetNonWhiteSpaceStringOrNull()?
             .Pipe(Snowflake.Parse);
 
-        var category = parentId is not null
+        try
-            ? await GetChannelCategoryAsync(parentId.Value, cancellationToken)
+        {
-            : null;
+            var parent = parentId is not null
+                ? await GetChannelAsync(parentId.Value, cancellationToken)
+                : null;
 
-        return Channel.Parse(response, category);
+            return Channel.Parse(response, parent);
+        }
+        // It's possible for the parent channel to be inaccessible, despite the
+        // child channel being accessible.
+        // https://github.com/Tyrrrz/DiscordChatExporter/issues/1108
+        catch (DiscordChatExporterException)
+        {
+            return Channel.Parse(response);
+        }
     }
 
     private async ValueTask<Message?> TryGetLastMessageAsync(
@@ -466,4 +484,44 @@ public class DiscordClient
             }
         }
     }
+
+    public async IAsyncEnumerable<User> GetMessageReactionsAsync(
+        Snowflake channelId,
+        Snowflake messageId,
+        Emoji emoji,
+        [EnumeratorCancellation] CancellationToken cancellationToken = default)
+    {
+        var reactionName = emoji.Id is not null
+            // Custom emoji
+            ? emoji.Name + ':' + emoji.Id
+            // Standard emoji
+            : emoji.Name;
+
+        var currentAfter = Snowflake.Zero;
+        while (true)
+        {
+            var url = new UrlBuilder()
+                .SetPath($"channels/{channelId}/messages/{messageId}/reactions/{Uri.EscapeDataString(reactionName)}")
+                .SetQueryParameter("limit", "100")
+                .SetQueryParameter("after", currentAfter.ToString())
+                .Build();
+
+            var response = await GetJsonResponseAsync(url, cancellationToken);
+
+            var count = 0;
+            foreach (var userJson in response.EnumerateArray())
+            {
+                var user = User.Parse(userJson);
+                yield return user;
+
+                currentAfter = user.Id;
+                count++;
+            }
+
+            // Each batch can contain up to 100 users.
+            // If we got fewer, then it's definitely the last batch.
+            if (count < 100)
+                yield break;
+        }
+    }
 }

DiscordChatExporter.Core/DiscordChatExporter.Core.csproj

@@ -4,11 +4,11 @@
     <PackageReference Include="AsyncKeyedLock" Version="6.2.1" />
     <PackageReference Include="Gress" Version="2.1.1" />
     <PackageReference Include="JsonExtensions" Version="1.2.0" />
-    <PackageReference Include="Polly" Version="7.2.3" />
+    <PackageReference Include="Polly" Version="7.2.4" />
     <PackageReference Include="RazorBlade" Version="0.4.3" />
     <PackageReference Include="Superpower" Version="3.0.0" />
     <PackageReference Include="WebMarkupMin.Core" Version="2.14.0" />
-    <PackageReference Include="YoutubeExplode" Version="6.2.15" />
+    <PackageReference Include="YoutubeExplode" Version="6.3.1" />
   </ItemGroup>
 
 </Project>

DiscordChatExporter.Core/Exceptions/DiscordChatExporterException.cs

@@ -1,9 +1,8 @@
 using System;
-using System.Net.Http;
 
 namespace DiscordChatExporter.Core.Exceptions;
 
-public partial class DiscordChatExporterException : Exception
+public class DiscordChatExporterException : Exception
 {
     public bool IsFatal { get; }
 
@@ -12,33 +11,4 @@ public partial class DiscordChatExporterException : Exception
     {
         IsFatal = isFatal;
     }
-}
-
-public partial class DiscordChatExporterException
-{
-    internal static DiscordChatExporterException FailedHttpRequest(HttpResponseMessage response)
-    {
-        var message = $@"
-Failed to perform an HTTP request.
-
-[Request]
-{response.RequestMessage}
-
-[Response]
-{response}";
-
-        return new DiscordChatExporterException(message.Trim(), true);
-    }
-
-    internal static DiscordChatExporterException Unauthorized() =>
-        new("Authentication token is invalid.", true);
-
-    internal static DiscordChatExporterException Forbidden() =>
-        new("Access is forbidden.");
-
-    internal static DiscordChatExporterException NotFound(string resourceId) =>
-        new($"Requested resource ({resourceId}) does not exist.");
-
-    internal static DiscordChatExporterException ChannelIsEmpty() =>
-        new("Channel is empty or contains no messages for the specified period.");
 }

DiscordChatExporter.Core/Exporting/ChannelExporter.cs

@@ -20,11 +20,19 @@ public class ChannelExporter
     {
         // Check if the channel is empty
         if (request.Channel.LastMessageId is null)
-            throw DiscordChatExporterException.ChannelIsEmpty();
+        {
+            throw new DiscordChatExporterException(
+                "Channel does not contain any messages."
+            );
+        }
 
         // Check if the 'after' boundary is valid
         if (request.After is not null && request.Channel.LastMessageId < request.After)
-            throw DiscordChatExporterException.ChannelIsEmpty();
+        {
+            throw new DiscordChatExporterException(
+                "Channel does not contain any messages within the specified period."
+            );
+        }
 
         // Build context
         var context = new ExportContext(_discord, request);
@@ -50,6 +58,10 @@ public class ChannelExporter
 
         // Throw if no messages were exported
         if (messageExporter.MessagesExported <= 0)
-            throw DiscordChatExporterException.ChannelIsEmpty();
+        {
+            throw new DiscordChatExporterException(
+                "Channel does not contain any matching messages within the specified period."
+            );
+        }
     }
 }

DiscordChatExporter.Core/Exporting/ExportAssetDownloader.cs

@@ -38,50 +38,49 @@ internal partial class ExportAssetDownloader
         var fileName = GetFileNameFromUrl(url);
         var filePath = Path.Combine(_workingDirPath, fileName);
 
-        using (await Locker.LockAsync(filePath, cancellationToken))
+        using var _ = await Locker.LockAsync(filePath, cancellationToken);
-        {
-            if (_pathCache.TryGetValue(url, out var cachedFilePath))
-                return cachedFilePath;
 
-            // Reuse existing files if we're allowed to
+        if (_pathCache.TryGetValue(url, out var cachedFilePath))
-            if (_reuse && File.Exists(filePath))
+            return cachedFilePath;
-                return _pathCache[url] = filePath;
-
-            Directory.CreateDirectory(_workingDirPath);
-
-            await Http.ResiliencePolicy.ExecuteAsync(async () =>
-            {
-                // Download the file
-                using var response = await Http.Client.GetAsync(url, cancellationToken);
-                await using (var output = File.Create(filePath))
-                    await response.Content.CopyToAsync(output, cancellationToken);
-
-                // Try to set the file date according to the last-modified header
-                try
-                {
-                    var lastModified = response.Content.Headers.TryGetValue("Last-Modified")?.Pipe(s =>
-                        DateTimeOffset.TryParse(s, CultureInfo.InvariantCulture, DateTimeStyles.None, out var instant)
-                            ? instant
-                            : (DateTimeOffset?)null
-                    );
-
-                    if (lastModified is not null)
-                    {
-                        File.SetCreationTimeUtc(filePath, lastModified.Value.UtcDateTime);
-                        File.SetLastWriteTimeUtc(filePath, lastModified.Value.UtcDateTime);
-                        File.SetLastAccessTimeUtc(filePath, lastModified.Value.UtcDateTime);
-                    }
-                }
-                catch
-                {
-                    // This can apparently fail for some reason.
-                    // Updating the file date is not a critical task, so we'll just ignore exceptions thrown here.
-                    // https://github.com/Tyrrrz/DiscordChatExporter/issues/585
-                }
-            });
 
+        // Reuse existing files if we're allowed to
+        if (_reuse && File.Exists(filePath))
             return _pathCache[url] = filePath;
-        }
+
+        Directory.CreateDirectory(_workingDirPath);
+
+        await Http.ResiliencePolicy.ExecuteAsync(async () =>
+        {
+            // Download the file
+            using var response = await Http.Client.GetAsync(url, cancellationToken);
+            await using (var output = File.Create(filePath))
+                await response.Content.CopyToAsync(output, cancellationToken);
+
+            // Try to set the file date according to the last-modified header
+            try
+            {
+                var lastModified = response.Content.Headers.TryGetValue("Last-Modified")?.Pipe(s =>
+                    DateTimeOffset.TryParse(s, CultureInfo.InvariantCulture, DateTimeStyles.None, out var instant)
+                        ? instant
+                        : (DateTimeOffset?)null
+                );
+
+                if (lastModified is not null)
+                {
+                    File.SetCreationTimeUtc(filePath, lastModified.Value.UtcDateTime);
+                    File.SetLastWriteTimeUtc(filePath, lastModified.Value.UtcDateTime);
+                    File.SetLastAccessTimeUtc(filePath, lastModified.Value.UtcDateTime);
+                }
+            }
+            catch
+            {
+                // This can apparently fail for some reason.
+                // Updating the file date is not a critical task, so we'll just ignore exceptions thrown here.
+                // https://github.com/Tyrrrz/DiscordChatExporter/issues/585
+            }
+        });
+
+        return _pathCache[url] = filePath;
     }
 }
 

DiscordChatExporter.Core/Exporting/ExportContext.cs

@@ -63,7 +63,7 @@ internal class ExportContext
 
             // User may have been deleted since they were mentioned
             if (user is not null)
-                member = Member.CreateDefault(user);
+                member = Member.CreateFallback(user);
         }
 
         // Store the result even if it's null, to avoid re-fetching non-existing members
@@ -89,22 +89,17 @@ internal class ExportContext
 
     public Role? TryGetRole(Snowflake id) => _roles.GetValueOrDefault(id);
 
-    public Color? TryGetUserColor(Snowflake id)
+    public IReadOnlyList<Role> GetUserRoles(Snowflake id) => TryGetMember(id)?
-    {
+        .RoleIds
-        var member = TryGetMember(id);
+        .Select(TryGetRole)
+        .WhereNotNull()
+        .OrderByDescending(r => r.Position)
+        .ToArray() ?? Array.Empty<Role>();
 
-        var memberRoles = member?
+    public Color? TryGetUserColor(Snowflake id) => GetUserRoles(id)
-            .RoleIds
+        .Where(r => r.Color is not null)
-            .Select(TryGetRole)
+        .Select(r => r.Color)
-            .WhereNotNull()
+        .FirstOrDefault();
-            .ToArray();
-
-        return memberRoles?
-            .Where(r => r.Color is not null)
-            .OrderByDescending(r => r.Position)
-            .Select(r => r.Color)
-            .FirstOrDefault();
-    }
 
     public async ValueTask<string> ResolveAssetUrlAsync(string url, CancellationToken cancellationToken = default)
     {
@@ -117,7 +112,7 @@ internal class ExportContext
             var relativeFilePath = Path.GetRelativePath(Request.OutputDirPath, filePath);
 
             // Prefer relative paths so that the output files can be copied around without breaking references.
-            // If the assets path is outside of the export directory, use an absolute path instead.
+            // If the asset directory is outside of the export directory, use an absolute path instead.
             var optimalFilePath =
                 relativeFilePath.StartsWith(".." + Path.DirectorySeparatorChar, StringComparison.Ordinal) ||
                 relativeFilePath.StartsWith(".." + Path.AltDirectorySeparatorChar, StringComparison.Ordinal)

DiscordChatExporter.Core/Exporting/ExportRequest.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Globalization;
 using System.IO;
 using System.Text;
 using System.Text.RegularExpressions;
@@ -102,7 +103,7 @@ public partial class ExportRequest
         var buffer = new StringBuilder();
 
         // Guild and channel names
-        buffer.Append($"{guild.Name} - {channel.Category.Name} - {channel.Name} [{channel.Id}]");
+        buffer.Append($"{guild.Name} - {channel.Category} - {channel.Name} [{channel.Id}]");
 
         // Date range
         if (after is not null || before is not null)
@@ -148,15 +149,15 @@ public partial class ExportRequest
             {
                 "%g" => guild.Id.ToString(),
                 "%G" => guild.Name,
-                "%t" => channel.Category.Id.ToString(),
+                "%t" => channel.Parent?.Id.ToString() ?? "",
-                "%T" => channel.Category.Name,
+                "%T" => channel.Parent?.Name ?? "",
                 "%c" => channel.Id.ToString(),
                 "%C" => channel.Name,
-                "%p" => channel.Position?.ToString() ?? "0",
+                "%p" => channel.Position?.ToString(CultureInfo.InvariantCulture) ?? "0",
-                "%P" => channel.Category.Position?.ToString() ?? "0",
+                "%P" => channel.Parent?.Position?.ToString(CultureInfo.InvariantCulture) ?? "0",
-                "%a" => after?.ToDate().ToString("yyyy-MM-dd") ?? "",
+                "%a" => after?.ToDate().ToString("yyyy-MM-dd", CultureInfo.InvariantCulture) ?? "",
-                "%b" => before?.ToDate().ToString("yyyy-MM-dd") ?? "",
+                "%b" => before?.ToDate().ToString("yyyy-MM-dd", CultureInfo.InvariantCulture) ?? "",
-                "%d" => DateTimeOffset.Now.ToString("yyyy-MM-dd"),
+                "%d" => DateTimeOffset.Now.ToString("yyyy-MM-dd", CultureInfo.InvariantCulture),
                 "%%" => "%",
                 _ => m.Value
             })

DiscordChatExporter.Core/Exporting/HtmlMarkdownVisitor.cs

@@ -261,7 +261,7 @@ internal partial class HtmlMarkdownVisitor : MarkdownVisitor
         else if (mention.Kind == MentionKind.Channel)
         {
             var channel = mention.TargetId?.Pipe(_context.TryGetChannel);
-            var symbol = channel?.IsVoice == true ? "🔊" : "#";
+            var symbol = channel?.Kind.IsVoice() == true ? "🔊" : "#";
             var name = channel?.Name ?? "deleted-channel";
 
             _buffer.Append(

DiscordChatExporter.Core/Exporting/JsonMessageWriter.cs

@@ -1,4 +1,5 @@
-using System.IO;
+using System.Collections.Generic;
+using System.IO;
 using System.Text.Encodings.Web;
 using System.Text.Json;
 using System.Threading;
@@ -48,6 +49,9 @@ internal class JsonMessageWriter : MessageWriter
         _writer.WriteString("color", Context.TryGetUserColor(user.Id)?.ToHex());
         _writer.WriteBoolean("isBot", user.IsBot);
 
+        _writer.WritePropertyName("roles");
+        await WriteRolesAsync(Context.GetUserRoles(user.Id), cancellationToken);
+
         _writer.WriteString(
             "avatarUrl",
             await Context.ResolveAssetUrlAsync(
@@ -60,6 +64,28 @@ internal class JsonMessageWriter : MessageWriter
         await _writer.FlushAsync(cancellationToken);
     }
 
+    private async ValueTask WriteRolesAsync(
+        IReadOnlyList<Role> roles,
+        CancellationToken cancellationToken = default)
+    {
+        _writer.WriteStartArray();
+
+        foreach (var role in roles)
+        {
+            _writer.WriteStartObject();
+
+            _writer.WriteString("id", role.Id.ToString());
+            _writer.WriteString("name", role.Name);
+            _writer.WriteString("color", role.Color?.ToHex());
+            _writer.WriteNumber("position", role.Position);
+
+            _writer.WriteEndObject();
+        }
+
+        _writer.WriteEndArray();
+        await _writer.FlushAsync(cancellationToken);
+    }
+
     private async ValueTask WriteEmbedAuthorAsync(
         EmbedAuthor embedAuthor,
         CancellationToken cancellationToken = default)
@@ -215,8 +241,8 @@ internal class JsonMessageWriter : MessageWriter
         _writer.WriteStartObject("channel");
         _writer.WriteString("id", Context.Request.Channel.Id.ToString());
         _writer.WriteString("type", Context.Request.Channel.Kind.ToString());
-        _writer.WriteString("categoryId", Context.Request.Channel.Category.Id.ToString());
+        _writer.WriteString("categoryId", Context.Request.Channel.Parent?.Id.ToString());
-        _writer.WriteString("category", Context.Request.Channel.Category.Name);
+        _writer.WriteString("category", Context.Request.Channel.Category);
         _writer.WriteString("name", Context.Request.Channel.Name);
         _writer.WriteString("topic", Context.Request.Channel.Topic);
 
@@ -236,6 +262,9 @@ internal class JsonMessageWriter : MessageWriter
         _writer.WriteString("before", Context.Request.Before?.ToDate());
         _writer.WriteEndObject();
 
+        // Timestamp
+        _writer.WriteString("exportedAt", System.DateTimeOffset.UtcNow);
+
         // Message array (start)
         _writer.WriteStartArray("messages");
         await _writer.FlushAsync(cancellationToken);
@@ -331,6 +360,36 @@ internal class JsonMessageWriter : MessageWriter
 
             _writer.WriteNumber("count", reaction.Count);
 
+            _writer.WriteStartArray("users");
+            await foreach (var user in Context.Discord.GetMessageReactionsAsync(
+                               Context.Request.Channel.Id,
+                               message.Id,
+                               reaction.Emoji,
+                               cancellationToken))
+            {
+                _writer.WriteStartObject();
+
+                // Write limited user information without color and roles,
+                // so we can avoid fetching guild member information for each user.
+                _writer.WriteString("id", user.Id.ToString());
+                _writer.WriteString("name", user.Name);
+                _writer.WriteString("discriminator", user.DiscriminatorFormatted);
+                _writer.WriteString("nickname", Context.TryGetMember(user.Id)?.DisplayName ?? user.DisplayName);
+                _writer.WriteBoolean("isBot", user.IsBot);
+
+                _writer.WriteString(
+                    "avatarUrl",
+                    await Context.ResolveAssetUrlAsync(
+                        Context.TryGetMember(user.Id)?.AvatarUrl ?? user.AvatarUrl,
+                        cancellationToken
+                    )
+                );
+
+                _writer.WriteEndObject();
+            }
+
+            _writer.WriteEndArray();
+
             _writer.WriteEndObject();
         }
 

DiscordChatExporter.Core/Exporting/MessageGroupTemplate.cshtml

@@ -1,5 +1,6 @@
 @using System
 @using System.Collections.Generic
+@using System.Globalization
 @using System.Linq
 @using System.Threading.Tasks
 @using DiscordChatExporter.Core.Discord.Data
@@ -99,7 +100,7 @@
                         }
                         else if (message.Kind == MessageKind.Call)
                         {
-                            <span>started a call that lasted @(((message.CallEndedTimestamp ?? message.Timestamp) - message.Timestamp).TotalMinutes) minutes</span>
+                            <span>started a call that lasted @(((message.CallEndedTimestamp ?? message.Timestamp) - message.Timestamp).TotalMinutes.ToString("n0", CultureInfo.InvariantCulture)) minutes</span>
                         }
                         else if (message.Kind == MessageKind.ChannelNameChange)
                         {
@@ -321,7 +322,7 @@
 
                         foreach (var inviteCode in inviteCodes)
                         {
-                            var invite = await Context.Discord.TryGetGuildInviteAsync(inviteCode, CancellationToken);
+                            var invite = await Context.Discord.TryGetInviteAsync(inviteCode, CancellationToken);
                             if (invite is null)
                             {
                                 continue;

DiscordChatExporter.Core/Exporting/PlainTextMarkdownVisitor.cs

@@ -1,6 +1,7 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using DiscordChatExporter.Core.Discord.Data;
 using DiscordChatExporter.Core.Markdown;
 using DiscordChatExporter.Core.Markdown.Parsing;
 using DiscordChatExporter.Core.Utils.Extensions;
@@ -71,7 +72,7 @@ internal partial class PlainTextMarkdownVisitor : MarkdownVisitor
             _buffer.Append($"#{name}");
 
             // Voice channel marker
-            if (channel?.IsVoice == true)
+            if (channel?.Kind.IsVoice() == true)
                 _buffer.Append(" [voice]");
         }
         else if (mention.Kind == MentionKind.Role)

DiscordChatExporter.Core/Exporting/PlainTextMessageExtensions.cs

@@ -1,4 +1,5 @@
-using System.Linq;
+using System.Globalization;
+using System.Linq;
 using DiscordChatExporter.Core.Discord.Data;
 using DiscordChatExporter.Core.Utils.Extensions;
 
@@ -19,7 +20,13 @@ internal static class PlainTextMessageExtensions
             : "Removed a recipient.",
 
         MessageKind.Call =>
-            $"Started a call that lasted {message.CallEndedTimestamp?.Pipe(t => t - message.Timestamp).Pipe(t => (int)t.TotalMinutes) ?? 0} minutes.",
+            $"Started a call that lasted {
+                message
+                    .CallEndedTimestamp?
+                    .Pipe(t => t - message.Timestamp)
+                    .Pipe(t => t.TotalMinutes)
+                    .ToString("n0", CultureInfo.InvariantCulture) ?? "0"
+            } minutes.",
 
         MessageKind.ChannelNameChange =>
             !string.IsNullOrWhiteSpace(message.Content)

DiscordChatExporter.Core/Exporting/PlainTextMessageWriter.cs

@@ -193,7 +193,7 @@ internal class PlainTextMessageWriter : MessageWriter
     {
         await _writer.WriteLineAsync(new string('=', 62));
         await _writer.WriteLineAsync($"Guild: {Context.Request.Guild.Name}");
-        await _writer.WriteLineAsync($"Channel: {Context.Request.Channel.Category.Name} / {Context.Request.Channel.Name}");
+        await _writer.WriteLineAsync($"Channel: {Context.Request.Channel.Category} / {Context.Request.Channel.Name}");
 
         if (!string.IsNullOrWhiteSpace(Context.Request.Channel.Topic))
         {

DiscordChatExporter.Core/Exporting/PostambleTemplate.cshtml

@@ -14,7 +14,7 @@
 <!--/wmm:ignore-->
 
 <div class="postamble">
-    <div class="postamble__entry">Exported @MessagesWritten.ToString("N0") message(s)</div>
+    <div class="postamble__entry">Exported @MessagesWritten.ToString("n0") message(s)</div>
 </div>
 
 </body>

DiscordChatExporter.Core/Exporting/PreambleTemplate.cshtml

@@ -1004,7 +1004,7 @@
     </div>
     <div class="preamble__entries-container">
         <div class="preamble__entry">@Context.Request.Guild.Name</div>
-        <div class="preamble__entry">@Context.Request.Channel.Category.Name / @Context.Request.Channel.Name</div>
+        <div class="preamble__entry">@Context.Request.Channel.Category / @Context.Request.Channel.Name</div>
 
         @if (!string.IsNullOrWhiteSpace(Context.Request.Channel.Topic))
         {

DiscordChatExporter.Core/Markdown/Parsing/MarkdownParser.cs

@@ -12,7 +12,7 @@ namespace DiscordChatExporter.Core.Markdown.Parsing;
 // Discord does NOT use a recursive-descent parser for markdown which becomes evident in some
 // scenarios, like when multiple formatting nodes are nested together.
 // To replicate Discord's behavior, we're employing a special parser that uses a set of regular
-// expressions that are executed sequentially in a first-match-first-serve manner.
+// expressions that are executed sequentially in a first-matched-first-served manner.
 internal static partial class MarkdownParser
 {
     private const RegexOptions DefaultRegexOptions =
@@ -83,7 +83,9 @@ internal static partial class MarkdownParser
 
     private static readonly IMatcher<MarkdownNode> RepeatedSingleLineQuoteNodeMatcher = new RegexMatcher<MarkdownNode>(
         // Include the linebreaks in the content, so that the lines are preserved in quotes.
-        new Regex(@"(?:^>\s(.+\n?)){2,}", DefaultRegexOptions),
+        // Empty content is allowed within quotes.
+        // https://github.com/Tyrrrz/DiscordChatExporter/issues/1115
+        new Regex(@"(?:^>\s(.*\n?)){2,}", DefaultRegexOptions),
         (s, m) => new FormattingNode(
             FormattingKind.Quote,
             m.Groups[1].Captures.SelectMany(c => Parse(s.Relocate(c))).ToArray()
@@ -262,6 +264,7 @@ internal static partial class MarkdownParser
     private static readonly IMatcher<MarkdownNode> EscapedSymbolTextNodeMatcher = new RegexMatcher<MarkdownNode>(
         // Capture any "symbol/other" character or surrogate pair preceded by a backslash.
         // This escapes them from matching for emoji.
+        // https://github.com/Tyrrrz/DiscordChatExporter/issues/230
         new Regex(@"\\(\p{So}|\p{Cs}{2})", DefaultRegexOptions),
         (_, m) => new TextNode(m.Groups[1].Value)
     );

DiscordChatExporter.Core/Utils/Extensions/BinaryExtensions.cs

@@ -1,15 +1,20 @@
-using System.Text;
+using System.Globalization;
+using System.Text;
 
 namespace DiscordChatExporter.Core.Utils.Extensions;
 
 public static class BinaryExtensions
 {
-    public static string ToHex(this byte[] data)
+    public static string ToHex(this byte[] data, bool isUpperCase = true)
     {
         var buffer = new StringBuilder(2 * data.Length);
 
-        foreach (var t in data)
+        foreach (var b in data)
-            buffer.Append(t.ToString("X2"));
+        {
+            buffer.Append(
+                b.ToString(isUpperCase ? "X2" : "x2", CultureInfo.InvariantCulture)
+            );
+        }
 
         return buffer.ToString();
     }

DiscordChatExporter.Core/Utils/Extensions/StringExtensions.cs

@@ -16,6 +16,21 @@ public static class StringExtensions
             ? str[..charCount]
             : str;
 
+    public static string ToSpaceSeparatedWords(this string str)
+    {
+        var builder = new StringBuilder(str.Length * 2);
+
+        foreach (var c in str)
+        {
+            if (char.IsUpper(c) && builder.Length > 0)
+                builder.Append(' ');
+
+            builder.Append(c);
+        }
+
+        return builder.ToString();
+    }
+
     public static IEnumerable<Rune> GetRunes(this string str)
     {
         var lastIndex = 0;

DiscordChatExporter.Gui/Bootstrapper.cs

@@ -31,12 +31,12 @@ public class Bootstrapper : Bootstrapper<RootViewModel>
     }
 
 #if !DEBUG
-    protected override void OnUnhandledException(DispatcherUnhandledExceptionEventArgs e)
+    protected override void OnUnhandledException(DispatcherUnhandledExceptionEventArgs args)
     {
-        base.OnUnhandledException(e);
+        base.OnUnhandledException(args);
 
         MessageBox.Show(
-            e.Exception.ToString(),
+            args.Exception.ToString(),
             "Error occured",
             MessageBoxButton.OK,
             MessageBoxImage.Error

DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj

@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Cogwheel" Version="2.0.2" />
+    <PackageReference Include="Cogwheel" Version="2.0.3" />
     <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" />
@@ -21,7 +21,7 @@
     <PackageReference Include="MaterialDesignThemes" Version="4.9.0" />
     <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.9" />
+    <PackageReference Include="Onova" Version="2.6.10" />
     <PackageReference Include="PropertyChanged.Fody" Version="4.1.0" PrivateAssets="all" />
     <PackageReference Include="Stylet" Version="1.3.6" />
   </ItemGroup>

DiscordChatExporter.Gui/Services/SettingsService.cs

@@ -46,10 +46,13 @@ public partial class SettingsService : SettingsBase
     public override void Save()
     {
         // Clear the token if it's not supposed to be persisted
+        var lastToken = LastToken;
         if (!IsTokenPersisted)
             LastToken = null;
 
         base.Save();
+
+        LastToken = lastToken;
     }
 }
 

DiscordChatExporter.Gui/ViewModels/Components/DashboardViewModel.cs

@@ -38,8 +38,6 @@ public class DashboardViewModel : PropertyChangedBase
 
     public string? Token { get; set; }
 
-    public bool IsTokenSet => !string.IsNullOrWhiteSpace(Token);
-
     private IReadOnlyDictionary<Guild, IReadOnlyList<Channel>>? ChannelsByGuild { get; set; }
 
     public IReadOnlyList<Guild>? AvailableGuilds => ChannelsByGuild?.Keys.ToArray();
@@ -67,8 +65,15 @@ public class DashboardViewModel : PropertyChangedBase
 
         _progressMuxer = Progress.CreateMuxer().WithAutoReset();
 
-        this.Bind(o => o.IsBusy, (_, _) => NotifyOfPropertyChange(() => IsProgressIndeterminate));
+        this.Bind(
-        Progress.Bind(o => o.Current, (_, _) => NotifyOfPropertyChange(() => IsProgressIndeterminate));
+            o => o.IsBusy,
+            (_, _) => NotifyOfPropertyChange(() => IsProgressIndeterminate)
+        );
+
+        Progress.Bind(
+            o => o.Current,
+            (_, _) => NotifyOfPropertyChange(() => IsProgressIndeterminate)
+        );
     }
 
     public void OnViewLoaded()

DiscordChatExporter.Gui/Views/Components/DashboardView.xaml

@@ -6,6 +6,7 @@
     xmlns:behaviors="clr-namespace:DiscordChatExporter.Gui.Behaviors"
     xmlns:componentModel="clr-namespace:System.ComponentModel;assembly=WindowsBase"
     xmlns:components="clr-namespace:DiscordChatExporter.Gui.ViewModels.Components"
+    xmlns:controls="clr-namespace:DiscordChatExporter.Gui.Views.Controls"
     xmlns:converters="clr-namespace:DiscordChatExporter.Gui.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:data="clr-namespace:DiscordChatExporter.Core.Discord.Data;assembly=DiscordChatExporter.Core"
@@ -28,7 +29,7 @@
         <!--  Sort guild channels by position  -->
         <CollectionViewSource x:Key="AvailableChannelsViewSource" Source="{Binding AvailableChannels, Mode=OneWay}">
             <CollectionViewSource.GroupDescriptions>
-                <PropertyGroupDescription PropertyName="Category.Name" />
+                <PropertyGroupDescription PropertyName="Category" />
             </CollectionViewSource.GroupDescriptions>
             <CollectionViewSource.SortDescriptions>
                 <componentModel:SortDescription Direction="Ascending" PropertyName="Position" />
@@ -52,7 +53,6 @@
                 <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
 
-            <!--  Token and pull data button  -->
             <materialDesign:Card
                 Grid.Row="0"
                 Grid.Column="0"
@@ -74,39 +74,30 @@
                         Foreground="{DynamicResource PrimaryHueMidBrush}"
                         Kind="Key" />
 
-                    <!--  Token value  -->
+                    <!--  Token  -->
-                    <TextBox
+                    <controls:RevealablePasswordBox
                         x:Name="TokenValueTextBox"
                         Grid.Column="1"
                         Margin="0,6,6,8"
                         VerticalAlignment="Bottom"
                         materialDesign:HintAssist.Hint="Token"
-                        materialDesign:TextFieldAssist.DecorationVisibility="Hidden"
-                        materialDesign:TextFieldAssist.TextBoxViewMargin="0,0,2,0"
                         BorderThickness="0"
+                        FontFamily="Consolas"
                         FontSize="16"
-                        Text="{Binding Token, UpdateSourceTrigger=PropertyChanged}">
+                        Password="{Binding Token, UpdateSourceTrigger=PropertyChanged}">
-                        <TextBox.Style>
+                        <controls:RevealablePasswordBox.Style>
-                            <Style BasedOn="{StaticResource {x:Type TextBox}}" TargetType="{x:Type TextBox}">
+                            <Style TargetType="{x:Type controls:RevealablePasswordBox}">
                                 <Style.Triggers>
-                                    <!--  Blur the token when it's out of focus  -->
+                                    <DataTrigger Binding="{Binding IsMouseOver, RelativeSource={RelativeSource AncestorType=materialDesign:Card}}" Value="True">
-                                    <MultiDataTrigger>
+                                        <Setter Property="IsRevealed" Value="True" />
-                                        <MultiDataTrigger.Conditions>
+                                    </DataTrigger>
-                                            <Condition Binding="{Binding IsMouseOver, RelativeSource={RelativeSource AncestorType=materialDesign:Card}}" Value="False" />
+                                    <DataTrigger Binding="{Binding IsKeyboardFocusWithin, RelativeSource={RelativeSource AncestorType=materialDesign:Card}}" Value="True">
-                                            <Condition Binding="{Binding IsFocused, RelativeSource={RelativeSource Self}}" Value="False" />
+                                        <Setter Property="IsRevealed" Value="True" />
-                                            <!--  Don't blur if the token is not set, so the user can see the hint text  -->
+                                    </DataTrigger>
-                                            <Condition Binding="{Binding IsTokenSet}" Value="True" />
-                                        </MultiDataTrigger.Conditions>
-                                        <Setter Property="Effect">
-                                            <Setter.Value>
-                                                <BlurEffect Radius="12" />
-                                            </Setter.Value>
-                                        </Setter>
-                                    </MultiDataTrigger>
                                 </Style.Triggers>
                             </Style>
-                        </TextBox.Style>
+                        </controls:RevealablePasswordBox.Style>
-                    </TextBox>
+                    </controls:RevealablePasswordBox>
 
                     <!--  Pull data button  -->
                     <Button

DiscordChatExporter.Gui/Views/Controls/RevealablePasswordBox.xaml

@@ -0,0 +1,24 @@
+<UserControl
+    x:Class="DiscordChatExporter.Gui.Views.Controls.RevealablePasswordBox"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:s="https://github.com/canton7/Stylet"
+    x:Name="Root"
+    mc:Ignorable="d">
+    <Grid>
+        <TextBox
+            materialDesign:TextFieldAssist.DecorationVisibility="Hidden"
+            BorderThickness="{Binding BorderThickness, ElementName=Root}"
+            Text="{Binding Password, ElementName=Root, UpdateSourceTrigger=PropertyChanged}"
+            Visibility="{Binding IsRevealed, ElementName=Root, Converter={x:Static s:BoolToVisibilityConverter.Instance}}" />
+        <PasswordBox
+            materialDesign:PasswordBoxAssist.Password="{Binding Password, ElementName=Root, UpdateSourceTrigger=PropertyChanged}"
+            materialDesign:TextFieldAssist.DecorationVisibility="Hidden"
+            BorderThickness="{Binding BorderThickness, ElementName=Root}"
+            IsEnabled="False"
+            Visibility="{Binding IsRevealed, ElementName=Root, Converter={x:Static s:BoolToVisibilityConverter.InverseInstance}}" />
+    </Grid>
+</UserControl>

DiscordChatExporter.Gui/Views/Controls/RevealablePasswordBox.xaml.cs

@@ -0,0 +1,37 @@
+using System.Windows;
+
+namespace DiscordChatExporter.Gui.Views.Controls;
+
+public partial class RevealablePasswordBox
+{
+    public static readonly DependencyProperty PasswordProperty = DependencyProperty.Register(
+        nameof(Password),
+        typeof(string),
+        typeof(RevealablePasswordBox),
+        new FrameworkPropertyMetadata(string.Empty, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault)
+    );
+
+    public static readonly DependencyProperty IsRevealedProperty = DependencyProperty.Register(
+        nameof(IsRevealed),
+        typeof(bool),
+        typeof(RevealablePasswordBox),
+        new FrameworkPropertyMetadata(false, FrameworkPropertyMetadataOptions.None)
+    );
+
+    public string Password
+    {
+        get => (string)GetValue(PasswordProperty);
+        set => SetValue(PasswordProperty, value);
+    }
+
+    public bool IsRevealed
+    {
+        get => (bool)GetValue(IsRevealedProperty);
+        set => SetValue(IsRevealedProperty, value);
+    }
+
+    public RevealablePasswordBox()
+    {
+        InitializeComponent();
+    }
+}

DiscordChatExporter.Gui/Views/Dialogs/ExportSetupView.xaml

@@ -60,7 +60,7 @@
                 FontWeight="Light"
                 TextTrimming="CharacterEllipsis"
                 Visibility="{Binding IsSingleChannel, Converter={x:Static s:BoolToVisibilityConverter.Instance}}">
-                <Run Text="{Binding Channels[0].Category.Name, Mode=OneWay}" ToolTip="{Binding Channels[0].Category.Name, Mode=OneWay}" />
+                <Run Text="{Binding Channels[0].Category, Mode=OneWay}" ToolTip="{Binding Channels[0].Category, Mode=OneWay}" />
                 <Run Text="/" />
                 <Run
                     FontWeight="SemiBold"

DiscordChatExporter.Gui/Views/Dialogs/SettingsView.xaml

@@ -19,7 +19,7 @@
 
         <TextBlock
             Grid.Row="0"
-            Margin="16,16,16,8"
+            Margin="16"
             FontSize="19"
             FontWeight="Light"
             Text="Settings" />
@@ -60,10 +60,10 @@
                         <ToggleButton
                             x:Name="DarkModeToggleButton"
                             VerticalAlignment="Center"
-                            Checked="DarkModeToggleButton_Checked"
+                            Checked="DarkModeToggleButton_OnChecked"
                             DockPanel.Dock="Right"
                             IsChecked="{Binding IsDarkModeEnabled}"
-                            Unchecked="DarkModeToggleButton_Unchecked" />
+                            Unchecked="DarkModeToggleButton_OnUnchecked" />
                     </DockPanel>
 
                     <!--  Persist token  -->
@@ -71,7 +71,7 @@
                         Margin="16,8"
                         Background="Transparent"
                         LastChildFill="False"
-                        ToolTip="Save last used token in a file so that it can be persisted between sessions">
+                        ToolTip="Save the last used token to a file so that it can be persisted between sessions">
                         <TextBlock
                             VerticalAlignment="Center"
                             DockPanel.Dock="Left"
@@ -132,13 +132,13 @@
             </ScrollViewer>
         </Border>
 
-        <!--  Save button  -->
+        <!--  Close button  -->
         <Button
             Grid.Row="2"
             Margin="16"
             HorizontalAlignment="Stretch"
             Command="{s:Action Close}"
-            Content="SAVE"
+            Content="CLOSE"
             IsCancel="True"
             IsDefault="True"
             Style="{DynamicResource MaterialDesignOutlinedButton}" />

DiscordChatExporter.Gui/Views/Dialogs/SettingsView.xaml.cs

@@ -9,9 +9,9 @@ public partial class SettingsView
         InitializeComponent();
     }
 
-    private void DarkModeToggleButton_Checked(object sender, RoutedEventArgs e) =>
+    private void DarkModeToggleButton_OnChecked(object sender, RoutedEventArgs args) =>
         App.SetDarkTheme();
 
-    private void DarkModeToggleButton_Unchecked(object sender, RoutedEventArgs e) =>
+    private void DarkModeToggleButton_OnUnchecked(object sender, RoutedEventArgs args) =>
         App.SetLightTheme();
 }

License.txt

@@ -1,692 +1,21 @@
- DiscordChatExporter
+MIT License
- Copyright (C) 2017-2023 Oleksii Holub
+
-
+Copyright (c) 2017-2023 Oleksii Holub
- This program is free software: you can redistribute it and/or modify
+
- it under the terms of the GNU General Public License as published by
+Permission is hereby granted, free of charge, to any person obtaining a copy
- the Free Software Foundation, either version 3 of the License, or
+of this software and associated documentation files (the "Software"), to deal
- (at your option) any later version.
+in the Software without restriction, including without limitation the rights
-
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- This program is distributed in the hope that it will be useful,
+copies of the Software, and to permit persons to whom the Software is
- but WITHOUT ANY WARRANTY; without even the implied warranty of
+furnished to do so, subject to the following conditions:
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+
- GNU General Public License for more details.
+The above copyright notice and this permission notice shall be included in all
-
+copies or substantial portions of the Software.
- You should have received a copy of the GNU General Public License
+
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- ======================================================================
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-                    GNU GENERAL PUBLIC LICENSE
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-                       Version 3, 29 June 2007
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-
+SOFTWARE.
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    {one line to give the program's name and a brief idea of what it does.}
-    Copyright (C) {year}  {name of author}
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    {project}  Copyright (C) {year}  {fullname}
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.

Readme.md

@@ -1,5 +1,6 @@
 # DiscordChatExporter
 
+[![Status](https://img.shields.io/badge/status-maintenance-ffd700.svg)](https://github.com/Tyrrrz/.github/blob/master/docs/project-status.md)
 [![Made in Ukraine](https://img.shields.io/badge/made_in-ukraine-ffd700.svg?labelColor=0057b7)](https://tyrrrz.me/ukraine)
 [![Build](https://img.shields.io/github/actions/workflow/status/Tyrrrz/DiscordChatExporter/main.yml?branch=master)](https://github.com/Tyrrrz/DiscordChatExporter/actions)
 [![Coverage](https://img.shields.io/codecov/c/github/Tyrrrz/DiscordChatExporter/master)](https://codecov.io/gh/Tyrrrz/DiscordChatExporter)
@@ -7,10 +8,13 @@
 [![Downloads](https://img.shields.io/github/downloads/Tyrrrz/DiscordChatExporter/total.svg)](https://github.com/Tyrrrz/DiscordChatExporter/releases)
 [![Pulls](https://img.shields.io/docker/pulls/tyrrrz/discordchatexporter)](https://hub.docker.com/r/tyrrrz/discordchatexporter)
 [![Discord](https://img.shields.io/discord/869237470565392384?label=discord)](https://discord.gg/2SUWKFnHSm)
-[![Donate](https://img.shields.io/badge/donate-$$$-8a2be2.svg)](https://tyrrrz.me/donate)
 [![Fuck Russia](https://img.shields.io/badge/fuck-russia-e4181c.svg?labelColor=000000)](https://twitter.com/tyrrrz/status/1495972128977571848)
 
-> 🟡 **Project status**: maintenance mode<sup>[[?]](https://github.com/Tyrrrz/.github/blob/master/docs/project-status.md)</sup>
+<table>
+    <tr>
+        <td width="99999" align="center">Development of this project is entirely funded by the community. <b><a href="https://tyrrrz.me/donate">Consider donating to support!</a></b></td>
+    </tr>
+</table>
 
 <p align="center">
     <img src="favicon.png" alt="Icon" />