Merge branch 'vue3-again' into shigusegubu-vue3

* vue3-again:
  fix user-list-popover
  fix duplicate setting (most likely a merge issue)
  fix opening directly to filtering tab not working
  Fix notices not disappearing on their own
  fix another spacing issue

src/components/settings_modal/settings_modal_content.js

@@ -63,8 +63,8 @@ const SettingsModalContent = {
       const targetTab = this.$store.state.interface.settingsModalTargetTab
       // We're being told to open in specific tab
       if (targetTab) {
-        const tabIndex = this.$refs.tabSwitcher.$slots.default.findIndex(elm => {
+        const tabIndex = this.$refs.tabSwitcher.$slots.default().findIndex(elm => {
-          return elm.data && elm.data.attrs['data-tab-name'] === targetTab
+          return elm.props && elm.props['data-tab-name'] === targetTab
         })
         if (tabIndex >= 0) {
           this.$refs.tabSwitcher.setTab(tabIndex)

src/components/settings_modal/tabs/filtering_tab.vue

@@ -72,22 +72,10 @@
           <div>{{ $t('settings.filtering_explanation') }}</div>
         </li>
         <h3>{{ $t('settings.attachments') }}</h3>
-        <li v-if="expertLevel > 0">
-          <label for="maxThumbnails">
-            {{ $t('settings.max_thumbnails') }}
-          </label>
-          <input
-            id="maxThumbnails"
-            path.number="maxThumbnails"
-            class="number-input"
-            type="number"
-            min="0"
-            step="1"
-          >
-        </li>
         <li>
           <IntegerSetting
             path="maxThumbnails"
+            expert="1"
             :min="0"
           >
             {{ $t('settings.max_thumbnails') }}

src/components/status/status.vue

@@ -101,6 +101,7 @@
               :to="retweeterProfileLink"
             >{{ retweeter }}</router-link>
           </span>
+          {{ ' ' }}
           <FAIcon
             icon="retweet"
             class="repeat-icon"

src/components/user_list_popover/user_list_popover.js

@@ -1,4 +1,5 @@
 import { defineAsyncComponent } from 'vue'
+import RichContent from 'src/components/rich_content/rich_content.jsx'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faCircleNotch } from '@fortawesome/free-solid-svg-icons'
@@ -13,6 +14,7 @@ const UserListPopover = {
     'users'
   ],
   components: {
+    RichContent,
     Popover: defineAsyncComponent(() => import('../popover/popover.vue')),
     UserAvatar: defineAsyncComponent(() => import('../user_avatar/user_avatar.vue'))
   },

src/modules/interface.js

@@ -106,7 +106,7 @@ const interfaceMod = {
       commit('openSettingsModal')
     },
     pushGlobalNotice (
-      { commit, dispatch },
+      { commit, dispatch, state },
       {
         messageKey,
         messageArgs = {},
@@ -118,11 +118,14 @@ const interfaceMod = {
         messageArgs,
         level
       }
-      if (timeout) {
-        setTimeout(() => dispatch('removeGlobalNotice', notice), timeout)
-      }
       commit('pushGlobalNotice', notice)
-      return notice
+      // Adding a new element to array wraps it in a Proxy, which breaks the comparison
+      // TODO: Generate UUID or something instead or relying on !== operator?
+      const newNotice = state.globalNotices[state.globalNotices.length - 1]
+      if (timeout) {
+        setTimeout(() => dispatch('removeGlobalNotice', newNotice), timeout)
+      }
+      return newNotice
     },
     removeGlobalNotice ({ commit }, notice) {
       commit('removeGlobalNotice', notice)