Various small API updates (#107)

* Update default avatar calculation for migrated users

* Add new auto moderation trigger metadata field: mention_raid_protection_enabled

* Add new guild field: safety_alerts_channel_id

* Add new permissions: CREATE_GUILD_EXPRESSIONS, CREATE_EVENTS

* Add new field to LocalActivity for custom statuses: state

* Add new field to ApplicationTeamMember: role

* Changes

* Update default param value

src/Disqord.Core/Discord/Cdn/Discord.Cdn.cs

@@ -61,7 +61,7 @@ public static string GetDefaultAvatarUrl(string discriminator)
 
         public static string GetDefaultAvatarUrl(Snowflake userId)
         {
-            return GetDefaultAvatarUrl((DefaultAvatarColor) ((userId.RawValue >> 22) % 5));
+            return GetDefaultAvatarUrl((DefaultAvatarColor) ((userId.RawValue >> 22) % 6));
         }
 
         public static string GetDefaultAvatarUrl(DefaultAvatarColor color)

src/Disqord.Core/Entities/Core/Application/IApplicationTeamMember.cs

@@ -22,4 +22,9 @@ public interface IApplicationTeamMember : IUser, IJsonUpdatable<TeamMemberJsonMo
     ///     Gets the permissions of this member.
     /// </summary>
     IReadOnlyList<string> Permissions { get; }
-}
+
+    /// <summary>
+    ///     Gets the role of this member.
+    /// </summary>
+    TeamMemberRole Role { get; }
+}

src/Disqord.Core/Entities/Core/AuditLogs/Guild/Data/IGuildAuditLogChanges.cs

@@ -48,4 +48,6 @@ public interface IGuildAuditLogChanges
     AuditLogChange<Snowflake?> WidgetChannelId { get; }
 
     AuditLogChange<Snowflake?> SystemChannelId { get; }
+
+    AuditLogChange<Snowflake?> SafetyAlertsChannelId { get; }
 }

src/Disqord.Core/Entities/Core/AutoModeration/IAutoModerationTriggerMetadata.cs

@@ -47,4 +47,12 @@ public interface IAutoModerationTriggerMetadata : IEntity, IJsonUpdatable<AutoMo
     ///     Used by the <see cref="AutoModerationRuleTrigger.MentionSpam"/> trigger type.
     /// </remarks>
     int? MentionLimit { get; }
+
+    /// <summary>
+    ///     Gets whether mention raids should be automatically detected.
+    /// </summary>
+    /// <remarks>
+    ///     Used by the <see cref="AutoModerationRuleTrigger.MentionSpam"/> trigger type.
+    /// </remarks>
+    bool IsMentionRaidProtectionEnabled { get; }
 }

src/Disqord.Core/Entities/Core/Guild/IGuild.cs

@@ -173,4 +173,9 @@ public interface IGuild : ISnowflakeEntity, INamableEntity, IJsonUpdatable<Guild
     ///     Gets whether this guild has the boost progress bar enabled.
     /// </summary>
     bool IsBoostProgressBarEnabled { get; }
+
+    /// <summary>
+    ///     Gets the safety alerts channel ID of this guild.
+    /// </summary>
+    Snowflake? SafetyAlertsChannelId { get; }
 }

src/Disqord.Core/Entities/Local/AutoModeration/Extensions/LocalAutoModerationTriggerMetadataExtensions.cs

@@ -110,4 +110,10 @@ public static LocalAutoModerationTriggerMetadata WithMentionLimit(this LocalAuto
         metadata.MentionLimit = mentionLimit;
         return metadata;
     }
+
+    public static LocalAutoModerationTriggerMetadata WithIsMentionRaidProtectionEnabled(this LocalAutoModerationTriggerMetadata metadata, bool isEnabled = true)
+    {
+        metadata.IsMentionRaidProtectionEnabled = isEnabled;
+        return metadata;
+    }
 }

src/Disqord.Core/Entities/Local/AutoModeration/LocalAutoModerationTriggerMetadata.cs

@@ -16,6 +16,8 @@ public class LocalAutoModerationTriggerMetadata : ILocalConstruct<LocalAutoModer
 
     public Optional<int> MentionLimit { get; set; }
 
+    public Optional<bool> IsMentionRaidProtectionEnabled { get; set; }
+
     /// <summary>
     ///     Instantiates a new <see cref="LocalAutoModerationTriggerMetadata"/>.
     /// </summary>
@@ -33,6 +35,7 @@ protected LocalAutoModerationTriggerMetadata(LocalAutoModerationTriggerMetadata
         Presets = other.Presets.Clone();
         AllowedSubstrings = other.AllowedSubstrings.Clone();
         MentionLimit = other.MentionLimit;
+        IsMentionRaidProtectionEnabled = other.IsMentionRaidProtectionEnabled;
     }
 
     /// <inheritdoc/>
@@ -50,7 +53,8 @@ public AutoModerationTriggerMetadataJsonModel ToModel()
             RegexPatterns = RegexPatterns.ToArray(),
             Presets = Presets.ToArray(),
             AllowList = AllowedSubstrings.ToArray(),
-            MentionTotalLimit = MentionLimit
+            MentionTotalLimit = MentionLimit,
+            MentionRaidProtectionEnabled = IsMentionRaidProtectionEnabled
         };
     }
 }

src/Disqord.Core/Entities/Transient/Application/TransientApplicationTeamMember.cs

@@ -15,6 +15,9 @@ public class TransientApplicationTeamMember : TransientUser, IApplicationTeamMem
     /// <inheritdoc/>
     public IReadOnlyList<string> Permissions => Model.Permissions;
 
+    /// <inheritdoc/>
+    public TeamMemberRole Role => Model.Role;
+
     /// <inheritdoc/>
     public new TeamMemberJsonModel Model { get; }
 
@@ -23,4 +26,4 @@ public TransientApplicationTeamMember(IClient client, TeamMemberJsonModel model)
     {
         Model = model;
     }
-}
+}

src/Disqord.Core/Entities/Transient/AuditLogs/Guild/Data/TransientGuildAuditLogChanges.cs

@@ -74,6 +74,9 @@ public class TransientGuildAuditLogChanges : IGuildAuditLogChanges
     /// <inheritdoc/>
     public AuditLogChange<Snowflake?> SystemChannelId { get; }
 
+    /// <inheritdoc/>
+    public AuditLogChange<Snowflake?> SafetyAlertsChannelId { get; }
+
     public TransientGuildAuditLogChanges(IClient client, AuditLogJsonModel? auditLogJsonModel, AuditLogEntryJsonModel model)
     {
         for (var i = 0; i < model.Changes.Value.Length; i++)
@@ -200,6 +203,11 @@ public TransientGuildAuditLogChanges(IClient client, AuditLogJsonModel? auditLog
                     SystemChannelId = AuditLogChange<Snowflake?>.Convert(change);
                     break;
                 }
+                case "safety_alerts_channel_id":
+                {
+                    SafetyAlertsChannelId = AuditLogChange<Snowflake?>.Convert(change);
+                    break;
+                }
                 default:
                 {
                     client.Logger.LogDebug("Unknown key {0} for {1}", change.Key, this);

src/Disqord.Core/Entities/Transient/AutoModeration/TransientAutoModerationTriggerMetadata.cs

@@ -63,6 +63,9 @@ public IReadOnlyList<string> AllowedSubstrings
     /// <inheritdoc/>
     public int? MentionLimit => Model.MentionTotalLimit.GetValueOrNullable();
 
+    /// <inheritdoc/>
+    public bool IsMentionRaidProtectionEnabled => Model.MentionRaidProtectionEnabled.GetValueOrDefault();
+
     public TransientAutoModerationTriggerMetadata(AutoModerationTriggerMetadataJsonModel model)
         : base(model)
     { }

src/Disqord.Core/Entities/Transient/Guild/TransientGuild.cs

@@ -140,6 +140,9 @@ public IReadOnlyDictionary<Snowflake, IGuildSticker> Stickers
     /// <inheritdoc/>
     public bool IsBoostProgressBarEnabled => Model.PremiumProgressBarEnabled;
 
+    /// <inheritdoc/>
+    public Snowflake? SafetyAlertsChannelId => Model.SafetyAlertsChannelId;
+
     public TransientGuild(IClient client, GuildJsonModel model)
         : base(client, model)
     { }

src/Disqord.Core/Enums/Permissions.cs

@@ -167,7 +167,7 @@ public enum Permissions : ulong
     ManageWebhooks = 1ul << 29,
 
     /// <summary>
-    ///     Allows management of emojis, stickers, soundboard sounds etc.
+    ///     Allows management of emojis, stickers, soundboard sounds, etc.
     /// </summary>
     ManageExpressions = 1ul << 30,
 
@@ -241,6 +241,16 @@ public enum Permissions : ulong
     /// </summary>
     UseSoundboard = 1ul << 42,
 
+    /// <summary>
+    ///     Allows creating emojis, stickers, soundboard sounds, etc.
+    /// </summary>
+    CreateExpressions = 1ul << 43,
+
+    /// <summary>
+    ///     Allows creating guild events.
+    /// </summary>
+    CreateEvents = 1ul << 44,
+
     /// <summary>
     ///     Allows using sounds from other guilds.
     /// </summary>
@@ -267,6 +277,6 @@ public enum Permissions : ulong
         | ManageRoles | ManageWebhooks | ManageExpressions | UseApplicationCommands
         | RequestToSpeak | ManageEvents | ManageThreads | CreatePublicThreads
         | CreatePrivateThreads | UseExternalStickers | SendMessagesInThreads | StartActivities
-        | ModerateMembers | ViewCreatorMonetizationAnalytics | UseSoundboard | UseExternalSounds
-        | SendVoiceMessages
+        | ModerateMembers | ViewCreatorMonetizationAnalytics | UseSoundboard | CreateExpressions
+        | CreateEvents | UseExternalSounds | SendVoiceMessages
 }

src/Disqord.Core/Enums/TeamMemberRole.cs

@@ -0,0 +1,29 @@
+using System.Runtime.Serialization;
+using Disqord.Serialization.Json;
+
+namespace Disqord;
+
+/// <summary>
+///     Represents the role of team member in an application team.
+/// </summary>
+[StringEnum]
+public enum TeamMemberRole
+{
+    /// <summary>
+    ///     Represents a team administrator.
+    /// </summary>
+    [EnumMember(Value = "admin")]
+    Administrator,
+
+    /// <summary>
+    ///     Represents a team developer.
+    /// </summary>
+    [EnumMember(Value = "developer")]
+    Developer,
+
+    /// <summary>
+    ///     Represents a team member with read-only access.
+    /// </summary>
+    [EnumMember(Value = "read_only")]
+    ReadOnly
+}

src/Disqord.Core/Models/Application/TeamMemberJsonModel.cs

@@ -15,4 +15,7 @@ public class TeamMemberJsonModel : JsonModel
 
     [JsonProperty("user")]
     public UserJsonModel User = null!;
-}
+
+    [JsonProperty("role")]
+    public TeamMemberRole Role;
+}

src/Disqord.Core/Models/AutoModeration/AutoModerationTriggerMetadataJsonModel.cs

@@ -19,4 +19,7 @@ public class AutoModerationTriggerMetadataJsonModel : JsonModel
 
     [JsonProperty("mention_total_limit")]
     public Optional<int> MentionTotalLimit;
+
+    [JsonProperty("mention_raid_protection_enabled")]
+    public Optional<bool> MentionRaidProtectionEnabled;
 }

src/Disqord.Core/Models/GuildJsonModel.cs

@@ -125,4 +125,7 @@ public class GuildJsonModel : JsonModel
 
     [JsonProperty("premium_progress_bar_enabled")]
     public bool PremiumProgressBarEnabled;
+
+    [JsonProperty("safety_alerts_channel_id")]
+    public Snowflake? SafetyAlertsChannelId;
 }

src/Disqord.Gateway/Entities/Cached/CachedGuild.cs

@@ -146,6 +146,9 @@ public IReadOnlyDictionary<Snowflake, IMember> Members
     /// <inheritdoc/>
     public bool IsBoostProgressBarEnabled { get; private set; }
 
+    /// <inheritdoc/>
+    public Snowflake? SafetyAlertsChannelId { get; private set; }
+
     IReadOnlyDictionary<Snowflake, IGuildChannel> IGatewayGuild.Channels
     {
         get
@@ -250,6 +253,7 @@ public void Update(GuildJsonModel model)
         MaxVideoMemberCount = model.MaxVideoChannelUsers.GetValueOrNullable();
         NsfwLevel = model.NsfwLevel;
         IsBoostProgressBarEnabled = model.PremiumProgressBarEnabled;
+        SafetyAlertsChannelId = model.SafetyAlertsChannelId;
     }
 
     public void Update(GatewayGuildJsonModel model)

src/Disqord.Gateway/Entities/Local/LocalActivity.cs

@@ -26,6 +26,11 @@ public static LocalActivity Watching(string name)
         return new(name, ActivityType.Watching);
     }
 
+    public static LocalActivity Custom(string text)
+    {
+        return new("Custom Status", ActivityType.Custom, text: text);
+    }
+
     public static LocalActivity Competing(string name)
     {
         return new(name, ActivityType.Competing);
@@ -37,6 +42,8 @@ public static LocalActivity Competing(string name)
 
     public Optional<ActivityType> Type { get; set; }
 
+    public Optional<string> Text { get; set; }
+
     public LocalActivity()
     { }
 
@@ -45,13 +52,15 @@ protected LocalActivity(LocalActivity other)
         Name = other.Name;
         Url = other.Url;
         Type = other.Type;
+        Text = other.Text;
     }
 
-    public LocalActivity(string name, ActivityType type, string? url = null)
+    public LocalActivity(string name, ActivityType type, string? url = null, string? text = null)
     {
         Name = name;
         Url = Optional.FromNullable(url);
         Type = type;
+        Text = Optional.FromNullable(text);
     }
 
     public LocalActivity(string name, string url)
@@ -76,7 +85,8 @@ public virtual ActivityJsonModel ToModel()
         {
             Name = Name.Value,
             Type = Type.Value,
-            Url = Url
+            Url = Url,
+            State = Text
         };
     }
 }

src/Disqord.Gateway/Entities/Transient/Guild/TransientGatewayGuild.cs

@@ -107,6 +107,8 @@ public IReadOnlyDictionary<Snowflake, IGuildSticker> Stickers
 
     public bool IsBoostProgressBarEnabled => Model.PremiumProgressBarEnabled;
 
+    public Snowflake? SafetyAlertsChannelId => Model.SafetyAlertsChannelId;
+
     public DateTimeOffset JoinedAt => Model.JoinedAt;
 
     public bool IsLarge => Model.Large;

src/Disqord.Rest.Api/Content/Json/ModifyGuildJsonRestRequestContent.cs

@@ -62,4 +62,7 @@ public class ModifyGuildJsonRestRequestContent : JsonModelRestRequestContent
 
     [JsonProperty("premium_progress_bar_enabled")]
     public Optional<bool> PremiumProgressBarEnabled;
-}
+
+    [JsonProperty("safety_alerts_channel_id")]
+    public Optional<Snowflake?> SafetyAlertsChannelId;
+}

src/Disqord.Rest/ActionProperties/Modify/ModifyGuildActionProperties.cs

@@ -45,6 +45,8 @@ public sealed class ModifyGuildActionProperties
 
     public Optional<bool> IsBoostProgressBarEnabled { internal get; set; }
 
+    public Optional<Snowflake?> SafetyAlertsChannelId { internal get; set; }
+
     internal ModifyGuildActionProperties()
     { }
-}
+}

src/Disqord.Rest/Extensions/RestClientExtensions.Guild.cs

@@ -59,7 +59,8 @@ public static async Task<IGuild> ModifyGuildAsync(this IRestClient client,
             PreferredLocale = Optional.Convert(properties.PreferredLocale, x => x.Name),
             Features = Optional.Convert(properties.Features, x => x.ToArray()),
             Description = properties.Description,
-            PremiumProgressBarEnabled = properties.IsBoostProgressBarEnabled
+            PremiumProgressBarEnabled = properties.IsBoostProgressBarEnabled,
+            SafetyAlertsChannelId = properties.SafetyAlertsChannelId
         };
 
         var model = await client.ApiClient.ModifyGuildAsync(guildId, content, options, cancellationToken).ConfigureAwait(false);