Cleanup

DiscordChatExporter.Cli/Commands/Base/ExportCommandBase.cs

@@ -4,9 +4,9 @@ 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 DiscordChatExporter.Core.Discord;
+using DiscordChatExporter.Core.Discord.Data;
+using DiscordChatExporter.Core.Exporting;
 
 namespace DiscordChatExporter.Cli.Commands.Base
 {
@@ -36,11 +36,15 @@ 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)
         {
-            console.Output.Write($"Exporting channel '{channel.Category} / {channel.Name}'... ");
+            await console.Output.WriteAsync(
+                $"Exporting channel '{channel.Category} / {channel.Name}'... "
+            );
+
             var progress = console.CreateProgressTicker();
 
             var request = new ExportRequest(
@@ -56,21 +60,21 @@ namespace DiscordChatExporter.Cli.Commands.Base
                 DateFormat
             );
 
-            await GetChannelExporter().ExportChannelAsync(request, progress);
+            await Exporter.ExportChannelAsync(request, progress);
 
-            console.Output.WriteLine();
-            console.Output.WriteLine("Done.");
+            await console.Output.WriteLineAsync();
+            await console.Output.WriteLineAsync("Done.");
         }
 
         protected async ValueTask ExportAsync(IConsole console, Channel channel)
         {
-            var guild = await GetDiscordClient().GetGuildAsync(channel.GuildId);
+            var guild = await Discord.GetGuildAsync(channel.GuildId);
             await ExportAsync(console, guild, channel);
         }
 
         protected async ValueTask ExportAsync(IConsole console, Snowflake channelId)
         {
-            var channel = await GetDiscordClient().GetChannelAsync(channelId);
+            var channel = await Discord.GetChannelAsync(channelId);
             await ExportAsync(console, channel);
         }
 

DiscordChatExporter.Cli/Commands/Base/ExportMultipleCommandBase.cs

@@ -6,10 +6,10 @@ 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 DiscordChatExporter.Core.Discord.Data;
+using DiscordChatExporter.Core.Exceptions;
+using DiscordChatExporter.Core.Exporting;
+using DiscordChatExporter.Core.Utils.Extensions;
 using Gress;
 using Tyrrrz.Extensions;
 
@@ -25,7 +25,10 @@ namespace DiscordChatExporter.Cli.Commands.Base
             // 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... ");
+            await console.Output.WriteAsync(
+                $"Exporting {channels.Count} channels... "
+            );
+
             var progress = console.CreateProgressTicker();
 
             var operations = progress.Wrap().CreateOperations(channels.Count);
@@ -39,7 +42,7 @@ namespace DiscordChatExporter.Cli.Commands.Base
 
                 try
                 {
-                    var guild = await GetDiscordClient().GetGuildAsync(channel.GuildId);
+                    var guild = await Discord.GetGuildAsync(channel.GuildId);
 
                     var request = new ExportRequest(
                         guild,
@@ -54,7 +57,7 @@ namespace DiscordChatExporter.Cli.Commands.Base
                         DateFormat
                     );
 
-                    await GetChannelExporter().ExportChannelAsync(request, operation);
+                    await Exporter.ExportChannelAsync(request, operation);
 
                     Interlocked.Increment(ref successfulExportCount);
                 }
@@ -68,12 +71,12 @@ namespace DiscordChatExporter.Cli.Commands.Base
                 }
             }, ParallelLimit.ClampMin(1));
 
-            console.Output.WriteLine();
+            await console.Output.WriteLineAsync();
 
             foreach (var (channel, error) in errors)
-                console.Error.WriteLine($"Channel '{channel}': {error}");
+                await console.Error.WriteLineAsync($"Channel '{channel}': {error}");
 
-            console.Output.WriteLine($"Successfully exported {successfulExportCount} channel(s).");
+            await console.Output.WriteLineAsync($"Successfully exported {successfulExportCount} channel(s).");
         }
     }
 }

DiscordChatExporter.Cli/Commands/Base/TokenCommandBase.cs

@@ -1,26 +1,27 @@
 using System.Threading.Tasks;
 using CliFx;
 using CliFx.Attributes;
-using DiscordChatExporter.Domain.Discord;
+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, EnvironmentVariableName = "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', EnvironmentVariableName = "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);
     }

DiscordChatExporter.Cli/Commands/ExportAllCommand.cs

@@ -3,7 +3,7 @@ using System.Threading.Tasks;
 using CliFx;
 using CliFx.Attributes;
 using DiscordChatExporter.Cli.Commands.Base;
-using DiscordChatExporter.Domain.Discord.Models;
+using DiscordChatExporter.Core.Discord.Data;
 
 namespace DiscordChatExporter.Cli.Commands
 {
@@ -15,16 +15,18 @@ namespace DiscordChatExporter.Cli.Commands
 
         public override async ValueTask ExecuteAsync(IConsole console)
         {
+            await base.ExecuteAsync(console);
+
             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))
                 {
                     channels.Add(channel);
                 }

DiscordChatExporter.Cli/Commands/ExportChannelCommand.cs

@@ -2,7 +2,7 @@
 using CliFx;
 using CliFx.Attributes;
 using DiscordChatExporter.Cli.Commands.Base;
-using DiscordChatExporter.Domain.Discord;
+using DiscordChatExporter.Core.Discord;
 
 namespace DiscordChatExporter.Cli.Commands
 {

DiscordChatExporter.Cli/Commands/ExportDirectMessagesCommand.cs

@@ -2,8 +2,8 @@
 using CliFx;
 using CliFx.Attributes;
 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
 {
@@ -12,7 +12,9 @@ namespace DiscordChatExporter.Cli.Commands
     {
         public override async ValueTask ExecuteAsync(IConsole console)
         {
-            var channels = await GetDiscordClient().GetGuildChannelsAsync(Guild.DirectMessages.Id);
+            await base.ExecuteAsync(console);
+
+            var channels = await Discord.GetGuildChannelsAsync(Guild.DirectMessages.Id);
             await ExportMultipleAsync(console, channels);
         }
     }

DiscordChatExporter.Cli/Commands/ExportGuildCommand.cs

@@ -2,8 +2,8 @@
 using CliFx;
 using CliFx.Attributes;
 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
 {
@@ -15,7 +15,9 @@ namespace DiscordChatExporter.Cli.Commands
 
         public override async ValueTask ExecuteAsync(IConsole console)
         {
-            var channels = await GetDiscordClient().GetGuildChannelsAsync(GuildId);
+            await base.ExecuteAsync(console);
+
+            var channels = await Discord.GetGuildChannelsAsync(GuildId);
             await ExportMultipleAsync(console, channels);
         }
     }

DiscordChatExporter.Cli/Commands/GetChannelsCommand.cs

@@ -3,9 +3,9 @@ using System.Threading.Tasks;
 using CliFx;
 using CliFx.Attributes;
 using DiscordChatExporter.Cli.Commands.Base;
-using DiscordChatExporter.Domain.Discord;
-using DiscordChatExporter.Domain.Discord.Models.Common;
-using DiscordChatExporter.Domain.Utilities;
+using DiscordChatExporter.Core.Discord;
+using DiscordChatExporter.Core.Discord.Data.Common;
+using DiscordChatExporter.Core.Utils.Extensions;
 
 namespace DiscordChatExporter.Cli.Commands
 {
@@ -17,10 +17,14 @@ 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, PositionBasedComparer.Instance).ThenBy(c => c.Name))
-                console.Output.WriteLine($"{channel.Id} | {channel.Category} / {channel.Name}");
+            foreach (var channel in channels.OrderBy(c => c.Category.Position).ThenBy(c => c.Name))
+            {
+                await console.Output.WriteLineAsync(
+                    $"{channel.Id} | {channel.Category} / {channel.Name}"
+                );
+            }
         }
     }
 }

DiscordChatExporter.Cli/Commands/GetDirectMessageChannelsCommand.cs

@@ -3,9 +3,8 @@ using System.Threading.Tasks;
 using CliFx;
 using CliFx.Attributes;
 using DiscordChatExporter.Cli.Commands.Base;
-using DiscordChatExporter.Domain.Discord.Models;
-using DiscordChatExporter.Domain.Discord.Models.Common;
-using DiscordChatExporter.Domain.Utilities;
+using DiscordChatExporter.Core.Discord.Data;
+using DiscordChatExporter.Core.Utils.Extensions;
 
 namespace DiscordChatExporter.Cli.Commands
 {
@@ -14,10 +13,14 @@ 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.Name))
-                console.Output.WriteLine($"{channel.Id} | {channel.Category} / {channel.Name}");
+            {
+                await console.Output.WriteLineAsync(
+                    $"{channel.Id} | {channel.Category} / {channel.Name}"
+                );
+            }
         }
     }
 }

DiscordChatExporter.Cli/Commands/GetGuildsCommand.cs

@@ -3,7 +3,7 @@ using System.Threading.Tasks;
 using CliFx;
 using CliFx.Attributes;
 using DiscordChatExporter.Cli.Commands.Base;
-using DiscordChatExporter.Domain.Utilities;
+using DiscordChatExporter.Core.Utils.Extensions;
 
 namespace DiscordChatExporter.Cli.Commands
 {
@@ -12,10 +12,14 @@ 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}");
+            {
+                await console.Output.WriteLineAsync(
+                    $"{guild.Id} | {guild.Name}"
+                );
+            }
         }
     }
 }

DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj

@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\DiscordChatExporter.Domain\DiscordChatExporter.Domain.csproj" />
+    <ProjectReference Include="..\DiscordChatExporter.Core\DiscordChatExporter.Core.csproj" />
   </ItemGroup>
 
 </Project>

DiscordChatExporter.Core/Discord/AuthToken.cs

@@ -1,6 +1,6 @@
 using System.Net.Http.Headers;
 
-namespace DiscordChatExporter.Domain.Discord
+namespace DiscordChatExporter.Core.Discord
 {
     public enum AuthTokenType { User, Bot }
 
@@ -16,7 +16,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)

DiscordChatExporter.Core/Discord/Data/Attachment.cs

@@ -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
@@ -32,7 +32,13 @@ namespace DiscordChatExporter.Domain.Discord.Models
 
         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;

DiscordChatExporter.Core/Discord/Data/Channel.cs

@@ -1,12 +1,11 @@
-using System;
-using System.Linq;
+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;
 using Tyrrrz.Extensions;
 
-namespace DiscordChatExporter.Domain.Discord.Models
+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.
@@ -22,7 +21,7 @@ namespace DiscordChatExporter.Domain.Discord.Models
     }
 
     // https://discord.com/developers/docs/resources/channel#channel-object
-    public partial class Channel : IHasIdAndPosition
+    public partial class Channel : IHasId, IHasPosition
     {
         public Snowflake Id { get; }
 
@@ -45,12 +44,19 @@ namespace DiscordChatExporter.Domain.Discord.Models
 
         public string? Topic { get; }
 
-        public Channel(Snowflake id, ChannelType type, Snowflake guildId, ChannelCategory? category, string name, int? position, string? topic)
+        public Channel(
+            Snowflake id,
+            ChannelType type,
+            Snowflake guildId,
+            ChannelCategory? category,
+            string name,
+            int? position,
+            string? topic)
         {
             Id = id;
             Type = type;
             GuildId = guildId;
-            Category = category ?? GetDefaultCategory(type);
+            Category = category ?? GetFallbackCategory(type);
             Name = name;
             Position = position;
             Topic = topic;
@@ -62,7 +68,7 @@ namespace DiscordChatExporter.Domain.Discord.Models
 
     public partial class Channel
     {
-        private static ChannelCategory GetDefaultCategory(ChannelType channelType) => new(
+        private static ChannelCategory GetFallbackCategory(ChannelType channelType) => new(
             Snowflake.Zero,
             channelType switch
             {
@@ -95,7 +101,7 @@ namespace DiscordChatExporter.Domain.Discord.Models
                 id,
                 type,
                 guildId ?? Guild.DirectMessages.Id,
-                category ?? GetDefaultCategory(type),
+                category ?? GetFallbackCategory(type),
                 name,
                 position,
                 topic

DiscordChatExporter.Core/Discord/Data/ChannelCategory.cs

@@ -1,14 +1,13 @@
-using System;
-using System.Linq;
+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;
 using Tyrrrz.Extensions;
 
-namespace DiscordChatExporter.Domain.Discord.Models
+namespace DiscordChatExporter.Core.Discord.Data
 {
-    public partial class ChannelCategory : IHasIdAndPosition
+    public partial class ChannelCategory : IHasId, IHasPosition
     {
         public Snowflake Id { get; }
 
@@ -45,6 +44,6 @@ namespace DiscordChatExporter.Domain.Discord.Models
             );
         }
 
-        public static ChannelCategory Empty { get; } = new(Snowflake.Zero, "Missing", 0);
+        public static ChannelCategory Empty { get; } = new(Snowflake.Zero, "<unknown category>", 0);
     }
 }

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

@@ -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

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

@@ -1,4 +1,4 @@
-namespace DiscordChatExporter.Domain.Discord.Models.Common
+namespace DiscordChatExporter.Core.Discord.Data.Common
 {
     public interface IHasId
     {

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

@@ -0,0 +1,7 @@
+namespace DiscordChatExporter.Core.Discord.Data.Common
+{
+    public interface IHasPosition
+    {
+        int? Position { get; }
+    }
+}

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

@@ -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>
     {

DiscordChatExporter.Core/Discord/Data/Embed.cs

@@ -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

DiscordChatExporter.Core/Discord/Data/EmbedAuthor.cs

@@ -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

DiscordChatExporter.Core/Discord/Data/EmbedField.cs

@@ -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

DiscordChatExporter.Core/Discord/Data/EmbedFooter.cs

@@ -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

DiscordChatExporter.Core/Discord/Data/EmbedImage.cs

@@ -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-image-structure
     public partial class EmbedImage

DiscordChatExporter.Core/Discord/Data/Emoji.cs

@@ -5,7 +5,7 @@ using System.Text.Json;
 using JsonExtensions.Reading;
 using Tyrrrz.Extensions;
 
-namespace DiscordChatExporter.Domain.Discord.Models
+namespace DiscordChatExporter.Core.Discord.Data
 {
     // https://discord.com/developers/docs/resources/emoji#emoji-object
     public partial class Emoji

DiscordChatExporter.Core/Discord/Data/Guild.cs

@@ -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";

DiscordChatExporter.Core/Discord/Data/Member.cs

@@ -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
@@ -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,
+            null,
+            Array.Empty<Snowflake>()
+        );
 
         public static Member Parse(JsonElement json)
         {

DiscordChatExporter.Core/Discord/Data/Message.cs

@@ -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

DiscordChatExporter.Core/Discord/Data/MessageReference.cs

@@ -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

DiscordChatExporter.Core/Discord/Data/Reaction.cs

@@ -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

DiscordChatExporter.Core/Discord/Data/Role.cs

@@ -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;

DiscordChatExporter.Core/Discord/Data/User.cs

@@ -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
@@ -21,7 +21,12 @@ namespace DiscordChatExporter.Domain.Discord.Models
 
         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;

DiscordChatExporter.Core/Discord/DiscordClient.cs

@@ -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
     {
@@ -34,7 +34,7 @@ namespace DiscordChatExporter.Domain.Discord
             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);
             });
@@ -120,7 +120,8 @@ namespace DiscordChatExporter.Domain.Discord
                 var orderedResponse = response
                     .EnumerateArray()
                     .OrderBy(j => j.GetProperty("position").GetInt32())
-                    .ThenBy(j => ulong.Parse(j.GetProperty("id").GetString()));
+                    .ThenBy(j => ulong.Parse(j.GetProperty("id").GetString()))
+                    .ToArray();
 
                 var categories = orderedResponse
                     .Where(j => j.GetProperty("type").GetInt32() == (int)ChannelType.GuildCategory)

DiscordChatExporter.Core/Discord/Snowflake.cs

@@ -2,7 +2,7 @@
 using System.Globalization;
 using System.Text.RegularExpressions;
 
-namespace DiscordChatExporter.Domain.Discord
+namespace DiscordChatExporter.Core.Discord
 {
     public readonly partial struct Snowflake
     {
@@ -32,7 +32,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);

DiscordChatExporter.Core/Exceptions/DiscordChatExporterException.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Net.Http;
 
-namespace DiscordChatExporter.Domain.Exceptions
+namespace DiscordChatExporter.Core.Exceptions
 {
     public partial class DiscordChatExporterException : Exception
     {

DiscordChatExporter.Core/Exporting/ChannelExporter.cs

@@ -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
     {

DiscordChatExporter.Core/Exporting/ExportContext.cs

@@ -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
     {

DiscordChatExporter.Core/Exporting/ExportFormat.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace DiscordChatExporter.Domain.Exporting
+namespace DiscordChatExporter.Core.Exporting
 {
     public enum ExportFormat
     {

DiscordChatExporter.Core/Exporting/ExportRequest.cs

@@ -2,11 +2,11 @@
 using System.IO;
 using System.Text;
 using System.Text.RegularExpressions;
-using DiscordChatExporter.Domain.Discord;
-using DiscordChatExporter.Domain.Discord.Models;
-using DiscordChatExporter.Domain.Internal;
+using DiscordChatExporter.Core.Discord;
+using DiscordChatExporter.Core.Discord.Data;
+using DiscordChatExporter.Core.Utils;
 
-namespace DiscordChatExporter.Domain.Exporting
+namespace DiscordChatExporter.Core.Exporting
 {
     public partial class ExportRequest
     {

DiscordChatExporter.Core/Exporting/MediaDownloader.cs

@@ -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
     {

DiscordChatExporter.Core/Exporting/MessageExporter.cs

@@ -1,10 +1,10 @@
 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
     {

DiscordChatExporter.Core/Exporting/Writers/CsvMessageWriter.cs

@@ -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
     {

DiscordChatExporter.Core/Exporting/Writers/Html/LayoutTemplateContext.cs

@@ -1,4 +1,4 @@
-namespace DiscordChatExporter.Domain.Exporting.Writers.Html
+namespace DiscordChatExporter.Core.Exporting.Writers.Html
 {
     internal class LayoutTemplateContext
     {

DiscordChatExporter.Core/Exporting/Writers/Html/MessageGroup.cs

@@ -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

DiscordChatExporter.Core/Exporting/Writers/Html/MessageGroupTemplate.cshtml

@@ -1,8 +1,8 @@
 @using System
 @using System.Linq
 @using System.Threading.Tasks
-@namespace DiscordChatExporter.Domain.Exporting.Writers.Html
-@inherits MiniRazor.TemplateBase<DiscordChatExporter.Domain.Exporting.Writers.Html.MessageGroupTemplateContext>
+@namespace DiscordChatExporter.Core.Exporting.Writers.Html
+@inherits MiniRazor.TemplateBase<DiscordChatExporter.Core.Exporting.Writers.Html.MessageGroupTemplateContext>
 
 @{
     string FormatDate(DateTimeOffset date) => Model.ExportContext.FormatDate(date);

DiscordChatExporter.Core/Exporting/Writers/Html/MessageGroupTemplateContext.cs

@@ -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
     {

DiscordChatExporter.Core/Exporting/Writers/Html/PostambleTemplate.cshtml

@@ -0,0 +1,12 @@
+@namespace DiscordChatExporter.Core.Exporting.Writers.Html
+@inherits MiniRazor.TemplateBase<DiscordChatExporter.Core.Exporting.Writers.Html.LayoutTemplateContext>
+
+</div>
+
+<div class="postamble">
+    <div class="postamble__entry">Exported @Model.MessageCount.ToString("N0") message(s)</div>
+</div>
+
+</body>
+
+</html>

DiscordChatExporter.Core/Exporting/Writers/Html/PreambleTemplate.cshtml

@@ -1,15 +1,15 @@
 @using System
 @using System.Threading.Tasks
 @using Tyrrrz.Extensions
-@namespace DiscordChatExporter.Domain.Exporting.Writers.Html
-@inherits MiniRazor.TemplateBase<DiscordChatExporter.Domain.Exporting.Writers.Html.LayoutTemplateContext>
+@namespace DiscordChatExporter.Core.Exporting.Writers.Html
+@inherits MiniRazor.TemplateBase<DiscordChatExporter.Core.Exporting.Writers.Html.LayoutTemplateContext>
 
 @{
     string FormatDate(DateTimeOffset date) => Model.ExportContext.FormatDate(date);
 
     ValueTask<string> ResolveUrlAsync(string url) => Model.ExportContext.ResolveMediaUrlAsync(url);
 
-    string GetStyleSheet(string name) => Model.GetType().Assembly.GetManifestResourceString($"DiscordChatExporter.Domain.Exporting.Writers.Html.{name}.css");
+    string GetStyleSheet(string name) => Model.GetType().Assembly.GetManifestResourceString($"DiscordChatExporter.Core.Exporting.Writers.Html.{name}.css");
 }
 
 <!DOCTYPE html>

DiscordChatExporter.Core/Exporting/Writers/HtmlMessageWriter.cs

@@ -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
     {

DiscordChatExporter.Core/Exporting/Writers/JsonMessageWriter.cs

@@ -1,13 +1,13 @@
 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
     {

DiscordChatExporter.Core/Exporting/Writers/MarkdownVisitors/HtmlMarkdownVisitor.cs

@@ -3,13 +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.Domain.Utilities;
+using DiscordChatExporter.Core.Discord;
+using DiscordChatExporter.Core.Discord.Data;
+using DiscordChatExporter.Core.Markdown;
+using DiscordChatExporter.Core.Markdown.Ast;
+using DiscordChatExporter.Core.Utils.Extensions;
 
-namespace DiscordChatExporter.Domain.Exporting.Writers.MarkdownVisitors
+namespace DiscordChatExporter.Core.Exporting.Writers.MarkdownVisitors
 {
     internal partial class HtmlMarkdownVisitor : MarkdownVisitor
     {

DiscordChatExporter.Core/Exporting/Writers/MarkdownVisitors/PlainTextMarkdownVisitor.cs

@@ -1,10 +1,10 @@
 using System.Text;
-using DiscordChatExporter.Domain.Discord;
-using DiscordChatExporter.Domain.Markdown;
-using DiscordChatExporter.Domain.Markdown.Ast;
-using DiscordChatExporter.Domain.Utilities;
+using DiscordChatExporter.Core.Discord;
+using DiscordChatExporter.Core.Markdown;
+using DiscordChatExporter.Core.Markdown.Ast;
+using DiscordChatExporter.Core.Utils.Extensions;
 
-namespace DiscordChatExporter.Domain.Exporting.Writers.MarkdownVisitors
+namespace DiscordChatExporter.Core.Exporting.Writers.MarkdownVisitors
 {
     internal partial class PlainTextMarkdownVisitor : MarkdownVisitor
     {

DiscordChatExporter.Core/Exporting/Writers/MessageWriter.cs

@@ -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
     {

DiscordChatExporter.Core/Exporting/Writers/PlainTextMessageWriter.cs

@@ -2,11 +2,11 @@
 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
     {

DiscordChatExporter.Core/Markdown/Ast/EmojiNode.cs

@@ -1,4 +1,4 @@
-namespace DiscordChatExporter.Domain.Markdown.Ast
+namespace DiscordChatExporter.Core.Markdown.Ast
 {
     internal class EmojiNode : MarkdownNode
     {

DiscordChatExporter.Core/Markdown/Ast/FormattedNode.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace DiscordChatExporter.Domain.Markdown.Ast
+namespace DiscordChatExporter.Core.Markdown.Ast
 {
     internal enum TextFormatting
     {

DiscordChatExporter.Core/Markdown/Ast/InlineCodeBlockNode.cs

@@ -1,4 +1,4 @@
-namespace DiscordChatExporter.Domain.Markdown.Ast
+namespace DiscordChatExporter.Core.Markdown.Ast
 {
     internal class InlineCodeBlockNode : MarkdownNode
     {

DiscordChatExporter.Core/Markdown/Ast/LinkNode.cs

@@ -1,4 +1,4 @@
-namespace DiscordChatExporter.Domain.Markdown.Ast
+namespace DiscordChatExporter.Core.Markdown.Ast
 {
     internal class LinkNode : MarkdownNode
     {

DiscordChatExporter.Core/Markdown/Ast/MarkdownNode.cs

@@ -1,4 +1,4 @@
-namespace DiscordChatExporter.Domain.Markdown.Ast
+namespace DiscordChatExporter.Core.Markdown.Ast
 {
     internal abstract class MarkdownNode
     {

DiscordChatExporter.Core/Markdown/Ast/MentionNode.cs

@@ -1,4 +1,4 @@
-namespace DiscordChatExporter.Domain.Markdown.Ast
+namespace DiscordChatExporter.Core.Markdown.Ast
 {
     internal enum MentionType
     {

DiscordChatExporter.Core/Markdown/Ast/MultiLineCodeBlockNode.cs

@@ -1,4 +1,4 @@
-namespace DiscordChatExporter.Domain.Markdown.Ast
+namespace DiscordChatExporter.Core.Markdown.Ast
 {
     internal class MultiLineCodeBlockNode : MarkdownNode
     {

DiscordChatExporter.Core/Markdown/Ast/TextNode.cs

@@ -1,4 +1,4 @@
-namespace DiscordChatExporter.Domain.Markdown.Ast
+namespace DiscordChatExporter.Core.Markdown.Ast
 {
     internal class TextNode : MarkdownNode
     {

DiscordChatExporter.Core/Markdown/MarkdownParser.cs

@@ -1,10 +1,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
-using DiscordChatExporter.Domain.Markdown.Ast;
-using DiscordChatExporter.Domain.Markdown.Matching;
+using DiscordChatExporter.Core.Markdown.Ast;
+using DiscordChatExporter.Core.Markdown.Matching;
 
-namespace DiscordChatExporter.Domain.Markdown
+namespace DiscordChatExporter.Core.Markdown
 {
     // The following parsing logic is meant to replicate Discord's markdown grammar as close as possible
     internal static partial class MarkdownParser

DiscordChatExporter.Core/Markdown/MarkdownVisitor.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
-using DiscordChatExporter.Domain.Markdown.Ast;
+using DiscordChatExporter.Core.Markdown.Ast;
 
-namespace DiscordChatExporter.Domain.Markdown
+namespace DiscordChatExporter.Core.Markdown
 {
     internal abstract class MarkdownVisitor
     {

DiscordChatExporter.Core/Markdown/Matching/AggregateMatcher.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace DiscordChatExporter.Domain.Markdown.Matching
+namespace DiscordChatExporter.Core.Markdown.Matching
 {
     internal class AggregateMatcher<T> : IMatcher<T>
     {

DiscordChatExporter.Core/Markdown/Matching/IMatcher.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace DiscordChatExporter.Domain.Markdown.Matching
+namespace DiscordChatExporter.Core.Markdown.Matching
 {
     internal interface IMatcher<T>
     {

DiscordChatExporter.Core/Markdown/Matching/ParsedMatch.cs

@@ -1,4 +1,4 @@
-namespace DiscordChatExporter.Domain.Markdown.Matching
+namespace DiscordChatExporter.Core.Markdown.Matching
 {
     internal class ParsedMatch<T>
     {

DiscordChatExporter.Core/Markdown/Matching/RegexMatcher.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Text.RegularExpressions;
 
-namespace DiscordChatExporter.Domain.Markdown.Matching
+namespace DiscordChatExporter.Core.Markdown.Matching
 {
     internal class RegexMatcher<T> : IMatcher<T>
     {

DiscordChatExporter.Core/Markdown/Matching/StringMatcher.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace DiscordChatExporter.Domain.Markdown.Matching
+namespace DiscordChatExporter.Core.Markdown.Matching
 {
     internal class StringMatcher<T> : IMatcher<T>
     {

DiscordChatExporter.Core/Markdown/Matching/StringPart.cs

@@ -1,6 +1,6 @@
 using System.Text.RegularExpressions;
 
-namespace DiscordChatExporter.Domain.Markdown.Matching
+namespace DiscordChatExporter.Core.Markdown.Matching
 {
     internal readonly struct StringPart
     {

DiscordChatExporter.Core/Utils/Extensions/AsyncExtensions.cs

@@ -5,7 +5,7 @@ using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace DiscordChatExporter.Domain.Utilities
+namespace DiscordChatExporter.Core.Utils.Extensions
 {
     public static class AsyncExtensions
     {

DiscordChatExporter.Core/Utils/Extensions/BinaryExtensions.cs

@@ -1,8 +1,8 @@
 using System.Text;
 
-namespace DiscordChatExporter.Domain.Internal.Extensions
+namespace DiscordChatExporter.Core.Utils.Extensions
 {
-    internal static class BinaryExtensions
+    public static class BinaryExtensions
     {
         public static string ToHex(this byte[] data)
         {

DiscordChatExporter.Core/Utils/Extensions/ColorExtensions.cs

@@ -1,8 +1,8 @@
 using System.Drawing;
 
-namespace DiscordChatExporter.Domain.Internal.Extensions
+namespace DiscordChatExporter.Core.Utils.Extensions
 {
-    internal static class ColorExtensions
+    public static class ColorExtensions
     {
         public static Color WithAlpha(this Color color, int alpha) => Color.FromArgb(alpha, color);
 

DiscordChatExporter.Core/Utils/Extensions/DateExtensions.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Globalization;
 
-namespace DiscordChatExporter.Domain.Internal.Extensions
+namespace DiscordChatExporter.Core.Utils.Extensions
 {
-    internal static class DateExtensions
+    public static class DateExtensions
     {
         public static string ToLocalString(this DateTimeOffset dateTime, string format) =>
             dateTime.ToLocalTime().ToString(format, CultureInfo.InvariantCulture);

DiscordChatExporter.Core/Utils/Extensions/GenericExtensions.cs

@@ -1,9 +1,11 @@
 using System;
 
-namespace DiscordChatExporter.Domain.Internal.Extensions
+namespace DiscordChatExporter.Core.Utils.Extensions
 {
-    internal static class GenericExtensions
+    public static class GenericExtensions
     {
+        public static TOut Pipe<TIn, TOut>(this TIn input, Func<TIn, TOut> transform) => transform(input);
+
         public static T? NullIf<T>(this T value, Func<T, bool> predicate) where T : struct =>
             !predicate(value)
                 ? value

DiscordChatExporter.Core/Utils/Extensions/HttpExtensions.cs

@@ -1,8 +1,8 @@
 using System.Net.Http.Headers;
 
-namespace DiscordChatExporter.Domain.Internal.Extensions
+namespace DiscordChatExporter.Core.Utils.Extensions
 {
-    internal static class HttpExtensions
+    public static class HttpExtensions
     {
         public static string? TryGetValue(this HttpContentHeaders headers, string name) =>
             headers.TryGetValues(name, out var values)

DiscordChatExporter.Core/Utils/Extensions/StringExtensions.cs

@@ -1,8 +1,8 @@
 using System.Text;
 
-namespace DiscordChatExporter.Domain.Internal.Extensions
+namespace DiscordChatExporter.Core.Utils.Extensions
 {
-    internal static class StringExtensions
+    public static class StringExtensions
     {
         public static string Truncate(this string str, int charCount) =>
             str.Length > charCount

DiscordChatExporter.Core/Utils/Http.cs

@@ -7,9 +7,9 @@ using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Polly;
 
-namespace DiscordChatExporter.Domain.Internal
+namespace DiscordChatExporter.Core.Utils
 {
-    internal static class Http
+    public static class Http
     {
         public static HttpClient Client { get; } = new();
 

DiscordChatExporter.Core/Utils/PathEx.cs

@@ -1,9 +1,9 @@
 using System.IO;
 using System.Text;
 
-namespace DiscordChatExporter.Domain.Internal
+namespace DiscordChatExporter.Core.Utils
 {
-    internal static class PathEx
+    public static class PathEx
     {
         public static StringBuilder EscapePath(StringBuilder pathBuffer)
         {

DiscordChatExporter.Core/Utils/UrlBuilder.cs

@@ -4,9 +4,9 @@ using System.Linq;
 using System.Net;
 using System.Text;
 
-namespace DiscordChatExporter.Domain.Internal
+namespace DiscordChatExporter.Core.Utils
 {
-    internal class UrlBuilder
+    public class UrlBuilder
     {
         private string _path = "";
 

DiscordChatExporter.Domain/Discord/Models/Common/IHasIdAndPosition.cs

@@ -1,7 +0,0 @@
-namespace DiscordChatExporter.Domain.Discord.Models.Common
-{
-    public interface IHasIdAndPosition : IHasId
-    {
-        int? Position { get; }
-    }
-}

DiscordChatExporter.Domain/Discord/Models/Common/PositionBasedComparer.cs

@@ -1,22 +0,0 @@
-using System.Collections.Generic;
-
-namespace DiscordChatExporter.Domain.Discord.Models.Common
-{
-    public partial class PositionBasedComparer : IComparer<IHasIdAndPosition>
-    {
-        public int Compare(IHasIdAndPosition? x, IHasIdAndPosition? y)
-        {
-            int result = Comparer<int?>.Default.Compare(x?.Position, y?.Position);
-            if (result == 0)
-            {
-                result = Comparer<ulong?>.Default.Compare(x?.Id.Value, y?.Id.Value);
-            }
-            return result;
-        }
-    }
-
-    public partial class PositionBasedComparer
-    {
-        public static PositionBasedComparer Instance { get; } = new();
-    }
-}

DiscordChatExporter.Domain/Exporting/Writers/Html/PostambleTemplate.cshtml

@@ -1,12 +0,0 @@
-@namespace DiscordChatExporter.Domain.Exporting.Writers.Html
-@inherits MiniRazor.TemplateBase<DiscordChatExporter.Domain.Exporting.Writers.Html.LayoutTemplateContext>
-
-</div>
-
-<div class="postamble">
-    <div class="postamble__entry">Exported @Model.MessageCount.ToString("N0") message(s)</div>
-</div>
-
-</body>
-
-</html>

DiscordChatExporter.Domain/Utilities/GeneralExtensions.cs

@@ -1,9 +0,0 @@
-using System;
-
-namespace DiscordChatExporter.Domain.Utilities
-{
-    public static class GeneralExtensions
-    {
-        public static TOut Pipe<TIn, TOut>(this TIn input, Func<TIn, TOut> transform) => transform(input);
-    }
-}

DiscordChatExporter.Gui/App.xaml.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Reflection;
-using DiscordChatExporter.Gui.Internal;
+using DiscordChatExporter.Gui.Utils;
 using MaterialDesignThemes.Wpf;
 
 namespace DiscordChatExporter.Gui

DiscordChatExporter.Gui/Behaviors/ChannelMultiSelectionListBoxBehavior.cs

@@ -1,4 +1,4 @@
-using DiscordChatExporter.Domain.Discord.Models;
+using DiscordChatExporter.Core.Discord.Data;
 
 namespace DiscordChatExporter.Gui.Behaviors
 {

DiscordChatExporter.Gui/Converters/ExportFormatToStringConverter.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Globalization;
 using System.Windows.Data;
-using DiscordChatExporter.Domain.Exporting;
+using DiscordChatExporter.Core.Exporting;
 
 namespace DiscordChatExporter.Gui.Converters
 {

DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj

@@ -25,7 +25,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\DiscordChatExporter.Domain\DiscordChatExporter.Domain.csproj" />
+    <ProjectReference Include="..\DiscordChatExporter.Core\DiscordChatExporter.Core.csproj" />
   </ItemGroup>
 
   <Target Name="Format XAML" AfterTargets="BeforeBuild">

DiscordChatExporter.Gui/Services/SettingsService.cs

@@ -1,5 +1,5 @@
-using DiscordChatExporter.Domain.Discord;
-using DiscordChatExporter.Domain.Exporting;
+using DiscordChatExporter.Core.Discord;
+using DiscordChatExporter.Core.Exporting;
 using Tyrrrz.Settings;
 
 namespace DiscordChatExporter.Gui.Services

DiscordChatExporter.Gui/Utils/MediaColor.cs

@@ -1,6 +1,6 @@
 using System.Windows.Media;
 
-namespace DiscordChatExporter.Gui.Internal
+namespace DiscordChatExporter.Gui.Utils
 {
     internal static class MediaColor
     {

DiscordChatExporter.Gui/Utils/ProcessEx.cs

@@ -1,6 +1,6 @@
 using System.Diagnostics;
 
-namespace DiscordChatExporter.Gui.Internal
+namespace DiscordChatExporter.Gui.Utils
 {
     internal static class ProcessEx
     {

DiscordChatExporter.Gui/ViewModels/Dialogs/ExportSetupViewModel.cs

@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using DiscordChatExporter.Domain.Discord;
-using DiscordChatExporter.Domain.Discord.Models;
-using DiscordChatExporter.Domain.Exporting;
-using DiscordChatExporter.Domain.Utilities;
+using DiscordChatExporter.Core.Discord;
+using DiscordChatExporter.Core.Discord.Data;
+using DiscordChatExporter.Core.Exporting;
+using DiscordChatExporter.Core.Utils.Extensions;
 using DiscordChatExporter.Gui.Services;
 using DiscordChatExporter.Gui.ViewModels.Framework;
 

DiscordChatExporter.Gui/ViewModels/RootViewModel.cs

@@ -3,13 +3,13 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using DiscordChatExporter.Domain.Discord;
-using DiscordChatExporter.Domain.Discord.Models;
-using DiscordChatExporter.Domain.Exceptions;
-using DiscordChatExporter.Domain.Exporting;
-using DiscordChatExporter.Domain.Utilities;
-using DiscordChatExporter.Gui.Internal;
+using DiscordChatExporter.Core.Discord;
+using DiscordChatExporter.Core.Discord.Data;
+using DiscordChatExporter.Core.Exceptions;
+using DiscordChatExporter.Core.Exporting;
+using DiscordChatExporter.Core.Utils.Extensions;
 using DiscordChatExporter.Gui.Services;
+using DiscordChatExporter.Gui.Utils;
 using DiscordChatExporter.Gui.ViewModels.Dialogs;
 using DiscordChatExporter.Gui.ViewModels.Framework;
 using Gress;

DiscordChatExporter.sln

@@ -16,7 +16,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscordChatExporter.Gui", "
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DiscordChatExporter.Cli", "DiscordChatExporter.Cli\DiscordChatExporter.Cli.csproj", "{D08624B6-3081-4BCB-91F8-E9832FACC6CE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscordChatExporter.Domain", "DiscordChatExporter.Domain\DiscordChatExporter.Domain.csproj", "{E19980B9-2B84-4257-A517-540FF1E3FCDD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscordChatExporter.Core", "DiscordChatExporter.Core\DiscordChatExporter.Core.csproj", "{E19980B9-2B84-4257-A517-540FF1E3FCDD}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

Dockerfile

@@ -4,7 +4,7 @@ WORKDIR /src
 
 COPY favicon.ico ./
 COPY Directory.Build.props ./
-COPY DiscordChatExporter.Domain DiscordChatExporter.Domain
+COPY DiscordChatExporter.Core DiscordChatExporter.Core
 COPY DiscordChatExporter.Cli DiscordChatExporter.Cli
 
 RUN dotnet publish DiscordChatExporter.Cli -o DiscordChatExporter.Cli/publish -c Release