🐛 Fix Spotify pagination bug (#2061)

* Fixed missing value

Fixed infinite amount of interval triggered nodes executions

* Fixed inifite loop on Spotify Node

* Hide Limit parameter

* Logic operator fix

* Spotify getFollowingArtists returnAll fix

*  Small improvements to #2054

* 👕 Fix lint issue

Co-authored-by: Лебедев Иван <11215636+X-pech@users.noreply.github.com>
Co-authored-by: X-pech <lisgml@gmail.com>
This commit is contained in:
Ricardo Espinoza 2021-08-08 03:58:04 -04:00 committed by GitHub
parent 1529550b14
commit 2e309bef7f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 7 deletions

View file

@ -71,7 +71,7 @@ export async function spotifyApiRequestAllItems(this: IHookFunctions | IExecuteF
}
} while (
(responseData['next'] !== null && responseData['next'] !== undefined) ||
responseData[propertyName.split('.')[0]].next !== null
(responseData[propertyName.split('.')[0]].next !== null && responseData[propertyName.split('.')[0]].next !== undefined)
);
return returnData;

View file

@ -715,6 +715,7 @@ export class Spotify implements INodeType {
'myData',
'playlist',
'track',
'player',
],
operation: [
'getTracks',
@ -724,6 +725,7 @@ export class Spotify implements INodeType {
'getLikedTracks',
'getFollowingArtists',
'search',
'recentlyPlayed',
],
},
},
@ -779,6 +781,9 @@ export class Spotify implements INodeType {
'getFollowingArtists',
'recentlyPlayed',
],
returnAll: [
false,
],
},
},
typeOptions: {
@ -908,6 +913,7 @@ export class Spotify implements INodeType {
endpoint = `/me/player/pause`;
responseData = await spotifyApiRequest.call(this, requestMethod, endpoint, body, qs);
responseData = { success: true };
@ -917,15 +923,22 @@ export class Spotify implements INodeType {
endpoint = `/me/player/recently-played`;
const limit = this.getNodeParameter('limit', i) as number;
returnAll = this.getNodeParameter('returnAll', i) as boolean;
qs = {
limit,
};
propertyName = 'items';
responseData = await spotifyApiRequest.call(this, requestMethod, endpoint, body, qs);
if (!returnAll) {
responseData = responseData.items;
const limit = this.getNodeParameter('limit', i) as number;
qs = {
limit,
};
responseData = await spotifyApiRequest.call(this, requestMethod, endpoint, body, qs);
responseData = responseData.items;
}
} else if (operation === 'currentlyPlaying') {
requestMethod = 'GET';
@ -1384,8 +1397,14 @@ export class Spotify implements INodeType {
endpoint = `/me/following`;
returnAll = this.getNodeParameter('returnAll', i) as boolean;
propertyName = 'artists.items';
qs = {
type: 'artist',
};
if (!returnAll) {
const limit = this.getNodeParameter('limit', i) as number;
qs = {