🔨 Add connect api command

src/main/java/net/Broken/Api/Controllers/AudioController.java

@@ -1,8 +1,10 @@
 package net.Broken.Api.Controllers;
 
+import net.Broken.Api.Data.Music.Connect;
 import net.Broken.Api.Data.Music.Status;
 import net.Broken.Api.Security.Data.JwtPrincipal;
 import net.Broken.Api.Services.AudioService;
+import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.Authentication;
 import org.springframework.web.bind.annotation.*;
@@ -25,4 +27,11 @@ public class AudioController {
         JwtPrincipal principal = (JwtPrincipal) authentication.getPrincipal();
         return audioService.getGuildAudioStatus(guildId, principal.user().getDiscordId());
     }
+
+
+    @PostMapping("/{guildId}/connect")
+    @PreAuthorize("isInGuild(#guildId) && canInteractWithVoiceChannel(#guildId, #body)")
+    public ResponseEntity<String> connect(@PathVariable String guildId, @RequestBody Connect body){
+        return audioService.connect(guildId, body);
+    }
 }

src/main/java/net/Broken/Api/Data/Music/Connect.java

@@ -0,0 +1,4 @@
+package net.Broken.Api.Data.Music;
+
+public record Connect(String channelId) {
+}

src/main/java/net/Broken/Api/Security/Expression/CustomMethodSecurityExpressionRoot.java

@@ -1,11 +1,13 @@
 package net.Broken.Api.Security.Expression;
 
+import net.Broken.Api.Data.Music.Connect;
 import net.Broken.Api.Security.Data.JwtPrincipal;
 import net.Broken.MainBot;
 import net.Broken.Tools.CacheTools;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.VoiceChannel;
 import okhttp3.Cache;
 import org.springframework.security.access.expression.SecurityExpressionRoot;
 import org.springframework.security.access.expression.method.MethodSecurityExpressionOperations;
@@ -41,6 +43,21 @@ public class CustomMethodSecurityExpressionRoot
         );
     }
 
+    public boolean canInteractWithVoiceChannel(String guildId, Connect connectPayload){
+        JwtPrincipal jwtPrincipal = (JwtPrincipal) authentication.getPrincipal();
+        Guild guild = MainBot.jda.getGuildById(guildId);
+        Member member = guild.getMemberById(jwtPrincipal.user().getDiscordId());
+        VoiceChannel channel = guild.getVoiceChannelById(connectPayload.channelId());
+        if( channel == null){
+            return false;
+        }
+
+       return  (member.hasPermission(channel, Permission.VOICE_CONNECT)
+                || member.getVoiceState() != null
+                && member.getVoiceState().getChannel() == channel)
+                && member.hasPermission(channel, Permission.VOICE_SPEAK);
+    }
+
     @Override
     public void setFilterObject(Object filterObject) {
         this.filterObject = filterObject;

src/main/java/net/Broken/Api/Services/AudioService.java

@@ -1,6 +1,7 @@
 package net.Broken.Api.Services;
 
 import net.Broken.Api.Data.Guild.Channel;
+import net.Broken.Api.Data.Music.Connect;
 import net.Broken.Api.Data.Music.PlayBackInfo;
 import net.Broken.Api.Data.Music.Status;
 import net.Broken.Api.Data.Music.TrackInfo;
@@ -12,6 +13,8 @@ import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.GuildVoiceState;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.VoiceChannel;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
 @Service
@@ -28,15 +31,18 @@ public class AudioService {
 //                  -> He can view the voice channel
 //                  -> OR He can *not* view the voice channel, but he is connected to this voice channel
                 boolean canView = member.hasPermission(channel, Permission.VIEW_CHANNEL)
-                        || (member.getVoiceState() != null && member.getVoiceState().getChannel() == channel);
+                        || (member.getVoiceState() != null
+                        && member.getVoiceState().getChannel() == channel);
                 if (canView) {
 //                  The user can interact with the audio if:
 //                      -> He can connect to this voice channel
+//                          -> OR he is connected to this voice channel
 //                      -> AND He can speak in this voice channel
-//                      -> AND He is connected to this voice channel
-                    boolean canInteract = member.hasPermission(channel, Permission.VOICE_CONNECT, Permission.VOICE_SPEAK)
-                            && member.getVoiceState() != null
-                            && member.getVoiceState().getChannel() == channel;
+                    boolean canInteract = (member.hasPermission(channel, Permission.VOICE_CONNECT)
+                            || member.getVoiceState() != null
+                            && member.getVoiceState().getChannel() == channel)
+                            && member.hasPermission(channel, Permission.VOICE_SPEAK);
+
                     AudioM audioM = AudioM.getInstance(guild);
                     boolean stopped = audioM.getGuildAudioPlayer().player.getPlayingTrack() == null;
                     PlayBackInfo playBackInfo;
@@ -62,4 +68,14 @@ public class AudioService {
         }
         return new Status(false, null, null, null, null);
     }
+    
+    public ResponseEntity<String> connect(String guildId, Connect body){
+        Guild guild = MainBot.jda.getGuildById(guildId);
+        AudioM audioM = AudioM.getInstance(guild);
+        VoiceChannel voiceChannel = guild.getVoiceChannelById(body.channelId());
+        audioM.getGuildAudioPlayer();
+        guild.getAudioManager().openAudioConnection(voiceChannel);
+        audioM.setPlayedChanel(voiceChannel);
+        return new ResponseEntity<>("OK", HttpStatus.OK);
+    }
 }