Merge branch 'develop' into 'notifications'

# Conflicts:
#   src/main.js
This commit is contained in:
kaniini 2018-08-24 23:00:56 +00:00
commit fe906cc3f0
16 changed files with 224 additions and 101 deletions

View file

@ -37,6 +37,7 @@ const CHANGE_PASSWORD_URL = '/api/pleroma/change_password'
const FOLLOW_REQUESTS_URL = '/api/pleroma/friend_requests'
const APPROVE_USER_URL = '/api/pleroma/friendships/approve'
const DENY_USER_URL = '/api/pleroma/friendships/deny'
const SUGGESTIONS_URL = '/api/v1/suggestions'
import { each, map } from 'lodash'
import 'whatwg-fetch'
@ -454,6 +455,12 @@ const fetchMutes = ({credentials}) => {
}).then((data) => data.json())
}
const suggestions = ({credentials}) => {
return fetch(SUGGESTIONS_URL, {
headers: authHeaders(credentials)
}).then((data) => data.json())
}
const apiService = {
verifyCredentials,
fetchTimeline,
@ -487,7 +494,8 @@ const apiService = {
changePassword,
fetchFollowRequests,
approveUser,
denyUser
denyUser,
suggestions
}
export default apiService