Refactor more

DiscordChatExporter.Domain/Discord/DiscordClient.Parsing.cs

@@ -3,6 +3,7 @@ using System.Drawing;
 using System.Linq;
 using System.Text.Json;
 using DiscordChatExporter.Domain.Discord.Models;
+using DiscordChatExporter.Domain.Discord.Models.Common;
 using DiscordChatExporter.Domain.Internal;
 using Tyrrrz.Extensions;
 

DiscordChatExporter.Domain/Discord/DiscordClient.cs

@@ -23,8 +23,6 @@ namespace DiscordChatExporter.Domain.Discord
             _token = token;
             _httpClient = httpClient;
 
-            _httpClient.BaseAddress = new Uri("https://discordapp.com/api/v6");
-
             // Discord seems to always respond with 429 on the first request with unreasonable wait time (10+ minutes).
             // For that reason the policy will start respecting their retry-after header only after Nth failed response.
             _httpRequestPolicy = Policy
@@ -53,7 +51,9 @@ namespace DiscordChatExporter.Domain.Discord
         {
             using var response = await _httpRequestPolicy.ExecuteAsync(async () =>
             {
-                using var request = new HttpRequestMessage(HttpMethod.Get, url);
+                var uri = new Uri(new Uri("https://discordapp.com/api/v6"), url);
+
+                using var request = new HttpRequestMessage(HttpMethod.Get, uri);
                 request.Headers.Authorization = _token.GetAuthenticationHeader();
 
                 return await _httpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead);

DiscordChatExporter.Domain/Discord/Models/Attachment.cs

@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using System.Linq;
+using DiscordChatExporter.Domain.Discord.Models.Common;
 
 namespace DiscordChatExporter.Domain.Discord.Models
 {

DiscordChatExporter.Domain/Discord/Models/Channel.cs

@@ -1,4 +1,6 @@
-namespace DiscordChatExporter.Domain.Discord.Models
+using DiscordChatExporter.Domain.Discord.Models.Common;
+
+namespace DiscordChatExporter.Domain.Discord.Models
 {
     // https://discordapp.com/developers/docs/resources/channel#channel-object-channel-types
     // Order of enum fields needs to match the order in the docs.

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

@@ -1,6 +1,6 @@
 using System;
 
-namespace DiscordChatExporter.Domain.Discord.Models
+namespace DiscordChatExporter.Domain.Discord.Models.Common
 {
     // Loosely based on https://github.com/omar/ByteSize (MIT license)
 

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

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

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

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace DiscordChatExporter.Domain.Discord.Models
+namespace DiscordChatExporter.Domain.Discord.Models.Common
 {
     public partial class IdBasedEqualityComparer : IEqualityComparer<IHasId>
     {

DiscordChatExporter.Domain/Discord/Models/Guild.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using DiscordChatExporter.Domain.Discord.Models.Common;
 using DiscordChatExporter.Domain.Internal;
 
 namespace DiscordChatExporter.Domain.Discord.Models

DiscordChatExporter.Domain/Discord/Models/Message.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using DiscordChatExporter.Domain.Discord.Models.Common;
 
 namespace DiscordChatExporter.Domain.Discord.Models
 {

DiscordChatExporter.Domain/Discord/Models/Role.cs

@@ -1,4 +1,5 @@
 using System.Drawing;
+using DiscordChatExporter.Domain.Discord.Models.Common;
 
 namespace DiscordChatExporter.Domain.Discord.Models
 {

DiscordChatExporter.Domain/Discord/Models/User.cs

@@ -1,4 +1,5 @@
 using System;
+using DiscordChatExporter.Domain.Discord.Models.Common;
 
 namespace DiscordChatExporter.Domain.Discord.Models
 {