Fix ChatInputCommandGrammar#resolve never completing with records

Alex1304 · May 11, 2024 · 65fc707 · 65fc707
1 parent 8aa286c
commit 65fc707
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/interaction/src/main/java/botrino/interaction/grammar/ChatInputCommandGrammar.java b/interaction/src/main/java/botrino/interaction/grammar/ChatInputCommandGrammar.java
@@ -135,10 +135,13 @@ private Mono<T> resolveRecordClass(ChatInputInteractionEvent event) {
                 publishers.add(Mono.justOrEmpty(getOptionByName(event, optionAnnot.name()))
                         .flatMap(option -> Mono.justOrEmpty(option.getValue())
                                 .flatMap(value -> extractOptionValue(option.getType(), value,
-                                        event.getInteraction().getGuildId().orElse(null)))));
+                                        event.getInteraction().getGuildId().orElse(null)))
+                                .map(Optional::of))
+                        .switchIfEmpty(Mono.just(Optional.empty())));
             }
             return Mono.zip(publishers,
-                    params -> (T) ConfigUtils.instantiateRecord(valueClass.asSubclass(Record.class), params));
+                    params -> (T) ConfigUtils.instantiateRecord(valueClass.asSubclass(Record.class),
+                            Arrays.stream(params).map(opt -> ((Optional<?>) opt).orElse(null)).toArray()));
         });
     }