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

add with_relationships where necessary

Browse source
This commit is contained in:
Shpuld Shpuldson 2020-05-13 17:48:31 +03:00
parent 7a0e554daf
commit 8e39971098
4 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/post_status_form/post_status_form.js
View file

@ -102,7 +102,7 @@ const PostStatusForm = {
...this.$store.state.instance.customEmoji
],
users: this.$store.state.users.users,
updateUsersList: (input) => this.$store.dispatch('searchUsers', input)
updateUsersList: (query) => this.$store.dispatch('searchUsers', { query })
})
},
emojiSuggestor () {

4
src/components/user_settings/user_settings.js
View file

@ -112,7 +112,7 @@ const UserSettings = {
...this.$store.state.instance.customEmoji
],
users: this.$store.state.users.users,
updateUsersList: (input) => this.$store.dispatch('searchUsers', input)
updateUsersList: (query) => this.$store.dispatch('searchUsers', { query })
})
},
emojiSuggestor () {
@ -362,7 +362,7 @@ const UserSettings = {
})
},
queryUserIds (query) {
return this.$store.dispatch('searchUsers', query)
return this.$store.dispatch('searchUsers', { query })
.then((users) => map(users, 'id'))
},
blockUsers (ids) {

4
src/modules/users.js
View file

@ -428,8 +428,8 @@ const users = {
store.commit('setUserForNotification', notification)
})
},
searchUsers (store, query) {
return store.rootState.api.backendInteractor.searchUsers({ query })
searchUsers (store, { query, withRelationships }) {
return store.rootState.api.backendInteractor.searchUsers({ query, withRelationships })
.then((users) => {
store.commit('addNewUsers', users)
return users

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

@ -324,7 +324,8 @@ const fetchFriends = ({ id, maxId, sinceId, limit = 20, credentials }) => {
const args = [
maxId && `max_id=${maxId}`,
sinceId && `since_id=${sinceId}`,
limit && `limit=${limit}`
limit && `limit=${limit}`,
`with_relationships=true`
].filter(_ => _).join('&')
url = url + (args ? '?' + args : '')
@ -358,7 +359,8 @@ const fetchFollowers = ({ id, maxId, sinceId, limit = 20, credentials }) => {
const args = [
maxId && `max_id=${maxId}`,
sinceId && `since_id=${sinceId}`,
limit && `limit=${limit}`
limit && `limit=${limit}`,
`with_relationships=true`
].filter(_ => _).join('&')
url += args ? '?' + args : ''
@ -935,12 +937,13 @@ const reportUser = ({ credentials, userId, statusIds, comment, forward }) => {
})
}
const searchUsers = ({ credentials, query }) => {
const searchUsers = ({ credentials, query, withRelationships }) => {
return promisedRequest({
url: MASTODON_USER_SEARCH_URL,
params: {
q: query,
resolve: true
resolve: true,
with_relationships: withRelationships
},
credentials
})
@ -971,6 +974,8 @@ const search2 = ({ credentials, q, resolve, limit, offset, following }) => {
params.push(['following', true])
}
params.push(['with_relationships', true])
let queryString = map(params, (param) => `${param[0]}=${param[1]}`).join('&')
url += `?${queryString}`