diff --git a/mopidy_iris/__init__.py b/mopidy_iris/__init__.py
index d3337e86..01fdd9f0 100755
--- a/mopidy_iris/__init__.py
+++ b/mopidy_iris/__init__.py
@@ -8,7 +8,7 @@ from frontend import IrisFrontend
from http import RequestHandler
logger = logging.getLogger(__name__)
-__version__ = '2.10.14'
+__version__ = '2.10.13'
##
# Core extension class
diff --git a/src/js/components/VersionManager.js b/src/js/components/VersionManager.js
index c15bc571..d08e4eae 100755
--- a/src/js/components/VersionManager.js
+++ b/src/js/components/VersionManager.js
@@ -30,7 +30,7 @@ class VersionManager extends React.Component{
}
if( this.props.pusher.version.upgrade_available ){
- return
+ return
}
return
diff --git a/src/js/services/pusher/actions.js b/src/js/services/pusher/actions.js
index 4b7a863e..aaabbc4d 100755
--- a/src/js/services/pusher/actions.js
+++ b/src/js/services/pusher/actions.js
@@ -29,15 +29,15 @@ export function disconnect(){
}
}
-export function performUpgrade(){
+export function startUpgrade(){
return {
- type: 'PUSHER_UPGRADING'
+ type: 'START_UPGRADE'
}
}
export function getConnections(){
return {
- type: 'PUSHER_GET_CONNECTIONS'
+ type: 'GET_CONNECTIONS'
}
}
diff --git a/src/js/services/pusher/middleware.js b/src/js/services/pusher/middleware.js
index 4c38f2bb..3c9df1fd 100755
--- a/src/js/services/pusher/middleware.js
+++ b/src/js/services/pusher/middleware.js
@@ -126,11 +126,16 @@ const PusherMiddleware = (function(){
return next(action);
break;
- case 'UPGRADING':
+ case 'START_UPGRADE':
request({ action: 'perform_upgrade' })
.then(
- response => {
- store.dispatch({ type: 'UPGRADE', data: response.data })
+ response => {
+ if (response.data.version.upgrade_successful){
+ uiActions.createNotification('Upgrade complete')
+ }else{
+ uiActions.createNotification('Upgrade failed, manual upgrade required')
+ }
+ store.dispatch({ type: 'VERSION', data: response.data })
}
)
return next(action);
diff --git a/src/js/services/pusher/reducer.js b/src/js/services/pusher/reducer.js
index c62144fd..8335e1f1 100755
--- a/src/js/services/pusher/reducer.js
+++ b/src/js/services/pusher/reducer.js
@@ -43,7 +43,7 @@ export default function reducer(pusher = {}, action){
upgrading: false
});
- case 'UPGRADING':
+ case 'START_UPGRADE':
return Object.assign({}, pusher, { upgrading: true });
default:
diff --git a/src/js/services/spotify/actions.js b/src/js/services/spotify/actions.js
index 8a0b39f6..9dc1a77c 100755
--- a/src/js/services/spotify/actions.js
+++ b/src/js/services/spotify/actions.js
@@ -254,7 +254,7 @@ export function getFeaturedPlaylists(){
var timestamp = year+'-'+month+'-'+day+'T'+hour+':'+min+':'+sec;
- sendRequest( dispatch, getState, 'browse/featured-playlists?timestamp='+timestamp+'&country='+getState().spotify.country+'&limit=50' )
+ sendRequest( dispatch, getState, 'browse/featured-playlists?timestamp='+timestamp+'&country='+getState().spotify.country+'&limit=50&locale='+getState().spotify.locale )
.then( response => {
dispatch({
type: 'SPOTIFY_FEATURED_PLAYLISTS_LOADED',
@@ -284,7 +284,7 @@ export function getCategory( id ){
dispatch({ type: 'SPOTIFY_CATEGORY_LOADED', data: false });
- sendRequest( dispatch, getState, 'browse/categories/'+id )
+ sendRequest( dispatch, getState, 'browse/categories/'+id+'?country='+getState().spotify.country+'&locale='+getState().spotify.locale )
.then( response => {
dispatch({
type: 'SPOTIFY_CATEGORY_LOADED',