Merge branch 'fix-music-player' into 'master'

Fix music player

See merge request anthorob/netneutrality!42

.gitlab-ci.yml

@@ -27,6 +27,7 @@ stages:
   - compile
   - test
   - package
+  - docker-build
 
 compile:
   stage: compile
@@ -67,3 +68,18 @@ package:
     - if: '$CI_COMMIT_BRANCH == "main"'
       when: manual
     - when: never
+
+docker-build:
+  stage: docker-build
+  image: quay.io/buildah/stable
+  script:
+    - buildah bud -f Dockerfile -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG .
+    - echo "$CI_REGISTRY_PASSWORD" | buildah login -u "$CI_REGISTRY_USER" --password-stdin "$CI_REGISTRY"
+    - buildah push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
+    - |
+      if [ "$CI_COMMIT_BRANCH" = "main" ]; then
+        buildah tag $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG $CI_REGISTRY_IMAGE:latest
+        buildah push $CI_REGISTRY_IMAGE:latest
+      fi
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" || $CI_COMMIT_BRANCH == "main"'

Dockerfile

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:21.0.6_7-jdk-alpine AS build
+FROM docker.io/library/eclipse-temurin:21.0.6_7-jdk-alpine AS build
 
 COPY .mvn/ .mvn
 COPY mvnw pom.xml ./
@@ -9,7 +9,7 @@ RUN ["chmod", "+x", "./mvnw"]
 RUN ./mvnw install
 
 
-FROM eclipse-temurin:21.0.6_7-jre-alpine
+FROM docker.io/library/eclipse-temurin:21.0.6_7-jre-alpine
 
 RUN apk add netcat-openbsd
 RUN apk add curl

pom.xml

@@ -146,7 +146,7 @@
         <dependency>
             <groupId>dev.lavalink.youtube</groupId>
             <artifactId>v2</artifactId>
-            <version>1.13.0</version>
+            <version>1.13.2</version>
         </dependency>
 
         <dependency>

src/main/java/me/bobert/netneutrality/core/tasks/TaskManager.java

@@ -271,7 +271,7 @@ public class TaskManager {
     }
 
     private void deleteInteraction(String taskId, Deletable deletable) {
-        logger.debug("Deleting interaction: {}", deletable);
+        logger.debug("Deleting interaction: {}", taskId);
 
         CommandContext context = deletableTasksContext.get(taskId);
         if (context != null) {

src/main/java/me/bobert/netneutrality/hooks/EventsHandler.java

@@ -49,7 +49,7 @@ import java.util.function.Function;
 public class EventsHandler implements EventListener {
     private static final Map<Class<? extends Event>, Function<? extends Event, Context>> listeners = new ConcurrentHashMap<>();
     private static final Logger logger = LoggerFactory.getLogger(EventsHandler.class);
-    private final ExecutorService executorService = ThreadManager.getExecutor("events-handler");
+    private static final ExecutorService executorService = ThreadManager.getExecutor("events-handler");
 
     static {
         addListener(MessageReceivedEvent.class, event -> {

src/main/java/me/bobert/netneutrality/utils/MusicUtils.java

@@ -14,9 +14,15 @@ import net.dv8tion.jda.api.entities.GuildVoiceState;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.channel.middleman.AudioChannel;
 import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.util.Objects;
 
 public class MusicUtils {
 
+    private static final Logger logger = LogManager.getLogger(MusicUtils.class);
+
     public static boolean connect(Context context) {
         return connect(context, false);
     }
@@ -75,16 +81,25 @@ public class MusicUtils {
     }
 
     public static AudioChannel getVoiceChannel(Context context) {
-        GuildVoiceState memberVoiceState = context.getGuildUser().getVoiceState();
+        Member member = context.getGuildUser();
+        logger.debug("User: {}", member);
+
+        GuildVoiceState memberVoiceState = member.getVoiceState();
 
         if (memberVoiceState == null) {
             throw new ContextException("Voice state is null", context, null);
         }
 
+        logger.debug("channel: {}", memberVoiceState.getChannel());
         if (!memberVoiceState.inAudioChannel()) {
+            logger.debug("inAudioChannel() is false");
             return null;
         }
 
+        if (memberVoiceState.getChannel() != null) {
+            logger.debug(memberVoiceState.getChannel().getId());
+        }
+
         return memberVoiceState.getChannel();
     }