Merge remote-tracking branch 'upstream/develop' into shigusegubu

* upstream/develop: (24 commits) Remove whitespace hack on empty post content Change output directory of fontello add html-webpack-plugin to karma config use another fork of fontello-webpack-plugin add animate-spin class remove needless code use another approach for versioning font files versioning the font resources through webpack fix "can't find property of undefined" errors in mrf transparency panel move mention button right next to mute button restore muted users collapsing logic on other user’s profiles [i18n] Improve easy/pedantic Japanese switching Normalize profile fields backend interactor service: implement startFetchingFollowRequest show badge visibility user setting checkbox only if needed Use kana+kanji as default for Japanese translation Remove outdated changelog file Fix translation (https://blob.cat/notice/9oyYO1RzcNbJXxKxeq) use yarn, try to restart pipeline tests + updates ...
2019-12-10 23:08:45 +02:00 · 2019-12-10 23:08:45 +02:00 · b6b7bc5852
commit b6b7bc5852
parent 31aabd5fc7 e60d9f2d5a
50 changed files with 428 additions and 1149 deletions
--- a/src/components/account_actions/account_actions.js
+++ b/src/components/account_actions/account_actions.js
@ -25,9 +25,6 @@ const AccountActions = {
    },
    reportUser () {
      this.$store.dispatch('openUserReportingModal', this.user.id)
-    },
-    mentionUser () {
-      this.$store.dispatch('openPostStatusModal', { replyTo: true, repliedUser: this.user })
    }
  }
 }
--- a/src/components/account_actions/account_actions.vue
+++ b/src/components/account_actions/account_actions.vue
@ -9,17 +9,7 @@
    >
      <div slot="popover">
        <div class="dropdown-menu">
-          <button
-            class="btn btn-default btn-block dropdown-item"
-            @click="mentionUser"
-          >
-            {{ $t('user_card.mention') }}
-          </button>
          <template v-if="user.following">
-            <div
-              role="separator"
-              class="dropdown-divider"
-            />
            <button
              v-if="user.showing_reblogs"
              class="btn btn-default dropdown-item"
@ -34,11 +24,11 @@
            >
              {{ $t('user_card.show_repeats') }}
            </button>
+            <div
+              role="separator"
+              class="dropdown-divider"
+            />
          </template>
-          <div
-            role="separator"
-            class="dropdown-divider"
-          />
          <button
            v-if="user.statusnet_blocking"
            class="btn btn-default btn-block dropdown-item"
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@ -43,7 +43,8 @@ const conversation = {
    'collapsable',
    'isPage',
    'pinnedStatusIdsObject',
-    'inProfile'
+    'inProfile',
+    'profileUserId'
  ],
  created () {
    if (this.isPage) {
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@ -27,6 +27,7 @@
      :highlight="getHighlight()"
      :replies="getReplies(status.id)"
      :in-profile="inProfile"
+      :profile-user-id="profileUserId"
      class="status-fadein panel-body"
      @goto="setHighlight"
      @toggleExpanded="toggleExpanded"
--- a/src/components/interface_language_switcher/interface_language_switcher.vue
+++ b/src/components/interface_language_switcher/interface_language_switcher.vue
@ -51,8 +51,8 @@ export default {
  methods: {
    getLanguageName (code) {
      const specialLanguageNames = {
-        'ja': 'Japanese (やさしいにほんご)',
-        'ja_pedantic': 'Japanese (日本語)',
+        'ja': 'Japanese (日本語)',
+        'ja_easy': 'Japanese (やさしいにほんご)',
        'zh': 'Chinese (简体中文)'
      }
      return specialLanguageNames[code] || ISO6391.getName(code)
--- a/src/components/media_modal/media_modal.vue
+++ b/src/components/media_modal/media_modal.vue
@ -10,13 +10,13 @@
      :src="currentMedia.url"
      @touchstart.stop="mediaTouchStart"
      @touchmove.stop="mediaTouchMove"
+      @click="hide"
    >
    <VideoAttachment
      v-if="type === 'video'"
      class="modal-image"
      :attachment="currentMedia"
      :controls="true"
-      @click.stop.native=""
    />
    <button
      v-if="canNavigate"
--- a/src/components/mrf_transparency_panel/mrf_transparency_panel.js
+++ b/src/components/mrf_transparency_panel/mrf_transparency_panel.js
@ -1,16 +1,27 @@
 import { mapState } from 'vuex'
+import { get } from 'lodash'

 const MRFTransparencyPanel = {
-  computed: mapState({
-    federationPolicy: state => state.instance.federationPolicy,
-    mrfPolicies: state => state.instance.federationPolicy.mrf_policies,
-    acceptInstances: state => state.instance.federationPolicy.mrf_simple.accept,
-    rejectInstances: state => state.instance.federationPolicy.mrf_simple.reject,
-    quarantineInstances: state => state.instance.federationPolicy.quarantined_instances,
-    ftlRemovalInstances: state => state.instance.federationPolicy.mrf_simple.federated_timeline_removal,
-    mediaNsfwInstances: state => state.instance.federationPolicy.mrf_simple.media_nsfw,
-    mediaRemovalInstances: state => state.instance.federationPolicy.mrf_simple.media_removal
-  })
+  computed: {
+    ...mapState({
+      federationPolicy: state => get(state, 'instance.federationPolicy'),
+      mrfPolicies: state => get(state, 'instance.federationPolicy.mrf_policies', []),
+      quarantineInstances: state => get(state, 'instance.federationPolicy.quarantined_instances', []),
+      acceptInstances: state => get(state, 'instance.federationPolicy.mrf_simple.accept', []),
+      rejectInstances: state => get(state, 'instance.federationPolicy.mrf_simple.reject', []),
+      ftlRemovalInstances: state => get(state, 'instance.federationPolicy.mrf_simple.federated_timeline_removal', []),
+      mediaNsfwInstances: state => get(state, 'instance.federationPolicy.mrf_simple.media_nsfw', []),
+      mediaRemovalInstances: state => get(state, 'instance.federationPolicy.mrf_simple.media_removal', [])
+    }),
+    hasInstanceSpecificPolicies () {
+      return this.quarantineInstances.length ||
+        this.acceptInstances.length ||
+        this.rejectInstances.length ||
+        this.ftlRemovalInstances.length ||
+        this.mediaNsfwInstances.length ||
+        this.mediaRemovalInstances.length
+    }
+  }
 }

 export default MRFTransparencyPanel
--- a/src/components/mrf_transparency_panel/mrf_transparency_panel.vue
+++ b/src/components/mrf_transparency_panel/mrf_transparency_panel.vue
@ -22,7 +22,9 @@
            />
          </ul>

-          <h2>{{ $t("about.mrf_policy_simple") }}</h2>
+          <h2 v-if="hasInstanceSpecificPolicies">
+            {{ $t("about.mrf_policy_simple") }}
+          </h2>

          <div v-if="acceptInstances.length">
            <h4>{{ $t("about.mrf_policy_simple_accept") }}</h4>
--- a/src/components/nav_panel/nav_panel.js
+++ b/src/components/nav_panel/nav_panel.js
@ -1,12 +1,7 @@
-import followRequestFetcher from '../../services/follow_request_fetcher/follow_request_fetcher.service'
-
 const NavPanel = {
  created () {
    if (this.currentUser && this.currentUser.locked) {
-      const store = this.$store
-      const credentials = store.state.users.currentUser.credentials
-
-      followRequestFetcher.startFetching({ store, credentials })
+      this.$store.dispatch('startFetchingFollowRequest')
    }
  },
  computed: {
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@ -169,9 +169,7 @@ const PostStatusForm = {
      if (this.submitDisabled) { return }

      if (this.newStatus.status === '') {
-        if (this.newStatus.files.length > 0) {
-          this.newStatus.status = '\u200b' // hack
-        } else {
+        if (this.newStatus.files.length === 0) {
          this.error = 'Cannot post an empty status with no files'
          return
        }
--- a/src/components/side_drawer/side_drawer.js
+++ b/src/components/side_drawer/side_drawer.js
@ -10,6 +10,10 @@ const SideDrawer = {
  }),
  created () {
    this.closeGesture = GestureService.swipeGesture(GestureService.DIRECTION_LEFT, this.toggleDrawer)
+
+    if (this.currentUser && this.currentUser.locked) {
+      this.$store.dispatch('startFetchingFollowRequest')
+    }
  },
  components: { UserCard },
  computed: {
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@ -33,7 +33,8 @@ const Status = {
    'noHeading',
    'inlineExpanded',
    'showPinned',
-    'inProfile'
+    'inProfile',
+    'profileUserId'
  ],
  data () {
    return {
@ -115,7 +116,7 @@ const Status = {

      return hits
    },
-    muted () { return !this.unmuted && ((!this.inProfile && this.status.user.muted) || (!this.inConversation && this.status.thread_muted) || this.muteWordHits.length > 0) },
+    muted () { return !this.unmuted && ((!(this.inProfile && this.status.user.id === this.profileUserId) && this.status.user.muted) || (!this.inConversation && this.status.thread_muted) || this.muteWordHits.length > 0) },
    hideFilteredStatuses () {
      return this.mergedConfig.hideFilteredStatuses
    },
--- a/src/components/timeline/timeline.vue
+++ b/src/components/timeline/timeline.vue
@ -37,6 +37,7 @@
            :collapsable="true"
            :pinned-status-ids-object="pinnedStatusIdsObject"
            :in-profile="inProfile"
+            :profile-user-id="userId"
          />
        </template>
        <template v-for="status in timeline.visibleStatuses">
@ -47,6 +48,7 @@
            :status-id="status.id"
            :collapsable="true"
            :in-profile="inProfile"
+            :profile-user-id="userId"
          />
        </template>
      </div>
--- 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: {
@ -143,6 +149,9 @@ export default {
      }
      this.$store.dispatch('setMedia', [attachment])
      this.$store.dispatch('setCurrent', attachment)
+    },
+    mentionUser () {
+      this.$store.dispatch('openPostStatusModal', { replyTo: true, repliedUser: this.user })
    }
  }
 }
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@ -175,6 +175,14 @@
              {{ $t('user_card.mute') }}
            </button>
          </div>
+          <div>
+            <button
+              class="btn btn-default btn-block"
+              @click="mentionUser"
+            >
+              {{ $t('user_card.mention') }}
+            </button>
+          </div>
          <ModerationTools
            v-if="loggedIn.role === &quot;admin&quot;"
            :user="user"
@ -208,14 +216,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 -->
--- a/src/components/user_settings/user_settings.vue
+++ b/src/components/user_settings/user_settings.vue
@ -104,7 +104,7 @@
                {{ $t('settings.hide_followers_count_description') }}
              </Checkbox>
            </p>
-            <p>
+            <p v-if="role === 'admin' || role === 'moderator'">
              <Checkbox v-model="showRole">
                <template v-if="role === 'admin'">
                  {{ $t('settings.show_admin_badge') }}