From ee33e9548853bc89fdcd9d086af0d1bdff05ba43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20Spie=C3=9F?= <business@minnced.club>
Date: Sun, 13 Nov 2022 15:54:31 +0100
Subject: [PATCH] Fix handling of empty select menu interactions (#2330)

---
 .../component/EntitySelectInteractionImpl.java             | 5 +++--
 .../component/StringSelectInteractionImpl.java             | 7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/net/dv8tion/jda/internal/interactions/component/EntitySelectInteractionImpl.java b/src/main/java/net/dv8tion/jda/internal/interactions/component/EntitySelectInteractionImpl.java
index e736781ece..c46a9f3e9f 100644
--- a/src/main/java/net/dv8tion/jda/internal/interactions/component/EntitySelectInteractionImpl.java
+++ b/src/main/java/net/dv8tion/jda/internal/interactions/component/EntitySelectInteractionImpl.java
@@ -20,6 +20,7 @@
 import net.dv8tion.jda.api.entities.Mentions;
 import net.dv8tion.jda.api.interactions.components.selections.EntitySelectInteraction;
 import net.dv8tion.jda.api.interactions.components.selections.EntitySelectMenu;
+import net.dv8tion.jda.api.utils.data.DataArray;
 import net.dv8tion.jda.api.utils.data.DataObject;
 import net.dv8tion.jda.internal.JDAImpl;
 import net.dv8tion.jda.internal.entities.GuildImpl;
@@ -39,8 +40,8 @@ public EntitySelectInteractionImpl(JDAImpl jda, DataObject data)
         this.mentions = new SelectMenuMentions(
                 jda,
                 (GuildImpl) getGuild(),
-                content.getObject("resolved"),
-                content.getArray("values")
+                content.optObject("resolved").orElseGet(DataObject::empty),
+                content.optArray("values").orElseGet(DataArray::empty)
         );
     }
 
diff --git a/src/main/java/net/dv8tion/jda/internal/interactions/component/StringSelectInteractionImpl.java b/src/main/java/net/dv8tion/jda/internal/interactions/component/StringSelectInteractionImpl.java
index 5e17e170eb..142f89d998 100644
--- a/src/main/java/net/dv8tion/jda/internal/interactions/component/StringSelectInteractionImpl.java
+++ b/src/main/java/net/dv8tion/jda/internal/interactions/component/StringSelectInteractionImpl.java
@@ -39,9 +39,10 @@ public StringSelectInteractionImpl(JDAImpl jda, DataObject data)
 
     protected List<String> parseValues(DataObject data)
     {
-        return data.getArray("values")
-                .stream(DataArray::getString)
-                .collect(Collectors.toList());
+        return data.optArray("values").map(arr ->
+            arr.stream(DataArray::getString)
+               .collect(Collectors.toList())
+        ).orElse(Collections.emptyList());
     }
 
     @Nonnull