[AB-365] introducing slash commands for a selection of commands

adding method for pinning a message
moving suggestion to correct deployment

abstracto-application/abstracto-modules/starboard/starboard-impl/src/main/java/dev/sheldan/abstracto/starboard/command/StarStats.java

@@ -5,15 +5,22 @@ 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.SlashCommandConfig;
 import dev.sheldan.abstracto.core.command.execution.CommandContext;
 import dev.sheldan.abstracto.core.command.execution.CommandResult;
+import dev.sheldan.abstracto.core.command.slash.parameter.SlashCommandParameterService;
 import dev.sheldan.abstracto.core.config.FeatureDefinition;
+import dev.sheldan.abstracto.core.interaction.InteractionService;
 import dev.sheldan.abstracto.core.service.ChannelService;
+import dev.sheldan.abstracto.core.templating.model.MessageToSend;
+import dev.sheldan.abstracto.core.templating.service.TemplateService;
 import dev.sheldan.abstracto.core.utils.FutureUtils;
 import dev.sheldan.abstracto.starboard.config.StarboardFeatureDefinition;
+import dev.sheldan.abstracto.starboard.config.StarboardSlashCommandNames;
 import dev.sheldan.abstracto.starboard.model.template.MemberStarStatsModel;
 import dev.sheldan.abstracto.starboard.service.StarboardService;
 import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -26,6 +33,8 @@ public class StarStats extends AbstractConditionableCommand {
 
     public static final String STARSTATS_RESPONSE_TEMPLATE = "starStats_response";
     public static final String STARSTATS_SINGLE_MEMBER_RESPONSE_TEMPLATE = "starStats_single_member_response";
+    private static final String STAR_STATS_COMMAND = "starStats";
+    private static final String MEMBER_PARAMETER = "member";
 
     @Autowired
     private StarboardService starboardService;
@@ -33,31 +42,77 @@ public class StarStats extends AbstractConditionableCommand {
     @Autowired
     private ChannelService channelService;
 
+    @Autowired
+    private TemplateService templateService;
+
+    @Autowired
+    private SlashCommandParameterService slashCommandParameterService;
+
+    @Autowired
+    private InteractionService interactionService;
+
     @Override
     public CompletableFuture<CommandResult> executeAsync(CommandContext commandContext) {
         List<Object> parameters = commandContext.getParameters().getParameters();
         if(parameters.isEmpty()) {
             return starboardService.retrieveStarStats(commandContext.getGuild().getIdLong())
-                    .thenCompose(starStatsModel ->
-                            FutureUtils.toSingleFutureGeneric(channelService.sendEmbedTemplateInTextChannelList(STARSTATS_RESPONSE_TEMPLATE, starStatsModel, commandContext.getChannel()))
-                    ).thenApply(o -> CommandResult.fromIgnored());
+                    .thenCompose(starStatsModel -> {
+                            MessageToSend messageToSend = templateService.renderEmbedTemplate(STARSTATS_RESPONSE_TEMPLATE, starStatsModel, commandContext.getGuild().getIdLong());
+                            return FutureUtils.toSingleFutureGeneric(channelService.sendMessageToSendToChannel(messageToSend, commandContext.getChannel()));
+                    }).thenApply(o -> CommandResult.fromIgnored());
         } else {
             Member targetMember = (Member) parameters.get(0);
             MemberStarStatsModel memberStarStatsModel = starboardService.retrieveStarStatsForMember(targetMember);
-            return FutureUtils.toSingleFutureGeneric(channelService.sendEmbedTemplateInTextChannelList(STARSTATS_SINGLE_MEMBER_RESPONSE_TEMPLATE, memberStarStatsModel, commandContext.getChannel()))
+            MessageToSend messageToSend = templateService.renderEmbedTemplate(STARSTATS_SINGLE_MEMBER_RESPONSE_TEMPLATE, memberStarStatsModel, commandContext.getGuild().getIdLong());
+            return FutureUtils.toSingleFutureGeneric(channelService.sendMessageToSendToChannel(messageToSend, commandContext.getChannel()))
                     .thenApply(unused -> CommandResult.fromIgnored());
         }
     }
 
+    @Override
+    public CompletableFuture<CommandResult> executeSlash(SlashCommandInteractionEvent event) {
+        if(slashCommandParameterService.hasCommandOption(MEMBER_PARAMETER, event)) {
+            Member targetMember = slashCommandParameterService.getCommandOption(MEMBER_PARAMETER, event, Member.class, Member.class);
+            MemberStarStatsModel memberStarStatsModel = starboardService.retrieveStarStatsForMember(targetMember);
+            MessageToSend messageToSend = templateService.renderEmbedTemplate(STARSTATS_SINGLE_MEMBER_RESPONSE_TEMPLATE, memberStarStatsModel, event.getGuild().getIdLong());
+            return interactionService.replyMessageToSend(messageToSend, event)
+                    .thenApply(interactionHook -> CommandResult.fromSuccess());
+        } else {
+            return starboardService.retrieveStarStats(event.getGuild().getIdLong())
+                    .thenCompose(starStatsModel -> {
+                        MessageToSend messageToSend = templateService.renderEmbedTemplate(STARSTATS_RESPONSE_TEMPLATE, starStatsModel, event.getGuild().getIdLong());
+                        return interactionService.replyMessageToSend(messageToSend, event);
+                    }).thenApply(o -> CommandResult.fromIgnored());
+        }
+    }
+
     @Override
     public CommandConfiguration getConfiguration() {
-        Parameter memberParameter = Parameter.builder().templated(true).name("member").type(Member.class).optional(true).build();
+        Parameter memberParameter = Parameter
+                .builder()
+                .templated(true)
+                .name(MEMBER_PARAMETER)
+                .type(Member.class)
+                .optional(true)
+                .build();
         List<Parameter> parameters = Collections.singletonList(memberParameter);
-        HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
+        HelpInfo helpInfo = HelpInfo
+                .builder()
+                .templated(true)
+                .build();
+
+        SlashCommandConfig slashCommandConfig = SlashCommandConfig
+                .builder()
+                .enabled(true)
+                .rootCommandName(StarboardSlashCommandNames.STARBOARD)
+                .commandName(STAR_STATS_COMMAND)
+                .build();
+
         return CommandConfiguration.builder()
-                .name("starStats")
+                .name(STAR_STATS_COMMAND)
                 .module(UtilityModuleDefinition.UTILITY)
                 .templated(true)
+                .slashCommandConfig(slashCommandConfig)
                 .async(true)
                 .supportsEmbedException(true)
                 .causesReaction(false)

abstracto-application/abstracto-modules/starboard/starboard-impl/src/test/java/dev/sheldan/abstracto/starboard/command/StarStatsTest.java

@@ -1,63 +0,0 @@
-package dev.sheldan.abstracto.starboard.command;
-
-import dev.sheldan.abstracto.core.command.execution.CommandContext;
-import dev.sheldan.abstracto.core.command.execution.CommandResult;
-import dev.sheldan.abstracto.core.service.ChannelService;
-import dev.sheldan.abstracto.core.test.command.CommandConfigValidator;
-import dev.sheldan.abstracto.core.test.command.CommandTestUtilities;
-import dev.sheldan.abstracto.starboard.model.template.GuildStarStatsModel;
-import dev.sheldan.abstracto.starboard.model.template.MemberStarStatsModel;
-import dev.sheldan.abstracto.starboard.service.StarboardService;
-import net.dv8tion.jda.api.entities.Member;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import java.util.Arrays;
-import java.util.concurrent.CompletableFuture;
-
-import static org.mockito.Mockito.*;
-
-@RunWith(MockitoJUnitRunner.class)
-public class StarStatsTest {
-
-    @InjectMocks
-    private StarStats testUnit;
-
-    @Mock
-    private StarboardService starboardService;
-
-    @Mock
-    private ChannelService channelService;
-
-    @Test
-    public void executeCommand() {
-        CommandContext noParameters = CommandTestUtilities.getNoParameters();
-        GuildStarStatsModel guildStarStatsModel = Mockito.mock(GuildStarStatsModel.class);
-        when(starboardService.retrieveStarStats(noParameters.getGuild().getIdLong())).thenReturn(CompletableFuture.completedFuture(guildStarStatsModel));
-        CompletableFuture<CommandResult> result = testUnit.executeAsync(noParameters);
-        verify(channelService, times(1)).sendEmbedTemplateInTextChannelList(StarStats.STARSTATS_RESPONSE_TEMPLATE, guildStarStatsModel, noParameters.getChannel());
-        CommandTestUtilities.checkSuccessfulCompletionAsync(result);
-    }
-
-    @Test
-    public void executeCommandForMember() {
-        Member member = Mockito.mock(Member.class);
-        CommandContext memberParameter = CommandTestUtilities.getWithParameters(Arrays.asList(member));
-        MemberStarStatsModel model = Mockito.mock(MemberStarStatsModel.class);
-        when(starboardService.retrieveStarStatsForMember(member)).thenReturn(model);
-        CompletableFuture<CommandResult> result = testUnit.executeAsync(memberParameter);
-        verify(channelService, times(1)).sendEmbedTemplateInTextChannelList(StarStats.STARSTATS_SINGLE_MEMBER_RESPONSE_TEMPLATE, model, memberParameter.getChannel());
-        CommandTestUtilities.checkSuccessfulCompletionAsync(result);
-    }
-
-
-    @Test
-    public void validateCommand() {
-        CommandConfigValidator.validateCommandConfiguration(testUnit.getConfiguration());
-    }
-
-}