From a41fa62124b3b4c46b7c77b0831f4804524c983d Mon Sep 17 00:00:00 2001 From: Misha133 <61027276+Misha-133@users.noreply.github.com> Date: Mon, 22 May 2023 23:35:57 +0300 Subject: [PATCH] [Fix] Modify mention limit, regex patterns & allowlist of a automod rule (#2683) * fix one another automod bug * possible fix for another bug * final one --- .../Entities/Guilds/GuildHelper.cs | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/Discord.Net.Rest/Entities/Guilds/GuildHelper.cs b/src/Discord.Net.Rest/Entities/Guilds/GuildHelper.cs index 2dc687dc..f902df8c 100644 --- a/src/Discord.Net.Rest/Entities/Guilds/GuildHelper.cs +++ b/src/Discord.Net.Rest/Entities/Guilds/GuildHelper.cs @@ -1238,13 +1238,17 @@ namespace Discord.Rest 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()), - RegexPatterns = args.RegexPatterns.GetValueOrDefault(Array.Empty()), - AllowList = args.AllowList.GetValueOrDefault(Array.Empty()), - MentionLimit = args.MentionLimit, - Presets = args.Presets.GetValueOrDefault(Array.Empty()) + 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.Unspecified, + Presets = args.Presets.IsSpecified ? args.Presets : rule.Presets.ToArray(), } : Optional.Unspecified };