Improved abstraction from private channels

Author: Avid29

src/Quarrel.Client/Models/Channels/Abstract/PrivateChannel.cs

@@ -1,14 +1,53 @@
 // Quarrel © 2022
 
 using Discord.API.Models.Json.Channels;
+using Quarrel.Client.Models.Channels.Interfaces;
 
 namespace Quarrel.Client.Models.Channels.Abstract
 {
-    public abstract class PrivateChannel : Channel
+    /// <summary>
+    /// The base class for private channels.
+    /// </summary>
+    public abstract class PrivateChannel : Channel, IPrivateChannel
     {
         internal PrivateChannel(JsonChannel restChannel, QuarrelClient context) :
             base(restChannel, context)
         {
+            LastMessageId = restChannel.LastMessageId;
+            RTCRegion = restChannel.RTCRegion;
+        }
+
+        /// <inheritdoc/>
+        public int? MentionCount { get; private set; }
+
+        /// <inheritdoc/>
+        public ulong? LastMessageId { get; private set; }
+
+        /// <inheritdoc/>
+        public ulong? LastReadMessageId { get; private set; }
+
+        /// <inheritdoc/>
+        public string? RTCRegion { get; private set; }
+
+        /// <inheritdoc/>
+        public bool IsUnread => LastMessageId > LastReadMessageId;
+
+        int? IMessageChannel.MentionCount
+        {
+            get => MentionCount;
+            set => MentionCount = value;
+        }
+
+        ulong? IMessageChannel.LastMessageId
+        {
+            get => LastMessageId;
+            set => LastMessageId = value;
+        }
+
+        ulong? IMessageChannel.LastReadMessageId
+        {
+            get => LastReadMessageId;
+            set => LastReadMessageId = value;
         }
     }
 }

src/Quarrel.Client/Models/Channels/DirectChannel.cs

@@ -20,46 +20,11 @@ internal DirectChannel(JsonChannel restChannel, QuarrelClient context) :
             Guard.IsNotNull(restChannel.Recipients, nameof(restChannel.Recipients));
 
             RecipientId = restChannel.Recipients[0].Id;
-            LastMessageId = restChannel.LastMessageId;
-            RTCRegion = restChannel.RTCRegion;
         }
 
         /// <inheritdoc/>
         public ulong RecipientId { get; private set; }
 
-        /// <inheritdoc/>
-        public int? MentionCount { get; private set; }
-
-        /// <inheritdoc/>
-        public ulong? LastMessageId { get; private set; }
-
-        /// <inheritdoc/>
-        public ulong? LastReadMessageId { get; private set; }
-
-        /// <inheritdoc/>
-        public bool IsUnread => LastMessageId > LastReadMessageId;
-
-        int? IMessageChannel.MentionCount
-        {
-            get => MentionCount;
-            set => MentionCount = value;
-        }
-
-        ulong? IMessageChannel.LastMessageId
-        {
-            get => LastMessageId;
-            set => LastMessageId = value;
-        }
-
-        ulong? IMessageChannel.LastReadMessageId
-        {
-            get => LastReadMessageId;
-            set => LastReadMessageId = value;
-        }
-
-        /// <inheritdoc/>
-        public string? RTCRegion { get; private set; }
-
         /// <summary>
         /// Gets the recipient of the direct message channel.
         /// </summary>

src/Quarrel.Client/Models/Channels/GroupChannel.cs

@@ -23,18 +23,13 @@ internal GroupChannel(JsonChannel restChannel, QuarrelClient context) :
 
             OwnerId = restChannel.OwnerId.Value;
 
-            RTCRegion = restChannel.RTCRegion;
             Recipients = restChannel.Recipients.Select(x => new User(x, context)).ToArray();
             Icon = restChannel.Icon;
-            LastMessageId = restChannel.LastMessageId;
         }
 
         /// <inheritdoc/>
         public ulong OwnerId { get; private set; }
 
-        /// <inheritdoc/>
-        public string? RTCRegion { get; private set; }
-
         /// <inheritdoc/>
         public User[] Recipients { get; private set; }
 
@@ -43,36 +38,6 @@ internal GroupChannel(JsonChannel restChannel, QuarrelClient context) :
 
         IUser[] IGroupChannel.Recipients => Recipients;
 
-        /// <inheritdoc/>
-        public int? MentionCount { get; internal set; }
-
-        /// <inheritdoc/>
-        public ulong? LastMessageId { get; internal set; }
-
-        /// <inheritdoc/>
-        public ulong? LastReadMessageId { get; internal set; }
-
-        /// <inheritdoc/>
-        public bool IsUnread => LastMessageId > LastReadMessageId;
-
-        int? IMessageChannel.MentionCount
-        {
-            get => MentionCount;
-            set => MentionCount = value;
-        }
-
-        ulong? IMessageChannel.LastMessageId
-        {
-            get => LastMessageId;
-            set => LastMessageId = value;
-        }
-
-        ulong? IMessageChannel.LastReadMessageId
-        {
-            get => LastReadMessageId;
-            set => LastReadMessageId = value;
-        }
-
         internal override JsonChannel ToJsonChannel()
         {
             JsonChannel restChannel = base.ToJsonChannel();

src/Quarrel.Client/QuarrelClient.Methods.cs

@@ -32,7 +32,7 @@ public partial class QuarrelClient
             return user;
         }
 
-        public Settings GetSettings()
+        public Settings? GetSettings()
         {
             return _settings;
         }