Update Guild and Message Models (#1165)

* Add ExplicitContentFilter property to Guild

* re-order properties to match order listed on api docs

* re-order SystemChannelId to match api docs

* Implement ApplicationId in Guild model

* Add ExplicitContentFilter property to Guild

* re-order properties to match order listed on api docs

* re-order SystemChannelId to match api docs

* Implement ApplicationId in Guild model

* Improve xmldoc for IGuild ExplicitContentFilter

* Update xmldoc

* docs "Id" -> "ID"

* rename Test.GuildPermissions to a more general Test.Guilds

* Add ExplicitContentFilter to GuildProperties

* Add a test for ExplicitContentFilterLevel modification behavior

* Implement ModifyAsync behavior

* simplify ExplicitContentFilter test

* Add RestGuild ApplicationId inheritdoc

* Implement message Activity and Application model update

* RestMessage Application and Activity implementation

* add ToString to MessageApplication

* Add IconUrl property to MessageApplication

* clean up whitespace

* another excessive whitespace removal

src/Discord.Net.Core/Entities/Guilds/ExplicitContentFilterLevel.cs

@@ -0,0 +1,13 @@
+namespace Discord
+{
+    public enum ExplicitContentFilterLevel
+    {
+        /// <summary> No messages will be scanned. </summary>
+        Disabled = 0,
+        /// <summary> Scans messages from all guild members that do not have a role. </summary>
+        /// <remarks> Recommented option for servers that use roles for trusted membership. </remarks>
+        MembersWithoutRoles = 1,
+        /// <summary> Scan messages sent by all guild members. </summary>
+        AllMembers = 2
+    }
+}

src/Discord.Net.Core/Entities/Guilds/GuildProperties.cs

@@ -66,5 +66,9 @@ namespace Discord
         ///     Gets or sets the ID of the owner of this guild.
         /// </summary>
         public Optional<ulong> OwnerId { get; set; }
+        /// <summary>
+        ///     Gets or sets the explicit content filter level of this guild.
+        /// </summary>
+        public Optional<ExplicitContentFilterLevel> ExplicitContentFilter { get; set; }
     }
 }

src/Discord.Net.Core/Entities/Guilds/IGuild.cs

@@ -53,6 +53,13 @@ namespace Discord
         /// </returns>
         VerificationLevel VerificationLevel { get; }
         /// <summary>
+        ///     Gets the level of content filtering applied to user's content in a Guild.
+        /// </summary>
+        /// <returns>
+        ///     The level of explicit content filtering.
+        /// </returns>
+        ExplicitContentFilterLevel ExplicitContentFilter { get; }
+        /// <summary>
         ///     Gets the ID of this guild's icon.
         /// </summary>
         /// <returns>
@@ -141,6 +148,13 @@ namespace Discord
         /// </returns>
         ulong OwnerId { get; }
         /// <summary>
+        ///     Gets the application ID of the guild creator if it is bot-created.
+        /// </summary>
+        /// <returns>
+        ///     A <see cref="ulong"/> representing the snowflake identifier of the application ID that created this guild, or <c>null</c> if it was not bot-created.
+        /// </returns>
+        ulong? ApplicationId { get; }
+        /// <summary>
         ///     Gets the ID of the region hosting this guild's voice channels.
         /// </summary>
         /// <returns>

src/Discord.Net.Core/Entities/Messages/IMessage.cs

@@ -100,5 +100,25 @@ namespace Discord
         ///     A read-only collection of user IDs.
         /// </returns>
         IReadOnlyCollection<ulong> MentionedUserIds { get; }
+        /// <summary>
+        ///     Returns the Activity associated with a message.
+        /// </summary>
+        /// <remarks>
+        ///     Sent with Rich Presence-related chat embeds.
+        /// </remarks>
+        /// <returns>
+        ///     A message's activity, if any is associated.
+        /// </returns>
+        MessageActivity Activity { get; }
+        /// <summary>
+        ///     Returns the Application associated with a messsage.
+        /// </summary>
+        /// <remarks>
+        ///     Sent with Rich-Presence-related chat embeds.
+        /// </remarks>
+        /// <returns>
+        ///     A message's application, if any is associated.
+        /// </returns>
+        MessageApplication Application { get; }
     }
 }

src/Discord.Net.Core/Entities/Messages/MessageActivity.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Discord
+{
+    [DebuggerDisplay(@"{DebuggerDisplay,nq}")]
+    public class MessageActivity
+    {
+        /// <summary>
+        ///     Gets the type of activity of this message.
+        /// </summary>
+        public MessageActivityType Type { get; set; }
+        /// <summary>
+        ///     Gets the party ID of this activity, if any.
+        /// </summary>
+        public string PartyId { get; set; }
+
+        private string DebuggerDisplay
+            => $"{Type}{(string.IsNullOrWhiteSpace(PartyId) ? "" : $" {PartyId}")}";
+
+        public override string ToString() => DebuggerDisplay;
+    }
+}

src/Discord.Net.Core/Entities/Messages/MessageActivityType.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Discord
+{
+    public enum MessageActivityType
+    {
+        Join = 1,
+        Spectate = 2,
+        Listen = 3,
+        JoinRequest = 5
+    }
+}

src/Discord.Net.Core/Entities/Messages/MessageApplication.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Discord
+{
+    [DebuggerDisplay(@"{DebuggerDisplay,nq}")]
+    public class MessageApplication
+    {
+        /// <summary>
+        ///     Gets the snowflake ID of the application.
+        /// </summary>
+        public ulong Id { get; set; }
+        /// <summary>
+        ///     Gets the ID of the embed's image asset.
+        /// </summary>
+        public string CoverImage { get; set; }
+        /// <summary>
+        ///     Gets the application's description.
+        /// </summary>
+        public string Description { get; set; }
+        /// <summary>
+        ///     Gets the ID of the application's icon.
+        /// </summary>
+        public string Icon { get; set; }
+        /// <summary>
+        ///     Gets the Url of the application's icon.
+        /// </summary>
+        public string IconUrl
+            => $"https://cdn.discordapp.com/app-icons/{Id}/{Icon}";
+        /// <summary>
+        ///     Gets the name of the application.
+        /// </summary>
+        public string Name { get; set; }
+        private string DebuggerDisplay
+            => $"{Name} ({Id}): {Description}";
+        public override string ToString()
+            => DebuggerDisplay;
+    }
+}

src/Discord.Net.Rest/API/Common/Guild.cs

@@ -1,4 +1,4 @@
-#pragma warning disable CS1591
+#pragma warning disable CS1591
 using Newtonsoft.Json;
 
 namespace Discord.API
@@ -25,10 +25,12 @@ namespace Discord.API
         public bool EmbedEnabled { get; set; }
         [JsonProperty("embed_channel_id")]
         public ulong? EmbedChannelId { get; set; }
-        [JsonProperty("system_channel_id")]
-        public ulong? SystemChannelId { get; set; }
         [JsonProperty("verification_level")]
         public VerificationLevel VerificationLevel { get; set; }
+        [JsonProperty("default_message_notifications")]
+        public DefaultMessageNotifications DefaultMessageNotifications { get; set; }
+        [JsonProperty("explicit_content_filter")]
+        public ExplicitContentFilterLevel ExplicitContentFilter { get; set; }
         [JsonProperty("voice_states")]
         public VoiceState[] VoiceStates { get; set; }
         [JsonProperty("roles")]
@@ -39,7 +41,9 @@ namespace Discord.API
         public string[] Features { get; set; }
         [JsonProperty("mfa_level")]
         public MfaLevel MfaLevel { get; set; }
-        [JsonProperty("default_message_notifications")]
+        [JsonProperty("application_id")]
-        public DefaultMessageNotifications DefaultMessageNotifications { get; set; }
+        public ulong? ApplicationId { get; set; }
+        [JsonProperty("system_channel_id")]
+        public ulong? SystemChannelId { get; set; }
     }
 }

src/Discord.Net.Rest/API/Common/Message.cs

@@ -44,5 +44,11 @@ namespace Discord.API
         public Optional<bool> Pinned { get; set; }
         [JsonProperty("reactions")]
         public Optional<Reaction[]> Reactions { get; set; }
+        // sent with Rich Presence-related chat embeds
+        [JsonProperty("activity")]
+        public Optional<MessageActivity> Activity { get; set; }
+        // sent with Rich Presence-related chat embeds
+        [JsonProperty("application")]
+        public Optional<MessageApplication> Application { get; set; }
     }
 }

src/Discord.Net.Rest/API/Common/MessageActivity.cs

@@ -0,0 +1,17 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Discord.API
+{
+    public class MessageActivity
+    {
+        [JsonProperty("type")]
+        public Optional<MessageActivityType> Type { get; set; }
+        [JsonProperty("party_id")]
+        public Optional<string> PartyId { get; set; }
+    }
+}

src/Discord.Net.Rest/API/Common/MessageApplication.cs

@@ -0,0 +1,38 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Discord.API
+{
+    public class MessageApplication
+    {
+        /// <summary>
+        ///     Gets the snowflake ID of the application.
+        /// </summary>
+        [JsonProperty("id")]
+        public ulong Id { get; set; }
+        /// <summary>
+        ///     Gets the ID of the embed's image asset.
+        /// </summary>
+        [JsonProperty("cover_image")]
+        public string CoverImage { get; set; }
+        /// <summary>
+        ///     Gets the application's description.
+        /// </summary>
+        [JsonProperty("description")]
+        public string Description { get; set; }
+        /// <summary>
+        ///     Gets the ID of the application's icon.
+        /// </summary>
+        [JsonProperty("icon")]
+        public string Icon { get; set; }
+        /// <summary>
+        ///     Gets the name of the application.
+        /// </summary>
+        [JsonProperty("name")]
+        public string Name { get; set; }
+    }
+}

src/Discord.Net.Rest/API/Rest/ModifyGuildParams.cs

@@ -1,4 +1,4 @@
-#pragma warning disable CS1591
+#pragma warning disable CS1591
 using Newtonsoft.Json;
 
 namespace Discord.API.Rest
@@ -28,5 +28,7 @@ namespace Discord.API.Rest
         public Optional<ulong?> AfkChannelId { get; set; }
         [JsonProperty("owner_id")]
         public Optional<ulong> OwnerId { get; set; }
+        [JsonProperty("explicit_content_filter")]
+        public Optional<ExplicitContentFilterLevel> ExplicitContentFilter { get; set; }
     }
 }

src/Discord.Net.Rest/Entities/Guilds/GuildHelper.cs

@@ -32,7 +32,8 @@ namespace Discord.Rest
                 Icon = args.Icon.IsSpecified ? args.Icon.Value?.ToModel() : Optional.Create<ImageModel?>(),
                 Name = args.Name,
                 Splash = args.Splash.IsSpecified ? args.Splash.Value?.ToModel() : Optional.Create<ImageModel?>(),
-                VerificationLevel = args.VerificationLevel
+                VerificationLevel = args.VerificationLevel,
+                ExplicitContentFilter = args.ExplicitContentFilter
             };
 
             if (args.AfkChannel.IsSpecified)
@@ -60,6 +61,9 @@ namespace Discord.Rest
             if (!apiArgs.Icon.IsSpecified && guild.IconId != null)
                 apiArgs.Icon = new ImageModel(guild.IconId);
 
+            if (args.ExplicitContentFilter.IsSpecified)
+                apiArgs.ExplicitContentFilter = args.ExplicitContentFilter.Value;
+
             return await client.ApiClient.ModifyGuildAsync(guild.Id, apiArgs, options).ConfigureAwait(false);
         }
         /// <exception cref="ArgumentNullException"><paramref name="func"/> is <c>null</c>.</exception>

src/Discord.Net.Rest/Entities/Guilds/RestGuild.cs

@@ -32,6 +32,8 @@ namespace Discord.Rest
         public MfaLevel MfaLevel { get; private set; }
         /// <inheritdoc />
         public DefaultMessageNotifications DefaultMessageNotifications { get; private set; }
+        /// <inheritdoc />
+        public ExplicitContentFilterLevel ExplicitContentFilter { get; private set; }
 
         /// <inheritdoc />
         public ulong? AFKChannelId { get; private set; }
@@ -48,6 +50,8 @@ namespace Discord.Rest
         /// <inheritdoc />
         public string SplashId { get; private set; }
         internal bool Available { get; private set; }
+        /// <inheritdoc />
+        public ulong? ApplicationId { get; private set; }
 
         /// <inheritdoc />
         public DateTimeOffset CreatedAt => SnowflakeUtils.FromSnowflake(Id);
@@ -98,6 +102,8 @@ namespace Discord.Rest
             VerificationLevel = model.VerificationLevel;
             MfaLevel = model.MfaLevel;
             DefaultMessageNotifications = model.DefaultMessageNotifications;
+            ExplicitContentFilter = model.ExplicitContentFilter;
+            ApplicationId = model.ApplicationId;
 
             if (model.Emojis != null)
             {

src/Discord.Net.Rest/Entities/Messages/RestMessage.cs

@@ -55,6 +55,10 @@ namespace Discord.Rest
 
         /// <inheritdoc />
         public DateTimeOffset Timestamp => DateTimeUtils.FromTicks(_timestampTicks);
+        /// <inheritdoc />
+        public MessageActivity Activity { get; private set; }
+        /// <inheritdoc />
+        public MessageApplication Application { get; private set; }
 
         internal RestMessage(BaseDiscordClient discord, ulong id, IMessageChannel channel, IUser author, MessageSource source)
             : base(discord, id)
@@ -77,6 +81,29 @@ namespace Discord.Rest
 
             if (model.Content.IsSpecified)
                 Content = model.Content.Value;
+
+            if (model.Application.IsSpecified)
+            {
+                // create a new Application from the API model
+                Application = new MessageApplication()
+                {
+                    Id = model.Application.Value.Id,
+                    CoverImage = model.Application.Value.CoverImage,
+                    Description = model.Application.Value.Description,
+                    Icon = model.Application.Value.Icon,
+                    Name = model.Application.Value.Name
+                };
+            }
+
+            if (model.Activity.IsSpecified)
+            {
+                // create a new Activity from the API model
+                Activity = new MessageActivity()
+                {
+                    Type = model.Activity.Value.Type.Value,
+                    PartyId = model.Activity.Value.PartyId.Value
+                };
+            }
         }
 
         /// <inheritdoc />

src/Discord.Net.WebSocket/Entities/Guilds/SocketGuild.cs

@@ -50,6 +50,8 @@ namespace Discord.WebSocket
         public MfaLevel MfaLevel { get; private set; }
         /// <inheritdoc />
         public DefaultMessageNotifications DefaultMessageNotifications { get; private set; }
+        /// <inheritdoc />
+        public ExplicitContentFilterLevel ExplicitContentFilter { get; private set; }
         /// <summary>
         ///     Gets the number of members.
         /// </summary>
@@ -73,6 +75,8 @@ namespace Discord.WebSocket
         internal bool IsAvailable { get; private set; }
         /// <summary> Indicates whether the client is connected to this guild. </summary>
         public bool IsConnected { get; internal set; }
+        /// <inheritdoc />
+        public ulong? ApplicationId { get; internal set; }
 
         internal ulong? AFKChannelId { get; private set; }
         internal ulong? EmbedChannelId { get; private set; }
@@ -346,6 +350,8 @@ namespace Discord.WebSocket
             VerificationLevel = model.VerificationLevel;
             MfaLevel = model.MfaLevel;
             DefaultMessageNotifications = model.DefaultMessageNotifications;
+            ExplicitContentFilter = model.ExplicitContentFilter;
+            ApplicationId = model.ApplicationId;
 
             if (model.Emojis != null)
             {

src/Discord.Net.WebSocket/Entities/Messages/SocketMessage.cs

@@ -43,6 +43,13 @@ namespace Discord.WebSocket
         public virtual bool IsPinned => false;
         /// <inheritdoc />
         public virtual DateTimeOffset? EditedTimestamp => null;
+
+        /// <inheritdoc />
+        public MessageActivity Activity { get; private set; }
+
+        /// <inheritdoc />
+        public MessageApplication Application { get; private set; }
+
         /// <summary>
         ///     Returns all attachments included in this message.
         /// </summary>
@@ -105,6 +112,29 @@ namespace Discord.WebSocket
 
             if (model.Content.IsSpecified)
                 Content = model.Content.Value;
+
+            if (model.Application.IsSpecified)
+            {
+                // create a new Application from the API model
+                Application = new MessageApplication()
+                {
+                    Id = model.Application.Value.Id,
+                    CoverImage = model.Application.Value.CoverImage,
+                    Description = model.Application.Value.Description,
+                    Icon = model.Application.Value.Icon,
+                    Name = model.Application.Value.Name
+                };
+            }
+
+            if (model.Activity.IsSpecified)
+            {
+                // create a new Activity from the API model
+                Activity = new MessageActivity()
+                {
+                    Type = model.Activity.Value.Type.Value,
+                    PartyId = model.Activity.Value.PartyId.Value
+                };
+            }
         }
 
         /// <inheritdoc />

test/Discord.Net.Tests/Tests.Guilds.cs

@@ -5,8 +5,25 @@ using Xunit;
 
 namespace Discord
 {
-    public class GuidPermissionsTests
+    public partial class Tests
     {
+        /// <summary>
+        ///     Tests the behavior of modifying the ExplicitContentFilter property of a Guild.
+        /// </summary>
+        [Fact]
+        public async Task TestExplicitContentFilter()
+        {
+            foreach (var level in Enum.GetValues(typeof(ExplicitContentFilterLevel)))
+            {
+                await _guild.ModifyAsync(x => x.ExplicitContentFilter = (ExplicitContentFilterLevel)level);
+                await _guild.UpdateAsync();
+                Assert.Equal(level, _guild.ExplicitContentFilter);
+            }
+        }
+
+        /// <summary>
+        ///     Tests the behavior of the GuildPermissions class.
+        /// </summary>
         [Fact]
         public Task TestGuildPermission()
         {