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

Merge branch 'feat/add-embed-relationships' into 'develop'

Browse source 
Add `with_relationships` query param

Closes #838

See merge request pleroma/pleroma-fe!1107
This commit is contained in:
lain 2020-05-17 07:27:07 +00:00
commit bc9ed36424
4 changed files with 10 additions and 6 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 ...this.$store.state.instance.customEmoji
], ],
users: this.$store.state.users.users, users: this.$store.state.users.users,
updateUsersList: (input) => this.$store.dispatch('searchUsers', input) updateUsersList: (query) => this.$store.dispatch('searchUsers', { query })
}) })
}, },
emojiSuggestor () { emojiSuggestor () {

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

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

2
src/modules/users.js
View file

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

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

@ -324,7 +324,8 @@ const fetchFriends = ({ id, maxId, sinceId, limit = 20, credentials }) => {
const args = [ const args = [
maxId && `max_id=${maxId}`, maxId && `max_id=${maxId}`,
sinceId && `since_id=${sinceId}`, sinceId && `since_id=${sinceId}`,
limit && `limit=${limit}` limit && `limit=${limit}`,
`with_relationships=true`
].filter(_ => _).join('&') ].filter(_ => _).join('&')
url = url + (args ? '?' + args : '') url = url + (args ? '?' + args : '')
@ -358,7 +359,8 @@ const fetchFollowers = ({ id, maxId, sinceId, limit = 20, credentials }) => {
const args = [ const args = [
maxId && `max_id=${maxId}`, maxId && `max_id=${maxId}`,
sinceId && `since_id=${sinceId}`, sinceId && `since_id=${sinceId}`,
limit && `limit=${limit}` limit && `limit=${limit}`,
`with_relationships=true`
].filter(_ => _).join('&') ].filter(_ => _).join('&')
url += args ? '?' + args : '' url += args ? '?' + args : ''
@ -971,6 +973,8 @@ const search2 = ({ credentials, q, resolve, limit, offset, following }) => {
params.push(['following', true]) params.push(['following', true])
} }
params.push(['with_relationships', true])
let queryString = map(params, (param) => `${param[0]}=${param[1]}`).join('&') let queryString = map(params, (param) => `${param[0]}=${param[1]}`).join('&')
url += `?${queryString}` url += `?${queryString}`