correctly paginate on MastoAPI

This commit is contained in:
Henry Jameson 2019-03-25 21:04:52 +02:00
parent 50960c7cfc
commit 968e6c7fe8
3 changed files with 32 additions and 24 deletions

View file

@ -52,23 +52,23 @@ export const mutations = {
state.loggingIn = false state.loggingIn = false
}, },
// TODO Clean after ourselves? // TODO Clean after ourselves?
addFriends (state, { id, friends, page }) { addFriends (state, { id, friends }) {
const user = state.usersObject[id] const user = state.usersObject[id]
each(friends, friend => { each(friends, friend => {
if (!find(user.friends, { id: friend.id })) { if (!find(user.friends, { id: friend.id })) {
user.friends.push(friend) user.friends.push(friend)
} }
}) })
user.friendsPage = page + 1 user.lastFriendId = friends.slice(-1)[0].id
}, },
addFollowers (state, { id, followers, page }) { addFollowers (state, { id, followers }) {
const user = state.usersObject[id] const user = state.usersObject[id]
each(followers, follower => { each(followers, follower => {
if (!find(user.followers, { id: follower.id })) { if (!find(user.followers, { id: follower.id })) {
user.followers.push(follower) user.followers.push(follower)
} }
}) })
user.followersPage = page + 1 user.lastFollowerId = followers.slice(-1)[0].id
}, },
// Because frontend doesn't have a reason to keep these stuff in memory // Because frontend doesn't have a reason to keep these stuff in memory
// outside of viewing someones user profile. // outside of viewing someones user profile.
@ -78,7 +78,7 @@ export const mutations = {
return return
} }
user.friends = [] user.friends = []
user.friendsPage = 0 user.lastFriendId = null
}, },
clearFollowers (state, userId) { clearFollowers (state, userId) {
const user = state.usersObject[userId] const user = state.usersObject[userId]
@ -86,7 +86,7 @@ export const mutations = {
return return
} }
user.followers = [] user.followers = []
user.followersPage = 0 user.lastFollowerId = null
}, },
addNewUsers (state, users) { addNewUsers (state, users) {
each(users, (user) => mergeOrAdd(state.users, state.usersObject, user)) each(users, (user) => mergeOrAdd(state.users, state.usersObject, user))
@ -219,10 +219,10 @@ const users = {
addFriends ({ rootState, commit }, fetchBy) { addFriends ({ rootState, commit }, fetchBy) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const user = rootState.users.usersObject[fetchBy] const user = rootState.users.usersObject[fetchBy]
const page = user.friendsPage || 1 const sinceId = user.lastFriendId
rootState.api.backendInteractor.fetchFriends({ id: user.id, page }) rootState.api.backendInteractor.fetchFriends({ id: user.id, sinceId })
.then((friends) => { .then((friends) => {
commit('addFriends', { id: user.id, friends, page }) commit('addFriends', { id: user.id, friends })
resolve(friends) resolve(friends)
}).catch(() => { }).catch(() => {
reject() reject()
@ -231,10 +231,10 @@ const users = {
}, },
addFollowers ({ rootState, commit }, fetchBy) { addFollowers ({ rootState, commit }, fetchBy) {
const user = rootState.users.usersObject[fetchBy] const user = rootState.users.usersObject[fetchBy]
const page = user.followersPage || 1 const sinceId = user.lastFollowerId
return rootState.api.backendInteractor.fetchFollowers({ id: user.id, page }) return rootState.api.backendInteractor.fetchFollowers({ id: user.id, sinceId })
.then((followers) => { .then((followers) => {
commit('addFollowers', { id: user.id, followers, page }) commit('addFollowers', { id: user.id, followers })
return followers return followers
}) })
}, },

View file

@ -276,11 +276,15 @@ const fetchUserRelationship = ({id, credentials}) => {
}) })
} }
const fetchFriends = ({id, page, credentials}) => { const fetchFriends = ({id, maxId, sinceId, limit = 20, credentials}) => {
let url = MASTODON_FOLLOWING_URL(id) let url = MASTODON_FOLLOWING_URL(id)
if (page) { const args = [
url = url + `?page=${page}` maxId && `max_id=${maxId}`,
} sinceId && `max_id=${sinceId}`,
limit && `limit=${limit}`
].filter(_ => _).join('&')
url = url + (args ? '?' + args : '')
return fetch(url, { headers: authHeaders(credentials) }) return fetch(url, { headers: authHeaders(credentials) })
.then((data) => data.json()) .then((data) => data.json())
.then((data) => data.map(parseUser)) .then((data) => data.map(parseUser))
@ -293,11 +297,15 @@ const exportFriends = ({id, credentials}) => {
.then((data) => data.map(parseUser)) .then((data) => data.map(parseUser))
} }
const fetchFollowers = ({id, page, credentials}) => { const fetchFollowers = ({id, maxId, sinceId, limit = 20, credentials}) => {
let url = MASTODON_FOLLOWERS_URL(id) let url = MASTODON_FOLLOWERS_URL(id)
if (page) { const args = [
url = url + `?page=${page}` maxId && `max_id=${maxId}`,
} sinceId && `max_id=${sinceId}`,
limit && `limit=${limit}`
].filter(_ => _).join('&')
url = url + (args ? '?' + args : '')
return fetch(url, { headers: authHeaders(credentials) }) return fetch(url, { headers: authHeaders(credentials) })
.then((data) => data.json()) .then((data) => data.json())
.then((data) => data.map(parseUser)) .then((data) => data.map(parseUser))

View file

@ -10,16 +10,16 @@ const backendInteractorService = (credentials) => {
return apiService.fetchConversation({id, credentials}) return apiService.fetchConversation({id, credentials})
} }
const fetchFriends = ({id, page}) => { const fetchFriends = ({id, maxId, sinceId, limit}) => {
return apiService.fetchFriends({id, page, credentials}) return apiService.fetchFriends({id, maxId, sinceId, limit, credentials})
} }
const exportFriends = ({id}) => { const exportFriends = ({id}) => {
return apiService.exportFriends({id, credentials}) return apiService.exportFriends({id, credentials})
} }
const fetchFollowers = ({id, page}) => { const fetchFollowers = ({id, maxId, sinceId, limit}) => {
return apiService.fetchFollowers({id, page, credentials}) return apiService.fetchFollowers({id, maxId, sinceId, limit, credentials})
} }
const fetchAllFollowing = ({username}) => { const fetchAllFollowing = ({username}) => {