pleroma-fe

commit: 1f42283b8dda0308480de6292995221e631c3989
parent: 3dae1cf39642a677f73d16d3a108f0d88475c36f
Author: kaniini <ariadne@dereferenced.org>
Date:   Wed, 13 Nov 2019 21:22:35 +0000

Merge branch 'friend-follower-count-display' into 'develop'

Show "Hidden" instead of zero when followers/following counts are hidden

See merge request pleroma/pleroma-fe!993
Diffstat:
M
src/components/user_card/user_card.js
6
++++++
M
src/components/user_card/user_card.vue
4
++--
M
src/i18n/en.json
1
+

3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/components/user_card/user_card.js b/src/components/user_card/user_card.js
@@ -93,6 +93,12 @@ export default {
       const roleTitle = rights.admin ? 'admin' : 'moderator'
       return validRole && roleTitle
     },
+    hideFollowsCount () {
+      return this.isOtherUser && this.user.hide_follows_count
+    },
+    hideFollowersCount () {
+      return this.isOtherUser && this.user.hide_followers_count
+    },
     ...mapGetters(['mergedConfig'])
   },
   components: {
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
@@ -208,14 +208,14 @@
           @click.prevent="setProfileView('friends')"
         >
           <h5>{{ $t('user_card.followees') }}</h5>
-          <span>{{ user.friends_count }}</span>
+          <span>{{ hideFollowsCount ? $t('user_card.hidden') : user.friends_count }}</span>
         </div>
         <div
           class="user-count"
           @click.prevent="setProfileView('followers')"
         >
           <h5>{{ $t('user_card.followers') }}</h5>
-          <span>{{ user.followers_count }}</span>
+          <span>{{ hideFollowersCount ? $t('user_card.hidden') : user.followers_count }}</span>
         </div>
       </div>
       <!-- eslint-disable vue/no-v-html -->
diff --git a/src/i18n/en.json b/src/i18n/en.json
@@ -569,6 +569,7 @@
     "followers": "Followers",
     "following": "Following!",
     "follows_you": "Follows you!",
+    "hidden": "Hidden",
     "its_you": "It's you!",
     "media": "Media",
     "mention": "Mention",