Lint

Author: infnibor

README.md

@@ -3,16 +3,24 @@
 # LavaSrc
 
 > [!IMPORTANT]
-> For LavaSrc v3 (Lavaplayer v1 & Lavalink v3) look [here](https://github.com/topi314/LavaSrc/tree/v3-legacy) 
-
-A collection of additional [Lavaplayer v2](https://github.com/sedmelluq/lavaplayer), [LavaSearch](https://github.com/topi314/LavaSearch) & [LavaLyrics](https://github.com/topi314/LavaLyrics) Audio Source Managers and [Lavalink v4](https://github.com/lavalink-devs/Lavalink) Plugin.
-* [Spotify](https://www.spotify.com) playlists/albums/songs/artists(top tracks)/search results/[LavaSearch](https://github.com/topi314/LavaSearch)/[LavaLyrics](https://github.com/topi314/LavaLyrics)
-* [Apple Music](https://www.apple.com/apple-music/) playlists/albums/songs/artists/search results/[LavaSearch](https://github.com/topi314/LavaSearch) (Big thx to [ryan5453](https://github.com/ryan5453) for helping me)
-* [Deezer](https://www.deezer.com) playlists/albums/songs/artists/search results/[LavaSearch](https://github.com/topi314/LavaSearch)/[LavaLyrics](https://github.com/topi314/LavaLyrics) (Big thx to [ryan5453](https://github.com/ryan5453) and [melike2d](https://github.com/melike2d) for helping me)
-* [Yandex Music](https://music.yandex.ru) playlists/albums/songs/artists/podcasts/search results/[LavaLyrics](https://github.com/topi314/LavaLyrics)/[LavaSearch](https://github.com/topi314/LavaSearch) (Thx to [AgutinVBoy](https://github.com/agutinvboy) for implementing it)
+> For LavaSrc v3 (Lavaplayer v1 & Lavalink v3) look [here](https://github.com/topi314/LavaSrc/tree/v3-legacy)
+
+A collection of additional [Lavaplayer v2](https://github.com/sedmelluq/lavaplayer), [LavaSearch](https://github.com/topi314/LavaSearch) & [LavaLyrics](https://github.com/topi314/LavaLyrics)
+Audio Source Managers and [Lavalink v4](https://github.com/lavalink-devs/Lavalink) Plugin.
+
+* [Spotify](https://www.spotify.com) playlists/albums/songs/artists(top tracks)/search
+  results/[LavaSearch](https://github.com/topi314/LavaSearch)/[LavaLyrics](https://github.com/topi314/LavaLyrics)
+* [Apple Music](https://www.apple.com/apple-music/) playlists/albums/songs/artists/search results/[LavaSearch](https://github.com/topi314/LavaSearch) (Big thx
+  to [ryan5453](https://github.com/ryan5453) for helping me)
+* [Deezer](https://www.deezer.com) playlists/albums/songs/artists/search results/[LavaSearch](https://github.com/topi314/LavaSearch)/[LavaLyrics](https://github.com/topi314/LavaLyrics) (Big
+  thx to [ryan5453](https://github.com/ryan5453) and [melike2d](https://github.com/melike2d) for helping me)
+* [Yandex Music](https://music.yandex.ru) playlists/albums/songs/artists/podcasts/search
+  results/[LavaLyrics](https://github.com/topi314/LavaLyrics)/[LavaSearch](https://github.com/topi314/LavaSearch) (Thx to [AgutinVBoy](https://github.com/agutinvboy) for implementing it)
 * [Flowery TTS](https://flowery.pw/docs) (Thx to [bachtran02](https://github.com/bachtran02) for implementing it)
-* [YouTube](https://youtube.com) & [YouTubeMusic](https://music.youtube.com/) [LavaSearch](https://github.com/topi314/LavaSearch)/[LavaLyrics](https://github.com/topi314/LavaLyrics)  (Thx to [DRSchlaubi](https://github.com/DRSchlaubi) for helping me)
-* [Vk Music](https://music.vk.com/) playlists/albums/songs/artists(top tracks)/search results/[LavaLyrics](https://github.com/topi314/LavaLyrics)/[LavaSearch](https://github.com/topi314/LavaSearch) (Thx to [Krispeckt](https://github.com/Krispeckt) for implementing it)
+* [YouTube](https://youtube.com) & [YouTubeMusic](https://music.youtube.com/) [LavaSearch](https://github.com/topi314/LavaSearch)/[LavaLyrics](https://github.com/topi314/LavaLyrics)  (Thx
+  to [DRSchlaubi](https://github.com/DRSchlaubi) for helping me)
+* [Vk Music](https://music.vk.com/) playlists/albums/songs/artists(top tracks)/search
+  results/[LavaLyrics](https://github.com/topi314/LavaLyrics)/[LavaSearch](https://github.com/topi314/LavaSearch) (Thx to [Krispeckt](https://github.com/Krispeckt) for implementing it)
 * [Tidal](https://tidal.com) playlists/albums/songs/search results (Thx to [Nansess](https://github.com/Nansess) and [InfNibor](https://github.com/infnibor) for implementing it)
 
 > [!IMPORTANT]
@@ -21,8 +29,8 @@ A collection of additional [Lavaplayer v2](https://github.com/sedmelluq/lavaplay
 ## Summary
 
 * [Lavalink Usage](#lavalink-usage)
-  * [Configuration](#configuration)
-  * [Update Settings at Runtime](#update-settings-at-runtime)
+    * [Configuration](#configuration)
+    * [Update Settings at Runtime](#update-settings-at-runtime)
 * [Lavaplayer Usage](#lavaplayer-usage)
 * [Supported URLs and Queries](#supported-urls-and-queries)
 
@@ -294,9 +302,9 @@ PATCH /v4/lavasrc/config
 
 ##### Tidal Config Object
 
-| Field      | Type   | Description             |
-|------------|--------|-------------------------|
-| ?token     | string | The Tidal token         |
+| Field  | Type   | Description     |
+|--------|--------|-----------------|
+| ?token | string | The Tidal token |
 
 <details>
 <summary>Example Payload</summary>
@@ -338,7 +346,6 @@ PATCH /v4/lavasrc/config
 
 ---
 
-
 ## Lavaplayer Usage
 
 Replace `x.y.z` with the latest version number
@@ -486,6 +493,7 @@ var searchManager = new SearchManager();
 // register source
 searchManager.registerSearchManager(appleMusic);
 ```
+
 </details>
 
 ---
@@ -556,7 +564,8 @@ searchManager.registerSearchManager(deezer);
 2. Go to https://oauth.yandex.ru/authorize?response_type=token&client_id=23cabbbdc6cd418abb4b39c32c41195d
 3. Authorize and grant access
 4. The browser will redirect to the address like `https://music.yandex.ru/#access_token=AQAAAAAYc***&token_type=bearer&expires_in=31535645`.
-   Very quickly there will be a redirect to another page, so you need to have time to copy the link. ![image](https://user-images.githubusercontent.com/68972811/196124196-a817b828-3387-4f70-a2b2-cdfdc71ce1f2.png)
+   Very quickly there will be a redirect to another page, so you need to have time to copy the
+   link. ![image](https://user-images.githubusercontent.com/68972811/196124196-a817b828-3387-4f70-a2b2-cdfdc71ce1f2.png)
 5. Your accessToken, what is after `access_token`.
 
 Token expires in 1 year. You can get a new one by repeating the steps above.
@@ -645,7 +654,8 @@ playerManager.registerSourceManager(new FloweryTTSSourceManager("..."));
 
 #### Carefully, this token can be used to access your personal data. Use a newly created account specifically for LavaSrc. This source is designed mainly for the RU region, 80% of songs in other regions will not be played.
 
-1. Go to the authorization page [Marusya application](https://oauth.vk.com/authorize?client_id=6463690&scope=1073737727&redirect_uri=https://oauth.vk.com/blank.html&display=page&response_type=token&revoke=1)
+1. Go to the authorization
+   page [Marusya application](https://oauth.vk.com/authorize?client_id=6463690&scope=1073737727&redirect_uri=https://oauth.vk.com/blank.html&display=page&response_type=token&revoke=1)
 2. Authorize through your vk account.
 3. A link like this `https://oauth.vk.com/blank.html#access_token=$$$$$&expires_in=0&user_id=$$$$$@[email protected]`
 4. Copy your token and paste it into your config! Enjoy captcha-free vk music!
@@ -700,6 +710,7 @@ AudioPlayerManager playerManager = new DefaultAudioPlayerManager();
 var tidal = new TidalSourceManager("your tidal token");
 playerManager.registerSourceManager(tidal);
 ```
+
 #### LavaSearch
 
 > [!NOTE]
@@ -716,7 +727,8 @@ playerManager.registerSourceManager(tidal);
   (check out [Spotify Recommendations Docs](https://developer.spotify.com/documentation/web-api/reference/get-recommendations) for the full query parameter list)
 * https://open.spotify.com/track/0eG08cBeKk0mzykKjw4hcQ
 * https://open.spotify.com/album/7qemUq4n71awwVPOaX7jw4
-* https://open.spotify.com/playlist/7HAO9R9v203gkaPAgknOMp (playlists can include local files if you enabled this via: `plugins.lavasrc.spotify.localFiles: true`. Please note `uri` & `isrc` will be `null` & `identifier` will be `"local"`)
+* https://open.spotify.com/playlist/7HAO9R9v203gkaPAgknOMp (playlists can include local files if you enabled this via: `plugins.lavasrc.spotify.localFiles: true`. Please note `uri` & `isrc`
+  will be `null` & `identifier` will be `"local"`)
 * https://open.spotify.com/artist/3ZztVuWxHzNpl0THurTFCv
 
 (including new regional links like https://open.spotify.com/intl-de/track/0eG08cBeKk0mzykKjw4hcQ)

main/src/main/java/com/github/topi314/lavasrc/tidal/TidalAudioTrack.java

@@ -1,7 +1,6 @@
 package com.github.topi314.lavasrc.tidal;
 
 import com.github.topi314.lavasrc.mirror.MirroringAudioTrack;
-import com.sedmelluq.discord.lavaplayer.container.mp3.Mp3AudioTrack;
 import com.sedmelluq.discord.lavaplayer.tools.io.SeekableInputStream;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo;

main/src/main/java/com/github/topi314/lavasrc/tidal/TidalSourceManager.java

@@ -1,6 +1,5 @@
 package com.github.topi314.lavasrc.tidal;
 
-import com.github.topi314.lavasearch.result.AudioSearchResult;
 import com.github.topi314.lavasrc.ExtendedAudioPlaylist;
 import com.github.topi314.lavasrc.LavaSrcTools;
 import com.github.topi314.lavasrc.mirror.DefaultMirroringAudioTrackResolver;
@@ -13,12 +12,9 @@
 import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterface;
 import com.sedmelluq.discord.lavaplayer.tools.io.HttpInterfaceManager;
 import com.sedmelluq.discord.lavaplayer.track.*;
-
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.HttpClientBuilder;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -30,7 +26,6 @@
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Set;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.regex.Pattern;
@@ -46,12 +41,11 @@ public class TidalSourceManager extends MirroringAudioSourceManager implements H
 	public static final int PLAYLIST_MAX_PAGE_ITEMS = 750;
 	public static final int ALBUM_MAX_PAGE_ITEMS = 120;
 	private static final String USER_AGENT = "TIDAL/3704 CFNetwork/1220.1 Darwin/20.3.0";
-	private final String tidalToken;
 	private static final Logger log = LoggerFactory.getLogger(TidalSourceManager.class);
-
+	private final String tidalToken;
 	private final HttpInterfaceManager httpInterfaceManager = HttpClientTools.createDefaultThreadLocalManager();
-	private int searchLimit = 6;
 	private final String countryCode;
+	private int searchLimit = 6;
 
 	public TidalSourceManager(String[] providers, String countryCode, Function<Void, AudioPlayerManager> audioPlayerManager, String tidalToken) {
 		this(countryCode, audioPlayerManager, new DefaultMirroringAudioTrackResolver(providers), tidalToken);

plugin/src/main/java/com/github/topi314/lavasrc/plugin/LavaSrcPlugin.java

@@ -8,8 +8,6 @@
 import com.github.topi314.lavasrc.deezer.DeezerAudioSourceManager;
 import com.github.topi314.lavasrc.deezer.DeezerAudioTrack;
 import com.github.topi314.lavasrc.flowerytts.FloweryTTSSourceManager;
-import com.github.topi314.lavasrc.mirror.MirroringAudioTrackResolver;
-import com.github.topi314.lavasrc.mirror.DefaultMirroringAudioTrackResolver;
 import com.github.topi314.lavasrc.plugin.config.*;
 import com.github.topi314.lavasrc.protocol.Config;
 import com.github.topi314.lavasrc.spotify.SpotifySourceManager;
@@ -27,8 +25,6 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Arrays;
-
 @Service
 @RestController
 public class LavaSrcPlugin implements AudioPlayerManagerConfiguration, SearchManagerConfiguration, LyricsManagerConfiguration {

plugin/src/main/java/com/github/topi314/lavasrc/plugin/config/SourcesConfig.java

@@ -73,7 +73,11 @@ public void setVkMusic(boolean vkMusic) {
 		this.vkMusic = vkMusic;
 	}
 
-	public boolean isTidal() { return this.tidal; }
+	public boolean isTidal() {
+		return this.tidal;
+	}
 
-	public void setTidal(boolean tidal) { this.tidal = tidal; }
+	public void setTidal(boolean tidal) {
+		this.tidal = tidal;
+	}
 }

plugin/src/main/java/com/github/topi314/lavasrc/plugin/config/TidalConfig.java

@@ -10,15 +10,27 @@ public class TidalConfig {
 	private int searchLimit;
 	private String token;
 
-	public String getCountryCode() { return this.countryCode; }
+	public String getCountryCode() {
+		return this.countryCode;
+	}
 
-	public void setCountryCode(String countryCode) { this.countryCode = countryCode; }
+	public void setCountryCode(String countryCode) {
+		this.countryCode = countryCode;
+	}
 
-	public int getSearchLimit() { return this.searchLimit;}
+	public int getSearchLimit() {
+		return this.searchLimit;
+	}
 
-	public void setSearchLimit(int searchLimit) { this.searchLimit = searchLimit;}
+	public void setSearchLimit(int searchLimit) {
+		this.searchLimit = searchLimit;
+	}
 
-	public String getToken() { return token; }
+	public String getToken() {
+		return token;
+	}
 
-	public void setToken(String token) { this.token = token;}
+	public void setToken(String token) {
+		this.token = token;
+	}
 }