permission adapter

Author: Kaleidox

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

@@ -0,0 +1,28 @@
+package org.comroid.interaction.adapter.jda;
+
+import lombok.Value;
+import net.dv8tion.jda.api.Permission;
+import net.dv8tion.jda.api.entities.Member;
+import org.comroid.interaction.component.permission.PermissionAdapter;
+import org.comroid.interaction.model.InteractionContext;
+
+import java.util.Arrays;
+import java.util.stream.Stream;
+
+@Value
+class DiscordPermissionAdapter implements PermissionAdapter {
+    JdaAdapter adp;
+
+    @Override
+    public boolean verifyPermission(InteractionContext context) {
+        var member = context.child(Member.class).orElse(null);
+        var list   = context.getNode().getDefinitionValues(JdaAdapter.KEY_PERMISSION).flatMap(DiscordPermissionAdapter::parsePermission).toList();
+        return list.isEmpty() ? member == null : member.hasPermission(list);
+    }
+
+    static Stream<Permission> parsePermission(String string) {
+        return string.matches("\\d+")
+               ? Permission.getPermissions(Long.parseLong(string)).stream()
+               : Arrays.stream(Permission.values()).filter(it -> it.name().equalsIgnoreCase(string));
+    }
+}

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

@@ -61,7 +61,7 @@ public JdaAdapter(@NonNull InteractionCore parent, JDA jda) {
         this.core = parent;
         this.jda  = jda;
 
-        addChildren(DiscordNameCapitalizer.INSTANCE, new DiscordCommandRegistrator(this), DiscordResponseChain.INSTANCE);
+        addChildren(DiscordNameCapitalizer.INSTANCE, new DiscordCommandRegistrator(this), new DiscordPermissionAdapter(this), DiscordResponseChain.INSTANCE);
         jda.addEventListener(this);
     }
 

src/main/java/org/comroid/interaction/annotation/ContextDefinition.java

@@ -10,7 +10,7 @@
 @Retention(RetentionPolicy.RUNTIME)
 public @interface ContextDefinition {
     /// context key
-    String value();
+    String key();
 
     // expressions for values to set; each will be appended
     @Language(value = "JShellLanguage", prefix = "java.lang.Supplier x = () -> ", suffix = ";") String[] expr() default { };

src/main/java/org/comroid/interaction/annotation/ContextFilter.java

@@ -16,7 +16,7 @@
 @Retention(RetentionPolicy.RUNTIME)
 public @interface ContextFilter {
     /// context key
-    String value();
+    String key();
 
     /// check type to perform against filter
     Check check() default Check.ANY;
@@ -32,7 +32,7 @@ enum Check implements Named, BiPredicate<ContextFilter, InteractionContext> {
         EQUALS {
             @Override
             public boolean test(ContextFilter requirement, InteractionContext context) {
-                var target = context.getValue(requirement.value());
+                var target = context.getValue(requirement.key());
                 var filter = requirement.filter();
 
                 return Objects.equals(target, filter);
@@ -42,7 +42,7 @@ public boolean test(ContextFilter requirement, InteractionContext context) {
         SIMILAR {
             @Override
             public boolean test(ContextFilter requirement, InteractionContext context) {
-                var target = context.getValue(requirement.value());
+                var target = context.getValue(requirement.key());
                 var filter = requirement.filter();
 
                 if (target instanceof CharSequence) return filter.equalsIgnoreCase(target.toString());
@@ -58,7 +58,7 @@ public boolean test(ContextFilter requirement, InteractionContext context) {
         ANY {
             @Override
             public boolean test(ContextFilter requirement, InteractionContext context) {
-                var target = context.getValue(requirement.value());
+                var target = context.getValue(requirement.key());
                 var filter = requirement.filter();
 
                 return Check.any(target, filter);
@@ -68,7 +68,7 @@ public boolean test(ContextFilter requirement, InteractionContext context) {
         ABSENT {
             @Override
             public boolean test(ContextFilter requirement, InteractionContext context) {
-                var target = context.getValue(requirement.value());
+                var target = context.getValue(requirement.key());
                 var filter = requirement.filter();
 
                 return !Check.any(target, filter);

src/main/java/org/comroid/interaction/annotation/Interaction.java

@@ -67,7 +67,7 @@ public static Resolved of(Element element, @Nullable Element parent) {
                             .map(Element::interaction)
                             .flatMap(it -> Arrays.stream(it.definitions()))).toArray(ContextDefinition[]::new);
             var nameCapitalization = Arrays.stream(definitions)
-                    .filter(def -> def.value().equalsIgnoreCase(NameCapitalizer.CONTEXT_KEY))
+                    .filter(def -> def.key().equalsIgnoreCase(NameCapitalizer.CONTEXT_KEY))
                     .map(ContextDefinition::expr)
                     .flatMap(Arrays::stream)
                     .map(ThrowingFunction.fallback(Capitalization::valueOf))

src/main/java/org/comroid/interaction/component/permission/PermissionAdapter.java

@@ -0,0 +1,7 @@
+package org.comroid.interaction.component.permission;
+
+import org.comroid.interaction.model.InteractionContext;
+
+public interface PermissionAdapter {
+    boolean verifyPermission(InteractionContext context);
+}

src/main/java/org/comroid/interaction/model/InteractionContext.java

@@ -9,6 +9,7 @@
 import org.comroid.eval.MinimalExpression;
 import org.comroid.interaction.InteractionCore;
 import org.comroid.interaction.component.error.ErrorHandler;
+import org.comroid.interaction.component.permission.PermissionAdapter;
 import org.comroid.interaction.component.response.ResponseConverter;
 import org.comroid.interaction.component.response.ResponseHandler;
 import org.comroid.interaction.node.MethodNode;
@@ -56,7 +57,7 @@ public static InteractionContext.Builder basic(InteractionCore core, String... f
         var defs = new MultiValueMap<String, Object>();
         for (var def : node.getInteraction().definitions())
             defs.getUnderlying()
-                    .computeIfAbsent(def.value(), $ -> new HashSet<>())
+                    .computeIfAbsent(def.key(), $ -> new HashSet<>())
                     .addAll(Arrays.stream(def.expr()).map(MinimalExpression::evaluate).filter(Objects::nonNull).toList());
 
         return context.definitions(defs);
@@ -96,17 +97,21 @@ public Object getParameter(ParameterNode node) {
     }
 
     public void invoke() {
-        if (node.getInteraction().async()) {
-            component(ResponseHandler.class).ifPresent(it -> it.deferResponse(this));
+        try {
+            if (components(PermissionAdapter.class).noneMatch(adp -> adp.verifyPermission(this))) throw Response.of("Insufficient permissions");
 
-            CompletableFuture.supplyAsync(() -> node.invoke(this)).thenAccept(this::handle).exceptionally(t -> {
-                handle(t);
-                return null;
-            });
-        } else try {
-            var response = node.invoke(this);
+            if (node.getInteraction().async()) {
+                component(ResponseHandler.class).ifPresent(it -> it.deferResponse(this));
 
-            handle(response);
+                CompletableFuture.supplyAsync(() -> node.invoke(this)).thenAccept(this::handle).exceptionally(t -> {
+                    handle(t);
+                    return null;
+                });
+            } else {
+                var response = node.invoke(this);
+
+                handle(response);
+            }
         } catch (Response response) {
             handle((Object) response);
         } catch (Throwable t) {

src/main/java/org/comroid/interaction/node/model/ContextManipulatingNode.java

@@ -15,11 +15,11 @@ default Stream<ContextFilter> getFilter(String key) {
     }
 
     default Stream<String> getFilterValues(String key) {
-        return getFilter(key).map(ContextFilter::value);
+        return getFilter(key).map(ContextFilter::key);
     }
 
     default Stream<ContextDefinition> getDefinition(String key) {
-        return Arrays.stream(getInteraction().definitions()).filter(it -> it.value().startsWith(key));
+        return Arrays.stream(getInteraction().definitions()).filter(it -> it.key().startsWith(key));
     }
 
     default Stream<String> getDefinitionValues(String key) {

src/test/java/org/comroid/test/interaction/InteractionTest.java

@@ -11,7 +11,7 @@
 import java.util.function.IntBinaryOperator;
 
 public class InteractionTest {
-    @Interaction(filter = { @ContextFilter(value = "permission.discord", filter = "8") })
+    @Interaction(filter = { @ContextFilter(key = "permission.discord", filter = "8") })
     public static int math(
             @Parameter Operator operator, @Parameter(completion = { @Completion(strings = { "1", "2" }) }) int x,
             @Parameter(completion = { @Completion(strings = { "3", "4" }) }) int y