From 57b4583fd7b6aff47af033fbd870283da54f9b55 Mon Sep 17 00:00:00 2001 From: sclement Date: Thu, 14 Dec 2023 17:21:23 +0100 Subject: [PATCH] Spring boot 3 --- .vscode/settings.json | 7 +- .../Api/Controllers/AudioController.java | 24 +-- .../Api/Controllers/AuthController.java | 7 +- .../Controllers/CrossOptionController.java | 10 +- .../Api/Controllers/GuildController.java | 6 +- .../Api/Controllers/SettingController.java | 10 +- src/main/java/net/Broken/Api/Data/Login.java | 2 +- .../Broken/Api/Data/Music/PlayBackInfo.java | 9 +- .../net/Broken/Api/Data/Music/Status.java | 13 +- .../net/Broken/Api/Data/Music/TrackInfo.java | 3 +- .../Api/Data/Settings/SettingDescriber.java | 3 +- .../Api/Data/Settings/SettingGroup.java | 7 +- .../net/Broken/Api/OpenApi/OpenApiConfig.java | 4 +- .../DiscordAuthenticationProvider.java | 8 +- .../Components/UnauthorizedHandler.java | 12 +- .../Security/Data/DiscordOauthUserInfo.java | 9 +- ...CustomMethodSecurityExpressionHandler.java | 25 --- .../CustomMethodSecurityExpressionRoot.java | 102 ---------- .../Api/Security/Expression/WebSecurity.java | 69 +++++++ .../Api/Security/Filters/JwtFilter.java | 21 ++- .../Broken/Api/Security/SecurityConfig.java | 14 +- .../Api/Security/Services/JwtService.java | 49 +++-- .../net/Broken/Api/Services/AudioService.java | 28 +-- .../net/Broken/Api/Services/GuildService.java | 9 +- .../Broken/Api/Services/SettingService.java | 4 +- .../Broken/Audio/AudioPlayerSendHandler.java | 15 +- .../Broken/Audio/GuildAudioBotService.java | 121 ++++++------ .../java/net/Broken/Audio/TrackScheduler.java | 31 +-- src/main/java/net/Broken/BotConfigLoader.java | 14 +- src/main/java/net/Broken/Commande.java | 2 - .../DB/Entity/GuildPreferenceEntity.java | 31 +-- .../java/net/Broken/DB/Entity/UserEntity.java | 14 +- .../java/net/Broken/DB/Entity/UserStats.java | 8 +- .../Repository/GuildPreferenceRepository.java | 5 +- src/main/java/net/Broken/Init.java | 24 +-- src/main/java/net/Broken/MainBot.java | 5 +- .../java/net/Broken/SlashCommands/Cat.java | 7 +- .../java/net/Broken/SlashCommands/Clear.java | 6 +- .../java/net/Broken/SlashCommands/Music.java | 15 +- .../net/Broken/SlashCommands/Over18/Ass.java | 5 +- .../Broken/SlashCommands/Over18/Boobs.java | 2 - .../Broken/SlashCommands/Over18/Madame.java | 8 +- .../java/net/Broken/SlashCommands/Rank.java | 9 +- .../net/Broken/Tools/AutoVoiceChannel.java | 1 - .../Broken/Tools/Command/CommandParser.java | 15 +- .../Tools/Command/NumberedSlashCommand.java | 6 +- .../Tools/Command/SlashCommandLoader.java | 18 +- .../Broken/Tools/DayListener/DayListener.java | 7 +- .../DayListener/Listeners/DailyMadame.java | 29 ++- .../net/Broken/Tools/EmbedMessageUtils.java | 39 ++-- .../Broken/Tools/FindContentOnWebPage.java | 82 ++++---- .../java/net/Broken/Tools/LimitChecker.java | 2 - .../Broken/Tools/Random/Data/RandomData.java | 15 +- .../net/Broken/Tools/Random/TrueRandom.java | 25 +-- .../java/net/Broken/Tools/Redirection.java | 7 +- .../Settings/SettingDescriptionBuilder.java | 177 +++++++++--------- .../Broken/Tools/Settings/SettingSaver.java | 17 +- .../Tools/Settings/SettingValueBuilder.java | 132 ++++++------- .../java/net/Broken/Tools/SettingsUtils.java | 2 +- .../java/net/Broken/Tools/TimeConvertor.java | 4 +- .../UserManager/Stats/UserStatsUtils.java | 56 +++--- src/main/java/net/Broken/VersionLoader.java | 6 +- src/main/resources/application.yml | 2 +- .../db/changelog/db.changelog-master.yml | 31 --- 64 files changed, 670 insertions(+), 780 deletions(-) delete mode 100644 src/main/java/net/Broken/Api/Security/Expression/CustomMethodSecurityExpressionHandler.java delete mode 100644 src/main/java/net/Broken/Api/Security/Expression/CustomMethodSecurityExpressionRoot.java create mode 100644 src/main/java/net/Broken/Api/Security/Expression/WebSecurity.java diff --git a/.vscode/settings.json b/.vscode/settings.json index f7a6660..deaad8b 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,4 +1,7 @@ { "java.configuration.updateBuildConfiguration": "automatic", - "java.compile.nullAnalysis.mode": "disabled" -} \ No newline at end of file + "java.compile.nullAnalysis.mode": "disabled", + "editor.codeActionsOnSave": { + "source.organizeImports": true + } +} diff --git a/src/main/java/net/Broken/Api/Controllers/AudioController.java b/src/main/java/net/Broken/Api/Controllers/AudioController.java index ee7bce0..c0cf857 100644 --- a/src/main/java/net/Broken/Api/Controllers/AudioController.java +++ b/src/main/java/net/Broken/Api/Controllers/AudioController.java @@ -23,60 +23,60 @@ public class AudioController { this.audioService = audioService; } - @GetMapping("/{guildId}/status") - @PreAuthorize("isInGuild(#guildId)") + @PreAuthorize("@webSecurity.isInGuild(#guildId)") public Status getMusicStatus(@PathVariable String guildId, Authentication authentication) { JwtPrincipal principal = (JwtPrincipal) authentication.getPrincipal(); return audioService.getGuildAudioStatus(guildId, principal.user().getDiscordId()); } - @PostMapping("/{guildId}/connect") - @PreAuthorize("isInGuild(#guildId) && canInteractWithVoiceChannel(#guildId, #body)") - public ResponseEntity connect(@PathVariable String guildId, @RequestBody Connect body, Authentication authentication) { + @PreAuthorize("@webSecurity.isInGuild(#guildId) && @webSecurity.canInteractWithVoiceChannel(#guildId, #body)") + public ResponseEntity connect(@PathVariable String guildId, @RequestBody Connect body, + Authentication authentication) { JwtPrincipal principal = (JwtPrincipal) authentication.getPrincipal(); return audioService.connect(guildId, body, principal.user().getDiscordId()); } @PostMapping("/{guildId}/disconnect") - @PreAuthorize("isInGuild(#guildId) && canInteractWithVoiceChannel(#guildId)") + @PreAuthorize("@webSecurity.isInGuild(#guildId) && @webSecurity.canInteractWithVoiceChannel(#guildId)") public ResponseEntity disconnect(@PathVariable String guildId, Authentication authentication) { JwtPrincipal principal = (JwtPrincipal) authentication.getPrincipal(); return audioService.disconnect(guildId, principal.user().getDiscordId()); } @PostMapping("/{guildId}/resume") - @PreAuthorize("isInGuild(#guildId) && canInteractWithVoiceChannel(#guildId)") + @PreAuthorize("@webSecurity.isInGuild(#guildId) && @webSecurity.canInteractWithVoiceChannel(#guildId)") public ResponseEntity resume(@PathVariable String guildId, Authentication authentication) { JwtPrincipal principal = (JwtPrincipal) authentication.getPrincipal(); return audioService.resume(guildId, principal.user().getDiscordId()); } @PostMapping("/{guildId}/pause") - @PreAuthorize("isInGuild(#guildId) && canInteractWithVoiceChannel(#guildId)") + @PreAuthorize("@webSecurity.isInGuild(#guildId) && @webSecurity.canInteractWithVoiceChannel(#guildId)") public ResponseEntity pause(@PathVariable String guildId, Authentication authentication) { JwtPrincipal principal = (JwtPrincipal) authentication.getPrincipal(); return audioService.pause(guildId, principal.user().getDiscordId()); } @PostMapping("/{guildId}/skip") - @PreAuthorize("isInGuild(#guildId) && canInteractWithVoiceChannel(#guildId)") + @PreAuthorize("@webSecurity.isInGuild(#guildId) && @webSecurity.canInteractWithVoiceChannel(#guildId)") public ResponseEntity skip(@PathVariable String guildId, Authentication authentication) { JwtPrincipal principal = (JwtPrincipal) authentication.getPrincipal(); return audioService.skip(guildId, principal.user().getDiscordId()); } @PostMapping("/{guildId}/stop") - @PreAuthorize("isInGuild(#guildId) && canInteractWithVoiceChannel(#guildId)") + @PreAuthorize("@webSecurity.isInGuild(#guildId) && @webSecurity.canInteractWithVoiceChannel(#guildId)") public ResponseEntity stop(@PathVariable String guildId, Authentication authentication) { JwtPrincipal principal = (JwtPrincipal) authentication.getPrincipal(); return audioService.stop(guildId, principal.user().getDiscordId()); } @PostMapping("/{guildId}/add") - @PreAuthorize("isInGuild(#guildId) && canInteractWithVoiceChannel(#guildId)") - public ResponseEntity add(@PathVariable String guildId, @RequestBody Add body, Authentication authentication) throws ExecutionException, InterruptedException { + @PreAuthorize("@webSecurity.isInGuild(#guildId) && @webSecurity.canInteractWithVoiceChannel(#guildId)") + public ResponseEntity add(@PathVariable String guildId, @RequestBody Add body, + Authentication authentication) throws ExecutionException, InterruptedException { JwtPrincipal principal = (JwtPrincipal) authentication.getPrincipal(); return audioService.add(guildId, principal.user().getDiscordId(), body); } diff --git a/src/main/java/net/Broken/Api/Controllers/AuthController.java b/src/main/java/net/Broken/Api/Controllers/AuthController.java index 75d6c43..89795c5 100644 --- a/src/main/java/net/Broken/Api/Controllers/AuthController.java +++ b/src/main/java/net/Broken/Api/Controllers/AuthController.java @@ -19,7 +19,8 @@ public class AuthController { private final JwtService jwtService; - public AuthController(AuthenticationManager authenticationManager, UserRepository userRepository, JwtService jwtService) { + public AuthController(AuthenticationManager authenticationManager, UserRepository userRepository, + JwtService jwtService) { this.authenticationManager = authenticationManager; this.jwtService = jwtService; } @@ -27,14 +28,12 @@ public class AuthController { @PostMapping("/discord") public JwtResponse loginDiscord(@Validated @RequestBody Login login) { Authentication authentication = authenticationManager.authenticate( - new UsernamePasswordAuthenticationToken(login.redirectUri(), login.code()) - ); + new UsernamePasswordAuthenticationToken(login.redirectUri(), login.code())); UserEntity user = (UserEntity) authentication.getPrincipal(); String jwt = jwtService.buildJwt(user); - return new JwtResponse(jwt); } } diff --git a/src/main/java/net/Broken/Api/Controllers/CrossOptionController.java b/src/main/java/net/Broken/Api/Controllers/CrossOptionController.java index 69b7b24..fd45139 100644 --- a/src/main/java/net/Broken/Api/Controllers/CrossOptionController.java +++ b/src/main/java/net/Broken/Api/Controllers/CrossOptionController.java @@ -8,7 +8,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; - @RestController @RequestMapping("/api/v2") @CrossOrigin(origins = "*", maxAge = 3600) @@ -16,13 +15,10 @@ import org.springframework.web.bind.annotation.RestController; public class CrossOptionController { /** - * For cross preflight request send by axios + * For cross preflight request send by axios */ - @RequestMapping( - value = "/**", - method = RequestMethod.OPTIONS - ) + @RequestMapping(value = "/**", method = RequestMethod.OPTIONS) public ResponseEntity handle() { - return new ResponseEntity<>("",HttpStatus.OK); + return new ResponseEntity<>("", HttpStatus.OK); } } diff --git a/src/main/java/net/Broken/Api/Controllers/GuildController.java b/src/main/java/net/Broken/Api/Controllers/GuildController.java index cf84cc1..9787d12 100644 --- a/src/main/java/net/Broken/Api/Controllers/GuildController.java +++ b/src/main/java/net/Broken/Api/Controllers/GuildController.java @@ -41,21 +41,21 @@ public class GuildController { } @GetMapping("/{guildId}/voiceChannels") - @PreAuthorize("isInGuild(#guildId)") + @PreAuthorize("@webSecurity.isInGuild(#guildId)") public List getVoiceChannels(@PathVariable String guildId, Authentication authentication) { JwtPrincipal principal = (JwtPrincipal) authentication.getPrincipal(); return guildService.getVoiceChannel(guildId, principal.user().getDiscordId()); } @GetMapping("/{guildId}/textChannels") - @PreAuthorize("isInGuild(#guildId)") + @PreAuthorize("@webSecurity.isInGuild(#guildId)") public List getTextChannels(@PathVariable String guildId, Authentication authentication) { JwtPrincipal principal = (JwtPrincipal) authentication.getPrincipal(); return guildService.getTextChannel(guildId, principal.user().getDiscordId()); } @GetMapping("/{guildId}/roles") - @PreAuthorize("isInGuild(#guildId)") + @PreAuthorize("@webSecurity.isInGuild(#guildId)") public List getRoles(@PathVariable String guildId) { return guildService.getRole(guildId); } diff --git a/src/main/java/net/Broken/Api/Controllers/SettingController.java b/src/main/java/net/Broken/Api/Controllers/SettingController.java index 2cbe1f6..2d10718 100644 --- a/src/main/java/net/Broken/Api/Controllers/SettingController.java +++ b/src/main/java/net/Broken/Api/Controllers/SettingController.java @@ -21,19 +21,19 @@ public class SettingController { } @GetMapping("description") - public List getSettingDescription(){ + public List getSettingDescription() { return settingService.getSettingDescription(); } @GetMapping("/{guildId}/values") - @PreAuthorize("isInGuild(#guildId) && canManageGuild(#guildId)") - public List getSettingValues(@PathVariable String guildId){ + @PreAuthorize("@webSecurity.isInGuild(#guildId) && @webSecurity.canManageGuild(#guildId)") + public List getSettingValues(@PathVariable String guildId) { return settingService.getValues(guildId); } @PostMapping("/{guildId}/values") - @PreAuthorize("isInGuild(#guildId) && canManageGuild(#guildId)") - public List getSettingValues(@PathVariable String guildId, @RequestBody List values){ + @PreAuthorize("@webSecurity.isInGuild(#guildId) && @webSecurity.anManageGuild(#guildId)") + public List getSettingValues(@PathVariable String guildId, @RequestBody List values) { GuildPreferenceEntity pref = settingService.saveValue(guildId, values); return new SettingValueBuilder(pref).build(); } diff --git a/src/main/java/net/Broken/Api/Data/Login.java b/src/main/java/net/Broken/Api/Data/Login.java index ffa13f1..7b9c6a1 100644 --- a/src/main/java/net/Broken/Api/Data/Login.java +++ b/src/main/java/net/Broken/Api/Data/Login.java @@ -1,6 +1,6 @@ package net.Broken.Api.Data; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; public record Login( @NotBlank String code, @NotBlank String redirectUri) { diff --git a/src/main/java/net/Broken/Api/Data/Music/PlayBackInfo.java b/src/main/java/net/Broken/Api/Data/Music/PlayBackInfo.java index 67079a0..5c140f4 100644 --- a/src/main/java/net/Broken/Api/Data/Music/PlayBackInfo.java +++ b/src/main/java/net/Broken/Api/Data/Music/PlayBackInfo.java @@ -4,9 +4,8 @@ import com.fasterxml.jackson.annotation.JsonInclude; @JsonInclude(JsonInclude.Include.NON_NULL) public record PlayBackInfo( - Boolean paused, - Boolean stopped, - Long progress, - TrackInfo trackInfo -) { + Boolean paused, + Boolean stopped, + Long progress, + TrackInfo trackInfo) { } diff --git a/src/main/java/net/Broken/Api/Data/Music/Status.java b/src/main/java/net/Broken/Api/Data/Music/Status.java index 99fafa9..da1625a 100644 --- a/src/main/java/net/Broken/Api/Data/Music/Status.java +++ b/src/main/java/net/Broken/Api/Data/Music/Status.java @@ -6,11 +6,10 @@ import net.dv8tion.jda.api.audio.hooks.ConnectionStatus; @JsonInclude(JsonInclude.Include.NON_NULL) public record Status( - Boolean connected, - ConnectionStatus connectionStatus, - Channel channel, - Boolean canView, - Boolean canInteract, - PlayBackInfo playBackInfo -) { + Boolean connected, + ConnectionStatus connectionStatus, + Channel channel, + Boolean canView, + Boolean canInteract, + PlayBackInfo playBackInfo) { } diff --git a/src/main/java/net/Broken/Api/Data/Music/TrackInfo.java b/src/main/java/net/Broken/Api/Data/Music/TrackInfo.java index 1d99679..749827a 100644 --- a/src/main/java/net/Broken/Api/Data/Music/TrackInfo.java +++ b/src/main/java/net/Broken/Api/Data/Music/TrackInfo.java @@ -7,7 +7,8 @@ import net.Broken.Audio.UserAudioTrack; public record TrackInfo(UserInfo submitter, AudioTrackInfo detail) { public TrackInfo(UserAudioTrack userAudioTrack) { - this(new UserInfo(userAudioTrack.getSubmittedUser().getId(), userAudioTrack.getSubmittedUser().getName(), userAudioTrack.getSubmittedUser().getAvatarUrl()), + this(new UserInfo(userAudioTrack.getSubmittedUser().getId(), userAudioTrack.getSubmittedUser().getName(), + userAudioTrack.getSubmittedUser().getAvatarUrl()), userAudioTrack.getAudioTrack().getInfo()); } } diff --git a/src/main/java/net/Broken/Api/Data/Settings/SettingDescriber.java b/src/main/java/net/Broken/Api/Data/Settings/SettingDescriber.java index 16dc5f8..65cfe70 100644 --- a/src/main/java/net/Broken/Api/Data/Settings/SettingDescriber.java +++ b/src/main/java/net/Broken/Api/Data/Settings/SettingDescriber.java @@ -7,8 +7,7 @@ public record SettingDescriber( String id, String name, String description, - TYPE type -) { + TYPE type) { public enum TYPE { BOOL, LIST, STRING, ROLE, TEXT_CHANNEL, VOICE_CHANNEL diff --git a/src/main/java/net/Broken/Api/Data/Settings/SettingGroup.java b/src/main/java/net/Broken/Api/Data/Settings/SettingGroup.java index a10180a..dd2000f 100644 --- a/src/main/java/net/Broken/Api/Data/Settings/SettingGroup.java +++ b/src/main/java/net/Broken/Api/Data/Settings/SettingGroup.java @@ -6,8 +6,7 @@ import java.util.List; @JsonInclude(JsonInclude.Include.NON_NULL) public record SettingGroup( - String name, - SettingDescriber mainField, - List fields -) { + String name, + SettingDescriber mainField, + List fields) { } diff --git a/src/main/java/net/Broken/Api/OpenApi/OpenApiConfig.java b/src/main/java/net/Broken/Api/OpenApi/OpenApiConfig.java index 681e437..66277b2 100644 --- a/src/main/java/net/Broken/Api/OpenApi/OpenApiConfig.java +++ b/src/main/java/net/Broken/Api/OpenApi/OpenApiConfig.java @@ -28,8 +28,8 @@ public class OpenApiConfig { new SecurityScheme().name(securitySchemeName) .type(SecurityScheme.Type.HTTP) .scheme("bearer") - .bearerFormat("JWT")) - ).addServersItem(new Server().url("/").description("Default")) + .bearerFormat("JWT"))) + .addServersItem(new Server().url("/").description("Default")) .info(new Info().title("ClaptrapBot API").version(versionLoader.getVersion())); } } \ No newline at end of file diff --git a/src/main/java/net/Broken/Api/Security/Components/DiscordAuthenticationProvider.java b/src/main/java/net/Broken/Api/Security/Components/DiscordAuthenticationProvider.java index 40b7bad..19f9cbc 100644 --- a/src/main/java/net/Broken/Api/Security/Components/DiscordAuthenticationProvider.java +++ b/src/main/java/net/Broken/Api/Security/Components/DiscordAuthenticationProvider.java @@ -29,10 +29,12 @@ public class DiscordAuthenticationProvider implements AuthenticationProvider { String token = discordOauthService.getAccessToken(code, redirectUri); DiscordOauthUserInfo discordOauthUserInfo = discordOauthService.getUserInfo(token); discordOauthService.revokeToken(token); - DiscordOauthService.LoginOrRegisterResponse loginOrRegisterResponse = discordOauthService.loginOrRegisterDiscordUser(discordOauthUserInfo); + DiscordOauthService.LoginOrRegisterResponse loginOrRegisterResponse = discordOauthService + .loginOrRegisterDiscordUser(discordOauthUserInfo); UserEntity userEntity = loginOrRegisterResponse.response(); - if(!loginOrRegisterResponse.created()){ - userEntity = discordOauthService.updateUserInfo(discordOauthUserInfo, loginOrRegisterResponse.response()); + if (!loginOrRegisterResponse.created()) { + userEntity = discordOauthService.updateUserInfo(discordOauthUserInfo, + loginOrRegisterResponse.response()); } return new UsernamePasswordAuthenticationToken(userEntity, null, new ArrayList<>()); } catch (OAuthLoginFail e) { diff --git a/src/main/java/net/Broken/Api/Security/Components/UnauthorizedHandler.java b/src/main/java/net/Broken/Api/Security/Components/UnauthorizedHandler.java index 0cb9d77..c5ea431 100644 --- a/src/main/java/net/Broken/Api/Security/Components/UnauthorizedHandler.java +++ b/src/main/java/net/Broken/Api/Security/Components/UnauthorizedHandler.java @@ -1,15 +1,17 @@ package net.Broken.Api.Security.Components; import com.fasterxml.jackson.databind.ObjectMapper; + +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.http.MediaType; import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.AuthenticationEntryPoint; import org.springframework.stereotype.Component; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.HashMap; import java.util.Map; @@ -19,7 +21,9 @@ public class UnauthorizedHandler implements AuthenticationEntryPoint { private final Logger logger = LogManager.getLogger(); @Override - public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException) throws IOException { + public void commence(HttpServletRequest request, + HttpServletResponse response, AuthenticationException authException) + throws IOException, ServletException { logger.error("[API] Unauthorized error: {}", authException.getMessage()); response.setContentType(MediaType.APPLICATION_JSON_VALUE); diff --git a/src/main/java/net/Broken/Api/Security/Data/DiscordOauthUserInfo.java b/src/main/java/net/Broken/Api/Security/Data/DiscordOauthUserInfo.java index b1ffc0c..867ef4c 100644 --- a/src/main/java/net/Broken/Api/Security/Data/DiscordOauthUserInfo.java +++ b/src/main/java/net/Broken/Api/Security/Data/DiscordOauthUserInfo.java @@ -4,9 +4,8 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @JsonIgnoreProperties(ignoreUnknown = true) public record DiscordOauthUserInfo( - String id, - String username, - String discriminator, - String avatar) { + String id, + String username, + String discriminator, + String avatar) { } - diff --git a/src/main/java/net/Broken/Api/Security/Expression/CustomMethodSecurityExpressionHandler.java b/src/main/java/net/Broken/Api/Security/Expression/CustomMethodSecurityExpressionHandler.java deleted file mode 100644 index 87edfa8..0000000 --- a/src/main/java/net/Broken/Api/Security/Expression/CustomMethodSecurityExpressionHandler.java +++ /dev/null @@ -1,25 +0,0 @@ -package net.Broken.Api.Security.Expression; - -import org.aopalliance.intercept.MethodInvocation; -import org.springframework.security.access.expression.method.DefaultMethodSecurityExpressionHandler; -import org.springframework.security.access.expression.method.MethodSecurityExpressionOperations; -import org.springframework.security.authentication.AuthenticationTrustResolver; -import org.springframework.security.authentication.AuthenticationTrustResolverImpl; -import org.springframework.security.core.Authentication; - -public class CustomMethodSecurityExpressionHandler - extends DefaultMethodSecurityExpressionHandler { - private final AuthenticationTrustResolver trustResolver = - new AuthenticationTrustResolverImpl(); - - @Override - protected MethodSecurityExpressionOperations createSecurityExpressionRoot( - Authentication authentication, MethodInvocation invocation) { - CustomMethodSecurityExpressionRoot root = - new CustomMethodSecurityExpressionRoot(authentication); - root.setPermissionEvaluator(getPermissionEvaluator()); - root.setTrustResolver(this.trustResolver); - root.setRoleHierarchy(getRoleHierarchy()); - return root; - } -} \ No newline at end of file diff --git a/src/main/java/net/Broken/Api/Security/Expression/CustomMethodSecurityExpressionRoot.java b/src/main/java/net/Broken/Api/Security/Expression/CustomMethodSecurityExpressionRoot.java deleted file mode 100644 index 4cd0f39..0000000 --- a/src/main/java/net/Broken/Api/Security/Expression/CustomMethodSecurityExpressionRoot.java +++ /dev/null @@ -1,102 +0,0 @@ -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.channel.concrete.VoiceChannel; -import net.dv8tion.jda.api.entities.channel.unions.AudioChannelUnion; - -import org.springframework.security.access.expression.SecurityExpressionRoot; -import org.springframework.security.access.expression.method.MethodSecurityExpressionOperations; -import org.springframework.security.core.Authentication; - -public class CustomMethodSecurityExpressionRoot - extends SecurityExpressionRoot - implements MethodSecurityExpressionOperations { - private Object filterObject; - private Object returnObject; - /** - * Creates a new instance - * - * @param authentication the {@link Authentication} to use. Cannot be null. - */ - public CustomMethodSecurityExpressionRoot(Authentication authentication) { - super(authentication); - } - - public boolean isInGuild(String guildId){ - JwtPrincipal jwtPrincipal = (JwtPrincipal) authentication.getPrincipal(); - Guild guild = MainBot.jda.getGuildById(guildId); - return CacheTools.getJdaUser(jwtPrincipal.user()).getMutualGuilds().contains(guild); - } - - public boolean canManageGuild(String guildId){ - JwtPrincipal jwtPrincipal = (JwtPrincipal) authentication.getPrincipal(); - Member member = MainBot.jda.getGuildById(guildId).getMemberById(jwtPrincipal.user().getDiscordId()); - return member.hasPermission( - Permission.MANAGE_SERVER, - Permission.MANAGE_PERMISSIONS, - Permission.MANAGE_CHANNEL - ); - } - - 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); - } - - public boolean canInteractWithVoiceChannel(String guildId) { - JwtPrincipal jwtPrincipal = (JwtPrincipal) authentication.getPrincipal(); - Guild guild = MainBot.jda.getGuildById(guildId); - AudioChannelUnion channel = guild.getAudioManager().getConnectedChannel(); - - if (channel == null) { - return false; - } - - Member member = guild.getMemberById(jwtPrincipal.user().getDiscordId()); - 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; - } - - @Override - public Object getFilterObject() { - return this.filterObject; - } - - @Override - public void setReturnObject(Object returnObject) { - this.returnObject = returnObject; - } - - @Override - public Object getReturnObject() { - return this.returnObject; - } - - @Override - public Object getThis() { - return this; - } -} diff --git a/src/main/java/net/Broken/Api/Security/Expression/WebSecurity.java b/src/main/java/net/Broken/Api/Security/Expression/WebSecurity.java new file mode 100644 index 0000000..bea72af --- /dev/null +++ b/src/main/java/net/Broken/Api/Security/Expression/WebSecurity.java @@ -0,0 +1,69 @@ +package net.Broken.Api.Security.Expression; + +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.stereotype.Service; + +import net.Broken.MainBot; +import net.Broken.Api.Data.Music.Connect; +import net.Broken.Api.Security.Data.JwtPrincipal; +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.channel.concrete.VoiceChannel; +import net.dv8tion.jda.api.entities.channel.unions.AudioChannelUnion; + +@Service +public class WebSecurity { + public boolean isInGuild(String guildId) { + + JwtPrincipal jwtPrincipal = (JwtPrincipal) SecurityContextHolder.getContext().getAuthentication() + .getPrincipal(); + Guild guild = MainBot.jda.getGuildById(guildId); + return CacheTools.getJdaUser(jwtPrincipal.user()).getMutualGuilds().contains(guild); + } + + public boolean canManageGuild(String guildId) { + JwtPrincipal jwtPrincipal = (JwtPrincipal) SecurityContextHolder.getContext().getAuthentication() + .getPrincipal(); + Member member = MainBot.jda.getGuildById(guildId).getMemberById(jwtPrincipal.user().getDiscordId()); + return member.hasPermission( + Permission.MANAGE_SERVER, + Permission.MANAGE_PERMISSIONS, + Permission.MANAGE_CHANNEL); + } + + public boolean canInteractWithVoiceChannel(String guildId, Connect connectPayload) { + JwtPrincipal jwtPrincipal = (JwtPrincipal) SecurityContextHolder.getContext().getAuthentication() + .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); + } + + public boolean canInteractWithVoiceChannel(String guildId) { + JwtPrincipal jwtPrincipal = (JwtPrincipal) SecurityContextHolder.getContext().getAuthentication() + .getPrincipal(); + Guild guild = MainBot.jda.getGuildById(guildId); + AudioChannelUnion channel = guild.getAudioManager().getConnectedChannel(); + + if (channel == null) { + return false; + } + + Member member = guild.getMemberById(jwtPrincipal.user().getDiscordId()); + return (member.hasPermission(channel, Permission.VOICE_CONNECT) + || member.getVoiceState() != null + && member.getVoiceState().getChannel() == channel) + && member.hasPermission(channel, Permission.VOICE_SPEAK); + } + +} diff --git a/src/main/java/net/Broken/Api/Security/Filters/JwtFilter.java b/src/main/java/net/Broken/Api/Security/Filters/JwtFilter.java index 771cadd..43e931b 100644 --- a/src/main/java/net/Broken/Api/Security/Filters/JwtFilter.java +++ b/src/main/java/net/Broken/Api/Security/Filters/JwtFilter.java @@ -2,6 +2,10 @@ package net.Broken.Api.Security.Filters; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jws; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import net.Broken.Api.Security.Data.JwtPrincipal; import net.Broken.Api.Security.Services.JwtService; import net.Broken.BotConfigLoader; @@ -15,10 +19,6 @@ import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.web.authentication.WebAuthenticationDetailsSource; import org.springframework.web.filter.OncePerRequestFilter; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.ArrayList; @@ -32,23 +32,24 @@ public class JwtFilter extends OncePerRequestFilter { private final Logger logger = LogManager.getLogger(); @Override - protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException { + protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) + throws ServletException, IOException { String authHeader = request.getHeader("Authorization"); if (authHeader != null && authHeader.startsWith("Bearer ")) { String token = authHeader.replace("Bearer ", ""); try { UserEntity user; JwtPrincipal principal; - if(config.mode().equals("DEV")){ + if (config.mode().equals("DEV")) { user = userRepository.findByDiscordId(token).orElseThrow(); principal = new JwtPrincipal("DEV", user); - } - else { + } else { Jws jwt = jwtService.verifyAndParseJwt(token); user = jwtService.getUserWithJwt(jwt); - principal = new JwtPrincipal(jwt.getBody().getId(), user); + principal = new JwtPrincipal(jwt.getPayload().getId(), user); } - UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(principal, null, new ArrayList<>()); + UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken( + principal, null, new ArrayList<>()); authenticationToken.setDetails(new WebAuthenticationDetailsSource().buildDetails(request)); SecurityContextHolder.getContext().setAuthentication(authenticationToken); } catch (Exception e) { diff --git a/src/main/java/net/Broken/Api/Security/SecurityConfig.java b/src/main/java/net/Broken/Api/Security/SecurityConfig.java index 6bc7d2f..055259b 100644 --- a/src/main/java/net/Broken/Api/Security/SecurityConfig.java +++ b/src/main/java/net/Broken/Api/Security/SecurityConfig.java @@ -6,6 +6,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.http.SessionCreationPolicy; @@ -16,6 +17,7 @@ import net.Broken.Api.Security.Components.UnauthorizedHandler; import net.Broken.Api.Security.Filters.JwtFilter; @EnableWebSecurity +@EnableMethodSecurity @Configuration public class SecurityConfig { private final UnauthorizedHandler unauthorizedHandler; @@ -30,12 +32,12 @@ public class SecurityConfig { .exceptionHandling(handling -> handling.authenticationEntryPoint(unauthorizedHandler)) .sessionManagement(management -> management.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) .authorizeHttpRequests(requests -> requests - .antMatchers("/api/v2/auth/**").permitAll() - .antMatchers("/api/v2/guild/inviteLink").permitAll() - .antMatchers("/swagger-ui/**").permitAll() - .antMatchers("/swagger-ui.html").permitAll() - .antMatchers("/v3/api-docs/**").permitAll() - .antMatchers("/actuator/**").permitAll() + .requestMatchers("/api/v2/auth/**").permitAll() + .requestMatchers("/api/v2/guild/inviteLink").permitAll() + .requestMatchers("/swagger-ui/**").permitAll() + .requestMatchers("/swagger-ui.html").permitAll() + .requestMatchers("/v3/api-docs/**").permitAll() + .requestMatchers("/actuator/**").permitAll() .anyRequest().authenticated()); http.addFilterBefore(jwtFilter(), UsernamePasswordAuthenticationFilter.class); diff --git a/src/main/java/net/Broken/Api/Security/Services/JwtService.java b/src/main/java/net/Broken/Api/Security/Services/JwtService.java index 1e4df47..8ae26c8 100644 --- a/src/main/java/net/Broken/Api/Security/Services/JwtService.java +++ b/src/main/java/net/Broken/Api/Security/Services/JwtService.java @@ -1,34 +1,33 @@ package net.Broken.Api.Security.Services; - -import io.jsonwebtoken.Claims; -import io.jsonwebtoken.Jws; -import io.jsonwebtoken.Jwts; -import io.jsonwebtoken.SignatureAlgorithm; -import io.jsonwebtoken.security.Keys; -import net.Broken.DB.Entity.UserEntity; -import net.Broken.DB.Repository.UserRepository; -import org.springframework.stereotype.Service; - -import java.security.Key; import java.util.Calendar; import java.util.Date; import java.util.NoSuchElementException; import java.util.UUID; +import javax.crypto.SecretKey; + +import org.springframework.stereotype.Service; + +import io.jsonwebtoken.Claims; +import io.jsonwebtoken.Jws; +import io.jsonwebtoken.Jwts; +import net.Broken.DB.Entity.UserEntity; +import net.Broken.DB.Repository.UserRepository; + @Service public class JwtService { - private final Key jwtKey; + private final SecretKey jwtKey; private final UserRepository userRepository; public JwtService(UserRepository userRepository) { this.userRepository = userRepository; - this.jwtKey = Keys.secretKeyFor(SignatureAlgorithm.HS256); + this.jwtKey = Jwts.SIG.HS256.key().build(); } - public String buildJwt(UserEntity user){ + public String buildJwt(UserEntity user) { Date iat = new Date(); Date nbf = new Date(); Calendar expCal = Calendar.getInstance(); @@ -36,33 +35,29 @@ public class JwtService { Date exp = expCal.getTime(); UUID uuid = UUID.randomUUID(); - return Jwts.builder() - .setSubject(user.getUsername()) + .subject(user.getUsername()) .claim("discord_id", user.getDiscordId()) .claim("avatar", user.getAvatar()) .claim("discriminator", user.getDiscriminator()) - .setId(uuid.toString()) - .setIssuedAt(iat) - .setNotBefore(nbf) - .setExpiration(exp) + .id(uuid.toString()) + .issuedAt(iat) + .notBefore(nbf) + .expiration(exp) .signWith(this.jwtKey) .compact(); - } - public Jws verifyAndParseJwt(String token) { - return Jwts.parserBuilder() - .setSigningKey(this.jwtKey) + return Jwts.parser() + .verifyWith(this.jwtKey) .build() - .parseClaimsJws(token); + .parseSignedClaims(token); } - public UserEntity getUserWithJwt(Jws jwt) throws NoSuchElementException { - String discordId = jwt.getBody().get("discord_id", String.class); + String discordId = jwt.getPayload().get("discord_id", String.class); return userRepository.findByDiscordId(discordId) .orElseThrow(); } diff --git a/src/main/java/net/Broken/Api/Services/AudioService.java b/src/main/java/net/Broken/Api/Services/AudioService.java index a037284..f182d68 100644 --- a/src/main/java/net/Broken/Api/Services/AudioService.java +++ b/src/main/java/net/Broken/Api/Services/AudioService.java @@ -29,35 +29,35 @@ public class AudioService { Guild guild = MainBot.jda.getGuildById(guildId); Member member = guild.getMemberById(userId); - AudioChannelUnion channel = guild.getAudioManager().getConnectedChannel(); ConnectionStatus status = guild.getAudioManager().getConnectionStatus(); if (channel != null) { -// The user can view the audio status if: -// -> He can view the voice channel -// -> OR He can *not* view the voice channel, but he is connected to this voice channel + // The user can view the audio status if: + // -> 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().getChannel() == channel); GuildAudioBotService guildAudioBotService = GuildAudioBotService.getInstance(guild); 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 + // 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 boolean canInteract = (member.hasPermission(channel, Permission.VOICE_CONNECT) || member.getVoiceState() != null - && member.getVoiceState().getChannel() == channel) + && member.getVoiceState().getChannel() == channel) && member.hasPermission(channel, Permission.VOICE_SPEAK); - boolean stopped = guildAudioBotService.getGuidAudioManager().player.getPlayingTrack() == null; PlayBackInfo playBackInfo; if (!stopped) { boolean paused = guildAudioBotService.getGuidAudioManager().player.isPaused(); long position = guildAudioBotService.getGuidAudioManager().player.getPlayingTrack().getPosition(); - UserAudioTrack userAudioTrack = guildAudioBotService.getGuidAudioManager().scheduler.getCurrentPlayingTrack(); + UserAudioTrack userAudioTrack = guildAudioBotService.getGuidAudioManager().scheduler + .getCurrentPlayingTrack(); playBackInfo = new PlayBackInfo(paused, false, position, new TrackInfo(userAudioTrack)); @@ -90,7 +90,6 @@ public class AudioService { return new ResponseEntity<>(status, HttpStatus.OK); } - public ResponseEntity pause(String guildId, String userId) { Guild guild = MainBot.jda.getGuildById(guildId); GuildAudioBotService.getInstance(guild).pause(); @@ -119,7 +118,8 @@ public class AudioService { return new ResponseEntity<>(status, HttpStatus.OK); } - public ResponseEntity add(String guildId, String userId, Add body) throws ExecutionException, InterruptedException { + public ResponseEntity add(String guildId, String userId, Add body) + throws ExecutionException, InterruptedException { Guild guild = MainBot.jda.getGuildById(guildId); boolean success = GuildAudioBotService.getInstance(guild).loadAndPlaySync(body.url(), userId); if (success) { diff --git a/src/main/java/net/Broken/Api/Services/GuildService.java b/src/main/java/net/Broken/Api/Services/GuildService.java index 4fb0709..3335f45 100644 --- a/src/main/java/net/Broken/Api/Services/GuildService.java +++ b/src/main/java/net/Broken/Api/Services/GuildService.java @@ -27,8 +27,7 @@ public class GuildService { boolean canManage = guild.getMember(discordUser).hasPermission( Permission.MANAGE_SERVER, Permission.MANAGE_PERMISSIONS, - Permission.MANAGE_CHANNEL - ); + Permission.MANAGE_CHANNEL); guildList.add(new Guild(guild.getId(), guild.getName(), guild.getIconUrl(), canManage)); } return guildList; @@ -69,9 +68,9 @@ public class GuildService { return roles; } - - public String getInviteLink(){ - return MainBot.jda.setRequiredScopes("applications.commands").getInviteUrl(Permission.getPermissions(1644971949399L)); + public String getInviteLink() { + return MainBot.jda.setRequiredScopes("applications.commands") + .getInviteUrl(Permission.getPermissions(1644971949399L)); } } diff --git a/src/main/java/net/Broken/Api/Services/SettingService.java b/src/main/java/net/Broken/Api/Services/SettingService.java index 827597e..cafbafa 100644 --- a/src/main/java/net/Broken/Api/Services/SettingService.java +++ b/src/main/java/net/Broken/Api/Services/SettingService.java @@ -19,7 +19,6 @@ public class SettingService { public final GuildPreferenceRepository preferenceRepository; private final Logger logger = LogManager.getLogger(); - public SettingService(GuildPreferenceRepository preferenceRepository) { this.preferenceRepository = preferenceRepository; } @@ -28,7 +27,6 @@ public class SettingService { return new SettingDescriptionBuilder().build(); } - public List getValues(String guildId) { GuildPreferenceEntity pref = preferenceRepository.findByGuildId(guildId).orElseGet(() -> { logger.info("[API] : Generate default guild pref"); @@ -37,7 +35,7 @@ public class SettingService { return new SettingValueBuilder(pref).build(); } - public GuildPreferenceEntity saveValue(String guildId, List values){ + public GuildPreferenceEntity saveValue(String guildId, List values) { GuildPreferenceEntity pref = preferenceRepository.findByGuildId(guildId).orElseGet(() -> { logger.info("[API] : Generate default guild pref"); return preferenceRepository.save(GuildPreferenceEntity.getDefault(guildId)); diff --git a/src/main/java/net/Broken/Audio/AudioPlayerSendHandler.java b/src/main/java/net/Broken/Audio/AudioPlayerSendHandler.java index 665d3aa..ef30ea5 100644 --- a/src/main/java/net/Broken/Audio/AudioPlayerSendHandler.java +++ b/src/main/java/net/Broken/Audio/AudioPlayerSendHandler.java @@ -1,14 +1,17 @@ package net.Broken.Audio; -import com.sedmelluq.discord.lavaplayer.player.AudioPlayer; -import com.sedmelluq.discord.lavaplayer.track.playback.MutableAudioFrame; -import net.dv8tion.jda.api.audio.AudioSendHandler; - import java.nio.ByteBuffer; +import com.sedmelluq.discord.lavaplayer.player.AudioPlayer; +import com.sedmelluq.discord.lavaplayer.track.playback.MutableAudioFrame; + +import net.dv8tion.jda.api.audio.AudioSendHandler; + /** - * This is a wrapper around AudioPlayer which makes it behave as an AudioSendHandler for JDA. As JDA calls canProvide - * before every call to provide20MsAudio(), we pull the frame in canProvide() and use the frame we already pulled in + * This is a wrapper around AudioPlayer which makes it behave as an + * AudioSendHandler for JDA. As JDA calls canProvide + * before every call to provide20MsAudio(), we pull the frame in canProvide() + * and use the frame we already pulled in * provide20MsAudio(). */ public class AudioPlayerSendHandler implements AudioSendHandler { diff --git a/src/main/java/net/Broken/Audio/GuildAudioBotService.java b/src/main/java/net/Broken/Audio/GuildAudioBotService.java index fc0f9d2..0a88ad4 100644 --- a/src/main/java/net/Broken/Audio/GuildAudioBotService.java +++ b/src/main/java/net/Broken/Audio/GuildAudioBotService.java @@ -80,7 +80,8 @@ public class GuildAudioBotService { * @param playlistLimit Limit of playlist * @param onHead True for adding audio track on top of playlist */ - public void loadAndPlay(SlashCommandInteractionEvent event, AudioChannel voiceChannel, final String trackUrl, int playlistLimit, boolean onHead) { + public void loadAndPlay(SlashCommandInteractionEvent event, AudioChannel voiceChannel, final String trackUrl, + int playlistLimit, boolean onHead) { audioPlayerManager.loadItemOrdered(guildAudioManager, trackUrl, new AudioLoadResultHandler() { @Override public void trackLoaded(AudioTrack track) { @@ -110,7 +111,8 @@ public class GuildAudioBotService { @Override public void noMatches() { logger.warn("[{}] Cant find media!", guild); - MessageCreateData message = new MessageCreateBuilder().setEmbeds(EmbedMessageUtils.getMusicError("Video not found !")).build(); + MessageCreateData message = new MessageCreateBuilder() + .setEmbeds(EmbedMessageUtils.getMusicError("Video not found !")).build(); event.getHook().setEphemeral(true).sendMessage(message).queue(); } @@ -118,7 +120,8 @@ public class GuildAudioBotService { public void loadFailed(FriendlyException exception) { logger.error("[{}] Can't load media!", guild); logger.error(exception.getMessage()); - MessageCreateData message = new MessageCreateBuilder().setEmbeds(EmbedMessageUtils.getMusicError("Playback error !")).build(); + MessageCreateData message = new MessageCreateBuilder() + .setEmbeds(EmbedMessageUtils.getMusicError("Playback error !")).build(); event.getHook().setEphemeral(true).sendMessage(message).queue(); } }); @@ -128,42 +131,42 @@ public class GuildAudioBotService { Member member = guild.getMemberById(userId); AudioChannelUnion playedChanel = guild.getAudioManager().getConnectedChannel(); final String uuid = UUID.randomUUID().toString(); - Future future = audioPlayerManager.loadItemOrdered(guildAudioManager, trackUrl, new AudioLoadResultHandler() { - @Override - public void trackLoaded(AudioTrack track) { - logger.info("[{}] Auto add {} to playlist.", guild, track.getInfo().title); - UserAudioTrack userAudioTrack = new UserAudioTrack(member.getUser(), track); - play(guild, playedChanel, guildAudioManager, userAudioTrack, true); - addStatus.put(uuid, true); - } + Future future = audioPlayerManager.loadItemOrdered(guildAudioManager, trackUrl, + new AudioLoadResultHandler() { + @Override + public void trackLoaded(AudioTrack track) { + logger.info("[{}] Auto add {} to playlist.", guild, track.getInfo().title); + UserAudioTrack userAudioTrack = new UserAudioTrack(member.getUser(), track); + play(guild, playedChanel, guildAudioManager, userAudioTrack, true); + addStatus.put(uuid, true); + } - @Override - public void playlistLoaded(AudioPlaylist playlist) { - AudioTrack track = playlist.getTracks().get(0); - logger.info("[{}] Auto add {} to playlist.", guild, track.getInfo().title); - UserAudioTrack userAudioTrack = new UserAudioTrack(member.getUser(), track); - play(guild, playedChanel, guildAudioManager, userAudioTrack, true); - addStatus.put(uuid, true); - } + @Override + public void playlistLoaded(AudioPlaylist playlist) { + AudioTrack track = playlist.getTracks().get(0); + logger.info("[{}] Auto add {} to playlist.", guild, track.getInfo().title); + UserAudioTrack userAudioTrack = new UserAudioTrack(member.getUser(), track); + play(guild, playedChanel, guildAudioManager, userAudioTrack, true); + addStatus.put(uuid, true); + } - @Override - public void noMatches() { - logger.warn("[{}] Track not found: {}", guild, trackUrl); - addStatus.put(uuid, false); - } + @Override + public void noMatches() { + logger.warn("[{}] Track not found: {}", guild, trackUrl); + addStatus.put(uuid, false); + } - @Override - public void loadFailed(FriendlyException exception) { - logger.error("[{}] Cant load media!", guild); - logger.error(exception.getMessage()); - addStatus.put(uuid, false); - } - }); + @Override + public void loadFailed(FriendlyException exception) { + logger.error("[{}] Cant load media!", guild); + logger.error(exception.getMessage()); + addStatus.put(uuid, false); + } + }); future.get(); return addStatus.remove(uuid); } - /** * Load playlist to playlist * @@ -189,7 +192,6 @@ public class GuildAudioBotService { } } - /** * Add single track to playlist, auto-connect if not connected to vocal chanel * @@ -199,7 +201,8 @@ public class GuildAudioBotService { * @param track Track to add to playlist * @param onHead True for adding audio track on top of playlist */ - public void play(Guild guild, AudioChannel channel, GuildAudioManager musicManager, UserAudioTrack track, boolean onHead) { + public void play(Guild guild, AudioChannel channel, GuildAudioManager musicManager, UserAudioTrack track, + boolean onHead) { if (!guild.getAudioManager().isConnected()) guild.getAudioManager().openAudioConnection(channel); if (!onHead) @@ -212,7 +215,8 @@ public class GuildAudioBotService { if (guild.getAudioManager().isConnected()) { loadAndPlay(event, guild.getAudioManager().getConnectedChannel(), url, playListLimit, onHead); } else { - MessageCreateData message = new MessageCreateBuilder().setEmbeds(EmbedMessageUtils.getMusicError("Not connected to vocal chanel !")).build(); + MessageCreateData message = new MessageCreateBuilder() + .setEmbeds(EmbedMessageUtils.getMusicError("Not connected to vocal chanel !")).build(); event.getHook().setEphemeral(true).sendMessage(message).queue(); } } @@ -227,8 +231,8 @@ public class GuildAudioBotService { EmbedMessageUtils.buildStandar( new EmbedBuilder() .setTitle(":pause_button: Playback paused") - .setColor(Color.green) - )).build(); + .setColor(Color.green))) + .build(); clearLastButton(); lastMessageWithButton = hook.sendMessage(message).addActionRow(getActionButton()).complete(); } @@ -244,16 +248,16 @@ public class GuildAudioBotService { EmbedMessageUtils.buildStandar( new EmbedBuilder() .setTitle(":warning: Nothing to play, playlist is empty !") - .setColor(Color.green) - )).build(); + .setColor(Color.green))) + .build(); } else { resume(); message = new MessageCreateBuilder().setEmbeds( EmbedMessageUtils.buildStandar( new EmbedBuilder() .setTitle(":arrow_forward: Playback resumed") - .setColor(Color.green) - )).build(); + .setColor(Color.green))) + .build(); } clearLastButton(); lastMessageWithButton = hook.sendMessage(message).addActionRow(getActionButton()).complete(); @@ -269,8 +273,8 @@ public class GuildAudioBotService { EmbedMessageUtils.buildStandar( new EmbedBuilder() .setTitle(":track_next: Next Track") - .setColor(Color.green) - )).build(); + .setColor(Color.green))) + .build(); clearLastButton(); lastMessageWithButton = hook.sendMessage(message).addActionRow(getActionButton()).complete(); } @@ -285,8 +289,8 @@ public class GuildAudioBotService { EmbedMessageUtils.buildStandar( new EmbedBuilder() .setTitle(":stop_button: Playback stopped") - .setColor(Color.green) - )).build(); + .setColor(Color.green))) + .build(); clearLastButton(); lastMessageWithButton = hook.sendMessage(message).addActionRow(getActionButton()).complete(); @@ -304,8 +308,8 @@ public class GuildAudioBotService { EmbedMessageUtils.buildStandar( new EmbedBuilder() .setTitle(":eject: Disconnected") - .setColor(Color.green) - )).build(); + .setColor(Color.green))) + .build(); clearLastButton(); hook.sendMessage(message).queue(); } @@ -316,10 +320,12 @@ public class GuildAudioBotService { guild.getAudioManager().closeAudioConnection(); clearLastButton(); } + public void info(InteractionHook hook) { AudioTrackInfo info = guildAudioManager.scheduler.getInfo(); UserAudioTrack userAudioTrack = guildAudioManager.scheduler.getCurrentPlayingTrack(); - MessageCreateData message = new MessageCreateBuilder().setEmbeds(EmbedMessageUtils.getMusicInfo(info, userAudioTrack)).build(); + MessageCreateData message = new MessageCreateBuilder() + .setEmbeds(EmbedMessageUtils.getMusicInfo(info, userAudioTrack)).build(); clearLastButton(); lastMessageWithButton = hook.sendMessage(message).addActionRow(getActionButton()).complete(); } @@ -330,8 +336,8 @@ public class GuildAudioBotService { EmbedMessageUtils.buildStandar( new EmbedBuilder() .setTitle(":wastebasket: Playlist flushed") - .setColor(Color.green) - )).build(); + .setColor(Color.green))) + .build(); clearLastButton(); lastMessageWithButton = hook.sendMessage(message).addActionRow(getActionButton()).complete(); } @@ -350,9 +356,9 @@ public class GuildAudioBotService { new EmbedBuilder() .setTitle(":scroll: Playlist") .setColor(Color.green) - .setDescription("Oh no ! The playlist is empty !") - )).build(); - hook.sendMessage(message).queue(); + .setDescription("Oh no ! The playlist is empty !"))) + .build(); + hook.sendMessage(message).queue(); } else { StringBuilder resp = new StringBuilder(); int i = 0; @@ -375,8 +381,8 @@ public class GuildAudioBotService { new EmbedBuilder() .setTitle(":scroll: Playlist") .setColor(Color.green) - .setDescription(resp.toString()) - )).build(); + .setDescription(resp.toString()))) + .build(); hook.sendMessage(message).queue(); } @@ -390,7 +396,6 @@ public class GuildAudioBotService { return guildAudioManager; } - public void clearLastButton() { if (lastMessageWithButton != null) { this.lastMessageWithButton.editMessageComponents(new ArrayList<>()).queue(); @@ -401,10 +406,10 @@ public class GuildAudioBotService { public void updateLastButton() { if (lastMessageWithButton != null) - lastMessageWithButton = lastMessageWithButton.editMessageComponents(ActionRow.of(getActionButton())).complete(); + lastMessageWithButton = lastMessageWithButton.editMessageComponents(ActionRow.of(getActionButton())) + .complete(); } - private List