Update validation check

Quahu · Dec 22, 2023 · 91e026a · 91e026a
1 parent a47336a
commit 91e026a
Showing 1 changed file with 8 additions and 14 deletions.
diff --git a/src/Disqord.Core/Models/Interactions/Components/ComponentJsonModel.cs b/src/Disqord.Core/Models/Interactions/Components/ComponentJsonModel.cs
@@ -145,21 +145,15 @@ protected override void OnValidate()
                 {
                     Guard.IsBetweenOrEqualTo(defaultValues.Length, MinValues.GetValueOrDefault(Discord.Limits.Component.Selection.MinMinimumSelectedOptions), MaxValues.GetValueOrDefault(Discord.Limits.Component.Selection.MaxMaximumSelectedOptions));
 
-                    switch (Type)
+                    Predicate<DefaultValueJsonModel> predicate = Type switch
                     {
-                        case ComponentType.UserSelection:
-                            Guard.IsTrue(defaultValues.All(x => x.Type == DefaultSelectionValueType.User));
-                            break;
-                        case ComponentType.RoleSelection:
-                            Guard.IsTrue(defaultValues.All(x => x.Type == DefaultSelectionValueType.Role));
-                            break;
-                        case ComponentType.MentionableSelection:
-                            Guard.IsTrue(defaultValues.All(x => x.Type == DefaultSelectionValueType.User || x.Type == DefaultSelectionValueType.Role));
-                            break;
-                        case ComponentType.ChannelSelection:
-                            Guard.IsTrue(defaultValues.All(x => x.Type == DefaultSelectionValueType.Channel));
-                            break;
-                    }
+                        ComponentType.UserSelection => value => value.Type is DefaultSelectionValueType.User,
+                        ComponentType.RoleSelection => value => value.Type is DefaultSelectionValueType.Role,
+                        ComponentType.MentionableSelection => value => value.Type is DefaultSelectionValueType.User or DefaultSelectionValueType.Role,
+                        ComponentType.ChannelSelection => value => value.Type is DefaultSelectionValueType.Channel,
+                    };
+
+                    Guard.IsTrue(Array.TrueForAll(defaultValues, predicate), message: "The types of default selection values must match the type of the component.");
                 });
 
                 break;