Merge pull request #588 from UWPCommunity/rewrite/main

Alpha update

Author: Avid29

src/API/Discord.API/Models/Enums/Guilds/ExplicitContentFilterLevel.cs

@@ -0,0 +1,25 @@
+// Quarrel © 2022
+
+namespace Discord.API.Models.Enums.Settings
+{
+    /// <summary>
+    /// The content filter level.
+    /// </summary>
+    public enum ExplicitContentFilterLevel : int
+    {
+        /// <summary>
+        /// Filter content from nobody.
+        /// </summary>
+        None,
+
+        /// <summary>
+        /// Filter content not from my friends
+        /// </summary>
+        Public,
+
+        /// <summary>
+        /// Filter content from everyone.
+        /// </summary>
+        All,
+    }
+}

src/API/Discord.API/Models/Enums/Settings/ExplicitContentFilterLevel.cs

@@ -1,6 +1,7 @@
 // Quarrel © 2022
 
 using Discord.API.Models.Enums.Guilds;
+using Discord.API.Models.Enums.Settings;
 using Discord.API.Models.Json.Channels;
 using Discord.API.Models.Json.Emojis;
 using Discord.API.Models.Json.Roles;

src/API/Discord.API/Models/Json/Guilds/JsonGuild.cs

@@ -0,0 +1,19 @@
+// Quarrel © 2022
+
+using System;
+using System.Text.Json.Serialization;
+
+// JSON models don't need to respect standard nullable rules.
+#pragma warning disable CS8618
+
+namespace Discord.API.Models.Json.Messages
+{
+    internal class JsonCall
+    {
+        [JsonPropertyName("ended_timestamp")]
+        public DateTimeOffset EndedTimestamp { get; set; }
+
+        [JsonPropertyName("participants"), JsonNumberHandling(Constants.ReadWriteAsString)]
+        public ulong[] Participants { get; set; }
+    }
+}

src/API/Discord.API/Models/Json/Messages/JsonCall.cs

@@ -0,0 +1,25 @@
+// Quarrel © 2022
+
+using Discord.API.Models.Enums.Channels;
+using System.Text.Json.Serialization;
+
+// JSON models don't need to respect standard nullable rules.
+#pragma warning disable CS8618
+
+namespace Discord.API.Models.Json.Messages
+{
+    internal class JsonChannelMention
+    {
+        [JsonPropertyName("id")]
+        public ulong Id { get; set; }
+
+        [JsonPropertyName("guild_id")]
+        public ulong GuildId { get; set; }
+
+        [JsonPropertyName("type")]
+        public ChannelType ChannelType { get; set; }
+
+        [JsonPropertyName("name")]
+        public string Name { get; set; }
+    }
+}

src/API/Discord.API/Models/Json/Messages/JsonChannelMention.cs

@@ -1,9 +1,9 @@
 // Quarrel © 2022
 
+using Discord.API.Models.Enums.Messages;
 using Discord.API.Models.Json.Messages.Embeds;
 using Discord.API.Models.Json.Reactions;
 using Discord.API.Models.Json.Users;
-using Discord.API.Models.Enums.Messages;
 using System;
 using System.Text.Json.Serialization;
 
@@ -32,6 +32,9 @@ internal class JsonMessage
         [JsonPropertyName("author")]
         public JsonUser? Author { get; set; }
 
+        [JsonPropertyName("call")]
+        public JsonCall? Call { get; set; }
+
         [JsonPropertyName("member")]
         public JsonGuildMember? Member { get; set; }
 
@@ -56,6 +59,9 @@ internal class JsonMessage
         [JsonPropertyName("mention_roles"), JsonNumberHandling(Constants.ReadWriteAsString)]
         public ulong[]? RoleMentions { get; set; }
 
+        [JsonPropertyName("mention_channels")]
+        public JsonChannelMention[]? ChannelMentions { get; set; }
+
         [JsonPropertyName("attachments")]
         public JsonAttachment[]? Attachments { get; set; }
 

src/API/Discord.API/Models/Json/Messages/JsonMessage.cs

@@ -1,5 +1,6 @@
 // Quarrel © 2022
 
+using Discord.API.Models.Enums.Settings;
 using System.Text.Json.Serialization;
 
 // JSON models don't need to respect standard nullable rules.
@@ -48,5 +49,7 @@ internal class JsonUserSettings
         [JsonPropertyName("guild_folders")]
         public JsonGuildFolder[] GuildFolders { get; set; }
 
+        [JsonPropertyName("explicit_content_filter")]
+        public ExplicitContentFilterLevel ExplicitContentFilter { get; set; }
     }
 }

src/API/Discord.API/Models/Json/Settings/JsonUserSettings.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/Abstract/PrivateChannel.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/DirectChannel.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();