Merge pull request #128 from citelao/dev

Fix playlists in regexes
citelao · Jul 16, 2019 · f353e4c · f353e4c
2 parents b7e8afb + 6a2b279
commit f353e4c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog #
 
+## v0.13.8 ##
+- Fixed: Support new Spotify playlist syntax (without `user:` prefix).
+
 ## v0.13.7 ##
 - Fixed: Bump up the Spotify API version so Spotifious works again
 

diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@ Spotifious uses Packal to make sure you always have the latest version. It gives
 
 ## Download & Install ##
 
-Latest version: [v0.13.7](https://github.com/citelao/Spotify-for-Alfred/archive/master.zip) | Latest dev build: [v0.13.7](https://github.com/citelao/Spotify-for-Alfred/archive/dev.zip)
+Latest version: [v0.13.8](https://github.com/citelao/Spotify-for-Alfred/archive/master.zip) | Latest dev build: [v0.13.8](https://github.com/citelao/Spotify-for-Alfred/archive/dev.zip)
 
 An in-depth [installation guide](http://ben.stolovitz.com/Spotify-for-Alfred/download/) is available on the Spotifious website.
 

diff --git a/info.plist b/info.plist
@@ -1086,7 +1086,7 @@ Spotifious works out of the box (just type `spotifious` in Alfred), but works be
 		</dict>
 	</dict>
 	<key>version</key>
-	<string>0.13.7</string>
+	<string>0.13.8</string>
 	<key>webaddress</key>
 	<string>https://github.com/citelao/Spotify-for-Alfred</string>
 </dict>

diff --git a/src/citelao/Spotifious/Spotifious.php b/src/citelao/Spotifious/Spotifious.php
@@ -334,7 +334,7 @@ protected function trim_value(&$value) {
 
 	// TODO cite
 	protected function is_spotify_uri($item) {
-		$regex = '/^(spotify:(?:album|artist|track|user:[^:]+:playlist):[a-zA-Z0-9]+)$/x';
+		$regex = '/^(spotify:(?:album|artist|track|(?:user:[^:]+:)?playlist):[a-zA-Z0-9]+)$/x';
 
 		return preg_match($regex, $item);
 	}