[Fix] Modify mention limit, regex patterns & allowlist of a automod r…

…ule (#2683) * fix one another automod bug * possible fix for another bug * final one
discord-net · May 22, 2023 · a41fa62 · a41fa62
1 parent 9df4438
commit a41fa62
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/src/Discord.Net.Rest/Entities/Guilds/GuildHelper.cs b/src/Discord.Net.Rest/Entities/Guilds/GuildHelper.cs
@@ -1238,13 +1238,17 @@ public static Task<AutoModerationRule> ModifyRuleAsync(BaseDiscordClient client,
                 ExemptRoles = args.ExemptRoles,
                 Name = args.Name,
                 TriggerType = args.TriggerType,
-                TriggerMetadata = args.KeywordFilter.IsSpecified || args.Presets.IsSpecified ? new API.TriggerMetadata
+                TriggerMetadata = args.KeywordFilter.IsSpecified
+                                  || args.Presets.IsSpecified
+                                  || args.MentionLimit.IsSpecified
+                                  || args.RegexPatterns.IsSpecified
+                                  || args.AllowList.IsSpecified ? new API.TriggerMetadata
                 {
-                    KeywordFilter = args.KeywordFilter.GetValueOrDefault(Array.Empty<string>()),
-                    RegexPatterns = args.RegexPatterns.GetValueOrDefault(Array.Empty<string>()),
-                    AllowList = args.AllowList.GetValueOrDefault(Array.Empty<string>()),
-                    MentionLimit = args.MentionLimit,
-                    Presets = args.Presets.GetValueOrDefault(Array.Empty<KeywordPresetTypes>())
+                    KeywordFilter = args.KeywordFilter.IsSpecified ? args.KeywordFilter : rule.KeywordFilter.ToArray(),
+                    RegexPatterns = args.RegexPatterns.IsSpecified ? args.RegexPatterns : rule.RegexPatterns.ToArray(),
+                    AllowList = args.AllowList.IsSpecified ? args.AllowList : rule.AllowList.ToArray(),
+                    MentionLimit = args.MentionLimit.IsSpecified ? args.MentionLimit : rule.MentionTotalLimit ?? Optional<int>.Unspecified,
+                    Presets = args.Presets.IsSpecified ? args.Presets : rule.Presets.ToArray(),
                 } : Optional<API.TriggerMetadata>.Unspecified
             };