fix group registration

Author: Kaleidox

src/main/java/org/comroid/interaction/adapter/jda/DiscordCommandRegistrator.java

@@ -19,6 +19,7 @@
 import org.comroid.api.attr.IntegerAttribute;
 import org.comroid.api.data.RegExpUtil;
 import org.comroid.api.data.seri.type.ValueType;
+import org.comroid.api.func.exc.ThrowingFunction;
 import org.comroid.api.tree.Initializable;
 import org.comroid.interaction.InteractionCore;
 import org.comroid.interaction.component.NameCapitalizer;
@@ -33,6 +34,7 @@
 import java.util.Collection;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.logging.Level;
 import java.util.stream.Stream;
 
 import static org.comroid.interaction.adapter.jda.JdaAdapter.*;
@@ -85,7 +87,6 @@ public void initialize() {
         }
 
         var jda = adp.getJda();
-        log.info("Upserting %d interactions to discord bot %s".formatted(all.size(), jda.getSelfUser()));
 
         RestAction<?> action = PURGE_COMMANDS.consume() ? jda.retrieveCommands().flatMap(cmds -> {
             log.fine("Purging %d previously defined commands".formatted(cmds.size()));
@@ -99,7 +100,10 @@ public void initialize() {
 
         for (var data : all) action = action.flatMap($ -> jda.upsertCommand(data));
 
-        action.queue();
+        action.submit().thenAccept($ -> log.info("Upserted %d interactions to discord bot %s".formatted(all.size(), jda.getSelfUser()))).exceptionally(t -> {
+            log.log(Level.SEVERE, "Failed to upsert interactions", t);
+            return null;
+        });
     }
 
     static void initCommandData(InteractionNode node, CommandData data) {
@@ -108,7 +112,10 @@ static void initCommandData(InteractionNode node, CommandData data) {
     }
 
     static void initDefaultPermission(Stream<String> permissions, CommandData data) {
-        var permissionMask = permissions.flatMap(perm -> Optional.ofNullable(Permission.valueOf(perm.toUpperCase()))
+        var permissionMask = permissions.flatMap(perm -> Optional.of(perm)
+                        .filter(str -> str.matches("\\D+"))
+                        .map(String::toUpperCase)
+                        .map(ThrowingFunction.fallback(Permission::valueOf))
                         .map(Stream::of)
                         .orElseGet(() -> Stream.of(perm)
                                 .filter(it -> it.matches("\\d+"))

src/main/java/org/comroid/interaction/registry/RegistryHelper.java

@@ -41,7 +41,7 @@ public static Collection<InteractionNode> compileFromClass(@NonNull RegistrySour
 
         for (var method : type.getMethods()) {
             var mod = method.getModifiers();
-            if (!Modifier.isStatic(mod)) continue;
+            if (source instanceof InstanceRegistry reg && reg.getInstance() != null && Modifier.isStatic(mod)) continue;
 
             var callable = constructMethod(source, method, base == null ? null : base.toInteractionElement()).orElse(null);
             if (callable == null) continue;