Update version

[HTML] Show "Click to see attachment" on replies to attachment or embed messages without content
Closes #634
2026-07-07 14:44:39 +02:00 · 2021-07-19 01:58:23 +03:00 · 2021-07-19 01:12:30 +03:00 · 2021-07-18 16:04:39 +03:00 · 2021-07-18 02:19:50 +03:00 · 2021-07-18 01:09:52 +03:00
157 changed files with 12108 additions and 2134 deletions
@@ -0,0 +1,64 @@
+name: 🐞 Bug report
+description: Report broken functionality.
+labels: [bug]
+
+body:
+- type: markdown
+  attributes:
+    value: |
+      🧐 **Guidelines:**
+
+      - Search through [existing issues](https://github.com/Tyrrrz/DiscordChatExporter/issues?q=is%3Aissue) first to ensure that this bug has not been reported before.
+      - Write a descriptive title for your issue. Avoid generic or vague titles such as "Something's not working" or "A couple of problems".
+      - Keep your issue focused on one single problem. If you have multiple bug reports, please create separate issues for each of them.
+      - Provide as much context as possible in the details section. Include screenshots, screen recordings, links, references, or anything else you may consider relevant.
+      - If you want to ask a question instead of reporting a bug, please use [discussions](https://github.com/Tyrrrz/DiscordChatExporter/discussions/new) instead.
+
+- type: input
+  attributes:
+    label: Version
+    description: Which version of DiscordChatExporter does this bug affect?
+    placeholder: ver X.Y.Z
+  validations:
+    required: true
+
+- type: dropdown
+  attributes:
+    label: Flavor
+    description: Does this bug affect the GUI version, the CLI version, or both?
+    multiple: true
+    options:
+    - GUI (Graphical User Interface)
+    - CLI (Command Line Interface)
+  validations:
+    required: true
+
+- type: dropdown
+  attributes:
+    label: Export format
+    description: Does this bug affect specific export format(s)? If not applicable, leave this field blank.
+    multiple: true
+    options:
+    - HTML
+    - TXT
+    - JSON
+    - CSV
+
+- type: textarea
+  attributes:
+    label: Details
+    description: Clear and thorough explanation of the bug.
+    placeholder: I was doing X expecting Y to happen, but Z happened instead.
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: Steps to reproduce
+    description: Minimum steps required to reproduce the bug.
+    placeholder: |
+      - Step 1
+      - Step 2
+      - Step 3
+  validations:
+    required: true
@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: 📖 Wiki
+    url: https://github.com/Tyrrrz/DiscordChatExporter/wiki
+    about: Find usage guides and frequently asked questions.
+  - name: 🗨 Discussions
+    url: https://github.com/Tyrrrz/DiscordChatExporter/discussions/new
+    about: Ask and answer questions.
@@ -0,0 +1,42 @@
+name: ✨ Feature request
+description: Request a new feature.
+labels: [enhancement]
+
+body:
+- type: markdown
+  attributes:
+    value: |
+      🧐 **Guidelines:**
+
+      - Search through [existing issues](https://github.com/Tyrrrz/DiscordChatExporter/issues?q=is%3Aissue) first to ensure that this feature has not been requested before.
+      - Write a descriptive title for your issue. Avoid generic or vague titles such as "Some suggestions" or "Ideas for improvement".
+      - Keep your issue focused on one single problem. If you have multiple feature requests, please create separate issues for each of them.
+      - Provide as much context as possible in the details section. Include screenshots, screen recordings, links, references, or anything else you may consider relevant.
+      - If you want to ask a question instead of requesting a feature, please use [discussions](https://github.com/Tyrrrz/DiscordChatExporter/discussions/new) instead.
+
+- type: dropdown
+  attributes:
+    label: Flavor
+    description: Is this feature request related to specific flavor(s) of DiscordChatExporter? If not applicable, leave this field blank.
+    multiple: true
+    options:
+    - GUI (Graphical User Interface)
+    - CLI (Command Line Interface)
+
+- type: dropdown
+  attributes:
+    label: Export format
+    description: Is this feature request related to specific export format(s)? If not applicable, leave this field blank.
+    multiple: true
+    options:
+    - HTML
+    - TXT
+    - JSON
+    - CSV
+
+- type: textarea
+  attributes:
+    label: Details
+    description: Clear and thorough explanation of the feature you have in mind.
+  validations:
+    required: true
@@ -0,0 +1,17 @@
+<!--
+
+**Important:**
+
+Please make sure that there is an existing issue that describes the problem solved by your pull request. If there isn't one, consider creating it first.
+An open issue offers a good place to iron out requirements, discuss possible solutions, and ask questions.
+
+Remember to also:
+
+- Keep your pull request focused and as small as possible. If you want to contribute multiple unrelated changes, please create separate pull requests for them.
+- Follow the coding style and conventions already established by the project. When in doubt about which style to use, ask in the comments to your pull request.
+- If you want to start a discussion regarding a specific change you've made, add a review comment to your own code. This can be used to highlight something important or to seek further input from others.
+
+-->
+
+<!-- Please specify the issue addressed by this pull request -->
+Closes #ISSUE_NUMBER
@@ -4,6 +4,7 @@
 *.userosscache
 *.sln.docstates
 .idea/
+.vs/

 # Build results
 [Dd]ebug/
@@ -1,3 +1,56 @@
+### v2.29 (19-Jul-2021)
+
+- Added support for message filtering, which is accessible as an additional export parameter in the GUI and as the `--filter` option in the CLI. Message filters use a special syntax similar to Discord's search query syntax to allow specifying which messages should be included in the export. For example, you can limit the export to only include messages that contain image attachments (`has:image`) or messages from a certain user (`from:Tyrrrz`) or messages containing certain words (`hello world`), etc. You can also combine filters together (`hi mentions:Tyrrrz`, `from:Tyrrrz | from:96-LB`, `(mentions:Tyrrrz | from:Tyrrrz) has:image`) or negate them (`-has:link`). More thorough documentation coming soon. (Thanks [@Lucas LaBuff](https://github.com/96-LB))
+- Added support for rendering mentions of voice channels, in addition to text channels.
+- Added support for rendering unix timestamp markers. Currently, style markers are ignored and timestamps are always rendered with the format configured in settings (or provided via `--date-format` option).
+- Updated in-app instructions for obtaining a user token. (Thanks [@Yudi](https://github.com/Yudi) and [@virtuallyvlad](https://github.com/virtuallyvlad))
+- [HTML] Improved visual appearance of the reference symbol (Г-shaped line in replies) to make it more closely resemble Discord's styling.
+- [HTML] Added more specific fallback text used when rendering referenced messages that contain no text content but have attachments or embeds.
+- [HTML] Fixed an issue where a broken embed author icon occupied visual space, ruining the embed layout. (Thanks [@Cliff J.](https://github.com/CliffJameston))
+- [GUI] Improved handling for fatal errors that may occur when attempting to export a channel. These errors are now displayed in a popup, allowing the user to try again instead of having the application crash completely.
+- [CLI] Fixed an issue where an attempt to export a channel resulted in `NotSupportedException` when the default encoding was set to `UTF8`.
+- [CLI] Fixed an issue where providing an incorrectly formatted partition limit via `-p|--partition` option resulted in a non-descriptive and unhelpful error.
+- Improved "Requested resource does not exist" error message by including the ID of the requested resource.
+
+### v2.28 (19-Jun-2021)
+
+- [HTML] Added special casing for YouTube video embeds to render them directly using an embedded player. (Thanks [@quentinmay](https://github.com/quentinmay))
+- [HTML] Added support for rendering standard emoji by code. Such emoji may sometimes be found in messages sent by bots or through webhooks. (Thanks [@CanePlayz](https://github.com/CanePlayz) and [@Lucas LaBuff](https://github.com/96-LB))
+- [HTML] Changed tooltips on standard emoji to show emoji code instead of their raw string representations. (Thanks [@CanePlayz](https://github.com/CanePlayz) and [@Lucas LaBuff](https://github.com/96-LB))
+- [HTML] Added tooltips on individual messages to show when those messages were sent. 
+- [HTML] Updated colors and minor styling elements to match Discord's new style direction after rebranding.
+- [HTML] Updated Twemoji URLs to use SVG image variants for better rendering quality.
+- [HTML] Changed user avatar URLs to include predetermined size query parameter for better rendering quality.
+- Changed embed rendering logic to prefer Discord-proxied URLs for external content, in order to avoid unnecessary HTTP requests to third parties.
+- Fixed an issue where exporting with media sometimes resulted in a crash due to lack of permissions to change file attributes. These errors are now ignored, which means that the creation, write, and access dates of downloaded files may sometimes not match the dates provided by Discord's CDN.
+- [HTML] Fixed styling issues when rendering embed footers.
+- [HTML] Fixed an issue where links didn't render properly inside referenced messages.
+- [HTML] Fixed an issue where standalone emoji were incorrectly enlarged inside referenced messages.
+- [HTML] Fixed an issue where clicking on a referenced message revealed spoilers inside of it.
+- [GUI] Fixed an issue where the list of missing components, reported by the prerequisite check at application startup, included Windows updates that were not applicable to the user's system due to the fact that other superseding updates have already been installed. This issue only affected users running DiscordChatExporter on Windows 7.
+- [GUI] Fixed a few other minor issues related to the prerequisite installation window.
+
+### v2.27.1 (08-Jun-2021)
+
+- [GUI] Application will now detect if the required .NET Runtime or any of its prerequisites are missing and prompt the user to download and install them automatically. **Experimental feature, please test it out and report any issues you may find!**
+- [CLI] Fixed an issue where the application crashed when exporting a channel that had square brackets as part of its name or category name. (Thanks [@Lucas LaBuff](https://github.com/96-LB))
+
+### v2.27 (24-Apr-2021)
+
+- Added partitioning by file size. You can now use values such as `10mb` to indicate a size-based cut off point, in addition to values like `10` to indicate a number of messages. (Thanks [@Andrew Kolos](https://github.com/andrewkolos))
+- [CLI] Improved formatting and progress reporting.
+- [CLI] Changed `export` command so that it can accept multiple channel IDs passed to `-c|--channel` option. This makes it possible to export multiple channels at once while benefiting from parallelization.
+- [JSON] Added `color` field to message author. This is a hex string that represents user's color, inherited from their roles. (Thanks [@rtm516](https://github.com/rtm516))
+- [JSON] Added `categoryId` field to the root. This represents the ID of the category channel that the currently exported channel belongs to. (Thanks [@rtm516](https://github.com/rtm516))
+- [JSON] Fixed an issue where user discriminator was written without leading zeroes. (Thanks [@Lucas LaBuff](https://github.com/96-LB))
+- [JSON] Fixed an issue where the application sometimes crashed with an error saying `']' invalid without a matching open`, which was just a validation message that masked the actual error behind the failure. (Thanks [@Lucas LaBuff](https://github.com/96-LB))
+- Fixed an issue where progress was not reported correctly if the channel didn't have any messages in the specified time range.
+
+### v2.26.1 (06-Feb-2021)
+
+- [CLI] Added support for file name templates, which allow you to dynamically generate output file names based on channel and guild metadata. (Thanks [@Lucas LaBuff](https://github.com/96-LB))
+- Fixed an issue where the application sometimes crashed with `Invalid snowflake` message when exporting chat logs that contained invalid or outdated mentions. (Thanks [@Lucas LaBuff](https://github.com/96-LB))
+
 ### v2.26 (29-Dec-2020)

 - [HTML] Added support for replies. (Thanks [@Sanqui](https://github.com/Sanqui))
@@ -57,7 +110,7 @@

 ### v2.21 (18-Jul-2020)

- Added a new option that enables self-contained exports for all output formats. You can turn it on in the export setup dialog in GUI or using the `--media` option in CLI. When using this, the application will additionally download any media content directly referenced from the exported file instead of linking back to Discord CDN. The files which are downloaded include: guild icons, user avatars, attachments, embedded images, reaction emojis. Note that only files which are actually referenced by the export are downloaded, which means that, for example, user avatars will not be downloaded when using plain text export format. This option is not meant to enable complete offline viewing for HTML exports, but rather to make it easier to archive media content that may eventually get deleted from Discord servers. Also keep in mind that this option may make the export drastically slower and the total file size larger.
+- Added a new option that enables self-contained exports for all output formats. You can turn it on in the export setup dialog in GUI or using the `--media` option in CLI. When using this, the application will additionally download any media content directly referenced from the exported file instead of linking back to Discord CDN. The files which are downloaded include: guild icons, user avatars, attachments, embedded images, reaction emoji. Note that only files which are actually referenced by the export are downloaded, which means that, for example, user avatars will not be downloaded when using plain text export format. This option is not meant to enable complete offline viewing for HTML exports, but rather to make it easier to archive media content that may eventually get deleted from Discord servers. Also keep in mind that this option may make the export drastically slower and the total file size larger.
 - Changed "discordapp.com" to "discord.com" where applicable as Discord is migrating to a new domain. CDN will remain on "cdn.discordapp.com" for the foreseeable future.

 Note that all existing and current HTML exports will likely not render accurately because Discord enabled CORS for their font resources, which prevents them from loading locally. Please refer to [issue #322](https://github.com/Tyrrrz/DiscordChatExporter/issues/322) for discussion on this topic. 
@@ -96,7 +149,7 @@ Note that all existing and current HTML exports will likely not render accuratel

 - Fixed an issue where an empty file was produced when exporting a channel with no messages (for specified period). With the new behavior, no file will be created and instead a message will be shown to the user informing of the failure.
 - [HTML/TXT] Added message count to the bottom of the file. This number shows how many messages were exported as part of the current file. Prior to 2.16 this number was present along with the rest of the metadata at the top, then removed due to changes in the exporter, and now brought back at the end of the file instead.
- [HTML] Fixed an issue where some emojis were not properly rendered.
+- [HTML] Fixed an issue where some emoji were not properly rendered.
 - [GUI] Added a setting that lets you configure whether to remember the last used token. Previously it was the default behavior, but now you can disable it if you don't want the token persisted on your system.

 ### v2.16 (08-Dec-2019)
@@ -109,7 +162,7 @@ Note that all existing and current HTML exports will likely not render accuratel
 - Fixed various issues that resulted in exceptions during export process.
 - [HTML/TXT] Removed message count from the metadata. Due to the fact that the messages are exported as they are streamed, total number of messages is not known ahead of time.
 - [HTML] Changed default color of the embed color pill to match the theme.
- [HTML] Changed emoji parser to be less greedy. As a result it should match fewer character sequences that look like emojis but really aren't, but on the other hand it might miss some actual emojis. This means that some standard emojis (i.e. not custom server emojis) may not look like in Discord. This is a compromise I'm willing to take because detecting emojis in text is really hard to get right and not worth it at all.
+- [HTML] Changed emoji parser to be less greedy. As a result it should match fewer character sequences that look like emoji but really aren't, but on the other hand it might miss some actual emoji. This means that some standard emoji (i.e. not custom server emoji) may not look like in Discord. This is a compromise I'm willing to take because detecting emoji in text is really hard to get right and not worth it at all.
 - [HTML] Some other minor styling adjustments.
 - [CSV] Replaced semicolons (;) with (,) as separators.

@@ -150,8 +203,8 @@ Please note that CSV export is most likely not going to receive future updates a
 ### v2.12.1 (12-Apr-2019)

 - [GUI] Fixed an issue where the app crashed when trying to export multiple channels.
- [HTML] Fixed an issue where some of the emojis were rendered via Twemoji while Discord renders them as plain text.
- [HTML] Fixed an issue where emojis weren't jumbo if there were more than one of them.
+- [HTML] Fixed an issue where some of the emoji were rendered via Twemoji while Discord renders them as plain text.
+- [HTML] Fixed an issue where emoji weren't jumbo if there were more than one of them.

 ### v2.12 (11-Apr-2019)

@@ -173,15 +226,15 @@ Please note that CSV export is most likely not going to receive future updates a

 ### v2.10.1 (06-Mar-2019)

- [HTML] Fixed an issue where multiple emojis on a single line would get rendered as one emoji.
+- [HTML] Fixed an issue where multiple emoji on a single line would get rendered as one emoji.
 - [HTML] Fixed an issue where an open square bracket character would incorrectly render as an emoji.
 - [HTML] Added alt text to emoji images so that they will be rendered using default font when Twemoji images are not available.

 ### v2.10 (03-Mar-2019)

 - [HTML] Reworked the entire markdown parsing engine which fixes numerous rendering inconsistencies (over 15 issues fixed).
- [HTML] Added support for animated emojis.
- [HTML] Standard emojis are now rendered using Twemoji, the same image set that Discord uses.
+- [HTML] Added support for animated emoji.
+- [HTML] Standard emoji are now rendered using Twemoji, the same image set that Discord uses.
 - [HTML] Fixed an issue where video attachments would render incorrectly.
 - [HTML] Minor fixes in styling.
 - [GUI] Aggregated export progress is now shown in the taskbar.
@@ -241,7 +294,7 @@ Please note that CSV export is most likely not going to receive future updates a
 - Added support for reactions (HTML only).
 - Selected date range is now shown in the export (HTML and PlainText).
 - Added placeholders for guild icons to display while the icons are loading.
- Added support for jumbo emojis (custom emojis only).
+- Added support for jumbo emoji (custom emoji only).
 - Added basic retry policy for 429 error responses.
 - Added validation for from/to dates in the UI which prevents choosing invalid date ranges.
 - Added an error message when trying to export a deleted channel.
@@ -265,7 +318,7 @@ Please note that CSV export is most likely not going to receive future updates a

 - Improved message date filtering, it's now marginally faster.
 - Fixed underscores not recognized as italics in markdown.
- Added support for custom emojis.
+- Added support for custom emoji.
 - Added support for user and role mentions.
 - Added support for channel mentions.
 - Fixed text in pre blocks not being wrapped correctly.
@@ -2,7 +2,7 @@

  <PropertyGroup>
    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <Version>2.26</Version>
+    <Version>2.29</Version>
    <Company>Tyrrrz</Company>
    <Copyright>Copyright (c) Alexey Golub</Copyright>
    <LangVersion>preview</LangVersion>
@@ -10,4 +10,4 @@
    <WarningsAsErrors>nullable</WarningsAsErrors>
  </PropertyGroup>

-</Project>
+</Project>
@@ -1,12 +1,21 @@
-using System.IO;
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
 using System.Threading.Tasks;
-using CliFx;
 using CliFx.Attributes;
 using CliFx.Exceptions;
-using CliFx.Utilities;
-using DiscordChatExporter.Domain.Discord;
-using DiscordChatExporter.Domain.Discord.Models;
-using DiscordChatExporter.Domain.Exporting;
+using CliFx.Infrastructure;
+using DiscordChatExporter.Cli.Utils.Extensions;
+using DiscordChatExporter.Core.Discord;
+using DiscordChatExporter.Core.Discord.Data;
+using DiscordChatExporter.Core.Exceptions;
+using DiscordChatExporter.Core.Exporting;
+using DiscordChatExporter.Core.Exporting.Filtering;
+using DiscordChatExporter.Core.Exporting.Partitioning;
+using DiscordChatExporter.Core.Utils.Extensions;
+using Tyrrrz.Extensions;

 namespace DiscordChatExporter.Cli.Commands.Base
 {
@@ -24,8 +33,14 @@ namespace DiscordChatExporter.Cli.Commands.Base
        [CommandOption("before", Description = "Only include messages sent before this date or message ID.")]
        public Snowflake? Before { get; init; }

-        [CommandOption("partition", 'p', Description = "Split output into partitions limited to this number of messages.")]
-        public int? PartitionLimit { get; init; }
+        [CommandOption("partition", 'p', Description = "Split output into partitions, each limited to this number of messages (e.g. '100') or file size (e.g. '10mb').")]
+        public PartitionLimit PartitionLimit { get; init; } = PartitionLimit.Null;
+
+        [CommandOption("filter", Description = "Only include messages that satisfy this filter (e.g. 'from:foo#1234' or 'has:image').")]
+        public MessageFilter MessageFilter { get; init; } = MessageFilter.Null;
+
+        [CommandOption("parallel", Description = "Limits how many channels can be exported in parallel.")]
+        public int ParallelLimit { get; init; } = 1;

        [CommandOption("media", Description = "Download referenced media content.")]
        public bool ShouldDownloadMedia { get; init; }
@@ -36,49 +51,95 @@ namespace DiscordChatExporter.Cli.Commands.Base
        [CommandOption("dateformat", Description = "Format used when writing dates.")]
        public string DateFormat { get; init; } = "dd-MMM-yy hh:mm tt";

-        protected ChannelExporter GetChannelExporter() => new(GetDiscordClient());
+        private ChannelExporter? _channelExporter;
+        protected ChannelExporter Exporter => _channelExporter ??= new ChannelExporter(Discord);

-        protected async ValueTask ExportAsync(IConsole console, Guild guild, Channel channel)
+        protected async ValueTask ExportAsync(IConsole console, IReadOnlyList<Channel> channels)
        {
-            console.Output.Write($"Exporting channel '{channel.Category} / {channel.Name}'... ");
-            var progress = console.CreateProgressTicker();
+            await console.Output.WriteLineAsync($"Exporting {channels.Count} channel(s)...");

-            var request = new ExportRequest(
-                guild,
-                channel,
-                OutputPath,
-                ExportFormat,
-                After,
-                Before,
-                PartitionLimit,
-                ShouldDownloadMedia,
-                ShouldReuseMedia,
-                DateFormat
-            );
+            var errors = new ConcurrentDictionary<Channel, string>();

-            await GetChannelExporter().ExportChannelAsync(request, progress);
+            // Wrap everything in a progress ticker
+            await console.CreateProgressTicker().StartAsync(async progressContext =>
+            {
+                await channels.ParallelForEachAsync(async channel =>
+                {
+                    // Export
+                    try
+                    {
+                        await progressContext.StartTaskAsync($"{channel.Category} / {channel.Name}", async progress =>
+                        {
+                            var guild = await Discord.GetGuildAsync(channel.GuildId);

-            console.Output.WriteLine();
-            console.Output.WriteLine("Done.");
-        }
+                            var request = new ExportRequest(
+                                guild,
+                                channel,
+                                OutputPath,
+                                ExportFormat,
+                                After,
+                                Before,
+                                PartitionLimit,
+                                MessageFilter,
+                                ShouldDownloadMedia,
+                                ShouldReuseMedia,
+                                DateFormat
+                            );

-        protected async ValueTask ExportAsync(IConsole console, Channel channel)
-        {
-            var guild = await GetDiscordClient().GetGuildAsync(channel.GuildId);
-            await ExportAsync(console, guild, channel);
-        }
+                            await Exporter.ExportChannelAsync(request, progress);
+                        });
+                    }
+                    catch (DiscordChatExporterException ex) when (!ex.IsCritical)
+                    {
+                        errors[channel] = ex.Message;
+                    }
+                }, ParallelLimit.ClampMin(1));
+            });

-        protected async ValueTask ExportAsync(IConsole console, Snowflake channelId)
-        {
-            var channel = await GetDiscordClient().GetChannelAsync(channelId);
-            await ExportAsync(console, channel);
+            // Print result
+            using (console.WithForegroundColor(ConsoleColor.White))
+            {
+                await console.Output.WriteLineAsync(
+                    $"Successfully exported {channels.Count - errors.Count} channel(s)."
+                );
+            }
+
+            // Print errors
+            if (errors.Any())
+            {
+                await console.Output.WriteLineAsync();
+
+                using (console.WithForegroundColor(ConsoleColor.Red))
+                {
+                    await console.Output.WriteLineAsync(
+                        $"Failed to export {errors.Count} channel(s):"
+                    );
+                }
+
+                foreach (var (channel, error) in errors)
+                {
+                    await console.Output.WriteAsync($"{channel.Category} / {channel.Name}: ");
+
+                    using (console.WithForegroundColor(ConsoleColor.Red))
+                        await console.Output.WriteLineAsync(error);
+                }
+
+                await console.Output.WriteLineAsync();
+            }
+
+            // Fail the command if ALL channels failed to export.
+            // Having some of the channels fail to export is fine and expected.
+            if (errors.Count >= channels.Count)
+            {
+                throw new CommandException("Export failed.");
+            }
        }

        public override ValueTask ExecuteAsync(IConsole console)
        {
            if (ShouldReuseMedia && !ShouldDownloadMedia)
            {
-                throw new CommandException("The --reuse-media option cannot be used without the --media option.");
+                throw new CommandException("Option --reuse-media cannot be used without --media.");
            }

            return default;
@@ -1,79 +0,0 @@
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using CliFx;
-using CliFx.Attributes;
-using CliFx.Utilities;
-using DiscordChatExporter.Domain.Discord.Models;
-using DiscordChatExporter.Domain.Exceptions;
-using DiscordChatExporter.Domain.Exporting;
-using DiscordChatExporter.Domain.Utilities;
-using Gress;
-using Tyrrrz.Extensions;
-
-namespace DiscordChatExporter.Cli.Commands.Base
-{
-    public abstract class ExportMultipleCommandBase : ExportCommandBase
-    {
-        [CommandOption("parallel", Description = "Limits how many channels can be exported in parallel.")]
-        public int ParallelLimit { get; init; } = 1;
-
-        protected async ValueTask ExportMultipleAsync(IConsole console, IReadOnlyList<Channel> channels)
-        {
-            // This uses a different route from ExportCommandBase.ExportAsync() because it runs
-            // in parallel and needs another way to report progress to console.
-
-            console.Output.Write($"Exporting {channels.Count} channels... ");
-            var progress = console.CreateProgressTicker();
-
-            var operations = progress.Wrap().CreateOperations(channels.Count);
-
-            var successfulExportCount = 0;
-            var errors = new ConcurrentBag<(Channel, string)>();
-
-            await channels.Zip(operations).ParallelForEachAsync(async tuple =>
-            {
-                var (channel, operation) = tuple;
-
-                try
-                {
-                    var guild = await GetDiscordClient().GetGuildAsync(channel.GuildId);
-
-                    var request = new ExportRequest(
-                        guild,
-                        channel,
-                        OutputPath,
-                        ExportFormat,
-                        After,
-                        Before,
-                        PartitionLimit,
-                        ShouldDownloadMedia,
-                        ShouldReuseMedia,
-                        DateFormat
-                    );
-
-                    await GetChannelExporter().ExportChannelAsync(request, operation);
-
-                    Interlocked.Increment(ref successfulExportCount);
-                }
-                catch (DiscordChatExporterException ex) when (!ex.IsCritical)
-                {
-                    errors.Add((channel, ex.Message));
-                }
-                finally
-                {
-                    operation.Dispose();
-                }
-            }, ParallelLimit.ClampMin(1));
-
-            console.Output.WriteLine();
-
-            foreach (var (channel, error) in errors)
-                console.Error.WriteLine($"Channel '{channel}': {error}");
-
-            console.Output.WriteLine($"Successfully exported {successfulExportCount} channel(s).");
-        }
-    }
-}
@@ -1,26 +1,28 @@
 using System.Threading.Tasks;
 using CliFx;
 using CliFx.Attributes;
-using DiscordChatExporter.Domain.Discord;
+using CliFx.Infrastructure;
+using DiscordChatExporter.Core.Discord;

 namespace DiscordChatExporter.Cli.Commands.Base
 {
    public abstract class TokenCommandBase : ICommand
    {
-        [CommandOption("token", 't', IsRequired = true, EnvironmentVariableName = "DISCORD_TOKEN", Description = "Authorization token.")]
+        [CommandOption("token", 't', IsRequired = true, EnvironmentVariable = "DISCORD_TOKEN", Description = "Authentication token.")]
        public string TokenValue { get; init; } = "";

-        [CommandOption("bot", 'b', EnvironmentVariableName = "DISCORD_TOKEN_BOT", Description = "Authorize as a bot.")]
+        [CommandOption("bot", 'b', EnvironmentVariable = "DISCORD_TOKEN_BOT", Description = "Authenticate as a bot.")]
        public bool IsBotToken { get; init; }

-        protected AuthToken GetAuthToken() => new(
+        private AuthToken GetAuthToken() => new(
            IsBotToken
                ? AuthTokenType.Bot
                : AuthTokenType.User,
            TokenValue
        );

-        protected DiscordClient GetDiscordClient() => new(GetAuthToken());
+        private DiscordClient? _discordClient;
+        protected DiscordClient Discord => _discordClient ??= new DiscordClient(GetAuthToken());

        public abstract ValueTask ExecuteAsync(IConsole console);
    }
@@ -1,36 +1,46 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using CliFx;
 using CliFx.Attributes;
+using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands.Base;
-using DiscordChatExporter.Domain.Discord.Models;
+using DiscordChatExporter.Core.Discord.Data;

 namespace DiscordChatExporter.Cli.Commands
 {
    [Command("exportall", Description = "Export all accessible channels.")]
-    public class ExportAllCommand : ExportMultipleCommandBase
+    public class ExportAllCommand : ExportCommandBase
    {
        [CommandOption("include-dm", Description = "Include direct message channels.")]
        public bool IncludeDirectMessages { get; init; } = true;

        public override async ValueTask ExecuteAsync(IConsole console)
        {
+            await base.ExecuteAsync(console);
+
+            // Get channel metadata
+            await console.Output.WriteLineAsync("Fetching channels...");
+
            var channels = new List<Channel>();

            // Aggregate channels from all guilds
-            await foreach (var guild in GetDiscordClient().GetUserGuildsAsync())
+            await foreach (var guild in Discord.GetUserGuildsAsync())
            {
                // Skip DMs if instructed to
                if (!IncludeDirectMessages && guild.Id == Guild.DirectMessages.Id)
                    continue;

-                await foreach (var channel in GetDiscordClient().GetGuildChannelsAsync(guild.Id))
+                await foreach (var channel in Discord.GetGuildChannelsAsync(guild.Id))
                {
+                    // Skip non-text channels
+                    if (!channel.IsTextChannel)
+                        continue;
+
                    channels.Add(channel);
                }
            }

-            await ExportMultipleAsync(console, channels);
+            // Export
+            await ExportAsync(console, channels);
        }
    }
 }
@@ -1,21 +0,0 @@
-using System.Threading.Tasks;
-using CliFx;
-using CliFx.Attributes;
-using DiscordChatExporter.Cli.Commands.Base;
-using DiscordChatExporter.Domain.Discord;
-
-namespace DiscordChatExporter.Cli.Commands
-{
-    [Command("export", Description = "Export a channel.")]
-    public class ExportChannelCommand : ExportCommandBase
-    {
-        [CommandOption("channel", 'c', IsRequired = true, Description = "Channel ID.")]
-        public Snowflake ChannelId { get; init; }
-
-        public override async ValueTask ExecuteAsync(IConsole console)
-        {
-            await base.ExecuteAsync(console);
-            await ExportAsync(console, ChannelId);
-        }
-    }
-}
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using CliFx.Attributes;
+using CliFx.Infrastructure;
+using DiscordChatExporter.Cli.Commands.Base;
+using DiscordChatExporter.Core.Discord;
+using DiscordChatExporter.Core.Discord.Data;
+
+namespace DiscordChatExporter.Cli.Commands
+{
+    [Command("export", Description = "Export one or multiple channels.")]
+    public class ExportChannelsCommand : ExportCommandBase
+    {
+        // TODO: change this to plural (breaking change)
+        [CommandOption("channel", 'c', IsRequired = true, Description = "Channel ID(s).")]
+        public IReadOnlyList<Snowflake> ChannelIds { get; init; } = Array.Empty<Snowflake>();
+
+        public override async ValueTask ExecuteAsync(IConsole console)
+        {
+            await base.ExecuteAsync(console);
+
+            // Get channel metadata
+            await console.Output.WriteLineAsync("Fetching channel(s)...");
+
+            var channels = new List<Channel>();
+
+            foreach (var channelId in ChannelIds)
+            {
+                var channel = await Discord.GetChannelAsync(channelId);
+                channels.Add(channel);
+            }
+
+            // Export
+            await ExportAsync(console, channels);
+        }
+    }
+}
@@ -1,19 +1,27 @@
-using System.Threading.Tasks;
-using CliFx;
+using System.Linq;
+using System.Threading.Tasks;
 using CliFx.Attributes;
+using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands.Base;
-using DiscordChatExporter.Domain.Discord.Models;
-using DiscordChatExporter.Domain.Utilities;
+using DiscordChatExporter.Core.Discord.Data;
+using DiscordChatExporter.Core.Utils.Extensions;

 namespace DiscordChatExporter.Cli.Commands
 {
    [Command("exportdm", Description = "Export all direct message channels.")]
-    public class ExportDirectMessagesCommand : ExportMultipleCommandBase
+    public class ExportDirectMessagesCommand : ExportCommandBase
    {
        public override async ValueTask ExecuteAsync(IConsole console)
        {
-            var channels = await GetDiscordClient().GetGuildChannelsAsync(Guild.DirectMessages.Id);
-            await ExportMultipleAsync(console, channels);
+            await base.ExecuteAsync(console);
+
+            // Get channel metadata
+            await console.Output.WriteLineAsync("Fetching channels...");
+            var channels = await Discord.GetGuildChannelsAsync(Guild.DirectMessages.Id);
+            var textChannels = channels.Where(c => c.IsTextChannel).ToArray();
+
+            // Export
+            await ExportAsync(console, textChannels);
        }
    }
 }
@@ -1,22 +1,30 @@
-using System.Threading.Tasks;
-using CliFx;
+using System.Linq;
+using System.Threading.Tasks;
 using CliFx.Attributes;
+using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands.Base;
-using DiscordChatExporter.Domain.Discord;
-using DiscordChatExporter.Domain.Utilities;
+using DiscordChatExporter.Core.Discord;
+using DiscordChatExporter.Core.Utils.Extensions;

 namespace DiscordChatExporter.Cli.Commands
 {
    [Command("exportguild", Description = "Export all channels within specified guild.")]
-    public class ExportGuildCommand : ExportMultipleCommandBase
+    public class ExportGuildCommand : ExportCommandBase
    {
        [CommandOption("guild", 'g', IsRequired = true, Description = "Guild ID.")]
        public Snowflake GuildId { get; init; }

        public override async ValueTask ExecuteAsync(IConsole console)
        {
-            var channels = await GetDiscordClient().GetGuildChannelsAsync(GuildId);
-            await ExportMultipleAsync(console, channels);
+            await base.ExecuteAsync(console);
+
+            // Get channel metadata
+            await console.Output.WriteLineAsync("Fetching channels...");
+            var channels = await Discord.GetGuildChannelsAsync(GuildId);
+            var textChannels = channels.Where(c => c.IsTextChannel).ToArray();
+
+            // Export
+            await ExportAsync(console, textChannels);
        }
    }
 }
@@ -1,10 +1,11 @@
-using System.Linq;
+using System;
+using System.Linq;
 using System.Threading.Tasks;
-using CliFx;
 using CliFx.Attributes;
+using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands.Base;
-using DiscordChatExporter.Domain.Discord;
-using DiscordChatExporter.Domain.Utilities;
+using DiscordChatExporter.Core.Discord;
+using DiscordChatExporter.Core.Utils.Extensions;

 namespace DiscordChatExporter.Cli.Commands
 {
@@ -16,10 +17,29 @@ namespace DiscordChatExporter.Cli.Commands

        public override async ValueTask ExecuteAsync(IConsole console)
        {
-            var channels = await GetDiscordClient().GetGuildChannelsAsync(GuildId);
+            var channels = await Discord.GetGuildChannelsAsync(GuildId);

-            foreach (var channel in channels.OrderBy(c => c.Category).ThenBy(c => c.Name))
-                console.Output.WriteLine($"{channel.Id} | {channel.Category} / {channel.Name}");
+            var textChannels = channels
+                .Where(c => c.IsTextChannel)
+                .OrderBy(c => c.Category.Position)
+                .ThenBy(c => c.Name)
+                .ToArray();
+
+            foreach (var channel in textChannels)
+            {
+                // Channel ID
+                await console.Output.WriteAsync(channel.Id.ToString());
+
+                // Separator
+                using (console.WithForegroundColor(ConsoleColor.DarkGray))
+                    await console.Output.WriteAsync(" | ");
+
+                // Channel category / name
+                using (console.WithForegroundColor(ConsoleColor.White))
+                    await console.Output.WriteAsync($"{channel.Category} / {channel.Name}");
+
+                await console.Output.WriteLineAsync();
+            }
        }
    }
 }
@@ -1,10 +1,11 @@
-using System.Linq;
+using System;
+using System.Linq;
 using System.Threading.Tasks;
-using CliFx;
 using CliFx.Attributes;
+using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands.Base;
-using DiscordChatExporter.Domain.Discord.Models;
-using DiscordChatExporter.Domain.Utilities;
+using DiscordChatExporter.Core.Discord.Data;
+using DiscordChatExporter.Core.Utils.Extensions;

 namespace DiscordChatExporter.Cli.Commands
 {
@@ -13,10 +14,29 @@ namespace DiscordChatExporter.Cli.Commands
    {
        public override async ValueTask ExecuteAsync(IConsole console)
        {
-            var channels = await GetDiscordClient().GetGuildChannelsAsync(Guild.DirectMessages.Id);
+            var channels = await Discord.GetGuildChannelsAsync(Guild.DirectMessages.Id);

-            foreach (var channel in channels.OrderBy(c => c.Category).ThenBy(c => c.Name))
-                console.Output.WriteLine($"{channel.Id} | {channel.Category} / {channel.Name}");
+            var textChannels = channels
+                .Where(c => c.IsTextChannel)
+                .OrderBy(c => c.Category.Position)
+                .ThenBy(c => c.Name)
+                .ToArray();
+
+            foreach (var channel in textChannels)
+            {
+                // Channel ID
+                await console.Output.WriteAsync(channel.Id.ToString());
+
+                // Separator
+                using (console.WithForegroundColor(ConsoleColor.DarkGray))
+                    await console.Output.WriteAsync(" | ");
+
+                // Channel category / name
+                using (console.WithForegroundColor(ConsoleColor.White))
+                    await console.Output.WriteAsync($"{channel.Category} / {channel.Name}");
+
+                await console.Output.WriteLineAsync();
+            }
        }
    }
 }
@@ -1,9 +1,10 @@
-using System.Linq;
+using System;
+using System.Linq;
 using System.Threading.Tasks;
-using CliFx;
 using CliFx.Attributes;
+using CliFx.Infrastructure;
 using DiscordChatExporter.Cli.Commands.Base;
-using DiscordChatExporter.Domain.Utilities;
+using DiscordChatExporter.Core.Utils.Extensions;

 namespace DiscordChatExporter.Cli.Commands
 {
@@ -12,10 +13,23 @@ namespace DiscordChatExporter.Cli.Commands
    {
        public override async ValueTask ExecuteAsync(IConsole console)
        {
-            var guilds = await GetDiscordClient().GetUserGuildsAsync();
+            var guilds = await Discord.GetUserGuildsAsync();

            foreach (var guild in guilds.OrderBy(g => g.Name))
-                console.Output.WriteLine($"{guild.Id} | {guild.Name}");
+            {
+                // Guild ID
+                await console.Output.WriteAsync(guild.Id.ToString());
+
+                // Separator
+                using (console.WithForegroundColor(ConsoleColor.DarkGray))
+                    await console.Output.WriteAsync(" | ");
+
+                // Guild name
+                using (console.WithForegroundColor(ConsoleColor.White))
+                    await console.Output.WriteAsync(guild.Name);
+
+                await console.Output.WriteLineAsync();
+            }
        }
    }
 }
@@ -1,7 +1,8 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using CliFx;
 using CliFx.Attributes;
+using CliFx.Infrastructure;

 namespace DiscordChatExporter.Cli.Commands
 {
@@ -10,30 +11,32 @@ namespace DiscordChatExporter.Cli.Commands
    {
        public ValueTask ExecuteAsync(IConsole console)
        {
-            console.WithForegroundColor(ConsoleColor.White, () =>
-                console.Output.WriteLine("To get user token:")
-            );
+            using (console.WithForegroundColor(ConsoleColor.White))
+                console.Output.WriteLine("To get user token:");
+
            console.Output.WriteLine(" 1. Open Discord");
            console.Output.WriteLine(" 2. Press Ctrl+Shift+I to show developer tools");
-            console.Output.WriteLine(" 3. Navigate to the Application tab");
-            console.Output.WriteLine(" 4. Select \"Local Storage\" > \"https://discord.com\" on the left");
-            console.Output.WriteLine(" 5. Press Ctrl+R to reload");
-            console.Output.WriteLine(" 6. Find \"token\" at the bottom and copy the value");
+            console.Output.WriteLine(" 3. Press Ctrl+Shift+M to toggle device toolbar");
+            console.Output.WriteLine(" 4. Navigate to the Application tab");
+            console.Output.WriteLine(" 5. On the left, expand Local Storage and select https://discord.com");
+            console.Output.WriteLine(" 6. Type \"token\" into the Filter box");
+            console.Output.WriteLine(" 7. If the token key does not appear, press Ctrl+R to reload");
+            console.Output.WriteLine(" 8. Copy the value of the token key");
            console.Output.WriteLine(" *  Automating user accounts is technically against TOS, use at your own risk.");
            console.Output.WriteLine();

-            console.WithForegroundColor(ConsoleColor.White, () =>
-                console.Output.WriteLine("To get bot token:")
-            );
+            using (console.WithForegroundColor(ConsoleColor.White))
+                console.Output.WriteLine("To get bot token:");
+
            console.Output.WriteLine(" 1. Go to Discord developer portal");
            console.Output.WriteLine(" 2. Open your application's settings");
            console.Output.WriteLine(" 3. Navigate to the Bot section on the left");
            console.Output.WriteLine(" 4. Under Token click Copy");
            console.Output.WriteLine();

-            console.WithForegroundColor(ConsoleColor.White, () =>
-                console.Output.WriteLine("To get guild ID or guild channel ID:")
-            );
+            using (console.WithForegroundColor(ConsoleColor.White))
+                console.Output.WriteLine("To get guild ID or guild channel ID:");
+
            console.Output.WriteLine(" 1. Open Discord");
            console.Output.WriteLine(" 2. Open Settings");
            console.Output.WriteLine(" 3. Go to Appearance section");
@@ -41,9 +44,9 @@ namespace DiscordChatExporter.Cli.Commands
            console.Output.WriteLine(" 5. Right click on the desired guild or channel and click Copy ID");
            console.Output.WriteLine();

-            console.WithForegroundColor(ConsoleColor.White, () =>
-                console.Output.WriteLine("To get direct message channel ID:")
-            );
+            using (console.WithForegroundColor(ConsoleColor.White))
+                console.Output.WriteLine("To get direct message channel ID:");
+
            console.Output.WriteLine(" 1. Open Discord");
            console.Output.WriteLine(" 2. Open the desired direct message channel");
            console.Output.WriteLine(" 3. Press Ctrl+Shift+I to show developer tools");
@@ -52,12 +55,11 @@ namespace DiscordChatExporter.Cli.Commands
            console.Output.WriteLine(" 6. Copy the first long sequence of numbers inside the URL");
            console.Output.WriteLine();

-            console.WithForegroundColor(ConsoleColor.White,
-                () => console.Output.WriteLine("For more information, check out the wiki:")
-            );
-            console.WithForegroundColor(ConsoleColor.Blue,
-                () => console.Output.WriteLine("https://github.com/Tyrrrz/DiscordChatExporter/wiki")
-            );
+            using (console.WithForegroundColor(ConsoleColor.White))
+                console.Output.WriteLine("For more information, check out the wiki:");
+
+            using (console.WithForegroundColor(ConsoleColor.DarkCyan))
+                console.Output.WriteLine("https://github.com/Tyrrrz/DiscordChatExporter/wiki");

            return default;
        }
@@ -6,13 +6,14 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="CliFx" Version="1.6.0" />
+    <PackageReference Include="CliFx" Version="2.0.6" />
+    <PackageReference Include="Spectre.Console" Version="0.41.0" />
    <PackageReference Include="Gress" Version="1.2.0" />
    <PackageReference Include="Tyrrrz.Extensions" Version="1.6.5" />
  </ItemGroup>

  <ItemGroup>
-    <ProjectReference Include="..\DiscordChatExporter.Domain\DiscordChatExporter.Domain.csproj" />
+    <ProjectReference Include="..\DiscordChatExporter.Core\DiscordChatExporter.Core.csproj" />
  </ItemGroup>

 </Project>
@@ -0,0 +1,52 @@
+using System;
+using System.Threading.Tasks;
+using CliFx.Infrastructure;
+using Spectre.Console;
+
+namespace DiscordChatExporter.Cli.Utils.Extensions
+{
+    internal static class ConsoleExtensions
+    {
+        public static IAnsiConsole CreateAnsiConsole(this IConsole console) => AnsiConsole.Create(
+            new AnsiConsoleSettings
+            {
+                Ansi = AnsiSupport.Detect,
+                ColorSystem = ColorSystemSupport.Detect,
+                Out = new AnsiConsoleOutput(console.Output)
+            }
+        );
+
+        public static Progress CreateProgressTicker(this IConsole console) => console
+            .CreateAnsiConsole()
+            .Progress()
+            .AutoClear(false)
+            .AutoRefresh(true)
+            .HideCompleted(false)
+            .Columns(
+                new TaskDescriptionColumn {Alignment = Justify.Left},
+                new ProgressBarColumn(),
+                new PercentageColumn()
+            );
+
+        public static async ValueTask StartTaskAsync(
+            this ProgressContext progressContext,
+            string description,
+            Func<ProgressTask, ValueTask> performOperationAsync)
+        {
+            var progressTask = progressContext.AddTask(
+                // Don't recognize random square brackets as style tags
+                Markup.Escape(description),
+                new ProgressTaskSettings {MaxValue = 1}
+            );
+
+            try
+            {
+                await performOperationAsync(progressTask);
+            }
+            finally
+            {
+                progressTask.StopTask();
+            }
+        }
+    }
+}
@@ -1,9 +1,7 @@
 using System.Net.Http.Headers;

-namespace DiscordChatExporter.Domain.Discord
+namespace DiscordChatExporter.Core.Discord
 {
-    public enum AuthTokenType { User, Bot }
-
    public class AuthToken
    {
        public AuthTokenType Type { get; }
@@ -16,7 +14,7 @@ namespace DiscordChatExporter.Domain.Discord
            Value = value;
        }

-        public AuthenticationHeaderValue GetAuthorizationHeader() => Type switch
+        public AuthenticationHeaderValue GetAuthenticationHeader() => Type switch
        {
            AuthTokenType.Bot => new AuthenticationHeaderValue("Bot", Value),
            _ => new AuthenticationHeaderValue(Value)
@@ -0,0 +1,8 @@
+namespace DiscordChatExporter.Core.Discord
+{
+    public enum AuthTokenType
+    {
+        User,
+        Bot
+    }
+}
@@ -2,11 +2,11 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Text.Json;
-using DiscordChatExporter.Domain.Discord.Models.Common;
-using DiscordChatExporter.Domain.Utilities;
+using DiscordChatExporter.Core.Discord.Data.Common;
+using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;

-namespace DiscordChatExporter.Domain.Discord.Models
+namespace DiscordChatExporter.Core.Discord.Data
 {
    // https://discord.com/developers/docs/resources/channel#attachment-object
    public partial class Attachment : IHasId
@@ -17,22 +17,29 @@ namespace DiscordChatExporter.Domain.Discord.Models

        public string FileName { get; }

+        public string FileExtension => Path.GetExtension(FileName);
+
        public int? Width { get; }

        public int? Height { get; }

-        public bool IsImage => ImageFileExtensions.Contains(Path.GetExtension(FileName));
+        public bool IsImage => ImageFileExtensions.Contains(FileExtension);

-        public bool IsVideo => VideoFileExtensions.Contains(Path.GetExtension(FileName));
+        public bool IsVideo => VideoFileExtensions.Contains(FileExtension);

-        public bool IsAudio => AudioFileExtensions.Contains(Path.GetExtension(FileName));
+        public bool IsAudio => AudioFileExtensions.Contains(FileExtension);

-        public bool IsSpoiler =>
-            (IsImage || IsVideo || IsAudio) && FileName.StartsWith("SPOILER_", StringComparison.Ordinal);
+        public bool IsSpoiler => FileName.StartsWith("SPOILER_", StringComparison.Ordinal);

        public FileSize FileSize { get; }

-        public Attachment(Snowflake id, string url, string fileName, int? width, int? height, FileSize fileSize)
+        public Attachment(
+            Snowflake id,
+            string url,
+            string fileName,
+            int? width,
+            int? height,
+            FileSize fileSize)
        {
            Id = id;
            Url = url;
@@ -0,0 +1,99 @@
+using System.Linq;
+using System.Text.Json;
+using DiscordChatExporter.Core.Discord.Data.Common;
+using DiscordChatExporter.Core.Utils.Extensions;
+using JsonExtensions.Reading;
+using Tyrrrz.Extensions;
+
+namespace DiscordChatExporter.Core.Discord.Data
+{
+    // https://discord.com/developers/docs/resources/channel#channel-object
+    public partial class Channel : IHasId
+    {
+        public Snowflake Id { get; }
+
+        public ChannelType Type { get; }
+
+        public bool IsTextChannel => Type is
+            ChannelType.GuildTextChat or
+            ChannelType.DirectTextChat or
+            ChannelType.DirectGroupTextChat or
+            ChannelType.GuildNews or
+            ChannelType.GuildStore;
+
+        public bool IsVoiceChannel => !IsTextChannel;
+
+        public Snowflake GuildId { get; }
+
+        public ChannelCategory Category { get; }
+
+        public string Name { get; }
+
+        public int? Position { get; }
+
+        public string? Topic { get; }
+
+        public Channel(
+            Snowflake id,
+            ChannelType type,
+            Snowflake guildId,
+            ChannelCategory category,
+            string name,
+            int? position,
+            string? topic)
+        {
+            Id = id;
+            Type = type;
+            GuildId = guildId;
+            Category = category;
+            Name = name;
+            Position = position;
+            Topic = topic;
+        }
+
+        public override string ToString() => Name;
+    }
+
+    public partial class Channel
+    {
+        private static ChannelCategory GetFallbackCategory(ChannelType channelType) => new(
+            Snowflake.Zero,
+            channelType switch
+            {
+                ChannelType.GuildTextChat => "Text",
+                ChannelType.DirectTextChat => "Private",
+                ChannelType.DirectGroupTextChat => "Group",
+                ChannelType.GuildNews => "News",
+                ChannelType.GuildStore => "Store",
+                _ => "Default"
+            },
+            null
+        );
+
+        public static Channel Parse(JsonElement json, ChannelCategory? category = null, int? position = null)
+        {
+            var id = json.GetProperty("id").GetString().Pipe(Snowflake.Parse);
+            var guildId = json.GetPropertyOrNull("guild_id")?.GetString().Pipe(Snowflake.Parse);
+            var topic = json.GetPropertyOrNull("topic")?.GetString();
+            var type = (ChannelType) json.GetProperty("type").GetInt32();
+
+            var name =
+                // Guild channel
+                json.GetPropertyOrNull("name")?.GetString() ??
+                // DM channel
+                json.GetPropertyOrNull("recipients")?.EnumerateArray().Select(User.Parse).Select(u => u.Name).JoinToString(", ") ??
+                // Fallback
+                id.ToString();
+
+            return new Channel(
+                id,
+                type,
+                guildId ?? Guild.DirectMessages.Id,
+                category ?? GetFallbackCategory(type),
+                name,
+                position ?? json.GetPropertyOrNull("position")?.GetInt32(),
+                topic
+            );
+        }
+    }
+}
@@ -0,0 +1,45 @@
+using System.Text.Json;
+using DiscordChatExporter.Core.Discord.Data.Common;
+using DiscordChatExporter.Core.Utils.Extensions;
+using JsonExtensions.Reading;
+
+namespace DiscordChatExporter.Core.Discord.Data
+{
+    public partial class ChannelCategory : IHasId
+    {
+        public Snowflake Id { get; }
+
+        public string Name { get; }
+
+        public int? Position { get; }
+
+        public ChannelCategory(Snowflake id, string name, int? position)
+        {
+            Id = id;
+            Name = name;
+            Position = position;
+        }
+
+        public override string ToString() => Name;
+    }
+
+    public partial class ChannelCategory
+    {
+        public static ChannelCategory Parse(JsonElement json, int? position = null)
+        {
+            var id = json.GetProperty("id").GetString().Pipe(Snowflake.Parse);
+
+            var name =
+                json.GetPropertyOrNull("name")?.GetString() ??
+                id.ToString();
+
+            return new ChannelCategory(
+                id,
+                name,
+                position ?? json.GetPropertyOrNull("position")?.GetInt32()
+            );
+        }
+
+        public static ChannelCategory Empty { get; } = new(Snowflake.Zero, "<unknown category>", 0);
+    }
+}
@@ -0,0 +1,15 @@
+namespace DiscordChatExporter.Core.Discord.Data
+{
+    // https://discord.com/developers/docs/resources/channel#channel-object-channel-types
+    // Order of enum fields needs to match the order in the docs.
+    public enum ChannelType
+    {
+        GuildTextChat = 0,
+        DirectTextChat,
+        GuildVoiceChat,
+        DirectGroupTextChat,
+        GuildCategory,
+        GuildNews,
+        GuildStore
+    }
+}
@@ -1,6 +1,6 @@
 using System;

-namespace DiscordChatExporter.Domain.Discord.Models.Common
+namespace DiscordChatExporter.Core.Discord.Data.Common
 {
    // Loosely based on https://github.com/omar/ByteSize (MIT license)
    public readonly partial struct FileSize
@@ -10,19 +10,11 @@ namespace DiscordChatExporter.Domain.Discord.Models.Common
        public double TotalKiloBytes => TotalBytes / 1024.0;
        public double TotalMegaBytes => TotalKiloBytes / 1024.0;
        public double TotalGigaBytes => TotalMegaBytes / 1024.0;
-        public double TotalTeraBytes => TotalGigaBytes / 1024.0;
-        public double TotalPetaBytes => TotalTeraBytes / 1024.0;

        public FileSize(long bytes) => TotalBytes = bytes;

        private double GetLargestWholeNumberValue()
        {
-            if (Math.Abs(TotalPetaBytes) >= 1)
-                return TotalPetaBytes;
-
-            if (Math.Abs(TotalTeraBytes) >= 1)
-                return TotalTeraBytes;
-
            if (Math.Abs(TotalGigaBytes) >= 1)
                return TotalGigaBytes;

@@ -37,12 +29,6 @@ namespace DiscordChatExporter.Domain.Discord.Models.Common

        private string GetLargestWholeNumberSymbol()
        {
-            if (Math.Abs(TotalPetaBytes) >= 1)
-                return "PB";
-
-            if (Math.Abs(TotalTeraBytes) >= 1)
-                return "TB";
-
            if (Math.Abs(TotalGigaBytes) >= 1)
                return "GB";

@@ -1,4 +1,4 @@
-namespace DiscordChatExporter.Domain.Discord.Models.Common
+namespace DiscordChatExporter.Core.Discord.Data.Common
 {
    public interface IHasId
    {
@@ -1,7 +1,6 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;

-namespace DiscordChatExporter.Domain.Discord.Models.Common
+namespace DiscordChatExporter.Core.Discord.Data.Common
 {
    public partial class IdBasedEqualityComparer : IEqualityComparer<IHasId>
    {
@@ -3,11 +3,10 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using System.Text.Json;
-using DiscordChatExporter.Domain.Internal.Extensions;
-using DiscordChatExporter.Domain.Utilities;
+using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;

-namespace DiscordChatExporter.Domain.Discord.Models
+namespace DiscordChatExporter.Core.Discord.Data
 {
    // https://discord.com/developers/docs/resources/channel#embed-object
    public partial class Embed
@@ -56,6 +55,8 @@ namespace DiscordChatExporter.Domain.Discord.Models
            Footer = footer;
        }

+        public YouTubeVideoEmbedProjection? TryGetYouTubeVideo() => YouTubeVideoEmbedProjection.TryResolve(this);
+
        public override string ToString() => Title ?? "<untitled embed>";
    }

@@ -64,10 +65,10 @@ namespace DiscordChatExporter.Domain.Discord.Models
        public static Embed Parse(JsonElement json)
        {
            var title = json.GetPropertyOrNull("title")?.GetString();
-            var description = json.GetPropertyOrNull("description")?.GetString();
            var url = json.GetPropertyOrNull("url")?.GetString();
            var timestamp = json.GetPropertyOrNull("timestamp")?.GetDateTimeOffset();
            var color = json.GetPropertyOrNull("color")?.GetInt32().Pipe(System.Drawing.Color.FromArgb).ResetAlpha();
+            var description = json.GetPropertyOrNull("description")?.GetString();

            var author = json.GetPropertyOrNull("author")?.Pipe(EmbedAuthor.Parse);
            var thumbnail = json.GetPropertyOrNull("thumbnail")?.Pipe(EmbedImage.Parse);
@@ -1,7 +1,7 @@
 using System.Text.Json;
 using JsonExtensions.Reading;

-namespace DiscordChatExporter.Domain.Discord.Models
+namespace DiscordChatExporter.Core.Discord.Data
 {
    // https://discord.com/developers/docs/resources/channel#embed-object-embed-author-structure
    public partial class EmbedAuthor
@@ -12,11 +12,14 @@ namespace DiscordChatExporter.Domain.Discord.Models

        public string? IconUrl { get; }

-        public EmbedAuthor(string? name, string? url, string? iconUrl)
+        public string? IconProxyUrl { get; }
+
+        public EmbedAuthor(string? name, string? url, string? iconUrl, string? iconProxyUrl)
        {
            Name = name;
            Url = url;
            IconUrl = iconUrl;
+            IconProxyUrl = iconProxyUrl;
        }

        public override string ToString() => Name ?? "<unnamed author>";
@@ -29,8 +32,9 @@ namespace DiscordChatExporter.Domain.Discord.Models
            var name = json.GetPropertyOrNull("name")?.GetString();
            var url = json.GetPropertyOrNull("url")?.GetString();
            var iconUrl = json.GetPropertyOrNull("icon_url")?.GetString();
+            var iconProxyUrl = json.GetPropertyOrNull("proxy_icon_url")?.GetString();

-            return new EmbedAuthor(name, url, iconUrl);
+            return new EmbedAuthor(name, url, iconUrl, iconProxyUrl);
        }
    }
 }
@@ -1,7 +1,7 @@
 using System.Text.Json;
 using JsonExtensions.Reading;

-namespace DiscordChatExporter.Domain.Discord.Models
+namespace DiscordChatExporter.Core.Discord.Data
 {
    // https://discord.com/developers/docs/resources/channel#embed-object-embed-field-structure
    public partial class EmbedField
@@ -1,7 +1,7 @@
 using System.Text.Json;
 using JsonExtensions.Reading;

-namespace DiscordChatExporter.Domain.Discord.Models
+namespace DiscordChatExporter.Core.Discord.Data
 {
    // https://discord.com/developers/docs/resources/channel#embed-object-embed-footer-structure
    public partial class EmbedFooter
@@ -10,10 +10,13 @@ namespace DiscordChatExporter.Domain.Discord.Models

        public string? IconUrl { get; }

-        public EmbedFooter(string text, string? iconUrl)
+        public string? IconProxyUrl { get; }
+
+        public EmbedFooter(string text, string? iconUrl, string? iconProxyUrl)
        {
            Text = text;
            IconUrl = iconUrl;
+            IconProxyUrl = iconProxyUrl;
        }

        public override string ToString() => Text;
@@ -25,8 +28,9 @@ namespace DiscordChatExporter.Domain.Discord.Models
        {
            var text = json.GetProperty("text").GetString();
            var iconUrl = json.GetPropertyOrNull("icon_url")?.GetString();
+            var iconProxyUrl = json.GetPropertyOrNull("proxy_icon_url")?.GetString();

-            return new EmbedFooter(text, iconUrl);
+            return new EmbedFooter(text, iconUrl, iconProxyUrl);
        }
    }
 }
@@ -1,20 +1,23 @@
 using System.Text.Json;
 using JsonExtensions.Reading;

-namespace DiscordChatExporter.Domain.Discord.Models
+namespace DiscordChatExporter.Core.Discord.Data
 {
    // https://discord.com/developers/docs/resources/channel#embed-object-embed-image-structure
    public partial class EmbedImage
    {
        public string? Url { get; }

+        public string? ProxyUrl { get; }
+
        public int? Width { get; }

        public int? Height { get; }

-        public EmbedImage(string? url, int? width, int? height)
+        public EmbedImage(string? url, string? proxyUrl, int? width, int? height)
        {
            Url = url;
+            ProxyUrl = proxyUrl;
            Height = height;
            Width = width;
        }
@@ -25,10 +28,11 @@ namespace DiscordChatExporter.Domain.Discord.Models
        public static EmbedImage Parse(JsonElement json)
        {
            var url = json.GetPropertyOrNull("url")?.GetString();
+            var proxyUrl = json.GetPropertyOrNull("proxy_url")?.GetString();
            var width = json.GetPropertyOrNull("width")?.GetInt32();
            var height = json.GetPropertyOrNull("height")?.GetInt32();

-            return new EmbedImage(url, width, height);
+            return new EmbedImage(url, proxyUrl, width, height);
        }
    }
 }
@@ -0,0 +1,74 @@
+using System.Linq;
+using System.Text.Json;
+using DiscordChatExporter.Core.Utils;
+using DiscordChatExporter.Core.Utils.Extensions;
+using JsonExtensions.Reading;
+using Tyrrrz.Extensions;
+
+namespace DiscordChatExporter.Core.Discord.Data
+{
+    // https://discord.com/developers/docs/resources/emoji#emoji-object
+    public partial class Emoji
+    {
+        // Only present on custom emoji
+        public string? Id { get; }
+
+        // Name of custom emoji (e.g. LUL) or actual representation of standard emoji (e.g. 🙂)
+        public string Name { get; }
+
+        // Name of custom emoji (e.g. LUL) or name of standard emoji (e.g. slight_smile)
+        public string Code => !string.IsNullOrWhiteSpace(Id)
+            ? Name
+            : EmojiIndex.TryGetCode(Name) ?? Name;
+
+        public bool IsAnimated { get; }
+
+        public string ImageUrl { get; }
+
+        public Emoji(string? id, string name, bool isAnimated, string imageUrl)
+        {
+            Id = id;
+            Name = name;
+            IsAnimated = isAnimated;
+            ImageUrl = imageUrl;
+        }
+
+        public override string ToString() => Name;
+    }
+
+    public partial class Emoji
+    {
+        private static string GetTwemojiName(string name) => name
+            .GetRunes()
+            // Variant selector rune is skipped in Twemoji names
+            .Where(r => r.Value != 0xfe0f)
+            .Select(r => r.Value.ToString("x"))
+            .JoinToString("-");
+
+        public static string GetImageUrl(string? id, string name, bool isAnimated)
+        {
+            // Custom emoji
+            if (!string.IsNullOrWhiteSpace(id))
+            {
+                return isAnimated
+                    ? $"https://cdn.discordapp.com/emojis/{id}.gif"
+                    : $"https://cdn.discordapp.com/emojis/{id}.png";
+            }
+
+            // Standard emoji
+            var twemojiName = GetTwemojiName(name);
+            return $"https://twemoji.maxcdn.com/2/svg/{twemojiName}.svg";
+        }
+
+        public static Emoji Parse(JsonElement json)
+        {
+            var id = json.GetPropertyOrNull("id")?.GetString();
+            var name = json.GetProperty("name").GetString();
+            var isAnimated = json.GetPropertyOrNull("animated")?.GetBoolean() ?? false;
+
+            var imageUrl = GetImageUrl(id, name, isAnimated);
+
+            return new Emoji(id, name, isAnimated, imageUrl);
+        }
+    }
+}
@@ -1,8 +1,8 @@
 using System.Text.Json;
-using DiscordChatExporter.Domain.Discord.Models.Common;
-using DiscordChatExporter.Domain.Utilities;
+using DiscordChatExporter.Core.Discord.Data.Common;
+using DiscordChatExporter.Core.Utils.Extensions;

-namespace DiscordChatExporter.Domain.Discord.Models
+namespace DiscordChatExporter.Core.Discord.Data
 {
    // https://discord.com/developers/docs/resources/guild#guild-object
    public partial class Guild : IHasId
@@ -25,7 +25,11 @@ namespace DiscordChatExporter.Domain.Discord.Models

    public partial class Guild
    {
-        public static Guild DirectMessages { get; } = new(Snowflake.Zero, "Direct Messages", GetDefaultIconUrl());
+        public static Guild DirectMessages { get; } = new(
+            Snowflake.Zero,
+            "Direct Messages",
+            GetDefaultIconUrl()
+        );

        private static string GetDefaultIconUrl() =>
            "https://cdn.discordapp.com/embed/avatars/0.png";
@@ -2,11 +2,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
-using DiscordChatExporter.Domain.Discord.Models.Common;
-using DiscordChatExporter.Domain.Utilities;
+using DiscordChatExporter.Core.Discord.Data.Common;
+using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;

-namespace DiscordChatExporter.Domain.Discord.Models
+namespace DiscordChatExporter.Core.Discord.Data
 {
    // https://discord.com/developers/docs/resources/guild#guild-member-object
    public partial class Member : IHasId
@@ -19,10 +19,10 @@ namespace DiscordChatExporter.Domain.Discord.Models

        public IReadOnlyList<Snowflake> RoleIds { get; }

-        public Member(User user, string? nick, IReadOnlyList<Snowflake> roleIds)
+        public Member(User user, string nick, IReadOnlyList<Snowflake> roleIds)
        {
            User = user;
-            Nick = nick ?? user.Name;
+            Nick = nick;
            RoleIds = roleIds;
        }

@@ -31,7 +31,11 @@ namespace DiscordChatExporter.Domain.Discord.Models

    public partial class Member
    {
-        public static Member CreateForUser(User user) => new(user, null, Array.Empty<Snowflake>());
+        public static Member CreateForUser(User user) => new(
+            user,
+            user.Name,
+            Array.Empty<Snowflake>()
+        );

        public static Member Parse(JsonElement json)
        {
@@ -39,12 +43,12 @@ namespace DiscordChatExporter.Domain.Discord.Models
            var nick = json.GetPropertyOrNull("nick")?.GetString();

            var roleIds =
-                json.GetPropertyOrNull("roles")?.EnumerateArray().Select(j => j.GetString().Pipe(Snowflake.Parse)).ToArray() ??
+                json.GetPropertyOrNull("roles")?.EnumerateArray().Select(j => j.GetString()).Select(Snowflake.Parse).ToArray() ??
                Array.Empty<Snowflake>();

            return new Member(
                user,
-                nick,
+                nick ?? user.Name,
                roleIds
            );
        }
@@ -2,11 +2,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
-using DiscordChatExporter.Domain.Discord.Models.Common;
-using DiscordChatExporter.Domain.Utilities;
+using DiscordChatExporter.Core.Discord.Data.Common;
+using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;

-namespace DiscordChatExporter.Domain.Discord.Models
+namespace DiscordChatExporter.Core.Discord.Data
 {
    // https://discord.com/developers/docs/resources/channel#message-object-message-types
    public enum MessageType
@@ -100,7 +100,7 @@ namespace DiscordChatExporter.Domain.Discord.Models
            var type = (MessageType) json.GetProperty("type").GetInt32();
            var isPinned = json.GetPropertyOrNull("pinned")?.GetBoolean() ?? false;
            var messageReference = json.GetPropertyOrNull("message_reference")?.Pipe(MessageReference.Parse);
-            var referencedMessage = json.GetPropertyOrNull("referenced_message")?.Pipe(Message.Parse);
+            var referencedMessage = json.GetPropertyOrNull("referenced_message")?.Pipe(Parse);

            var content = type switch
            {
@@ -1,8 +1,8 @@
 using System.Text.Json;
-using DiscordChatExporter.Domain.Utilities;
+using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;

-namespace DiscordChatExporter.Domain.Discord.Models
+namespace DiscordChatExporter.Core.Discord.Data
 {
    // https://discord.com/developers/docs/resources/channel#message-object-message-reference-structure
    public partial class MessageReference
@@ -1,7 +1,7 @@
 using System.Text.Json;
-using DiscordChatExporter.Domain.Utilities;
+using DiscordChatExporter.Core.Utils.Extensions;

-namespace DiscordChatExporter.Domain.Discord.Models
+namespace DiscordChatExporter.Core.Discord.Data
 {
    // https://discord.com/developers/docs/resources/channel#reaction-object
    public partial class Reaction
@@ -23,8 +23,8 @@ namespace DiscordChatExporter.Domain.Discord.Models
    {
        public static Reaction Parse(JsonElement json)
        {
-            var count = json.GetProperty("count").GetInt32();
            var emoji = json.GetProperty("emoji").Pipe(Emoji.Parse);
+            var count = json.GetProperty("count").GetInt32();

            return new Reaction(emoji, count);
        }
@@ -1,11 +1,10 @@
 using System.Drawing;
 using System.Text.Json;
-using DiscordChatExporter.Domain.Discord.Models.Common;
-using DiscordChatExporter.Domain.Internal.Extensions;
-using DiscordChatExporter.Domain.Utilities;
+using DiscordChatExporter.Core.Discord.Data.Common;
+using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;

-namespace DiscordChatExporter.Domain.Discord.Models
+namespace DiscordChatExporter.Core.Discord.Data
 {
    // https://discord.com/developers/docs/topics/permissions#role-object
    public partial class Role : IHasId
@@ -18,7 +17,11 @@ namespace DiscordChatExporter.Domain.Discord.Models

        public Color? Color { get; }

-        public Role(Snowflake id, string name, int position, Color? color)
+        public Role(
+            Snowflake id,
+            string name,
+            int position,
+            Color? color)
        {
            Id = id;
            Name = name;
@@ -37,7 +40,8 @@ namespace DiscordChatExporter.Domain.Discord.Models
            var name = json.GetProperty("name").GetString();
            var position = json.GetProperty("position").GetInt32();

-            var color = json.GetPropertyOrNull("color")?
+            var color = json
+                .GetPropertyOrNull("color")?
                .GetInt32()
                .Pipe(System.Drawing.Color.FromArgb)
                .ResetAlpha()
@@ -1,10 +1,10 @@
 using System;
 using System.Text.Json;
-using DiscordChatExporter.Domain.Discord.Models.Common;
-using DiscordChatExporter.Domain.Utilities;
+using DiscordChatExporter.Core.Discord.Data.Common;
+using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;

-namespace DiscordChatExporter.Domain.Discord.Models
+namespace DiscordChatExporter.Core.Discord.Data
 {
    // https://discord.com/developers/docs/resources/user#user-object
    public partial class User : IHasId
@@ -15,13 +15,20 @@ namespace DiscordChatExporter.Domain.Discord.Models

        public int Discriminator { get; }

+        public string DiscriminatorFormatted => $"{Discriminator:0000}";
+
        public string Name { get; }

-        public string FullName => $"{Name}#{Discriminator:0000}";
+        public string FullName => $"{Name}#{DiscriminatorFormatted}";

        public string AvatarUrl { get; }

-        public User(Snowflake id, bool isBot, int discriminator, string name, string avatarUrl)
+        public User(
+            Snowflake id,
+            bool isBot,
+            int discriminator,
+            string name,
+            string avatarUrl)
        {
            Id = id;
            IsBot = isBot;
@@ -42,19 +49,19 @@ namespace DiscordChatExporter.Domain.Discord.Models
        {
            // Animated
            if (avatarHash.StartsWith("a_", StringComparison.Ordinal))
-                return $"https://cdn.discordapp.com/avatars/{id}/{avatarHash}.gif";
+                return $"https://cdn.discordapp.com/avatars/{id}/{avatarHash}.gif?size=40";

            // Non-animated
-            return $"https://cdn.discordapp.com/avatars/{id}/{avatarHash}.png";
+            return $"https://cdn.discordapp.com/avatars/{id}/{avatarHash}.png?size=40";
        }

        public static User Parse(JsonElement json)
        {
            var id = json.GetProperty("id").GetString().Pipe(Snowflake.Parse);
+            var isBot = json.GetPropertyOrNull("bot")?.GetBoolean() ?? false;
            var discriminator = json.GetProperty("discriminator").GetString().Pipe(int.Parse);
            var name = json.GetProperty("username").GetString();
            var avatarHash = json.GetProperty("avatar").GetString();
-            var isBot = json.GetPropertyOrNull("bot")?.GetBoolean() ?? false;

            var avatarUrl = !string.IsNullOrWhiteSpace(avatarHash)
                ? GetAvatarUrl(id, avatarHash)
@@ -0,0 +1,61 @@
+using System.Text.RegularExpressions;
+
+namespace DiscordChatExporter.Core.Discord.Data
+{
+    public partial class YouTubeVideoEmbedProjection
+    {
+        public string VideoId { get; }
+
+        public string Url { get; }
+
+        public YouTubeVideoEmbedProjection(string videoId, string url)
+        {
+            VideoId = videoId;
+            Url = url;
+        }
+
+        public override string ToString() => Url;
+    }
+
+    public partial class YouTubeVideoEmbedProjection
+    {
+        // Adapted from YoutubeExplode
+        // https://github.com/Tyrrrz/YoutubeExplode/blob/5be164be20019783913f76fcc98f18c65aebe9f0/YoutubeExplode/Videos/VideoId.cs#L34-L64
+        private static string? TryParseVideoId(string embedUrl)
+        {
+            // Regular URL
+            // https://www.youtube.com/watch?v=yIVRs6YSbOM
+            var regularMatch = Regex.Match(embedUrl, @"youtube\..+?/watch.*?v=(.*?)(?:&|/|$)").Groups[1].Value;
+            if (!string.IsNullOrWhiteSpace(regularMatch))
+                return regularMatch;
+
+            // Short URL
+            // https://youtu.be/yIVRs6YSbOM
+            var shortMatch = Regex.Match(embedUrl, @"youtu\.be/(.*?)(?:\?|&|/|$)").Groups[1].Value;
+            if (!string.IsNullOrWhiteSpace(shortMatch))
+                return shortMatch;
+
+            // Embed URL
+            // https://www.youtube.com/embed/yIVRs6YSbOM
+            var embedMatch = Regex.Match(embedUrl, @"youtube\..+?/embed/(.*?)(?:\?|&|/|$)").Groups[1].Value;
+            if (!string.IsNullOrWhiteSpace(embedMatch))
+                return embedMatch;
+
+            return null;
+        }
+
+        public static YouTubeVideoEmbedProjection? TryResolve(Embed embed)
+        {
+            if (string.IsNullOrWhiteSpace(embed.Url))
+                return null;
+
+            var videoId = TryParseVideoId(embed.Url);
+            if (string.IsNullOrWhiteSpace(videoId))
+                return null;
+
+            var url = $"https://www.youtube.com/embed/{videoId}";
+
+            return new YouTubeVideoEmbedProjection(videoId, url);
+        }
+    }
+}
@@ -5,14 +5,14 @@ using System.Net;
 using System.Net.Http;
 using System.Text.Json;
 using System.Threading.Tasks;
-using DiscordChatExporter.Domain.Discord.Models;
-using DiscordChatExporter.Domain.Exceptions;
-using DiscordChatExporter.Domain.Internal;
-using DiscordChatExporter.Domain.Utilities;
+using DiscordChatExporter.Core.Discord.Data;
+using DiscordChatExporter.Core.Exceptions;
+using DiscordChatExporter.Core.Utils;
+using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Http;
 using JsonExtensions.Reading;

-namespace DiscordChatExporter.Domain.Discord
+namespace DiscordChatExporter.Core.Discord
 {
    public class DiscordClient
    {
@@ -28,13 +28,15 @@ namespace DiscordChatExporter.Domain.Discord
        }

        public DiscordClient(AuthToken token)
-            : this(Http.Client, token) {}
+            : this(Http.Client, token)
+        {
+        }

        private async ValueTask<HttpResponseMessage> GetResponseAsync(string url) =>
            await Http.ResponsePolicy.ExecuteAsync(async () =>
            {
                using var request = new HttpRequestMessage(HttpMethod.Get, new Uri(_baseUri, url));
-                request.Headers.Authorization = _token.GetAuthorizationHeader();
+                request.Headers.Authorization = _token.GetAuthenticationHeader();

                return await _httpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead);
            });
@@ -49,7 +51,7 @@ namespace DiscordChatExporter.Domain.Discord
                {
                    HttpStatusCode.Unauthorized => DiscordChatExporterException.Unauthorized(),
                    HttpStatusCode.Forbidden => DiscordChatExporterException.Forbidden(),
-                    HttpStatusCode.NotFound => DiscordChatExporterException.NotFound(),
+                    HttpStatusCode.NotFound => DiscordChatExporterException.NotFound(url),
                    _ => DiscordChatExporterException.FailedHttpRequest(response)
                };
            }
@@ -63,7 +65,7 @@ namespace DiscordChatExporter.Domain.Discord

            return response.IsSuccessStatusCode
                ? await response.Content.ReadAsJsonAsync()
-                : (JsonElement?) null;
+                : null;
        }

        public async IAsyncEnumerable<Guild> GetUserGuildsAsync()
@@ -117,25 +119,30 @@ namespace DiscordChatExporter.Domain.Discord
            {
                var response = await GetJsonResponseAsync($"guilds/{guildId}/channels");

-                var categories = response
+                var responseOrdered = response
                    .EnumerateArray()
-                    .ToDictionary(
-                        j => j.GetProperty("id").GetString(),
-                        j => j.GetProperty("name").GetString()
-                    );
+                    .OrderBy(j => j.GetProperty("position").GetInt32())
+                    .ThenBy(j => Snowflake.Parse(j.GetProperty("id").GetString()))
+                    .ToArray();

-                foreach (var channelJson in response.EnumerateArray())
+                var categories = responseOrdered
+                    .Where(j => j.GetProperty("type").GetInt32() == (int) ChannelType.GuildCategory)
+                    .Select((j, index) => ChannelCategory.Parse(j, index + 1))
+                    .ToDictionary(j => j.Id.ToString(), StringComparer.Ordinal);
+
+                var position = 0;
+
+                foreach (var channelJson in responseOrdered)
                {
                    var parentId = channelJson.GetPropertyOrNull("parent_id")?.GetString();
+
                    var category = !string.IsNullOrWhiteSpace(parentId)
                        ? categories.GetValueOrDefault(parentId)
                        : null;

-                    var channel = Channel.Parse(channelJson, category);
+                    var channel = Channel.Parse(channelJson, category, position);

-                    // Skip non-text channels
-                    if (!channel.IsTextChannel)
-                        continue;
+                    position++;

                    yield return channel;
                }
@@ -162,10 +169,19 @@ namespace DiscordChatExporter.Domain.Discord
            return response?.Pipe(Member.Parse);
        }

-        private async ValueTask<string> GetChannelCategoryAsync(Snowflake channelParentId)
+        public async ValueTask<ChannelCategory> GetChannelCategoryAsync(Snowflake channelId)
        {
-            var response = await GetJsonResponseAsync($"channels/{channelParentId}");
-            return response.GetProperty("name").GetString();
+            try
+            {
+                var response = await GetJsonResponseAsync($"channels/{channelId}");
+                return ChannelCategory.Parse(response);
+            }
+            // In some cases, the Discord API returns an empty body when requesting channel category.
+            // Instead, we use an empty channel category as a fallback.
+            catch (DiscordChatExporterException)
+            {
+                return ChannelCategory.Empty;
+            }
        }

        public async ValueTask<Channel> GetChannelAsync(Snowflake channelId)
@@ -174,7 +190,7 @@ namespace DiscordChatExporter.Domain.Discord

            var parentId = response.GetPropertyOrNull("parent_id")?.GetString().Pipe(Snowflake.Parse);

-            var category = parentId != null
+            var category = parentId is not null
                ? await GetChannelCategoryAsync(parentId.Value)
                : null;

@@ -200,11 +216,11 @@ namespace DiscordChatExporter.Domain.Discord
            IProgress<double>? progress = null)
        {
            // Get the last message in the specified range.
-            // This snapshots the boundaries, which means that messages posted after the exported started
+            // This snapshots the boundaries, which means that messages posted after the export started
            // will not appear in the output.
            // Additionally, it provides the date of the last message, which is used to calculate progress.
            var lastMessage = await TryGetLastMessageAsync(channelId, before);
-            if (lastMessage == null || lastMessage.Timestamp < after?.ToDate())
+            if (lastMessage is null || lastMessage.Timestamp < after?.ToDate())
                yield break;

            // Keep track of first message in range in order to calculate progress
@@ -239,11 +255,23 @@ namespace DiscordChatExporter.Domain.Discord
                    if (message.Timestamp > lastMessage.Timestamp)
                        yield break;

-                    // Report progress based on the duration of parsed messages divided by total
-                    progress?.Report(
-                        (message.Timestamp - firstMessage.Timestamp) /
-                        (lastMessage.Timestamp - firstMessage.Timestamp)
-                    );
+                    // Report progress based on the duration of exported messages divided by total
+                    if (progress is not null)
+                    {
+                        var exportedDuration = (message.Timestamp - firstMessage.Timestamp).Duration();
+                        var totalDuration = (lastMessage.Timestamp - firstMessage.Timestamp).Duration();
+
+                        if (totalDuration > TimeSpan.Zero)
+                        {
+                            progress.Report(exportedDuration / totalDuration);
+                        }
+                        // Avoid division by zero if all messages have the exact same timestamp
+                        // (which may be the case if there's only one message in the channel)
+                        else
+                        {
+                            progress.Report(1);
+                        }
+                    }

                    yield return message;
                    currentAfter = message.Id;
@@ -251,4 +279,4 @@ namespace DiscordChatExporter.Domain.Discord
            }
        }
    }
-}
+}
@@ -2,7 +2,7 @@
 using System.Globalization;
 using System.Text.RegularExpressions;

-namespace DiscordChatExporter.Domain.Discord
+namespace DiscordChatExporter.Core.Discord
 {
    public readonly partial struct Snowflake
    {
@@ -10,8 +10,9 @@ namespace DiscordChatExporter.Domain.Discord

        public Snowflake(ulong value) => Value = value;

-        public DateTimeOffset ToDate() =>
-            DateTimeOffset.FromUnixTimeMilliseconds((long) ((Value >> 22) + 1420070400000UL)).ToLocalTime();
+        public DateTimeOffset ToDate() => DateTimeOffset.FromUnixTimeMilliseconds(
+            (long) ((Value >> 22) + 1420070400000UL)
+        ).ToLocalTime();

        public override string ToString() => Value.ToString(CultureInfo.InvariantCulture);
    }
@@ -32,7 +33,7 @@ namespace DiscordChatExporter.Domain.Discord
                return null;

            // As number
-            if (Regex.IsMatch(str, @"^\d{15,}$") &&
+            if (Regex.IsMatch(str, @"^\d+$") &&
                ulong.TryParse(str, NumberStyles.Number, formatProvider, out var value))
            {
                return new Snowflake(value);
@@ -48,14 +49,16 @@ namespace DiscordChatExporter.Domain.Discord
        }

        public static Snowflake Parse(string str, IFormatProvider? formatProvider) =>
-            TryParse(str, formatProvider) ?? throw new FormatException($"Invalid snowflake: {str}.");
+            TryParse(str, formatProvider) ?? throw new FormatException($"Invalid snowflake '{str}'.");

        public static Snowflake Parse(string str) => Parse(str, null);
    }

-    public partial struct Snowflake : IEquatable<Snowflake>
+    public partial struct Snowflake : IComparable<Snowflake>, IEquatable<Snowflake>
    {
-        public bool Equals(Snowflake other) => Value == other.Value;
+        public int CompareTo(Snowflake other) => Value.CompareTo(other.Value);
+
+        public bool Equals(Snowflake other) => CompareTo(other) == 0;

        public override bool Equals(object? obj) => obj is Snowflake other && Equals(other);

@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="JsonExtensions" Version="1.1.0" />
+    <PackageReference Include="MiniRazor.CodeGen" Version="2.1.2" />
+    <PackageReference Include="Polly" Version="7.2.2" />
+    <PackageReference Include="Superpower" Version="2.3.0" />
+    <PackageReference Include="Tyrrrz.Extensions" Version="1.6.5" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <AdditionalFiles Include="Exporting\Writers\Html\*.cshtml" IsRazorTemplate="true" />
+  </ItemGroup>
+
+</Project>
@@ -1,7 +1,7 @@
 using System;
 using System.Net.Http;

-namespace DiscordChatExporter.Domain.Exceptions
+namespace DiscordChatExporter.Core.Exceptions
 {
    public partial class DiscordChatExporterException : Exception
    {
@@ -21,35 +21,25 @@ namespace DiscordChatExporter.Domain.Exceptions
            var message = $@"
 Failed to perform an HTTP request.

+[Request]
 {response.RequestMessage}

+[Response]
 {response}";

            return new DiscordChatExporterException(message.Trim(), true);
        }

-        internal static DiscordChatExporterException Unauthorized()
-        {
-            const string message = "Authentication token is invalid.";
-            return new DiscordChatExporterException(message);
-        }
+        internal static DiscordChatExporterException Unauthorized() =>
+            new("Authentication token is invalid.");

-        internal static DiscordChatExporterException Forbidden()
-        {
-            const string message = "Access is forbidden.";
-            return new DiscordChatExporterException(message);
-        }
+        internal static DiscordChatExporterException Forbidden() =>
+            new("Access is forbidden.");

-        internal static DiscordChatExporterException NotFound()
-        {
-            const string message = "Requested resource does not exist.";
-            return new DiscordChatExporterException(message);
-        }
+        internal static DiscordChatExporterException NotFound(string resourceId) =>
+            new($"Requested resource ({resourceId}) does not exist.");

-        internal static DiscordChatExporterException ChannelIsEmpty()
-        {
-            var message = $"No messages for the specified period.";
-            return new DiscordChatExporterException(message);
-        }
+        internal static DiscordChatExporterException ChannelIsEmpty() =>
+            new("No messages found for the specified period.");
    }
 }
@@ -2,13 +2,13 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using DiscordChatExporter.Domain.Discord;
-using DiscordChatExporter.Domain.Discord.Models;
-using DiscordChatExporter.Domain.Discord.Models.Common;
-using DiscordChatExporter.Domain.Exceptions;
-using DiscordChatExporter.Domain.Utilities;
+using DiscordChatExporter.Core.Discord;
+using DiscordChatExporter.Core.Discord.Data;
+using DiscordChatExporter.Core.Discord.Data.Common;
+using DiscordChatExporter.Core.Exceptions;
+using DiscordChatExporter.Core.Utils.Extensions;

-namespace DiscordChatExporter.Domain.Exporting
+namespace DiscordChatExporter.Core.Exporting
 {
    public class ChannelExporter
    {
@@ -39,6 +39,10 @@ namespace DiscordChatExporter.Domain.Exporting
            var encounteredUsers = new HashSet<User>(IdBasedEqualityComparer.Instance);
            await foreach (var message in _discord.GetMessagesAsync(request.Channel.Id, request.After, request.Before, progress))
            {
+                // Skips any messages that fail to pass the supplied filter
+                if (!request.MessageFilter.Filter(message))
+                    continue;
+
                // Resolve members for referenced users
                foreach (var referencedUser in message.MentionedUsers.Prepend(message.Author))
                {
@@ -5,12 +5,12 @@ using System.IO;
 using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
-using DiscordChatExporter.Domain.Discord;
-using DiscordChatExporter.Domain.Discord.Models;
-using DiscordChatExporter.Domain.Internal.Extensions;
+using DiscordChatExporter.Core.Discord;
+using DiscordChatExporter.Core.Discord.Data;
+using DiscordChatExporter.Core.Utils.Extensions;
 using Tyrrrz.Extensions;

-namespace DiscordChatExporter.Domain.Exporting
+namespace DiscordChatExporter.Core.Exporting
 {
    internal class ExportContext
    {
@@ -57,7 +57,7 @@ namespace DiscordChatExporter.Domain.Exporting
            var roles = member?.RoleIds.Join(Roles, i => i, r => r.Id, (_, role) => role);

            return roles?
-                .Where(r => r.Color != null)
+                .Where(r => r.Color is not null)
                .OrderByDescending(r => r.Position)
                .Select(r => r.Color)
                .FirstOrDefault();
@@ -79,7 +79,7 @@ namespace DiscordChatExporter.Domain.Exporting
                    : filePath;

                // HACK: for HTML, we need to format the URL properly
-                if (Request.Format == ExportFormat.HtmlDark || Request.Format == ExportFormat.HtmlLight)
+                if (Request.Format is ExportFormat.HtmlDark or ExportFormat.HtmlLight)
                {
                    // Need to escape each path segment while keeping the directory separators intact
                    return relativeFilePath
@@ -93,7 +93,7 @@ namespace DiscordChatExporter.Domain.Exporting
            // Try to catch only exceptions related to failed HTTP requests
            // https://github.com/Tyrrrz/DiscordChatExporter/issues/332
            // https://github.com/Tyrrrz/DiscordChatExporter/issues/372
-            catch (Exception ex) when (ex is HttpRequestException || ex is OperationCanceledException)
+            catch (Exception ex) when (ex is HttpRequestException or OperationCanceledException)
            {
                // TODO: add logging so we can be more liberal with catching exceptions
                // We don't want this to crash the exporting process in case of failure
@@ -1,6 +1,6 @@
 using System;

-namespace DiscordChatExporter.Domain.Exporting
+namespace DiscordChatExporter.Core.Exporting
 {
    public enum ExportFormat
    {
@@ -1,10 +1,14 @@
-using System.IO;
+using System;
+using System.IO;
 using System.Text;
-using DiscordChatExporter.Domain.Discord;
-using DiscordChatExporter.Domain.Discord.Models;
-using DiscordChatExporter.Domain.Internal;
+using System.Text.RegularExpressions;
+using DiscordChatExporter.Core.Discord;
+using DiscordChatExporter.Core.Discord.Data;
+using DiscordChatExporter.Core.Exporting.Filtering;
+using DiscordChatExporter.Core.Exporting.Partitioning;
+using DiscordChatExporter.Core.Utils;

-namespace DiscordChatExporter.Domain.Exporting
+namespace DiscordChatExporter.Core.Exporting
 {
    public partial class ExportRequest
    {
@@ -26,7 +30,9 @@ namespace DiscordChatExporter.Domain.Exporting

        public Snowflake? Before { get; }

-        public int? PartitionLimit { get; }
+        public PartitionLimit PartitionLimit { get; }
+
+        public MessageFilter MessageFilter { get; }

        public bool ShouldDownloadMedia { get; }

@@ -41,7 +47,8 @@ namespace DiscordChatExporter.Domain.Exporting
            ExportFormat format,
            Snowflake? after,
            Snowflake? before,
-            int? partitionLimit,
+            PartitionLimit partitionLimit,
+            MessageFilter messageFilter,
            bool shouldDownloadMedia,
            bool shouldReuseMedia,
            string dateFormat)
@@ -53,6 +60,7 @@ namespace DiscordChatExporter.Domain.Exporting
            After = after;
            Before = before;
            PartitionLimit = partitionLimit;
+            MessageFilter = messageFilter;
            ShouldDownloadMedia = shouldDownloadMedia;
            ShouldReuseMedia = shouldReuseMedia;
            DateFormat = dateFormat;
@@ -81,6 +89,26 @@ namespace DiscordChatExporter.Domain.Exporting
            Snowflake? after = null,
            Snowflake? before = null)
        {
+
+            // Formats path
+            outputPath = Regex.Replace(outputPath, "%.", m =>
+                PathEx.EscapePath(m.Value switch
+                {
+                    "%g" => guild.Id.ToString(),
+                    "%G" => guild.Name,
+                    "%t" => channel.Category.Id.ToString(),
+                    "%T" => channel.Category.Name,
+                    "%c" => channel.Id.ToString(),
+                    "%C" => channel.Name,
+                    "%p" => channel.Position?.ToString() ?? "0",
+                    "%P" => channel.Category.Position?.ToString() ?? "0",
+                    "%a" => (after ?? Snowflake.Zero).ToDate().ToString("yyyy-MM-dd"),
+                    "%b" => (before?.ToDate() ?? DateTime.Now).ToString("yyyy-MM-dd"),
+                    "%%" => "%",
+                    _ => m.Value
+                })
+            );
+
            // Output is a directory
            if (Directory.Exists(outputPath) || string.IsNullOrWhiteSpace(Path.GetExtension(outputPath)))
            {
@@ -102,20 +130,20 @@ namespace DiscordChatExporter.Domain.Exporting
            var buffer = new StringBuilder();

            // Guild and channel names
-            buffer.Append($"{guild.Name} - {channel.Category} - {channel.Name} [{channel.Id}]");
+            buffer.Append($"{guild.Name} - {channel.Category.Name} - {channel.Name} [{channel.Id}]");

            // Date range
-            if (after != null || before != null)
+            if (after is not null || before is not null)
            {
                buffer.Append(" (");

                // Both 'after' and 'before' are set
-                if (after != null && before != null)
+                if (after is not null && before is not null)
                {
                    buffer.Append($"{after?.ToDate():yyyy-MM-dd} to {before?.ToDate():yyyy-MM-dd}");
                }
                // Only 'after' is set
-                else if (after != null)
+                else if (after is not null)
                {
                    buffer.Append($"after {after?.ToDate():yyyy-MM-dd}");
                }
@@ -0,0 +1,8 @@
+namespace DiscordChatExporter.Core.Exporting.Filtering
+{
+    internal enum BinaryExpressionKind
+    {
+        Or,
+        And
+    }
+}
@@ -0,0 +1,26 @@
+using System;
+using DiscordChatExporter.Core.Discord.Data;
+
+namespace DiscordChatExporter.Core.Exporting.Filtering
+{
+    internal class BinaryExpressionMessageFilter : MessageFilter
+    {
+        private readonly MessageFilter _first;
+        private readonly MessageFilter _second;
+        private readonly BinaryExpressionKind _kind;
+
+        public BinaryExpressionMessageFilter(MessageFilter first, MessageFilter second, BinaryExpressionKind kind)
+        {
+            _first = first;
+            _second = second;
+            _kind = kind;
+        }
+
+        public override bool Filter(Message message) => _kind switch
+        {
+            BinaryExpressionKind.Or => _first.Filter(message) || _second.Filter(message),
+            BinaryExpressionKind.And => _first.Filter(message) && _second.Filter(message),
+            _ => throw new InvalidOperationException($"Unknown binary expression kind '{_kind}'.")
+        };
+    }
+}
@@ -0,0 +1,18 @@
+using System.Text.RegularExpressions;
+using DiscordChatExporter.Core.Discord.Data;
+
+namespace DiscordChatExporter.Core.Exporting.Filtering
+{
+    internal class ContainsMessageFilter : MessageFilter
+    {
+        private readonly string _text;
+
+        public ContainsMessageFilter(string text) => _text = text;
+
+        public override bool Filter(Message message) => Regex.IsMatch(
+            message.Content,
+            "\\b" + _text + "\\b",
+            RegexOptions.IgnoreCase | RegexOptions.CultureInvariant
+        );
+    }
+}
@@ -0,0 +1,17 @@
+using System;
+using DiscordChatExporter.Core.Discord.Data;
+
+namespace DiscordChatExporter.Core.Exporting.Filtering
+{
+    internal class FromMessageFilter : MessageFilter
+    {
+        private readonly string _value;
+
+        public FromMessageFilter(string value) => _value = value;
+
+        public override bool Filter(Message message) =>
+            string.Equals(_value, message.Author.Name, StringComparison.OrdinalIgnoreCase) ||
+            string.Equals(_value, message.Author.FullName, StringComparison.OrdinalIgnoreCase) ||
+            string.Equals(_value, message.Author.Id.ToString(), StringComparison.OrdinalIgnoreCase);
+    }
+}
@@ -0,0 +1,25 @@
+using System;
+using System.Linq;
+using System.Text.RegularExpressions;
+using DiscordChatExporter.Core.Discord.Data;
+
+namespace DiscordChatExporter.Core.Exporting.Filtering
+{
+    internal class HasMessageFilter : MessageFilter
+    {
+        private readonly MessageContentMatchKind _kind;
+
+        public HasMessageFilter(MessageContentMatchKind kind) => _kind = kind;
+
+        public override bool Filter(Message message) => _kind switch
+        {
+            MessageContentMatchKind.Link => Regex.IsMatch(message.Content, "https?://\\S*[^\\.,:;\"\'\\s]"),
+            MessageContentMatchKind.Embed => message.Embeds.Any(),
+            MessageContentMatchKind.File => message.Attachments.Any(),
+            MessageContentMatchKind.Video => message.Attachments.Any(file => file.IsVideo),
+            MessageContentMatchKind.Image => message.Attachments.Any(file => file.IsImage),
+            MessageContentMatchKind.Sound => message.Attachments.Any(file => file.IsAudio),
+            _ => throw new InvalidOperationException($"Unknown message content match kind '{_kind}'.")
+        };
+    }
+}
@@ -0,0 +1,19 @@
+using System;
+using System.Linq;
+using DiscordChatExporter.Core.Discord.Data;
+
+namespace DiscordChatExporter.Core.Exporting.Filtering
+{
+    internal class MentionsMessageFilter : MessageFilter
+    {
+        private readonly string _value;
+
+        public MentionsMessageFilter(string value) => _value = value;
+
+        public override bool Filter(Message message) => message.MentionedUsers.Any(user =>
+            string.Equals(_value, user.Name, StringComparison.OrdinalIgnoreCase) ||
+            string.Equals(_value, user.FullName, StringComparison.OrdinalIgnoreCase) ||
+            string.Equals(_value, user.Id.ToString(), StringComparison.OrdinalIgnoreCase)
+        );
+    }
+}
@@ -0,0 +1,12 @@
+namespace DiscordChatExporter.Core.Exporting.Filtering
+{
+    internal enum MessageContentMatchKind
+    {
+        Link,
+        Embed,
+        File,
+        Video,
+        Image,
+        Sound
+    }
+}
@@ -0,0 +1,18 @@
+using DiscordChatExporter.Core.Discord.Data;
+using DiscordChatExporter.Core.Exporting.Filtering.Parsing;
+using Superpower;
+
+namespace DiscordChatExporter.Core.Exporting.Filtering
+{
+    public abstract partial class MessageFilter
+    {
+        public abstract bool Filter(Message message);
+    }
+
+    public partial class MessageFilter
+    {
+        public static MessageFilter Null { get; } = new NullMessageFilter();
+
+        public static MessageFilter Parse(string value) => FilterGrammar.Filter.Parse(value);
+    }
+}
@@ -0,0 +1,13 @@
+using DiscordChatExporter.Core.Discord.Data;
+
+namespace DiscordChatExporter.Core.Exporting.Filtering
+{
+    internal class NegatedMessageFilter : MessageFilter
+    {
+        private readonly MessageFilter _filter;
+
+        public NegatedMessageFilter(MessageFilter filter) => _filter = filter;
+
+        public override bool Filter(Message message) => !_filter.Filter(message);
+    }
+}
@@ -0,0 +1,9 @@
+using DiscordChatExporter.Core.Discord.Data;
+
+namespace DiscordChatExporter.Core.Exporting.Filtering
+{
+    internal class NullMessageFilter : MessageFilter
+    {
+        public override bool Filter(Message message) => true;
+    }
+}
@@ -0,0 +1,106 @@
+using System.Linq;
+using DiscordChatExporter.Core.Utils.Extensions;
+using Superpower;
+using Superpower.Parsers;
+
+namespace DiscordChatExporter.Core.Exporting.Filtering.Parsing
+{
+    internal static class FilterGrammar
+    {
+        // Choice(a, b) looks cleaner than a.Or(b)
+        private static TextParser<T> Choice<T>(params TextParser<T>[] parsers) =>
+            parsers.Aggregate((current, next) => current.Or(next));
+
+        private static readonly TextParser<char> EscapedCharacter =
+            Character.EqualTo('\\').IgnoreThen(Character.AnyChar);
+
+        private static readonly TextParser<string> QuotedString =
+            from open in Character.In('"', '\'')
+            from value in Choice(EscapedCharacter, Character.Except(open)).Many().Text()
+            from close in Character.EqualTo(open)
+            select value;
+
+        private static readonly TextParser<char> FreeCharacter =
+            Character.Matching(c =>
+                    !char.IsWhiteSpace(c) &&
+                    // Avoid all special tokens used by the grammar
+                    c is not ('(' or ')' or '"' or '\'' or '-' or '|' or '&'),
+                "any character except whitespace or `(`, `)`, `\"`, `'`, `-`, `|`, `&`"
+            );
+
+        private static readonly TextParser<string> UnquotedString =
+            Choice(EscapedCharacter, FreeCharacter).AtLeastOnce().Text();
+
+        private static readonly TextParser<string> String =
+            Choice(QuotedString, UnquotedString).Named("text string");
+
+        private static readonly TextParser<MessageFilter> ContainsFilter =
+            String.Select(v => (MessageFilter) new ContainsMessageFilter(v));
+
+        private static readonly TextParser<MessageFilter> FromFilter = Span
+            .EqualToIgnoreCase("from:")
+            .IgnoreThen(String)
+            .Select(v => (MessageFilter) new FromMessageFilter(v))
+            .Named("from:<value>");
+
+        private static readonly TextParser<MessageFilter> MentionsFilter = Span
+            .EqualToIgnoreCase("mentions:")
+            .IgnoreThen(String)
+            .Select(v => (MessageFilter) new MentionsMessageFilter(v))
+            .Named("mentions:<value>");
+
+        private static readonly TextParser<MessageFilter> HasFilter = Span
+            .EqualToIgnoreCase("has:")
+            .IgnoreThen(Choice(
+                Span.EqualToIgnoreCase("link").IgnoreThen(Parse.Return(MessageContentMatchKind.Link)),
+                Span.EqualToIgnoreCase("embed").IgnoreThen(Parse.Return(MessageContentMatchKind.Embed)),
+                Span.EqualToIgnoreCase("video").IgnoreThen(Parse.Return(MessageContentMatchKind.Video)),
+                Span.EqualToIgnoreCase("image").IgnoreThen(Parse.Return(MessageContentMatchKind.Image)),
+                Span.EqualToIgnoreCase("sound").IgnoreThen(Parse.Return(MessageContentMatchKind.Sound))
+            ))
+            .Select(k => (MessageFilter) new HasMessageFilter(k))
+            .Named("has:<value>");
+
+        private static readonly TextParser<MessageFilter> NegatedFilter = Character
+            .EqualTo('-')
+            .IgnoreThen(Parse.Ref(() => StandaloneFilter))
+            .Select(f => (MessageFilter) new NegatedMessageFilter(f));
+
+        private static readonly TextParser<MessageFilter> GroupedFilter =
+            from open in Character.EqualTo('(')
+            from content in Parse.Ref(() => BinaryExpressionFilter).Token()
+            from close in Character.EqualTo(')')
+            select content;
+
+        private static readonly TextParser<MessageFilter> StandaloneFilter = Choice(
+            GroupedFilter,
+            FromFilter,
+            MentionsFilter,
+            HasFilter,
+            ContainsFilter
+        );
+
+        private static readonly TextParser<MessageFilter> UnaryExpressionFilter = Choice(
+            NegatedFilter,
+            StandaloneFilter
+        );
+
+        private static readonly TextParser<MessageFilter> BinaryExpressionFilter = Parse.Chain(
+            Choice(
+                // Explicit operator
+                Character.In('|', '&').Token().Try(),
+                // Implicit operator (resolves to 'and')
+                Character.WhiteSpace.AtLeastOnce().IgnoreThen(Parse.Return(' '))
+            ),
+            UnaryExpressionFilter,
+            (op, left, right) => op switch
+            {
+                '|' => new BinaryExpressionMessageFilter(left, right, BinaryExpressionKind.Or),
+                _ => new BinaryExpressionMessageFilter(left, right, BinaryExpressionKind.And)
+            }
+        );
+
+        public static readonly TextParser<MessageFilter> Filter =
+            BinaryExpressionFilter.Token().AtEnd();
+    }
+}
@@ -7,11 +7,10 @@ using System.Security.Cryptography;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
-using DiscordChatExporter.Domain.Internal;
-using DiscordChatExporter.Domain.Internal.Extensions;
-using DiscordChatExporter.Domain.Utilities;
+using DiscordChatExporter.Core.Utils;
+using DiscordChatExporter.Core.Utils.Extensions;

-namespace DiscordChatExporter.Domain.Exporting
+namespace DiscordChatExporter.Core.Exporting
 {
    internal partial class MediaDownloader
    {
@@ -46,7 +45,7 @@ namespace DiscordChatExporter.Domain.Exporting

            Directory.CreateDirectory(_workingDirPath);

-            // This catches IOExceptions which is dangerous as we're working also with files
+            // This retries on IOExceptions which is dangerous as we're also working with files
            await Http.ExceptionPolicy.ExecuteAsync(async () =>
            {
                // Download the file
@@ -57,17 +56,27 @@ namespace DiscordChatExporter.Domain.Exporting
                }

                // Try to set the file date according to the last-modified header
-                var lastModified = response.Content.Headers.TryGetValue("Last-Modified")?.Pipe(s =>
-                    DateTimeOffset.TryParse(s, CultureInfo.InvariantCulture, DateTimeStyles.None, out var date)
-                        ? date
-                        : (DateTimeOffset?) null
-                );
-
-                if (lastModified != null)
+                try
                {
-                    File.SetCreationTimeUtc(filePath, lastModified.Value.UtcDateTime);
-                    File.SetLastWriteTimeUtc(filePath, lastModified.Value.UtcDateTime);
-                    File.SetLastAccessTimeUtc(filePath, lastModified.Value.UtcDateTime);
+                    var lastModified = response.Content.Headers.TryGetValue("Last-Modified")?.Pipe(s =>
+                        DateTimeOffset.TryParse(s, CultureInfo.InvariantCulture, DateTimeStyles.None, out var date)
+                            ? date
+                            : (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.
+                    // https://github.com/Tyrrrz/DiscordChatExporter/issues/585
+                    // Updating file dates is not a critical task, so we'll just
+                    // ignore exceptions thrown here.
                }
            });

@@ -103,4 +112,4 @@ namespace DiscordChatExporter.Domain.Exporting
            return PathEx.EscapePath(fileNameWithoutExtension.Truncate(42) + '-' + urlHash + fileExtension);
        }
    }
-}
+}
@@ -1,16 +1,15 @@
 using System;
 using System.IO;
 using System.Threading.Tasks;
-using DiscordChatExporter.Domain.Discord.Models;
-using DiscordChatExporter.Domain.Exporting.Writers;
+using DiscordChatExporter.Core.Discord.Data;
+using DiscordChatExporter.Core.Exporting.Writers;

-namespace DiscordChatExporter.Domain.Exporting
+namespace DiscordChatExporter.Core.Exporting
 {
    internal partial class MessageExporter : IAsyncDisposable
    {
        private readonly ExportContext _context;

-        private long _messageCount;
        private int _partitionIndex;
        private MessageWriter? _writer;

@@ -19,15 +18,9 @@ namespace DiscordChatExporter.Domain.Exporting
            _context = context;
        }

-        private bool IsPartitionLimitReached() =>
-            _messageCount > 0 &&
-            _context.Request.PartitionLimit != null &&
-            _context.Request.PartitionLimit != 0 &&
-            _messageCount % _context.Request.PartitionLimit == 0;
-
        private async ValueTask ResetWriterAsync()
        {
-            if (_writer != null)
+            if (_writer is not null)
            {
                await _writer.WritePostambleAsync();
                await _writer.DisposeAsync();
@@ -38,14 +31,15 @@ namespace DiscordChatExporter.Domain.Exporting
        private async ValueTask<MessageWriter> GetWriterAsync()
        {
            // Ensure partition limit has not been exceeded
-            if (IsPartitionLimitReached())
+            if (_writer is not null &&
+                _context.Request.PartitionLimit.IsReached(_writer.MessagesWritten, _writer.BytesWritten))
            {
                await ResetWriterAsync();
                _partitionIndex++;
            }

            // Writer is still valid - return
-            if (_writer != null)
+            if (_writer is not null)
                return _writer;

            var filePath = GetPartitionFilePath(_context.Request.OutputBaseFilePath, _partitionIndex);
@@ -64,7 +58,6 @@ namespace DiscordChatExporter.Domain.Exporting
        {
            var writer = await GetWriterAsync();
            await writer.WriteMessageAsync(message);
-            _messageCount++;
        }

        public async ValueTask DisposeAsync() => await ResetWriterAsync();
@@ -72,9 +65,7 @@ namespace DiscordChatExporter.Domain.Exporting

    internal partial class MessageExporter
    {
-        private static string GetPartitionFilePath(
-            string baseFilePath,
-            int partitionIndex)
+        private static string GetPartitionFilePath(string baseFilePath, int partitionIndex)
        {
            // First partition - don't change file name
            if (partitionIndex <= 0)
@@ -0,0 +1,12 @@
+namespace DiscordChatExporter.Core.Exporting.Partitioning
+{
+    internal class FileSizePartitionLimit : PartitionLimit
+    {
+        private readonly long _limit;
+
+        public FileSizePartitionLimit(long limit) => _limit = limit;
+
+        public override bool IsReached(long messagesWritten, long bytesWritten) =>
+            bytesWritten >= _limit;
+    }
+}
@@ -0,0 +1,12 @@
+namespace DiscordChatExporter.Core.Exporting.Partitioning
+{
+    internal class MessageCountPartitionLimit : PartitionLimit
+    {
+        private readonly long _limit;
+
+        public MessageCountPartitionLimit(long limit) => _limit = limit;
+
+        public override bool IsReached(long messagesWritten, long bytesWritten) =>
+            messagesWritten >= _limit;
+    }
+}
@@ -0,0 +1,7 @@
+namespace DiscordChatExporter.Core.Exporting.Partitioning
+{
+    internal class NullPartitionLimit : PartitionLimit
+    {
+        public override bool IsReached(long messagesWritten, long bytesWritten) => false;
+    }
+}
@@ -0,0 +1,63 @@
+using System;
+using System.Globalization;
+using System.Text.RegularExpressions;
+
+namespace DiscordChatExporter.Core.Exporting.Partitioning
+{
+    public abstract partial class PartitionLimit
+    {
+        public abstract bool IsReached(long messagesWritten, long bytesWritten);
+    }
+
+    public partial class PartitionLimit
+    {
+        public static PartitionLimit Null { get; } = new NullPartitionLimit();
+
+        private static long? TryParseFileSizeBytes(string value, IFormatProvider? formatProvider = null)
+        {
+            var match = Regex.Match(value, @"^\s*(\d+[\.,]?\d*)\s*(\w)?b\s*$", RegexOptions.IgnoreCase);
+
+            // Number part
+            if (!double.TryParse(
+                match.Groups[1].Value,
+                NumberStyles.Float,
+                formatProvider,
+                out var number))
+            {
+                return null;
+            }
+
+            // Magnitude part
+            var magnitude = match.Groups[2].Value.ToUpperInvariant() switch
+            {
+                "G" => 1_000_000_000,
+                "M" => 1_000_000,
+                "K" => 1_000,
+                "" => 1,
+                _ => -1
+            };
+
+            if (magnitude < 0)
+            {
+                return null;
+            }
+
+            return (long) (number * magnitude);
+        }
+
+        public static PartitionLimit? TryParse(string value, IFormatProvider? formatProvider = null)
+        {
+            var fileSizeLimit = TryParseFileSizeBytes(value, formatProvider);
+            if (fileSizeLimit is not null)
+                return new FileSizePartitionLimit(fileSizeLimit.Value);
+
+            if (int.TryParse(value, NumberStyles.Integer, formatProvider, out var messageCountLimit))
+                return new MessageCountPartitionLimit(messageCountLimit);
+
+            return null;
+        }
+
+        public static PartitionLimit Parse(string value, IFormatProvider? formatProvider = null) =>
+            TryParse(value, formatProvider) ?? throw new FormatException($"Invalid partition limit '{value}'.");
+    }
+}
@@ -2,11 +2,11 @@
 using System.IO;
 using System.Text;
 using System.Threading.Tasks;
-using DiscordChatExporter.Domain.Discord.Models;
-using DiscordChatExporter.Domain.Exporting.Writers.MarkdownVisitors;
-using DiscordChatExporter.Domain.Internal.Extensions;
+using DiscordChatExporter.Core.Discord.Data;
+using DiscordChatExporter.Core.Exporting.Writers.MarkdownVisitors;
+using DiscordChatExporter.Core.Utils.Extensions;

-namespace DiscordChatExporter.Domain.Exporting.Writers
+namespace DiscordChatExporter.Core.Exporting.Writers
 {
    internal partial class CsvMessageWriter : MessageWriter
    {
@@ -58,6 +58,8 @@ namespace DiscordChatExporter.Domain.Exporting.Writers

        public override async ValueTask WriteMessageAsync(Message message)
        {
+            await base.WriteMessageAsync(message);
+
            // Author ID
            await _writer.WriteAsync(CsvEncode(message.Author.Id.ToString()));
            await _writer.WriteAsync(',');
@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using DiscordChatExporter.Domain.Discord.Models;
+using DiscordChatExporter.Core.Discord.Data;

-namespace DiscordChatExporter.Domain.Exporting.Writers.Html
+namespace DiscordChatExporter.Core.Exporting.Writers.Html
 {
    // Used for grouping contiguous messages in HTML export
    internal partial class MessageGroup
@@ -36,9 +36,13 @@ namespace DiscordChatExporter.Domain.Exporting.Writers.Html
    internal partial class MessageGroup
    {
        public static bool CanJoin(Message message1, Message message2) =>
+            // Must be from the same author
            message1.Author.Id == message2.Author.Id &&
+            // Author's name must not have changed between messages
            string.Equals(message1.Author.FullName, message2.Author.FullName, StringComparison.Ordinal) &&
+            // Duration between messages must be 7 minutes or less
            (message2.Timestamp - message1.Timestamp).Duration().TotalMinutes <= 7 &&
+            // Other message must not be a reply
            message2.Reference is null;

        public static MessageGroup Join(IReadOnlyList<Message> messages)
@@ -1,8 +1,10 @@
@using System
@using System.Linq
@using System.Threading.Tasks
-@namespace DiscordChatExporter.Domain.Exporting.Writers.Html
-@inherits MiniRazor.TemplateBase<DiscordChatExporter.Domain.Exporting.Writers.Html.MessageGroupTemplateContext>
+@using DiscordChatExporter.Core.Exporting.Writers.Html;
+
+@namespace DiscordChatExporter.Core.Exporting.Writers.Html
+@inherits MiniRazor.TemplateBase<MessageGroupTemplateContext>

@{
    string FormatDate(DateTimeOffset date) => Model.ExportContext.FormatDate(date);
@@ -17,7 +19,7 @@

    var userColor = Model.ExportContext.TryGetUserColor(Model.MessageGroup.Author.Id);

-    var userColorStyle = userColor != null
+    var userColorStyle = userColor is not null
        ? $"color: rgb({userColor?.R},{userColor?.G},{userColor?.B})"
        : null;

@@ -25,19 +27,19 @@
        ? Model.MessageGroup.Author.Name
        : userMember?.Nick ?? Model.MessageGroup.Author.Name;

-    var referencedUserMember = Model.MessageGroup.ReferencedMessage != null
+    var referencedUserMember = Model.MessageGroup.ReferencedMessage is not null
        ? Model.ExportContext.TryGetMember(Model.MessageGroup.ReferencedMessage.Author.Id)
        : null;

-    var referencedUserColor = Model.MessageGroup.ReferencedMessage != null
+    var referencedUserColor = Model.MessageGroup.ReferencedMessage is not null
        ? Model.ExportContext.TryGetUserColor(Model.MessageGroup.ReferencedMessage.Author.Id)
        : null;

-    var referencedUserColorStyle = referencedUserColor != null
+    var referencedUserColorStyle = referencedUserColor is not null
        ? $"color: rgb({referencedUserColor?.R},{referencedUserColor?.G},{referencedUserColor?.B})"
        : null;

-    var referencedUserNick = Model.MessageGroup.ReferencedMessage != null
+    var referencedUserNick = Model.MessageGroup.ReferencedMessage is not null
        ? Model.MessageGroup.ReferencedMessage.Author.IsBot
            ? Model.MessageGroup.ReferencedMessage.Author.Name
            : referencedUserMember?.Nick ?? Model.MessageGroup.ReferencedMessage.Author.Name
@@ -45,20 +47,24 @@
 }

 <div class="chatlog__message-group">
-    @if (Model.MessageGroup.Reference != null)
+    @{/* Referenced message */}
+    @if (Model.MessageGroup.Reference is not null)
    {
-        <div class="chatlog__reference-symbol">
-        </div>
+        <div class="chatlog__reference-symbol"></div>
        <div class="chatlog__reference">
-            @if (Model.MessageGroup.ReferencedMessage != null)
+            @if (Model.MessageGroup.ReferencedMessage is not null)
            {
-                <img class="chatlog__reference-avatar" src="@await ResolveUrlAsync(Model.MessageGroup.ReferencedMessage.Author.AvatarUrl)" alt="Avatar">
+                <img class="chatlog__reference-avatar" src="@await ResolveUrlAsync(Model.MessageGroup.ReferencedMessage.Author.AvatarUrl)" alt="Avatar" loading="lazy">
                <span class="chatlog__reference-name" title="@Model.MessageGroup.ReferencedMessage.Author.FullName" style="@referencedUserColorStyle">@referencedUserNick</span>
-                <a class="chatlog__reference-link" href="#" onclick="scrollToMessage(event, '@Model.MessageGroup.ReferencedMessage.Id')">
-                    <span class="chatlog__reference-content">
+                <div class="chatlog__reference-content">
+                    <span class="chatlog__reference-link" onclick="scrollToMessage(event, '@Model.MessageGroup.ReferencedMessage.Id')">
                        @if (!string.IsNullOrWhiteSpace(Model.MessageGroup.ReferencedMessage.Content))
                        {
-                            @Raw(FormatMarkdown(Model.MessageGroup.ReferencedMessage.Content))
+                            @Raw(FormatEmbedMarkdown(Model.MessageGroup.ReferencedMessage.Content))
+                        }
+                        else if (Model.MessageGroup.ReferencedMessage.Attachments.Any() || Model.MessageGroup.ReferencedMessage.Embeds.Any())
+                        {
+                            <em>Click to see attachment</em> <span>🖼️</span>
                        }
                        else
                        {
@@ -66,11 +72,11 @@
                        }
                    </span>

-                    @if (Model.MessageGroup.ReferencedMessage.EditedTimestamp != null)
+                    @if (Model.MessageGroup.ReferencedMessage.EditedTimestamp is not null)
                    {
                        <span class="chatlog__reference-edited-timestamp" title="@FormatDate(Model.MessageGroup.ReferencedMessage.EditedTimestamp.Value)">(edited)</span>
                    }
-                </a>
+                </div>
            }
            else
            {
@@ -80,31 +86,38 @@
            }
        </div>
    }
+
+    @{/* Avatar */}
    <div class="chatlog__author-avatar-container">
-        <img class="chatlog__author-avatar" src="@await ResolveUrlAsync(Model.MessageGroup.Author.AvatarUrl)" alt="Avatar">
+        <img class="chatlog__author-avatar" src="@await ResolveUrlAsync(Model.MessageGroup.Author.AvatarUrl)" alt="Avatar" loading="lazy">
    </div>
+
    <div class="chatlog__messages">
+        @{/* Author name */}
        <span class="chatlog__author-name" title="@Model.MessageGroup.Author.FullName" data-user-id="@Model.MessageGroup.Author.Id" style="@userColorStyle">@userNick</span>

+        @{/* Bot tag */}
        @if (Model.MessageGroup.Author.IsBot)
        {
            <span class="chatlog__bot-tag">BOT</span>
        }

+        @{/* Message timestamp */}
        <span class="chatlog__timestamp">@FormatDate(Model.MessageGroup.Timestamp)</span>

+        @{/* Messages in a group */}
        @foreach (var message in Model.MessageGroup.Messages)
        {
-            var isPinnedStyle = message.IsPinned ? "chatlog__message--pinned" : null;
-
-            <div class="chatlog__message @isPinnedStyle" data-message-id="@message.Id" id="message-@message.Id">
-                @if (!string.IsNullOrWhiteSpace(message.Content) || message.EditedTimestamp != null)
+            <div class="chatlog__message @(message.IsPinned ? "chatlog__message--pinned" : null)" data-message-id="@message.Id" id="message-@message.Id" title="Message sent: @FormatDate(message.Timestamp)">
+                @if (!string.IsNullOrWhiteSpace(message.Content) || message.EditedTimestamp is not null)
                {
                    <div class="chatlog__content">
                        <div class="markdown">
+                            @{/* Message content */}
                            <span class="preserve-whitespace">@Raw(FormatMarkdown(message.Content))</span>

-                            @if (message.EditedTimestamp != null)
+                            @{/* Edit timestamp */}
+                            @if (message.EditedTimestamp is not null)
                            {
                                <span class="chatlog__edited-timestamp" title="@FormatDate(message.EditedTimestamp.Value)">(edited)</span>
                            }
@@ -112,60 +125,64 @@
                    </div>
                }

+                @{/* Attachments */}
                @foreach (var attachment in message.Attachments)
                {
-                    <div class="chatlog__attachment">
-                        <div class="@(attachment.IsSpoiler ? "spoiler spoiler--hidden" : "")" onclick="@(attachment.IsSpoiler ? "showSpoiler(event, this)" : "")">
-                            <div class="@(attachment.IsSpoiler ? "spoiler-image" : "")">
-                                @if (attachment.IsImage)
-                                {
+                    <div class="chatlog__attachment @(attachment.IsSpoiler ? "chatlog__attachment--hidden" : "")" onclick="@(attachment.IsSpoiler ? "showSpoiler(event, this)" : "")">
+                        @{/* Spoiler caption */}
+                        @if (attachment.IsSpoiler)
+                        {
+                            <div class="chatlog__attachment-spoiler-caption">SPOILER</div>
+                        }
+
+                        @{/* Attachment preview */}
+                        @if (attachment.IsImage)
+                        {
+                            <a href="@await ResolveUrlAsync(attachment.Url)">
+                                <img class="chatlog__attachment-media" src="@await ResolveUrlAsync(attachment.Url)" alt="Image attachment" title="@($"Image: {attachment.FileName} ({attachment.FileSize})")" loading="lazy">
+                            </a>
+                        }
+                        else if (attachment.IsVideo)
+                        {
+                            <video class="chatlog__attachment-media" controls>
+                                <source src="@await ResolveUrlAsync(attachment.Url)" alt="Video attachment" title="@($"Video: {attachment.FileName} ({attachment.FileSize})")">
+                            </video>
+                        }
+                        else if (attachment.IsAudio)
+                        {
+                            <audio class="chatlog__attachment-media" controls>
+                                <source src="@await ResolveUrlAsync(attachment.Url)" alt="Audio attachment" title="@($"Audio: {attachment.FileName} ({attachment.FileSize})")">
+                            </audio>
+                        }
+                        else
+                        {
+                            <div class="chatlog__attachment-generic">
+                                <svg class="chatlog__attachment-generic-icon">
+                                    <use href="#icon-attachment" />
+                                </svg>
+                                <div class="chatlog__attachment-generic-name">
                                    <a href="@await ResolveUrlAsync(attachment.Url)">
-                                        <img class="chatlog__attachment-thumbnail" src="@await ResolveUrlAsync(attachment.Url)" alt="Image attachment" title="@($"Image: {attachment.FileName} ({attachment.FileSize})")">
+                                        @attachment.FileName
                                    </a>
-                                }
-                                else if (attachment.IsVideo)
-                                {
-                                    <video controls class="chatlog__attachment-thumbnail">
-                                        <source src="@await ResolveUrlAsync(attachment.Url)" alt="Video attachment" title="@($"Video: {attachment.FileName} ({attachment.FileSize})")">
-                                    </video>
-                                }
-                                else if (attachment.IsAudio)
-                                {
-                                    <audio controls class="chatlog__attachment-thumbnail">
-                                        <source src="@await ResolveUrlAsync(attachment.Url)" alt="Audio attachment" title="@($"Audio: {attachment.FileName} ({attachment.FileSize})")">
-                                    </audio>
-                                }
-                                else
-                                {
-                                    <div class="chatlog__attachment-container">
-                                        <svg class="chatlog__attachment-icon" viewBox="0 0 720 960">
-                                            <path class="a"/>
-                                            <path class="b"/>
-                                            <path class="c"/>
-                                            <path class="d"/>
-                                        </svg>
-                                        <div class="chatlog__attachment-filename">
-                                            <a href="@await ResolveUrlAsync(attachment.Url)">
-                                                @attachment.FileName
-                                            </a>
-                                        </div>
-                                        <div class="chatlog__attachment-filesize">
-                                            @attachment.FileSize
-                                        </div>
-                                    </div>
-                                }
+                                </div>
+                                <div class="chatlog__attachment-generic-size">
+                                    @attachment.FileSize
+                                </div>
                            </div>
-                        </div>
+                        }
                    </div>
                }

+                @{/* Embeds */}
                @foreach (var embed in message.Embeds)
                {
+                    var youTubeVideo = embed.TryGetYouTubeVideo();
+
                    <div class="chatlog__embed">
-                        @if (embed.Color != null)
+                        @{/* Color pill */}
+                        @if (embed.Color is not null)
                        {
-                            var embedColorStyle = $"background-color: rgba({embed.Color?.R},{embed.Color?.G},{embed.Color?.B},{embed.Color?.A})";
-                            <div class="chatlog__embed-color-pill" style="@embedColorStyle"></div>
+                            <div class="chatlog__embed-color-pill" style="background-color: rgba(@embed.Color?.R,@embed.Color?.G,@embed.Color?.B,@embed.Color?.A)"></div>
                        }
                        else
                        {
@@ -175,12 +192,13 @@
                        <div class="chatlog__embed-content-container">
                            <div class="chatlog__embed-content">
                                <div class="chatlog__embed-text">
-                                    @if (embed.Author != null)
+                                    @{/* Embed author */}
+                                    @if (embed.Author is not null)
                                    {
                                        <div class="chatlog__embed-author">
                                            @if (!string.IsNullOrWhiteSpace(embed.Author.IconUrl))
                                            {
-                                                <img class="chatlog__embed-author-icon" src="@await ResolveUrlAsync(embed.Author.IconUrl)" alt="Author icon">
+                                                <img class="chatlog__embed-author-icon" src="@await ResolveUrlAsync(embed.Author.IconProxyUrl ?? embed.Author.IconUrl)" alt="Author icon" loading="lazy" onerror="this.style.visibility='hidden'">
                                            }

                                            @if (!string.IsNullOrWhiteSpace(embed.Author.Name))
@@ -199,6 +217,7 @@
                                        </div>
                                    }

+                                    @{/* Embed title */}
                                    @if (!string.IsNullOrWhiteSpace(embed.Title))
                                    {
                                        <div class="chatlog__embed-title">
@@ -215,21 +234,27 @@
                                        </div>
                                    }

-                                    @if (!string.IsNullOrWhiteSpace(embed.Description))
+                                    @{/* Embed description (with special casing for YouTube videos) */}
+                                    @if (youTubeVideo is not null)
+                                    {
+                                        <div class="chatlog__embed-youtube-container">
+                                            <iframe class="chatlog__embed-youtube" src="@youTubeVideo.Url" width="400" height="225"></iframe>
+                                        </div>
+                                    }
+                                    else if (!string.IsNullOrWhiteSpace(embed.Description))
                                    {
                                        <div class="chatlog__embed-description">
                                            <div class="markdown preserve-whitespace">@Raw(FormatEmbedMarkdown(embed.Description))</div>
                                        </div>
                                    }

+                                    @{/* Embed fields */}
                                    @if (embed.Fields.Any())
                                    {
                                        <div class="chatlog__embed-fields">
                                            @foreach (var field in embed.Fields)
                                            {
-                                                var isInlineStyle = field.IsInline ? "chatlog__embed-field--inline" : null;
-
-                                                <div class="chatlog__embed-field @isInlineStyle">
+                                                <div class="chatlog__embed-field @(field.IsInline ? "chatlog__embed-field--inline" : null)">
                                                    @if (!string.IsNullOrWhiteSpace(field.Name))
                                                    {
                                                        <div class="chatlog__embed-field-name">
@@ -249,45 +274,51 @@
                                    }
                                </div>

-                                @if (embed.Thumbnail != null)
+                                @{/* Embed content (not shown for YouTube videos) */}
+                                @if (embed.Thumbnail is not null && !string.IsNullOrWhiteSpace(embed.Thumbnail.Url) && youTubeVideo is null)
                                {
                                    <div class="chatlog__embed-thumbnail-container">
-                                        <a class="chatlog__embed-thumbnail-link" href="@await ResolveUrlAsync(embed.Thumbnail.Url)">
-                                            <img class="chatlog__embed-thumbnail" src="@await ResolveUrlAsync(embed.Thumbnail.Url)" alt="Thumbnail">
+                                        <a class="chatlog__embed-thumbnail-link" href="@await ResolveUrlAsync(embed.Thumbnail.ProxyUrl ?? embed.Thumbnail.Url)">
+                                            <img class="chatlog__embed-thumbnail" src="@await ResolveUrlAsync(embed.Thumbnail.ProxyUrl ?? embed.Thumbnail.Url)" alt="Thumbnail" loading="lazy">
                                        </a>
                                    </div>
                                }
                            </div>

-                            @if (embed.Image != null)
+                            @{/* Embed image */}
+                            @if (embed.Image is not null && !string.IsNullOrWhiteSpace(embed.Image.Url))
                            {
                                <div class="chatlog__embed-image-container">
-                                    <a class="chatlog__embed-image-link" href="@await ResolveUrlAsync(embed.Image.Url)">
-                                        <img class="chatlog__embed-image" src="@await ResolveUrlAsync(embed.Image.Url)" alt="Image">
+                                    <a class="chatlog__embed-image-link" href="@await ResolveUrlAsync(embed.Image.ProxyUrl ?? embed.Image.Url)">
+                                        <img class="chatlog__embed-image" src="@await ResolveUrlAsync(embed.Image.ProxyUrl ?? embed.Image.Url)" alt="Image" loading="lazy">
                                    </a>
                                </div>
                            }

-                            @if (embed.Footer != null || embed.Timestamp != null)
+                            @{/* Embed footer & icon */}
+                            @if (embed.Footer is not null || embed.Timestamp is not null)
                            {
                                <div class="chatlog__embed-footer">
+                                    @{/* Footer icon */}
                                    @if (!string.IsNullOrWhiteSpace(embed.Footer?.IconUrl))
                                    {
-                                        <img class="chatlog__embed-footer-icon" src="@await ResolveUrlAsync(embed.Footer.IconUrl)" alt="Footer icon">
+                                        <img class="chatlog__embed-footer-icon" src="@await ResolveUrlAsync(embed.Footer.IconProxyUrl ?? embed.Footer.IconUrl)" alt="Footer icon" loading="lazy">
                                    }

                                    <span class="chatlog__embed-footer-text">
+                                        @{/* Footer text */}
                                        @if (!string.IsNullOrWhiteSpace(embed.Footer?.Text))
                                        {
                                            @embed.Footer.Text
                                        }

-                                        @if (!string.IsNullOrWhiteSpace(embed.Footer?.Text) && embed.Timestamp != null)
+                                        @if (!string.IsNullOrWhiteSpace(embed.Footer?.Text) && embed.Timestamp is not null)
                                        {
                                            @(" • ")
                                        }

-                                        @if (embed.Timestamp != null)
+                                        @{/* Embed timestamp */}
+                                        @if (embed.Timestamp is not null)
                                        {
                                            @FormatDate(embed.Timestamp.Value)
                                        }
@@ -298,13 +329,14 @@
                    </div>
                }

+                @{/* Message reactions */}
                @if (message.Reactions.Any())
                {
                    <div class="chatlog__reactions">
                        @foreach (var reaction in message.Reactions)
                        {
-                            <div class="chatlog__reaction">
-                                <img class="emoji emoji--small" alt="@reaction.Emoji.Name" title="@reaction.Emoji.Name" src="@await ResolveUrlAsync(reaction.Emoji.ImageUrl)">
+                            <div class="chatlog__reaction" title="@reaction.Emoji.Code">
+                                <img class="emoji emoji--small" alt="@reaction.Emoji.Name" src="@await ResolveUrlAsync(reaction.Emoji.ImageUrl)" loading="lazy">
                                <span class="chatlog__reaction-count">@reaction.Count</span>
                            </div>
                        }
@@ -1,6 +1,6 @@
-using DiscordChatExporter.Domain.Exporting.Writers.MarkdownVisitors;
+using DiscordChatExporter.Core.Exporting.Writers.MarkdownVisitors;

-namespace DiscordChatExporter.Domain.Exporting.Writers.Html
+namespace DiscordChatExporter.Core.Exporting.Writers.Html
 {
    internal class MessageGroupTemplateContext
    {
@@ -0,0 +1,15 @@
+@using DiscordChatExporter.Core.Exporting.Writers.Html;
+
+@namespace DiscordChatExporter.Core.Exporting.Writers.Html
+@inherits MiniRazor.TemplateBase<PostambleTemplateContext>
+
+@{/* Close elements opened by preamble */}
+</div>
+
+<div class="postamble">
+    <div class="postamble__entry">Exported @Model.MessagesWritten.ToString("N0") message(s)</div>
+</div>
+
+</body>
+
+</html>
@@ -0,0 +1,15 @@
+namespace DiscordChatExporter.Core.Exporting.Writers.Html
+{
+    internal class PostambleTemplateContext
+    {
+        public ExportContext ExportContext { get; }
+
+        public long MessagesWritten { get; }
+
+        public PostambleTemplateContext(ExportContext exportContext, long messagesWritten)
+        {
+            ExportContext = exportContext;
+            MessagesWritten = messagesWritten;
+        }
+    }
+}
@@ -0,0 +1,703 @@
+@using System
+@using System.Threading.Tasks
+@using DiscordChatExporter.Core.Exporting.Writers.Html;
+
+@namespace DiscordChatExporter.Core.Exporting.Writers.Html
+@inherits MiniRazor.TemplateBase<PreambleTemplateContext>
+
+@{
+    string Themed(string darkVariant, string lightVariant) =>
+        string.Equals(Model.ThemeName, "Dark", StringComparison.OrdinalIgnoreCase)
+            ? darkVariant
+            : lightVariant;
+
+    string FormatDate(DateTimeOffset date) => Model.ExportContext.FormatDate(date);
+
+    ValueTask<string> ResolveUrlAsync(string url) => Model.ExportContext.ResolveMediaUrlAsync(url);
+}
+
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <title>@Model.ExportContext.Request.Guild.Name - @Model.ExportContext.Request.Channel.Name</title>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width">
+
+    @{/* Styling */}
+    <style>
+        @@font-face {
+            font-family: Whitney;
+            src: url(https://cdn.jsdelivr.net/gh/Tyrrrz/DiscordFonts@master/whitney-300.woff);
+            font-weight: 300;
+        }
+
+        @@font-face {
+            font-family: Whitney;
+            src: url(https://cdn.jsdelivr.net/gh/Tyrrrz/DiscordFonts@master/whitney-400.woff);
+            font-weight: 400;
+        }
+
+        @@font-face {
+            font-family: Whitney;
+            src: url(https://cdn.jsdelivr.net/gh/Tyrrrz/DiscordFonts@master/whitney-500.woff);
+            font-weight: 500;
+        }
+
+        @@font-face {
+            font-family: Whitney;
+            src: url(https://cdn.jsdelivr.net/gh/Tyrrrz/DiscordFonts@master/whitney-600.woff);
+            font-weight: 600;
+        }
+
+        @@font-face {
+            font-family: Whitney;
+            src: url(https://cdn.jsdelivr.net/gh/Tyrrrz/DiscordFonts@master/whitney-700.woff);
+            font-weight: 700;
+        }
+
+        body {
+            background-color: @Themed("#36393e", "#ffffff");
+            color: @Themed("#dcddde", "#23262a");
+            font-family: "Whitney", "Helvetica Neue", Helvetica, Arial, sans-serif;
+            font-size: 17px;
+            font-weight: @Themed("400", "500");
+        }
+
+        a {
+            color: @Themed("#00aff4", "#0068e0");
+            text-decoration: none;
+        }
+
+        a:hover {
+            text-decoration: underline;
+        }
+
+        img {
+            object-fit: contain;
+        }
+
+        .markdown {
+            max-width: 100%;
+            line-height: 1.3;
+            overflow-wrap: break-word;
+        }
+
+        .preserve-whitespace {
+            white-space: pre-wrap;
+        }
+
+        .spoiler-text {
+            background-color: @Themed("rgba(255, 255, 255, 0.1)", "rgba(0, 0, 0, 0.1)");
+            border-radius: 3px;
+        }
+
+        .spoiler-text--hidden {
+            cursor: pointer;
+            background-color: @Themed("#202225", "#b9bbbe");
+            color: rgba(0, 0, 0, 0);
+        }
+
+        .spoiler-text--hidden:hover {
+            background-color: @Themed("rgba(32, 34, 37, 0.8)", "rgba(185, 187, 190, 0.8)");
+        }
+
+        .spoiler-text--hidden::selection {
+            color: rgba(0, 0, 0, 0);
+        }
+
+        .quote {
+            margin: 0.1em 0;
+            padding-left: 0.6em;
+            border-left: 4px solid @Themed("#4f545c", "#c7ccd1");
+            border-radius: 3px;
+        }
+
+        .pre {
+            background-color: @Themed("#2f3136", "#f9f9f9");
+            font-family: "Consolas", "Courier New", Courier, monospace;
+        }
+
+        .pre--multiline {
+            margin-top: 0.25em;
+            padding: 0.5em;
+            border: 2px solid @Themed("#282b30", "#f3f3f3");
+            border-radius: 5px;
+            color: @Themed("#b9bbbe", "#657b83");
+        }
+
+        @{/* Override Highlight.js styles with a higher specificity selector */}
+        .pre--multiline.hljs {
+            background-color: @Themed("#2f3136", "#f9f9f9");
+            color: @Themed("#b9bbbe", "#657b83");
+        }
+
+        .pre--inline {
+            padding: 2px;
+            border-radius: 3px;
+            font-size: 0.85em;
+        }
+
+        .mention {
+            border-radius: 3px;
+            padding: 0 2px;
+            color: #7289da;
+            background-color: rgba(114, 137, 218, .1);
+            font-weight: 500;
+        }
+
+        .timestamp {
+            border-radius: 3px;
+            padding: 0 2px;
+            background-color: @Themed("rgba(255, 255, 255, 0.06)", "rgba(6, 6, 7, 0.08)");
+        }
+
+        .emoji {
+            width: 1.325em;
+            height: 1.325em;
+            margin: 0 0.06em;
+            vertical-align: -0.4em;
+        }
+
+        .emoji--small {
+            width: 1em;
+            height: 1em;
+        }
+
+        .emoji--large {
+            width: 2.8em;
+            height: 2.8em;
+        }
+
+        .preamble {
+            display: grid;
+            margin: 0 0.3em 0.6em 0.3em;
+            max-width: 100%;
+            grid-template-columns: auto 1fr;
+        }
+
+        .preamble__guild-icon-container {
+            grid-column: 1;
+        }
+
+        .preamble__guild-icon {
+            max-width: 88px;
+            max-height: 88px;
+        }
+
+        .preamble__entries-container {
+            grid-column: 2;
+            margin-left: 0.6em;
+        }
+
+        .preamble__entry {
+            font-size: 1.4em;
+            color: @Themed("#ffffff", "#2f3136");
+        }
+
+        .preamble__entry--small {
+            font-size: 1em;
+        }
+
+        .chatlog {
+            max-width: 100%;
+        }
+
+        .chatlog__message-group {
+            display: grid;
+            margin: 0 0.6em;
+            padding: 0.9em 0;
+            border-top: 1px solid @Themed("rgba(255, 255, 255, 0.1)", "#eceeef");
+            grid-template-columns: auto 1fr;
+        }
+
+        .chatlog__reference-symbol {
+            grid-column: 1;
+            margin: 8px 4px 4px 18px;
+            border-left: 2px solid @Themed("#4f545c", "#c7ccd1");
+            border-top: 2px solid @Themed("#4f545c", "#c7ccd1");
+            border-radius: 8px 0 0 0;
+        }
+
+        .chatlog__reference {
+            display: flex;
+            grid-column: 2;
+            margin-bottom: 0.25em;
+            font-size: 0.875em;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            align-items: center;
+            color: @Themed("#b5b6b8", "#5f5f60");
+        }
+
+        .chatlog__reference-avatar {
+            border-radius: 50%;
+            width: 16px;
+            height: 16px;
+            margin-right: 0.25em;
+        }
+
+        .chatlog__reference-name {
+            margin-right: 0.25em;
+            font-weight: 600;
+        }
+
+        .chatlog__reference-content {
+            overflow: hidden;
+            text-overflow: ellipsis;
+        }
+
+        .chatlog__reference-content a:hover {
+            text-decoration: none;
+        }
+
+        .chatlog__reference-link {
+            cursor: pointer;
+            color: @Themed("#b5b6b8", "#5f5f60");
+        }
+
+        .chatlog__reference-link * {
+            display: inline;
+            pointer-events: none;
+        }
+
+        .chatlog__reference-link:hover {
+            color: @Themed("#ffffff", "#2f3136");
+        }
+
+        .chatlog__reference-link:hover *:not(.spoiler-text) {
+            color: @Themed("#ffffff", "#2f3136");
+        }
+
+        .chatlog__reference-edited-timestamp {
+            margin-left: 0.25em;
+            font-size: 0.8em;
+            color: @Themed("rgba(255, 255, 255, 0.2)", "#747f8d");
+        }
+
+        .chatlog__author-avatar-container {
+            grid-column: 1;
+            width: 40px;
+            height: 40px;
+            margin-right: 16px;
+        }
+
+        .chatlog__author-avatar {
+            border-radius: 50%;
+            width: 40px;
+            height: 40px;
+        }
+
+        .chatlog__messages {
+            grid-column: 2;
+            min-width: 50%;
+        }
+
+        .chatlog__author-name {
+            font-weight: @Themed("500", "600");
+            color: @Themed("#ffffff", "#2f3136");
+        }
+
+        .chatlog__timestamp {
+            margin-left: 0.3em;
+            font-size: 0.75em;
+            color: @Themed("rgba(255, 255, 255, 0.2)", "#747f8d");
+        }
+
+        .chatlog__message {
+            padding: 0.1em 0.3em;
+            margin: 0 -0.3em;
+            background-color: transparent;
+            transition: background-color 1s ease;
+        }
+
+        .chatlog__message--highlighted {
+            background-color: @Themed("rgba(114, 137, 218, 0.2)", "rgba(114, 137, 218, 0.2)");
+        }
+
+        .chatlog__message--pinned {
+            background-color: @Themed("rgba(249, 168, 37, 0.05)", "rgba(249, 168, 37, 0.05)");
+        }
+
+        .chatlog__content {
+            font-size: 0.95em;
+            word-wrap: break-word;
+        }
+
+        .chatlog__edited-timestamp {
+            margin-left: 0.15em;
+            font-size: 0.8em;
+        }
+
+        .chatlog__attachment {
+            display: inline-block;
+            position: relative;
+            margin-top: 0.3em;
+            border-radius: 3px;
+            overflow: hidden;
+        }
+
+        .chatlog__attachment--hidden {
+            cursor: pointer;
+            box-shadow: 0 0 1px 1px rgba(0, 0, 0, 0.1);
+        }
+
+        .chatlog__attachment--hidden * {
+            pointer-events: none;
+        }
+
+        .chatlog__attachment-spoiler-caption {
+            display: none;
+            z-index: 999;
+            position: absolute;
+            left: 50%;
+            top: 50%;
+            transform: translate(-50%, -50%);
+            padding: 0.4em 0.8em;
+            background-color: rgba(0, 0, 0, 0.9);
+            border-radius: 20px;
+            color: #dcddde;
+            font-size: 0.9em;
+            font-weight: 600;
+            letter-spacing: 0.05em;
+        }
+
+        .chatlog__attachment--hidden .chatlog__attachment-spoiler-caption {
+            display: block;
+        }
+
+        .chatlog__attachment--hidden:hover .chatlog__attachment-spoiler-caption {
+            color: #fff;
+        }
+
+        .chatlog__attachment-media {
+            vertical-align: top;
+            max-width: 45vw;
+            max-height: 500px;
+            border-radius: 3px;
+        }
+
+        .chatlog__attachment--hidden .chatlog__attachment-media {
+            filter: blur(44px);
+        }
+
+        .chatlog__attachment-generic {
+            width: 100%;
+            max-width: 520px;
+            height: 40px;
+            padding: 10px;
+            background-color: @Themed("#2f3136", "#f2f3f5");
+            border: 1px solid @Themed("#292b2f", "#ebedef");
+            border-radius: 3px;
+            overflow: hidden;
+        }
+
+        .chatlog__attachment--hidden .chatlog__attachment-generic {
+            filter: blur(44px);
+        }
+
+        .chatlog__attachment-generic-icon {
+            float: left;
+            width: 30px;
+            height: 100%;
+            margin-right: 10px;
+        }
+
+        .chatlog__attachment-generic-size {
+            color: #72767d;
+            font-size: 12px;
+        }
+
+        .chatlog__attachment-generic-name {
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+        }
+
+        .chatlog__edited-timestamp {
+            color: @Themed("rgba(255, 255, 255, 0.2)", "#747f8d");
+        }
+
+        .chatlog__embed {
+            display: flex;
+            margin-top: 0.3em;
+            max-width: 520px;
+        }
+
+        .chatlog__embed-color-pill {
+            flex-shrink: 0;
+            width: 0.25em;
+            border-top-left-radius: 3px;
+            border-bottom-left-radius: 3px;
+        }
+
+        .chatlog__embed-color-pill--default {
+            background-color: @Themed("#202225", "rgba(227, 229, 232, 1)");
+        }
+
+        .chatlog__embed-content-container {
+            display: flex;
+            flex-direction: column;
+            padding: 0.5em 0.6em;
+            background-color: @Themed("rgba(46, 48, 54, 0.3)", "rgba(249, 249, 249, 0.3)");
+            border: 1px solid @Themed("rgba(46, 48, 54, 0.6)", "rgba(204, 204, 204, 0.3)");
+            border-top-right-radius: 3px;
+            border-bottom-right-radius: 3px;
+        }
+
+        .chatlog__embed-content {
+            display: flex;
+            width: 100%;
+        }
+
+        .chatlog__embed-text {
+            flex: 1;
+        }
+
+        .chatlog__embed-author {
+            display: flex;
+            margin-bottom: 0.3em;
+            align-items: center;
+        }
+
+        .chatlog__embed-author-icon {
+            margin-right: 0.5em;
+            width: 20px;
+            height: 20px;
+            border-radius: 50%;
+        }
+
+        .chatlog__embed-author-name {
+            font-size: 0.875em;
+            font-weight: 600;
+            color: @Themed("#ffffff", "#4f545c")
+        }
+
+        .chatlog__embed-author-name-link {
+            color: @Themed("#ffffff", "#4f545c");
+        }
+
+        .chatlog__embed-title {
+            margin-bottom: 0.2em;
+            font-size: 0.875em;
+            font-weight: 600;
+            color: @Themed("#ffffff", "#4f545c");
+        }
+
+        .chatlog__embed-description {
+            font-weight: 500;
+            font-size: 0.85em;
+            color: @Themed("#dcddde", "#2e3338");
+        }
+
+        .chatlog__embed-fields {
+            display: flex;
+            flex-wrap: wrap;
+        }
+
+        .chatlog__embed-field {
+            flex: 0;
+            min-width: 100%;
+            max-width: 506px;
+            padding-top: 0.6em;
+            font-size: 0.875em;
+        }
+
+        .chatlog__embed-field--inline {
+            flex: 1;
+            flex-basis: auto;
+            min-width: 150px;
+        }
+
+        .chatlog__embed-field-name {
+            margin-bottom: 0.2em;
+            font-weight: 600;
+            color: @Themed("#ffffff", "#36393e");
+        }
+
+        .chatlog__embed-field-value {
+            font-weight: 500;
+            color: @Themed("#dcddde", "#2e3338");
+        }
+
+        .chatlog__embed-thumbnail {
+            flex: 0;
+            margin-left: 1.2em;
+            max-width: 80px;
+            max-height: 80px;
+            border-radius: 3px;
+        }
+
+        .chatlog__embed-image-container {
+            margin-top: 0.6em;
+        }
+
+        .chatlog__embed-image {
+            max-width: 500px;
+            max-height: 400px;
+            border-radius: 3px;
+        }
+
+        .chatlog__embed-footer {
+            margin-top: 0.6em;
+            color: @Themed("#dcddde", "#2e3338");
+        }
+
+        .chatlog__embed-footer-icon {
+            margin-right: 0.2em;
+            width: 20px;
+            height: 20px;
+            border-radius: 50%;
+            vertical-align: middle;
+        }
+
+        .chatlog__embed-footer-text {
+            vertical-align: middle;
+            font-size: 0.75em;
+            font-weight: 500;
+        }
+
+        .chatlog__embed-youtube-container {
+            margin-top: 0.6em;
+        }
+
+        .chatlog__embed-youtube {
+            border: 0;
+            border-radius: 3px;
+        }
+
+        .chatlog__reactions {
+            display: flex;
+        }
+
+        .chatlog__reaction {
+            display: flex;
+            align-items: center;
+            margin: 0.35em 0.1em 0.1em 0.1em;
+            padding: 0.2em 0.35em;
+            background-color: @Themed("rgba(255, 255, 255, 0.05)", "rgba(79, 84, 92, 0.06)");
+            border-radius: 3px;
+        }
+
+        .chatlog__reaction-count {
+            min-width: 9px;
+            margin-left: 0.35em;
+            font-size: 0.875em;
+            color: @Themed("rgba(255, 255, 255, 0.3)", "#747f8d");
+        }
+
+        .chatlog__bot-tag {
+            position: relative;
+            top: -.2em;
+            margin-left: 0.3em;
+            padding: 0.05em 0.3em;
+            border-radius: 3px;
+            vertical-align: middle;
+            line-height: 1.3;
+            background-color: #5865F2;
+            color: #ffffff;
+            font-size: 0.625em;
+            font-weight: 500;
+        }
+
+        .postamble {
+            margin: 1.4em 0.3em 0.6em 0.3em;
+            padding: 1em;
+            border-top: 1px solid @Themed("rgba(255, 255, 255, 0.1)", "#eceeef");
+        }
+
+        .postamble__entry {
+            color: @Themed("#ffffff", "#2f3136");
+        }
+    </style>
+
+    @{/* Syntax highlighting */}
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.15.6/styles/solarized-@(Model.ThemeName.ToLowerInvariant()).min.css">
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.15.6/highlight.min.js"></script>
+    <script>
+        document.addEventListener('DOMContentLoaded', () => {
+            document.querySelectorAll('.pre--multiline').forEach(block => hljs.highlightBlock(block));
+        });
+    </script>
+
+    @{/* Scripts */}
+    <script>
+        function scrollToMessage(event, id) {
+            var element = document.getElementById('message-' + id);
+
+            if (element) {
+                event.preventDefault();
+
+                element.classList.add('chatlog__message--highlighted');
+
+                window.scrollTo({
+                    top: element.getBoundingClientRect().top - document.body.getBoundingClientRect().top - (window.innerHeight / 2),
+                    behavior: 'smooth'
+                });
+
+                window.setTimeout(function() {
+                    element.classList.remove('chatlog__message--highlighted');
+                }, 2000);
+            }
+        }
+
+        function showSpoiler(event, element) {
+            if (element && element.classList.contains('spoiler-text--hidden')) {
+                event.preventDefault();
+                element.classList.remove('spoiler-text--hidden');
+            }
+            if (element && element.classList.contains('chatlog__attachment--hidden')) {
+                event.preventDefault();
+                element.classList.remove('chatlog__attachment--hidden');
+            }
+        }
+    </script>
+
+    @{/* Icons */}
+    <svg style="display: none">
+        <symbol id="icon-attachment" viewBox="0 0 720 960">
+            <path fill="#f4f5fb" d="M50,935a25,25,0,0,1-25-25V50A25,25,0,0,1,50,25H519.6L695,201.32V910a25,25,0,0,1-25,25Z" />
+            <path fill="#7789c4" d="M509.21,50,670,211.63V910H50V50H509.21M530,0H50A50,50,0,0,0,0,50V910a50,50,0,0,0,50,50H670a50,50,0,0,0,50-50h0V191Z" />
+            <path fill="#f4f5fb" d="M530,215a25,25,0,0,1-25-25V50a25,25,0,0,1,16.23-23.41L693.41,198.77A25,25,0,0,1,670,215Z" />
+            <path fill="#7789c4" d="M530,70.71,649.29,190H530V70.71M530,0a50,50,0,0,0-50,50V190a50,50,0,0,0,50,50H670a50,50,0,0,0,50-50Z" />
+        </symbol>
+    </svg>
+</head>
+<body>
+
+<div class="preamble">
+    <div class="preamble__guild-icon-container">
+        <img class="preamble__guild-icon" src="@await ResolveUrlAsync(Model.ExportContext.Request.Guild.IconUrl)" alt="Guild icon" loading="lazy">
+    </div>
+    <div class="preamble__entries-container">
+        <div class="preamble__entry">@Model.ExportContext.Request.Guild.Name</div>
+        <div class="preamble__entry">@Model.ExportContext.Request.Channel.Category / @Model.ExportContext.Request.Channel.Name</div>
+
+        @if (!string.IsNullOrWhiteSpace(Model.ExportContext.Request.Channel.Topic))
+        {
+            <div class="preamble__entry preamble__entry--small">@Model.ExportContext.Request.Channel.Topic</div>
+        }
+
+        @if (Model.ExportContext.Request.After is not null || Model.ExportContext.Request.Before is not null)
+        {
+            <div class="preamble__entry preamble__entry--small">
+            @if (Model.ExportContext.Request.After is not null && Model.ExportContext.Request.Before is not null)
+            {
+                @($"Between {FormatDate(Model.ExportContext.Request.After.Value.ToDate())} and {FormatDate(Model.ExportContext.Request.Before.Value.ToDate())}")
+            }
+            else if (Model.ExportContext.Request.After is not null)
+            {
+                @($"After {FormatDate(Model.ExportContext.Request.After.Value.ToDate())}")
+            }
+            else if (Model.ExportContext.Request.Before is not null)
+            {
+                @($"Before {FormatDate(Model.ExportContext.Request.Before.Value.ToDate())}")
+            }
+            </div>
+        }
+    </div>
+</div>
+
+@{/* Preamble cuts off at this point */}
+<div class="chatlog">
@@ -0,0 +1,15 @@
+namespace DiscordChatExporter.Core.Exporting.Writers.Html
+{
+    internal class PreambleTemplateContext
+    {
+        public ExportContext ExportContext { get; }
+
+        public string ThemeName { get; }
+
+        public PreambleTemplateContext(ExportContext exportContext, string themeName)
+        {
+            ExportContext = exportContext;
+            ThemeName = themeName;
+        }
+    }
+}
@@ -2,10 +2,10 @@
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using DiscordChatExporter.Domain.Discord.Models;
-using DiscordChatExporter.Domain.Exporting.Writers.Html;
+using DiscordChatExporter.Core.Discord.Data;
+using DiscordChatExporter.Core.Exporting.Writers.Html;

-namespace DiscordChatExporter.Domain.Exporting.Writers
+namespace DiscordChatExporter.Core.Exporting.Writers
 {
    internal class HtmlMessageWriter : MessageWriter
    {
@@ -14,8 +14,6 @@ namespace DiscordChatExporter.Domain.Exporting.Writers

        private readonly List<Message> _messageGroupBuffer = new();

-        private long _messageCount;
-
        public HtmlMessageWriter(Stream stream, ExportContext context, string themeName)
            : base(stream, context)
        {
@@ -25,7 +23,7 @@ namespace DiscordChatExporter.Domain.Exporting.Writers

        public override async ValueTask WritePreambleAsync()
        {
-            var templateContext = new LayoutTemplateContext(Context, _themeName, _messageCount);
+            var templateContext = new PreambleTemplateContext(Context, _themeName);

            await _writer.WriteLineAsync(
                await PreambleTemplate.RenderAsync(templateContext)
@@ -43,6 +41,8 @@ namespace DiscordChatExporter.Domain.Exporting.Writers

        public override async ValueTask WriteMessageAsync(Message message)
        {
+            await base.WriteMessageAsync(message);
+
            // If message group is empty or the given message can be grouped, buffer the given message
            if (!_messageGroupBuffer.Any() || MessageGroup.CanJoin(_messageGroupBuffer.Last(), message))
            {
@@ -56,9 +56,6 @@ namespace DiscordChatExporter.Domain.Exporting.Writers
                _messageGroupBuffer.Clear();
                _messageGroupBuffer.Add(message);
            }
-
-            // Increment message count
-            _messageCount++;
        }

        public override async ValueTask WritePostambleAsync()
@@ -67,7 +64,7 @@ namespace DiscordChatExporter.Domain.Exporting.Writers
            if (_messageGroupBuffer.Any())
                await WriteMessageGroupAsync(MessageGroup.Join(_messageGroupBuffer));

-            var templateContext = new LayoutTemplateContext(Context, _themeName, _messageCount);
+            var templateContext = new PostambleTemplateContext(Context, MessagesWritten);

            await _writer.WriteLineAsync(
                await PostambleTemplate.RenderAsync(templateContext)
@@ -1,27 +1,28 @@
 using System.IO;
+using System.Text.Encodings.Web;
 using System.Text.Json;
 using System.Threading.Tasks;
-using System.Text.Encodings.Web;
-using DiscordChatExporter.Domain.Discord.Models;
-using DiscordChatExporter.Domain.Exporting.Writers.MarkdownVisitors;
-using DiscordChatExporter.Domain.Internal.Extensions;
+using DiscordChatExporter.Core.Discord.Data;
+using DiscordChatExporter.Core.Exporting.Writers.MarkdownVisitors;
+using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Writing;

-namespace DiscordChatExporter.Domain.Exporting.Writers
+namespace DiscordChatExporter.Core.Exporting.Writers
 {
    internal class JsonMessageWriter : MessageWriter
    {
        private readonly Utf8JsonWriter _writer;

-        private long _messageCount;
-
        public JsonMessageWriter(Stream stream, ExportContext context)
            : base(stream, context)
        {
            _writer = new Utf8JsonWriter(stream, new JsonWriterOptions
            {
                Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
-                Indented = true
+                Indented = true,
+                // Validation errors may mask actual failures
+                // https://github.com/Tyrrrz/DiscordChatExporter/issues/413
+                SkipValidation = true
            });
        }

@@ -49,7 +50,7 @@ namespace DiscordChatExporter.Domain.Exporting.Writers
            _writer.WriteString("url", embedAuthor.Url);

            if (!string.IsNullOrWhiteSpace(embedAuthor.IconUrl))
-                _writer.WriteString("iconUrl", await Context.ResolveMediaUrlAsync(embedAuthor.IconUrl));
+                _writer.WriteString("iconUrl", await Context.ResolveMediaUrlAsync(embedAuthor.IconProxyUrl ?? embedAuthor.IconUrl));

            _writer.WriteEndObject();
            await _writer.FlushAsync();
@@ -60,7 +61,7 @@ namespace DiscordChatExporter.Domain.Exporting.Writers
            _writer.WriteStartObject("thumbnail");

            if (!string.IsNullOrWhiteSpace(embedThumbnail.Url))
-                _writer.WriteString("url", await Context.ResolveMediaUrlAsync(embedThumbnail.Url));
+                _writer.WriteString("url", await Context.ResolveMediaUrlAsync(embedThumbnail.ProxyUrl ?? embedThumbnail.Url));

            _writer.WriteNumber("width", embedThumbnail.Width);
            _writer.WriteNumber("height", embedThumbnail.Height);
@@ -74,7 +75,7 @@ namespace DiscordChatExporter.Domain.Exporting.Writers
            _writer.WriteStartObject("image");

            if (!string.IsNullOrWhiteSpace(embedImage.Url))
-                _writer.WriteString("url", await Context.ResolveMediaUrlAsync(embedImage.Url));
+                _writer.WriteString("url", await Context.ResolveMediaUrlAsync(embedImage.ProxyUrl ?? embedImage.Url));

            _writer.WriteNumber("width", embedImage.Width);
            _writer.WriteNumber("height", embedImage.Height);
@@ -90,7 +91,7 @@ namespace DiscordChatExporter.Domain.Exporting.Writers
            _writer.WriteString("text", embedFooter.Text);

            if (!string.IsNullOrWhiteSpace(embedFooter.IconUrl))
-                _writer.WriteString("iconUrl", await Context.ResolveMediaUrlAsync(embedFooter.IconUrl));
+                _writer.WriteString("iconUrl", await Context.ResolveMediaUrlAsync(embedFooter.IconProxyUrl ?? embedFooter.IconUrl));

            _writer.WriteEndObject();
            await _writer.FlushAsync();
@@ -117,19 +118,19 @@ namespace DiscordChatExporter.Domain.Exporting.Writers
            _writer.WriteString("timestamp", embed.Timestamp);
            _writer.WriteString("description", FormatMarkdown(embed.Description));

-            if (embed.Color != null)
+            if (embed.Color is not null)
                _writer.WriteString("color", embed.Color.Value.ToHex());

-            if (embed.Author != null)
+            if (embed.Author is not null)
                await WriteEmbedAuthorAsync(embed.Author);

-            if (embed.Thumbnail != null)
+            if (embed.Thumbnail is not null)
                await WriteEmbedThumbnailAsync(embed.Thumbnail);

-            if (embed.Image != null)
+            if (embed.Image is not null)
                await WriteEmbedImageAsync(embed.Image);

-            if (embed.Footer != null)
+            if (embed.Footer is not null)
                await WriteEmbedFooterAsync(embed.Footer);

            // Fields
@@ -168,7 +169,7 @@ namespace DiscordChatExporter.Domain.Exporting.Writers

            _writer.WriteString("id", mentionedUser.Id.ToString());
            _writer.WriteString("name", mentionedUser.Name);
-            _writer.WriteNumber("discriminator", mentionedUser.Discriminator);
+            _writer.WriteString("discriminator", mentionedUser.DiscriminatorFormatted);
            _writer.WriteString("nickname", Context.TryGetMember(mentionedUser.Id)?.Nick ?? mentionedUser.Name);
            _writer.WriteBoolean("isBot", mentionedUser.IsBot);

@@ -192,7 +193,8 @@ namespace DiscordChatExporter.Domain.Exporting.Writers
            _writer.WriteStartObject("channel");
            _writer.WriteString("id", Context.Request.Channel.Id.ToString());
            _writer.WriteString("type", Context.Request.Channel.Type.ToString());
-            _writer.WriteString("category", Context.Request.Channel.Category);
+            _writer.WriteString("categoryId", Context.Request.Channel.Category.Id.ToString());
+            _writer.WriteString("category", Context.Request.Channel.Category.Name);
            _writer.WriteString("name", Context.Request.Channel.Name);
            _writer.WriteString("topic", Context.Request.Channel.Topic);
            _writer.WriteEndObject();
@@ -210,6 +212,8 @@ namespace DiscordChatExporter.Domain.Exporting.Writers

        public override async ValueTask WriteMessageAsync(Message message)
        {
+            await base.WriteMessageAsync(message);
+
            _writer.WriteStartObject();

            // Metadata
@@ -227,7 +231,9 @@ namespace DiscordChatExporter.Domain.Exporting.Writers
            _writer.WriteStartObject("author");
            _writer.WriteString("id", message.Author.Id.ToString());
            _writer.WriteString("name", message.Author.Name);
-            _writer.WriteString("discriminator", $"{message.Author.Discriminator:0000}");
+            _writer.WriteString("discriminator", message.Author.DiscriminatorFormatted);
+            _writer.WriteString("nickname", Context.TryGetMember(message.Author.Id)?.Nick ?? message.Author.Name);
+            _writer.WriteString("color", Context.TryGetUserColor(message.Author.Id)?.ToHex());
            _writer.WriteBoolean("isBot", message.Author.IsBot);
            _writer.WriteString("avatarUrl", await Context.ResolveMediaUrlAsync(message.Author.AvatarUrl));
            _writer.WriteEndObject();
@@ -265,7 +271,7 @@ namespace DiscordChatExporter.Domain.Exporting.Writers
            _writer.WriteEndArray();

            // Message reference
-            if (message.Reference != null)
+            if (message.Reference is not null)
            {
                _writer.WriteStartObject("reference");
                _writer.WriteString("messageId", message.Reference.MessageId?.ToString());
@@ -276,8 +282,6 @@ namespace DiscordChatExporter.Domain.Exporting.Writers

            _writer.WriteEndObject();
            await _writer.FlushAsync();
-
-            _messageCount++;
        }

        public override async ValueTask WritePostambleAsync()
@@ -285,7 +289,7 @@ namespace DiscordChatExporter.Domain.Exporting.Writers
            // Message array (end)
            _writer.WriteEndArray();

-            _writer.WriteNumber("messageCount", _messageCount);
+            _writer.WriteNumber("messageCount", MessagesWritten);

            // Root object (end)
            _writer.WriteEndObject();
@@ -3,12 +3,13 @@ using System.Linq;
 using System.Net;
 using System.Text;
 using System.Text.RegularExpressions;
-using DiscordChatExporter.Domain.Discord;
-using DiscordChatExporter.Domain.Discord.Models;
-using DiscordChatExporter.Domain.Markdown;
-using DiscordChatExporter.Domain.Markdown.Ast;
+using DiscordChatExporter.Core.Discord;
+using DiscordChatExporter.Core.Discord.Data;
+using DiscordChatExporter.Core.Markdown;
+using DiscordChatExporter.Core.Markdown.Parsing;
+using DiscordChatExporter.Core.Utils.Extensions;

-namespace DiscordChatExporter.Domain.Exporting.Writers.MarkdownVisitors
+namespace DiscordChatExporter.Core.Exporting.Writers.MarkdownVisitors
 {
    internal partial class HtmlMarkdownVisitor : MarkdownVisitor
    {
@@ -38,7 +39,7 @@ namespace DiscordChatExporter.Domain.Exporting.Writers.MarkdownVisitors
                TextFormatting.Underline => ("<u>", "</u>"),
                TextFormatting.Strikethrough => ("<s>", "</s>"),
                TextFormatting.Spoiler => (
-                    "<span class=\"spoiler spoiler--hidden\" onclick=\"showSpoiler(event, this)\"><span class=\"spoiler-text\">", "</span></span>"),
+                    "<span class=\"spoiler-text spoiler-text--hidden\" onclick=\"showSpoiler(event, this)\">", "</span>"),
                TextFormatting.Quote => ("<div class=\"quote\">", "</div>"),
                _ => throw new ArgumentOutOfRangeException(nameof(formatted.Formatting))
            };
@@ -74,66 +75,6 @@ namespace DiscordChatExporter.Domain.Exporting.Writers.MarkdownVisitors
            return base.VisitMultiLineCodeBlock(multiLineCodeBlock);
        }

-        protected override MarkdownNode VisitMention(MentionNode mention)
-        {
-            if (mention.Type == MentionType.Meta)
-            {
-                _buffer
-                    .Append("<span class=\"mention\">")
-                    .Append("@").Append(HtmlEncode(mention.Id))
-                    .Append("</span>");
-            }
-            else if (mention.Type == MentionType.User)
-            {
-                var member = _context.TryGetMember(Snowflake.Parse(mention.Id));
-                var fullName = member?.User.FullName ?? "Unknown";
-                var nick = member?.Nick ?? "Unknown";
-
-                _buffer
-                    .Append($"<span class=\"mention\" title=\"{HtmlEncode(fullName)}\">")
-                    .Append("@").Append(HtmlEncode(nick))
-                    .Append("</span>");
-            }
-            else if (mention.Type == MentionType.Channel)
-            {
-                var channel = _context.TryGetChannel(Snowflake.Parse(mention.Id));
-                var name = channel?.Name ?? "deleted-channel";
-
-                _buffer
-                    .Append("<span class=\"mention\">")
-                    .Append("#").Append(HtmlEncode(name))
-                    .Append("</span>");
-            }
-            else if (mention.Type == MentionType.Role)
-            {
-                var role = _context.TryGetRole(Snowflake.Parse(mention.Id));
-                var name = role?.Name ?? "deleted-role";
-                var color = role?.Color;
-
-                var style = color != null
-                    ? $"color: rgb({color?.R}, {color?.G}, {color?.B}); background-color: rgba({color?.R}, {color?.G}, {color?.B}, 0.1);"
-                    : "";
-
-                _buffer
-                    .Append($"<span class=\"mention\" style=\"{style}\">")
-                    .Append("@").Append(HtmlEncode(name))
-                    .Append("</span>");
-            }
-
-            return base.VisitMention(mention);
-        }
-
-        protected override MarkdownNode VisitEmoji(EmojiNode emoji)
-        {
-            var emojiImageUrl = Emoji.GetImageUrl(emoji.Id, emoji.Name, emoji.IsAnimated);
-            var jumboClass = _isJumbo ? "emoji--large" : "";
-
-            _buffer
-                .Append($"<img class=\"emoji {jumboClass}\" alt=\"{emoji.Name}\" title=\"{emoji.Name}\" src=\"{emojiImageUrl}\">");
-
-            return base.VisitEmoji(emoji);
-        }
-
        protected override MarkdownNode VisitLink(LinkNode link)
        {
            // Extract message ID if the link points to a Discord message
@@ -156,6 +97,78 @@ namespace DiscordChatExporter.Domain.Exporting.Writers.MarkdownVisitors

            return base.VisitLink(link);
        }
+
+        protected override MarkdownNode VisitEmoji(EmojiNode emoji)
+        {
+            var emojiImageUrl = Emoji.GetImageUrl(emoji.Id, emoji.Name, emoji.IsAnimated);
+            var jumboClass = _isJumbo ? "emoji--large" : "";
+
+            _buffer
+                .Append($"<img loading=\"lazy\" class=\"emoji {jumboClass}\" alt=\"{emoji.Name}\" title=\"{emoji.Code}\" src=\"{emojiImageUrl}\">");
+
+            return base.VisitEmoji(emoji);
+        }
+
+        protected override MarkdownNode VisitMention(MentionNode mention)
+        {
+            var mentionId = Snowflake.TryParse(mention.Id);
+            if (mention.Kind == MentionKind.Meta)
+            {
+                _buffer
+                    .Append("<span class=\"mention\">")
+                    .Append("@").Append(HtmlEncode(mention.Id))
+                    .Append("</span>");
+            }
+            else if (mention.Kind == MentionKind.User)
+            {
+                var member = mentionId?.Pipe(_context.TryGetMember);
+                var fullName = member?.User.FullName ?? "Unknown";
+                var nick = member?.Nick ?? "Unknown";
+
+                _buffer
+                    .Append($"<span class=\"mention\" title=\"{HtmlEncode(fullName)}\">")
+                    .Append("@").Append(HtmlEncode(nick))
+                    .Append("</span>");
+            }
+            else if (mention.Kind == MentionKind.Channel)
+            {
+                var channel = mentionId?.Pipe(_context.TryGetChannel);
+                var symbol = channel?.IsVoiceChannel == true ? "🔊" : "#";
+                var name = channel?.Name ?? "deleted-channel";
+
+                _buffer
+                    .Append("<span class=\"mention\">")
+                    .Append(symbol).Append(HtmlEncode(name))
+                    .Append("</span>");
+            }
+            else if (mention.Kind == MentionKind.Role)
+            {
+                var role = mentionId?.Pipe(_context.TryGetRole);
+                var name = role?.Name ?? "deleted-role";
+                var color = role?.Color;
+
+                var style = color is not null
+                    ? $"color: rgb({color?.R}, {color?.G}, {color?.B}); background-color: rgba({color?.R}, {color?.G}, {color?.B}, 0.1);"
+                    : "";
+
+                _buffer
+                    .Append($"<span class=\"mention\" style=\"{style}\">")
+                    .Append("@").Append(HtmlEncode(name))
+                    .Append("</span>");
+            }
+
+            return base.VisitMention(mention);
+        }
+
+        protected override MarkdownNode VisitUnixTimestamp(UnixTimestampNode timestamp)
+        {
+            _buffer
+                .Append("<span class=\"timestamp\">")
+                .Append(HtmlEncode(_context.FormatDate(timestamp.Value)))
+                .Append("</span>");
+
+            return base.VisitUnixTimestamp(timestamp);
+        }
    }

    internal partial class HtmlMarkdownVisitor
@@ -1,9 +1,10 @@
 using System.Text;
-using DiscordChatExporter.Domain.Discord;
-using DiscordChatExporter.Domain.Markdown;
-using DiscordChatExporter.Domain.Markdown.Ast;
+using DiscordChatExporter.Core.Discord;
+using DiscordChatExporter.Core.Markdown;
+using DiscordChatExporter.Core.Markdown.Parsing;
+using DiscordChatExporter.Core.Utils.Extensions;

-namespace DiscordChatExporter.Domain.Exporting.Writers.MarkdownVisitors
+namespace DiscordChatExporter.Core.Exporting.Writers.MarkdownVisitors
 {
    internal partial class PlainTextMarkdownVisitor : MarkdownVisitor
    {
@@ -22,37 +23,6 @@ namespace DiscordChatExporter.Domain.Exporting.Writers.MarkdownVisitors
            return base.VisitText(text);
        }

-        protected override MarkdownNode VisitMention(MentionNode mention)
-        {
-            if (mention.Type == MentionType.Meta)
-            {
-                _buffer.Append($"@{mention.Id}");
-            }
-            else if (mention.Type == MentionType.User)
-            {
-                var member = _context.TryGetMember(Snowflake.Parse(mention.Id));
-                var name = member?.User.Name ?? "Unknown";
-
-                _buffer.Append($"@{name}");
-            }
-            else if (mention.Type == MentionType.Channel)
-            {
-                var channel = _context.TryGetChannel(Snowflake.Parse(mention.Id));
-                var name = channel?.Name ?? "deleted-channel";
-
-                _buffer.Append($"#{name}");
-            }
-            else if (mention.Type == MentionType.Role)
-            {
-                var role = _context.TryGetRole(Snowflake.Parse(mention.Id));
-                var name = role?.Name ?? "deleted-role";
-
-                _buffer.Append($"@{name}");
-            }
-
-            return base.VisitMention(mention);
-        }
-
        protected override MarkdownNode VisitEmoji(EmojiNode emoji)
        {
            _buffer.Append(
@@ -63,6 +33,51 @@ namespace DiscordChatExporter.Domain.Exporting.Writers.MarkdownVisitors

            return base.VisitEmoji(emoji);
        }
+
+        protected override MarkdownNode VisitMention(MentionNode mention)
+        {
+            var mentionId = Snowflake.TryParse(mention.Id);
+            if (mention.Kind == MentionKind.Meta)
+            {
+                _buffer.Append($"@{mention.Id}");
+            }
+            else if (mention.Kind == MentionKind.User)
+            {
+                var member = mentionId?.Pipe(_context.TryGetMember);
+                var name = member?.User.Name ?? "Unknown";
+
+                _buffer.Append($"@{name}");
+            }
+            else if (mention.Kind == MentionKind.Channel)
+            {
+                var channel = mentionId?.Pipe(_context.TryGetChannel);
+                var name = channel?.Name ?? "deleted-channel";
+
+                _buffer.Append($"#{name}");
+
+                // Voice channel marker
+                if (channel?.IsVoiceChannel == true)
+                    _buffer.Append(" [voice]");
+            }
+            else if (mention.Kind == MentionKind.Role)
+            {
+                var role = mentionId?.Pipe(_context.TryGetRole);
+                var name = role?.Name ?? "deleted-role";
+
+                _buffer.Append($"@{name}");
+            }
+
+            return base.VisitMention(mention);
+        }
+
+        protected override MarkdownNode VisitUnixTimestamp(UnixTimestampNode timestamp)
+        {
+            _buffer.Append(
+                _context.FormatDate(timestamp.Value)
+            );
+
+            return base.VisitUnixTimestamp(timestamp);
+        }
    }

    internal partial class PlainTextMarkdownVisitor
@@ -1,9 +1,9 @@
 using System;
 using System.IO;
 using System.Threading.Tasks;
-using DiscordChatExporter.Domain.Discord.Models;
+using DiscordChatExporter.Core.Discord.Data;

-namespace DiscordChatExporter.Domain.Exporting.Writers
+namespace DiscordChatExporter.Core.Exporting.Writers
 {
    internal abstract class MessageWriter : IAsyncDisposable
    {
@@ -11,6 +11,10 @@ namespace DiscordChatExporter.Domain.Exporting.Writers

        protected ExportContext Context { get; }

+        public long MessagesWritten { get; private set; }
+
+        public long BytesWritten => Stream.Length;
+
        protected MessageWriter(Stream stream, ExportContext context)
        {
            Stream = stream;
@@ -19,7 +23,11 @@ namespace DiscordChatExporter.Domain.Exporting.Writers

        public virtual ValueTask WritePreambleAsync() => default;

-        public abstract ValueTask WriteMessageAsync(Message message);
+        public virtual ValueTask WriteMessageAsync(Message message)
+        {
+            MessagesWritten++;
+            return default;
+        }

        public virtual ValueTask WritePostambleAsync() => default;

@@ -2,18 +2,16 @@
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using DiscordChatExporter.Domain.Discord.Models;
-using DiscordChatExporter.Domain.Exporting.Writers.MarkdownVisitors;
+using DiscordChatExporter.Core.Discord.Data;
+using DiscordChatExporter.Core.Exporting.Writers.MarkdownVisitors;
 using Tyrrrz.Extensions;

-namespace DiscordChatExporter.Domain.Exporting.Writers
+namespace DiscordChatExporter.Core.Exporting.Writers
 {
    internal class PlainTextMessageWriter : MessageWriter
    {
        private readonly TextWriter _writer;

-        private long _messageCount;
-
        public PlainTextMessageWriter(Stream stream, ExportContext context)
            : base(stream, context)
        {
@@ -77,10 +75,10 @@ namespace DiscordChatExporter.Domain.Exporting.Writers
                }

                if (!string.IsNullOrWhiteSpace(embed.Thumbnail?.Url))
-                    await _writer.WriteLineAsync(await Context.ResolveMediaUrlAsync(embed.Thumbnail.Url));
+                    await _writer.WriteLineAsync(await Context.ResolveMediaUrlAsync(embed.Thumbnail.ProxyUrl ?? embed.Thumbnail.Url));

                if (!string.IsNullOrWhiteSpace(embed.Image?.Url))
-                    await _writer.WriteLineAsync(await Context.ResolveMediaUrlAsync(embed.Image.Url));
+                    await _writer.WriteLineAsync(await Context.ResolveMediaUrlAsync(embed.Image.ProxyUrl ?? embed.Image.Url));

                if (!string.IsNullOrWhiteSpace(embed.Footer?.Text))
                    await _writer.WriteLineAsync(embed.Footer.Text);
@@ -113,15 +111,15 @@ namespace DiscordChatExporter.Domain.Exporting.Writers
        {
            await _writer.WriteLineAsync('='.Repeat(62));
            await _writer.WriteLineAsync($"Guild: {Context.Request.Guild.Name}");
-            await _writer.WriteLineAsync($"Channel: {Context.Request.Channel.Category} / {Context.Request.Channel.Name}");
+            await _writer.WriteLineAsync($"Channel: {Context.Request.Channel.Category.Name} / {Context.Request.Channel.Name}");

            if (!string.IsNullOrWhiteSpace(Context.Request.Channel.Topic))
                await _writer.WriteLineAsync($"Topic: {Context.Request.Channel.Topic}");

-            if (Context.Request.After != null)
+            if (Context.Request.After is not null)
                await _writer.WriteLineAsync($"After: {Context.FormatDate(Context.Request.After.Value.ToDate())}");

-            if (Context.Request.Before != null)
+            if (Context.Request.Before is not null)
                await _writer.WriteLineAsync($"Before: {Context.FormatDate(Context.Request.Before.Value.ToDate())}");

            await _writer.WriteLineAsync('='.Repeat(62));
@@ -130,26 +128,29 @@ namespace DiscordChatExporter.Domain.Exporting.Writers

        public override async ValueTask WriteMessageAsync(Message message)
        {
+            await base.WriteMessageAsync(message);
+
+            // Header
            await WriteMessageHeaderAsync(message);

+            // Content
            if (!string.IsNullOrWhiteSpace(message.Content))
                await _writer.WriteLineAsync(FormatMarkdown(message.Content));

            await _writer.WriteLineAsync();

+            // Attachments, embeds, reactions
            await WriteAttachmentsAsync(message.Attachments);
            await WriteEmbedsAsync(message.Embeds);
            await WriteReactionsAsync(message.Reactions);

            await _writer.WriteLineAsync();
-
-            _messageCount++;
        }

        public override async ValueTask WritePostambleAsync()
        {
            await _writer.WriteLineAsync('='.Repeat(62));
-            await _writer.WriteLineAsync($"Exported {_messageCount:N0} message(s)");
+            await _writer.WriteLineAsync($"Exported {MessagesWritten:N0} message(s)");
            await _writer.WriteLineAsync('='.Repeat(62));
        }

@@ -1,11 +1,20 @@
-namespace DiscordChatExporter.Domain.Markdown.Ast
+using DiscordChatExporter.Core.Utils;
+
+namespace DiscordChatExporter.Core.Markdown
 {
    internal class EmojiNode : MarkdownNode
    {
+        // Only present on custom emoji
        public string? Id { get; }

+        // Name of custom emoji (e.g. LUL) or actual representation of standard emoji (e.g. 🙂)
        public string Name { get; }

+        // Name of custom emoji (e.g. LUL) or name of standard emoji (e.g. slight_smile)
+        public string Code => !string.IsNullOrWhiteSpace(Id)
+            ? Name
+            : EmojiIndex.TryGetCode(Name) ?? Name;
+
        public bool IsAnimated { get; }

        public bool IsCustomEmoji => !string.IsNullOrWhiteSpace(Id);
@@ -1,17 +1,7 @@
 using System.Collections.Generic;

-namespace DiscordChatExporter.Domain.Markdown.Ast
+namespace DiscordChatExporter.Core.Markdown
 {
-    internal enum TextFormatting
-    {
-        Bold,
-        Italic,
-        Underline,
-        Strikethrough,
-        Spoiler,
-        Quote
-    }
-
    internal class FormattedNode : MarkdownNode
    {
        public TextFormatting Formatting { get; }
@@ -1,4 +1,4 @@
-namespace DiscordChatExporter.Domain.Markdown.Ast
+namespace DiscordChatExporter.Core.Markdown
 {
    internal class InlineCodeBlockNode : MarkdownNode
    {
@@ -1,4 +1,4 @@
-namespace DiscordChatExporter.Domain.Markdown.Ast
+namespace DiscordChatExporter.Core.Markdown
 {
    internal class LinkNode : MarkdownNode
    {
@@ -1,4 +1,4 @@
-namespace DiscordChatExporter.Domain.Markdown.Ast
+namespace DiscordChatExporter.Core.Markdown
 {
    internal abstract class MarkdownNode
    {
@@ -0,0 +1,10 @@
+namespace DiscordChatExporter.Core.Markdown
+{
+    internal enum MentionKind
+    {
+        Meta,
+        User,
+        Channel,
+        Role
+    }
+}
@@ -0,0 +1,17 @@
+namespace DiscordChatExporter.Core.Markdown
+{
+    internal class MentionNode : MarkdownNode
+    {
+        public string Id { get; }
+
+        public MentionKind Kind { get; }
+
+        public MentionNode(string id, MentionKind kind)
+        {
+            Id = id;
+            Kind = kind;
+        }
+
+        public override string ToString() => $"<{Kind} mention> {Id}";
+    }
+}
@@ -1,4 +1,4 @@
-namespace DiscordChatExporter.Domain.Markdown.Ast
+namespace DiscordChatExporter.Core.Markdown
 {
    internal class MultiLineCodeBlockNode : MarkdownNode
    {
@@ -1,6 +1,6 @@
 using System.Collections.Generic;

-namespace DiscordChatExporter.Domain.Markdown.Matching
+namespace DiscordChatExporter.Core.Markdown.Parsing
 {
    internal class AggregateMatcher<T> : IMatcher<T>
    {
@@ -27,11 +27,11 @@ namespace DiscordChatExporter.Domain.Markdown.Matching
                var match = matcher.TryMatch(stringPart);

                // If there's no match - continue
-                if (match == null)
+                if (match is null)
                    continue;

                // If this match is earlier than previous earliest - replace
-                if (earliestMatch == null || match.StringPart.StartIndex < earliestMatch.StringPart.StartIndex)
+                if (earliestMatch is null || match.StringPart.StartIndex < earliestMatch.StringPart.StartIndex)
                    earliestMatch = match;

                // If the earliest match starts at the very beginning - break,
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;

-namespace DiscordChatExporter.Domain.Markdown.Matching
+namespace DiscordChatExporter.Core.Markdown.Parsing
 {
    internal interface IMatcher<T>
    {
@@ -21,7 +21,7 @@ namespace DiscordChatExporter.Domain.Markdown.Matching
                var match = matcher.TryMatch(stringPart.Slice(currentIndex, stringPart.EndIndex - currentIndex));

                // If there's no match - break
-                if (match == null)
+                if (match is null)
                    break;

                // If this match doesn't start immediately at current index - transform and yield fallback first
@@ -1,10 +1,11 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Text.RegularExpressions;
-using DiscordChatExporter.Domain.Markdown.Ast;
-using DiscordChatExporter.Domain.Markdown.Matching;
+using DiscordChatExporter.Core.Utils;

-namespace DiscordChatExporter.Domain.Markdown
+namespace DiscordChatExporter.Core.Markdown.Parsing
 {
    // The following parsing logic is meant to replicate Discord's markdown grammar as close as possible
    internal static partial class MarkdownParser
@@ -103,7 +104,7 @@ namespace DiscordChatExporter.Domain.Markdown
        // There can be either one or two backticks, but equal number on both sides
        private static readonly IMatcher<MarkdownNode> InlineCodeBlockNodeMatcher = new RegexMatcher<MarkdownNode>(
            new Regex("(`{1,2})([^`]+)\\1", DefaultRegexOptions | RegexOptions.Singleline),
-            m => new InlineCodeBlockNode(m.Groups[2].Value.Trim('\r', '\n'))
+            (_, m) => new InlineCodeBlockNode(m.Groups[2].Value.Trim('\r', '\n'))
        );

        // Capture language identifier and then any character until the earliest triple backtick
@@ -111,7 +112,7 @@ namespace DiscordChatExporter.Domain.Markdown
        // Blank lines at the beginning and end of content are trimmed
        private static readonly IMatcher<MarkdownNode> MultiLineCodeBlockNodeMatcher = new RegexMatcher<MarkdownNode>(
            new Regex("```(?:(\\w*)\\n)?(.+?)```", DefaultRegexOptions | RegexOptions.Singleline),
-            m => new MultiLineCodeBlockNode(m.Groups[1].Value, m.Groups[2].Value.Trim('\r', '\n'))
+            (_, m) => new MultiLineCodeBlockNode(m.Groups[1].Value, m.Groups[2].Value.Trim('\r', '\n'))
        );

        /* Mentions */
@@ -119,31 +120,31 @@ namespace DiscordChatExporter.Domain.Markdown
        // Capture @everyone
        private static readonly IMatcher<MarkdownNode> EveryoneMentionNodeMatcher = new StringMatcher<MarkdownNode>(
            "@everyone",
-            _ => new MentionNode("everyone", MentionType.Meta)
+            _ => new MentionNode("everyone", MentionKind.Meta)
        );

        // Capture @here
        private static readonly IMatcher<MarkdownNode> HereMentionNodeMatcher = new StringMatcher<MarkdownNode>(
            "@here",
-            _ => new MentionNode("here", MentionType.Meta)
+            _ => new MentionNode("here", MentionKind.Meta)
        );

        // Capture <@123456> or <@!123456>
        private static readonly IMatcher<MarkdownNode> UserMentionNodeMatcher = new RegexMatcher<MarkdownNode>(
            new Regex("<@!?(\\d+)>", DefaultRegexOptions),
-            m => new MentionNode(m.Groups[1].Value, MentionType.User)
+            (_, m) => new MentionNode(m.Groups[1].Value, MentionKind.User)
        );

        // Capture <#123456>
        private static readonly IMatcher<MarkdownNode> ChannelMentionNodeMatcher = new RegexMatcher<MarkdownNode>(
-            new Regex("<#(\\d+)>", DefaultRegexOptions),
-            m => new MentionNode(m.Groups[1].Value, MentionType.Channel)
+            new Regex("<#!?(\\d+)>", DefaultRegexOptions),
+            (_, m) => new MentionNode(m.Groups[1].Value, MentionKind.Channel)
        );

        // Capture <@&123456>
        private static readonly IMatcher<MarkdownNode> RoleMentionNodeMatcher = new RegexMatcher<MarkdownNode>(
            new Regex("<@&(\\d+)>", DefaultRegexOptions),
-            m => new MentionNode(m.Groups[1].Value, MentionType.Role)
+            (_, m) => new MentionNode(m.Groups[1].Value, MentionKind.Role)
        );

        /* Emojis */
@@ -154,15 +155,26 @@ namespace DiscordChatExporter.Domain.Markdown
        // ... or digit followed by enclosing mark
        // (this does not match all emojis in Discord but it's reasonably accurate enough)
        private static readonly IMatcher<MarkdownNode> StandardEmojiNodeMatcher = new RegexMatcher<MarkdownNode>(
-            new Regex("((?:[\\uD83C][\\uDDE6-\\uDDFF]){2}|[\\u2600-\\u26FF]|\\p{Cs}{2}|\\d\\p{Me})",
-                DefaultRegexOptions),
-            m => new EmojiNode(m.Groups[1].Value)
+            new Regex("((?:[\\uD83C][\\uDDE6-\\uDDFF]){2}|[\\u2600-\\u26FF]|\\p{Cs}{2}|\\d\\p{Me})", DefaultRegexOptions),
+            (_, m) => new EmojiNode(m.Groups[1].Value)
+        );
+
+        // Capture :thinking: (but only for known emoji codes)
+        private static readonly IMatcher<MarkdownNode> CodedStandardEmojiNodeMatcher = new RegexMatcher<MarkdownNode>(
+            new Regex(":([\\w_]+):", DefaultRegexOptions),
+            (_, m) =>
+            {
+                var name = EmojiIndex.TryGetName(m.Groups[1].Value);
+                return name is not null
+                    ? new EmojiNode(name)
+                    : null;
+            }
        );

        // Capture <:lul:123456> or <a:lul:123456>
        private static readonly IMatcher<MarkdownNode> CustomEmojiNodeMatcher = new RegexMatcher<MarkdownNode>(
            new Regex("<(a)?:(.+?):(\\d+?)>", DefaultRegexOptions),
-            m => new EmojiNode(m.Groups[3].Value, m.Groups[2].Value, !string.IsNullOrWhiteSpace(m.Groups[1].Value))
+            (_, m) => new EmojiNode(m.Groups[3].Value, m.Groups[2].Value, !string.IsNullOrWhiteSpace(m.Groups[1].Value))
        );

        /* Links */
@@ -170,19 +182,19 @@ namespace DiscordChatExporter.Domain.Markdown
        // Capture [title](link)
        private static readonly IMatcher<MarkdownNode> TitledLinkNodeMatcher = new RegexMatcher<MarkdownNode>(
            new Regex("\\[(.+?)\\]\\((.+?)\\)", DefaultRegexOptions),
-            m => new LinkNode(m.Groups[2].Value, m.Groups[1].Value)
+            (_, m) => new LinkNode(m.Groups[2].Value, m.Groups[1].Value)
        );

        // Capture any non-whitespace character after http:// or https:// until the last punctuation character or whitespace
        private static readonly IMatcher<MarkdownNode> AutoLinkNodeMatcher = new RegexMatcher<MarkdownNode>(
            new Regex("(https?://\\S*[^\\.,:;\"\'\\s])", DefaultRegexOptions),
-            m => new LinkNode(m.Groups[1].Value)
+            (_, m) => new LinkNode(m.Groups[1].Value)
        );

        // Same as auto link but also surrounded by angular brackets
        private static readonly IMatcher<MarkdownNode> HiddenLinkNodeMatcher = new RegexMatcher<MarkdownNode>(
            new Regex("<(https?://\\S*[^\\.,:;\"\'\\s])>", DefaultRegexOptions),
-            m => new LinkNode(m.Groups[1].Value)
+            (_, m) => new LinkNode(m.Groups[1].Value)
        );

        /* Text */
@@ -198,21 +210,41 @@ namespace DiscordChatExporter.Domain.Markdown
        // This escapes it from matching for emoji
        private static readonly IMatcher<MarkdownNode> IgnoredEmojiTextNodeMatcher = new RegexMatcher<MarkdownNode>(
            new Regex("(\\u26A7|\\u2640|\\u2642|\\u2695|\\u267E|\\u00A9|\\u00AE|\\u2122)", DefaultRegexOptions),
-            m => new TextNode(m.Groups[1].Value)
+            (_, m) => new TextNode(m.Groups[1].Value)
        );

        // Capture any "symbol/other" character or surrogate pair preceded by a backslash
        // This escapes it from matching for emoji
        private static readonly IMatcher<MarkdownNode> EscapedSymbolTextNodeMatcher = new RegexMatcher<MarkdownNode>(
            new Regex("\\\\(\\p{So}|\\p{Cs}{2})", DefaultRegexOptions),
-            m => new TextNode(m.Groups[1].Value)
+            (_, m) => new TextNode(m.Groups[1].Value)
        );

        // Capture any non-whitespace, non latin alphanumeric character preceded by a backslash
        // This escapes it from matching for formatting or other tokens
        private static readonly IMatcher<MarkdownNode> EscapedCharacterTextNodeMatcher = new RegexMatcher<MarkdownNode>(
            new Regex("\\\\([^a-zA-Z0-9\\s])", DefaultRegexOptions),
-            m => new TextNode(m.Groups[1].Value)
+            (_, m) => new TextNode(m.Groups[1].Value)
+        );
+
+        /* Misc */
+
+        // Capture <t:12345678> or <t:12345678:R>
+        private static readonly IMatcher<MarkdownNode> UnixTimestampNodeMatcher = new RegexMatcher<MarkdownNode>(
+            new Regex("<t:(\\d+)(?::\\w)?>", DefaultRegexOptions),
+            (_, m) =>
+            {
+                // We don't care about the 'R' parameter because we're not going to
+                // show relative timestamps in an export anyway.
+
+                if (!long.TryParse(m.Groups[1].Value, NumberStyles.Integer, CultureInfo.InvariantCulture,
+                    out var offset))
+                {
+                    return null;
+                }
+
+                return new UnixTimestampNode(DateTimeOffset.UnixEpoch + TimeSpan.FromSeconds(offset));
+            }
        );

        // Combine all matchers into one
@@ -255,7 +287,11 @@ namespace DiscordChatExporter.Domain.Markdown

            // Emoji
            StandardEmojiNodeMatcher,
-            CustomEmojiNodeMatcher
+            CustomEmojiNodeMatcher,
+            CodedStandardEmojiNodeMatcher,
+
+            // Misc
+            UnixTimestampNodeMatcher
        );

        // Minimal set of matchers for non-multimedia formats (e.g. plain text)
@@ -268,7 +304,10 @@ namespace DiscordChatExporter.Domain.Markdown
            RoleMentionNodeMatcher,

            // Emoji
-            CustomEmojiNodeMatcher
+            CustomEmojiNodeMatcher,
+
+            // Misc
+            UnixTimestampNodeMatcher
        );

        private static IReadOnlyList<MarkdownNode> Parse(StringPart stringPart, IMatcher<MarkdownNode> matcher) =>
@@ -280,12 +319,16 @@ namespace DiscordChatExporter.Domain.Markdown

    internal static partial class MarkdownParser
    {
-        private static IReadOnlyList<MarkdownNode> Parse(StringPart stringPart) => Parse(stringPart, AggregateNodeMatcher);
+        private static IReadOnlyList<MarkdownNode> Parse(StringPart stringPart) =>
+            Parse(stringPart, AggregateNodeMatcher);

-        private static IReadOnlyList<MarkdownNode> ParseMinimal(StringPart stringPart) => Parse(stringPart, MinimalAggregateNodeMatcher);
+        private static IReadOnlyList<MarkdownNode> ParseMinimal(StringPart stringPart) =>
+            Parse(stringPart, MinimalAggregateNodeMatcher);

-        public static IReadOnlyList<MarkdownNode> Parse(string input) => Parse(new StringPart(input));
+        public static IReadOnlyList<MarkdownNode> Parse(string input) =>
+            Parse(new StringPart(input));

-        public static IReadOnlyList<MarkdownNode> ParseMinimal(string input) => ParseMinimal(new StringPart(input));
+        public static IReadOnlyList<MarkdownNode> ParseMinimal(string input) =>
+            ParseMinimal(new StringPart(input));
    }
 }
@@ -1,12 +1,12 @@
 using System;
 using System.Collections.Generic;
-using DiscordChatExporter.Domain.Markdown.Ast;

-namespace DiscordChatExporter.Domain.Markdown
+namespace DiscordChatExporter.Core.Markdown.Parsing
 {
    internal abstract class MarkdownVisitor
    {
-        protected virtual MarkdownNode VisitText(TextNode text) => text;
+        protected virtual MarkdownNode VisitText(TextNode text) =>
+            text;

        protected virtual MarkdownNode VisitFormatted(FormattedNode formatted)
        {
@@ -14,15 +14,23 @@ namespace DiscordChatExporter.Domain.Markdown
            return formatted;
        }

-        protected virtual MarkdownNode VisitInlineCodeBlock(InlineCodeBlockNode inlineCodeBlock) => inlineCodeBlock;
+        protected virtual MarkdownNode VisitInlineCodeBlock(InlineCodeBlockNode inlineCodeBlock) =>
+            inlineCodeBlock;

-        protected virtual MarkdownNode VisitMultiLineCodeBlock(MultiLineCodeBlockNode multiLineCodeBlock) => multiLineCodeBlock;
+        protected virtual MarkdownNode VisitMultiLineCodeBlock(MultiLineCodeBlockNode multiLineCodeBlock) =>
+            multiLineCodeBlock;

-        protected virtual MarkdownNode VisitLink(LinkNode link) => link;
+        protected virtual MarkdownNode VisitLink(LinkNode link) =>
+            link;

-        protected virtual MarkdownNode VisitEmoji(EmojiNode emoji) => emoji;
+        protected virtual MarkdownNode VisitEmoji(EmojiNode emoji) =>
+            emoji;

-        protected virtual MarkdownNode VisitMention(MentionNode mention) => mention;
+        protected virtual MarkdownNode VisitMention(MentionNode mention) =>
+            mention;
+
+        protected virtual MarkdownNode VisitUnixTimestamp(UnixTimestampNode timestamp) =>
+            timestamp;

        public MarkdownNode Visit(MarkdownNode node) => node switch
        {
@@ -33,6 +41,7 @@ namespace DiscordChatExporter.Domain.Markdown
            LinkNode link => VisitLink(link),
            EmojiNode emoji => VisitEmoji(emoji),
            MentionNode mention => VisitMention(mention),
+            UnixTimestampNode timestamp => VisitUnixTimestamp(timestamp),
            _ => throw new ArgumentOutOfRangeException(nameof(node))
        };

@@ -1,4 +1,4 @@
-namespace DiscordChatExporter.Domain.Markdown.Matching
+namespace DiscordChatExporter.Core.Markdown.Parsing
 {
    internal class ParsedMatch<T>
    {
@@ -1,24 +1,19 @@
 using System;
 using System.Text.RegularExpressions;

-namespace DiscordChatExporter.Domain.Markdown.Matching
+namespace DiscordChatExporter.Core.Markdown.Parsing
 {
    internal class RegexMatcher<T> : IMatcher<T>
    {
        private readonly Regex _regex;
-        private readonly Func<StringPart, Match, T> _transform;
+        private readonly Func<StringPart, Match, T?> _transform;

-        public RegexMatcher(Regex regex, Func<StringPart, Match, T> transform)
+        public RegexMatcher(Regex regex, Func<StringPart, Match, T?> transform)
        {
            _regex = regex;
            _transform = transform;
        }

-        public RegexMatcher(Regex regex, Func<Match, T> transform)
-            : this(regex, (p, m) => transform(m))
-        {
-        }
-
        public ParsedMatch<T>? TryMatch(StringPart stringPart)
        {
            var match = _regex.Match(stringPart.Target, stringPart.StartIndex, stringPart.Length);
@@ -30,11 +25,15 @@ namespace DiscordChatExporter.Domain.Markdown.Matching
            // Which is super weird because regex.Match(string, int) takes the whole input in context.
            // So in order to properly account for ^/$ regex tokens, we need to make sure that
            // the expression also matches on the bigger part of the input.
-            if (!_regex.IsMatch(stringPart.Target.Substring(0, stringPart.EndIndex), stringPart.StartIndex))
+            if (!_regex.IsMatch(stringPart.Target[..stringPart.EndIndex], stringPart.StartIndex))
                return null;

            var stringPartMatch = stringPart.Slice(match.Index, match.Length);
-            return new ParsedMatch<T>(stringPartMatch, _transform(stringPartMatch, match));
+            var value = _transform(stringPartMatch, match);
+
+            return value is not null
+                ? new ParsedMatch<T>(stringPartMatch, value)
+                : null;
        }
    }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Tyrrrz	de773467b6	Update version	2021-07-19 01:58:23 +03:00
Tyrrrz	92766b580b	[HTML] Show "Click to see attachment" on replies to attachment or embed messages without content Closes #634	2021-07-19 01:12:30 +03:00
Tyrrrz	abf7498667	Add support for timestamp markers Closes #637	2021-07-18 16:04:39 +03:00
Tyrrrz	ae42554621	Render voice channel mentions Closes #636	2021-07-18 02:19:50 +03:00
Tyrrrz	b58e67776c	[HTML] Improve how the reference symbol looks Closes #650	2021-07-18 01:09:52 +03:00
Tyrrrz	7fc6e0cfe0	Update readme	2021-07-18 00:19:25 +03:00
Tyrrrz	35264e8a12	Improve "Requested resource does not exist" exception message to give slightly more context	2021-07-18 00:15:06 +03:00
Tyrrrz	2ab6773c17	[GUI] Show error in a dialog when pull or export fails, instead of crashing the whole app	2021-07-18 00:02:28 +03:00
Tyrrrz	650c55bbd1	Refactor	2021-07-17 23:53:13 +03:00
Cliff J	e1726683f8	Hide author icon when loading returns an error (#644 ) Fixes #643	2021-07-13 14:56:36 -07:00
Yudi	70a1755c50	Update the in-app instructions for getting user token (#639 ) Co-authored-by: virtuallyvlad <37453320+virtuallyvlad@users.noreply.github.com> Co-authored-by: Alexey Golub <tyrrrrrr@gmail.com>	2021-07-13 07:26:26 -07:00
Tyrrrz	524b30b09b	Update CliFx to fix NotSupportedException Fixes #631	2021-07-09 22:53:12 +03:00
Lucas LaBuff	d39fc212b6	Filter which messages are exported (#622 )	2021-07-07 12:14:40 -07:00
Tyrrrz	95cd6cb50c	Further cleanup issue forms	2021-06-24 20:46:42 +03:00
Tyrrrz	79a9ac0462	Refactor issue forms and add pull request template	2021-06-24 19:29:15 +03:00
Tyrrrz	5b5a53dbf4	[HTML] More template cleanup	2021-06-22 20:03:30 +03:00
Tyrrrz	2b0fa4213b	[HTML] Cleanup templates slightly	2021-06-22 14:16:08 +03:00
Tyrrrz	fd9d367bad	[HTML] Cleanup formatting in stylesheet	2021-06-21 20:52:30 +03:00
Tyrrrz	dbc3209160	[HTML] Merge all static stylesheets into a single dynamic stylesheet	2021-06-21 20:44:36 +03:00
Tyrrrz	3bcde0c534	[HTML] Move stylesheets into their own template	2021-06-21 19:57:15 +03:00
Tyrrrz	903882e35b	Fix typos in changelog	2021-06-20 23:06:39 +03:00
Luke	3c6d9d74a4	Lazy load images (#613 )	2021-06-20 05:50:14 -07:00
Tyrrrz	1e53f50ca3	[HTML] Simplify disabling jumbo in referenced message content	2021-06-19 23:09:07 +03:00
Tyrrrz	cba5a934df	Update version	2021-06-19 20:50:22 +03:00
Tyrrrz	cd05058cf7	Prefer proxy URLs for embed content everywhere	2021-06-19 20:25:50 +03:00
Tyrrrz	e9c3872701	[HTML] Prevent click events on elements inside referenced message Closes #545	2021-06-19 20:17:36 +03:00
Tyrrrz	88c4330a66	[HTML] Link to pre-resized avatar image for better image quality	2021-06-19 20:15:18 +03:00
Tyrrrz	998bdaf2d4	[HTML] Use svg variants of Twemoji for better resize quality	2021-06-19 19:57:29 +03:00
Tyrrrz	24a80f915f	[HTML] Recognize standard emoji by code and show emoji code in tooltips Closes #549 Closes #599	2021-06-19 19:49:53 +03:00
Tyrrrz	de57cd714d	[HTML] Prepend "Message sent: " to message timestamp tooltips	2021-06-19 18:56:47 +03:00
Tyrrrz	f9ab269b29	[HTML] Don't jumbo emojis in referenced messages Closes #544	2021-06-19 15:49:16 +03:00
Tyrrrz	33feaccee7	Only use DotnetRuntimeBootstrapper in release build	2021-06-17 22:08:11 +03:00
Tyrrrz	4fd6f8272e	[HTML] Update styling to match Discord	2021-06-16 18:15:58 +03:00
Tyrrrz	b28f029382	Refactor YouTube embeds	2021-06-16 17:54:35 +03:00
Tyrrrz	29552be6e5	Cleanup	2021-06-16 16:52:18 +03:00
Tyrrrz	9491e18e2f	Update NuGet packages	2021-06-15 22:41:06 +03:00
quentinmay	4b1c9660be	Render YouTube iframe for applicable video embeds (#607 )	2021-06-15 07:19:19 -07:00
Tyrrrz	950625e671	[HTML] Show timestamps of individual messages Closes #536	2021-06-14 22:55:42 +03:00
Tyrrrz	ce2dedff6b	[HTML] Use a clickable <div> instead of <a> for reply reference link Fixes #546	2021-06-14 21:33:20 +03:00
Tyrrrz	baac419538	[HTML] Fix embed footer styling	2021-06-14 20:48:20 +03:00
Tyrrrz	bd40dbde48	Don't throw if file dates cannot be modified when downloading media Fixes #585	2021-06-14 20:43:44 +03:00
Tyrrrz	cbe4bc593c	[HTML] Prefer proxy URLs for resolving embed media Closes #590	2021-06-14 20:38:19 +03:00
Tyrrrz	cb32cee5f5	Update DotnetRuntimeBootstrapper	2021-06-14 04:51:32 +03:00
Tyrrrz	82f364a887	Update readme	2021-06-08 18:04:19 +03:00
Tyrrrz	152e8c8dcb	Update version	2021-06-08 17:54:58 +03:00
John Zabroski	260139ab25	Fix .NET v3.1 to say .NET Core v3.1 in readme (#605 )	2021-06-08 07:25:12 -07:00
Tyrrrz	11e9c0f15c	Downgrade MDIX	2021-06-08 01:32:21 +03:00
Tyrrrz	ac809d1a3f	Update packages	2021-06-08 01:23:00 +03:00
Tyrrrz	36fa346299	Use DotnetRuntimeBootstrapper	2021-06-08 00:53:41 +03:00
Tyrrrz	8c3a5bd096	Update issue templates	2021-05-12 21:38:12 +03:00
Tyrrrz	021682899a	[CLI] Move Markup.Escape(...) to ConsoleExtensions	2021-04-26 19:47:25 +03:00
Lucas LaBuff	0ec6027a93	Escape brackets in category name in CLI (#558 )	2021-04-26 09:37:37 -07:00
Tyrrrz	eb49d0bd16	Update version	2021-04-24 21:26:49 +03:00
Tyrrrz	e7c2564f6f	Update NuGet packages	2021-04-24 21:08:57 +03:00
Tyrrrz	d1b70cf5f6	Add wiki to issue templates	2021-04-22 21:48:45 +03:00
Tyrrrz	b73d6a78a9	Fix issue templates	2021-04-22 21:47:05 +03:00
Tyrrrz	b9f04bc4d9	Use issue forms	2021-04-22 21:40:47 +03:00
Tyrrrz	d01ed13041	Update NuGet packages	2021-04-18 19:32:59 +03:00
Tyrrrz	ed35a36eaa	Update NuGet.config	2021-04-17 21:25:52 +03:00
Tyrrrz	2ddfb46c31	Add IFormatProvider to FileSize.TryParse(...) and PartitionLimit.Parse(...)	2021-04-17 14:07:07 +03:00
rtm516	3c5beeba79	Export channel category id to JSON (#554 )	2021-04-17 13:56:27 +03:00
Tyrrrz	ed915443e6	Update contribution guidelines	2021-04-17 00:21:23 +03:00
Tyrrrz	f8d55f406c	[GUI] Cleanup ExportSetupViewModel & RootViewModel	2021-04-16 23:39:36 +03:00
Tyrrrz	15b605f5a7	Fix typo	2021-04-16 23:29:19 +03:00
Tyrrrz	511af1e35c	Refactor	2021-04-16 23:09:08 +03:00
rtm516	2fea455c64	[JSON] Write user color (#552 )	2021-04-15 19:21:16 +03:00
Tyrrrz	c64133f717	Add contribution guidelines	2021-04-14 21:42:41 +03:00
Alexey Golub	d18d2e0307	Update readme	2021-04-14 15:04:42 +03:00
Alexey Golub	86633b858c	Update readme Fixes #551	2021-04-14 15:02:06 +03:00
Tyrrrz	c390c64316	Remove GHA workarounds	2021-04-13 22:33:06 +03:00
Tyrrrz	af3a59ce0f	Add NuGet.config	2021-04-13 22:23:14 +03:00
Andrew Kolos	eb89ea5b40	Add partition by file size (#497 )	2021-04-12 13:50:32 +03:00
Tyrrrz	ad3655396f	[CLI] Remove redundant whitespace	2021-03-25 00:44:21 +02:00
Tyrrrz	1b8af364d3	[CLI] Cleanup	2021-03-24 22:39:27 +02:00
Tyrrrz	58464d8708	Improve error messages	2021-03-24 22:39:01 +02:00
Tyrrrz	026927265a	[CLI] Remove ExportMultipleCommandBase and allow multiple channel IDs in ExportChannelCommand	2021-03-24 03:04:46 +02:00
Tyrrrz	390735032e	[CLI] Hack Spectre.Console so that it properly supports CliFx encoding	2021-03-24 02:51:11 +02:00
Tyrrrz	461d474498	[CLI] Update CliFx	2021-03-24 02:50:54 +02:00
Tyrrrz	017ed5ae6d	[CLI] Update CliFx and use Spectre.Console for progress reporting	2021-03-23 22:38:44 +02:00
Tyrrrz	6f90c367b9	Clamp progress in DiscordClient.GetMessagesAsync(...)	2021-03-23 21:41:37 +02:00
Tyrrrz	f866c16355	Update NuGet packages	2021-03-23 18:43:09 +02:00
Tyrrrz	072d4c1fe6	Use MiniRazor.CodeGen instead of MiniRazor	2021-03-23 00:48:56 +02:00
Lucas LaBuff	6365e0a080	Fix JSON discriminator and nickname fields (#524 )	2021-03-19 16:58:28 +02:00
Tyrrrz	7b140fd450	Try to fix nullability warning	2021-03-18 02:13:15 +02:00
Tyrrrz	e237e00600	Fix CI/CD Windows issue	2021-03-16 01:24:00 +02:00
Tyrrrz	3aef7faa1e	Use `is null`/`is not null`	2021-03-09 21:57:26 +02:00
Tyrrrz	ebe4d58a42	Cleanup	2021-02-22 03:15:22 +02:00
Lucas LaBuff	bed0ade732	[JSON] Skip validation (#499 )	2021-02-15 01:07:28 +02:00
Alexey Golub	06e89538cb	Drop xs:code	2021-02-10 08:28:27 +02:00
Alexey Golub	7903869f9f	Update Readme.md	2021-02-10 02:44:55 +02:00
Tyrrrz	32443c5a5b	Update readme	2021-02-10 02:26:58 +02:00
Tyrrrz	d477159907	Update readme	2021-02-10 02:05:08 +02:00
Tyrrrz	93578abe24	Normalize snackbar style	2021-02-09 00:50:18 +02:00
Tyrrrz	f22b048d32	Update version	2021-02-06 21:22:42 +02:00
Lucas LaBuff	a8031ad3aa	Fix crash when parsing position on DM channels (#496 )	2021-02-06 17:00:29 +02:00
Frederic Portaria-Janicki	e49cf997ea	[CLI] Fix missing channel category bug when API returns empty string (#492 )	2021-02-02 14:42:04 +02:00
Lucas LaBuff	8b9afe45b9	[CLI] Fix sorting by channel/category position (#490 )	2021-01-31 17:23:46 +02:00
Lucas LaBuff	77b7977324	Formatting output paths (#472 )	2021-01-28 22:01:13 +02:00
Lucas LaBuff	915f4c8d9f	Fix crash on encountering invalid snowflake (#479 )	2021-01-18 19:21:22 +02:00
Tyrrrz	0872d6d44b	Update screenshots	2020-12-29 21:06:45 +02:00