validate live feed commands inside guild before user perms

Author: rfresh2

src/main/java/vc/api/VcApi.java

@@ -34,16 +34,6 @@ public ApiClient apiClient(
             ));
     }
 
-    @Bean(name = "namesApiClient")
-    public ApiClient apiClientNames(
-        final HttpClient.Builder httpClientBuilder,
-        final ObjectMapper objectMapper,
-        @Value("${API_KEY}") final String apiKey
-    ) {
-        return apiClient(httpClientBuilder, objectMapper, apiKey)
-            .setReadTimeout(Duration.ofSeconds(90));
-    }
-
     @Bean
     public ChatsApi chatsApi(final ApiClient apiClient) {
         return new ChatsApi(apiClient);

src/main/java/vc/commands/LiveFeedCommand.java

@@ -1,6 +1,5 @@
 package vc.commands;
 
-import discord4j.common.util.Snowflake;
 import discord4j.core.event.domain.interaction.ChatInputInteractionEvent;
 import discord4j.core.object.command.ApplicationCommandInteractionOption;
 import discord4j.core.object.command.ApplicationCommandInteractionOptionValue;
@@ -28,25 +27,24 @@ public LiveFeedCommand(final LiveFeed liveFeed) {
 
     @Override
     public Mono<Message> handle(final ChatInputInteractionEvent event) {
-        if (!validateUserPermissions(event)) return error(event, "You must have permission: " + Permission.MANAGE_MESSAGES
-            + " to use this command");
+        if (event.getInteraction().getGuildId().isEmpty()) return error(event, "This command can only be used inside a discord server");
+        if (!validateUserPermissions(event)) return error(event, "You must have permission: " + Permission.MANAGE_MESSAGES + " to use this command");
         Optional<Boolean> enabledBoolean = event.getOption("enabled")
             .flatMap(ApplicationCommandInteractionOption::getValue)
             .map(ApplicationCommandInteractionOptionValue::asBoolean);
         Optional<Mono<Channel>> channelArg = event.getOption("channel")
             .flatMap(ApplicationCommandInteractionOption::getValue)
             .map(ApplicationCommandInteractionOptionValue::asChannel);
         if (enabledBoolean.isEmpty() && channelArg.isEmpty()) return error(event, "At least 1 argument is required");
-        Optional<Snowflake> guildId = event.getInteraction().getGuildId();
-        if (guildId.isEmpty()) return error(event, "This command can only be used in a guild");
+        var guildId = event.getInteraction().getGuildId().get().asString();
         if (enabledBoolean.orElse(true) && channelArg.isEmpty()) return error(event, "Channel is required when enabling " + feedName());
         if (enabledBoolean.orElse(true)) {
             try {
                 final Channel channel = channelArg.get().block();
-                if (!testPermissions(guildId.get().asString(), channel)) {
+                if (!testPermissions(guildId, channel)) {
                     return error(event, "Bot must have permissions to send messages in: " + channel.getMention());
                 }
-                liveFeed.enableFeed(guildId.get().asString(), channel.getId().asString());
+                liveFeed.enableFeed(guildId, channel.getId().asString());
                 return event.createFollowup()
                     .withEmbeds(EmbedCreateSpec.builder()
                                     .title(feedName() + " Enabled")
@@ -58,7 +56,7 @@ public Mono<Message> handle(final ChatInputInteractionEvent event) {
             }
         } else {
             try {
-                liveFeed.disableFeed(guildId.get().asString());
+                liveFeed.disableFeed(guildId);
                 return event.createFollowup()
                     .withEmbeds(EmbedCreateSpec.builder()
                                     .title(feedName() + " Disabled")