Merge branch 'hide-followers-follows-count' into 'develop'

Added a setting to hide follow/follower count from the user profile

See merge request !951

src/components/user_settings/user_settings.js

@@ -41,6 +41,8 @@ const UserSettings = {
       newDefaultScope: this.$store.state.users.currentUser.default_scope,
       hideFollows: this.$store.state.users.currentUser.hide_follows,
       hideFollowers: this.$store.state.users.currentUser.hide_followers,
+      hideFollowsCount: this.$store.state.users.currentUser.hide_follows_count,
+      hideFollowersCount: this.$store.state.users.currentUser.hide_followers_count,
       showRole: this.$store.state.users.currentUser.show_role,
       role: this.$store.state.users.currentUser.role,
       pickAvatarBtnVisible: true,
@@ -142,6 +144,8 @@ const UserSettings = {
             no_rich_text: this.newNoRichText,
             hide_follows: this.hideFollows,
             hide_followers: this.hideFollowers,
+            hide_follows_count: this.hideFollowsCount,
+            hide_followers_count: this.hideFollowersCount,
             show_role: this.showRole
             /* eslint-enable camelcase */
           } }).then((user) => {

src/components/user_settings/user_settings.vue

@@ -90,6 +90,15 @@
               >
               <label for="account-hide-follows">{{ $t('settings.hide_follows_description') }}</label>
             </p>
+            <p class="setting-subitem">
+              <input
+                id="account-hide-follows-count"
+                v-model="hideFollowsCount"
+                type="checkbox"
+                :disabled="!hideFollows"
+              >
+              <label for="account-hide-follows-count">{{ $t('settings.hide_follows_count_description') }}</label>
+            </p>
             <p>
               <input
                 id="account-hide-followers"
@@ -98,6 +107,15 @@
               >
               <label for="account-hide-followers">{{ $t('settings.hide_followers_description') }}</label>
             </p>
+            <p class="setting-subitem">
+              <input
+                id="account-hide-followers-count"
+                v-model="hideFollowersCount"
+                type="checkbox"
+                :disabled="!hideFollowers"
+              >
+              <label for="account-hide-followers-count">{{ $t('settings.hide_followers_count_description') }}</label>
+            </p>
             <p>
               <input
                 id="account-show-role"
@@ -619,5 +637,9 @@
       width: 10em;
     }
   }
+
+  .setting-subitem {
+    margin-left: 1.75em;
+  }
 }
 </style>

src/i18n/en.json

@@ -284,6 +284,8 @@
     "no_mutes": "No mutes",
     "hide_follows_description": "Don't show who I'm following",
     "hide_followers_description": "Don't show who's following me",
+    "hide_follows_count_description": "Don't show follow count",
+    "hide_followers_count_description": "Don't show follower count",
     "show_admin_badge": "Show Admin badge in my profile",
     "show_moderator_badge": "Show Moderator badge in my profile",
     "nsfw_clickthrough": "Enable clickthrough NSFW attachment hiding",

src/i18n/ru.json

@@ -178,6 +178,8 @@
     "no_rich_text_description": "Убрать форматирование из всех постов",
     "hide_follows_description": "Не показывать кого я читаю",
     "hide_followers_description": "Не показывать кто читает меня",
+    "hide_follows_count_description": "Не показывать число читаемых пользователей",
+    "hide_followers_count_description": "Не показывать число моих подписчиков",
     "show_admin_badge": "Показывать значок администратора в моем профиле",
     "show_moderator_badge": "Показывать значок модератора в моем профиле",
     "nsfw_clickthrough": "Включить скрытие NSFW вложений",

src/services/entity_normalizer/entity_normalizer.service.js

@@ -74,6 +74,8 @@ export const parseUser = (data) => {
 
       output.hide_follows = data.pleroma.hide_follows
       output.hide_followers = data.pleroma.hide_followers
+      output.hide_follows_count = data.pleroma.hide_follows_count
+      output.hide_followers_count = data.pleroma.hide_followers_count
 
       output.rights = {
         moderator: data.pleroma.is_moderator,
@@ -140,6 +142,8 @@ export const parseUser = (data) => {
     output.default_scope = data.default_scope
     output.hide_follows = data.hide_follows
     output.hide_followers = data.hide_followers
+    output.hide_follows_count = data.hide_follows_count
+    output.hide_followers_count = data.hide_followers_count
     output.background_image = data.background_image
     // on mastoapi this info is contained in a "relationship"
     output.following = data.following

test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js

@@ -278,10 +278,12 @@ describe('API Entities normalizer', () => {
     })
 
     it('adds hide_follows and hide_followers user settings', () => {
-      const user = makeMockUserMasto({ pleroma: { hide_followers: true, hide_follows: false } })
+      const user = makeMockUserMasto({ pleroma: { hide_followers: true, hide_follows: false, hide_followers_count: false, hide_follows_count: true } })
 
       expect(parseUser(user)).to.have.property('hide_followers', true)
       expect(parseUser(user)).to.have.property('hide_follows', false)
+      expect(parseUser(user)).to.have.property('hide_followers_count', false)
+      expect(parseUser(user)).to.have.property('hide_follows_count', true)
     })
   })