More namespace refactoring

DiscordChatExporter.Cli.Tests/Specs/CsvContentSpecs.cs

@@ -4,13 +4,13 @@ using DiscordChatExporter.Cli.Tests.TestData;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.Csv;
+namespace DiscordChatExporter.Cli.Tests.Specs;
 
-public class ContentSpecs : IClassFixture<ExportWrapperFixture>
+public class CsvContentSpecs : IClassFixture<ExportWrapperFixture>
 {
     private readonly ExportWrapperFixture _exportWrapper;
 
-    public ContentSpecs(ExportWrapperFixture exportWrapper)
+    public CsvContentSpecs(ExportWrapperFixture exportWrapper)
     {
         _exportWrapper = exportWrapper;
     }

DiscordChatExporter.Cli.Tests/Specs/HtmlAttachmentSpecs.cs

@@ -7,13 +7,13 @@ using DiscordChatExporter.Core.Discord;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.Html;
+namespace DiscordChatExporter.Cli.Tests.Specs;
 
-public class AttachmentSpecs : IClassFixture<ExportWrapperFixture>
+public class HtmlAttachmentSpecs : IClassFixture<ExportWrapperFixture>
 {
     private readonly ExportWrapperFixture _exportWrapper;
 
-    public AttachmentSpecs(ExportWrapperFixture exportWrapper)
+    public HtmlAttachmentSpecs(ExportWrapperFixture exportWrapper)
     {
         _exportWrapper = exportWrapper;
     }

DiscordChatExporter.Cli.Tests/Specs/HtmlContentSpecs.cs

@@ -6,13 +6,13 @@ using DiscordChatExporter.Cli.Tests.TestData;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.Html;
+namespace DiscordChatExporter.Cli.Tests.Specs;
 
-public class ContentSpecs : IClassFixture<ExportWrapperFixture>
+public class HtmlContentSpecs : IClassFixture<ExportWrapperFixture>
 {
     private readonly ExportWrapperFixture _exportWrapper;
 
-    public ContentSpecs(ExportWrapperFixture exportWrapper)
+    public HtmlContentSpecs(ExportWrapperFixture exportWrapper)
     {
         _exportWrapper = exportWrapper;
     }

DiscordChatExporter.Cli.Tests/Specs/HtmlEmbedSpecs.cs

@@ -7,13 +7,13 @@ using DiscordChatExporter.Core.Discord;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.Html;
+namespace DiscordChatExporter.Cli.Tests.Specs;
 
-public class EmbedSpecs : IClassFixture<ExportWrapperFixture>
+public class HtmlEmbedSpecs : IClassFixture<ExportWrapperFixture>
 {
     private readonly ExportWrapperFixture _exportWrapper;
 
-    public EmbedSpecs(ExportWrapperFixture exportWrapper)
+    public HtmlEmbedSpecs(ExportWrapperFixture exportWrapper)
     {
         _exportWrapper = exportWrapper;
     }

DiscordChatExporter.Cli.Tests/Specs/HtmlGroupingSpecs.cs

@@ -11,13 +11,13 @@ using DiscordChatExporter.Core.Exporting;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.Html;
+namespace DiscordChatExporter.Cli.Tests.Specs;
 
-public class GroupingSpecs : IClassFixture<TempOutputFixture>
+public class HtmlGroupingSpecs : IClassFixture<TempOutputFixture>
 {
     private readonly TempOutputFixture _tempOutput;
 
-    public GroupingSpecs(TempOutputFixture tempOutput)
+    public HtmlGroupingSpecs(TempOutputFixture tempOutput)
     {
         _tempOutput = tempOutput;
     }

DiscordChatExporter.Cli.Tests/Specs/HtmlMentionSpecs.cs

@@ -6,13 +6,13 @@ using DiscordChatExporter.Core.Discord;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.Html;
+namespace DiscordChatExporter.Cli.Tests.Specs;
 
-public class MentionSpecs : IClassFixture<ExportWrapperFixture>
+public class HtmlMentionSpecs : IClassFixture<ExportWrapperFixture>
 {
     private readonly ExportWrapperFixture _exportWrapper;
 
-    public MentionSpecs(ExportWrapperFixture exportWrapper)
+    public HtmlMentionSpecs(ExportWrapperFixture exportWrapper)
     {
         _exportWrapper = exportWrapper;
     }

DiscordChatExporter.Cli.Tests/Specs/HtmlReplySpecs.cs

@@ -6,13 +6,13 @@ using DiscordChatExporter.Core.Discord;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.Html;
+namespace DiscordChatExporter.Cli.Tests.Specs;
 
-public class ReplySpecs : IClassFixture<ExportWrapperFixture>
+public class HtmlReplySpecs : IClassFixture<ExportWrapperFixture>
 {
     private readonly ExportWrapperFixture _exportWrapper;
 
-    public ReplySpecs(ExportWrapperFixture exportWrapper)
+    public HtmlReplySpecs(ExportWrapperFixture exportWrapper)
     {
         _exportWrapper = exportWrapper;
     }

DiscordChatExporter.Cli.Tests/Specs/HtmlStickerSpecs.cs

@@ -5,13 +5,13 @@ using DiscordChatExporter.Core.Discord;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.Html;
+namespace DiscordChatExporter.Cli.Tests.Specs;
 
-public class StickerSpecs : IClassFixture<ExportWrapperFixture>
+public class HtmlStickerSpecs : IClassFixture<ExportWrapperFixture>
 {
     private readonly ExportWrapperFixture _exportWrapper;
 
-    public StickerSpecs(ExportWrapperFixture exportWrapper)
+    public HtmlStickerSpecs(ExportWrapperFixture exportWrapper)
     {
         _exportWrapper = exportWrapper;
     }

DiscordChatExporter.Cli.Tests/Specs/JsonAttachmentSpecs.cs

@@ -6,13 +6,13 @@ using DiscordChatExporter.Core.Discord;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.Json;
+namespace DiscordChatExporter.Cli.Tests.Specs;
 
-public class AttachmentSpecs : IClassFixture<ExportWrapperFixture>
+public class JsonAttachmentSpecs : IClassFixture<ExportWrapperFixture>
 {
     private readonly ExportWrapperFixture _exportWrapper;
 
-    public AttachmentSpecs(ExportWrapperFixture exportWrapper)
+    public JsonAttachmentSpecs(ExportWrapperFixture exportWrapper)
     {
         _exportWrapper = exportWrapper;
     }

DiscordChatExporter.Cli.Tests/Specs/JsonContentSpecs.cs

@@ -5,13 +5,13 @@ using DiscordChatExporter.Cli.Tests.TestData;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.Json;
+namespace DiscordChatExporter.Cli.Tests.Specs;
 
-public class ContentSpecs : IClassFixture<ExportWrapperFixture>
+public class JsonContentSpecs : IClassFixture<ExportWrapperFixture>
 {
     private readonly ExportWrapperFixture _exportWrapper;
 
-    public ContentSpecs(ExportWrapperFixture exportWrapper)
+    public JsonContentSpecs(ExportWrapperFixture exportWrapper)
     {
         _exportWrapper = exportWrapper;
     }

DiscordChatExporter.Cli.Tests/Specs/JsonEmbedSpecs.cs

@@ -6,13 +6,13 @@ using DiscordChatExporter.Core.Discord;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.Json;
+namespace DiscordChatExporter.Cli.Tests.Specs;
 
-public class EmbedSpecs : IClassFixture<ExportWrapperFixture>
+public class JsonEmbedSpecs : IClassFixture<ExportWrapperFixture>
 {
     private readonly ExportWrapperFixture _exportWrapper;
 
-    public EmbedSpecs(ExportWrapperFixture exportWrapper)
+    public JsonEmbedSpecs(ExportWrapperFixture exportWrapper)
     {
         _exportWrapper = exportWrapper;
     }

DiscordChatExporter.Cli.Tests/Specs/JsonMentionSpecs.cs

@@ -6,13 +6,13 @@ using DiscordChatExporter.Core.Discord;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.Json;
+namespace DiscordChatExporter.Cli.Tests.Specs;
 
-public class MentionSpecs : IClassFixture<ExportWrapperFixture>
+public class JsonMentionSpecs : IClassFixture<ExportWrapperFixture>
 {
     private readonly ExportWrapperFixture _exportWrapper;
 
-    public MentionSpecs(ExportWrapperFixture exportWrapper)
+    public JsonMentionSpecs(ExportWrapperFixture exportWrapper)
     {
         _exportWrapper = exportWrapper;
     }

DiscordChatExporter.Cli.Tests/Specs/JsonStickerSpecs.cs

@@ -6,13 +6,13 @@ using DiscordChatExporter.Core.Discord;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.Json;
+namespace DiscordChatExporter.Cli.Tests.Specs;
 
-public class StickerSpecs : IClassFixture<ExportWrapperFixture>
+public class JsonStickerSpecs : IClassFixture<ExportWrapperFixture>
 {
     private readonly ExportWrapperFixture _exportWrapper;
 
-    public StickerSpecs(ExportWrapperFixture exportWrapper)
+    public JsonStickerSpecs(ExportWrapperFixture exportWrapper)
     {
         _exportWrapper = exportWrapper;
     }

DiscordChatExporter.Cli.Tests/Specs/PlainTextContentSpecs.cs

@@ -4,13 +4,13 @@ using DiscordChatExporter.Cli.Tests.TestData;
 using FluentAssertions;
 using Xunit;
 
-namespace DiscordChatExporter.Cli.Tests.Specs.PlainText;
+namespace DiscordChatExporter.Cli.Tests.Specs;
 
-public class ContentSpecs : IClassFixture<ExportWrapperFixture>
+public class PlainTextContentSpecs : IClassFixture<ExportWrapperFixture>
 {
     private readonly ExportWrapperFixture _exportWrapper;
 
-    public ContentSpecs(ExportWrapperFixture exportWrapper)
+    public PlainTextContentSpecs(ExportWrapperFixture exportWrapper)
     {
         _exportWrapper = exportWrapper;
     }

DiscordChatExporter.Core/Discord/Data/Message.cs

@@ -32,7 +32,7 @@ public record Message(
         if (embeds.Count <= 1)
             return embeds;
 
-        // Discord API doesn't support embeds with multiple images, even though the Discord client does.
+        // Discord API doesn't support embeds with multiple images, even though Discord client does.
         // To work around this, it seems that the API returns multiple consecutive embeds with different images,
         // which are then merged together on the client. We need to replicate the same behavior ourselves.
         // Currently, only known case where this workaround is required is Twitter embeds.

DiscordChatExporter.Core/DiscordChatExporter.Core.csproj

@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <RazorBlade Include="Exporting\Html\*.cshtml" />
+    <RazorBlade Include="**\*.cshtml" />
   </ItemGroup>
 
 </Project>

DiscordChatExporter.Core/Exporting/CsvMessageWriter.cs

@@ -4,10 +4,9 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using DiscordChatExporter.Core.Discord.Data;
-using DiscordChatExporter.Core.Exporting.PlainText;
 using DiscordChatExporter.Core.Utils.Extensions;
 
-namespace DiscordChatExporter.Core.Exporting.Csv;
+namespace DiscordChatExporter.Core.Exporting;
 
 internal partial class CsvMessageWriter : MessageWriter
 {

DiscordChatExporter.Core/Exporting/HtmlMarkdownVisitor.cs

@@ -10,7 +10,7 @@ using DiscordChatExporter.Core.Markdown;
 using DiscordChatExporter.Core.Markdown.Parsing;
 using DiscordChatExporter.Core.Utils.Extensions;
 
-namespace DiscordChatExporter.Core.Exporting.Html;
+namespace DiscordChatExporter.Core.Exporting;
 
 internal partial class HtmlMarkdownVisitor : MarkdownVisitor
 {

DiscordChatExporter.Core/Exporting/HtmlMessageExtensions.cs

@@ -2,9 +2,9 @@ using System;
 using DiscordChatExporter.Core.Discord.Data;
 using DiscordChatExporter.Core.Discord.Data.Embeds;
 
-namespace DiscordChatExporter.Core.Exporting.Html;
+namespace DiscordChatExporter.Core.Exporting;
 
-internal static class MessageExtensions
+internal static class HtmlMessageExtensions
 {
     // Message content is hidden if it's a link to an embedded media
     // https://github.com/Tyrrrz/DiscordChatExporter/issues/682

DiscordChatExporter.Core/Exporting/HtmlMessageWriter.cs

@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 using DiscordChatExporter.Core.Discord.Data;
 using WebMarkupMin.Core;
 
-namespace DiscordChatExporter.Core.Exporting.Html;
+namespace DiscordChatExporter.Core.Exporting;
 
 internal class HtmlMessageWriter : MessageWriter
 {

DiscordChatExporter.Core/Exporting/JsonMessageWriter.cs

@@ -5,11 +5,10 @@ using System.Threading;
 using System.Threading.Tasks;
 using DiscordChatExporter.Core.Discord.Data;
 using DiscordChatExporter.Core.Discord.Data.Embeds;
-using DiscordChatExporter.Core.Exporting.PlainText;
 using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Writing;
 
-namespace DiscordChatExporter.Core.Exporting.Json;
+namespace DiscordChatExporter.Core.Exporting;
 
 internal class JsonMessageWriter : MessageWriter
 {

DiscordChatExporter.Core/Exporting/MessageExporter.cs

@@ -3,10 +3,6 @@ using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 using DiscordChatExporter.Core.Discord.Data;
-using DiscordChatExporter.Core.Exporting.Csv;
-using DiscordChatExporter.Core.Exporting.Html;
-using DiscordChatExporter.Core.Exporting.Json;
-using DiscordChatExporter.Core.Exporting.PlainText;
 
 namespace DiscordChatExporter.Core.Exporting;
 

DiscordChatExporter.Core/Exporting/PlainTextMarkdownVisitor.cs

@@ -5,7 +5,7 @@ using DiscordChatExporter.Core.Markdown;
 using DiscordChatExporter.Core.Markdown.Parsing;
 using DiscordChatExporter.Core.Utils.Extensions;
 
-namespace DiscordChatExporter.Core.Exporting.PlainText;
+namespace DiscordChatExporter.Core.Exporting;
 
 internal partial class PlainTextMarkdownVisitor : MarkdownVisitor
 {

DiscordChatExporter.Core/Exporting/PlainTextMessageWriter.cs

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 using DiscordChatExporter.Core.Discord.Data;
 using DiscordChatExporter.Core.Discord.Data.Embeds;
 
-namespace DiscordChatExporter.Core.Exporting.PlainText;
+namespace DiscordChatExporter.Core.Exporting;
 
 internal class PlainTextMessageWriter : MessageWriter
 {