merge develop and fix conflicts AGAIN

2019-02-04 19:49:23 +02:00 · 2019-02-04 19:49:23 +02:00 · 54e7e0e31b
commit 54e7e0e31b
parent 18ae7bd5f3 3cd1deb133
26 changed files with 145 additions and 140 deletions
--- a/src/components/media_upload/media_upload.js
+++ b/src/components/media_upload/media_upload.js
@ -3,19 +3,10 @@ import statusPosterService from '../../services/status_poster/status_poster.serv
 import fileSizeFormatService from '../../services/file_size_format/file_size_format.js'

 const mediaUpload = {
-  mounted () {
-    const input = this.$el.querySelector('input')
-
-    input.addEventListener('change', ({target}) => {
-      for (var i = 0; i < target.files.length; i++) {
-        let file = target.files[i]
-        this.uploadFile(file)
-      }
-    })
-  },
  data () {
    return {
-      uploading: false
+      uploading: false,
+      uploadReady: true
    }
  },
  methods: {
@ -56,6 +47,18 @@ const mediaUpload = {
      } else {
        e.dataTransfer.dropEffect = 'none'
      }
+    },
+    clearFile () {
+      this.uploadReady = false
+      this.$nextTick(() => {
+        this.uploadReady = true
+      })
+    },
+    change ({target}) {
+      for (var i = 0; i < target.files.length; i++) {
+        let file = target.files[i]
+        this.uploadFile(file)
+      }
    }
  },
  props: [
--- a/src/components/media_upload/media_upload.vue
+++ b/src/components/media_upload/media_upload.vue
@ -3,7 +3,7 @@
    <label class="btn btn-default" :title="$t('tool_tip.media_upload')">
      <i class="icon-spin4 animate-spin" v-if="uploading"></i>
      <i class="icon-upload" v-if="!uploading"></i>
-      <input type="file" style="position: fixed; top: -100em" multiple="true"></input>
+      <input type="file" v-if="uploadReady" @change="change" style="position: fixed; top: -100em" multiple="true"></input>
    </label>
  </div>
 </template>
--- a/src/components/notification/notification.js
+++ b/src/components/notification/notification.js
@ -1,5 +1,5 @@
 import Status from '../status/status.vue'
-import StillImage from '../still-image/still-image.vue'
+import UserAvatar from '../user_avatar/user_avatar.vue'
 import UserCardContent from '../user_card_content/user_card_content.vue'
 import { highlightClass, highlightStyle } from '../../services/user_highlighter/user_highlighter.js'
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
@ -13,7 +13,7 @@ const Notification = {
  },
  props: [ 'notification' ],
  components: {
-    Status, StillImage, UserCardContent
+    Status, UserAvatar, UserCardContent
  },
  methods: {
    toggleUserExpanded () {
--- a/src/components/notification/notification.vue
+++ b/src/components/notification/notification.vue
@ -2,7 +2,7 @@
  <status v-if="notification.type === 'mention'" :compact="true" :statusoid="notification.status"></status>
  <div class="non-mention" :class="[userClass, { highlighted: userStyle }]" :style="[ userStyle ]"v-else>
    <a class='avatar-container' :href="notification.action.user.statusnet_profile_url" @click.stop.prevent.capture="toggleUserExpanded">
-      <StillImage class='avatar-compact' :class="{'better-shadow': betterShadow}" :src="notification.action.user.profile_image_url_original"/>
+      <UserAvatar :compact="true" :betterShadow="betterShadow" :src="notification.action.user.profile_image_url_original"/>
    </a>
    <div class='notification-right'>
      <div class="usercard notification-usercard" v-if="userExpanded">
--- a/src/components/notifications/notifications.scss
+++ b/src/components/notifications/notifications.scss
@ -36,26 +36,7 @@
  border-color: $fallback--border;
  border-color: var(--border, $fallback--border);

-  .avatar-compact {
-    width: 32px;
-    height: 32px;
-    box-shadow: var(--avatarStatusShadow);
-    border-radius: $fallback--avatarAltRadius;
-    border-radius: var(--avatarAltRadius, $fallback--avatarAltRadius);
-    overflow: hidden;
-    line-height: 0;
-
-    &.better-shadow {
-      box-shadow: var(--avatarStatusShadowInset);
-      filter: var(--avatarStatusShadowFilter)
-    }
-
-    &.animated::before {
-      display: none;
-    }
-  }
-
-  &:hover .animated.avatar-compact {
+  &:hover .animated.avatar {
    canvas {
      display: none;
    }
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@ -250,6 +250,7 @@ const PostStatusForm = {
            visibility: newStatus.visibility,
            contentType: newStatus.contentType
          }
+          this.$refs.mediaUpload.clearFile()
          this.$emit('posted')
          let el = this.$el.querySelector('textarea')
          el.style.height = 'auto'
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@ -64,7 +64,7 @@
        </div>
      </div>
      <div class='form-bottom'>
-        <media-upload @uploading="disableSubmit" @uploaded="addMediaFile" @upload-failed="uploadFailed" :drop-files="dropFiles"></media-upload>
+        <media-upload ref="mediaUpload" @uploading="disableSubmit" @uploaded="addMediaFile" @upload-failed="uploadFailed" :drop-files="dropFiles"></media-upload>

        <p v-if="isOverLengthLimit" class="error">{{ charactersLeft }}</p>
        <p class="faint" v-else-if="hasStatusLengthLimit">{{ charactersLeft }}</p>
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@ -4,7 +4,7 @@ import RetweetButton from '../retweet_button/retweet_button.vue'
 import DeleteButton from '../delete_button/delete_button.vue'
 import PostStatusForm from '../post_status_form/post_status_form.vue'
 import UserCardContent from '../user_card_content/user_card_content.vue'
-import StillImage from '../still-image/still-image.vue'
+import UserAvatar from '../user_avatar/user_avatar.vue'
 import Gallery from '../gallery/gallery.vue'
 import LinkPreview from '../link-preview/link-preview.vue'
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
@ -36,6 +36,7 @@ const Status = {
      preview: null,
      showPreview: false,
      showingTall: this.inConversation && this.focused,
+      showingLongSubject: false,
      expandingSubject: typeof this.$store.state.config.collapseMessageWithSubject === 'undefined'
        ? !this.$store.state.instance.collapseMessageWithSubject
        : !this.$store.state.config.collapseMessageWithSubject,
@ -89,6 +90,7 @@ const Status = {
    retweet () { return !!this.statusoid.retweeted_status },
    retweeter () { return this.statusoid.user.name || this.statusoid.user.screen_name },
    retweeterHtml () { return this.statusoid.user.name_html },
+    retweeterProfileLink () { return this.generateUserProfileLink(this.statusoid.user.id, this.statusoid.user.screen_name) },
    status () {
      if (this.retweet) {
        return this.statusoid.retweeted_status
@ -129,6 +131,9 @@ const Status = {
      const lengthScore = this.status.statusnet_html.split(/<p|<br/).length + this.status.text.length / 80
      return lengthScore > 20
    },
+    longSubject () {
+      return this.status.summary.length > 900
+    },
    isReply () {
      return !!(this.status.in_reply_to_status_id && this.status.in_reply_to_user_id)
    },
@ -244,7 +249,7 @@ const Status = {
    DeleteButton,
    PostStatusForm,
    UserCardContent,
-    StillImage,
+    UserAvatar,
    Gallery,
    LinkPreview
  },
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@ -13,10 +13,13 @@
    </template>
    <template v-else>
      <div v-if="retweet && !noHeading" :class="[repeaterClass, { highlighted: repeaterStyle }]" :style="[repeaterStyle]" class="media container retweet-info">
-        <StillImage v-if="retweet" class='avatar' :class='{ "better-shadow": betterShadow }' :src="statusoid.user.profile_image_url_original"/>
+        <UserAvatar v-if="retweet" :betterShadow="betterShadow" :src="statusoid.user.profile_image_url_original"/>
        <div class="media-body faint">
-          <a v-if="retweeterHtml" :href="statusoid.user.statusnet_profile_url" class="user-name" :title="'@'+statusoid.user.screen_name" v-html="retweeterHtml"></a>
-          <a v-else :href="statusoid.user.statusnet_profile_url" class="user-name" :title="'@'+statusoid.user.screen_name">{{retweeter}}</a>
+          <span class="user-name">
+            <router-link :to="retweeterProfileLink">
+              {{retweeterHtml || retweeter}}
+            </router-link>
+          </span>
          <i class='fa icon-retweet retweeted' :title="$t('tool_tip.repeat')"></i>
          {{$t('timeline.repeated')}}
        </div>
@ -25,7 +28,7 @@
      <div :class="[userClass, { highlighted: userStyle, 'is-retweet': retweet }]" :style="[ userStyle ]" class="media status">
        <div v-if="!noHeading" class="media-left">
          <router-link :to="userProfileLink" @click.stop.prevent.capture.native="toggleUserExpanded">
-            <StillImage class='avatar' :class="{'avatar-compact': compact, 'better-shadow': betterShadow}"  :src="status.user.profile_image_url_original"/>
+            <UserAvatar :compact="compact" :betterShadow="betterShadow" :src="status.user.profile_image_url_original"/>
          </router-link>
        </div>
        <div class="status-body">
@ -85,7 +88,12 @@
            </div>
          </div>

-          <div :class="{'tall-status': hideTallStatus}" class="status-content-wrapper">
+          <div class="status-content-wrapper" :class="{ 'tall-status': !showingLongSubject }" v-if="longSubject">
+            <a class="tall-status-hider" :class="{ 'tall-status-hider_focused': isFocused }" v-if="!showingLongSubject" href="#" @click.prevent="showingLongSubject=true">Show more</a>
+            <div @click.prevent="linkClicked" class="status-content media-body" v-html="status.statusnet_html"></div>
+            <a v-if="showingLongSubject" href="#" class="status-unhider" @click.prevent="showingLongSubject=false">Show less</a>
+          </div>
+          <div :class="{'tall-status': hideTallStatus}" class="status-content-wrapper" v-else>
            <a class="tall-status-hider" :class="{ 'tall-status-hider_focused': isFocused }" v-if="hideTallStatus" href="#" @click.prevent="toggleShowMore">Show more</a>
            <div @click.prevent="linkClicked" class="status-content media-body" v-html="status.statusnet_html" v-if="!hideSubjectStatus"></div>
            <div @click.prevent="linkClicked" class="status-content media-body" v-html="status.summary_html" v-else></div>
@ -93,7 +101,7 @@
            <a v-if="showingMore" href="#" class="status-unhider" @click.prevent="toggleShowMore">Show less</a>
          </div>

-          <div v-if="status.attachments && !hideSubjectStatus" class="attachments media-body">
+          <div v-if="status.attachments && (!hideSubjectStatus || showingLongSubject)" class="attachments media-body">
            <attachment
              class="non-gallery"
              v-for="attachment in nonGalleryAttachments"
@ -285,6 +293,14 @@
        overflow: hidden;
        white-space: nowrap;
      }
+      & > span {
+        text-overflow: ellipsis;
+        overflow: hidden;
+        white-space: nowrap;
+      }
+      & > a:last-child {
+        flex-shrink: 0;
+      }
    }
    .reply-info {
      display: flex;
@ -405,7 +421,7 @@
    padding: 0.4em 0.6em 0 0.6em;
    margin: 0;

-    .avatar {
+    .avatar.still-image {
      border-radius: $fallback--avatarAltRadius;
      border-radius: var(--avatarAltRadius, $fallback--avatarAltRadius);
      margin-left: 28px;
@ -489,46 +505,6 @@
  color: var(--cBlue, $fallback--cBlue);
 }

-.status .avatar-compact {
-  width: 32px;
-  height: 32px;
-  box-shadow: var(--avatarStatusShadow);
-  border-radius: $fallback--avatarAltRadius;
-  border-radius: var(--avatarAltRadius, $fallback--avatarAltRadius);
-
-  &.better-shadow {
-    box-shadow: var(--avatarStatusShadowInset);
-    filter: var(--avatarStatusShadowFilter)
-  }
-}
-
-.avatar.still-image {
-  width: 48px;
-  height: 48px;
-  box-shadow: var(--avatarStatusShadow);
-  border-radius: $fallback--avatarRadius;
-  border-radius: var(--avatarRadius, $fallback--avatarRadius);
-  overflow: hidden;
-  position: relative;
-
-  &.better-shadow {
-    box-shadow: var(--avatarStatusShadowInset);
-    filter: var(--avatarStatusShadowFilter)
-  }
-
-  img {
-    width: 100%;
-    height: 100%;
-  }
-
-  &.animated::before {
-    display: none;
-  }
-
-  &.retweeted {
-  }
-}
-
 .status:hover .animated.avatar {
  canvas {
    display: none;
@ -586,7 +562,7 @@ a.unmute {
@media all and (max-width: 800px) {
  .status-el {
    .retweet-info {
-      .avatar {
+      .avatar.still-image {
        margin-left: 20px;
      }
    }
@ -595,14 +571,14 @@ a.unmute {
    max-width: 100%;
  }

-  .status .avatar {
+  .status .avatar.still-image {
    width: 40px;
    height: 40px;
-  }

-  .status .avatar-compact {
-    width: 32px;
-    height: 32px;
+    &.avatar-compact {
+      width: 32px;
+      height: 32px;
+    }
  }
 }

--- a/src/components/still-image/still-image.js
+++ b/src/components/still-image/still-image.js
@ -2,7 +2,8 @@ const StillImage = {
  props: [
    'src',
    'referrerpolicy',
-    'mimetype'
+    'mimetype',
+    'imageLoadError'
  ],
  data () {
    return {
--- a/src/components/still-image/still-image.vue
+++ b/src/components/still-image/still-image.vue
@ -1,7 +1,7 @@
 <template>
  <div class='still-image' :class='{ animated: animated }' >
    <canvas ref="canvas" v-if="animated"></canvas>
-    <img ref="src" :src="src" :referrerpolicy="referrerpolicy" v-on:load="onLoad"/>
+    <img ref="src" :src="src" :referrerpolicy="referrerpolicy" v-on:load="onLoad" @error="imageLoadError"/>
  </div>
 </template>

--- a/src/components/user_avatar/user_avatar.js
+++ b/src/components/user_avatar/user_avatar.js
@ -0,0 +1,29 @@
+import StillImage from '../still-image/still-image.vue'
+
+const UserAvatar = {
+  props: [
+    'src',
+    'betterShadow',
+    'compact'
+  ],
+  data () {
+    return {
+      showPlaceholder: false
+    }
+  },
+  components: {
+    StillImage
+  },
+  computed: {
+    imgSrc () {
+      return this.showPlaceholder ? '/images/avi.png' : this.src
+    }
+  },
+  methods: {
+    imageLoadError () {
+      this.showPlaceholder = true
+    }
+  }
+}
+
+export default UserAvatar
--- a/src/components/user_avatar/user_avatar.vue
+++ b/src/components/user_avatar/user_avatar.vue
@ -0,0 +1,37 @@
+<template>
+  <StillImage class="avatar" :class="{ 'avatar-compact': compact, 'better-shadow': betterShadow }" :src="imgSrc" :imageLoadError="imageLoadError"/>
+</template>
+
+<script src="./user_avatar.js"></script>
+<style lang="scss">
+@import '../../_variables.scss';
+
+.avatar.still-image {
+  width: 48px;
+  height: 48px;
+  box-shadow: var(--avatarStatusShadow);
+  border-radius: $fallback--avatarRadius;
+  border-radius: var(--avatarRadius, $fallback--avatarRadius);
+
+  img {
+    width: 100%;
+    height: 100%;
+  }
+
+  &.better-shadow {
+    box-shadow: var(--avatarStatusShadowInset);
+    filter: var(--avatarStatusShadowFilter)
+  }
+
+  &.animated::before {
+    display: none;
+  }
+
+  &.avatar-compact {
+    width: 32px;
+    height: 32px;
+    border-radius: $fallback--avatarAltRadius;
+    border-radius: var(--avatarAltRadius, $fallback--avatarAltRadius);
+  }
+}
+</style>
--- a/src/components/user_card/user_card.js
+++ b/src/components/user_card/user_card.js
@ -1,5 +1,5 @@
 import UserCardContent from '../user_card_content/user_card_content.vue'
-import StillImage from '../still-image/still-image.vue'
+import UserAvatar from '../user_avatar/user_avatar.vue'
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'

 const UserCard = {
@ -15,7 +15,7 @@ const UserCard = {
  },
  components: {
    UserCardContent,
-    StillImage
+    UserAvatar
  },
  computed: {
    currentUser () { return this.$store.state.users.currentUser }
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@ -1,7 +1,7 @@
 <template>
  <div class="card">
    <a href="#">
-      <StillImage @click.prevent.native="toggleUserExpanded" class="avatar" :src="user.profile_image_url"/>
+      <UserAvatar class="avatar" :compact="true" @click.prevent.native="toggleUserExpanded" :src="user.profile_image_url"/>
    </a>
    <div class="usercard" v-if="userExpanded">
      <user-card-content :user="user" :switcher="false"></user-card-content>
@ -69,11 +69,7 @@
 	border-bottom-color: var(--border, $fallback--border);

  .avatar {
-    margin-top: 0.2em;
-    width:32px;
-    height: 32px;
-    border-radius: $fallback--avatarAltRadius;
-    border-radius: var(--avatarAltRadius, $fallback--avatarAltRadius);
+    padding: 0;
  }
 }

--- a/src/components/user_card_content/user_card_content.js
+++ b/src/components/user_card_content/user_card_content.js
@ -1,4 +1,4 @@
-import StillImage from '../still-image/still-image.vue'
+import UserAvatar from '../user_avatar/user_avatar.vue'
 import { hex2rgb } from '../../services/color_convert/color_convert.js'
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'

@ -82,7 +82,7 @@ export default {
    }
  },
  components: {
-    StillImage
+    UserAvatar
  },
  methods: {
    followUser () {
--- a/src/components/user_card_content/user_card_content.vue
+++ b/src/components/user_card_content/user_card_content.vue
@ -4,7 +4,7 @@
    <div class='user-info'>
      <div class='container'>
        <router-link :to="userProfileLink(user)">
-          <StillImage class="avatar" :class='{ "better-shadow": betterShadow }' :src="user.profile_image_url_original"/>
+          <UserAvatar :betterShadow="betterShadow" :src="user.profile_image_url_original"/>
        </router-link>
        <div class="name-and-screen-name">
          <div class="top-line">
@ -169,23 +169,12 @@
    max-height: 56px;

    .avatar {
-      border-radius: $fallback--avatarRadius;
-      border-radius: var(--avatarRadius, $fallback--avatarRadius);
      flex: 1 0 100%;
      width: 56px;
      height: 56px;
      box-shadow: 0px 1px 8px rgba(0,0,0,0.75);
      box-shadow: var(--avatarShadow);
      object-fit: cover;
-
-      &.better-shadow {
-        box-shadow: var(--avatarShadowInset);
-        filter: var(--avatarShadowFilter)
-      }
-
-      &.animated::before {
-        display: none;
-      }
    }
  }

--- a/src/components/user_settings/user_settings.js
+++ b/src/components/user_settings/user_settings.js
@ -10,8 +10,7 @@ const UserSettings = {
      newLocked: this.$store.state.users.currentUser.locked,
      newNoRichText: this.$store.state.users.currentUser.no_rich_text,
      newDefaultScope: this.$store.state.users.currentUser.default_scope,
-      hideFollowings: this.$store.state.users.currentUser.hide_followings,
-      hideFollowers: this.$store.state.users.currentUser.hide_followers,
+      newHideNetwork: this.$store.state.users.currentUser.hide_network,
      followList: null,
      followImportError: false,
      followsImported: false,
@ -67,8 +66,7 @@ const UserSettings = {
      /* eslint-disable camelcase */
      const default_scope = this.newDefaultScope
      const no_rich_text = this.newNoRichText
-      const hide_followings = this.hideFollowings
-      const hide_followers = this.hideFollowers
+      const hide_network = this.newHideNetwork
      /* eslint-enable camelcase */
      this.$store.state.api.backendInteractor
        .updateProfile({
@ -80,8 +78,7 @@ const UserSettings = {
            /* eslint-disable camelcase */
            default_scope,
            no_rich_text,
-            hide_followings,
-            hide_followers
+            hide_network
            /* eslint-enable camelcase */
          }}).then((user) => {
            if (!user.error) {
--- a/src/components/user_settings/user_settings.vue
+++ b/src/components/user_settings/user_settings.vue
@ -30,12 +30,8 @@
              <label for="account-no-rich-text">{{$t('settings.no_rich_text_description')}}</label>
            </p>
            <p>
-              <input type="checkbox" v-model="hideFollowings" id="account-hide-followings">
-              <label for="account-hide-followings">{{$t('settings.hide_followings_description')}}</label>
-            </p>
-            <p>
-              <input type="checkbox" v-model="hideFollowers" id="account-hide-followers">
-              <label for="account-hide-followers">{{$t('settings.hide_followers_description')}}</label>
+              <input type="checkbox" v-model="newHideNetwork" id="account-hide-network">
+              <label for="account-hide-network">{{$t('settings.hide_network_description')}}</label>
            </p>
            <button :disabled='newName.length <= 0' class="btn btn-default" @click="updateProfile">{{$t('general.submit')}}</button>
          </div>
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@ -155,8 +155,7 @@
    "notification_visibility_mentions": "Erwähnungen",
    "notification_visibility_repeats": "Wiederholungen",
    "no_rich_text_description": "Rich-Text Formatierungen von allen Beiträgen entfernen",
-    "hide_followings_description": "Zeige nicht, wem ich folge",
-    "hide_followers_description": "Zeige nicht, wer mir folgt",
+    "hide_network_description": "Zeige nicht, wem ich folge und wer mir folgt",
    "nsfw_clickthrough": "Aktiviere ausblendbares Overlay für Anhänge, die als NSFW markiert sind",
    "panelRadius": "Panel",
    "pause_on_unfocused": "Streaming pausieren, wenn das Tab nicht fokussiert ist",
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@ -164,8 +164,7 @@
    "notification_visibility_mentions": "Mentions",
    "notification_visibility_repeats": "Repeats",
    "no_rich_text_description": "Strip rich text formatting from all posts",
-    "hide_followings_description": "Don't show who I'm following",
-    "hide_followers_description": "Don't show who's following me",
+    "hide_network_description": "Don't show who I'm following and who's following me",
    "nsfw_clickthrough": "Enable clickthrough NSFW attachment hiding",
    "panelRadius": "Panels",
    "pause_on_unfocused": "Pause streaming when tab is not focused",
--- a/src/i18n/ja.json
+++ b/src/i18n/ja.json
@ -157,8 +157,7 @@
    "notification_visibility_mentions": "メンション",
    "notification_visibility_repeats": "リピート",
    "no_rich_text_description": "リッチテキストをつかわない",
-    "hide_followings_description": "フォローしている人を表示しない",
-    "hide_followers_description": "フォローしている人を表示しない",
+    "hide_network_description": "わたしがフォローしているひとと、わたしをフォローしているひとを、みせない",
    "nsfw_clickthrough": "NSFWなファイルをかくす",
    "panelRadius": "パネル",
    "pause_on_unfocused": "タブにフォーカスがないときストリーミングをとめる",
--- a/src/i18n/ko.json
+++ b/src/i18n/ko.json
@ -156,8 +156,7 @@
    "notification_visibility_mentions": "멘션",
    "notification_visibility_repeats": "반복",
    "no_rich_text_description": "모든 게시물의 서식을 지우기",
-    "hide_followings_description": "내가 팔로우하는 사람을 표시하지 않음",
-    "hide_followers_description": "나를 따르는 사람을 보여주지 마라.",
+    "hide_network_description": "내 팔로우와 팔로워를 숨기기",
    "nsfw_clickthrough": "NSFW 이미지 \"클릭해서 보이기\"를 활성화",
    "panelRadius": "패널",
    "pause_on_unfocused": "탭이 활성 상태가 아닐 때 스트리밍 멈추기",
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@ -127,8 +127,7 @@
    "notification_visibility_mentions": "Упоминания",
    "notification_visibility_repeats": "Повторы",
    "no_rich_text_description": "Убрать форматирование из всех постов",
-    "hide_followings_description": "Не показывать кого я читаю",
-    "hide_followers_description": "Не показывать кто читает меня",
+    "hide_network_description": "Не показывать кого я читаю и кто меня читает",
    "nsfw_clickthrough": "Включить скрытие NSFW вложений",
    "panelRadius": "Панели",
    "pause_on_unfocused": "Приостановить загрузку когда вкладка не в фокусе",
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@ -130,7 +130,7 @@ const updateBanner = ({credentials, params}) => {
 // description
 const updateProfile = ({credentials, params}) => {
  // Always include these fields, because they might be empty or false
-  const fields = ['description', 'locked', 'no_rich_text', 'hide_followings', 'hide_followers']
+  const fields = ['description', 'locked', 'no_rich_text', 'hide_network']
  let url = PROFILE_UPDATE_URL

  const form = new FormData()
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@ -100,8 +100,7 @@ export const parseUser = (data) => {
    output.rights = data.rights
    output.no_rich_text = data.no_rich_text
    output.default_scope = data.default_scope
-    output.hide_followings = data.hide_followings
-    output.hide_followers = data.hide_followers
+    output.hide_network = data.hide_network
    output.background_image = data.background_image
    // on mastoapi this info is contained in a "relationship"
    output.following = data.following