therwi/sunkkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into develop

Browse source
This commit is contained in:
sadposter 2020-05-20 17:16:21 +01:00
commit 78db835fe1
19 changed files with 3632 additions and 2567 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/follow_card/follow_card.vue
View file

@ -2,7 +2,7 @@
<basic-user-card :user="user">
<div class="follow-card-content-container">
<span
v-if="!noFollowsYou && relationship.followed_by"
v-if="isMe || (!noFollowsYou && relationship.followed_by)"
class="faint"
>
{{ isMe ? $t('user_card.its_you') : $t('user_card.follows_you') }}
@ -15,7 +15,7 @@
<RemoteFollow :user="user" />
</div>
</template>
<template v-else>
<template v-else-if="!isMe">
<FollowButton
:relationship="relationship"
:label-following="$t('user_card.follow_unfollow')"

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

@ -116,7 +116,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 () {
@ -380,7 +380,7 @@ const UserSettings = {
})
},
queryUserIds (query) {
return this.$store.dispatch('searchUsers', query)
return this.$store.dispatch('searchUsers', { query })
.then((users) => map(users, 'id'))
},
blockUsers (ids) {