[AB-xxx] adding support for user installable apps to varying commands

2026-03-07 00:30:50 +00:00 · 2024-04-02 23:48:27 +02:00
parent cd3378df32
commit 732535850b
98 changed files with 1184 additions and 773 deletions
--- a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/command/ShowAvatar.java
+++ b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/command/ShowAvatar.java
@@ -2,9 +2,8 @@ package dev.sheldan.abstracto.utility.command;

 import dev.sheldan.abstracto.core.command.UtilityModuleDefinition;
 import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
-import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
-import dev.sheldan.abstracto.core.command.config.HelpInfo;
-import dev.sheldan.abstracto.core.command.config.Parameter;
+import dev.sheldan.abstracto.core.command.config.*;
+import dev.sheldan.abstracto.core.command.handler.parameter.CombinedParameter;
 import dev.sheldan.abstracto.core.interaction.slash.SlashCommandConfig;
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
@@ -19,14 +18,21 @@ import dev.sheldan.abstracto.utility.config.UtilitySlashCommandNames;
 import dev.sheldan.abstracto.utility.model.ShowAvatarModel;
 import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;

 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.CompletableFuture;

+import static dev.sheldan.abstracto.core.command.config.Parameter.ADDITIONAL_TYPES_KEY;
+
@Component
@Slf4j
 public class ShowAvatar extends AbstractConditionableCommand {
@@ -44,6 +50,9 @@ public class ShowAvatar extends AbstractConditionableCommand {
    @Autowired
    private InteractionService interactionService;

+    @Value("${abstracto.feature.avatar.imagesize}")
+    private Integer imageSize;
+
    @Override
    public CompletableFuture<CommandResult> executeAsync(CommandContext commandContext) {
        List<Object> parameters = commandContext.getParameters().getParameters();
@@ -53,7 +62,7 @@ public class ShowAvatar extends AbstractConditionableCommand {
        }
        ShowAvatarModel model = ShowAvatarModel
                .builder()
-                .memberInfo(memberToShow)
+                .avatarUrl(memberToShow.getEffectiveAvatar().getUrl(imageSize))
                .build();
        log.info("Showing avatar for member {} towards user {} in channel {} in server {}.",
                memberToShow.getId(), commandContext.getAuthor().getId(), commandContext.getChannel().getId(), commandContext.getGuild().getId());
@@ -63,15 +72,27 @@ public class ShowAvatar extends AbstractConditionableCommand {

    @Override
    public CompletableFuture<CommandResult> executeSlash(SlashCommandInteractionEvent event) {
-        Member memberToShow;
+        String avatarUrl;
+        Member targetMember;
        if(slashCommandParameterService.hasCommandOption(MEMBER_PARAMETER, event)) {
-            memberToShow = slashCommandParameterService.getCommandOption(MEMBER_PARAMETER, event, Member.class);
+            targetMember = slashCommandParameterService.getCommandOption(MEMBER_PARAMETER, event, Member.class);
        } else {
-            memberToShow = event.getMember();
+            targetMember = event.getMember();
+        }
+        if(targetMember == null) {
+            User targetUser;
+            if(slashCommandParameterService.hasCommandOption(MEMBER_PARAMETER, event)) {
+                targetUser = slashCommandParameterService.getCommandOption(MEMBER_PARAMETER, event, User.class);
+            } else {
+                targetUser = event.getUser();
+            }
+            avatarUrl = targetUser.getEffectiveAvatar().getUrl(imageSize);
+        } else {
+            avatarUrl = targetMember.getEffectiveAvatar().getUrl(imageSize);
        }
        ShowAvatarModel model = ShowAvatarModel
                .builder()
-                .memberInfo(memberToShow)
+                .avatarUrl(avatarUrl)
                .build();
        return interactionService.replyEmbed(SHOW_AVATAR_RESPONSE_TEMPLATE, model, event.getInteraction())
                .thenApply(interactionHook -> CommandResult.fromSuccess());
@@ -80,11 +101,18 @@ public class ShowAvatar extends AbstractConditionableCommand {
    @Override
    public CommandConfiguration getConfiguration() {
        List<Parameter> parameters = new ArrayList<>();
+        Map<String, Object> parameterAlternatives = new HashMap<>();
+        parameterAlternatives.put(ADDITIONAL_TYPES_KEY, List.of(
+                CombinedParameterEntry.messageParameter(Message.class),
+                CombinedParameterEntry.parameter(Member.class),
+                CombinedParameterEntry.parameter(User.class)));
        Parameter memberParameter = Parameter
                .builder()
-                .type(Member.class)
                .name(MEMBER_PARAMETER)
+                .type(CombinedParameter.class)
+                .additionalInfo(parameterAlternatives)
                .templated(true)
+                .useStrictParameters(true)
                .optional(true)
                .build();
        parameters.add(memberParameter);
@@ -96,6 +124,8 @@ public class ShowAvatar extends AbstractConditionableCommand {
        SlashCommandConfig slashCommandConfig = SlashCommandConfig
                .builder()
                .enabled(true)
+                .userInstallable(true)
+                .userCommandConfig(UserCommandConfig.guildOnly())
                .rootCommandName(UtilitySlashCommandNames.UTILITY)
                .commandName(SHOW_AVATAR_COMMAND)
                .build();
--- a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/command/UserInfo.java
+++ b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/command/UserInfo.java
@@ -2,9 +2,8 @@ package dev.sheldan.abstracto.utility.command;

 import dev.sheldan.abstracto.core.command.UtilityModuleDefinition;
 import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand;
-import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
-import dev.sheldan.abstracto.core.command.config.HelpInfo;
-import dev.sheldan.abstracto.core.command.config.Parameter;
+import dev.sheldan.abstracto.core.command.config.*;
+import dev.sheldan.abstracto.core.command.handler.parameter.CombinedParameter;
 import dev.sheldan.abstracto.core.interaction.slash.SlashCommandConfig;
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
@@ -16,6 +15,7 @@ import dev.sheldan.abstracto.core.models.template.display.MemberNameDisplay;
 import dev.sheldan.abstracto.core.models.template.display.RoleDisplay;
 import dev.sheldan.abstracto.core.service.ChannelService;
 import dev.sheldan.abstracto.core.service.MemberService;
+import dev.sheldan.abstracto.core.utils.ContextUtils;
 import dev.sheldan.abstracto.core.utils.FutureUtils;
 import dev.sheldan.abstracto.utility.config.UtilityFeatureDefinition;
 import dev.sheldan.abstracto.utility.config.UtilitySlashCommandNames;
@@ -23,6 +23,8 @@ import dev.sheldan.abstracto.utility.model.UserInfoModel;
 import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.entities.Activity;
 import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.interactions.InteractionHook;
@@ -31,11 +33,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;

-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 import java.util.concurrent.CompletableFuture;

+import static dev.sheldan.abstracto.core.command.config.Parameter.ADDITIONAL_TYPES_KEY;
+
@Component
@Slf4j
 public class UserInfo extends AbstractConditionableCommand {
@@ -71,12 +73,12 @@ public class UserInfo extends AbstractConditionableCommand {
        if(!memberToShow.hasTimeJoined()) {
            log.info("Force reloading member {} in guild {} for user info.", memberToShow.getId(), memberToShow.getGuild().getId());
            return memberService.forceReloadMember(memberToShow).thenCompose(member -> {
-                fillUserInfoModel(model,  member);
+                fillUserInfoModel(model,  member, false);
                return self.sendResponse(commandContext.getChannel(), model)
                        .thenApply(aVoid -> CommandResult.fromIgnored());
            });
        } else {
-            fillUserInfoModel(model, memberToShow);
+            fillUserInfoModel(model, memberToShow, false);
            return self.sendResponse(commandContext.getChannel(), model)
                .thenApply(aVoid -> CommandResult.fromIgnored());
        }
@@ -94,55 +96,92 @@ public class UserInfo extends AbstractConditionableCommand {

    @Override
    public CompletableFuture<CommandResult> executeSlash(SlashCommandInteractionEvent event) {
-        Member memberToShow;
-        if(slashCommandParameterService.hasCommandOption(MEMBER_PARAMETER, event)) {
-            memberToShow = slashCommandParameterService.getCommandOption(MEMBER_PARAMETER, event, Member.class);
-        } else {
-            memberToShow = event.getMember();
-        }
-        if(!memberToShow.getGuild().equals(event.getGuild())) {
-            throw new EntityGuildMismatchException();
-        }
+        boolean userCommand = ContextUtils.isUserCommandInGuild(event);
+        boolean knownGuild = ContextUtils.isGuildKnown(event);
        UserInfoModel model = UserInfoModel
                .builder()
                .build();
-        if(!memberToShow.hasTimeJoined()) {
-            log.info("Force reloading member {} in guild {} for user info.", memberToShow.getId(), memberToShow.getGuild().getId());
-            return memberService.forceReloadMember(memberToShow).thenCompose(member -> {
-                fillUserInfoModel(model, member);
+        if(knownGuild) {
+            Member memberToShow;
+            if(slashCommandParameterService.hasCommandOption(MEMBER_PARAMETER, event)) {
+                memberToShow = slashCommandParameterService.getCommandOption(MEMBER_PARAMETER, event, Member.class);
+            } else {
+                memberToShow = event.getMember();
+            }
+            if(!memberToShow.getGuild().equals(event.getGuild())) {
+                throw new EntityGuildMismatchException();
+            }
+            if(!memberToShow.hasTimeJoined()) {
+                log.info("Force reloading member {} in guild {} for user info.", memberToShow.getId(), memberToShow.getGuild().getId());
+                return memberService.forceReloadMember(memberToShow).thenCompose(member -> {
+                    fillUserInfoModel(model, member, userCommand);
+                    return self.sendResponse(event, model)
+                            .thenApply(aVoid -> CommandResult.fromIgnored());
+                });
+            } else {
+                fillUserInfoModel(model, memberToShow, userCommand);
                return self.sendResponse(event, model)
                        .thenApply(aVoid -> CommandResult.fromIgnored());
-            });
+            }
        } else {
-            fillUserInfoModel(model, memberToShow);
+            User targetUser;
+            if(slashCommandParameterService.hasCommandOption(MEMBER_PARAMETER, event)) {
+                targetUser = slashCommandParameterService.getCommandOption(MEMBER_PARAMETER, event, User.class);
+            } else {
+                targetUser = event.getUser();
+            }
+            fillUserInfoModel(model, targetUser);
            return self.sendResponse(event, model)
                    .thenApply(aVoid -> CommandResult.fromIgnored());
        }
+
    }

-    private void fillUserInfoModel(UserInfoModel model, Member member) {
+    private void fillUserInfoModel(UserInfoModel model, User targetUser) {
+        model.setCreationDate(targetUser.getTimeCreated().toInstant());
+        model.setId(targetUser.getIdLong());
+        MemberNameDisplay memberDisplay = MemberNameDisplay
+                .builder()
+                .userName(targetUser.getName())
+                .userAvatarUrl(targetUser.getEffectiveAvatarUrl())
+                .discriminator(targetUser.getDiscriminator())
+                .displayName(targetUser.getGlobalName())
+                .build();
+        model.setMemberDisplay(memberDisplay);
+    }
+
+    private void fillUserInfoModel(UserInfoModel model, Member member, boolean userCommand) {
        model.setCreationDate(member.getTimeCreated().toInstant());
        model.setJoinDate(member.getTimeJoined().toInstant());
        model.setId(member.getIdLong());
        model.setMemberDisplay(MemberNameDisplay.fromMember(member));
-        model.setOnlineStatus(member.getOnlineStatus().getKey());
-        member.getRoles().forEach(role -> model.getRoles().add(RoleDisplay.fromRole(role)));
-        member.getActivities().forEach(activity -> model.getActivities().add(activity.getType().name()));
-        Optional<Activity> customStatusOptional = member.getActivities().stream().filter(activity -> activity.getType().equals(Activity.ActivityType.CUSTOM_STATUS)).findFirst();
-        customStatusOptional.ifPresent(activity -> {
-            model.setCustomStatus(activity.getName());
-            model.setCustomEmoji(activity.getEmoji() != null ? activity.getEmoji().getFormatted() : null);
-        });
+        if(!userCommand) {
+            model.setOnlineStatus(member.getOnlineStatus().getKey());
+            member.getRoles().forEach(role -> model.getRoles().add(RoleDisplay.fromRole(role)));
+            member.getActivities().forEach(activity -> model.getActivities().add(activity.getType().name()));
+            Optional<Activity> customStatusOptional = member.getActivities().stream().filter(activity -> activity.getType().equals(Activity.ActivityType.CUSTOM_STATUS)).findFirst();
+            customStatusOptional.ifPresent(activity -> {
+                model.setCustomStatus(activity.getName());
+                model.setCustomEmoji(activity.getEmoji() != null ? activity.getEmoji().getFormatted() : null);
+            });
+        }
    }

    @Override
    public CommandConfiguration getConfiguration() {
        List<Parameter> parameters = new ArrayList<>();
+        Map<String, Object> parameterAlternatives = new HashMap<>();
+        parameterAlternatives.put(ADDITIONAL_TYPES_KEY, List.of(
+                CombinedParameterEntry.messageParameter(Message.class),
+                CombinedParameterEntry.parameter(Member.class),
+                CombinedParameterEntry.parameter(User.class)));
        Parameter memberParameter = Parameter
                .builder()
-                .type(Member.class)
                .name(MEMBER_PARAMETER)
+                .type(CombinedParameter.class)
+                .additionalInfo(parameterAlternatives)
                .templated(true)
+                .useStrictParameters(true)
                .optional(true)
                .build();
        parameters.add(memberParameter);
@@ -154,6 +193,8 @@ public class UserInfo extends AbstractConditionableCommand {
        SlashCommandConfig slashCommandConfig = SlashCommandConfig
                .builder()
                .enabled(true)
+                .userInstallable(true)
+                .userCommandConfig(UserCommandConfig.guildOnly())
                .rootCommandName(UtilitySlashCommandNames.UTILITY)
                .commandName(USER_INFO_COMMAND)
                .build();
--- a/abstracto-application/abstracto-modules/utility/utility-impl/src/main/resources/utility-config.properties
+++ b/abstracto-application/abstracto-modules/utility/utility-impl/src/main/resources/utility-config.properties
@@ -1,2 +1,4 @@
 abstracto.featureFlags.utility.featureName=utility
 abstracto.featureFlags.utility.enabled=false
+
+abstracto.feature.avatar.imagesize=4096
--- a/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/model/ShowAvatarModel.java
+++ b/abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/model/ShowAvatarModel.java
@@ -3,11 +3,10 @@ package dev.sheldan.abstracto.utility.model;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
-import net.dv8tion.jda.api.entities.Member;

@Getter
@Setter
@Builder
 public class ShowAvatarModel {
-    private Member memberInfo;
+    private String avatarUrl;
 }