Troplo/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

review

Browse source
This commit is contained in:
Henry Jameson 2019-03-27 22:02:46 +02:00
parent 968e6c7fe8
commit fb2aca06de
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/modules/users.js
View file

@ -1,5 +1,5 @@
import backendInteractorService from '../services/backend_interactor_service/backend_interactor_service.js' import backendInteractorService from '../services/backend_interactor_service/backend_interactor_service.js'
import { compact, map, each, merge, find } from 'lodash' import { compact, map, each, merge, find, last } from 'lodash'
import { set } from 'vue' import { set } from 'vue'
import { registerPushNotifications, unregisterPushNotifications } from '../services/push/push.js' import { registerPushNotifications, unregisterPushNotifications } from '../services/push/push.js'
import oauthApi from '../services/new_api/oauth' import oauthApi from '../services/new_api/oauth'
@ -59,7 +59,7 @@ export const mutations = {
user.friends.push(friend) user.friends.push(friend)
} }
}) })
user.lastFriendId = friends.slice(-1)[0].id user.lastFriendId = last(friends).id
}, },
addFollowers (state, { id, followers }) { addFollowers (state, { id, followers }) {
const user = state.usersObject[id] const user = state.usersObject[id]
@ -68,7 +68,7 @@ export const mutations = {
user.followers.push(follower) user.followers.push(follower)
} }
}) })
user.lastFollowerId = followers.slice(-1)[0].id user.lastFollowerId = last(followers).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.

6
src/services/api/api.service.js
View file

@ -280,7 +280,7 @@ const fetchFriends = ({id, maxId, sinceId, limit = 20, credentials}) => {
let url = MASTODON_FOLLOWING_URL(id) let url = MASTODON_FOLLOWING_URL(id)
const args = [ const args = [
maxId && `max_id=${maxId}`, maxId && `max_id=${maxId}`,
sinceId && `max_id=${sinceId}`, sinceId && `since_id=${sinceId}`,
limit && `limit=${limit}` limit && `limit=${limit}`
].filter(_ => _).join('&') ].filter(_ => _).join('&')
@ -301,11 +301,11 @@ const fetchFollowers = ({id, maxId, sinceId, limit = 20, credentials}) => {
let url = MASTODON_FOLLOWERS_URL(id) let url = MASTODON_FOLLOWERS_URL(id)
const args = [ const args = [
maxId && `max_id=${maxId}`, maxId && `max_id=${maxId}`,
sinceId && `max_id=${sinceId}`, sinceId && `since_id=${sinceId}`,
limit && `limit=${limit}` limit && `limit=${limit}`
].filter(_ => _).join('&') ].filter(_ => _).join('&')
url = url + (args ? '?' + args : '') 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))