Moving providers into subset 'Services'

This commit is contained in:
James Barnsley
2018-03-30 22:37:38 +13:00
parent 96d4ec3bdf
commit 15a03affce
17 changed files with 4230 additions and 3969 deletions

View File

@ -358,7 +358,7 @@ export function getFeaturedPlaylists(){
var timestamp = year+'-'+month+'-'+day+'T'+hour+':'+min+':'+sec;
sendRequest(dispatch, getState, 'browse/featured-playlists?limit=50&country='+getState().core.country+'&locale='+getState().core.locale+'timestamp='+timestamp)
sendRequest(dispatch, getState, 'browse/featured-playlists?limit=50&country='+getState().spotify.country+'&locale='+getState().spotify.locale+'timestamp='+timestamp)
.then(
response => {
var playlists = []
@ -402,7 +402,7 @@ export function getFeaturedPlaylists(){
export function getCategories(){
return (dispatch, getState) => {
sendRequest(dispatch, getState, 'browse/categories?limit=50&country='+getState().core.country+'&locale='+getState().core.locale )
sendRequest(dispatch, getState, 'browse/categories?limit=50&country='+getState().spotify.country+'&locale='+getState().spotify.locale )
.then(
response => {
dispatch({
@ -432,7 +432,7 @@ export function getCategory(id){
});
// get the category
sendRequest(dispatch, getState, 'browse/categories/'+id+'?country='+getState().core.country+'&locale='+getState().core.locale )
sendRequest(dispatch, getState, 'browse/categories/'+id+'?country='+getState().spotify.country+'&locale='+getState().spotify.locale )
.then(
response => {
var category = Object.assign({}, response)
@ -451,7 +451,7 @@ export function getCategory(id){
)
// and the category's playlists
sendRequest(dispatch, getState, 'browse/categories/'+id+'/playlists?limit=50&country='+getState().core.country+'&locale='+getState().core.locale )
sendRequest(dispatch, getState, 'browse/categories/'+id+'/playlists?limit=50&country='+getState().spotify.country+'&locale='+getState().spotify.locale )
.then(
response => {
var playlists = []
@ -490,7 +490,7 @@ export function getCategory(id){
export function getNewReleases(){
return (dispatch, getState) => {
sendRequest(dispatch, getState, 'browse/new-releases?country='+getState().core.country+'&limit=50' )
sendRequest(dispatch, getState, 'browse/new-releases?country='+getState().spotify.country+'&limit=50' )
.then(
response => {
dispatch({
@ -578,7 +578,7 @@ export function getSearchResults(type, query, limit = 50, offset = 0){
var url = 'search?q='+query
url += '&type='+type
url += '&country='+getState().core.country
url += '&country='+getState().spotify.country
url += '&limit='+limit
url += '&offset='+offset
@ -670,7 +670,7 @@ export function getAutocompleteResults(field_id, query, types = ['album','artist
var endpoint = 'search?q='+query
endpoint += '&type='+types.join(',')
endpoint += '&country='+getState().core.country
endpoint += '&country='+getState().spotify.country
sendRequest(dispatch, getState, endpoint)
.then(
@ -1112,7 +1112,7 @@ export function getArtist(uri, full = false){
if (full){
requests.push(
sendRequest(dispatch, getState, 'artists/'+ helpers.getFromUri('artistid', uri) +'/top-tracks?country='+getState().core.country )
sendRequest(dispatch, getState, 'artists/'+ helpers.getFromUri('artistid', uri) +'/top-tracks?country='+getState().spotify.country )
.then(
response => {
Object.assign(artist, response);
@ -1163,7 +1163,7 @@ export function getArtist(uri, full = false){
// Now go get our artist albums
if (full){
sendRequest(dispatch, getState, 'artists/'+ helpers.getFromUri('artistid', uri) +'/albums?market='+getState().core.country )
sendRequest(dispatch, getState, 'artists/'+ helpers.getFromUri('artistid', uri) +'/albums?market='+getState().spotify.country )
.then(
response => {
dispatch({
@ -1235,7 +1235,7 @@ export function playArtistTopTracks(uri){
// We need to load the artist's top tracks first
} else {
sendRequest(dispatch, getState, 'artists/'+ helpers.getFromUri('artistid', uri) +'/top-tracks?country='+getState().core.country )
sendRequest(dispatch, getState, 'artists/'+ helpers.getFromUri('artistid', uri) +'/top-tracks?country='+getState().spotify.country )
.then(
response => {
const uris = helpers.arrayOf('uri',response.tracks)
@ -1531,7 +1531,7 @@ export function getPlaylist(uri){
return (dispatch, getState) => {
// get the main playlist object
sendRequest(dispatch, getState, 'users/'+ helpers.getFromUri('userid',uri) +'/playlists/'+ helpers.getFromUri('playlistid',uri) +'?market='+getState().core.country )
sendRequest(dispatch, getState, 'users/'+ helpers.getFromUri('userid',uri) +'/playlists/'+ helpers.getFromUri('playlistid',uri) +'?market='+getState().spotify.country )
.then(
response => {
@ -1665,7 +1665,7 @@ export function getPlaylistTracksAndPlay(uri){
'Loading playlist tracks',
{
uri: uri,
next: 'users/'+ helpers.getFromUri('userid',uri) +'/playlists/'+ helpers.getFromUri('playlistid',uri) +'/tracks?market='+getState().core.country
next: 'users/'+ helpers.getFromUri('userid',uri) +'/playlists/'+ helpers.getFromUri('playlistid',uri) +'/tracks?market='+getState().spotify.country
}
))
}