diff options
| author | Shpuld Shpludson <shp@cock.li> | 2020-05-08 09:14:26 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2020-05-08 09:14:26 +0000 |
| commit | 47c56ffa1c8509ed323602f54be34328e9105419 (patch) | |
| tree | c439d51bcc3a5a972fc763ab96ade4cee9bed7a1 /src/components/user_card/user_card.vue | |
| parent | 921eedfd84007da72619a553ba8d074076559e7a (diff) | |
| parent | 1186205583715b187bb4e503dc35e8c0644cfc7e (diff) | |
Merge branch 'feat/relationship-refactor' into 'develop'
Refactor: make relationships separate from users
Closes #819
See merge request pleroma/pleroma-fe!1091
Diffstat (limited to 'src/components/user_card/user_card.vue')
| -rw-r--r-- | src/components/user_card/user_card.vue | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue index 4ee040e8..b40435cd 100644 --- a/src/components/user_card/user_card.vue +++ b/src/components/user_card/user_card.vue @@ -69,6 +69,7 @@ <AccountActions v-if="isOtherUser && loggedIn" :user="user" + :relationship="relationship" /> </div> <div class="bottom-line"> @@ -92,7 +93,7 @@ </div> <div class="user-meta"> <div - v-if="user.follows_you && loggedIn && isOtherUser" + v-if="relationship.followed_by && loggedIn && isOtherUser" class="following" > {{ $t('user_card.follows_you') }} @@ -139,10 +140,10 @@ class="user-interactions" > <div class="btn-group"> - <FollowButton :user="user" /> - <template v-if="user.following"> + <FollowButton :relationship="relationship" /> + <template v-if="relationship.following"> <ProgressButton - v-if="!user.subscribed" + v-if="!relationship.subscribing" class="btn btn-default" :click="subscribeUser" :title="$t('user_card.subscribe')" @@ -161,7 +162,7 @@ </div> <div> <button - v-if="user.muted" + v-if="relationship.muting" class="btn btn-default btn-block toggled" @click="unmuteUser" > |