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

* origin/develop:
  Fix lint warning in filtering_tab.vue
  Fix Follow button missing on follow list
  Hide mention link avatar by default
  Add English translation for mention link prefs
  Make mention link prefs ui more intuitive
  Add option to fade domains in mention link
  Make avatar unselectable
  Add option to display user avatar in mention link
  Make (You) unselectable
  Style properly usernames without tooltips
  Add pref for whether to display full user names and tooltips
  Add a pref for whether to display mention as icon or text

src/components/settings_modal/tabs/filtering_tab.vue

@@ -31,7 +31,7 @@
               <BooleanSetting
                 :disabled="hideFilteredStatuses"
                 path="hideMutedPosts"
-                >
+              >
                 {{ $t('settings.hide_muted_posts') }}
               </BooleanSetting>
             </li>

src/components/settings_modal/tabs/general_tab.js

@@ -20,6 +20,11 @@ const GeneralTab = {
         value: mode,
         label: this.$t(`settings.subject_line_${mode === 'masto' ? 'mastodon' : mode}`)
       })),
+      mentionLinkDisplayOptions: ['short', 'full_for_remote', 'full'].map(mode => ({
+        key: mode,
+        value: mode,
+        label: this.$t(`settings.mention_link_display_${mode}`)
+      })),
       loopSilentAvailable:
       // Firefox
       Object.getOwnPropertyDescriptor(HTMLVideoElement.prototype, 'mozHasAudio') ||

src/components/settings_modal/tabs/general_tab.vue

@@ -152,6 +152,41 @@
             {{ $t('settings.greentext') }}
           </BooleanSetting>
         </li>
+        <li>
+          <ChoiceSetting
+            id="mentionLinkDisplay"
+            path="mentionLinkDisplay"
+            :options="mentionLinkDisplayOptions"
+          >
+            {{ $t('settings.mention_link_display') }}
+          </ChoiceSetting>
+        </li>
+        <ul
+          class="setting-list suboptions"
+        >
+          <li
+            v-if="mentionLinkDisplay === 'short'"
+          >
+            <BooleanSetting path="mentionLinkShowTooltip">
+              {{ $t('settings.mention_link_show_tooltip') }}
+            </BooleanSetting>
+          </li>
+          <li>
+            <BooleanSetting path="useAtIcon">
+              {{ $t('settings.use_at_icon') }}
+            </BooleanSetting>
+          </li>
+          <li>
+            <BooleanSetting path="mentionLinkShowAvatar">
+              {{ $t('settings.mention_link_show_avatar') }}
+            </BooleanSetting>
+          </li>
+          <li>
+            <BooleanSetting path="mentionLinkFadeDomain">
+              {{ $t('settings.mention_link_fade_domain') }}
+            </BooleanSetting>
+          </li>
+        </ul>
       </ul>
     </div>