fix regex for new spotify links (#74)

topi314 · Jun 3, 2023 · cc6f3f7 · cc6f3f7
1 parent 349dfb1
commit cc6f3f7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -210,6 +210,8 @@ plugins:
 * https://open.spotify.com/playlist/7HAO9R9v203gkaPAgknOMp
 * https://open.spotify.com/artist/3ZztVuWxHzNpl0THurTFCv
 
+(including new regional links like https://open.spotify.com/intl-de/track/0eG08cBeKk0mzykKjw4hcQ)
+
 ### Apple Music
 * `amsearch:animals architects`
 * https://music.apple.com/cy/album/animals/1533388849?i=1533388859

diff --git a/main/src/main/java/com/github/topisenpai/lavasrc/spotify/SpotifySourceManager.java b/main/src/main/java/com/github/topisenpai/lavasrc/spotify/SpotifySourceManager.java
@@ -38,7 +38,7 @@
 
 public class SpotifySourceManager extends MirroringAudioSourceManager implements HttpConfigurable {
 
-	public static final Pattern URL_PATTERN = Pattern.compile("(https?://)?(www\\.)?open\\.spotify\\.com/(user/[a-zA-Z0-9-_]+/)?(?<type>track|album|playlist|artist)/(?<identifier>[a-zA-Z0-9-_]+)");
+	public static final Pattern URL_PATTERN = Pattern.compile("(https?://)(www\\.)?open\\.spotify\\.com/((?<region>[a-zA-Z-]+)/)?(user/(?<user>[a-zA-Z0-9-_]+)/)?(?<type>track|album|playlist|artist)/(?<identifier>[a-zA-Z0-9-_]+)");
 	public static final String SEARCH_PREFIX = "spsearch:";
 	public static final String RECOMMENDATIONS_PREFIX = "sprec:";
 	public static final int PLAYLIST_MAX_PAGE_ITEMS = 100;