tueem/Marinara
1
1
Fork 0
Code Issues 2 Pull Requests 1 Actions Packages Projects 1 Releases Wiki Activity

change: getInteractionType check changed from class based to context based check
All checks were successful
github-mirror / push-github (push) Successful in 4s
Details
Build / Gradle-Build (push) Successful in 16s
Details
Test / Gradle-Test (push) Successful in 14s
Details

Browse Source
This commit is contained in:
tueem 2025-02-17 09:15:54 +01:00
parent 9d88ca902d
commit b4af922ac2
Signed by: tueem
GPG Key ID: 65C8667EC17A88FB
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/src/main/java/net/tomatentum/marinara/registry/InteractionRegistry.java
View File

@ -66,7 +66,7 @@ public class InteractionRegistry {
} }
public void handle(Object context) { public void handle(Object context) {
InteractionType type = marinara.getWrapper().getInteractionType(context.getClass()); InteractionType type = marinara.getWrapper().getInteractionType(context);
logger.debug("Received {} interaction ", context); logger.debug("Received {} interaction ", context);
interactionMethods.forEach((m) -> { interactionMethods.forEach((m) -> {
if (m.getType().equals(type) && m.canRun(context)) { if (m.getType().equals(type) && m.canRun(context)) {

2
lib/src/main/java/net/tomatentum/marinara/wrapper/LibraryWrapper.java
View File

@ -29,7 +29,7 @@ public abstract class LibraryWrapper {
interactionSubscriber.remove(consumer); interactionSubscriber.remove(consumer);
} }
public abstract InteractionType getInteractionType(Class<?> clazz); public abstract InteractionType getInteractionType(Object context);
public abstract void registerSlashCommands(SlashCommandDefinition[] defs); public abstract void registerSlashCommands(SlashCommandDefinition[] defs);
public abstract Object convertCommandOption(Object context, SlashCommandOptionType type, String optionName); public abstract Object convertCommandOption(Object context, SlashCommandOptionType type, String optionName);

6
wrapper/javacord/src/main/java/net/tomatentum/marinara/wrapper/javacord/JavacordWrapper.java
View File

@ -42,10 +42,10 @@ public class JavacordWrapper extends LibraryWrapper {
} }
@Override @Override
public InteractionType getInteractionType(Class<?> clazz) { public InteractionType getInteractionType(Object context) {
if (ApplicationCommandInteraction.class.isAssignableFrom(clazz)) if (ApplicationCommandInteraction.class.isAssignableFrom(context.getClass()))
return InteractionType.COMMAND; return InteractionType.COMMAND;
if (ButtonInteraction.class.isAssignableFrom(clazz)) if (ButtonInteraction.class.isAssignableFrom(context.getClass()))
return InteractionType.BUTTON; return InteractionType.BUTTON;
return null; return null;