From 79d02bddbe2b77574844b8ade7a09043c31b1c6b Mon Sep 17 00:00:00 2001
From: marcin mikołajczak <git@mkljczk.pl>
Date: Sun, 13 Feb 2022 19:07:49 +0100
Subject: Birthdays
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
---
 src/components/settings_modal/tabs/profile_tab.js          |  6 +++++-
 src/components/settings_modal/tabs/profile_tab.scss        |  5 +++++
 src/components/settings_modal/tabs/profile_tab.vue         | 12 ++++++++++++
 src/components/user_profile/user_profile.js                | 11 +++++++++--
 src/components/user_profile/user_profile.vue               | 14 ++++++++++++++
 src/i18n/en.json                                           |  5 +++++
 src/i18n/pl.json                                           |  9 +++++++--
 .../entity_normalizer/entity_normalizer.service.js         |  3 +++
 8 files changed, 60 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/components/settings_modal/tabs/profile_tab.js b/src/components/settings_modal/tabs/profile_tab.js
index 64079fcd..0ae95dbd 100644
--- a/src/components/settings_modal/tabs/profile_tab.js
+++ b/src/components/settings_modal/tabs/profile_tab.js
@@ -29,6 +29,8 @@ const ProfileTab = {
       newLocked: this.$store.state.users.currentUser.locked,
       newNoRichText: this.$store.state.users.currentUser.no_rich_text,
       newDefaultScope: this.$store.state.users.currentUser.default_scope,
+      newBirthday: this.$store.state.users.currentUser.birthday,
+      showBirthday: this.$store.state.users.currentUser.show_birthday,
       newFields: this.$store.state.users.currentUser.fields.map(field => ({ name: field.name, value: field.value })),
       hideFollows: this.$store.state.users.currentUser.hide_follows,
       hideFollowers: this.$store.state.users.currentUser.hide_followers,
@@ -132,7 +134,9 @@ const ProfileTab = {
             allow_following_move: this.allowFollowingMove,
             hide_follows_count: this.hideFollowsCount,
             hide_followers_count: this.hideFollowersCount,
-            show_role: this.showRole
+            show_role: this.showRole,
+            birthday: this.newBirthday || null,
+            show_birthday: this.showBirthday
             /* eslint-enable camelcase */
           } }).then((user) => {
           this.newFields.splice(user.fields.length)
diff --git a/src/components/settings_modal/tabs/profile_tab.scss b/src/components/settings_modal/tabs/profile_tab.scss
index 111eaed3..24287511 100644
--- a/src/components/settings_modal/tabs/profile_tab.scss
+++ b/src/components/settings_modal/tabs/profile_tab.scss
@@ -124,4 +124,9 @@
       padding: 0 0.5em;
     }
   }
+
+  .birthday-input {
+    display: block;
+    margin-bottom: 1em;
+  }
 }
diff --git a/src/components/settings_modal/tabs/profile_tab.vue b/src/components/settings_modal/tabs/profile_tab.vue
index bb3c301d..9b92056d 100644
--- a/src/components/settings_modal/tabs/profile_tab.vue
+++ b/src/components/settings_modal/tabs/profile_tab.vue
@@ -95,6 +95,18 @@
           {{ $t('settings.discoverable') }}
         </Checkbox>
       </p>
+      <div>
+        <p>{{ $t('settings.birthday.label') }}</p>
+        <input
+          id="birthday"
+          v-model="newBirthday"
+          type="date"
+          class="birthday-input"
+        >
+        <Checkbox v-model="showBirthday">
+          {{ $t('settings.birthday.show_birthday') }}
+        </Checkbox>
+      </div>
       <div v-if="maxFields > 0">
         <p>{{ $t('settings.profile_fields.label') }}</p>
         <div
diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js
index 7a475609..05d5f0a6 100644
--- a/src/components/user_profile/user_profile.js
+++ b/src/components/user_profile/user_profile.js
@@ -7,13 +7,16 @@ import TabSwitcher from 'src/components/tab_switcher/tab_switcher.js'
 import RichContent from 'src/components/rich_content/rich_content.jsx'
 import List from '../list/list.vue'
 import withLoadMore from '../../hocs/with_load_more/with_load_more'
+import localeService from 'src/services/locale/locale.service.js'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
-  faCircleNotch
+  faCircleNotch,
+  faBirthdayCake
 } from '@fortawesome/free-solid-svg-icons'
 
 library.add(
-  faCircleNotch
+  faCircleNotch,
+  faBirthdayCake
 )
 
 const FollowerList = withLoadMore({
@@ -75,6 +78,10 @@ const UserProfile = {
     },
     followersTabVisible () {
       return this.isUs || !this.user.hide_followers
+    },
+    formattedBirthday () {
+      const browserLocale = localeService.internalToBrowserLocale(this.$i18n.locale)
+      return this.user.birthday && new Date(Date.parse(this.user.birthday)).toLocaleDateString(browserLocale, { timeZone: 'UTC', day: 'numeric', month: 'long', year: 'numeric' })
     }
   },
   methods: {
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 726216ff..5e083198 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -11,6 +11,16 @@
         :allow-zooming-avatar="true"
         rounded="top"
       />
+      <span
+        v-if="!!user.birthday"
+        class="user-birthday"
+      >
+        <FAIcon
+          class="fa-old-padding"
+          icon="birthday-cake"
+        />
+        {{ $t('user_card.birthday', { birthday: formattedBirthday }) }}
+      </span>
       <div
         v-if="user.fields_html && user.fields_html.length > 0"
         class="user-profile-fields"
@@ -138,6 +148,10 @@
   flex: 2;
   flex-basis: 500px;
 
+  .user-birthday {
+    margin: 0 0.75em 0.5em;
+  }
+
   .user-profile-fields {
     margin: 0 0.5em;
 
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 209fd184..abdd57b5 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -399,6 +399,10 @@
       "name": "Label",
       "value": "Content"
     },
+    "birthday": {
+      "label": "Birthday",
+      "show_birthday": "Show my birthday"
+    },
     "use_contain_fit": "Don't crop the attachment in thumbnails",
     "name": "Name",
     "name_bio": "Name & bio",
@@ -774,6 +778,7 @@
     "hide_repeats": "Hide repeats",
     "show_repeats": "Show repeats",
     "bot": "Bot",
+    "birthday": "Born {birthday}",
     "admin_menu": {
       "moderation": "Moderation",
       "grant_admin": "Grant Admin",
diff --git a/src/i18n/pl.json b/src/i18n/pl.json
index 304a0349..7cd31a06 100644
--- a/src/i18n/pl.json
+++ b/src/i18n/pl.json
@@ -633,7 +633,11 @@
     "reply_visibility_following_short": "Pokazuj odpowiedzi obserwującym",
     "reply_visibility_self_short": "Pokazuj odpowiedzi tylko do mnie",
     "sensitive_by_default": "Domyślnie oznaczaj wpisy jako wrażliwe",
-    "hide_shoutbox": "Ukryj shoutbox instancji"
+    "hide_shoutbox": "Ukryj shoutbox instancji",
+    "birthday": {
+      "label": "Urodziny",
+      "show_birthday": "Pokazuj moją datę urodzenia"
+    }
   },
   "time": {
     "day": "{0} dzień",
@@ -770,7 +774,8 @@
     "highlight": {
       "disabled": "Bez wyróżnienia"
     },
-    "bot": "Bot"
+    "bot": "Bot",
+    "birthday": "Urodzony(-a) {birthday}"
   },
   "user_profile": {
     "timeline_title": "Oś czasu użytkownika",
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index 7025d803..86eb4c80 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -118,6 +118,8 @@ export const parseUser = (data) => {
       } else {
         output.role = 'member'
       }
+
+      output.birthday = data.pleroma.birthday
     }
 
     if (data.source) {
@@ -128,6 +130,7 @@ export const parseUser = (data) => {
         output.no_rich_text = data.source.pleroma.no_rich_text
         output.show_role = data.source.pleroma.show_role
         output.discoverable = data.source.pleroma.discoverable
+        output.show_birthday = data.pleroma.show_birthday
       }
     }
 
-- 
cgit v1.2.3-70-g09d2


From d2f97bf833fd535969e110e77121a5065c69df0a Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Wed, 14 Dec 2022 19:26:20 -0500
Subject: Improve quote style

---
 src/components/rich_content/rich_content.scss | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/components/rich_content/rich_content.scss b/src/components/rich_content/rich_content.scss
index db08ef1e..52042314 100644
--- a/src/components/rich_content/rich_content.scss
+++ b/src/components/rich_content/rich_content.scss
@@ -1,7 +1,11 @@
+@import '../../variables';
+
 .RichContent {
   blockquote {
-    margin: 0.2em 0 0.2em 2em;
+    margin: 0.2em 0 0.2em 0.2em;
     font-style: italic;
+    border-left: 0.2em solid var(--faint, $fallback--faint);
+    padding-left: 1em;
   }
 
   pre {
-- 
cgit v1.2.3-70-g09d2


From b7e93739656d225ed0a8854f357746b5291b6857 Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Mon, 25 Jul 2022 15:38:05 -0400
Subject: Add support for multiple interface languages

---
 .../interface_language_switcher.vue                | 75 +++++++++++++++++-----
 src/components/settings_modal/tabs/profile_tab.js  |  4 +-
 src/i18n/messages.js                               | 26 ++++++--
 src/modules/config.js                              |  5 +-
 src/services/locale/locale.service.js              |  5 ++
 5 files changed, 92 insertions(+), 23 deletions(-)

(limited to 'src')

diff --git a/src/components/interface_language_switcher/interface_language_switcher.vue b/src/components/interface_language_switcher/interface_language_switcher.vue
index 6997f149..e18a2a12 100644
--- a/src/components/interface_language_switcher/interface_language_switcher.vue
+++ b/src/components/interface_language_switcher/interface_language_switcher.vue
@@ -1,21 +1,39 @@
 <template>
-  <div>
-    <label for="interface-language-switcher">
+  <div class="interface-language-switcher">
+    <label>
       {{ promptText }}
     </label>
-    {{ ' ' }}
-    <Select
-      id="interface-language-switcher"
-      v-model="controlledLanguage"
-    >
-      <option
-        v-for="lang in languages"
-        :key="lang.code"
-        :value="lang.code"
+    <ol>
+      <li
+        v-for="index of controlledLanguage.keys()"
+        :key="index"
       >
-        {{ lang.name }}
-      </option>
-    </Select>
+        <Select
+          class="language-select"
+          :model-value="controlledLanguage[index]"
+          @update:modelValue="val => setLanguageAt(index, val)"
+        >
+          <option
+            v-for="lang in languages"
+            :key="lang.code"
+            :value="lang.code"
+          >
+            {{ lang.name }}
+          </option>
+        </Select>
+        <button
+          v-if="controlledLanguage.length > 1"
+          class="button-default btn"
+          @click="() => removeLanguageAt(index)"
+        >{{ $t('settings.remove_language') }}</button>
+      </li>
+      <li>
+        <button
+          class="button-default btn"
+          @click="addLanguage"
+        >{{ $t('settings.add_language') }}</button>
+      </li>
+    </ol>
   </div>
 </template>
 
@@ -34,7 +52,7 @@ export default {
       required: true
     },
     language: {
-      type: String,
+      type: [Array, String],
       required: true
     },
     setLanguage: {
@@ -48,7 +66,9 @@ export default {
     },
 
     controlledLanguage: {
-      get: function () { return this.language },
+      get: function () {
+        return Array.isArray(this.language) ? this.language : [this.language]
+      },
       set: function (val) {
         this.setLanguage(val)
       }
@@ -58,7 +78,30 @@ export default {
   methods: {
     getLanguageName (code) {
       return localeService.getLanguageName(code)
+    },
+    addLanguage () {
+      this.controlledLanguage = [...this.controlledLanguage, '']
+    },
+    setLanguageAt (index, val) {
+      const lang = [...this.controlledLanguage]
+      lang[index] = val
+      this.controlledLanguage = lang
+    },
+    removeLanguageAt (index) {
+      const lang = [...this.controlledLanguage]
+      lang.splice(index, 1)
+      this.controlledLanguage = lang
     }
   }
 }
 </script>
+
+<style lang="scss">
+@import '../../_variables.scss';
+
+.interface-language-switcher {
+  .language-select {
+    margin-right: 1em;
+  }
+}
+</style>
diff --git a/src/components/settings_modal/tabs/profile_tab.js b/src/components/settings_modal/tabs/profile_tab.js
index b86faef0..d5977461 100644
--- a/src/components/settings_modal/tabs/profile_tab.js
+++ b/src/components/settings_modal/tabs/profile_tab.js
@@ -43,7 +43,7 @@ const ProfileTab = {
       bannerPreview: null,
       background: null,
       backgroundPreview: null,
-      emailLanguage: this.$store.state.users.currentUser.language || ''
+      emailLanguage: this.$store.state.users.currentUser.language || ['']
     }
   },
   components: {
@@ -130,7 +130,7 @@ const ProfileTab = {
       }
 
       if (this.emailLanguage) {
-        params.language = localeService.internalToBackendLocale(this.emailLanguage)
+        params.language = localeService.internalToBackendLocaleMulti(this.emailLanguage)
       }
 
       this.$store.state.api.backendInteractor
diff --git a/src/i18n/messages.js b/src/i18n/messages.js
index 74a89ca8..849d98fd 100644
--- a/src/i18n/messages.js
+++ b/src/i18n/messages.js
@@ -7,8 +7,11 @@
 // sed -i -e "s/'//gm" -e 's/"/\\"/gm' -re 's/^( +)(.+?): ((.+?))?(,?)(\{?)$/\1"\2": "\4"/gm' -e 's/\"\{\"/{/g' -e 's/,"$/",/g' file.json
 // There's only problem that apostrophe character ' gets replaced by \\ so you have to fix it manually, sorry.
 
+import { isEqual } from 'lodash'
 import { languages, langCodeToJsonName } from './languages.js'
 
+const ULTIMATE_FALLBACK_LOCALE = 'en'
+
 const hasLanguageFile = (code) => languages.includes(code)
 
 const loadLanguageFile = (code) => {
@@ -25,11 +28,26 @@ const messages = {
     en: require('./en.json').default
   },
   setLanguage: async (i18n, language) => {
-    if (hasLanguageFile(language)) {
-      const messages = await loadLanguageFile(language)
-      i18n.setLocaleMessage(language, messages.default)
+    const languages = (Array.isArray(language) ? language : [language]).filter(k => k)
+
+    if (!languages.includes(ULTIMATE_FALLBACK_LOCALE)) {
+      languages.push(ULTIMATE_FALLBACK_LOCALE)
+    }
+    const [first, ...rest] = languages
+
+    if (first === i18n.locale && isEqual(rest, i18n.fallbackLocale)) {
+      return
     }
-    i18n.locale = language
+
+    for (const lang of languages) {
+      if (hasLanguageFile(lang)) {
+        const messages = await loadLanguageFile(lang)
+        i18n.setLocaleMessage(lang, messages.default)
+      }
+    }
+
+    i18n.fallbackLocale = rest
+    i18n.locale = first
   }
 }
 
diff --git a/src/modules/config.js b/src/modules/config.js
index 3cd6888f..1a0e0fc8 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -184,7 +184,10 @@ const config = {
         case 'interfaceLanguage':
           messages.setLanguage(this.getters.i18n, value)
           dispatch('loadUnicodeEmojiData', value)
-          Cookies.set(BACKEND_LANGUAGE_COOKIE_NAME, localeService.internalToBackendLocale(value))
+          Cookies.set(
+            BACKEND_LANGUAGE_COOKIE_NAME,
+            localeService.internalToBackendLocaleMulti(value)
+          )
           break
         case 'thirdColumnMode':
           dispatch('setLayoutWidth', undefined)
diff --git a/src/services/locale/locale.service.js b/src/services/locale/locale.service.js
index d3389785..a4af8b90 100644
--- a/src/services/locale/locale.service.js
+++ b/src/services/locale/locale.service.js
@@ -11,6 +11,10 @@ const specialLanguageCodes = {
 const internalToBrowserLocale = code => specialLanguageCodes[code] || code
 
 const internalToBackendLocale = code => internalToBrowserLocale(code).replace('_', '-')
+const internalToBackendLocaleMulti = codes => {
+  const langs = Array.isArray(codes) ? codes : [codes]
+  return langs.map(internalToBackendLocale).join(',')
+}
 
 const getLanguageName = (code) => {
   const specialLanguageNames = {
@@ -28,6 +32,7 @@ const languages = _.map(languagesObject.languages, (code) => ({ code, name: getL
 const localeService = {
   internalToBrowserLocale,
   internalToBackendLocale,
+  internalToBackendLocaleMulti,
   languages,
   getLanguageName
 }
-- 
cgit v1.2.3-70-g09d2


From 52eef2eed1767cd4061d1c3c94475429b2924952 Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Mon, 25 Jul 2022 15:38:31 -0400
Subject: Add English translations for multiple interface languages

---
 src/i18n/en.json | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

diff --git a/src/i18n/en.json b/src/i18n/en.json
index 59ee1c17..9abfae67 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -334,6 +334,8 @@
     "select_all": "Select all"
   },
   "settings": {
+    "add_language": "Add another language",
+    "remove_language": "Remove",
     "app_name": "App name",
     "expert_mode": "Show advanced",
     "save": "Save changes",
-- 
cgit v1.2.3-70-g09d2


From 7e2ae2ba9565a58944fe8915f054f8eef812ee54 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Fri, 23 Dec 2022 23:02:21 -0500
Subject: Optimize UI

---
 .../interface_language_switcher.vue                | 37 ++++++++++++----------
 src/i18n/en.json                                   |  4 ++-
 src/modules/instance.js                            |  9 ++++--
 3 files changed, 31 insertions(+), 19 deletions(-)

(limited to 'src')

diff --git a/src/components/interface_language_switcher/interface_language_switcher.vue b/src/components/interface_language_switcher/interface_language_switcher.vue
index e18a2a12..c9e7506b 100644
--- a/src/components/interface_language_switcher/interface_language_switcher.vue
+++ b/src/components/interface_language_switcher/interface_language_switcher.vue
@@ -3,29 +3,34 @@
     <label>
       {{ promptText }}
     </label>
-    <ol>
+    <ul class="setting-list">
       <li
         v-for="index of controlledLanguage.keys()"
         :key="index"
       >
-        <Select
-          class="language-select"
-          :model-value="controlledLanguage[index]"
-          @update:modelValue="val => setLanguageAt(index, val)"
-        >
-          <option
-            v-for="lang in languages"
-            :key="lang.code"
-            :value="lang.code"
+        <label>
+          {{ index === 0 ? $t('settings.primary_language') : $tc('settings.fallback_language', index, { index }) }}
+          <Select
+            class="language-select"
+            :model-value="controlledLanguage[index]"
+            @update:modelValue="val => setLanguageAt(index, val)"
           >
-            {{ lang.name }}
-          </option>
-        </Select>
+            <option
+              v-for="lang in languages"
+              :key="lang.code"
+              :value="lang.code"
+            >
+              {{ lang.name }}
+            </option>
+          </Select>
+        </label>
         <button
-          v-if="controlledLanguage.length > 1"
+          v-if="controlledLanguage.length > 1 && index !== 0"
           class="button-default btn"
           @click="() => removeLanguageAt(index)"
-        >{{ $t('settings.remove_language') }}</button>
+        >
+          {{ $t('settings.remove_language') }}
+        </button>
       </li>
       <li>
         <button
@@ -33,7 +38,7 @@
           @click="addLanguage"
         >{{ $t('settings.add_language') }}</button>
       </li>
-    </ol>
+    </ul>
   </div>
 </template>
 
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 9abfae67..7df42d92 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -334,8 +334,10 @@
     "select_all": "Select all"
   },
   "settings": {
-    "add_language": "Add another language",
+    "add_language": "Add fallback language",
     "remove_language": "Remove",
+    "primary_language": "Primary language:",
+    "fallback_language": "Fallback language {index}:",
     "app_name": "App name",
     "expert_mode": "Show advanced",
     "save": "Save changes",
diff --git a/src/modules/instance.js b/src/modules/instance.js
index 3b15e62e..bff26151 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -273,8 +273,13 @@ const instance = {
         langList
           .map(async lang => {
             if (!state.unicodeEmojiAnnotations[lang]) {
-              const annotations = await loadAnnotations(lang)
-              commit('setUnicodeEmojiAnnotations', { lang, annotations })
+              try {
+                const annotations = await loadAnnotations(lang)
+                commit('setUnicodeEmojiAnnotations', { lang, annotations })
+              } catch (e) {
+                console.warn(`Error loading unicode emoji annotations for ${lang}: `, e)
+                // ignore
+              }
             }
           }))
     },
-- 
cgit v1.2.3-70-g09d2


From 78690cdf518390308624b4914dd9be06858822e1 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Sat, 24 Dec 2022 11:58:33 -0500
Subject: Display detailed backup state

---
 src/components/settings_modal/tabs/data_import_export_tab.vue | 10 ++++++++++
 src/i18n/en.json                                              |  2 ++
 2 files changed, 12 insertions(+)

(limited to 'src')

diff --git a/src/components/settings_modal/tabs/data_import_export_tab.vue b/src/components/settings_modal/tabs/data_import_export_tab.vue
index e3b7f407..48356c9b 100644
--- a/src/components/settings_modal/tabs/data_import_export_tab.vue
+++ b/src/components/settings_modal/tabs/data_import_export_tab.vue
@@ -77,6 +77,16 @@
               >
                 {{ $t('settings.download_backup') }}
               </a>
+              <span
+                v-else-if="backup.state === 'running'"
+              >
+                {{ $tc('settings.backup_running', backup.processed_number, { number: backup.processed_number }) }}
+              </span>
+              <span
+                v-else-if="backup.state === 'failed'"
+              >
+                {{ $t('settings.backup_failed') }}
+              </span>
               <span
                 v-else
               >
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 59ee1c17..b7c19b88 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -390,6 +390,8 @@
     "account_backup_table_head": "Backup",
     "download_backup": "Download",
     "backup_not_ready": "This backup is not ready yet.",
+    "backup_running": "This backup is in progress, processed {number} record. | This backup is in progress, processed {number} records.",
+    "backup_failed": "This backup has failed.",
     "remove_backup": "Remove",
     "list_backups_error": "Error fetching backup list: {error}",
     "add_backup": "Create a new backup",
-- 
cgit v1.2.3-70-g09d2


From b65a89c8225289708fc0e97f3c2cbe66511473cb Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Sat, 24 Dec 2022 12:17:09 -0500
Subject: Make announcements available to all with privileges

---
 src/components/announcement/announcement.js              | 3 +++
 src/components/announcement/announcement.vue             | 4 ++--
 src/components/announcements_page/announcements_page.js  | 3 +++
 src/components/announcements_page/announcements_page.vue | 2 +-
 src/modules/announcements.js                             | 2 +-
 5 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/components/announcement/announcement.js b/src/components/announcement/announcement.js
index c10c7d90..30254926 100644
--- a/src/components/announcement/announcement.js
+++ b/src/components/announcement/announcement.js
@@ -27,6 +27,9 @@ const Announcement = {
     ...mapState({
       currentUser: state => state.users.currentUser
     }),
+    canEditAnnouncement () {
+      return this.currentUser && this.currentUser.privileges.includes('announcements_manage_announcements')
+    },
     content () {
       return this.announcement.content
     },
diff --git a/src/components/announcement/announcement.vue b/src/components/announcement/announcement.vue
index 5f64232a..c1b35981 100644
--- a/src/components/announcement/announcement.vue
+++ b/src/components/announcement/announcement.vue
@@ -45,14 +45,14 @@
           {{ $t('announcements.mark_as_read_action') }}
         </button>
         <button
-          v-if="currentUser && currentUser.role === 'admin'"
+          v-if="canEditAnnouncement"
           class="btn button-default"
           @click="enterEditMode"
         >
           {{ $t('announcements.edit_action') }}
         </button>
         <button
-          v-if="currentUser && currentUser.role === 'admin'"
+          v-if="canEditAnnouncement"
           class="btn button-default"
           @click="deleteAnnouncement"
         >
diff --git a/src/components/announcements_page/announcements_page.js b/src/components/announcements_page/announcements_page.js
index 0bb4892e..8d1204d4 100644
--- a/src/components/announcements_page/announcements_page.js
+++ b/src/components/announcements_page/announcements_page.js
@@ -28,6 +28,9 @@ const AnnouncementsPage = {
     }),
     announcements () {
       return this.$store.state.announcements.announcements
+    },
+    canPostAnnouncement () {
+      return this.currentUser && this.currentUser.privileges.includes('announcements_manage_announcements')
     }
   },
   methods: {
diff --git a/src/components/announcements_page/announcements_page.vue b/src/components/announcements_page/announcements_page.vue
index b1489dec..59ed283d 100644
--- a/src/components/announcements_page/announcements_page.vue
+++ b/src/components/announcements_page/announcements_page.vue
@@ -7,7 +7,7 @@
     </div>
     <div class="panel-body">
       <section
-        v-if="currentUser && currentUser.role === 'admin'"
+        v-if="canPostAnnouncement"
       >
         <div class="post-form">
           <div class="heading">
diff --git a/src/modules/announcements.js b/src/modules/announcements.js
index e4d2d2b0..4504263b 100644
--- a/src/modules/announcements.js
+++ b/src/modules/announcements.js
@@ -49,7 +49,7 @@ const announcements = {
       }
 
       const currentUser = store.rootState.users.currentUser
-      const isAdmin = currentUser && currentUser.role === 'admin'
+      const isAdmin = currentUser && currentUser.privileges.includes('announcements_manage_announcements')
 
       const getAnnouncements = async () => {
         if (!isAdmin) {
-- 
cgit v1.2.3-70-g09d2


From 01807446a846bdda5581a45562d14e5d6d17acf1 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Tue, 27 Dec 2022 13:46:50 -0500
Subject: Make notification settings work

---
 src/services/api/api.service.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index 7174cc5d..00d1c020 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -164,7 +164,7 @@ const updateNotificationSettings = ({ credentials, settings }) => {
     form.append(key, value)
   })
 
-  return fetch(NOTIFICATION_SETTINGS_URL, {
+  return fetch(`${NOTIFICATION_SETTINGS_URL}?${new URLSearchParams(settings)}`, {
     headers: authHeaders(credentials),
     method: 'PUT',
     body: form
-- 
cgit v1.2.3-70-g09d2


From de8c97f3a08241a08d4b4badd9ccfaa2333fef56 Mon Sep 17 00:00:00 2001
From: Dmytro Poltavchenko <xinit.info@gmail.com>
Date: Tue, 27 Dec 2022 01:35:29 +0000
Subject: Translated using Weblate (Ukrainian)

Currently translated at 87.8% (810 of 922 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 106 ++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 94 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index c75ed197..67b348d3 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -32,7 +32,13 @@
       "private": "Лише читачі",
       "public": "Публічне",
       "unlisted": "Непублічне"
-    }
+    },
+    "undo": "Відмінити",
+    "yes": "Так",
+    "no": "Ні",
+    "unpin": "Відкріпити",
+    "scroll_to_top": "Вгору",
+    "pin": "Прикріпити"
   },
   "finder": {
     "error_fetching_user": "Користувача не знайдено",
@@ -81,7 +87,8 @@
         "accept_desc": "Поточний інстанс приймає повідомлення тільки з перелічених інстансів:",
         "simple_policies": "Правила поточного інстансу",
         "reason": "Причина",
-        "not_applicable": "н/в"
+        "not_applicable": "н/в",
+        "instance": "Інстанс"
       },
       "mrf_policies_desc": "Правила MRF розповсюджуються на даний  інстанс. Наступні правила активні:",
       "mrf_policies": "Активувати правила MRF (модуль переписування повідомлень)",
@@ -153,7 +160,8 @@
     "favorited_you": "вподобав(-ла) ваш допис",
     "broken_favorite": "Невідомий допис, шукаю його…",
     "error": "Помилка при оновленні сповіщень: {0}",
-    "poll_ended": "опитування закінчено"
+    "poll_ended": "опитування закінчено",
+    "submitted_report": "подав скаргу"
   },
   "nav": {
     "chats": "Чати",
@@ -174,7 +182,13 @@
     "back": "Назад",
     "administration": "Адміністрування",
     "home_timeline": "Домашня стрічка",
-    "lists": "Списки"
+    "lists": "Списки",
+    "edit_pinned": "Редагувати прикріплене",
+    "edit_finish": "Завершити редагування",
+    "mobile_sidebar": "Ввімкнути бокову панель",
+    "mobile_notifications": "Відкрити сповіщення (є непрочитані)",
+    "mobile_notifications_close": "Закрити сповіщення",
+    "edit_nav_mobile": "Редагувати панель навігації"
   },
   "media_modal": {
     "next": "Наступна",
@@ -221,7 +235,8 @@
     "follows": "Нові підписки",
     "favs_repeats": "Поширення та вподобайки",
     "moves": "Міграції користувачів",
-    "emoji_reactions": "Емоджі реакції"
+    "emoji_reactions": "Емоджі реакції",
+    "reports": "Скарги"
   },
   "errors": {
     "storage_unavailable": "Pleroma не змогла отримати доступ до сховища браузеру. Ваша сесія та налаштування не будуть збережені, це може спричинити непередбачувані проблеми. Спробуйте увімкнути cookie."
@@ -235,7 +250,19 @@
     "emoji": "Емодзі",
     "load_all": "Всі {emojiAmount} эмодзі завантажуються",
     "load_all_hint": "Завантажені перші {saneAmount} емодзі, завантаження всіх емодзі може призвести до проблем з продуктивністю.",
-    "unicode": "Стандартні емодзі"
+    "unicode": "Стандартні емодзі",
+    "regional_indicator": "Регіональний індикатор {letter}",
+    "unicode_groups": {
+      "animals-and-nature": "Тварини і Рослини",
+      "flags": "Прапори",
+      "food-and-drink": "Їжа та Напої",
+      "objects": "Об'єкти",
+      "people-and-body": "Люди та Тіло",
+      "smileys-and-emotion": "Смайлики та Емотікони",
+      "activities": "Активності",
+      "symbols": "Символи",
+      "travel-and-places": "Подорожі та Місця"
+    }
   },
   "post_status": {
     "content_type": {
@@ -269,7 +296,10 @@
     "preview_empty": "Пустий",
     "media_description_error": "Не вдалось оновити медіа, спробуйте ще раз",
     "media_description": "Опис медіа",
-    "post": "Опублікувати"
+    "post": "Опублікувати",
+    "edit_unsupported_warning": "Pleroma не підтримує редагування згадувань чи голосувань.",
+    "edit_status": "Редагувати допис",
+    "edit_remote_warning": "Інші віддалені інстанси можуть не підтримувати редагування та вони можуть не отримати актуальну версію допису."
   },
   "settings": {
     "blocks_imported": "Блокування імпортовані! Їх обробка триватиме певний час.",
@@ -682,7 +712,30 @@
     "move_account": "Перемістити обліковий запис",
     "move_account_target": "Цільовий обліковий запис (напр. {example})",
     "moved_account": "Обліковий запис переміщено.",
-    "move_account_error": "Помилка під час переміщення облікового запису: {error}"
+    "move_account_error": "Помилка під час переміщення облікового запису: {error}",
+    "word_filter_and_more": "Фільтр слів та більше...",
+    "hide_bot_indication": "Сховати позначку бот у дописах",
+    "navbar_column_stretch": "Розтягнути панель навігації на ширину колонок",
+    "hide_wordfiltered_statuses": "Ховати фільтровані статуси",
+    "hide_muted_threads": "Ховати приглушені треди",
+    "posts": "Дописи",
+    "account_privacy": "Безпека",
+    "conversation_display": "Стиль відображення розмови",
+    "conversation_display_tree": "Деревоподібне",
+    "conversation_display_tree_quick": "Вигляд дерева",
+    "disable_sticky_headers": "Не закріплювати заголовок колонки зверху на сторінці",
+    "third_column_mode_none": "Не показувати третю колонку взагалі",
+    "third_column_mode_notifications": "Колонка сповіщень",
+    "columns": "Колонки",
+    "auto_update": "Автоматично показувати нові дописи",
+    "use_websockets": "Використовувати вебсокети (Оновлення в реальному часі)",
+    "use_at_icon": "Показувати {'@'} символ як іконку замість тексту",
+    "mute_bot_posts": "Приховати дописи ботів",
+    "always_show_post_button": "Завжди показувати плаваючу кнопку «Новий Допис»",
+    "hide_favorites_description": "Не показувати список моїх вподобань (люди все одно отримують сповіщення)",
+    "third_column_mode": "Коли достатньо місця, показувати третю колонку, що містить",
+    "user_popover_avatar_action_open": "Відкрити профіль",
+    "wordfilter": "Фільтр слів"
   },
   "selectable_list": {
     "select_all": "Вибрати все"
@@ -781,7 +834,23 @@
     "day": "{0} день",
     "seconds_short": "{0}с",
     "seconds": "{0} секунди",
-    "in_future": "через {0}"
+    "in_future": "через {0}",
+    "unit": {
+      "months": "{0} місяць | {0} місяців",
+      "minutes": "{0} хвилина | {0} хвилин",
+      "hours_short": "{0}год",
+      "minutes_short": "{0}хв",
+      "months_short": "{0}міс",
+      "seconds": "{0} секунда | {0} секунд",
+      "seconds_short": "{0}с",
+      "weeks_short": "{0}тижд",
+      "years": "{0} рік | {0} років",
+      "years_short": "{0}р.",
+      "days": "{0} день | {0} днів",
+      "days_short": "{0}д",
+      "hours": "{0} година | {0} годин",
+      "weeks": "{0} тиждень | {0} тижнів"
+    }
   },
   "search": {
     "no_results": "Немає результатів",
@@ -850,7 +919,9 @@
       "disabled": "Не виділяти"
     },
     "bot": "Бот",
-    "edit_profile": "Редагувати профіль"
+    "edit_profile": "Редагувати профіль",
+    "deactivated": "Деактивований",
+    "follow_cancel": "Скасувати запит"
   },
   "status": {
     "copy_link": "Скопіювати посилання на допис",
@@ -877,7 +948,15 @@
     "thread_muted": "Нитка заглушена",
     "unmute_conversation": "Припинити глушити розмову",
     "external_source": "Зовнішнє джерело",
-    "expand": "Розгорнути"
+    "expand": "Розгорнути",
+    "edit": "Редагувати допис",
+    "edited_at": "(змінено: {time})",
+    "thread_follow_with_icon": "{icon} {text}",
+    "ancestor_follow_with_icon": "{icon} {text}",
+    "show_all_conversation_with_icon": "{icon} {text}",
+    "plus_more": "+{number} більше",
+    "thread_show_full_with_icon": "{icon} {text}",
+    "show_only_conversation_under_this": "Показати всі відповіді на цей допис"
   },
   "timeline": {
     "no_more_statuses": "Більше немає дописів",
@@ -913,6 +992,9 @@
     "state": "Статус:",
     "state_open": "відкритий",
     "state_closed": "закритий",
-    "state_resolved": "вирішений"
+    "state_resolved": "вирішений",
+    "reported_statuses": "Дописи, на які подано скаргу:",
+    "reporter": "Позивач:",
+    "reported_user": "Відповідач:"
   }
 }
-- 
cgit v1.2.3-70-g09d2


From 010fdd8c245ed413666807b081f3735a33a2094f Mon Sep 17 00:00:00 2001
From: Dmytro Poltavchenko <xinit.info@gmail.com>
Date: Tue, 27 Dec 2022 20:12:11 +0000
Subject: Translated using Weblate (Ukrainian)

Currently translated at 87.8% (810 of 922 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 67b348d3..99b49868 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -54,7 +54,7 @@
     "media_proxy": "Посередник медіа-даних",
     "text_limit": "Ліміт символів",
     "upload_limit": "Обмеження завантажень",
-    "shout": "Оголошення"
+    "shout": "Гучномовець"
   },
   "exporter": {
     "processing": "Опрацьовую, скоро ви зможете завантажити файл",
@@ -67,7 +67,7 @@
     "mute": "Ігнорувати"
   },
   "shoutbox": {
-    "title": "Оголошення"
+    "title": "Гучномовець"
   },
   "about": {
     "staff": "Адміністрація",
@@ -684,7 +684,7 @@
       "backup_restore": "Резервне копіювання налаштувань"
     },
     "right_sidebar": "Показувати бокову панель справа",
-    "hide_shoutbox": "Приховати оголошення інстансу",
+    "hide_shoutbox": "Приховати гучномовець",
     "setting_server_side": "Цей параметр прив’язаний до вашого профілю та впливає на всі сеанси та клієнти",
     "lists_navigation": "Показувати списки в навігації",
     "account_backup": "Резервне копіювання облікового запису",
-- 
cgit v1.2.3-70-g09d2


From a1520b172a41004a2e4c50f47d60b90f35b53f2e Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Wed, 28 Dec 2022 21:47:14 +0000
Subject: Translated using Weblate (Esperanto)

Currently translated at 98.0% (904 of 922 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/eo/
---
 src/i18n/eo.json | 78 +++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 46 insertions(+), 32 deletions(-)

(limited to 'src')

diff --git a/src/i18n/eo.json b/src/i18n/eo.json
index 5a2c8afb..3596065c 100644
--- a/src/i18n/eo.json
+++ b/src/i18n/eo.json
@@ -96,7 +96,7 @@
     "friend_requests": "Petoj pri abono",
     "mentions": "Mencioj",
     "dms": "Rektaj mesaĝoj",
-    "public_tl": "Loka historio",
+    "public_tl": "Noda historio",
     "timeline": "Historio",
     "twkn": "Federa historio",
     "user_search": "Serĉi uzantojn",
@@ -112,16 +112,19 @@
     "edit_pinned": "Redakti fiksitajn erojn",
     "lists": "Listoj",
     "edit_nav_mobile": "Adapti navigan breton",
-    "edit_finish": "Fini redakton"
+    "edit_finish": "Fini redakton",
+    "mobile_notifications": "Malfermi sciigojn (estas nelegitaj)",
+    "mobile_notifications_close": "Fermi sciigojn",
+    "announcements": "Anoncoj"
   },
   "notifications": {
-    "broken_favorite": "Nekonata stato, serĉante ĝin…",
-    "favorited_you": "ŝatis vian staton",
+    "broken_favorite": "Nekonata afiŝo, serĉante ĝin…",
+    "favorited_you": "ŝatis vian afiŝon",
     "followed_you": "ekabonis vin",
     "load_older": "Enlegi pli malnovajn sciigojn",
     "notifications": "Sciigoj",
     "read": "Legite!",
-    "repeated_you": "ripetis vian staton",
+    "repeated_you": "ripetis vian afiŝon",
     "no_more_notifications": "Neniuj pliaj sciigoj",
     "reacted_with": "reagis per {0}",
     "migrated_to": "migris al",
@@ -131,7 +134,7 @@
     "poll_ended": "enketo finiĝis"
   },
   "post_status": {
-    "new_status": "Afiŝi novan staton",
+    "new_status": "Afiŝi",
     "account_not_locked_warning": "Via konto ne estas {0}. Iu ajn povas vin aboni por vidi eĉ viajn afiŝoj nur por abonantoj.",
     "account_not_locked_warning_link": "ŝlosita",
     "attachments_sensitive": "Marki kunsendaĵojn konsternaj",
@@ -152,12 +155,12 @@
       "unlisted": "Nelistigita – ne afiŝi al publikaj historioj"
     },
     "scope_notice": {
-      "unlisted": "Ĉi tiu afiŝo ne estos videbla en la Loka historio kaj la Federa historio",
+      "unlisted": "Ĉi tiu afiŝo ne estos videbla en la Noda kaj la Federa historioj",
       "private": "Ĉi tiu afiŝo estos videbla nur al viaj abonantoj",
       "public": "Ĉi tiu afiŝo estos videbla al ĉiuj"
     },
     "media_description_error": "Malsukcesis afiŝo de vidaŭdaĵoj; reprovu",
-    "empty_status_error": "Ne povas afiŝi malplenan staton sen dosieroj",
+    "empty_status_error": "Ne povas fari malplenan afiŝon sen dosieroj",
     "preview_empty": "Malplena",
     "preview": "Antaŭrigardo",
     "direct_warning_to_first_only": "Ĉi tiu afiŝo estas nur videbla al uzantoj menciitaj je la komenco de la mesaĝo.",
@@ -166,7 +169,7 @@
     "post": "Afiŝo",
     "edit_remote_warning": "Aliaj foraj nodoj eble ne subtenas redaktadon, kaj ne povos ricevi pli novan version de via afiŝo.",
     "edit_unsupported_warning": "Pleroma ne subtenas redaktadon de mencioj aŭ enketoj.",
-    "edit_status": "Stato de redakto"
+    "edit_status": "Redakti afiŝon"
   },
   "registration": {
     "bio": "Priskribo",
@@ -228,7 +231,7 @@
     "avatar_size_instruction": "La rekomendata minimuma grando de profilbildoj estas 150×150 bilderoj.",
     "export_theme": "Konservi antaŭagordon",
     "filtering": "Filtrado",
-    "filtering_explanation": "Ĉiuj statoj kun tiuj ĉi vortoj silentiĝos; skribu po unu linie",
+    "filtering_explanation": "Ĉiuj afiŝoj kun tiuj ĉi vortoj silentiĝos; skribu po unu linie",
     "follow_export": "Elporto de abonoj",
     "follow_export_button": "Elporti viajn abonojn al CSV-dosiero",
     "follow_export_processing": "Traktante; baldaŭ vi ricevos peton elŝuti la dosieron",
@@ -245,7 +248,7 @@
     "use_one_click_nsfw": "Malfermi konsternajn kunsendaĵojn per nur unu klako",
     "hide_post_stats": "Kaŝi statistikon de afiŝoj (ekz. nombron de ŝatoj)",
     "hide_user_stats": "Kaŝi statistikon de uzantoj (ekz. nombron de abonantoj)",
-    "hide_filtered_statuses": "Kaŝi filtritajn statojn",
+    "hide_filtered_statuses": "Kaŝi ĉiujn filtritajn afiŝojn",
     "import_followers_from_a_csv_file": "Enporti abonojn el CSV-dosiero",
     "import_theme": "Enlegi antaŭagordojn",
     "inputRadius": "Enigaj kampoj",
@@ -278,7 +281,7 @@
     "hide_followers_description": "Ne montri kiu min sekvas",
     "show_admin_badge": "Montri la insignon de administranto en mia profilo",
     "show_moderator_badge": "Montri la insignon de reguligisto en mia profilo",
-    "nsfw_clickthrough": "Ŝalti traklakan kaŝadon de kunsendaĵoj kaj antaŭmontroj de ligiloj por konsternaj statoj",
+    "nsfw_clickthrough": "Ŝalti traklakan kaŝadon de kunsendaĵoj kaj antaŭmontroj de ligiloj por konsternaj afiŝoj",
     "oauth_tokens": "Pecoj de OAuth",
     "token": "Peco",
     "refresh_token": "Aktualiga peco",
@@ -627,14 +630,14 @@
     "word_filter_and_more": "Vortofiltrado kaj pli…",
     "mute_bot_posts": "Silentigi afiŝojn de robotoj",
     "hide_bot_indication": "Kaŝi markon de roboteco en afiŝoj",
-    "hide_wordfiltered_statuses": "Kaŝi vorte filtritajn statojn",
+    "hide_wordfiltered_statuses": "Kaŝi vorte filtritajn afiŝojn",
     "hide_muted_threads": "Kaŝi silentigitajn fadenojn",
     "account_privacy": "Privateco",
     "user_profiles": "Profiloj de uzantoj",
     "hide_favorites_description": "Ne montri liston de miaj ŝatatoj (oni tamen sciiĝas)",
     "conversation_display_tree": "Arba stilo",
     "conversation_display_tree_quick": "Arba vido",
-    "show_scrollbars": "Montri rulumajn bretojn de flankaj kolumnoj",
+    "show_scrollbars": "Montri rulumskalojn de flankaj kolumnoj",
     "third_column_mode_none": "Neniam montri trian kolumnon",
     "third_column_mode_notifications": "Kolumno de sciigoj",
     "columns": "Kolumnoj",
@@ -644,9 +647,9 @@
     "column_sizes_notifs": "Sciigoj",
     "tree_advanced": "Permesi pli flekseblan navigadon en arba vido",
     "conversation_display_linear": "Linia stilo",
-    "conversation_other_replies_button": "Montri la butonon «aliaj respondoj»",
-    "conversation_other_replies_button_below": "Sub statoj",
-    "conversation_other_replies_button_inside": "En statoj",
+    "conversation_other_replies_button": "Montri la butonon pri «aliaj respondoj»",
+    "conversation_other_replies_button_below": "Sub afiŝoj",
+    "conversation_other_replies_button_inside": "En afiŝoj",
     "max_depth_in_thread": "Maksimuma nombro de niveloj implicite montrataj en fadeno",
     "auto_update": "Montri novajn afiŝojn memage",
     "use_at_icon": "Montri simbolon {'@'} kiel bildon anstataŭ teksto",
@@ -662,19 +665,20 @@
     "user_popover_avatar_action_open": "Malfermi la profilon",
     "user_popover_avatar_overlay": "Aperigi ŝprucaĵon pri uzanto sur profilbildo",
     "show_yous": "Montri la markon «(Vi)»",
-    "user_popover_avatar_action_zoom": "Zomi la profilbildon"
+    "user_popover_avatar_action_zoom": "Zomi la profilbildon",
+    "third_column_mode": "Kun sufiĉo da spaco, montri trian kolumnon kun"
   },
   "timeline": {
     "collapse": "Maletendi",
     "conversation": "Interparolo",
     "error_fetching": "Eraris ĝisdatigo",
-    "load_older": "Montri pli malnovajn statojn",
+    "load_older": "Montri pli malnovajn afiŝojn",
     "no_retweet_hint": "Afiŝo estas markita kiel rekta aŭ nur por abonantoj, kaj ne eblas ĝin ripeti",
     "repeated": "ripetis",
     "show_new": "Montri novajn",
     "up_to_date": "Ĝisdata",
-    "no_more_statuses": "Neniuj pliaj statoj",
-    "no_statuses": "Neniuj statoj",
+    "no_more_statuses": "Neniuj pliaj afiŝoj",
+    "no_statuses": "Neniuj afiŝoj",
     "reload": "Enlegi ree",
     "error": "Eraris akirado de historio: {0}",
     "socket_reconnected": "Realtempa konekto fariĝis",
@@ -700,7 +704,7 @@
     "muted": "Silentigita",
     "per_day": "tage",
     "remote_follow": "Fore aboni",
-    "statuses": "Statoj",
+    "statuses": "Afiŝoj",
     "unblock": "Malbloki",
     "unblock_progress": "Malblokante…",
     "block_progress": "Blokante…",
@@ -744,7 +748,12 @@
     "edit_profile": "Redakti profilon",
     "deactivated": "Malaktiva",
     "follow_cancel": "Nuligi peton",
-    "remove_follower": "Forigi abonanton"
+    "remove_follower": "Forigi abonanton",
+    "note": "Noto",
+    "note_blank": "(Neniu)",
+    "edit_note_apply": "Apliki",
+    "edit_note_cancel": "Nuligi",
+    "edit_note": "Redakti noton"
   },
   "user_profile": {
     "timeline_title": "Historio de uzanto",
@@ -764,7 +773,9 @@
     "bookmark": "Legosigno",
     "reject_follow_request": "Rifuzi abonpeton",
     "accept_follow_request": "Akcepti abonpeton",
-    "add_reaction": "Aldoni reagon"
+    "add_reaction": "Aldoni reagon",
+    "toggle_expand": "Etendi aŭ maletendi sciigon por montri plenan afiŝon",
+    "toggle_mute": "Etendi aŭ maletendi afiŝon por montri silentigitan enhavon"
   },
   "upload": {
     "error": {
@@ -893,19 +904,19 @@
     "show_full_subject": "Montri plenan temon",
     "thread_muted_and_words": ", enhavas vortojn:",
     "thread_muted": "Fadeno silentigita",
-    "copy_link": "Kopii ligilon al stato",
-    "status_unavailable": "Stato ne estas disponebla",
+    "copy_link": "Kopii ligilon al afiŝo",
+    "status_unavailable": "Afiŝo ne estas disponebla",
     "unmute_conversation": "Malsilentigi interparolon",
     "mute_conversation": "Silentigi interparolon",
     "replies_list": "Respondoj:",
     "reply_to": "Responde al",
-    "delete_confirm": "Ĉu vi certe volas forigi ĉi tiun staton?",
+    "delete_confirm": "Ĉu vi certe volas forigi ĉi tiun afiŝon?",
     "unbookmark": "Senlegosigni",
     "bookmark": "Legosigni",
     "pinned": "Fiksita",
     "unpin": "Malfiksi de profilo",
     "pin": "Fiksi al profilo",
-    "delete": "Forigi staton",
+    "delete": "Forigi afiŝon",
     "repeats": "Ripetoj",
     "favorites": "Ŝatoj",
     "status_deleted": "Ĉi tiu afiŝo foriĝis",
@@ -939,7 +950,8 @@
     "ancestor_follow_with_icon": "{icon} {text}",
     "show_all_conversation_with_icon": "{icon} {text}",
     "show_only_conversation_under_this": "Montri nur respondojn al ĉi tiu afiŝo",
-    "status_history": "Historio de afiŝo"
+    "status_history": "Historio de afiŝo",
+    "open_gallery": "Malfermi galerion"
   },
   "time": {
     "years_short": "{0}j",
@@ -996,7 +1008,9 @@
     "no_results": "Neniuj rezultoj",
     "people_talking": "{count} personoj parolas",
     "person_talking": "{count} persono parolas",
-    "hashtags": "Kradvortoj"
+    "hashtags": "Kradvortoj",
+    "no_more_results": "Neniuj pliaj rezultoj",
+    "load_more": "Enlegi pliajn rezultojn"
   },
   "display_date": {
     "today": "Hodiaŭ"
@@ -1047,9 +1061,9 @@
   "report": {
     "reporter": "Raportinto:",
     "reported_user": "Raportito:",
-    "reported_statuses": "Raportitaj statoj:",
+    "reported_statuses": "Raportitaj afiŝoj:",
     "notes": "Notoj:",
-    "state": "Stato:",
+    "state": "Afiŝo:",
     "state_open": "Malfermita",
     "state_closed": "Fermita",
     "state_resolved": "Solvita"
-- 
cgit v1.2.3-70-g09d2


From 5e98ee05e4a163b9c939f6186b2e1d42cb852d4b Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Fri, 30 Dec 2022 16:26:50 -0500
Subject: Fix list membership actions

---
 src/components/lists_edit/lists_edit.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/components/lists_edit/lists_edit.js b/src/components/lists_edit/lists_edit.js
index c22d1323..c33659df 100644
--- a/src/components/lists_edit/lists_edit.js
+++ b/src/components/lists_edit/lists_edit.js
@@ -95,10 +95,10 @@ const ListsNew = {
       return this.addedUserIds.has(user.id)
     },
     addUser (user) {
-      this.$store.dispatch('addListAccount', { accountId: this.user.id, listId: this.id })
+      this.$store.dispatch('addListAccount', { accountId: user.id, listId: this.id })
     },
     removeUser (userId) {
-      this.$store.dispatch('removeListAccount', { accountId: this.user.id, listId: this.id })
+      this.$store.dispatch('removeListAccount', { accountId: userId, listId: this.id })
     },
     onSearchLoading (results) {
       this.searchLoading = true
-- 
cgit v1.2.3-70-g09d2


From 876e51603a03dab45b5572bb014f2135bd4ad3e1 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Sat, 31 Dec 2022 12:29:33 -0500
Subject: Include unpacked emojis in emoji picker

---
 src/components/emoji_picker/emoji_picker.js |  6 ++++-
 src/i18n/en.json                            |  1 +
 src/modules/instance.js                     | 36 +++++++++++++++++++++++++----
 3 files changed, 37 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/components/emoji_picker/emoji_picker.js b/src/components/emoji_picker/emoji_picker.js
index dd5e5217..2838e102 100644
--- a/src/components/emoji_picker/emoji_picker.js
+++ b/src/components/emoji_picker/emoji_picker.js
@@ -287,7 +287,11 @@ const EmojiPicker = {
       return 0
     },
     allCustomGroups () {
-      return this.$store.getters.groupedCustomEmojis
+      const emojis = this.$store.getters.groupedCustomEmojis
+      if (emojis.unpacked) {
+        emojis.unpacked.text = this.$t('emoji.unpacked')
+      }
+      return emojis
     },
     defaultGroup () {
       return Object.keys(this.allCustomGroups)[0]
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 59ee1c17..b91f0b10 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -225,6 +225,7 @@
     "search_emoji": "Search for an emoji",
     "add_emoji": "Insert emoji",
     "custom": "Custom emoji",
+    "unpacked": "Unpacked emoji",
     "unicode": "Unicode emoji",
     "unicode_groups": {
       "activities": "Activities",
diff --git a/src/modules/instance.js b/src/modules/instance.js
index 3b15e62e..8e8d13d3 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -181,15 +181,28 @@ const instance = {
     },
     groupedCustomEmojis (state) {
       const packsOf = emoji => {
-        return emoji.tags
+        const packs = emoji.tags
           .filter(k => k.startsWith('pack:'))
-          .map(k => k.slice(5)) // remove 'pack:' prefix
+          .map(k => {
+            const packName = k.slice(5) // remove 'pack:' prefix
+            return {
+              id: `custom-${packName}`,
+              text: packName
+            }
+          })
+
+        if (!packs.length) {
+          return [{
+            id: 'unpacked'
+          }]
+        } else {
+          return packs
+        }
       }
 
       return state.customEmoji
         .reduce((res, emoji) => {
-          packsOf(emoji).forEach(packName => {
-            const packId = `custom-${packName}`
+          packsOf(emoji).forEach(({ id: packId, text: packName }) => {
             if (!res[packId]) {
               res[packId] = ({
                 id: packId,
@@ -290,9 +303,22 @@ const instance = {
             const lb = b.toLowerCase()
             return la > lb ? 1 : (la < lb ? -1 : 0)
           }
+          const noPackLast = (a, b) => {
+            const aNull = a === ''
+            const bNull = b === ''
+            if (aNull === bNull) {
+              return 0
+            } else if (aNull && !bNull) {
+              return 1
+            } else {
+              return -1
+            }
+          }
           const byPackThenByName = (a, b) => {
             const packOf = emoji => (emoji.tags.filter(k => k.startsWith('pack:'))[0] || '').slice(5)
-            return caseInsensitiveStrCmp(packOf(a), packOf(b)) || caseInsensitiveStrCmp(a.displayText, b.displayText)
+            const packOfA = packOf(a)
+            const packOfB = packOf(b)
+            return noPackLast(packOfA, packOfB) || caseInsensitiveStrCmp(packOfA, packOfB) || caseInsensitiveStrCmp(a.displayText, b.displayText)
           }
 
           const emoji = Object.entries(values).map(([key, value]) => {
-- 
cgit v1.2.3-70-g09d2


From 1120eb369421d121db33535c0445689c0b371cb2 Mon Sep 17 00:00:00 2001
From: Dmytro Poltavchenko <xinit.info@gmail.com>
Date: Fri, 30 Dec 2022 22:52:42 +0000
Subject: Translated using Weblate (Ukrainian)

Currently translated at 87.9% (811 of 922 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 99b49868..2110548c 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -956,7 +956,8 @@
     "show_all_conversation_with_icon": "{icon} {text}",
     "plus_more": "+{number} більше",
     "thread_show_full_with_icon": "{icon} {text}",
-    "show_only_conversation_under_this": "Показати всі відповіді на цей допис"
+    "show_only_conversation_under_this": "Показати всі відповіді на цей допис",
+    "status_history": "Історія змін"
   },
   "timeline": {
     "no_more_statuses": "Більше немає дописів",
-- 
cgit v1.2.3-70-g09d2


From cf2b44acfd4e8e29c5a1ce230544d113a670a2b8 Mon Sep 17 00:00:00 2001
From: Ihor Andreew <ihor@noleron.com>
Date: Mon, 2 Jan 2023 10:33:26 +0000
Subject: Translated using Weblate (Ukrainian)

Currently translated at 90.4% (834 of 922 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index 2110548c..c781b1f6 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -188,7 +188,8 @@
     "mobile_sidebar": "Ввімкнути бокову панель",
     "mobile_notifications": "Відкрити сповіщення (є непрочитані)",
     "mobile_notifications_close": "Закрити сповіщення",
-    "edit_nav_mobile": "Редагувати панель навігації"
+    "edit_nav_mobile": "Редагувати панель навігації",
+    "announcements": "Анонси"
   },
   "media_modal": {
     "next": "Наступна",
@@ -735,7 +736,10 @@
     "hide_favorites_description": "Не показувати список моїх вподобань (люди все одно отримують сповіщення)",
     "third_column_mode": "Коли достатньо місця, показувати третю колонку, що містить",
     "user_popover_avatar_action_open": "Відкрити профіль",
-    "wordfilter": "Фільтр слів"
+    "wordfilter": "Фільтр слів",
+    "mention_links": "Посилання для згадування",
+    "user_profiles": "Профілі користувачів",
+    "notification_visibility_polls": "Закінчення опитувань, в яких ви проголосували"
   },
   "selectable_list": {
     "select_all": "Вибрати все"
@@ -997,5 +1001,26 @@
     "reported_statuses": "Дописи, на які подано скаргу:",
     "reporter": "Позивач:",
     "reported_user": "Відповідач:"
+  },
+  "announcements": {
+    "delete_action": "Видалити",
+    "page_header": "Анонси",
+    "title": "Анонси",
+    "mark_as_read_action": "Позначити як прочитане",
+    "post_form_header": "Розмістити оголошення",
+    "post_placeholder": "Введіть текст вашого оголошення тут...",
+    "post_action": "Пост",
+    "post_error": "Помилка: {error}",
+    "close_error": "Закрити",
+    "start_time_prompt": "Початок: ",
+    "end_time_prompt": "Кінець: ",
+    "all_day_prompt": "Це захід на цілий день",
+    "published_time_display": "Опубліковано в {time}",
+    "start_time_display": "Початок о {time}",
+    "end_time_display": "Кінець о {time}",
+    "edit_action": "Редагувати",
+    "submit_edit_action": "Надіслати",
+    "cancel_edit_action": "Скасувати",
+    "inactive_message": "Це оголошення неактивне"
   }
 }
-- 
cgit v1.2.3-70-g09d2


From 78081836dfa40abdb587dcbca59d339a27e23fb2 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Sat, 24 Dec 2022 12:43:30 -0500
Subject: Remove lozad code

---
 src/components/emoji_picker/emoji_picker.js  | 40 ----------------------------
 src/components/emoji_picker/emoji_picker.vue |  4 +--
 src/components/still-image/still-image.js    |  3 ++-
 src/components/still-image/still-image.vue   |  1 +
 4 files changed, 5 insertions(+), 43 deletions(-)

(limited to 'src')

diff --git a/src/components/emoji_picker/emoji_picker.js b/src/components/emoji_picker/emoji_picker.js
index 2838e102..68240fd8 100644
--- a/src/components/emoji_picker/emoji_picker.js
+++ b/src/components/emoji_picker/emoji_picker.js
@@ -3,7 +3,6 @@ import Checkbox from '../checkbox/checkbox.vue'
 import Popover from 'src/components/popover/popover.vue'
 import StillImage from '../still-image/still-image.vue'
 import { ensureFinalFallback } from '../../i18n/languages.js'
-import lozad from 'lozad'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faBoxOpen,
@@ -125,9 +124,6 @@ const EmojiPicker = {
     setGroupRef (name) {
       return el => { this.groupRefs[name] = el }
     },
-    setEmojiRef (name) {
-      return el => { this.emojiRefs[name] = el }
-    },
     onPopoverShown () {
       this.$emit('show')
     },
@@ -208,43 +204,12 @@ const EmojiPicker = {
     filterByKeyword (list, keyword) {
       return filterByKeyword(list, keyword, this.languages, this.maybeLocalizedEmojiName)
     },
-    initializeLazyLoad () {
-      this.destroyLazyLoad()
-      this.$nextTick(() => {
-        this.$lozad = lozad('.still-image.emoji-picker-emoji', {
-          load: el => {
-            const name = el.getAttribute('data-emoji-name')
-            const vn = this.emojiRefs[name]
-            if (!vn) {
-              return
-            }
-
-            vn.loadLazy()
-          }
-        })
-        this.$lozad.observe()
-      })
-    },
-    waitForDomAndInitializeLazyLoad () {
-      this.$nextTick(() => this.initializeLazyLoad())
-    },
-    destroyLazyLoad () {
-      if (this.$lozad) {
-        if (this.$lozad.observer) {
-          this.$lozad.observer.disconnect()
-        }
-        if (this.$lozad.mutationObserver) {
-          this.$lozad.mutationObserver.disconnect()
-        }
-      }
-    },
     onShowing () {
       const oldContentLoaded = this.contentLoaded
       this.$nextTick(() => {
         this.$refs.search.focus()
       })
       this.contentLoaded = true
-      this.waitForDomAndInitializeLazyLoad()
       this.filteredEmojiGroups = this.getFilteredEmojiGroups()
       if (!oldContentLoaded) {
         this.$nextTick(() => {
@@ -269,13 +234,9 @@ const EmojiPicker = {
       this.debouncedHandleKeywordChange()
     },
     allCustomGroups () {
-      this.waitForDomAndInitializeLazyLoad()
       this.filteredEmojiGroups = this.getFilteredEmojiGroups()
     }
   },
-  destroyed () {
-    this.destroyLazyLoad()
-  },
   computed: {
     activeGroupView () {
       return this.showingStickers ? '' : this.activeGroup
@@ -314,7 +275,6 @@ const EmojiPicker = {
     },
     debouncedHandleKeywordChange () {
       return debounce(() => {
-        this.waitForDomAndInitializeLazyLoad()
         this.filteredEmojiGroups = this.getFilteredEmojiGroups()
       }, 500)
     },
diff --git a/src/components/emoji_picker/emoji_picker.vue b/src/components/emoji_picker/emoji_picker.vue
index ff56d637..d0b7fe8f 100644
--- a/src/components/emoji_picker/emoji_picker.vue
+++ b/src/components/emoji_picker/emoji_picker.vue
@@ -104,9 +104,9 @@
                 >{{ emoji.replacement }}</span>
                 <still-image
                   v-else
-                  :ref="setEmojiRef(group.id + emoji.displayText)"
                   class="emoji-picker-emoji -custom"
-                  :data-src="emoji.imageUrl"
+                  loading="lazy"
+                  :src="emoji.imageUrl"
                   :data-emoji-name="group.id + emoji.displayText"
                 />
               </span>
diff --git a/src/components/still-image/still-image.js b/src/components/still-image/still-image.js
index 200ef147..56fd2fd9 100644
--- a/src/components/still-image/still-image.js
+++ b/src/components/still-image/still-image.js
@@ -8,7 +8,8 @@ const StillImage = {
     'alt',
     'height',
     'width',
-    'dataSrc'
+    'dataSrc',
+    'loading'
   ],
   data () {
     return {
diff --git a/src/components/still-image/still-image.vue b/src/components/still-image/still-image.vue
index 633fb229..d015e138 100644
--- a/src/components/still-image/still-image.vue
+++ b/src/components/still-image/still-image.vue
@@ -17,6 +17,7 @@
       :data-src="dataSrc"
       :src="realSrc"
       :referrerpolicy="referrerpolicy"
+      :loading="loading"
       @load="onLoad"
       @error="onError"
     >
-- 
cgit v1.2.3-70-g09d2


From afd7f5fabe58dc08a5a6e35e923e2e8fd71926dc Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Sat, 24 Dec 2022 13:48:36 -0500
Subject: Use virtual scrolling for emoji picker

---
 package.json                                  |  1 +
 src/boot/after_store.js                       |  3 +
 src/components/emoji_picker/emoji_picker.js   | 33 ++++-------
 src/components/emoji_picker/emoji_picker.scss |  1 +
 src/components/emoji_picker/emoji_picker.vue  | 79 +++++++++++++++------------
 yarn.lock                                     | 24 ++++++++
 6 files changed, 83 insertions(+), 58 deletions(-)

(limited to 'src')

diff --git a/package.json b/package.json
index 231a93ad..a32f93a4 100644
--- a/package.json
+++ b/package.json
@@ -45,6 +45,7 @@
     "vue-i18n": "9.2.2",
     "vue-router": "4.1.6",
     "vue-template-compiler": "2.7.14",
+    "vue-virtual-scroller": "^2.0.0-beta.7",
     "vuex": "4.1.0"
   },
   "devDependencies": {
diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index 7a4672b6..1fa9dd2a 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -1,6 +1,8 @@
 import { createApp } from 'vue'
 import { createRouter, createWebHistory } from 'vue-router'
 import vClickOutside from 'click-outside-vue3'
+import VueVirtualScroller from 'vue-virtual-scroller'
+import 'vue-virtual-scroller/dist/vue-virtual-scroller.css'
 
 import { FontAwesomeIcon, FontAwesomeLayers } from '@fortawesome/vue-fontawesome'
 
@@ -397,6 +399,7 @@ const afterStoreSetup = async ({ store, i18n }) => {
 
   app.use(vClickOutside)
   app.use(VBodyScrollLock)
+  app.use(VueVirtualScroller)
 
   app.component('FAIcon', FontAwesomeIcon)
   app.component('FALayers', FontAwesomeLayers)
diff --git a/src/components/emoji_picker/emoji_picker.js b/src/components/emoji_picker/emoji_picker.js
index 68240fd8..c87dea7e 100644
--- a/src/components/emoji_picker/emoji_picker.js
+++ b/src/components/emoji_picker/emoji_picker.js
@@ -143,22 +143,13 @@ const EmojiPicker = {
       }
       this.$emit('emoji', { insertion: value, keepOpen: this.keepOpen })
     },
-    onScroll (e) {
-      const target = (e && e.target) || this.$refs['emoji-groups']
-      this.updateScrolledClass(target)
-      this.scrolledGroup(target)
+    onScroll (startIndex, endIndex, visibleStartIndex, visibleEndIndex) {
+      const current = this.filteredEmojiGroups[visibleStartIndex].id
+      this.scrolledGroup(current)
     },
-    scrolledGroup (target) {
-      const top = target.scrollTop + 5
-      this.$nextTick(() => {
-        this.allEmojiGroups.forEach(group => {
-          const ref = this.groupRefs['group-' + group.id]
-          if (ref && ref.offsetTop <= top) {
-            this.activeGroup = group.id
-          }
-        })
-        this.scrollHeader()
-      })
+    scrolledGroup (groupId) {
+      this.activeGroup = groupId
+      this.scrollHeader()
     },
     scrollHeader () {
       // Scroll the active tab's header into view
@@ -177,14 +168,9 @@ const EmojiPicker = {
         setScroll(right + margin - headerCont.clientWidth)
       }
     },
-    highlight (key) {
-      const ref = this.groupRefs['group-' + key]
-      const top = ref.offsetTop
+    highlight (index) {
       this.setShowStickers(false)
-      this.activeGroup = key
-      this.$nextTick(() => {
-        this.$refs['emoji-groups'].scrollTop = top + 1
-      })
+      this.$refs['emoji-groups'].scrollToItem(index)
     },
     updateScrolledClass (target) {
       if (target.scrollTop <= 5) {
@@ -238,6 +224,9 @@ const EmojiPicker = {
     }
   },
   computed: {
+    minItemSize () {
+      return 32
+    },
     activeGroupView () {
       return this.showingStickers ? '' : this.activeGroup
     },
diff --git a/src/components/emoji_picker/emoji_picker.scss b/src/components/emoji_picker/emoji_picker.scss
index 53363ec1..dda12197 100644
--- a/src/components/emoji_picker/emoji_picker.scss
+++ b/src/components/emoji_picker/emoji_picker.scss
@@ -74,6 +74,7 @@ $emoji-picker-emoji-size: 32px;
   }
 
   .emoji-groups {
+    height: 100%;
     min-height: 200px;
   }
 
diff --git a/src/components/emoji_picker/emoji_picker.vue b/src/components/emoji_picker/emoji_picker.vue
index d0b7fe8f..15cdb704 100644
--- a/src/components/emoji_picker/emoji_picker.vue
+++ b/src/components/emoji_picker/emoji_picker.vue
@@ -13,7 +13,7 @@
           class="emoji-tabs"
         >
           <span
-            v-for="group in filteredEmojiGroups"
+            v-for="(group, index) in filteredEmojiGroups"
             :ref="setGroupRef('group-header-' + group.id)"
             :key="group.id"
             class="emoji-tabs-item"
@@ -21,7 +21,7 @@
               active: activeGroupView === group.id
             }"
             :title="group.text"
-            @click.prevent="highlight(group.id)"
+            @click.prevent="highlight(index)"
           >
             <span
               v-if="group.image"
@@ -74,45 +74,52 @@
               @input="$event.target.composing = false"
             >
           </div>
-          <div
+          <DynamicScroller
             ref="emoji-groups"
             class="emoji-groups"
             :class="groupsScrolledClass"
-            @scroll="onScroll"
+            :min-item-size="minItemSize"
+            :items="filteredEmojiGroups"
+            @update="onScroll"
           >
-            <div
-              v-for="group in filteredEmojiGroups"
-              :key="group.id"
-              class="emoji-group"
-            >
-              <h6
-                :ref="setGroupRef('group-' + group.id)"
-                class="emoji-group-title"
-              >
-                {{ group.text }}
-              </h6>
-              <span
-                v-for="emoji in group.emojis"
-                :key="group.id + emoji.displayText"
-                :title="maybeLocalizedEmojiName(emoji)"
-                class="emoji-item"
-                @click.stop.prevent="onEmoji(emoji)"
+            <template #default="{ item: group, index, active }">
+              <DynamicScrollerItem
+                :item="group"
+                :active="active"
+                :data-index="index"
+                :size-dependencies="[group.emojis.length]"
               >
-                <span
-                  v-if="!emoji.imageUrl"
-                  class="emoji-picker-emoji -unicode"
-                >{{ emoji.replacement }}</span>
-                <still-image
-                  v-else
-                  class="emoji-picker-emoji -custom"
-                  loading="lazy"
-                  :src="emoji.imageUrl"
-                  :data-emoji-name="group.id + emoji.displayText"
-                />
-              </span>
-              <span :ref="setGroupRef('group-end-' + group.id)" />
-            </div>
-          </div>
+                <div
+                  class="emoji-group"
+                >
+                  <h6
+                    class="emoji-group-title"
+                  >
+                    {{ group.text }}
+                  </h6>
+                  <span
+                    v-for="emoji in group.emojis"
+                    :key="group.id + emoji.displayText"
+                    :title="maybeLocalizedEmojiName(emoji)"
+                    class="emoji-item"
+                    @click.stop.prevent="onEmoji(emoji)"
+                  >
+                    <span
+                      v-if="!emoji.imageUrl"
+                      class="emoji-picker-emoji -unicode"
+                    >{{ emoji.replacement }}</span>
+                    <still-image
+                      v-else
+                      class="emoji-picker-emoji -custom"
+                      loading="lazy"
+                      :src="emoji.imageUrl"
+                      :data-emoji-name="group.id + emoji.displayText"
+                    />
+                  </span>
+                </div>
+              </DynamicScrollerItem>
+            </template>
+          </DynamicScroller>
           <div class="keep-open">
             <Checkbox v-model="keepOpen">
               {{ $t('emoji.keep_open') }}
diff --git a/yarn.lock b/yarn.lock
index dc2050ca..7b45ee14 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6370,6 +6370,11 @@ minimist@^1.2.5:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
   integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
 
+mitt@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/mitt/-/mitt-2.1.0.tgz#f740577c23176c6205b121b2973514eade1b2230"
+  integrity sha512-ILj2TpLiysu2wkBbWjAmww7TkZb65aiQO+DkVdUTBpBXq+MHYiETENkKFMtsJZX1Lf4pe4QOrTSjIfUwN5lRdg==
+
 mkdirp@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
@@ -8805,6 +8810,16 @@ vue-loader@17.0.1:
     hash-sum "^2.0.0"
     loader-utils "^2.0.0"
 
+vue-observe-visibility@^2.0.0-alpha.1:
+  version "2.0.0-alpha.1"
+  resolved "https://registry.yarnpkg.com/vue-observe-visibility/-/vue-observe-visibility-2.0.0-alpha.1.tgz#1e4eda7b12562161d58984b7e0dea676d83bdb13"
+  integrity sha512-flFbp/gs9pZniXR6fans8smv1kDScJ8RS7rEpMjhVabiKeq7Qz3D9+eGsypncjfIyyU84saU88XZ0zjbD6Gq/g==
+
+vue-resize@^2.0.0-alpha.1:
+  version "2.0.0-alpha.1"
+  resolved "https://registry.yarnpkg.com/vue-resize/-/vue-resize-2.0.0-alpha.1.tgz#43eeb79e74febe932b9b20c5c57e0ebc14e2df3a"
+  integrity sha512-7+iqOueLU7uc9NrMfrzbG8hwMqchfVfSzpVlCMeJQe4pyibqyoifDNbKTZvwxZKDvGkB+PdFeKvnGZMoEb8esg==
+
 vue-router@4.1.6:
   version "4.1.6"
   resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-4.1.6.tgz#b70303737e12b4814578d21d68d21618469375a1"
@@ -8828,6 +8843,15 @@ vue-template-compiler@2.7.14:
     de-indent "^1.0.2"
     he "^1.2.0"
 
+vue-virtual-scroller@^2.0.0-beta.7:
+  version "2.0.0-beta.7"
+  resolved "https://registry.yarnpkg.com/vue-virtual-scroller/-/vue-virtual-scroller-2.0.0-beta.7.tgz#4ea8158638c84b2033b001a8b26c5fcb6896b271"
+  integrity sha512-OrouVj1i2939jaLjVfu8f5fsDlbzhAb4bOsYZYrAkpcVLylAmMoGtIL7eT3hJrdTiaKbwQpRdnv7DKf9Fn+tHg==
+  dependencies:
+    mitt "^2.1.0"
+    vue-observe-visibility "^2.0.0-alpha.1"
+    vue-resize "^2.0.0-alpha.1"
+
 vue@3.2.45:
   version "3.2.45"
   resolved "https://registry.yarnpkg.com/vue/-/vue-3.2.45.tgz#94a116784447eb7dbd892167784619fef379b3c8"
-- 
cgit v1.2.3-70-g09d2


From 314a4474f6475435cfac7e5e02862015a9455660 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Mon, 2 Jan 2023 12:40:03 -0500
Subject: Fix header indicator

---
 src/components/emoji_picker/emoji_picker.js  | 28 ++++++++++++++++++++++++----
 src/components/emoji_picker/emoji_picker.vue |  2 ++
 2 files changed, 26 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/components/emoji_picker/emoji_picker.js b/src/components/emoji_picker/emoji_picker.js
index c87dea7e..9c97e16c 100644
--- a/src/components/emoji_picker/emoji_picker.js
+++ b/src/components/emoji_picker/emoji_picker.js
@@ -81,6 +81,13 @@ const filterByKeyword = (list, keyword = '', languages, nameLocalizer) => {
   return orderedEmojiList.flat()
 }
 
+const getOffset = (elem) => {
+  const style = elem.style.transform
+  const res = /translateY\((\d+)px\)/.exec(style)
+  if (!res) { return 0 }
+  return res[1]
+}
+
 const EmojiPicker = {
   props: {
     enableStickerPicker: {
@@ -144,12 +151,25 @@ const EmojiPicker = {
       this.$emit('emoji', { insertion: value, keepOpen: this.keepOpen })
     },
     onScroll (startIndex, endIndex, visibleStartIndex, visibleEndIndex) {
+      console.log('onScroll', startIndex, endIndex, visibleStartIndex, visibleEndIndex)
       const current = this.filteredEmojiGroups[visibleStartIndex].id
-      this.scrolledGroup(current)
+      const target = this.$refs['emoji-groups'].$el
+      this.scrolledGroup(target, current, visibleStartIndex, visibleEndIndex)
     },
-    scrolledGroup (groupId) {
-      this.activeGroup = groupId
-      this.scrollHeader()
+    scrolledGroup (target, groupId, start, end) {
+      const top = target.scrollTop + 5
+      this.$nextTick(() => {
+        this.filteredEmojiGroups.slice(start, end + 1).forEach(group => {
+          const ref = this.groupRefs['group-' + group.id]
+          if (!ref) { return }
+          const elem = ref.$el.parentElement
+          if (!elem) { return }
+          if (elem && getOffset(elem) <= top) {
+            this.activeGroup = group.id
+          }
+        })
+        this.scrollHeader()
+      })
     },
     scrollHeader () {
       // Scroll the active tab's header into view
diff --git a/src/components/emoji_picker/emoji_picker.vue b/src/components/emoji_picker/emoji_picker.vue
index 15cdb704..78da4808 100644
--- a/src/components/emoji_picker/emoji_picker.vue
+++ b/src/components/emoji_picker/emoji_picker.vue
@@ -80,10 +80,12 @@
             :class="groupsScrolledClass"
             :min-item-size="minItemSize"
             :items="filteredEmojiGroups"
+            :emit-update="true"
             @update="onScroll"
           >
             <template #default="{ item: group, index, active }">
               <DynamicScrollerItem
+                :ref="setGroupRef('group-' + group.id)"
                 :item="group"
                 :active="active"
                 :data-index="index"
-- 
cgit v1.2.3-70-g09d2


From 6cc3b239f6f096f22139d5dbc543852a5e89ea1e Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Mon, 2 Jan 2023 13:25:59 -0500
Subject: Load emoji row by row

---
 src/components/emoji_picker/emoji_picker.js  | 45 +++++++++++++++++++++++-----
 src/components/emoji_picker/emoji_picker.vue |  3 +-
 2 files changed, 39 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/components/emoji_picker/emoji_picker.js b/src/components/emoji_picker/emoji_picker.js
index 9c97e16c..39a514a7 100644
--- a/src/components/emoji_picker/emoji_picker.js
+++ b/src/components/emoji_picker/emoji_picker.js
@@ -18,7 +18,7 @@ import {
   faCode,
   faFlag
 } from '@fortawesome/free-solid-svg-icons'
-import { debounce, trim } from 'lodash'
+import { debounce, trim, chunk } from 'lodash'
 
 library.add(
   faBoxOpen,
@@ -88,6 +88,10 @@ const getOffset = (elem) => {
   return res[1]
 }
 
+const toHeaderId = id => {
+  return id.replace(/^row-\d+-/, '')
+}
+
 const EmojiPicker = {
   props: {
     enableStickerPicker: {
@@ -152,20 +156,20 @@ const EmojiPicker = {
     },
     onScroll (startIndex, endIndex, visibleStartIndex, visibleEndIndex) {
       console.log('onScroll', startIndex, endIndex, visibleStartIndex, visibleEndIndex)
-      const current = this.filteredEmojiGroups[visibleStartIndex].id
       const target = this.$refs['emoji-groups'].$el
-      this.scrolledGroup(target, current, visibleStartIndex, visibleEndIndex)
+      this.scrolledGroup(target, visibleStartIndex, visibleEndIndex)
     },
-    scrolledGroup (target, groupId, start, end) {
+    scrolledGroup (target, start, end) {
       const top = target.scrollTop + 5
       this.$nextTick(() => {
-        this.filteredEmojiGroups.slice(start, end + 1).forEach(group => {
+        this.emojiItems.slice(start, end + 1).forEach(group => {
+          const headerId = toHeaderId(group.id)
           const ref = this.groupRefs['group-' + group.id]
           if (!ref) { return }
           const elem = ref.$el.parentElement
           if (!elem) { return }
           if (elem && getOffset(elem) <= top) {
-            this.activeGroup = group.id
+            this.activeGroup = headerId
           }
         })
         this.scrollHeader()
@@ -190,7 +194,12 @@ const EmojiPicker = {
     },
     highlight (index) {
       this.setShowStickers(false)
-      this.$refs['emoji-groups'].scrollToItem(index)
+      const item = this.filteredEmojiGroups[index]
+      if (!item) {
+        return
+      }
+      const indexInList = this.emojiItems.findIndex(k => k.id === item.id)
+      this.$refs['emoji-groups'].scrollToItem(indexInList)
     },
     updateScrolledClass (target) {
       if (target.scrollTop <= 5) {
@@ -245,7 +254,16 @@ const EmojiPicker = {
   },
   computed: {
     minItemSize () {
-      return 32
+      return this.emojiHeight
+    },
+    emojiHeight () {
+      return 32 + 4
+    },
+    emojiWidth () {
+      return 32 + 4
+    },
+    itemPerRow () {
+      return 6
     },
     activeGroupView () {
       return this.showingStickers ? '' : this.activeGroup
@@ -287,6 +305,17 @@ const EmojiPicker = {
         this.filteredEmojiGroups = this.getFilteredEmojiGroups()
       }, 500)
     },
+    emojiItems () {
+      return this.filteredEmojiGroups.map(group =>
+        chunk(group.emojis, this.itemPerRow)
+          .map((items, index) => ({
+            ...group,
+            id: index === 0 ? group.id : `row-${index}-${group.id}`,
+            emojis: items,
+            isFirstRow: index === 0
+          })))
+        .reduce((a, c) => a.concat(c), [])
+    },
     languages () {
       return ensureFinalFallback(this.$store.getters.mergedConfig.interfaceLanguage)
     },
diff --git a/src/components/emoji_picker/emoji_picker.vue b/src/components/emoji_picker/emoji_picker.vue
index 78da4808..5d8b0431 100644
--- a/src/components/emoji_picker/emoji_picker.vue
+++ b/src/components/emoji_picker/emoji_picker.vue
@@ -79,7 +79,7 @@
             class="emoji-groups"
             :class="groupsScrolledClass"
             :min-item-size="minItemSize"
-            :items="filteredEmojiGroups"
+            :items="emojiItems"
             :emit-update="true"
             @update="onScroll"
           >
@@ -95,6 +95,7 @@
                   class="emoji-group"
                 >
                   <h6
+                    v-if="group.isFirstRow"
                     class="emoji-group-title"
                   >
                     {{ group.text }}
-- 
cgit v1.2.3-70-g09d2


From 081a4161034ce6d748a11e260b7a9429c65aab9d Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Mon, 2 Jan 2023 13:42:09 -0500
Subject: Calculate display count from width

---
 src/components/emoji_picker/emoji_picker.js  | 18 +++++++++++++++---
 src/components/emoji_picker/emoji_picker.vue |  1 +
 2 files changed, 16 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/components/emoji_picker/emoji_picker.js b/src/components/emoji_picker/emoji_picker.js
index 39a514a7..ca2a3683 100644
--- a/src/components/emoji_picker/emoji_picker.js
+++ b/src/components/emoji_picker/emoji_picker.js
@@ -112,7 +112,8 @@ const EmojiPicker = {
       contentLoaded: false,
       groupRefs: {},
       emojiRefs: {},
-      filteredEmojiGroups: []
+      filteredEmojiGroups: [],
+      width: 0
     }
   },
   components: {
@@ -155,7 +156,6 @@ const EmojiPicker = {
       this.$emit('emoji', { insertion: value, keepOpen: this.keepOpen })
     },
     onScroll (startIndex, endIndex, visibleStartIndex, visibleEndIndex) {
-      console.log('onScroll', startIndex, endIndex, visibleStartIndex, visibleEndIndex)
       const target = this.$refs['emoji-groups'].$el
       this.scrolledGroup(target, visibleStartIndex, visibleEndIndex)
     },
@@ -221,6 +221,7 @@ const EmojiPicker = {
     },
     onShowing () {
       const oldContentLoaded = this.contentLoaded
+      this.recalculateItemPerRow()
       this.$nextTick(() => {
         this.$refs.search.focus()
       })
@@ -241,6 +242,14 @@ const EmojiPicker = {
           emojis: this.filterByKeyword(group.emojis, trim(this.keyword))
         }))
         .filter(group => group.emojis.length > 0)
+    },
+    recalculateItemPerRow () {
+      this.$nextTick(() => {
+        if (!this.$refs['emoji-groups']) {
+          return
+        }
+        this.width = this.$refs['emoji-groups'].$el.offsetWidth
+      })
     }
   },
   watch: {
@@ -252,6 +261,9 @@ const EmojiPicker = {
       this.filteredEmojiGroups = this.getFilteredEmojiGroups()
     }
   },
+  mounted () {
+    this.recalculateItemPerRow()
+  },
   computed: {
     minItemSize () {
       return this.emojiHeight
@@ -263,7 +275,7 @@ const EmojiPicker = {
       return 32 + 4
     },
     itemPerRow () {
-      return 6
+      return this.width ? Math.floor(this.width / this.emojiWidth - 1) : 6
     },
     activeGroupView () {
       return this.showingStickers ? '' : this.activeGroup
diff --git a/src/components/emoji_picker/emoji_picker.vue b/src/components/emoji_picker/emoji_picker.vue
index 5d8b0431..ae4683f5 100644
--- a/src/components/emoji_picker/emoji_picker.vue
+++ b/src/components/emoji_picker/emoji_picker.vue
@@ -82,6 +82,7 @@
             :items="emojiItems"
             :emit-update="true"
             @update="onScroll"
+            @visible="recalculateItemPerRow"
           >
             <template #default="{ item: group, index, active }">
               <DynamicScrollerItem
-- 
cgit v1.2.3-70-g09d2


From 47af5419b13688893a38c34fd55f4edf58dad6b2 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Mon, 2 Jan 2023 14:01:56 -0500
Subject: Clean up code

---
 src/components/emoji_picker/emoji_picker.js  | 11 ++---------
 src/components/emoji_picker/emoji_picker.vue |  4 ++--
 2 files changed, 4 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/components/emoji_picker/emoji_picker.js b/src/components/emoji_picker/emoji_picker.js
index ca2a3683..4a447905 100644
--- a/src/components/emoji_picker/emoji_picker.js
+++ b/src/components/emoji_picker/emoji_picker.js
@@ -192,13 +192,9 @@ const EmojiPicker = {
         setScroll(right + margin - headerCont.clientWidth)
       }
     },
-    highlight (index) {
+    highlight (groupId) {
       this.setShowStickers(false)
-      const item = this.filteredEmojiGroups[index]
-      if (!item) {
-        return
-      }
-      const indexInList = this.emojiItems.findIndex(k => k.id === item.id)
+      const indexInList = this.emojiItems.findIndex(k => k.id === groupId)
       this.$refs['emoji-groups'].scrollToItem(indexInList)
     },
     updateScrolledClass (target) {
@@ -261,9 +257,6 @@ const EmojiPicker = {
       this.filteredEmojiGroups = this.getFilteredEmojiGroups()
     }
   },
-  mounted () {
-    this.recalculateItemPerRow()
-  },
   computed: {
     minItemSize () {
       return this.emojiHeight
diff --git a/src/components/emoji_picker/emoji_picker.vue b/src/components/emoji_picker/emoji_picker.vue
index ae4683f5..453ecdfc 100644
--- a/src/components/emoji_picker/emoji_picker.vue
+++ b/src/components/emoji_picker/emoji_picker.vue
@@ -13,7 +13,7 @@
           class="emoji-tabs"
         >
           <span
-            v-for="(group, index) in filteredEmojiGroups"
+            v-for="group in filteredEmojiGroups"
             :ref="setGroupRef('group-header-' + group.id)"
             :key="group.id"
             class="emoji-tabs-item"
@@ -21,7 +21,7 @@
               active: activeGroupView === group.id
             }"
             :title="group.text"
-            @click.prevent="highlight(index)"
+            @click.prevent="highlight(group.id)"
           >
             <span
               v-if="group.image"
-- 
cgit v1.2.3-70-g09d2


From 76019d1e0349ecf170d660b8324145677b1e472c Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Fri, 6 Jan 2023 13:14:38 -0500
Subject: Fix emoji picker off-by-1 error

---
 src/components/emoji_picker/emoji_picker.js   | 2 +-
 src/components/emoji_picker/emoji_picker.scss | 2 +-
 src/components/emoji_picker/emoji_picker.vue  | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/components/emoji_picker/emoji_picker.js b/src/components/emoji_picker/emoji_picker.js
index 4a447905..0d7ca812 100644
--- a/src/components/emoji_picker/emoji_picker.js
+++ b/src/components/emoji_picker/emoji_picker.js
@@ -244,7 +244,7 @@ const EmojiPicker = {
         if (!this.$refs['emoji-groups']) {
           return
         }
-        this.width = this.$refs['emoji-groups'].$el.offsetWidth
+        this.width = this.$refs['emoji-groups'].$el.clientWidth
       })
     }
   },
diff --git a/src/components/emoji_picker/emoji_picker.scss b/src/components/emoji_picker/emoji_picker.scss
index dda12197..848d435a 100644
--- a/src/components/emoji_picker/emoji_picker.scss
+++ b/src/components/emoji_picker/emoji_picker.scss
@@ -7,7 +7,7 @@ $emoji-picker-emoji-size: 32px;
 
 .emoji-picker {
   width: 25em;
-  max-width: 100vw;
+  max-width: calc(100vw - 20px); // popover gives 10px margin from window edge
   display: flex;
   flex-direction: column;
   background-color: $fallback--bg;
diff --git a/src/components/emoji_picker/emoji_picker.vue b/src/components/emoji_picker/emoji_picker.vue
index 453ecdfc..ca90bf26 100644
--- a/src/components/emoji_picker/emoji_picker.vue
+++ b/src/components/emoji_picker/emoji_picker.vue
@@ -83,6 +83,7 @@
             :emit-update="true"
             @update="onScroll"
             @visible="recalculateItemPerRow"
+            @resize="recalculateItemPerRow"
           >
             <template #default="{ item: group, index, active }">
               <DynamicScrollerItem
-- 
cgit v1.2.3-70-g09d2


From 6d0b3d4d0a579b0669b93dc68c143d5755bf157a Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Fri, 6 Jan 2023 13:30:35 -0500
Subject: Stop propogation for all top-bar buttons

---
 src/components/desktop_nav/desktop_nav.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/components/desktop_nav/desktop_nav.vue b/src/components/desktop_nav/desktop_nav.vue
index 5db7fc79..07bf8005 100644
--- a/src/components/desktop_nav/desktop_nav.vue
+++ b/src/components/desktop_nav/desktop_nav.vue
@@ -38,7 +38,7 @@
         />
         <button
           class="button-unstyled nav-icon"
-          @click="openSettingsModal"
+          @click.stop="openSettingsModal"
         >
           <FAIcon
             fixed-width
@@ -65,7 +65,7 @@
         <button
           v-if="currentUser"
           class="button-unstyled nav-icon"
-          @click.prevent="logout"
+          @click.stop.prevent="logout"
         >
           <FAIcon
             fixed-width
-- 
cgit v1.2.3-70-g09d2


From 7dc22774532872fc99aa7768cf299ab623e9d155 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Mon, 9 Jan 2023 13:02:16 -0500
Subject: Use stylelint

---
 .stylelintrc.json                                  |   9 +-
 build/webpack.base.conf.js                         |   3 +-
 package.json                                       |   1 +
 src/App.scss                                       |  78 ++++++------
 src/_mixins.scss                                   |   5 +-
 src/_variables.scss                                |  14 ++-
 src/components/about/about.vue                     |   3 -
 src/components/account_actions/account_actions.vue |   3 +-
 src/components/announcement/announcement.vue       |   8 +-
 .../announcements_page/announcements_page.vue      |   3 +-
 .../async_component_error.vue                      |   5 +-
 src/components/attachment/attachment.scss          |  47 +++----
 src/components/autosuggest/autosuggest.vue         |   4 +-
 src/components/avatar_list/avatar_list.vue         |   2 +-
 src/components/basic_user_card/basic_user_card.vue |   2 +-
 src/components/block_card/block_card.vue           |   1 +
 src/components/chat/chat.scss                      |   4 +-
 src/components/chat/chat.vue                       |   4 +-
 src/components/chat_list/chat_list.vue             |   2 +-
 src/components/chat_list_item/chat_list_item.scss  |   9 +-
 src/components/chat_list_item/chat_list_item.vue   |   4 +-
 src/components/chat_message/chat_message.scss      |  94 +++++++-------
 src/components/chat_message/chat_message.vue       |   4 +-
 src/components/chat_new/chat_new.scss              |   2 +-
 src/components/chat_new/chat_new.vue               |   4 +-
 src/components/chat_title/chat_title.vue           |   2 +-
 src/components/checkbox/checkbox.vue               |  16 +--
 src/components/color_input/color_input.scss        |  19 +--
 src/components/contrast_ratio/contrast_ratio.vue   |   1 -
 src/components/conversation/conversation.vue       |  31 ++---
 src/components/desktop_nav/desktop_nav.scss        |  39 +++---
 src/components/dialog_modal/dialog_modal.vue       |  10 +-
 .../edit_status_modal/edit_status_modal.vue        |   1 +
 src/components/emoji_input/emoji_input.vue         |  24 ++--
 src/components/emoji_picker/emoji_picker.scss      |  35 +++---
 src/components/emoji_reactions/emoji_reactions.vue |   5 +-
 src/components/extra_buttons/extra_buttons.vue     |  13 +-
 src/components/favorite_button/favorite_button.vue |   4 +-
 src/components/flash/flash.vue                     |   5 +-
 src/components/follow_card/follow_card.vue         |   3 +-
 .../follow_request_card/follow_request_card.vue    |   4 +-
 src/components/font_control/font_control.vue       |   5 +-
 src/components/gallery/gallery.vue                 | 100 ++++++++-------
 .../global_notice_list/global_notice_list.vue      |   5 +-
 src/components/link-preview/link-preview.vue       |   5 +-
 src/components/list/list.vue                       |   2 +-
 src/components/lists_card/lists_card.vue           |  11 +-
 src/components/lists_edit/lists_edit.vue           |   2 +-
 .../lists_user_search/lists_user_search.vue        |   4 +-
 src/components/login_form/login_form.vue           |   7 +-
 src/components/media_modal/media_modal.vue         |  57 +++++----
 src/components/media_upload/media_upload.vue       |   2 +-
 src/components/mention_link/mention_link.scss      |   7 +-
 src/components/mentions_line/mentions_line.scss    |   2 +-
 src/components/mobile_nav/mobile_nav.vue           |   8 +-
 .../mobile_post_status_button.vue                  |   5 +-
 src/components/modal/modal.vue                     |   7 +-
 .../moderation_tools/moderation_tools.vue          |   7 +-
 .../mrf_transparency_panel.scss                    |  14 ++-
 .../mrf_transparency_panel.vue                     |   4 +-
 src/components/mute_card/mute_card.vue             |   1 +
 src/components/nav_panel/nav_panel.vue             |   7 +-
 src/components/navigation/navigation_entry.vue     |   4 +-
 src/components/navigation/navigation_pins.vue      |   3 +-
 src/components/notification/notification.scss      |  17 +--
 src/components/notifications/notifications.scss    |   9 +-
 src/components/panel_loading/panel_loading.vue     |   3 +-
 src/components/password_reset/password_reset.vue   |   2 +-
 src/components/poll/poll.vue                       |  12 +-
 src/components/poll/poll_form.vue                  |   3 +-
 src/components/popover/popover.vue                 |  37 +++---
 .../post_status_form/post_status_form.vue          |  67 +++++-----
 src/components/react_button/react_button.vue       |  24 ++--
 src/components/registration/registration.vue       |   6 +-
 .../remote_user_resolver/remote_user_resolver.vue  |   3 -
 src/components/reply_button/reply_button.vue       |   5 +-
 src/components/report/report.scss                  |   2 +-
 src/components/retweet_button/retweet_button.vue   |   4 +-
 src/components/rich_content/rich_content.scss      |   6 +-
 src/components/scope_selector/scope_selector.vue   |   3 +-
 src/components/search/search.vue                   |  14 +--
 src/components/search_bar/search_bar.vue           |   2 +-
 src/components/select/select.vue                   |   7 +-
 src/components/selectable_list/selectable_list.vue |   3 +-
 .../settings_modal/helpers/choice_setting.vue      |   5 -
 .../settings_modal/helpers/size_setting.vue        |   9 +-
 src/components/settings_modal/settings_modal.scss  |  51 ++++----
 .../settings_modal/settings_modal_content.scss     |   8 +-
 src/components/settings_modal/tabs/general_tab.vue |   1 +
 .../settings_modal/tabs/mutes_and_blocks_tab.scss  |  44 +++----
 .../settings_modal/tabs/profile_tab.scss           |   7 +-
 .../settings_modal/tabs/security_tab/mfa.vue       |  11 +-
 .../tabs/security_tab/mfa_backup_codes.vue         |   3 +-
 .../settings_modal/tabs/theme_tab/preview.vue      |  15 +--
 .../settings_modal/tabs/theme_tab/theme_tab.scss   | 120 ++++++++++--------
 src/components/shadow_control/shadow_control.vue   |  40 +++---
 src/components/shout_panel/shout_panel.vue         |   2 +-
 src/components/side_drawer/side_drawer.vue         |  18 +--
 src/components/staff_panel/staff_panel.vue         |   1 -
 src/components/status/status.scss                  |  10 +-
 src/components/status/status.vue                   |   2 +-
 src/components/status_body/status_body.scss        |  13 +-
 .../status_history_modal/status_history_modal.vue  |   1 +
 src/components/status_popover/status_popover.vue   |   3 +-
 src/components/sticker_picker/sticker_picker.vue   |   7 +-
 src/components/still-image/still-image.vue         |   6 +-
 src/components/tab_switcher/tab_switcher.scss      |  50 +++++---
 .../terms_of_service_panel.vue                     |   2 +-
 src/components/thread_tree/thread_tree.vue         |   4 +-
 src/components/timeline/timeline.scss              |   7 +-
 src/components/timeline_menu/timeline_menu.vue     | 139 +++++++++++----------
 .../update_notification/update_notification.scss   |  14 ++-
 src/components/user_avatar/user_avatar.vue         |   5 +-
 src/components/user_card/user_card.scss            | 114 +++++++++--------
 .../user_list_popover/user_list_popover.vue        |   2 +-
 src/components/user_note/user_note.vue             |   2 +-
 src/components/user_popover/user_popover.vue       |   4 +-
 src/components/user_profile/user_profile.vue       |   6 +-
 .../user_reporting_modal/user_reporting_modal.vue  |   4 +-
 src/components/who_to_follow/who_to_follow.vue     |   3 -
 .../who_to_follow_panel/who_to_follow_panel.vue    |  16 ++-
 src/hocs/with_load_more/with_load_more.scss        |   3 +-
 src/hocs/with_subscription/with_subscription.scss  |   2 +-
 src/panel.scss                                     |  16 +--
 yarn.lock                                          |  13 +-
 125 files changed, 969 insertions(+), 839 deletions(-)

(limited to 'src')

diff --git a/.stylelintrc.json b/.stylelintrc.json
index dc96d5e0..7517362c 100644
--- a/.stylelintrc.json
+++ b/.stylelintrc.json
@@ -10,12 +10,17 @@
     "declaration-no-important": true,
     "rscss/no-descendant-combinator": false,
     "rscss/class-format": [
-      true,
+      false,
       {
         "component": "pascal-case",
         "variant": "^-[a-z]\\w+",
         "element": "^[a-z]\\w+"
       }
-    ]
+    ],
+    "selector-class-pattern": null,
+    "import-notation": null,
+    "custom-property-pattern": null,
+    "keyframes-name-pattern": null,
+    "scss/operator-no-newline-after": null
   }
 }
diff --git a/build/webpack.base.conf.js b/build/webpack.base.conf.js
index bf946922..7e69352a 100644
--- a/build/webpack.base.conf.js
+++ b/build/webpack.base.conf.js
@@ -6,7 +6,7 @@ var ServiceWorkerWebpackPlugin = require('serviceworker-webpack5-plugin')
 var CopyPlugin = require('copy-webpack-plugin');
 var { VueLoaderPlugin } = require('vue-loader')
 var ESLintPlugin = require('eslint-webpack-plugin');
-
+var StylelintPlugin = require('stylelint-webpack-plugin');
 
 var env = process.env.NODE_ENV
 // check env & config/index.js to decide weither to enable CSS Sourcemaps for the
@@ -111,6 +111,7 @@ module.exports = {
       extensions: ['js', 'vue'],
       formatter: require('eslint-formatter-friendly')
     }),
+    new StylelintPlugin({}),
     new VueLoaderPlugin(),
     // This copies Ruffle's WASM to a directory so that JS side can access it
     new CopyPlugin({
diff --git a/package.json b/package.json
index 1949a16e..8658af93 100644
--- a/package.json
+++ b/package.json
@@ -120,6 +120,7 @@
     "stylelint-config-recommended-vue": "^1.4.0",
     "stylelint-config-standard": "29.0.0",
     "stylelint-rscss": "0.4.0",
+    "stylelint-webpack-plugin": "^3.3.0",
     "vue-loader": "17.0.1",
     "vue-style-loader": "4.1.3",
     "webpack": "5.75.0",
diff --git a/src/App.scss b/src/App.scss
index 75b2667c..0d2daa7d 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -1,5 +1,7 @@
 // stylelint-disable rscss/class-format
-@import './_variables.scss';
+/* stylelint-disable no-descending-specificity */
+@import "./variables";
+@import "./panel";
 
 :root {
   --navbar-height: 3.5rem;
@@ -123,7 +125,7 @@ h4 {
   font-weight: 1000;
 }
 
-i[class*=icon-],
+i[class*="icon-"],
 .svg-inline--fa,
 .iconLetter {
   color: $fallback--icon;
@@ -132,7 +134,7 @@ i[class*=icon-],
 
 .button-unstyled:hover,
 a:hover {
-  > i[class*=icon-],
+  > i[class*="icon-"],
   > .svg-inline--fa,
   > .iconLetter {
     color: var(--text);
@@ -141,12 +143,11 @@ a:hover {
 
 nav {
   z-index: var(--ZI_navbar);
-  color: var(--topBarText);
   background-color: $fallback--fg;
   background-color: var(--topBar, $fallback--fg);
   color: $fallback--faint;
   color: var(--faint, $fallback--faint);
-  box-shadow: 0 0 4px rgba(0, 0, 0, 0.6);
+  box-shadow: 0 0 4px rgb(0 0 0 / 60%);
   box-shadow: var(--topBarShadow);
   box-sizing: border-box;
   height: var(--navbar-height);
@@ -191,13 +192,11 @@ nav {
 }
 
 .underlay {
-  grid-column-start: 1;
-  grid-column-end: span 3;
-  grid-row-start: 1;
-  grid-row-end: 1;
+  grid-column: 1 / span 3;
+  grid-row: 1 / 1;
   pointer-events: none;
-  background-color: rgba(0, 0, 0, 0.15);
-  background-color: var(--underlay, rgba(0, 0, 0, 0.15));
+  background-color: rgb(0 0 0 / 15%);
+  background-color: var(--underlay, rgb(0 0 0 / 15%));
   z-index: -1000;
 }
 
@@ -215,8 +214,10 @@ nav {
   grid-template-columns:
     var(--effectiveSidebarColumnWidth)
     var(--effectiveContentColumnWidth);
+  /* stylelint-disable declaration-block-no-redundant-longhand-properties */
   grid-template-areas: "sidebar content";
   grid-template-rows: 1fr;
+  /* stylelint-enable declaration-block-no-redundant-longhand-properties */
   box-sizing: border-box;
   margin: 0 auto;
   align-content: flex-start;
@@ -231,8 +232,7 @@ nav {
     display: grid;
     grid-template-columns: 100%;
     box-sizing: border-box;
-    grid-row-start: 1;
-    grid-row-end: 1;
+    grid-row: 1 / 1;
     margin: 0 calc(var(--___columnMargin) / 2);
     padding: calc(var(--___columnMargin)) 0;
     row-gap: var(--___columnMargin);
@@ -307,7 +307,7 @@ nav {
     align-content: start;
   }
 
-  &.-reverse:not(.-wide):not(.-mobile) {
+  &.-reverse:not(.-wide, .-mobile) {
     grid-template-columns:
       var(--effectiveContentColumnWidth)
       var(--effectiveSidebarColumnWidth);
@@ -336,11 +336,8 @@ nav {
     padding: 0;
 
     .column {
-      margin-left: 0;
-      margin-right: 0;
       padding-top: 0;
-      margin-top: var(--navbar-height);
-      margin-bottom: 0;
+      margin-top: var(--navbar-height) 0 0 0;
     }
 
     .panel-heading,
@@ -389,7 +386,7 @@ nav {
     background: transparent;
   }
 
-  i[class*=icon-],
+  i[class*="icon-"],
   .svg-inline--fa {
     color: $fallback--text;
     color: var(--btnText, $fallback--text);
@@ -400,12 +397,15 @@ nav {
   }
 
   &:hover {
-    box-shadow: 0 0 4px rgba(255, 255, 255, 0.3);
+    box-shadow: 0 0 4px rgb(255 255 255 / 30%);
     box-shadow: var(--buttonHoverShadow);
   }
 
   &:active {
-    box-shadow: 0 0 4px 0 rgba(255, 255, 255, 0.3), 0 1px 0 0 rgba(0, 0, 0, 0.2) inset, 0 -1px 0 0 rgba(255, 255, 255, 0.2) inset;
+    box-shadow:
+      0 0 4px 0 rgb(255 255 255 / 30%),
+      0 1px 0 0 rgb(0 0 0 / 20%) inset,
+      0 -1px 0 0 rgb(255 255 255 / 20%) inset;
     box-shadow: var(--buttonPressedShadow);
     color: $fallback--text;
     color: var(--btnPressedText, $fallback--text);
@@ -438,7 +438,10 @@ nav {
     color: var(--btnToggledText, $fallback--text);
     background-color: $fallback--fg;
     background-color: var(--btnToggled, $fallback--fg);
-    box-shadow: 0 0 4px 0 rgba(255, 255, 255, 0.3), 0 1px 0 0 rgba(0, 0, 0, 0.2) inset, 0 -1px 0 0 rgba(255, 255, 255, 0.2) inset;
+    box-shadow:
+      0 0 4px 0 rgb(255 255 255 / 30%),
+      0 1px 0 0 rgb(0 0 0 / 20%) inset,
+      0 -1px 0 0 rgb(255 255 255 / 20%) inset;
     box-shadow: var(--buttonPressedShadow);
 
     svg,
@@ -503,7 +506,10 @@ textarea,
   border: none;
   border-radius: $fallback--inputRadius;
   border-radius: var(--inputRadius, $fallback--inputRadius);
-  box-shadow: 0 1px 0 0 rgba(0, 0, 0, 0.2) inset, 0 -1px 0 0 rgba(255, 255, 255, 0.2) inset, 0 0 2px 0 rgba(0, 0, 0, 1) inset;
+  box-shadow:
+    0 1px 0 0 rgb(0 0 0 / 20%) inset,
+    0 -1px 0 0 rgb(255 255 255 / 20%) inset,
+    0 0 2px 0 rgb(0 0 0 / 100%) inset;
   box-shadow: var(--inputShadow);
   background-color: $fallback--fg;
   background-color: var(--input, $fallback--fg);
@@ -521,13 +527,13 @@ textarea,
   padding: 0 var(--_padding);
 
   &:disabled,
-  &[disabled=disabled],
+  &[disabled="disabled"],
   &.disabled {
     cursor: not-allowed;
     opacity: 0.5;
   }
 
-  &[type=range] {
+  &[type="range"] {
     background: none;
     border: none;
     margin: 0;
@@ -535,7 +541,7 @@ textarea,
     flex: 1;
   }
 
-  &[type=radio] {
+  &[type="radio"] {
     display: none;
 
     &:checked + label::before {
@@ -555,7 +561,7 @@ textarea,
     + label::before {
       flex-shrink: 0;
       display: inline-block;
-      content: '';
+      content: "";
       transition: box-shadow 200ms;
       width: 1.1em;
       height: 1.1em;
@@ -575,7 +581,7 @@ textarea,
     }
   }
 
-  &[type=checkbox] {
+  &[type="checkbox"] {
     display: none;
 
     &:checked + label::before {
@@ -594,7 +600,7 @@ textarea,
     + label::before {
       flex-shrink: 0;
       display: inline-block;
-      content: '✓';
+      content: "✓";
       transition: color 200ms;
       width: 1.1em;
       height: 1.1em;
@@ -634,10 +640,10 @@ option {
 }
 
 .hide-number-spinner {
-  -moz-appearance: textfield;
+  appearance: textfield;
 
-  &[type=number]::-webkit-inner-spin-button,
-  &[type=number]::-webkit-outer-spin-button {
+  &[type="number"]::-webkit-inner-spin-button,
+  &[type="number"]::-webkit-outer-spin-button {
     opacity: 0;
     display: none;
   }
@@ -669,8 +675,6 @@ option {
   }
 }
 
-@import './panel.scss';
-
 .fa {
   color: grey;
 }
@@ -686,7 +690,7 @@ option {
   max-width: 10em;
   min-width: 1.7em;
   height: 1.3em;
-  padding: 0.15em 0.15em;
+  padding: 0.15em;
   vertical-align: middle;
   font-weight: normal;
   font-style: normal;
@@ -789,7 +793,8 @@ option {
 
 .fa-old-padding {
   &.iconLetter,
-  &.svg-inline--fa, &-layer {
+  &.svg-inline--fa,
+  &-layer {
     padding: 0 0.3em;
   }
 }
@@ -883,3 +888,4 @@ option {
 .fade-leave-active {
   opacity: 0;
 }
+/* stylelint-enable no-descending-specificity */
diff --git a/src/_mixins.scss b/src/_mixins.scss
index 1fed16c3..e99fe26f 100644
--- a/src/_mixins.scss
+++ b/src/_mixins.scss
@@ -1,13 +1,14 @@
 @mixin unfocused-style {
   @content;
 
-  &:focus:not(:focus-visible):not(:hover) {
+  &:focus:not(:focus-visible, :hover) {
     @content;
   }
 }
 
 @mixin focused-style {
-  &:hover, &:focus {
+  &:hover,
+  &:focus {
     @content;
   }
 
diff --git a/src/_variables.scss b/src/_variables.scss
index 099d3606..751fc9a4 100644
--- a/src/_variables.scss
+++ b/src/_variables.scss
@@ -4,20 +4,20 @@ $darkened-background: whitesmoke;
 
 $fallback--bg: #121a24;
 $fallback--fg: #182230;
-$fallback--faint: rgba(185, 185, 186, .5);
+$fallback--faint: rgb(185 185 186 / 50%);
 $fallback--text: #b9b9ba;
 $fallback--link: #d8a070;
 $fallback--icon: #666;
-$fallback--lightBg: rgb(21, 30, 42);
+$fallback--lightBg: rgb(21 30 42);
 $fallback--lightText: #b9b9ba;
 $fallback--border: #222;
-$fallback--cRed: #ff0000;
+$fallback--cRed: #f00;
 $fallback--cBlue: #0095ff;
 $fallback--cGreen: #0fa00f;
 $fallback--cOrange: orange;
 
-$fallback--alertError: rgba(211,16,20,.5);
-$fallback--alertWarning: rgba(111,111,20,.5);
+$fallback--alertError: rgb(211 16 20 / 50%);
+$fallback--alertWarning: rgb(111 111 20 / 50%);
 
 $fallback--panelRadius: 10px;
 $fallback--checkboxRadius: 2px;
@@ -29,6 +29,8 @@ $fallback--avatarAltRadius: 10px;
 $fallback--attachmentRadius: 10px;
 $fallback--chatMessageRadius: 10px;
 
-$fallback--buttonShadow: 0px 0px 2px 0px rgba(0, 0, 0, 1), 0px 1px 0px 0px rgba(255, 255, 255, 0.2) inset, 0px -1px 0px 0px rgba(0, 0, 0, 0.2) inset;
+$fallback--buttonShadow: 0 0 2px 0 rgb(0 0 0 / 100%),
+  0 1px 0 0 rgb(255 255 255 / 20%) inset,
+  0 -1px 0 0 rgb(0 0 0 / 20%) inset;
 
 $status-margin: 0.75em;
diff --git a/src/components/about/about.vue b/src/components/about/about.vue
index 33586c97..8a551485 100644
--- a/src/components/about/about.vue
+++ b/src/components/about/about.vue
@@ -9,6 +9,3 @@
 </template>
 
 <script src="./about.js"></script>
-
-<style lang="scss">
-</style>
diff --git a/src/components/account_actions/account_actions.vue b/src/components/account_actions/account_actions.vue
index 218aa6b3..973a5935 100644
--- a/src/components/account_actions/account_actions.vue
+++ b/src/components/account_actions/account_actions.vue
@@ -80,7 +80,8 @@
 <script src="./account_actions.js"></script>
 
 <style lang="scss">
-@import '../../_variables.scss';
+@import "../../variables";
+
 .AccountActions {
   .ellipsis-button {
     width: 2.5em;
diff --git a/src/components/announcement/announcement.vue b/src/components/announcement/announcement.vue
index c1b35981..a1c5791e 100644
--- a/src/components/announcement/announcement.vue
+++ b/src/components/announcement/announcement.vue
@@ -102,19 +102,19 @@
 @import "../../variables";
 
 .announcement {
-  border-bottom-width: 1px;
-  border-bottom-style: solid;
-  border-bottom-color: var(--border, $fallback--border);
+  border-bottom: 1px solid var(--border, $fallback--border);
   border-radius: 0;
   padding: var(--status-margin, $status-margin);
 
-  .heading, .body {
+  .heading,
+  .body {
     margin-bottom: var(--status-margin, $status-margin);
   }
 
   .footer {
     display: flex;
     flex-direction: column;
+
     .times {
       display: flex;
       flex-direction: column;
diff --git a/src/components/announcements_page/announcements_page.vue b/src/components/announcements_page/announcements_page.vue
index 59ed283d..78d3ecee 100644
--- a/src/components/announcements_page/announcements_page.vue
+++ b/src/components/announcements_page/announcements_page.vue
@@ -67,7 +67,8 @@
   .post-form {
     padding: var(--status-margin, $status-margin);
 
-    .heading, .body {
+    .heading,
+    .body {
       margin-bottom: var(--status-margin, $status-margin);
     }
 
diff --git a/src/components/async_component_error/async_component_error.vue b/src/components/async_component_error/async_component_error.vue
index 26ab5d21..2ff8974c 100644
--- a/src/components/async_component_error/async_component_error.vue
+++ b/src/components/async_component_error/async_component_error.vue
@@ -34,9 +34,10 @@ export default {
   height: 100%;
   align-items: center;
   justify-content: center;
+
   .btn {
-    margin: .5em;
-    padding: .5em 2em;
+    margin: 0.5em;
+    padding: 0.5em 2em;
   }
 }
 </style>
diff --git a/src/components/attachment/attachment.scss b/src/components/attachment/attachment.scss
index b2dea98d..cf38d45b 100644
--- a/src/components/attachment/attachment.scss
+++ b/src/components/attachment/attachment.scss
@@ -1,4 +1,4 @@
-@import '../../_variables.scss';
+@import "../../variables";
 
 .Attachment {
   display: inline-flex;
@@ -102,14 +102,13 @@
     padding-top: 0.5em;
   }
 
-
   .play-icon {
     position: absolute;
     font-size: 64px;
     top: calc(50% - 32px);
     left: calc(50% - 32px);
-    color: rgba(255, 255, 255, 0.75);
-    text-shadow: 0 0 2px rgba(0, 0, 0, 0.4);
+    color: rgb(255 255 255 / 75%);
+    text-shadow: 0 0 2px rgb(0 0 0 / 40%);
 
     &::before {
       margin: 0;
@@ -135,18 +134,32 @@
       margin-left: 0.5em;
       font-size: 1.25em;
       // TODO: theming? hard to theme with unknown background image color
-      background: rgba(230, 230, 230, 0.7);
+      background: rgb(230 230 230 / 70%);
 
       .svg-inline--fa {
-        color: rgba(0, 0, 0, 0.6);
+        color: rgb(0 0 0 / 60%);
       }
 
       &:hover .svg-inline--fa {
-        color: rgba(0, 0, 0, 0.9);
+        color: rgb(0 0 0 / 90%);
       }
     }
   }
 
+  &.-contain-fit {
+    img,
+    canvas {
+      object-fit: contain;
+    }
+  }
+
+  &.-cover-fit {
+    img,
+    canvas {
+      object-fit: cover;
+    }
+  }
+
   .oembed-container {
     line-height: 1.2em;
     flex: 1 0 100%;
@@ -160,8 +173,9 @@
 
     .image {
       flex: 1;
+
       img {
-        border: 0px;
+        border: 0;
         border-radius: 5px;
         height: 100%;
         object-fit: cover;
@@ -172,9 +186,10 @@
       flex: 2;
       margin: 8px;
       word-break: break-all;
+
       h1 {
         font-size: 1rem;
-        margin: 0px;
+        margin: 0;
       }
     }
   }
@@ -251,18 +266,4 @@
   &.-loading {
     cursor: progress;
   }
-
-  &.-contain-fit {
-    img,
-    canvas {
-      object-fit: contain;
-    }
-  }
-
-  &.-cover-fit {
-    img,
-    canvas {
-      object-fit: cover;
-    }
-  }
 }
diff --git a/src/components/autosuggest/autosuggest.vue b/src/components/autosuggest/autosuggest.vue
index f283ab82..7b7102fd 100644
--- a/src/components/autosuggest/autosuggest.vue
+++ b/src/components/autosuggest/autosuggest.vue
@@ -24,7 +24,7 @@
 <script src="./autosuggest.js"></script>
 
 <style lang="scss">
-@import '../../_variables.scss';
+@import "../../variables";
 
 .autosuggest {
   position: relative;
@@ -50,7 +50,7 @@
     border-radius: var(--inputRadius, $fallback--inputRadius);
     border-top-left-radius: 0;
     border-top-right-radius: 0;
-    box-shadow: 1px 1px 4px rgba(0, 0, 0, 0.6);
+    box-shadow: 1px 1px 4px rgb(0 0 0 / 60%);
     box-shadow: var(--panelShadow);
     overflow-y: auto;
     z-index: 1;
diff --git a/src/components/avatar_list/avatar_list.vue b/src/components/avatar_list/avatar_list.vue
index 9a6ca3f6..2d00cb7b 100644
--- a/src/components/avatar_list/avatar_list.vue
+++ b/src/components/avatar_list/avatar_list.vue
@@ -17,7 +17,7 @@
 <script src="./avatar_list.js"></script>
 
 <style lang="scss">
-@import '../../_variables.scss';
+@import "../../variables";
 
 .avatars {
   display: flex;
diff --git a/src/components/basic_user_card/basic_user_card.vue b/src/components/basic_user_card/basic_user_card.vue
index 418de926..705e20f5 100644
--- a/src/components/basic_user_card/basic_user_card.vue
+++ b/src/components/basic_user_card/basic_user_card.vue
@@ -49,7 +49,7 @@
   margin: 0;
   padding: 0.6em 1em;
 
-   --emoji-size: 14px;
+  --emoji-size: 14px;
 
   &-collapsed-content {
     margin-left: 0.7em;
diff --git a/src/components/block_card/block_card.vue b/src/components/block_card/block_card.vue
index 2fe66d4c..b14ef844 100644
--- a/src/components/block_card/block_card.vue
+++ b/src/components/block_card/block_card.vue
@@ -37,6 +37,7 @@
 .block-card-content-container {
   margin-top: 0.5em;
   text-align: right;
+
   button {
     width: 10em;
   }
diff --git a/src/components/chat/chat.scss b/src/components/chat/chat.scss
index f2e154ab..43e7a5e4 100644
--- a/src/components/chat/chat.scss
+++ b/src/components/chat/chat.scss
@@ -17,7 +17,7 @@
     width: 100%;
     overflow: visible;
     min-height: calc(100vh - var(--navbar-height));
-    margin: 0 0 0 0;
+    margin: 0;
     border-radius: 10px 10px 0 0;
     border-radius: var(--panelRadius, 10px) var(--panelRadius, 10px) 0 0;
 
@@ -66,7 +66,7 @@
     display: flex;
     justify-content: center;
     align-items: center;
-    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.3), 0 2px 4px rgba(0, 0, 0, 0.3);
+    box-shadow: 0 1px 1px rgb(0 0 0 / 30%), 0 2px 4px rgb(0 0 0 / 30%);
     z-index: 10;
     transition: 0.35s all;
     transition-timing-function: cubic-bezier(0, 1, 0.5, 1);
diff --git a/src/components/chat/chat.vue b/src/components/chat/chat.vue
index 2e7df7bd..b1e5468c 100644
--- a/src/components/chat/chat.vue
+++ b/src/components/chat/chat.vue
@@ -95,6 +95,6 @@
 
 <script src="./chat.js"></script>
 <style lang="scss">
-@import '../../_variables.scss';
-@import './chat.scss';
+@import "../../variables";
+@import "./chat";
 </style>
diff --git a/src/components/chat_list/chat_list.vue b/src/components/chat_list/chat_list.vue
index 1248c4c8..27a475ed 100644
--- a/src/components/chat_list/chat_list.vue
+++ b/src/components/chat_list/chat_list.vue
@@ -45,7 +45,7 @@
 <script src="./chat_list.js"></script>
 
 <style lang="scss">
-@import '../../_variables.scss';
+@import "../../variables";
 
 .chat-list {
   min-height: 25em;
diff --git a/src/components/chat_list_item/chat_list_item.scss b/src/components/chat_list_item/chat_list_item.scss
index c6b45c34..3a84672b 100644
--- a/src/components/chat_list_item/chat_list_item.scss
+++ b/src/components/chat_list_item/chat_list_item.scss
@@ -13,7 +13,7 @@
 
   &:hover {
     background-color: var(--selectedPost, $fallback--lightBg);
-    box-shadow: 0 0 3px 1px rgba(0, 0, 0, 0.1);
+    box-shadow: 0 0 3px 1px rgb(0 0 0 / 10%);
   }
 
   .chat-list-item-left {
@@ -67,6 +67,7 @@
     canvas {
       display: none;
     }
+
     img {
       visibility: visible;
     }
@@ -79,13 +80,11 @@
 
   .chat-preview-body {
     --emoji-size: 1.4em;
+
+    padding-right: 1em;
   }
 
   .time-wrapper {
     line-height: var(--post-line-height);
   }
-
-  .chat-preview-body {
-    padding-right: 1em;
-  }
 }
diff --git a/src/components/chat_list_item/chat_list_item.vue b/src/components/chat_list_item/chat_list_item.vue
index c7c0e878..69ad609b 100644
--- a/src/components/chat_list_item/chat_list_item.vue
+++ b/src/components/chat_list_item/chat_list_item.vue
@@ -48,6 +48,6 @@
 <script src="./chat_list_item.js"></script>
 
 <style lang="scss">
-@import '../../_variables.scss';
-@import './chat_list_item.scss';
+@import "../../variables";
+@import "./chat_list_item";
 </style>
diff --git a/src/components/chat_message/chat_message.scss b/src/components/chat_message/chat_message.scss
index 1913479f..fd5b7aa4 100644
--- a/src/components/chat_message/chat_message.scss
+++ b/src/components/chat_message/chat_message.scss
@@ -1,12 +1,12 @@
-@import '../../_variables.scss';
+@import "../../variables";
 
 .chat-message-wrapper {
-
   &.hovered-message-chain {
     .animated.Avatar {
       canvas {
         display: none;
       }
+
       img {
         visibility: visible;
       }
@@ -28,7 +28,8 @@
   .menu-icon {
     cursor: pointer;
 
-    &:hover, .extra-button-popover.open & {
+    &:hover,
+    .extra-button-popover.open & {
       color: $fallback--text;
       color: var(--text, $fallback--text);
     }
@@ -54,27 +55,11 @@
     width: 32px;
   }
 
-  .link-preview, .attachments {
+  .link-preview,
+  .attachments {
     margin-bottom: 1em;
   }
 
-  .chat-message-inner {
-    display: flex;
-    flex-direction: column;
-    align-items: flex-start;
-    max-width: 80%;
-    min-width: 10em;
-    width: 100%;
-
-    &.with-media {
-      width: 100%;
-
-      .status {
-        width: 100%;
-      }
-    }
-  }
-
   .status {
     border-radius: $fallback--chatMessageRadius;
     border-radius: var(--chatMessageRadius, $fallback--chatMessageRadius);
@@ -86,7 +71,7 @@
     position: relative;
     float: right;
     font-size: 0.8em;
-    margin: -1em 0 -0.5em 0;
+    margin: -1em 0 -0.5em;
     font-style: italic;
     opacity: 0.8;
   }
@@ -103,18 +88,54 @@
   }
 
   .pending {
-    .status-content.media-body, .created-at {
+    .status-content.media-body,
+    .created-at {
       color: var(--faint);
     }
   }
 
   .error {
-    .status-content.media-body, .created-at {
+    .status-content.media-body,
+    .created-at {
       color: $fallback--cRed;
       color: var(--badgeNotification, $fallback--cRed);
     }
   }
 
+  .chat-message-inner {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    max-width: 80%;
+    min-width: 10em;
+    width: 100%;
+  }
+
+  .outgoing {
+    display: flex;
+    flex-flow: row wrap;
+    align-content: end;
+    justify-content: flex-end;
+
+    a {
+      color: var(--chatMessageOutgoingLink, $fallback--link);
+    }
+
+    .status {
+      color: var(--chatMessageOutgoingText, $fallback--text);
+      background-color: var(--chatMessageOutgoingBg, $fallback--lightBg);
+      border: 1px solid var(--chatMessageOutgoingBorder, --lightBg);
+    }
+
+    .chat-message-inner {
+      align-items: flex-end;
+    }
+
+    .chat-message-menu {
+      right: 0.4rem;
+    }
+  }
+
   .incoming {
     a {
       color: var(--chatMessageIncomingLink, $fallback--link);
@@ -137,36 +158,17 @@
     }
   }
 
-  .outgoing {
-    display: flex;
-    flex-direction: row;
-    flex-wrap: wrap;
-    align-content: end;
-    justify-content: flex-end;
-
-    a {
-      color: var(--chatMessageOutgoingLink, $fallback--link);
-    }
+  .chat-message-inner.with-media {
+    width: 100%;
 
     .status {
-      color: var(--chatMessageOutgoingText, $fallback--text);
-      background-color: var(--chatMessageOutgoingBg, $fallback--lightBg);
-      border: 1px solid var(--chatMessageOutgoingBorder, --lightBg);
-    }
-
-    .chat-message-inner {
-      align-items: flex-end;
-    }
-
-    .chat-message-menu {
-      right: 0.4rem;
+      width: 100%;
     }
   }
 
   .visible {
     opacity: 1;
   }
-
 }
 
 .chat-message-date-separator {
diff --git a/src/components/chat_message/chat_message.vue b/src/components/chat_message/chat_message.vue
index d635c47e..381574c3 100644
--- a/src/components/chat_message/chat_message.vue
+++ b/src/components/chat_message/chat_message.vue
@@ -33,7 +33,7 @@
           <div
             class="media status"
             :class="{ 'without-attachment': !hasAttachment, 'pending': chatViewItem.data.pending, 'error': chatViewItem.data.error }"
-            style="position: relative"
+            style="position: relative;"
             @mouseenter="hovered = true"
             @mouseleave="hovered = false"
           >
@@ -98,6 +98,6 @@
 
 <script src="./chat_message.js"></script>
 <style lang="scss">
-@import './chat_message.scss';
+@import "./chat_message";
 
 </style>
diff --git a/src/components/chat_new/chat_new.scss b/src/components/chat_new/chat_new.scss
index 240e1a38..b145ecf9 100644
--- a/src/components/chat_new/chat_new.scss
+++ b/src/components/chat_new/chat_new.scss
@@ -1,7 +1,7 @@
 .chat-new {
   .input-wrap {
     display: flex;
-    margin: 0.7em 0.5em 0.7em 0.5em;
+    margin: 0.7em 0.5em;
 
     input {
       width: 100%;
diff --git a/src/components/chat_new/chat_new.vue b/src/components/chat_new/chat_new.vue
index bf09a379..52306c1d 100644
--- a/src/components/chat_new/chat_new.vue
+++ b/src/components/chat_new/chat_new.vue
@@ -46,6 +46,6 @@
 
 <script src="./chat_new.js"></script>
 <style lang="scss">
-@import '../../_variables.scss';
-@import './chat_new.scss';
+@import "../../variables";
+@import "./chat_new";
 </style>
diff --git a/src/components/chat_title/chat_title.vue b/src/components/chat_title/chat_title.vue
index ab7491fa..93db4fa7 100644
--- a/src/components/chat_title/chat_title.vue
+++ b/src/components/chat_title/chat_title.vue
@@ -26,7 +26,7 @@
 <script src="./chat_title.js"></script>
 
 <style lang="scss">
-@import '../../_variables.scss';
+@import "../../variables";
 
 .chat-title {
   display: flex;
diff --git a/src/components/checkbox/checkbox.vue b/src/components/checkbox/checkbox.vue
index b6768d67..7139d4fc 100644
--- a/src/components/checkbox/checkbox.vue
+++ b/src/components/checkbox/checkbox.vue
@@ -32,7 +32,7 @@ export default {
 </script>
 
 <style lang="scss">
-@import '../../_variables.scss';
+@import "../../variables";
 
 .checkbox {
   position: relative;
@@ -49,13 +49,13 @@ export default {
     right: 0;
     top: 0;
     display: block;
-    content: '✓';
+    content: "✓";
     transition: color 200ms;
     width: 1.1em;
     height: 1.1em;
     border-radius: $fallback--checkboxRadius;
     border-radius: var(--checkboxRadius, $fallback--checkboxRadius);
-    box-shadow: 0px 0px 2px black inset;
+    box-shadow: 0 0 2px black inset;
     box-shadow: var(--inputShadow);
     background-color: $fallback--fg;
     background-color: var(--input, $fallback--fg);
@@ -71,15 +71,16 @@ export default {
   &.disabled {
     .checkbox-indicator::before,
     .label {
-      opacity: .5;
+      opacity: 0.5;
     }
+
     .label {
       color: $fallback--faint;
       color: var(--faint, $fallback--faint);
     }
   }
 
-  input[type=checkbox] {
+  input[type="checkbox"] {
     display: none;
 
     &:checked + .checkbox-indicator::before {
@@ -88,15 +89,14 @@ export default {
     }
 
     &:indeterminate + .checkbox-indicator::before {
-      content: '–';
+      content: "–";
       color: $fallback--text;
       color: var(--inputText, $fallback--text);
     }
-
   }
 
   & > span {
-    margin-left: .5em;
+    margin-left: 0.5em;
   }
 }
 </style>
diff --git a/src/components/color_input/color_input.scss b/src/components/color_input/color_input.scss
index 3de31fde..ca46199a 100644
--- a/src/components/color_input/color_input.scss
+++ b/src/components/color_input/color_input.scss
@@ -1,4 +1,4 @@
-@import '../../_variables.scss';
+@import "../../variables";
 
 .color-input {
   display: inline-flex;
@@ -8,7 +8,7 @@
     flex: 0 0 0;
     max-width: 9em;
     align-items: stretch;
-    padding: .2em 8px;
+    padding: 0.2em 8px;
 
     input {
       background: none;
@@ -31,6 +31,7 @@
         min-height: 100%;
       }
     }
+
     .computedIndicator,
     .transparentIndicator {
       flex: 0 0 2em;
@@ -38,22 +39,27 @@
       align-self: stretch;
       min-height: 100%;
     }
+
     .transparentIndicator {
       // forgot to install counter-strike source, ooops
-      background-color: #FF00FF;
+      background-color: #f0f;
       position: relative;
-      &::before, &::after {
+
+      &::before,
+      &::after {
         display: block;
-        content: '';
-        background-color: #000000;
+        content: "";
+        background-color: #000;
         position: absolute;
         height: 50%;
         width: 50%;
       }
+
       &::after {
         top: 0;
         left: 0;
       }
+
       &::before {
         bottom: 0;
         right: 0;
@@ -64,5 +70,4 @@
   .label {
     flex: 1 1 auto;
   }
-
 }
diff --git a/src/components/contrast_ratio/contrast_ratio.vue b/src/components/contrast_ratio/contrast_ratio.vue
index 374cb9ba..bbd6fd4a 100644
--- a/src/components/contrast_ratio/contrast_ratio.vue
+++ b/src/components/contrast_ratio/contrast_ratio.vue
@@ -87,7 +87,6 @@ export default {
 .contrast-ratio {
   display: flex;
   justify-content: flex-end;
-
   margin-top: -4px;
   margin-bottom: 5px;
 
diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
index afa04db0..7577129e 100644
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@@ -210,17 +210,16 @@
 <script src="./conversation.js"></script>
 
 <style lang="scss">
-@import '../../_variables.scss';
+@import "../../variables";
 
 .Conversation {
   z-index: 1;
 
   .conversation-dive-to-top-level-box {
     padding: var(--status-margin, $status-margin);
-    border-bottom-width: 1px;
-    border-bottom-style: solid;
-    border-bottom-color: var(--border, $fallback--border);
+    border-bottom: 1px solid var(--border, $fallback--border);
     border-radius: 0;
+
     /* Make the button stretch along the whole row */
     display: flex;
     align-items: stretch;
@@ -235,52 +234,48 @@
   .thread-ancestor.-faded .StatusContent {
     --link: var(--faintLink);
     --text: var(--faint);
+
     color: var(--text);
   }
 
   .thread-ancestor-dive-box {
     padding-left: var(--status-margin, $status-margin);
-    border-bottom-width: 1px;
-    border-bottom-style: solid;
-    border-bottom-color: var(--border, $fallback--border);
+    border-bottom: 1px solid var(--border, $fallback--border);
     border-radius: 0;
+
     /* Make the button stretch along the whole row */
-    &, &-inner {
+    &,
+    &-inner {
       display: flex;
       align-items: stretch;
       flex-direction: column;
     }
   }
+
   .thread-ancestor-dive-box-inner {
     padding: var(--status-margin, $status-margin);
   }
 
   .conversation-status {
-    border-bottom-width: 1px;
-    border-bottom-style: solid;
-    border-bottom-color: var(--border, $fallback--border);
+    border-bottom: 1px solid var(--border, $fallback--border);
     border-radius: 0;
   }
 
   .thread-ancestor-has-other-replies .conversation-status,
+  &:last-child .conversation-status,
   .thread-ancestor:last-child .conversation-status,
   .thread-ancestor:last-child .thread-ancestor-dive-box,
-  &:last-child .conversation-status,
   &.-expanded .thread-tree .conversation-status {
     border-bottom: none;
   }
 
   .thread-ancestors + .thread-tree > .conversation-status {
-    border-top-width: 1px;
-    border-top-style: solid;
-    border-top-color: var(--border, $fallback--border);
+    border-top: 1px solid var(--border, $fallback--border);
   }
 
   /* expanded conversation in timeline */
   &.status-fadein.-expanded .thread-body {
-    border-left-width: 4px;
-    border-left-style: solid;
-    border-left-color: $fallback--cRed;
+    border-left: 4px solid $fallback--cRed;
     border-left-color: var(--cRed, $fallback--cRed);
     border-radius: 0 0 $fallback--panelRadius $fallback--panelRadius;
     border-radius: 0 0 var(--panelRadius, $fallback--panelRadius) var(--panelRadius, $fallback--panelRadius);
diff --git a/src/components/desktop_nav/desktop_nav.scss b/src/components/desktop_nav/desktop_nav.scss
index 1ec25385..00f434bf 100644
--- a/src/components/desktop_nav/desktop_nav.scss
+++ b/src/components/desktop_nav/desktop_nav.scss
@@ -1,4 +1,4 @@
-@import '../../_variables.scss';
+@import "../../variables";
 
 .DesktopNav {
   width: 100%;
@@ -14,9 +14,11 @@
 
   .inner-nav {
     display: grid;
+    /* stylelint-disable declaration-block-no-redundant-longhand-properties */
     grid-template-rows: var(--navbar-height);
     grid-template-columns: 2fr auto 2fr;
     grid-template-areas: "sitename logo actions";
+    /* stylelint-enable declaration-block-no-redundant-longhand-properties */
     box-sizing: border-box;
     padding: 0 1.2em;
     margin: auto;
@@ -27,20 +29,13 @@
     --miniColumn: 25rem;
     --maxiColumn: 45rem;
     --columnGap: 1em;
-    max-width: calc(
-      var(--sidebarColumnWidth, var(--miniColumn)) +
-      var(--contentColumnWidth, var(--maxiColumn)) +
-      var(--columnGap)
-    );
-  }
 
-  &.-column-stretch.-wide .inner-nav {
-    max-width: calc(
-      var(--sidebarColumnWidth, var(--miniColumn)) +
-      var(--contentColumnWidth, var(--maxiColumn)) +
-      var(--notifsColumnWidth, var(--miniColumn)) +
-      var(--columnGap)
-    );
+    max-width:
+      calc(
+        var(--sidebarColumnWidth, var(--miniColumn)) +
+        var(--contentColumnWidth, var(--maxiColumn)) +
+        var(--columnGap)
+      );
   }
 
   &.-logoLeft .inner-nav {
@@ -48,8 +43,19 @@
     grid-template-areas: "logo sitename actions";
   }
 
+  &.-column-stretch.-wide .inner-nav {
+    max-width:
+      calc(
+        var(--sidebarColumnWidth, var(--miniColumn)) +
+        var(--contentColumnWidth, var(--maxiColumn)) +
+        var(--notifsColumnWidth, var(--miniColumn)) +
+        var(--columnGap)
+      );
+  }
+
   .button-default {
-    &, svg {
+    &,
+    svg {
       color: $fallback--text;
       color: var(--btnTopBarText, $fallback--text);
     }
@@ -70,7 +76,7 @@
       color: $fallback--text;
       color: var(--btnToggledTopBarText, $fallback--text);
       background-color: $fallback--fg;
-      background-color: var(--btnToggledTopBar, $fallback--fg)
+      background-color: var(--btnToggledTopBar, $fallback--fg);
     }
   }
 
@@ -82,6 +88,7 @@
     transition-duration: 100ms;
 
     @media all and (min-width: 800px) {
+      /* stylelint-disable-next-line declaration-no-important */
       opacity: 1 !important;
     }
 
diff --git a/src/components/dialog_modal/dialog_modal.vue b/src/components/dialog_modal/dialog_modal.vue
index 06b270c3..24d65142 100644
--- a/src/components/dialog_modal/dialog_modal.vue
+++ b/src/components/dialog_modal/dialog_modal.vue
@@ -25,7 +25,7 @@
 <script src="./dialog_modal.js"></script>
 
 <style lang="scss">
-@import '../../_variables.scss';
+@import "../../variables";
 
 // TODO: unify with other modals.
 .dark-overlay {
@@ -38,7 +38,7 @@
     position: fixed;
     right: 0;
     top: 0;
-    background: rgba(27,31,35,.5);
+    background: rgb(27 31 35 / 50%);
     z-index: 99;
   }
 }
@@ -65,7 +65,7 @@
 
   .dialog-modal-content {
     margin: 0;
-    padding: 1rem 1rem;
+    padding: 1rem;
     background-color: $fallback--bg;
     background-color: var(--bg, $fallback--bg);
     white-space: normal;
@@ -73,7 +73,7 @@
 
   .dialog-modal-footer {
     margin: 0;
-    padding: .5em .5em;
+    padding: 0.5em;
     background-color: $fallback--bg;
     background-color: var(--bg, $fallback--bg);
     border-top: 1px solid $fallback--border;
@@ -83,7 +83,7 @@
 
     button {
       width: auto;
-      margin-left: .5rem;
+      margin-left: 0.5rem;
     }
   }
 }
diff --git a/src/components/edit_status_modal/edit_status_modal.vue b/src/components/edit_status_modal/edit_status_modal.vue
index 1dbacaab..db62972d 100644
--- a/src/components/edit_status_modal/edit_status_modal.vue
+++ b/src/components/edit_status_modal/edit_status_modal.vue
@@ -26,6 +26,7 @@
 .modal-view.edit-form-modal-view {
   align-items: flex-start;
 }
+
 .edit-form-modal-panel {
   flex-shrink: 0;
   margin-top: 25%;
diff --git a/src/components/emoji_input/emoji_input.vue b/src/components/emoji_input/emoji_input.vue
index c9bbc18f..ccba0393 100644
--- a/src/components/emoji_input/emoji_input.vue
+++ b/src/components/emoji_input/emoji_input.vue
@@ -91,22 +91,18 @@
 <script src="./emoji_input.js"></script>
 
 <style lang="scss">
-@import '../../_variables.scss';
+@import "../../variables";
 
 .emoji-input {
   display: flex;
   flex-direction: column;
   position: relative;
 
-  &.with-picker input {
-    padding-right: 30px;
-  }
-
   .emoji-picker-icon {
     position: absolute;
     top: 0;
     right: 0;
-    margin: .2em .25em;
+    margin: 0.2em 0.25em;
     font-size: 1.3em;
     cursor: pointer;
     line-height: 24px;
@@ -123,14 +119,19 @@
     margin-top: 2px;
 
     &.hide {
-      display: none
+      display: none;
     }
   }
 
-  input, textarea {
+  input,
+  textarea {
     flex: 1 0 auto;
   }
 
+  &.with-picker input {
+    padding-right: 30px;
+  }
+
   .hidden-overlay {
     opacity: 0;
     pointer-events: none;
@@ -140,8 +141,10 @@
     right: 0;
     left: 0;
     overflow: hidden;
+
     /* DEBUG STUFF */
     color: red;
+
     /* set opacity to non-zero to see the overlay */
 
     .caret {
@@ -151,6 +154,7 @@
     }
   }
 }
+
 .autocomplete {
   &-panel {
     position: absolute;
@@ -160,7 +164,7 @@
     display: flex;
     cursor: pointer;
     padding: 0.2em 0.4em;
-    border-bottom: 1px solid rgba(0, 0, 0, 0.4);
+    border-bottom: 1px solid rgb(0 0 0 / 40%);
     height: 32px;
 
     .image {
@@ -169,7 +173,6 @@
       line-height: 32px;
       text-align: center;
       font-size: 32px;
-
       margin-right: 4px;
 
       img {
@@ -199,6 +202,7 @@
       background-color: $fallback--fg;
       background-color: var(--selectedMenuPopover, $fallback--fg);
       color: var(--selectedMenuPopoverText, $fallback--text);
+
       --faint: var(--selectedMenuPopoverFaintText, $fallback--faint);
       --faintLink: var(--selectedMenuPopoverFaintLink, $fallback--faint);
       --lightText: var(--selectedMenuPopoverLightText, $fallback--lightText);
diff --git a/src/components/emoji_picker/emoji_picker.scss b/src/components/emoji_picker/emoji_picker.scss
index dda12197..0ec261a4 100644
--- a/src/components/emoji_picker/emoji_picker.scss
+++ b/src/components/emoji_picker/emoji_picker.scss
@@ -1,4 +1,4 @@
-@import '../../_variables.scss';
+@import "../../variables";
 
 $emoji-picker-header-height: 36px;
 $emoji-picker-header-picture-width: 32px;
@@ -14,7 +14,7 @@ $emoji-picker-emoji-size: 32px;
   background-color: var(--popover, $fallback--bg);
   color: $fallback--link;
   color: var(--popoverText, $fallback--link);
-  --lightText: var(--popoverLightText, $fallback--faint);
+
   --faint: var(--popoverFaintText, $fallback--faint);
   --faintLink: var(--popoverFaintLink, $fallback--faint);
   --lightText: var(--popoverLightText, $fallback--lightText);
@@ -28,6 +28,7 @@ $emoji-picker-emoji-size: 32px;
     max-width: $emoji-picker-header-picture-width;
     height: $emoji-picker-header-picture-height;
     max-height: $emoji-picker-header-picture-height;
+
     .still-image {
       max-width: 100%;
       max-height: 100%;
@@ -62,25 +63,18 @@ $emoji-picker-emoji-size: 32px;
     display: flex;
     flex-direction: column;
     flex: 1 1 auto;
-    min-height: 0px;
+    min-height: 0;
   }
 
   .emoji-tabs {
     flex-grow: 1;
     display: flex;
-    flex-direction: row;
-    flex-wrap: nowrap;
+    flex-flow: row nowrap;
     overflow-x: auto;
   }
 
-  .emoji-groups {
-    height: 100%;
-    min-height: 200px;
-  }
-
   .additional-tabs {
     display: flex;
-    flex: 1;
     border-left: 1px solid;
     border-left-color: $fallback--icon;
     border-left-color: var(--icon, $fallback--icon);
@@ -122,7 +116,7 @@ $emoji-picker-emoji-size: 32px;
   }
 
   .sticker-picker {
-    flex: 1 1 auto
+    flex: 1 1 auto;
   }
 
   .stickers,
@@ -152,22 +146,27 @@ $emoji-picker-emoji-size: 32px;
     }
 
     &-groups {
+      height: 100%;
+      min-height: 200px;
       flex: 1 1 1px;
       position: relative;
       overflow: auto;
       user-select: none;
-      mask: linear-gradient(to top, white 0, transparent 100%) bottom no-repeat,
-            linear-gradient(to bottom, white 0, transparent 100%) top no-repeat,
-            linear-gradient(to top, white, white);
+      mask:
+        linear-gradient(to top, white 0, transparent 100%) bottom no-repeat,
+        linear-gradient(to bottom, white 0, transparent 100%) top no-repeat,
+        linear-gradient(to top, white, white);
       transition: mask-size 150ms;
       mask-size: 100% 20px, 100% 20px, auto;
       // Autoprefixed seem to ignore this one, and also syntax is different
-      -webkit-mask-composite: xor;
+      mask-composite: xor;
       mask-composite: exclude;
+
       &.scrolled {
         &-top {
           mask-size: 100% 20px, 100% 0, auto;
         }
+
         &-bottom {
           mask-size: 100% 0, 100% 20px, auto;
         }
@@ -201,7 +200,6 @@ $emoji-picker-emoji-size: 32px;
       align-items: center;
       justify-content: center;
       margin: 4px;
-
       cursor: pointer;
 
       .emoji-picker-emoji.-custom {
@@ -209,12 +207,11 @@ $emoji-picker-emoji-size: 32px;
         max-width: 100%;
         max-height: 100%;
       }
+
       .emoji-picker-emoji.-unicode {
         font-size: 24px;
         overflow: hidden;
       }
     }
-
   }
-
 }
diff --git a/src/components/emoji_reactions/emoji_reactions.vue b/src/components/emoji_reactions/emoji_reactions.vue
index 4eb22a65..a63daa97 100644
--- a/src/components/emoji_reactions/emoji_reactions.vue
+++ b/src/components/emoji_reactions/emoji_reactions.vue
@@ -28,7 +28,7 @@
 
 <script src="./emoji_reactions.js"></script>
 <style lang="scss">
-@import '../../_variables.scss';
+@import "../../variables";
 
 .EmojiReactions {
   display: flex;
@@ -55,6 +55,7 @@
 
     &.not-clickable {
       cursor: default;
+
       &:hover {
         box-shadow: $fallback--buttonShadow;
         box-shadow: var(--buttonShadow);
@@ -75,10 +76,10 @@
     display: flex;
     align-items: center;
     justify-content: center;
+
     &:hover {
       text-decoration: underline;
     }
   }
-
 }
 </style>
diff --git a/src/components/extra_buttons/extra_buttons.vue b/src/components/extra_buttons/extra_buttons.vue
index b2fad1c9..a84d47f6 100644
--- a/src/components/extra_buttons/extra_buttons.vue
+++ b/src/components/extra_buttons/extra_buttons.vue
@@ -172,15 +172,10 @@
 <script src="./extra_buttons.js"></script>
 
 <style lang="scss">
-@import '../../_variables.scss';
-@import '../../_mixins.scss';
+@import "../../variables";
+@import "../../mixins";
 
 .ExtraButtons {
-  /* override of popover internal stuff */
-  .popover-trigger-button {
-    width: auto;
-  }
-
   .popover-trigger {
     position: static;
     padding: 10px;
@@ -190,10 +185,12 @@
       color: $fallback--text;
       color: var(--text, $fallback--text);
     }
-
   }
 
   .popover-trigger-button {
+    /* override of popover internal stuff */
+    width: auto;
+
     @include unfocused-style {
       .focus-marker {
         visibility: hidden;
diff --git a/src/components/favorite_button/favorite_button.vue b/src/components/favorite_button/favorite_button.vue
index ea01720a..58d14945 100644
--- a/src/components/favorite_button/favorite_button.vue
+++ b/src/components/favorite_button/favorite_button.vue
@@ -58,8 +58,8 @@
 <script src="./favorite_button.js"></script>
 
 <style lang="scss">
-@import '../../_variables.scss';
-@import '../../_mixins.scss';
+@import "../../variables";
+@import "../../mixins";
 
 .FavoriteButton {
   display: flex;
diff --git a/src/components/flash/flash.vue b/src/components/flash/flash.vue
index 95f71950..9f58d314 100644
--- a/src/components/flash/flash.vue
+++ b/src/components/flash/flash.vue
@@ -42,7 +42,8 @@
 <script src="./flash.js"></script>
 
 <style lang="scss">
-@import '../../_variables.scss';
+@import "../../variables";
+
 .Flash {
   display: inline-block;
   width: 100%;
@@ -78,7 +79,7 @@
 
   .hidden {
     display: none;
-    visibility: 'hidden';
+    visibility: "hidden";
   }
 }
 </style>
diff --git a/src/components/follow_card/follow_card.vue b/src/components/follow_card/follow_card.vue
index c919b11a..eff69fb2 100644
--- a/src/components/follow_card/follow_card.vue
+++ b/src/components/follow_card/follow_card.vue
@@ -39,9 +39,8 @@
   &-content-container {
     flex-shrink: 0;
     display: flex;
-    flex-direction: row;
+    flex-flow: row wrap;
     justify-content: space-between;
-    flex-wrap: wrap;
     line-height: 1.5em;
   }
 
diff --git a/src/components/follow_request_card/follow_request_card.vue b/src/components/follow_request_card/follow_request_card.vue
index 1b12ba4b..eb222cc7 100644
--- a/src/components/follow_request_card/follow_request_card.vue
+++ b/src/components/follow_request_card/follow_request_card.vue
@@ -22,8 +22,8 @@
 <style lang="scss">
 .follow-request-card-content-container {
   display: flex;
-  flex-direction: row;
-  flex-wrap: wrap;
+  flex-flow: row wrap;
+
   button {
     margin-top: 0.5em;
     margin-right: 0.5em;
diff --git a/src/components/font_control/font_control.vue b/src/components/font_control/font_control.vue
index 83c1cef7..bb7e64bc 100644
--- a/src/components/font_control/font_control.vue
+++ b/src/components/font_control/font_control.vue
@@ -50,17 +50,20 @@
 <script src="./font_control.js"></script>
 
 <style lang="scss">
-@import '../../_variables.scss';
+@import "../../variables";
+
 .font-control {
   input.custom-font {
     min-width: 10em;
   }
+
   &.custom {
     /* TODO Should make proper joiners... */
     .font-switcher {
       border-top-right-radius: 0;
       border-bottom-right-radius: 0;
     }
+
     .custom-font {
       border-top-left-radius: 0;
       border-bottom-left-radius: 0;
diff --git a/src/components/gallery/gallery.vue b/src/components/gallery/gallery.vue
index ccf6e3e2..744b8198 100644
--- a/src/components/gallery/gallery.vue
+++ b/src/components/gallery/gallery.vue
@@ -86,7 +86,7 @@
 <script src='./gallery.js'></script>
 
 <style lang="scss">
-@import '../../_variables.scss';
+@import "../../variables";
 
 .Gallery {
   .gallery-rows {
@@ -100,6 +100,53 @@
     width: 100%;
     flex-grow: 1;
 
+    .gallery-row-inner {
+      position: absolute;
+      top: 0;
+      left: 0;
+      right: 0;
+      bottom: 0;
+      display: flex;
+      flex-flow: row wrap;
+      align-content: stretch;
+
+      .gallery-item {
+        margin: 0 0.5em 0 0;
+        flex-grow: 1;
+        height: 100%;
+        box-sizing: border-box;
+        // to make failed images a bit more noticeable on chromium
+        min-width: 2em;
+
+        &:last-child {
+          margin: 0;
+        }
+      }
+
+      &.-grid {
+        width: 100%;
+        height: auto;
+        position: relative;
+        display: grid;
+        grid-gap: 0.5em;
+        grid-template-columns: repeat(auto-fill, minmax(15em, 1fr));
+
+        .gallery-item {
+          margin: 0;
+          height: 200px;
+        }
+      }
+    }
+
+    &.-grid,
+    &.-minimal {
+      height: auto;
+
+      .gallery-row-inner {
+        position: relative;
+      }
+    }
+
     &:not(:first-child) {
       margin-top: 0.5em;
     }
@@ -114,7 +161,7 @@
         linear-gradient(to top, white, white);
 
       /* Autoprefixed seem to ignore this one, and also syntax is different */
-      -webkit-mask-composite: xor;
+      mask-composite: xor;
       mask-composite: exclude;
     }
   }
@@ -138,54 +185,5 @@
       padding: 0 2em;
     }
   }
-
-  .gallery-row {
-    &.-grid,
-    &.-minimal {
-      height: auto;
-      .gallery-row-inner {
-        position: relative;
-      }
-    }
-  }
-
-  .gallery-row-inner {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    display: flex;
-    flex-direction: row;
-    flex-wrap: nowrap;
-    align-content: stretch;
-
-    &.-grid {
-      width: 100%;
-      height: auto;
-      position: relative;
-      display: grid;
-      grid-column-gap: 0.5em;
-      grid-row-gap: 0.5em;
-      grid-template-columns: repeat(auto-fill, minmax(15em, 1fr));
-
-      .gallery-item {
-        margin: 0;
-        height: 200px;
-      }
-    }
-  }
-
-  .gallery-item {
-    margin: 0 0.5em 0 0;
-    flex-grow: 1;
-    height: 100%;
-    box-sizing: border-box;
-    // to make failed images a bit more noticeable on chromium
-    min-width: 2em;
-    &:last-child {
-      margin: 0;
-    }
-  }
 }
 </style>
diff --git a/src/components/global_notice_list/global_notice_list.vue b/src/components/global_notice_list/global_notice_list.vue
index d828b819..0e58476f 100644
--- a/src/components/global_notice_list/global_notice_list.vue
+++ b/src/components/global_notice_list/global_notice_list.vue
@@ -25,7 +25,7 @@
 <script src="./global_notice_list.js"></script>
 
 <style lang="scss">
-@import '../../_variables.scss';
+@import "../../variables";
 
 .global-notice-list {
   position: fixed;
@@ -73,6 +73,7 @@
   .global-success {
     background-color: var(--alertPopupSuccess, $fallback--cGreen);
     color: var(--alertPopupSuccessText, $fallback--text);
+
     .svg-inline--fa {
       color: var(--alertPopupSuccessText, $fallback--text);
     }
@@ -81,6 +82,7 @@
   .global-info {
     background-color: var(--alertPopupNeutral, $fallback--fg);
     color: var(--alertPopupNeutralText, $fallback--text);
+
     .svg-inline--fa {
       color: var(--alertPopupNeutralText, $fallback--text);
     }
@@ -88,6 +90,7 @@
 
   .close-notice {
     padding-right: 0.2em;
+
     .svg-inline--fa:hover {
       opacity: 0.6;
     }
diff --git a/src/components/link-preview/link-preview.vue b/src/components/link-preview/link-preview.vue
index 220527f2..09f341ac 100644
--- a/src/components/link-preview/link-preview.vue
+++ b/src/components/link-preview/link-preview.vue
@@ -33,7 +33,7 @@
 <script src="./link-preview.js"></script>
 
 <style lang="scss">
-@import '../../_variables.scss';
+@import "../../variables";
 
 .link-preview-card {
   display: flex;
@@ -46,6 +46,7 @@
     flex-shrink: 0;
     width: 120px;
     max-width: 25%;
+
     img {
       width: 100%;
       height: 100%;
@@ -67,7 +68,7 @@
   }
 
   .card-description {
-    margin: 0.5em 0 0 0;
+    margin: 0.5em 0 0;
     overflow: hidden;
     text-overflow: ellipsis;
     word-break: break-word;
diff --git a/src/components/list/list.vue b/src/components/list/list.vue
index a6223cce..f17766b4 100644
--- a/src/components/list/list.vue
+++ b/src/components/list/list.vue
@@ -35,7 +35,7 @@ export default {
 </script>
 
 <style lang="scss">
-@import '../../_variables.scss';
+@import "../../variables";
 
 .list {
   &-item:not(:last-child) {
diff --git a/src/components/lists_card/lists_card.vue b/src/components/lists_card/lists_card.vue
index 13866d8c..925da3a5 100644
--- a/src/components/lists_card/lists_card.vue
+++ b/src/components/lists_card/lists_card.vue
@@ -21,12 +21,16 @@
 <script src="./lists_card.js"></script>
 
 <style lang="scss">
-@import '../../_variables.scss';
+@import "../../variables";
 
 .list-card {
   display: flex;
 }
 
+.list-name {
+  flex-grow: 1;
+}
+
 .list-name,
 .button-list-edit {
   margin: 0;
@@ -39,13 +43,10 @@
     background-color: var(--selectedMenu, $fallback--lightBg);
     color: $fallback--link;
     color: var(--selectedMenuText, $fallback--link);
+
     --faint: var(--selectedMenuFaintText, $fallback--faint);
     --faintLink: var(--selectedMenuFaintLink, $fallback--faint);
     --lightText: var(--selectedMenuLightText, $fallback--lightText);
   }
 }
-
-.list-name {
-  flex-grow: 1;
-}
 </style>
diff --git a/src/components/lists_edit/lists_edit.vue b/src/components/lists_edit/lists_edit.vue
index 6521aba6..eec0f978 100644
--- a/src/components/lists_edit/lists_edit.vue
+++ b/src/components/lists_edit/lists_edit.vue
@@ -164,7 +164,7 @@
 <script src="./lists_edit.js"></script>
 
 <style lang="scss">
-@import '../../_variables.scss';
+@import "../../variables";
 
 .ListEdit {
   --panel-body-padding: 0.5em;
diff --git a/src/components/lists_user_search/lists_user_search.vue b/src/components/lists_user_search/lists_user_search.vue
index 8633170c..6ca107e6 100644
--- a/src/components/lists_user_search/lists_user_search.vue
+++ b/src/components/lists_user_search/lists_user_search.vue
@@ -27,12 +27,12 @@
 
 <script src="./lists_user_search.js"></script>
 <style lang="scss">
-@import '../../_variables.scss';
+@import "../../variables";
 
 .ListsUserSearch {
   .input-wrap {
     display: flex;
-    margin: 0.7em 0.5em 0.7em 0.5em;
+    margin: 0.7em 0.5em;
 
     input {
       width: 100%;
diff --git a/src/components/login_form/login_form.vue b/src/components/login_form/login_form.vue
index 7a430c51..829e88ad 100644
--- a/src/components/login_form/login_form.vue
+++ b/src/components/login_form/login_form.vue
@@ -93,7 +93,7 @@
 <script src="./login_form.js"></script>
 
 <style lang="scss">
-@import '../../_variables.scss';
+@import "../../variables";
 
 .login-form {
   display: flex;
@@ -110,7 +110,7 @@
   }
 
   .login-bottom {
-    margin-top: 1.0em;
+    margin-top: 1em;
     display: flex;
     flex-direction: row;
     align-items: center;
@@ -121,7 +121,7 @@
     display: flex;
     flex-direction: column;
     padding: 0.3em 0.5em 0.6em;
-    line-height:24px;
+    line-height: 24px;
   }
 
   .form-bottom {
@@ -142,7 +142,6 @@
 
   .error {
     text-align: center;
-
     animation-name: shakeError;
     animation-duration: 0.4s;
     animation-timing-function: ease-in-out;
diff --git a/src/components/media_modal/media_modal.vue b/src/components/media_modal/media_modal.vue
index d59055b3..6464b99f 100644
--- a/src/components/media_modal/media_modal.vue
+++ b/src/components/media_modal/media_modal.vue
@@ -120,32 +120,12 @@ $modal-view-button-icon-half-height: calc(#{$modal-view-button-icon-height} / 2)
 $modal-view-button-icon-width: 3em;
 $modal-view-button-icon-margin: 0.5em;
 
-.modal-view.media-modal-view {
-  z-index: var(--ZI_media_modal);
-  flex-direction: column;
-
-  .modal-view-button-arrow,
-  .modal-view-button-hide {
-    opacity: 0.75;
-
-    &:focus,
-    &:hover {
-      outline: none;
-      box-shadow: none;
-    }
-
-    &:hover {
-      opacity: 1;
-    }
-  }
-  overflow: hidden;
-}
-
 .media-modal-view {
   @keyframes media-fadein {
     from {
       opacity: 0;
     }
+
     to {
       opacity: 1;
     }
@@ -226,7 +206,7 @@ $modal-view-button-icon-margin: 0.5em;
     appearance: none;
     overflow: visible;
     cursor: pointer;
-    transition: opacity 333ms cubic-bezier(.4,0,.22,1);
+    transition: opacity 333ms cubic-bezier(0.4, 0, 0.22, 1);
     height: $modal-view-button-icon-height;
     width: $modal-view-button-icon-width;
 
@@ -236,9 +216,9 @@ $modal-view-button-icon-margin: 0.5em;
       width: $modal-view-button-icon-width;
       font-size: 1rem;
       line-height: $modal-view-button-icon-height;
-      color: #FFF;
+      color: #fff;
       text-align: center;
-      background-color: rgba(0,0,0,.3);
+      background-color: rgb(0 0 0 / 30%);
     }
   }
 
@@ -254,13 +234,14 @@ $modal-view-button-icon-margin: 0.5em;
       position: absolute;
       top: 0;
       line-height: $modal-view-button-icon-height;
-      color: #FFF;
+      color: #fff;
       text-align: center;
-      background-color: rgba(0,0,0,.3);
+      background-color: rgb(0 0 0 / 30%);
     }
 
     &--prev {
       left: 0;
+
       .arrow-icon {
         left: $modal-view-button-icon-margin;
       }
@@ -268,6 +249,7 @@ $modal-view-button-icon-margin: 0.5em;
 
     &--next {
       right: 0;
+
       .arrow-icon {
         right: $modal-view-button-icon-margin;
       }
@@ -278,10 +260,33 @@ $modal-view-button-icon-margin: 0.5em;
     position: absolute;
     top: 0;
     right: 0;
+
     .button-icon {
       top: $modal-view-button-icon-margin;
       right: $modal-view-button-icon-margin;
     }
   }
 }
+
+.modal-view.media-modal-view {
+  z-index: var(--ZI_media_modal);
+  flex-direction: column;
+
+  .modal-view-button-arrow,
+  .modal-view-button-hide {
+    opacity: 0.75;
+
+    &:focus,
+    &:hover {
+      outline: none;
+      box-shadow: none;
+    }
+
+    &:hover {
+      opacity: 1;
+    }
+  }
+
+  overflow: hidden;
+}
 </style>
diff --git a/src/components/media_upload/media_upload.vue b/src/components/media_upload/media_upload.vue
index a538a5ed..2799495b 100644
--- a/src/components/media_upload/media_upload.vue
+++ b/src/components/media_upload/media_upload.vue
@@ -29,7 +29,7 @@
 <script src="./media_upload.js"></script>
 
 <style lang="scss">
-@import '../../_variables.scss';
+@import "../../variables";
 
 .media-upload {
   cursor: pointer; // We use <label> for interactivity... i wonder if it's fine
diff --git a/src/components/mention_link/mention_link.scss b/src/components/mention_link/mention_link.scss
index 8b2af926..69e9fed1 100644
--- a/src/components/mention_link/mention_link.scss
+++ b/src/components/mention_link/mention_link.scss
@@ -1,4 +1,4 @@
-@import '../../_variables.scss';
+@import "../../variables";
 
 .MentionLink {
   position: relative;
@@ -59,6 +59,7 @@
         font-weight: 600;
       }
     }
+
     &.-has-selection {
       color: var(--alertNeutralText, $fallback--text);
       background-color: var(--alertNeutral, $fallback--fg);
@@ -100,10 +101,6 @@
     }
   }
 
-  .full {
-    pointer-events: none;
-  }
-
   .serverName.-faded {
     color: var(--faintLink, $fallback--link);
   }
diff --git a/src/components/mentions_line/mentions_line.scss b/src/components/mentions_line/mentions_line.scss
index 9a622e75..b7dfbfb8 100644
--- a/src/components/mentions_line/mentions_line.scss
+++ b/src/components/mentions_line/mentions_line.scss
@@ -2,7 +2,7 @@
   word-break: break-all;
 
   .mention-link:not(:first-child)::before {
-    content: ' ';
+    content: " ";
   }
 
   .showMoreLess {
diff --git a/src/components/mobile_nav/mobile_nav.vue b/src/components/mobile_nav/mobile_nav.vue
index 0f1fe621..d6fe102c 100644
--- a/src/components/mobile_nav/mobile_nav.vue
+++ b/src/components/mobile_nav/mobile_nav.vue
@@ -94,7 +94,7 @@
 <script src="./mobile_nav.js"></script>
 
 <style lang="scss">
-@import '../../_variables.scss';
+@import "../../variables";
 
 .MobileNav {
   z-index: var(--ZI_navbar);
@@ -127,7 +127,7 @@
   }
 
   .site-name {
-    padding: 0 .3em;
+    padding: 0 0.3em;
     display: inline-block;
   }
 
@@ -156,7 +156,7 @@
     position: fixed;
     top: 0;
     left: 0;
-    box-shadow: 1px 1px 4px rgba(0,0,0,.6);
+    box-shadow: 1px 1px 4px rgb(0 0 0 / 60%);
     box-shadow: var(--panelShadow);
     transition-property: transform;
     transition-duration: 0.25s;
@@ -182,7 +182,7 @@
     color: var(--topBarText);
     background-color: $fallback--fg;
     background-color: var(--topBar, $fallback--fg);
-    box-shadow: 0px 0px 4px rgba(0,0,0,.6);
+    box-shadow: 0 0 4px rgb(0 0 0 / 60%);
     box-shadow: var(--topBarShadow);
 
     .spacer {
diff --git a/src/components/mobile_post_status_button/mobile_post_status_button.vue b/src/components/mobile_post_status_button/mobile_post_status_button.vue
index 28a2c440..ef0f51fe 100644
--- a/src/components/mobile_post_status_button/mobile_post_status_button.vue
+++ b/src/components/mobile_post_status_button/mobile_post_status_button.vue
@@ -13,7 +13,7 @@
 <script src="./mobile_post_status_button.js"></script>
 
 <style lang="scss">
-@import '../../_variables.scss';
+@import "../../variables";
 
 .MobilePostButton {
   &.button-default {
@@ -30,9 +30,8 @@
     display: flex;
     justify-content: center;
     align-items: center;
-    box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3), 0px 4px 6px rgba(0, 0, 0, 0.3);
+    box-shadow: 0 2px 2px rgb(0 0 0 / 30%), 0 4px 6px rgb(0 0 0 / 30%);
     z-index: 10;
-
     transition: 0.35s transform;
     transition-timing-function: cubic-bezier(0, 1, 0.5, 1);
   }
diff --git a/src/components/modal/modal.vue b/src/components/modal/modal.vue
index 2187f392..9f767ede 100644
--- a/src/components/modal/modal.vue
+++ b/src/components/modal/modal.vue
@@ -59,7 +59,7 @@ export default {
 
   &.modal-background {
     pointer-events: initial;
-    background-color: rgba(0, 0, 0, 0.5);
+    background-color: rgb(0 0 0 / 50%);
   }
 
   &.open {
@@ -69,10 +69,11 @@ export default {
 
 @keyframes modal-background-fadein {
   from {
-    background-color: rgba(0, 0, 0, 0);
+    background-color: rgb(0 0 0 / 0%);
   }
+
   to {
-    background-color: rgba(0, 0, 0, 0.5);
+    background-color: rgb(0 0 0 / 50%);
   }
 }
 </style>
diff --git a/src/components/moderation_tools/moderation_tools.vue b/src/components/moderation_tools/moderation_tools.vue
index 8535ef27..b708cdc8 100644
--- a/src/components/moderation_tools/moderation_tools.vue
+++ b/src/components/moderation_tools/moderation_tools.vue
@@ -166,18 +166,21 @@
 <script src="./moderation_tools.js"></script>
 
 <style lang="scss">
-@import '../../_variables.scss';
+@import "../../variables";
 
 .moderation-tools-popover {
   height: 100%;
+
   .trigger {
+    /* stylelint-disable-next-line declaration-no-important */
     display: flex !important;
     height: 100%;
   }
 }
 
 .moderation-tools-button {
-  svg,i {
+  svg,
+  i {
     font-size: 0.8em;
   }
 }
diff --git a/src/components/mrf_transparency_panel/mrf_transparency_panel.scss b/src/components/mrf_transparency_panel/mrf_transparency_panel.scss
index 80ea01d4..a262ed1c 100644
--- a/src/components/mrf_transparency_panel/mrf_transparency_panel.scss
+++ b/src/components/mrf_transparency_panel/mrf_transparency_panel.scss
@@ -2,19 +2,21 @@
   margin: 1em;
 
   table {
-    width:100%;
+    width: 100%;
     text-align: left;
-    padding-left:10px;
-    padding-bottom:20px;
+    padding-left: 10px;
+    padding-bottom: 20px;
 
-    th, td {
+    th,
+    td {
       width: 180px;
       max-width: 360px;
-      overflow:  hidden;
+      overflow: hidden;
       vertical-align: text-top;
     }
 
-    th+th, td+td {
+    th + th,
+    td + td {
       width: auto;
     }
   }
diff --git a/src/components/mrf_transparency_panel/mrf_transparency_panel.vue b/src/components/mrf_transparency_panel/mrf_transparency_panel.vue
index 1787fa07..97af4787 100644
--- a/src/components/mrf_transparency_panel/mrf_transparency_panel.vue
+++ b/src/components/mrf_transparency_panel/mrf_transparency_panel.vue
@@ -227,6 +227,6 @@
 <script src="./mrf_transparency_panel.js"></script>
 
 <style lang="scss">
-@import '../../_variables.scss';
-@import './mrf_transparency_panel.scss';
+@import "../../variables";
+@import "./mrf_transparency_panel";
 </style>
diff --git a/src/components/mute_card/mute_card.vue b/src/components/mute_card/mute_card.vue
index ca33c6c5..97e91cbc 100644
--- a/src/components/mute_card/mute_card.vue
+++ b/src/components/mute_card/mute_card.vue
@@ -37,6 +37,7 @@
 .mute-card-content-container {
   margin-top: 0.5em;
   text-align: right;
+
   button {
     width: 10em;
   }
diff --git a/src/components/nav_panel/nav_panel.vue b/src/components/nav_panel/nav_panel.vue
index d628c380..1a826cc4 100644
--- a/src/components/nav_panel/nav_panel.vue
+++ b/src/components/nav_panel/nav_panel.vue
@@ -102,7 +102,7 @@
 <script src="./nav_panel.js"></script>
 
 <style lang="scss">
-@import '../../_variables.scss';
+@import "../../variables";
 
 .NavPanel {
   .panel {
@@ -169,8 +169,9 @@
   }
 
   .nav-panel-heading {
-   // breaks without a unit
-   --panel-heading-height-padding: 0em;
+    // breaks without a unit
+    // stylelint-disable-next-line length-zero-no-unit
+    --panel-heading-height-padding: 0px;
   }
 }
 </style>
diff --git a/src/components/navigation/navigation_entry.vue b/src/components/navigation/navigation_entry.vue
index f4d53836..411ca536 100644
--- a/src/components/navigation/navigation_entry.vue
+++ b/src/components/navigation/navigation_entry.vue
@@ -63,7 +63,7 @@
 <script src="./navigation_entry.js"></script>
 
 <style lang="scss">
-@import '../../_variables.scss';
+@import "../../variables";
 
 .NavigationEntry {
   display: flex;
@@ -102,6 +102,7 @@
     background-color: var(--selectedMenu, $fallback--lightBg);
     color: $fallback--link;
     color: var(--selectedMenuText, $fallback--link);
+
     --faint: var(--selectedMenuFaintText, $fallback--faint);
     --faintLink: var(--selectedMenuFaintLink, $fallback--faint);
     --lightText: var(--selectedMenuLightText, $fallback--lightText);
@@ -117,6 +118,7 @@
     background-color: var(--selectedMenu, $fallback--lightBg);
     color: $fallback--text;
     color: var(--selectedMenuText, $fallback--text);
+
     --faint: var(--selectedMenuFaintText, $fallback--faint);
     --faintLink: var(--selectedMenuFaintLink, $fallback--faint);
     --lightText: var(--selectedMenuLightText, $fallback--lightText);
diff --git a/src/components/navigation/navigation_pins.vue b/src/components/navigation/navigation_pins.vue
index 6a9ed6f5..4fbb4f95 100644
--- a/src/components/navigation/navigation_pins.vue
+++ b/src/components/navigation/navigation_pins.vue
@@ -27,7 +27,8 @@
 <script src="./navigation_pins.js"></script>
 
 <style lang="scss">
-@import '../../_variables.scss';
+@import "../../variables";
+
 .NavigationPins {
   display: flex;
   flex-wrap: wrap;
diff --git a/src/components/notification/notification.scss b/src/components/notification/notification.scss
index 38978137..654aca3c 100644
--- a/src/components/notification/notification.scss
+++ b/src/components/notification/notification.scss
@@ -1,13 +1,14 @@
-@import '../../_variables.scss';
+@import "../../variables";
 
 // TODO Copypaste from Status, should unify it somehow
 .Notification {
-   border-bottom: 1px solid;
-   border-color: $fallback--border;
-   border-color: var(--border, $fallback--border);
-   word-wrap: break-word;
-   word-break: break-word;
-   --emoji-size: 14px;
+  border-bottom: 1px solid;
+  border-color: $fallback--border;
+  border-color: var(--border, $fallback--border);
+  word-wrap: break-word;
+  word-break: break-word;
+
+  --emoji-size: 14px;
 
   &:hover {
     --_still-image-img-visibility: visible;
@@ -54,7 +55,7 @@
       margin-left: 0.2em;
 
       &::before {
-        content: ' ';
+        content: " ";
       }
     }
 
diff --git a/src/components/notifications/notifications.scss b/src/components/notifications/notifications.scss
index 9b241565..41cfcef0 100644
--- a/src/components/notifications/notifications.scss
+++ b/src/components/notifications/notifications.scss
@@ -1,4 +1,4 @@
-@import '../../_variables.scss';
+@import "../../variables";
 
 .Notifications {
   &:not(.minimal) {
@@ -25,12 +25,13 @@
 
     &.unseen {
       .notification-overlay {
-        background-image: linear-gradient(135deg, var(--badgeNotification, $fallback--cRed) 4px, transparent 10px)
+        background-image: linear-gradient(135deg, var(--badgeNotification, $fallback--cRed) 4px, transparent 10px);
       }
     }
   }
 }
 
+/* stylelint-disable-next-line no-descending-specificity */
 .notification {
   box-sizing: border-box;
 
@@ -38,6 +39,7 @@
     canvas {
       display: none;
     }
+
     img {
       visibility: visible;
     }
@@ -79,7 +81,8 @@
     }
   }
 
-  .follow-text, .move-text {
+  .follow-text,
+  .move-text {
     padding: 0.5em 0;
     overflow-wrap: break-word;
     display: flex;
diff --git a/src/components/panel_loading/panel_loading.vue b/src/components/panel_loading/panel_loading.vue
index d916d8a6..17458e49 100644
--- a/src/components/panel_loading/panel_loading.vue
+++ b/src/components/panel_loading/panel_loading.vue
@@ -23,7 +23,7 @@ export default {}
 </script>
 
 <style lang="scss">
-@import 'src/_variables.scss';
+@import "src/variables";
 
 .panel-loading {
   display: flex;
@@ -33,6 +33,7 @@ export default {}
   font-size: 2em;
   color: $fallback--text;
   color: var(--text, $fallback--text);
+
   .loading-text svg {
     line-height: 0;
     vertical-align: middle;
diff --git a/src/components/password_reset/password_reset.vue b/src/components/password_reset/password_reset.vue
index 90673f44..d6e10250 100644
--- a/src/components/password_reset/password_reset.vue
+++ b/src/components/password_reset/password_reset.vue
@@ -77,7 +77,7 @@
 
 <script src="./password_reset.js"></script>
 <style lang="scss">
-@import '../../_variables.scss';
+@import "../../variables";
 
 .password-reset-form {
   display: flex;
diff --git a/src/components/poll/poll.vue b/src/components/poll/poll.vue
index f6b12a54..cacc3298 100644
--- a/src/components/poll/poll.vue
+++ b/src/components/poll/poll.vue
@@ -90,7 +90,7 @@
 <script src="./poll.js"></script>
 
 <style lang="scss">
-@import '../../_variables.scss';
+@import "../../variables";
 
 .poll {
   .votes {
@@ -98,9 +98,11 @@
     flex-direction: column;
     margin: 0 0 0.5em;
   }
+
   .poll-option {
     margin: 0.75em 0.5em;
   }
+
   .option-result {
     height: 100%;
     display: flex;
@@ -109,6 +111,7 @@
     color: $fallback--lightText;
     color: var(--lightText, $fallback--lightText);
   }
+
   .option-result-label {
     display: flex;
     align-items: center;
@@ -116,10 +119,12 @@
     z-index: 1;
     word-break: break-word;
   }
+
   .result-percentage {
     width: 3.5em;
     flex-shrink: 0;
   }
+
   .result-fill {
     height: 100%;
     position: absolute;
@@ -133,20 +138,25 @@
     left: 0;
     transition: width 0.5s;
   }
+
   .option-vote {
     display: flex;
     align-items: center;
   }
+
   input {
     width: 3.5em;
   }
+
   .footer {
     display: flex;
     align-items: center;
   }
+
   &.loading * {
     cursor: progress;
   }
+
   .poll-vote-button {
     padding: 0 0.5em;
     margin-right: 0.5em;
diff --git a/src/components/poll/poll_form.vue b/src/components/poll/poll_form.vue
index 146754db..09d411ca 100644
--- a/src/components/poll/poll_form.vue
+++ b/src/components/poll/poll_form.vue
@@ -95,7 +95,7 @@
 <script src="./poll_form.js"></script>
 
 <style lang="scss">
-@import '../../_variables.scss';
+@import "../../variables";
 
 .poll-form {
   display: flex;
@@ -117,6 +117,7 @@
 
   .input-container {
     width: 100%;
+
     input {
       // Hack: dodge the floating X icon
       padding-right: 2.5em;
diff --git a/src/components/popover/popover.vue b/src/components/popover/popover.vue
index 2869d736..fd0fd821 100644
--- a/src/components/popover/popover.vue
+++ b/src/components/popover/popover.vue
@@ -41,7 +41,7 @@
 <script src="./popover.js" />
 
 <style lang="scss">
-@import '../../_variables.scss';
+@import "../../variables";
 
 .popover-trigger-button {
   display: inline-block;
@@ -52,31 +52,31 @@
   position: fixed;
   min-width: 0;
   max-width: calc(100vw - 20px);
-  box-shadow: 2px 2px 3px rgba(0, 0, 0, 0.5);
+  box-shadow: 2px 2px 3px rgb(0 0 0 / 50%);
   box-shadow: var(--popupShadow);
 }
 
 .popover-default {
-  &:after {
-    content: '';
+  &::after {
+    content: "";
     position: absolute;
     top: 0;
     bottom: 0;
     left: 0;
     right: 0;
     z-index: 3;
-    box-shadow: 1px 1px 4px rgba(0, 0, 0, 0.6);
+    box-shadow: 1px 1px 4px rgb(0 0 0 / 60%);
     box-shadow: var(--panelShadow);
     pointer-events: none;
   }
 
   border-radius: $fallback--btnRadius;
   border-radius: var(--btnRadius, $fallback--btnRadius);
-
   background-color: $fallback--bg;
   background-color: var(--popover, $fallback--bg);
   color: $fallback--text;
   color: var(--popoverText, $fallback--text);
+
   --faint: var(--popoverFaintText, $fallback--faint);
   --faintLink: var(--popoverFaintLink, $fallback--faint);
   --lightText: var(--popoverLightText, $fallback--lightText);
@@ -87,7 +87,7 @@
 
 .dropdown-menu {
   display: block;
-  padding: .5rem 0;
+  padding: 0.5rem 0;
   font-size: 1em;
   text-align: left;
   list-style: none;
@@ -97,7 +97,7 @@
 
   .dropdown-divider {
     height: 0;
-    margin: .5rem 0;
+    margin: 0.5rem 0;
     overflow: hidden;
     border-top: 1px solid $fallback--border;
     border-top: 1px solid var(--border, $fallback--border);
@@ -113,7 +113,7 @@
     text-align: inherit;
     white-space: nowrap;
     border: none;
-    border-radius: 0px;
+    border-radius: 0;
     background-color: transparent;
     box-shadow: none;
     width: 100%;
@@ -126,7 +126,7 @@
       svg {
         width: 22px;
         margin-right: 0.75rem;
-        color: var(--menuPopoverIcon, $fallback--icon)
+        color: var(--menuPopoverIcon, $fallback--icon);
       }
     }
 
@@ -137,17 +137,21 @@
       }
     }
 
-    &:active, &:hover {
+    &:active,
+    &:hover {
       background-color: $fallback--lightBg;
       background-color: var(--selectedMenuPopover, $fallback--lightBg);
       box-shadow: none;
+
       --btnText: var(--selectedMenuPopoverText, $fallback--link);
       --faint: var(--selectedMenuPopoverFaintText, $fallback--faint);
       --faintLink: var(--selectedMenuPopoverFaintLink, $fallback--faint);
       --lightText: var(--selectedMenuPopoverLightText, $fallback--lightText);
       --icon: var(--selectedMenuPopoverIcon, $fallback--icon);
+
       svg {
         color: var(--selectedMenuPopoverIcon, $fallback--icon);
+
         --icon: var(--selectedMenuPopoverIcon, $fallback--icon);
       }
     }
@@ -161,16 +165,16 @@
       max-height: 22px;
       line-height: 22px;
       text-align: center;
-      border-radius: 0px;
+      border-radius: 0;
       background-color: $fallback--fg;
       background-color: var(--input, $fallback--fg);
-      box-shadow: 0px 0px 2px black inset;
+      box-shadow: 0 0 2px black inset;
       box-shadow: var(--inputShadow);
       margin-right: 0.75em;
 
       &.menu-checkbox-checked::after {
         font-size: 1.25em;
-        content: '✓';
+        content: "✓";
       }
 
       &.-radio {
@@ -178,16 +182,15 @@
 
         &.menu-checkbox-checked::after {
           font-size: 2em;
-          content: '•';
+          content: "•";
         }
       }
     }
-
   }
 
   .button-default.dropdown-item {
     &,
-    i[class*=icon-] {
+    i[class*="icon-"] {
       color: $fallback--text;
       color: var(--btnText, $fallback--text);
     }
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index f65058f4..c51639db 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -331,7 +331,7 @@
 <script src="./post_status_form.js"></script>
 
 <style lang="scss">
-@import '../../_variables.scss';
+@import "../../variables";
 
 .post-status-form {
   position: relative;
@@ -378,7 +378,9 @@
     &:hover {
       text-decoration: underline;
     }
-    svg, i {
+
+    svg,
+    i {
       margin-left: 0.2em;
       font-size: 0.8em;
       transform: rotate(90deg);
@@ -428,7 +430,25 @@
     }
   }
 
-  .media-upload-icon, .poll-icon, .emoji-icon {
+  // Order is not necessary but a good indicator
+  .media-upload-icon {
+    order: 1;
+    justify-content: left;
+  }
+
+  .emoji-icon {
+    order: 2;
+    justify-content: center;
+  }
+
+  .poll-icon {
+    order: 3;
+    justify-content: right;
+  }
+
+  .media-upload-icon,
+  .poll-icon,
+  .emoji-icon {
     font-size: 1.85em;
     line-height: 1.1;
     flex: 1;
@@ -436,16 +456,20 @@
     display: flex;
     align-items: center;
 
-    &.selected, &:hover {
+    &.selected,
+    &:hover {
       // needs to be specific to override icon default color
-      svg, i, label {
+      svg,
+      i,
+      label {
         color: $fallback--lightText;
         color: var(--lightText, $fallback--lightText);
       }
     }
 
     &.disabled {
-      svg, i {
+      svg,
+      i {
         cursor: not-allowed;
         color: $fallback--icon;
         color: var(--btnDisabledText, $fallback--icon);
@@ -458,32 +482,17 @@
     }
   }
 
-  // Order is not necessary but a good indicator
-  .media-upload-icon {
-    order: 1;
-    justify-content: left;
-  }
-
-  .emoji-icon {
-    order: 2;
-    justify-content: center;
-  }
-
-  .poll-icon {
-    order: 3;
-    justify-content: right;
-  }
-
   .error {
     text-align: center;
   }
 
   .media-upload-wrapper {
-    margin-right: .2em;
-    margin-bottom: .5em;
+    margin-right: 0.2em;
+    margin-bottom: 0.5em;
     width: 18em;
 
-    img, video {
+    img,
+    video {
       object-fit: contain;
       max-height: 10em;
     }
@@ -557,18 +566,14 @@
     }
   }
 
-  .btn[disabled] {
-    cursor: not-allowed;
-  }
-
   @keyframes fade-in {
     from { opacity: 0; }
-    to   { opacity: 0.6; }
+    to { opacity: 0.6; }
   }
 
   @keyframes fade-out {
     from { opacity: 0.6; }
-    to   { opacity: 0; }
+    to { opacity: 0; }
   }
 
   .drop-indicator {
diff --git a/src/components/react_button/react_button.vue b/src/components/react_button/react_button.vue
index 0c5fe321..a813b6fd 100644
--- a/src/components/react_button/react_button.vue
+++ b/src/components/react_button/react_button.vue
@@ -73,8 +73,8 @@
 <script src="./react_button.js"></script>
 
 <style lang="scss">
-@import '../../_variables.scss';
-@import '../../_mixins.scss';
+@import "../../variables";
+@import "../../mixins";
 
 .ReactButton {
   .reaction-picker-filter {
@@ -104,20 +104,19 @@
     text-align: center;
     align-content: flex-start;
     user-select: none;
-
-    mask: linear-gradient(to top, white 0, transparent 100%) bottom no-repeat,
-          linear-gradient(to bottom, white 0, transparent 100%) top no-repeat,
-          linear-gradient(to top, white, white);
+    mask:
+      linear-gradient(to top, white 0, transparent 100%) bottom no-repeat,
+      linear-gradient(to bottom, white 0, transparent 100%) top no-repeat,
+      linear-gradient(to top, white, white);
     transition: mask-size 150ms;
     mask-size: 100% 20px, 100% 20px, auto;
 
     /* Autoprefixed seem to ignore this one, and also syntax is different */
-    -webkit-mask-composite: xor;
+    mask-composite: xor;
     mask-composite: exclude;
 
     .emoji-button {
       cursor: pointer;
-
       flex-basis: 20%;
       line-height: 1.5;
       align-content: center;
@@ -128,11 +127,6 @@
     }
   }
 
-  /* override of popover internal stuff */
-  .popover-trigger-button {
-    width: auto;
-  }
-
   .popover-trigger {
     padding: 10px;
     margin: -10px;
@@ -141,10 +135,12 @@
       color: $fallback--text;
       color: var(--text, $fallback--text);
     }
-
   }
 
   .popover-trigger-button {
+    /* override of popover internal stuff */
+    width: auto;
+
     @include unfocused-style {
       .focus-marker {
         visibility: hidden;
diff --git a/src/components/registration/registration.vue b/src/components/registration/registration.vue
index 24d9b59b..a26162f0 100644
--- a/src/components/registration/registration.vue
+++ b/src/components/registration/registration.vue
@@ -277,7 +277,7 @@
 
 <script src="./registration.js"></script>
 <style lang="scss">
-@import '../../_variables.scss';
+@import "../../variables";
 $validations-cRed: #f04124;
 
 .registration-form {
@@ -321,7 +321,7 @@ $validations-cRed: #f04124;
 
   .form-group--error {
     animation-name: shakeError;
-    animation-duration: .6s;
+    animation-duration: 0.6s;
     animation-timing-function: ease-in-out;
   }
 
@@ -350,7 +350,7 @@ $validations-cRed: #f04124;
   }
 
   form textarea {
-    line-height:16px;
+    line-height: 16px;
     resize: vertical;
   }
 
diff --git a/src/components/remote_user_resolver/remote_user_resolver.vue b/src/components/remote_user_resolver/remote_user_resolver.vue
index f8945225..07aac169 100644
--- a/src/components/remote_user_resolver/remote_user_resolver.vue
+++ b/src/components/remote_user_resolver/remote_user_resolver.vue
@@ -15,6 +15,3 @@
 </template>
 
 <script src="./remote_user_resolver.js"></script>
-
-<style lang="scss">
-</style>
diff --git a/src/components/reply_button/reply_button.vue b/src/components/reply_button/reply_button.vue
index dada511b..6e3964b7 100644
--- a/src/components/reply_button/reply_button.vue
+++ b/src/components/reply_button/reply_button.vue
@@ -51,8 +51,8 @@
 <script src="./reply_button.js"></script>
 
 <style lang="scss">
-@import '../../_variables.scss';
-@import '../../_mixins.scss';
+@import "../../variables";
+@import "../../mixins";
 
 .ReplyButton {
   display: flex;
@@ -86,6 +86,5 @@
       }
     }
   }
-
 }
 </style>
diff --git a/src/components/report/report.scss b/src/components/report/report.scss
index 578b4eb1..9762400b 100644
--- a/src/components/report/report.scss
+++ b/src/components/report/report.scss
@@ -1,4 +1,4 @@
-@import '../../_variables.scss';
+@import "../../variables";
 
 .Report {
   .report-content {
diff --git a/src/components/retweet_button/retweet_button.vue b/src/components/retweet_button/retweet_button.vue
index 240828e3..7700ee0d 100644
--- a/src/components/retweet_button/retweet_button.vue
+++ b/src/components/retweet_button/retweet_button.vue
@@ -65,8 +65,8 @@
 <script src="./retweet_button.js"></script>
 
 <style lang="scss">
-@import '../../_variables.scss';
-@import '../../_mixins.scss';
+@import "../../variables";
+@import "../../mixins";
 
 .RetweetButton {
   display: flex;
diff --git a/src/components/rich_content/rich_content.scss b/src/components/rich_content/rich_content.scss
index 52042314..e5d353ac 100644
--- a/src/components/rich_content/rich_content.scss
+++ b/src/components/rich_content/rich_content.scss
@@ -1,4 +1,4 @@
-@import '../../variables';
+@import "../../variables";
 
 .RichContent {
   blockquote {
@@ -21,11 +21,11 @@
   }
 
   p {
-    margin: 0 0 1em 0;
+    margin: 0 0 1em;
   }
 
   p:last-child {
-    margin: 0 0 0 0;
+    margin: 0;
   }
 
   h1 {
diff --git a/src/components/scope_selector/scope_selector.vue b/src/components/scope_selector/scope_selector.vue
index f3bee183..d6e7265b 100644
--- a/src/components/scope_selector/scope_selector.vue
+++ b/src/components/scope_selector/scope_selector.vue
@@ -64,10 +64,9 @@
 <script src="./scope_selector.js"></script>
 
 <style lang="scss">
-@import '../../_variables.scss';
+@import "../../variables";
 
 .ScopeSelector {
-
   .scope {
     display: inline-block;
     cursor: pointer;
diff --git a/src/components/search/search.vue b/src/components/search/search.vue
index 6fc6a0de..19b9c577 100644
--- a/src/components/search/search.vue
+++ b/src/components/search/search.vue
@@ -148,7 +148,7 @@
 <script src="./search.js"></script>
 
 <style lang="scss">
-@import '../../_variables.scss';
+@import "../../variables";
 
 .search-result-heading {
   color: $fallback--faint;
@@ -176,7 +176,7 @@
 }
 
 .search-result-footer {
-  border-width: 1px 0 0 0;
+  border-width: 1px 0 0;
   border-style: solid;
   border-color: var(--border, $fallback--border);
   padding: 10px;
@@ -229,11 +229,11 @@
     color: $fallback--text;
     color: var(--text, $fallback--text);
   }
-  }
+}
 
-  .more-statuses-button {
-    height: 3.5em;
-    line-height: 3.5em;
-  }
+.more-statuses-button {
+  height: 3.5em;
+  line-height: 3.5em;
+}
 
 </style>
diff --git a/src/components/search_bar/search_bar.vue b/src/components/search_bar/search_bar.vue
index 199a7500..3969d8de 100644
--- a/src/components/search_bar/search_bar.vue
+++ b/src/components/search_bar/search_bar.vue
@@ -56,7 +56,7 @@
 <script src="./search_bar.js"></script>
 
 <style lang="scss">
-@import '../../_variables.scss';
+@import "../../variables";
 
 .SearchBar {
   display: inline-flex;
diff --git a/src/components/select/select.vue b/src/components/select/select.vue
index 92493b0b..0ce4ea82 100644
--- a/src/components/select/select.vue
+++ b/src/components/select/select.vue
@@ -21,22 +21,20 @@
 <script src="./select.js"> </script>
 
 <style lang="scss">
-@import '../../_variables.scss';
+@import "../../variables";
 
 /* TODO fix order of styles */
 label.Select {
   padding: 0;
 
   select {
-    -webkit-appearance: none;
-    -moz-appearance: none;
     appearance: none;
     background: transparent;
     border: none;
     color: $fallback--text;
     color: var(--inputText, --text, $fallback--text);
     margin: 0;
-    padding: 0 2em 0 .2em;
+    padding: 0 2em 0 0.2em;
     font-family: sans-serif;
     font-family: var(--inputFont, sans-serif);
     font-size: 1em;
@@ -59,6 +57,5 @@ label.Select {
     z-index: 0;
     pointer-events: none;
   }
-
 }
 </style>
diff --git a/src/components/selectable_list/selectable_list.vue b/src/components/selectable_list/selectable_list.vue
index 1f7683ab..14910fc5 100644
--- a/src/components/selectable_list/selectable_list.vue
+++ b/src/components/selectable_list/selectable_list.vue
@@ -51,7 +51,7 @@
 <script src="./selectable_list.js"></script>
 
 <style lang="scss">
-@import '../../_variables.scss';
+@import "../../variables";
 
 .selectable-list {
   &-item-inner {
@@ -67,6 +67,7 @@
     background-color: $fallback--lightBg;
     background-color: var(--selectedMenu, $fallback--lightBg);
     color: var(--selectedMenuText, $fallback--text);
+
     --faint: var(--selectedMenuFaintText, $fallback--faint);
     --faintLink: var(--selectedMenuFaintLink, $fallback--faint);
     --lightText: var(--selectedMenuLightText, $fallback--lightText);
diff --git a/src/components/settings_modal/helpers/choice_setting.vue b/src/components/settings_modal/helpers/choice_setting.vue
index d141a0d6..8fdbb5d3 100644
--- a/src/components/settings_modal/helpers/choice_setting.vue
+++ b/src/components/settings_modal/helpers/choice_setting.vue
@@ -28,8 +28,3 @@
 </template>
 
 <script src="./choice_setting.js"></script>
-
-<style lang="scss">
-.ChoiceSetting {
-}
-</style>
diff --git a/src/components/settings_modal/helpers/size_setting.vue b/src/components/settings_modal/helpers/size_setting.vue
index 90c9f538..5a78f100 100644
--- a/src/components/settings_modal/helpers/size_setting.vue
+++ b/src/components/settings_modal/helpers/size_setting.vue
@@ -45,10 +45,11 @@
 <script src="./size_setting.js"></script>
 
 <style lang="scss">
-.css-unit-input, .css-unit-input select {
+.css-unit-input,
+.css-unit-input select {
   margin-left: 0.5em;
-  width: 4em !important;
-  max-width: 4em !important;
-  min-width: 4em !important;
+  width: 4em;
+  max-width: 4em;
+  min-width: 4em;
 }
 </style>
diff --git a/src/components/settings_modal/settings_modal.scss b/src/components/settings_modal/settings_modal.scss
index 13cb0e65..f5861229 100644
--- a/src/components/settings_modal/settings_modal.scss
+++ b/src/components/settings_modal/settings_modal.scss
@@ -1,4 +1,5 @@
-@import 'src/_variables.scss';
+@import "src/variables";
+
 .settings-modal {
   overflow: hidden;
 
@@ -6,32 +7,13 @@
   .option-list {
     list-style-type: none;
     padding-left: 2em;
+
     li {
       margin-bottom: 0.5em;
     }
-    .suboptions {
-      margin-top: 0.3em
-    }
-  }
-
-  &.peek {
-    .settings-modal-panel {
-      /* Explanation:
-       * Modal is positioned vertically centered.
-       * 100vh - 100% = Distance between modal's top+bottom boundaries and screen
-       * (100vh - 100%) / 2 = Distance between bottom (or top) boundary and screen
-       * + 100% - we move modal completely off-screen, it's top boundary touches
-       *   bottom of the screen
-       * - 50px - leaving tiny amount of space so that titlebar + tiny amount of modal is visible
-       */
-      transform: translateY(calc(((100vh - 100%) / 2 + 100%) - 50px));
 
-      @media all and (max-width: 800px) {
-        /* For mobile, the modal takes 100% of the available screen.
-           This ensures the minimized modal is always 50px above the browser bottom bar regardless of whether or not it is visible.
-        */
-        transform: translateY(calc(100% - 50px));
-      }
+    .suboptions {
+      margin-top: 0.3em;
     }
   }
 
@@ -63,6 +45,7 @@
 
   .settings-footer {
     display: flex;
+
     >* {
       margin-right: 0.5em;
     }
@@ -72,4 +55,26 @@
       flex-grow: 1;
     }
   }
+
+  &.peek {
+    .settings-modal-panel {
+      /* Explanation:
+       * Modal is positioned vertically centered.
+       * 100vh - 100% = Distance between modal's top+bottom boundaries and screen
+       * (100vh - 100%) / 2 = Distance between bottom (or top) boundary and screen
+       * + 100% - we move modal completely off-screen, it's top boundary touches
+       *   bottom of the screen
+       * - 50px - leaving tiny amount of space so that titlebar + tiny amount of modal is visible
+       */
+      transform: translateY(calc(((100vh - 100%) / 2 + 100%) - 50px));
+
+      @media all and (max-width: 800px) {
+        /* For mobile, the modal takes 100% of the available screen.
+           This ensures the minimized modal is always 50px above the browser bottom
+           bar regardless of whether or not it is visible.
+        */
+        transform: translateY(calc(100% - 50px));
+      }
+    }
+  }
 }
diff --git a/src/components/settings_modal/settings_modal_content.scss b/src/components/settings_modal/settings_modal_content.scss
index 81ab434b..87df7982 100644
--- a/src/components/settings_modal/settings_modal_content.scss
+++ b/src/components/settings_modal/settings_modal_content.scss
@@ -1,4 +1,5 @@
-@import 'src/_variables.scss';
+@import "src/variables";
+
 .settings_tab-switcher {
   height: 100%;
 
@@ -10,7 +11,8 @@
     > div,
     > label {
       display: block;
-      margin-bottom: .5em;
+      margin-bottom: 0.5em;
+
       &:last-child {
         margin-bottom: 0;
       }
@@ -21,7 +23,7 @@
 
       .option-list {
         margin: 0;
-        padding-left: .5em;
+        padding-left: 0.5em;
       }
     }
 
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index 8561647b..582cb288 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -464,6 +464,7 @@
   justify-content: space-evenly;
   flex-wrap: wrap;
 }
+
 .column-settings .size-label {
   display: block;
   margin-bottom: 0.5em;
diff --git a/src/components/settings_modal/tabs/mutes_and_blocks_tab.scss b/src/components/settings_modal/tabs/mutes_and_blocks_tab.scss
index 2adff847..5fa3a27b 100644
--- a/src/components/settings_modal/tabs/mutes_and_blocks_tab.scss
+++ b/src/components/settings_modal/tabs/mutes_and_blocks_tab.scss
@@ -1,29 +1,29 @@
 .mutes-and-blocks-tab {
-    height: 100%;
+  height: 100%;
 
-    .usersearch-wrapper {
-        padding: 1em;
-    }
+  .usersearch-wrapper {
+    padding: 1em;
+  }
 
-    .bulk-actions {
-        text-align: right;
-        padding: 0 1em;
-        min-height: 2em;
-    }
+  .bulk-actions {
+    text-align: right;
+    padding: 0 1em;
+    min-height: 2em;
+  }
 
-    .bulk-action-button {
-        width: 10em
-    }
+  .bulk-action-button {
+    width: 10em;
+  }
 
-    .domain-mute-form {
-        padding: 1em;
-        display: flex;
-        flex-direction: column
-    }
+  .domain-mute-form {
+    padding: 1em;
+    display: flex;
+    flex-direction: column;
+  }
 
-    .domain-mute-button {
-        align-self: flex-end;
-        margin-top: 1em;
-        width: 10em
-    }
+  .domain-mute-button {
+    align-self: flex-end;
+    margin-top: 1em;
+    width: 10em;
+  }
 }
diff --git a/src/components/settings_modal/tabs/profile_tab.scss b/src/components/settings_modal/tabs/profile_tab.scss
index 201f1a76..73879192 100644
--- a/src/components/settings_modal/tabs/profile_tab.scss
+++ b/src/components/settings_modal/tabs/profile_tab.scss
@@ -1,4 +1,5 @@
-@import '../../../_variables.scss';
+@import "../../../variables";
+
 .profile-tab {
   .bio {
     margin: 0;
@@ -8,7 +9,7 @@
     padding-top: 5px;
   }
 
-  input[type=file] {
+  input[type="file"] {
     padding: 5px;
     height: auto;
   }
@@ -52,7 +53,7 @@
     right: 0.2em;
     border-radius: $fallback--tooltipRadius;
     border-radius: var(--tooltipRadius, $fallback--tooltipRadius);
-    background-color: rgba(0, 0, 0, 0.6);
+    background-color: rgb(0 0 0 / 60%);
     opacity: 0.7;
     width: 1.5em;
     height: 1.5em;
diff --git a/src/components/settings_modal/tabs/security_tab/mfa.vue b/src/components/settings_modal/tabs/security_tab/mfa.vue
index 455d17b6..ee5b6b13 100644
--- a/src/components/settings_modal/tabs/security_tab/mfa.vue
+++ b/src/components/settings_modal/tabs/security_tab/mfa.vue
@@ -137,9 +137,11 @@
 
 <script src="./mfa.js"></script>
 <style lang="scss">
-@import '../../../../_variables.scss';
+@import "../../../../variables";
+
 .mfa-settings {
-  .mfa-heading, .method-item {
+  .mfa-heading,
+  .method-item {
     display: flex;
     flex-wrap: wrap;
     justify-content: space-between;
@@ -155,18 +157,19 @@
     display: flex;
     justify-content: center;
     flex-wrap: wrap;
+
     .qr-code {
       flex: 1;
       padding-right: 10px;
     }
     .verify { flex: 1; }
-    .error { margin: 4px 0 0 0; }
+    .error { margin: 4px 0 0; }
+
     .confirm-otp-actions {
       button {
         width: 15em;
         margin-top: 5px;
       }
-
     }
   }
 }
diff --git a/src/components/settings_modal/tabs/security_tab/mfa_backup_codes.vue b/src/components/settings_modal/tabs/security_tab/mfa_backup_codes.vue
index d7e98b3c..923161b2 100644
--- a/src/components/settings_modal/tabs/security_tab/mfa_backup_codes.vue
+++ b/src/components/settings_modal/tabs/security_tab/mfa_backup_codes.vue
@@ -21,13 +21,14 @@
 </template>
 <script src="./mfa_backup_codes.js"></script>
 <style lang="scss">
-@import '../../../../_variables.scss';
+@import "../../../../variables";
 
 .mfa-backup-codes {
   .warning {
     color: $fallback--cOrange;
     color: var(--cOrange, $fallback--cOrange);
   }
+
   .backup-codes {
     font-family: var(--postCodeFont, monospace);
   }
diff --git a/src/components/settings_modal/tabs/theme_tab/preview.vue b/src/components/settings_modal/tabs/theme_tab/preview.vue
index ba6bd529..d755279a 100644
--- a/src/components/settings_modal/tabs/theme_tab/preview.vue
+++ b/src/components/settings_modal/tabs/theme_tab/preview.vue
@@ -33,10 +33,10 @@
               scope="global"
               keypath="settings.style.preview.text"
             >
-              <code style="font-family: var(--postCodeFont)">
+              <code style="font-family: var(--postCodeFont);">
                 {{ $t('settings.style.preview.mono') }}
               </code>
-              <a style="color: var(--link)">
+              <a style="color: var(--link);">
                 {{ $t('settings.style.preview.link') }}
               </a>
             </i18n-t>
@@ -44,25 +44,25 @@
             <div class="icons">
               <FAIcon
                 fixed-width
-                style="color: var(--cBlue)"
+                style="color: var(--cBlue);"
                 class="fa-scale-110 fa-old-padding"
                 icon="reply"
               />
               <FAIcon
                 fixed-width
-                style="color: var(--cGreen)"
+                style="color: var(--cGreen);"
                 class="fa-scale-110 fa-old-padding"
                 icon="retweet"
               />
               <FAIcon
                 fixed-width
-                style="color: var(--cOrange)"
+                style="color: var(--cOrange);"
                 class="fa-scale-110 fa-old-padding"
                 icon="star"
               />
               <FAIcon
                 fixed-width
-                style="color: var(--cRed)"
+                style="color: var(--cRed);"
                 class="fa-scale-110 fa-old-padding"
                 icon="times"
               />
@@ -81,7 +81,7 @@
               class="faint"
               scope="global"
             >
-              <a style="color: var(--faintLink)">
+              <a style="color: var(--faintLink);">
                 {{ $t('settings.style.preview.faint_link') }}
               </a>
             </i18n-t>
@@ -138,6 +138,7 @@ export default {}
 .preview-container {
   position: relative;
 }
+
 .underlay-preview {
   position: absolute;
   top: 0;
diff --git a/src/components/settings_modal/tabs/theme_tab/theme_tab.scss b/src/components/settings_modal/tabs/theme_tab/theme_tab.scss
index bad6f51b..9935c2e7 100644
--- a/src/components/settings_modal/tabs/theme_tab/theme_tab.scss
+++ b/src/components/settings_modal/tabs/theme_tab/theme_tab.scss
@@ -1,20 +1,17 @@
-@import 'src/_variables.scss';
+@import "src/variables";
+
 .theme-tab {
   padding-bottom: 2em;
-  .theme-warning {
-    display: flex;
-    align-items: baseline;
-    margin-bottom: .5em;
-    .buttons {
-      .btn {
-        margin-bottom: .5em;
-      }
-    }
-  }
+
   .preset-switcher {
     margin-right: 1em;
   }
 
+  .btn {
+    margin-left: 0.25em;
+    margin-right: 0.25em;
+  }
+
   .style-control {
     display: flex;
     align-items: baseline;
@@ -24,35 +21,37 @@
       flex: 1;
     }
 
-    &.disabled {
-      input, select {
-        opacity: .5
-      }
-    }
-
     .opt {
-      margin: .5em;
+      margin: 0.5em;
     }
 
     .color-input {
       flex: 0 0 0;
     }
 
-    input, select {
+    input,
+    select {
       min-width: 3em;
       margin: 0;
       flex: 0;
 
-      &[type=number] {
+      &[type="number"] {
         min-width: 5em;
       }
 
-      &[type=range] {
+      &[type="range"] {
         flex: 1;
         min-width: 3em;
         align-self: flex-start;
       }
     }
+
+    &.disabled {
+      input,
+      select {
+        opacity: 0.5;
+      }
+    }
   }
 
   .reset-container {
@@ -63,8 +62,7 @@
   .reset-container,
   .apply-container,
   .radius-container,
-  .color-container,
-  {
+  .color-container, {
     display: flex;
   }
 
@@ -73,10 +71,11 @@
     flex-direction: column;
   }
 
-  .color-container{
+  .color-container {
     > h4 {
       width: 99%;
     }
+
     flex-wrap: wrap;
     justify-content: space-between;
   }
@@ -100,7 +99,7 @@
     p {
       flex: 1;
       margin: 0;
-      margin-right: .5em;
+      margin-right: 0.5em;
     }
   }
 
@@ -112,15 +111,16 @@
       min-width: 1px;
       flex: 0 auto;
       padding: 0 1em;
-      margin-bottom: .5em;
+      margin-bottom: 0.5em;
     }
   }
 
   .shadow-selector {
     .override {
       flex: 1;
-      margin-left: .5em;
+      margin-left: 0.5em;
     }
+
     .select-container {
       margin-top: -4px;
       margin-bottom: -3px;
@@ -136,7 +136,7 @@
 
     .presets,
     .import-export {
-      margin-bottom: .5em;
+      margin-bottom: 0.5em;
     }
 
     .import-export {
@@ -144,16 +144,17 @@
     }
 
     .override {
-      margin-left: .5em;
+      margin-left: 0.5em;
     }
   }
 
   .save-load-options {
     flex-wrap: wrap;
-    margin-top: .5em;
+    margin-top: 0.5em;
     justify-content: center;
+
     .keep-option {
-      margin: 0 .5em .5em;
+      margin: 0 0.5em 0.5em;
       min-width: 25%;
     }
   }
@@ -179,11 +180,11 @@
           flex: 1;
 
           h4 {
-            margin-bottom: .25em;
+            margin-bottom: 0.25em;
           }
 
           .icons {
-            margin-top: .5em;
+            margin-top: 0.5em;
             display: flex;
 
             i {
@@ -199,8 +200,20 @@
         align-items: center;
       }
 
-      .avatar, .avatar-alt{
-        background: linear-gradient(135deg, #b8e1fc 0%,#a9d2f3 10%,#90bae4 25%,#90bcea 37%,#90bff0 50%,#6ba8e5 51%,#a2daf5 83%,#bdf3fd 100%);
+      .avatar,
+      .avatar-alt {
+        background:
+          linear-gradient(
+            135deg,
+            #b8e1fc 0%,
+            #a9d2f3 10%,
+            #90bae4 25%,
+            #90bcea 37%,
+            #90bff0 50%,
+            #6ba8e5 51%,
+            #a2daf5 83%,
+            #bdf3fd 100%
+          );
         color: black;
         font-family: sans-serif;
         text-align: center;
@@ -251,33 +264,33 @@
     }
   }
 
+  .radius-item {
+    flex-basis: auto;
+  }
+
   .radius-item,
   .color-item {
     min-width: 20em;
     margin: 5px 6px 0 0;
-    display:flex;
+    display: flex;
     flex-direction: column;
     flex: 1 1 0;
 
     &.wide {
-      min-width: 60%
+      min-width: 60%;
     }
 
     &:not(.wide):nth-child(2n+1) {
       margin-right: 7px;
-
     }
 
-    .color, .opacity {
-      display:flex;
+    .color,
+    .opacity {
+      display: flex;
       align-items: baseline;
     }
   }
 
-  .radius-item {
-    flex-basis: auto;
-  }
-
   .theme-radius-rn,
   .theme-color-cl {
     border: 0;
@@ -295,14 +308,11 @@
 
   .theme-radius-in {
     min-width: 1em;
-  }
-
-  .theme-radius-in {
     max-width: 7em;
     flex: 1;
   }
 
-  .theme-radius-lb{
+  .theme-radius-lb {
     max-width: 50em;
   }
 
@@ -310,9 +320,16 @@
     padding: 20px;
   }
 
-  .btn {
-    margin-left: .25em;
-    margin-right: .25em;
+  .theme-warning {
+    display: flex;
+    align-items: baseline;
+    margin-bottom: 0.5em;
+
+    .buttons {
+      .btn {
+        margin-bottom: 0.5em;
+      }
+    }
   }
 }
 
@@ -323,6 +340,7 @@
     justify-content: space-around;
     flex-grow: 1;
 
+    /* stylelint-disable-next-line no-descending-specificity */
     .btn {
       flex-grow: 1;
       min-height: 2em;
diff --git a/src/components/shadow_control/shadow_control.vue b/src/components/shadow_control/shadow_control.vue
index 669cac71..7546535d 100644
--- a/src/components/shadow_control/shadow_control.vue
+++ b/src/components/shadow_control/shadow_control.vue
@@ -218,7 +218,8 @@
 <script src="./shadow_control.js"></script>
 
 <style lang="scss">
-@import '../../_variables.scss';
+@import "../../variables";
+
 .shadow-control {
   display: flex;
   flex-wrap: wrap;
@@ -229,6 +230,7 @@
   .shadow-tweak {
     margin: 5px 6px 0 0;
   }
+
   .shadow-preview-container {
     flex: 0;
     display: flex;
@@ -236,19 +238,19 @@
 
     $side: 15em;
 
-    input[type=number] {
+    input[type="number"] {
       width: 5em;
       min-width: 2em;
     }
+
     .x-shift-control,
     .y-shift-control {
       display: flex;
       flex: 0;
 
-      &[disabled=disabled] *{
-        opacity: .5
+      &[disabled="disabled"] * {
+        opacity: 0.5;
       }
-
     }
 
     .x-shift-control {
@@ -256,37 +258,40 @@
     }
 
     .x-shift-control .wrap,
-    input[type=range] {
+    input[type="range"] {
       margin: 0;
       width: $side;
       height: 2em;
     }
+
     .y-shift-control {
       flex-direction: column;
       align-items: flex-end;
+
       .wrap {
         width: 2em;
         height: $side;
       }
-      input[type=range] {
+
+      input[type="range"] {
         transform-origin: 1em 1em;
         transform: rotate(90deg);
       }
     }
+
     .preview-window {
       flex: 1;
-      background-color: #999999;
+      background-color: #999;
       display: flex;
       align-items: center;
       justify-content: center;
       background-image:
-      linear-gradient(45deg, #666666 25%, transparent 25%),
-      linear-gradient(-45deg, #666666 25%, transparent 25%),
-      linear-gradient(45deg, transparent 75%, #666666 75%),
-      linear-gradient(-45deg, transparent 75%, #666666 75%);
+        linear-gradient(45deg, #666 25%, transparent 25%),
+        linear-gradient(-45deg, #666 25%, transparent 25%),
+        linear-gradient(45deg, transparent 75%, #666 75%),
+        linear-gradient(-45deg, transparent 75%, #666 75%);
       background-size: 20px 20px;
-      background-position:0 0, 0 10px, 10px -10px, -10px 0;
-
+      background-position: 0 0, 0 10px, 10px -10px, -10px 0;
       border-radius: $fallback--inputRadius;
       border-radius: var(--inputRadius, $fallback--inputRadius);
 
@@ -312,14 +317,15 @@
         flex: 1;
       }
 
-      .shadow-switcher, .btn {
+      .shadow-switcher,
+      .btn {
         min-width: 1px;
         margin-right: 5px;
       }
 
       .btn {
-        padding: 0 .4em;
-        margin: 0 .1em;
+        padding: 0 0.4em;
+        margin: 0 0.1em;
       }
     }
   }
diff --git a/src/components/shout_panel/shout_panel.vue b/src/components/shout_panel/shout_panel.vue
index 688c2d61..a7013469 100644
--- a/src/components/shout_panel/shout_panel.vue
+++ b/src/components/shout_panel/shout_panel.vue
@@ -75,7 +75,7 @@
 <script src="./shout_panel.js"></script>
 
 <style lang="scss">
-@import '../../_variables.scss';
+@import "../../variables";
 
 .floating-shout {
   position: fixed;
diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue
index 887596f8..994ac953 100644
--- a/src/components/side_drawer/side_drawer.vue
+++ b/src/components/side_drawer/side_drawer.vue
@@ -73,7 +73,7 @@
         >
           <router-link
             :to="{ name: 'chats', params: { username: currentUser.screen_name } }"
-            style="position: relative"
+            style="position: relative;"
           >
             <FAIcon
               fixed-width
@@ -251,7 +251,7 @@
 <script src="./side_drawer.js"></script>
 
 <style lang="scss">
-@import '../../_variables.scss';
+@import "../../variables";
 
 .side-drawer-container {
   position: fixed;
@@ -284,11 +284,11 @@
   z-index: -1;
   transition: 0.35s;
   transition-property: background-color;
-  background-color: rgba(0, 0, 0, 0.5);
+  background-color: rgb(0 0 0 / 50%);
 }
 
 .side-drawer-darken-closed {
-  background-color: rgba(0, 0, 0, 0);
+  background-color: rgb(0 0 0 / 0%);
 }
 
 .side-drawer-click-outside {
@@ -297,20 +297,21 @@
 
 .side-drawer {
   overflow-x: hidden;
-  transition-timing-function: cubic-bezier(0, 1, 0.5, 1);
   transition: 0.35s;
+  transition-timing-function: cubic-bezier(0, 1, 0.5, 1);
   transition-property: transform;
   margin: 0 0 0 -100px;
   padding: 0 0 1em 100px;
   width: 80%;
   max-width: 20em;
   flex: 0 0 80%;
-  box-shadow: 1px 1px 4px rgba(0, 0, 0, 0.6);
+  box-shadow: 1px 1px 4px rgb(0 0 0 / 60%);
   box-shadow: var(--panelShadow);
   background-color: $fallback--bg;
   background-color: var(--popover, $fallback--bg);
   color: $fallback--link;
   color: var(--popoverText, $fallback--link);
+
   --faint: var(--popoverFaintText, $fallback--faint);
   --faintLink: var(--popoverFaintLink, $fallback--faint);
   --lightText: var(--popoverLightText, $fallback--lightText);
@@ -360,7 +361,6 @@
   list-style: none;
   margin: 0;
   padding: 0;
-
   border-bottom: 1px solid;
   border-color: $fallback--border;
   border-color: var(--border, $fallback--border);
@@ -373,7 +373,8 @@
 .side-drawer li {
   padding: 0;
 
-  a, button {
+  a,
+  button {
     box-sizing: border-box;
     display: block;
     height: 3em;
@@ -385,6 +386,7 @@
       background-color: var(--selectedMenuPopover, $fallback--lightBg);
       color: $fallback--text;
       color: var(--selectedMenuPopoverText, $fallback--text);
+
       --faint: var(--selectedMenuPopoverFaintText, $fallback--faint);
       --faintLink: var(--selectedMenuPopoverFaintLink, $fallback--faint);
       --lightText: var(--selectedMenuPopoverLightText, $fallback--lightText);
diff --git a/src/components/staff_panel/staff_panel.vue b/src/components/staff_panel/staff_panel.vue
index 6b9e61f2..77155e8b 100644
--- a/src/components/staff_panel/staff_panel.vue
+++ b/src/components/staff_panel/staff_panel.vue
@@ -27,7 +27,6 @@
 <script src="./staff_panel.js"></script>
 
 <style lang="scss">
-
 .staff-group {
   padding-left: 1em;
   padding-top: 1em;
diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index ada9841e..44812867 100644
--- a/src/components/status/status.scss
+++ b/src/components/status/status.scss
@@ -1,4 +1,4 @@
-@import '../../_variables.scss';
+@import "../../variables";
 
 .Status {
   min-width: 0;
@@ -181,7 +181,7 @@
 
   .reply-to-popover {
     .reply-to:hover::before {
-      content: '';
+      content: "";
       display: block;
       position: absolute;
       bottom: 0;
@@ -197,7 +197,7 @@
 
     &.-strikethrough {
       .reply-to::after {
-        content: '';
+        content: "";
         display: block;
         position: absolute;
         top: 50%;
@@ -336,7 +336,7 @@
       margin-left: 0.2em;
 
       &::before {
-        content: ' ';
+        content: " ";
       }
     }
 
@@ -374,7 +374,7 @@
     align-items: center;
 
     &::before {
-      content: '';
+      content: "";
       position: absolute;
       height: 100%;
       width: 1px;
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 82eb7ac6..fe8778cf 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -261,7 +261,7 @@
                   v-if="!isPreview"
                   :status-id="status.parent_visible && status.in_reply_to_status_id"
                   class="reply-to-popover"
-                  style="min-width: 0"
+                  style="min-width: 0;"
                   :class="{ '-strikethrough': !status.parent_visible }"
                 >
                   <button
diff --git a/src/components/status_body/status_body.scss b/src/components/status_body/status_body.scss
index 039d4c7f..8fd60afc 100644
--- a/src/components/status_body/status_body.scss
+++ b/src/components/status_body/status_body.scss
@@ -1,4 +1,4 @@
-@import '../../_variables.scss';
+@import "../../variables";
 
 .StatusBody {
   display: flex;
@@ -40,7 +40,7 @@
   .summary-wrapper {
     margin-bottom: 0.5em;
     border-style: solid;
-    border-width: 0 0 1px 0;
+    border-width: 0 0 1px;
     border-color: var(--border, $fallback--border);
     flex-grow: 0;
 
@@ -58,8 +58,7 @@
 
   .text-wrapper {
     display: flex;
-    flex-direction: column;
-    flex-wrap: nowrap;
+    flex-flow: column nowrap;
 
     &.-tall-status {
       position: relative;
@@ -75,7 +74,7 @@
           linear-gradient(to top, white, white);
 
         /* Autoprefixed seem to ignore this one, and also syntax is different */
-        -webkit-mask-composite: xor;
+        mask-composite: xor;
         mask-composite: exclude;
       }
     }
@@ -144,7 +143,7 @@
       mask-image: linear-gradient(to bottom, white 2em, transparent 3em);
 
       /* Autoprefixed seem to ignore this one, and also syntax is different */
-      -webkit-mask-composite: xor;
+      mask-composite: xor;
       mask-composite: exclude;
     }
 
@@ -158,7 +157,7 @@
 
     .summary-wrapper {
       .summary::after {
-        content: ': ';
+        content: ": ";
       }
 
       line-height: inherit;
diff --git a/src/components/status_history_modal/status_history_modal.vue b/src/components/status_history_modal/status_history_modal.vue
index 990be35b..79642e9c 100644
--- a/src/components/status_history_modal/status_history_modal.vue
+++ b/src/components/status_history_modal/status_history_modal.vue
@@ -32,6 +32,7 @@
 .modal-view.status-history-modal-view {
   align-items: flex-start;
 }
+
 .status-history-modal-panel {
   flex-shrink: 0;
   margin-top: 25%;
diff --git a/src/components/status_popover/status_popover.vue b/src/components/status_popover/status_popover.vue
index f4ab357b..311ca099 100644
--- a/src/components/status_popover/status_popover.vue
+++ b/src/components/status_popover/status_popover.vue
@@ -40,14 +40,13 @@
 <script src="./status_popover.js"></script>
 
 <style lang="scss">
-@import '../../_variables.scss';
+@import "../../variables";
 
 /* popover styles load on-demand, so we need to override */
 .status-popover.popover {
   font-size: 1rem;
   min-width: 15em;
   max-width: 95%;
-
   border-color: $fallback--border;
   border-color: var(--border, $fallback--border);
   border-style: solid;
diff --git a/src/components/sticker_picker/sticker_picker.vue b/src/components/sticker_picker/sticker_picker.vue
index dc449ccb..904853c0 100644
--- a/src/components/sticker_picker/sticker_picker.vue
+++ b/src/components/sticker_picker/sticker_picker.vue
@@ -32,24 +32,29 @@
 <script src="./sticker_picker.js"></script>
 
 <style lang="scss">
-@import '../../_variables.scss';
+@import "../../variables";
 
 .sticker-picker {
   width: 100%;
+
   .contents {
     min-height: 250px;
+
     .sticker-picker-content {
       display: flex;
       flex-wrap: wrap;
       padding: 0 4px;
+
       .sticker {
         display: flex;
         flex: 1 1 auto;
         margin: 4px;
         width: 56px;
         height: 56px;
+
         img {
           height: 100%;
+
           &:hover {
             filter: drop-shadow(0 0 5px var(--accent, $fallback--link));
           }
diff --git a/src/components/still-image/still-image.vue b/src/components/still-image/still-image.vue
index d015e138..fc46fbe6 100644
--- a/src/components/still-image/still-image.vue
+++ b/src/components/still-image/still-image.vue
@@ -28,7 +28,7 @@
 <script src="./still-image.js"></script>
 
 <style lang="scss">
-@import '../../_variables.scss';
+@import "../../variables";
 
 .still-image {
   position: relative;
@@ -58,13 +58,13 @@
   &.animated {
     &::before {
       zoom: var(--_still_image-label-scale, 1);
-      content: 'gif';
+      content: "gif";
       position: absolute;
       line-height: 1;
       font-size: 0.7em;
       top: 0.5em;
       left: 0.5em;
-      background: rgba(127, 127, 127, 0.5);
+      background: rgb(127 127 127 / 50%);
       color: #fff;
       display: block;
       padding: 2px 4px;
diff --git a/src/components/tab_switcher/tab_switcher.scss b/src/components/tab_switcher/tab_switcher.scss
index d930368c..705925c8 100644
--- a/src/components/tab_switcher/tab_switcher.scss
+++ b/src/components/tab_switcher/tab_switcher.scss
@@ -1,5 +1,6 @@
-@import '../../_variables.scss';
+@import "../../variables";
 
+/* stylelint-disable no-descending-specificity */
 .tab-switcher {
   display: flex;
 
@@ -19,8 +20,9 @@
       flex-direction: row;
       flex: 0 0 auto;
 
-      &::after, &::before {
-        content: '';
+      &::after,
+      &::before {
+        content: "";
         flex: 1 1 auto;
         border-bottom: 1px solid;
         border-bottom-color: $fallback--border;
@@ -39,6 +41,7 @@
           border-bottom-color: var(--border, $fallback--border);
         }
       }
+
       .tab {
         width: 100%;
         min-width: 1px;
@@ -48,6 +51,7 @@
         margin-bottom: 6px - 99px;
       }
     }
+
     .contents.scrollable-tabs {
       flex-basis: 0;
     }
@@ -70,10 +74,11 @@
       overflow-x: hidden;
       flex-direction: column;
 
-      &::after, &::before {
+      &::after,
+      &::before {
         flex-shrink: 0;
-        flex-basis: .5em;
-        content: '';
+        flex-basis: 0.5em;
+        content: "";
         border-right: 1px solid;
         border-right-color: $fallback--border;
         border-right-color: var(--border, $fallback--border);
@@ -107,7 +112,7 @@
 
         &::before {
           flex: 0 0 6px;
-          content: '';
+          content: "";
           border-right: 1px solid;
           border-right-color: $fallback--border;
           border-right-color: var(--border, $fallback--border);
@@ -131,12 +136,13 @@
         margin-left: 1em;
 
         @media all and (max-width: 800px) {
-          padding-left: .25em;
-          padding-right: calc(.25em + 200px);
-          margin-right: calc(.25em - 200px);
-          margin-left: .25em;
+          padding-left: 0.25em;
+          padding-right: calc(0.25em + 200px);
+          margin-right: calc(0.25em - 200px);
+          margin-left: 0.25em;
+
           .text {
-            display: none
+            display: none;
           }
         }
       }
@@ -145,15 +151,17 @@
 
   .contents {
     flex: 1 0 auto;
-    min-height: 0px;
+    min-height: 0;
 
     .hidden {
       display: none;
     }
+
     .full-height:not(.hidden) {
       height: 100%;
       display: flex;
       flex-direction: column;
+
       > *:not(.mobile-label) {
         flex: 1;
       }
@@ -196,7 +204,8 @@
     position: relative;
     box-sizing: border-box;
 
-    &::after, &::before {
+    &::after,
+    &::before {
       display: block;
       flex: 1 1 auto;
     }
@@ -209,7 +218,7 @@
 
     &:not(.active) {
       &::after {
-        content: '';
+        content: "";
         position: absolute;
         z-index: 7;
       }
@@ -217,11 +226,11 @@
   }
 
   .mobile-label {
-    padding-left: .3em;
-    padding-bottom: .25em;
-    margin-top: .5em;
-    margin-left: .2em;
-    margin-bottom: .25em;
+    padding-left: 0.3em;
+    padding-bottom: 0.25em;
+    margin-top: 0.5em;
+    margin-left: 0.2em;
+    margin-bottom: 0.25em;
     border-bottom: 1px solid var(--border, $fallback--border);
 
     @media all and (min-width: 800px) {
@@ -229,3 +238,4 @@
     }
   }
 }
+/* stylelint-enable no-descending-specificity */
diff --git a/src/components/terms_of_service_panel/terms_of_service_panel.vue b/src/components/terms_of_service_panel/terms_of_service_panel.vue
index 1df41d70..bff0ae74 100644
--- a/src/components/terms_of_service_panel/terms_of_service_panel.vue
+++ b/src/components/terms_of_service_panel/terms_of_service_panel.vue
@@ -17,6 +17,6 @@
 
 <style lang="scss">
 .tos-content {
-  margin: 1em
+  margin: 1em;
 }
 </style>
diff --git a/src/components/thread_tree/thread_tree.vue b/src/components/thread_tree/thread_tree.vue
index c6fffc71..04727278 100644
--- a/src/components/thread_tree/thread_tree.vue
+++ b/src/components/thread_tree/thread_tree.vue
@@ -119,7 +119,8 @@
 <script src="./thread_tree.js"></script>
 
 <style lang="scss">
-@import '../../_variables.scss';
+@import "../../variables";
+
 .thread-tree-replies {
   margin-left: var(--status-margin, $status-margin);
   border-left: 2px solid var(--border, $fallback--border);
@@ -127,6 +128,7 @@
 
 .thread-tree-replies-hidden {
   padding: var(--status-margin, $status-margin);
+
   /* Make the button stretch along the whole row */
   display: flex;
   align-items: stretch;
diff --git a/src/components/timeline/timeline.scss b/src/components/timeline/timeline.scss
index c6fb1ca7..4371947d 100644
--- a/src/components/timeline/timeline.scss
+++ b/src/components/timeline/timeline.scss
@@ -1,4 +1,4 @@
-@import '../../_variables.scss';
+@import "../../variables";
 
 .Timeline {
   .alert-dot {
@@ -46,10 +46,9 @@
       text-align: center;
       line-height: 2.75em;
       padding: 0 0.5em;
-    }
 
-    .timeline-heading {
-      .button-default, .alert {
+      .button-default,
+      .alert {
         line-height: 2em;
         width: 100%;
       }
diff --git a/src/components/timeline_menu/timeline_menu.vue b/src/components/timeline_menu/timeline_menu.vue
index e7250282..5f1da1f7 100644
--- a/src/components/timeline_menu/timeline_menu.vue
+++ b/src/components/timeline_menu/timeline_menu.vue
@@ -45,56 +45,7 @@
 <script src="./timeline_menu.js"></script>
 
 <style lang="scss">
-@import '../../_variables.scss';
-
-.TimelineMenu {
-  margin-right: auto;
-  min-width: 0;
-
-  .popover-trigger-button {
-    vertical-align: bottom;
-  }
-
-  .panel::after {
-    border-top-right-radius: 0;
-    border-top-left-radius: 0;
-  }
-
-  .timeline-menu-title {
-    margin: 0;
-    cursor: pointer;
-    user-select: none;
-    width: 100%;
-    display: flex;
-
-    .timeline-menu-name {
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    }
-
-    svg {
-      margin-left: 0.6em;
-      transition: transform 100ms;
-    }
-
-    .click-blocker {
-      cursor: default;
-      flex-grow: 1;
-    }
-  }
-
-  &.open .timeline-menu-title svg {
-    color: $fallback--text;
-    color: var(--panelText, $fallback--text);
-    transform: rotate(180deg);
-  }
-
-  .panel {
-    box-shadow: var(--popoverShadow);
-  }
-
-}
+@import "../../variables";
 
 .timeline-menu-popover {
   min-width: 24rem;
@@ -110,24 +61,6 @@
     padding: 0;
   }
 
-  li {
-    border-bottom: 1px solid;
-    border-color: $fallback--border;
-    border-color: var(--border, $fallback--border);
-    padding: 0;
-
-    &:last-child a {
-      border-bottom-right-radius: $fallback--panelRadius;
-      border-bottom-right-radius: var(--panelRadius, $fallback--panelRadius);
-      border-bottom-left-radius: $fallback--panelRadius;
-      border-bottom-left-radius: var(--panelRadius, $fallback--panelRadius);
-    }
-
-    &:last-child {
-      border: none;
-    }
-  }
-
   a {
     display: block;
     padding: 0 0.65em;
@@ -139,6 +72,7 @@
       background-color: var(--selectedMenu, $fallback--lightBg);
       color: $fallback--link;
       color: var(--selectedMenuText, $fallback--link);
+
       --faint: var(--selectedMenuFaintText, $fallback--faint);
       --faintLink: var(--selectedMenuFaintLink, $fallback--faint);
       --lightText: var(--selectedMenuLightText, $fallback--lightText);
@@ -150,7 +84,9 @@
       background-color: $fallback--lightBg;
       background-color: var(--selectedMenu, $fallback--lightBg);
       color: $fallback--text;
-      color: var(--selectedMenuText, $fallback--text); --faint: var(--selectedMenuFaintText, $fallback--faint);
+      color: var(--selectedMenuText, $fallback--text);
+
+      --faint: var(--selectedMenuFaintText, $fallback--faint);
       --faintLink: var(--selectedMenuFaintLink, $fallback--faint);
       --lightText: var(--selectedMenuLightText, $fallback--lightText);
       --icon: var(--selectedMenuIcon, $fallback--icon);
@@ -165,6 +101,71 @@
       margin-left: -0.2em;
     }
   }
+
+  li {
+    border-bottom: 1px solid;
+    border-color: $fallback--border;
+    border-color: var(--border, $fallback--border);
+    padding: 0;
+
+    &:last-child a {
+      border-bottom-right-radius: $fallback--panelRadius;
+      border-bottom-right-radius: var(--panelRadius, $fallback--panelRadius);
+      border-bottom-left-radius: $fallback--panelRadius;
+      border-bottom-left-radius: var(--panelRadius, $fallback--panelRadius);
+    }
+
+    &:last-child {
+      border: none;
+    }
+  }
 }
 
+.TimelineMenu {
+  margin-right: auto;
+  min-width: 0;
+
+  .popover-trigger-button {
+    vertical-align: bottom;
+  }
+
+  .panel::after {
+    border-top-right-radius: 0;
+    border-top-left-radius: 0;
+  }
+
+  .timeline-menu-title {
+    margin: 0;
+    cursor: pointer;
+    user-select: none;
+    width: 100%;
+    display: flex;
+
+    .timeline-menu-name {
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+
+    svg {
+      margin-left: 0.6em;
+      transition: transform 100ms;
+    }
+
+    .click-blocker {
+      cursor: default;
+      flex-grow: 1;
+    }
+  }
+
+  &.open .timeline-menu-title svg {
+    color: $fallback--text;
+    color: var(--panelText, $fallback--text);
+    transform: rotate(180deg);
+  }
+
+  .panel {
+    box-shadow: var(--popoverShadow);
+  }
+}
 </style>
diff --git a/src/components/update_notification/update_notification.scss b/src/components/update_notification/update_notification.scss
index ce8129d0..4337acc4 100644
--- a/src/components/update_notification/update_notification.scss
+++ b/src/components/update_notification/update_notification.scss
@@ -1,4 +1,5 @@
-@import 'src/_variables.scss';
+@import "src/variables";
+
 .UpdateNotification {
   overflow: hidden;
 }
@@ -21,7 +22,8 @@
 
   @media all and (max-width: 800px) {
     /* For mobile, the modal takes 100% of the available screen.
-    This ensures the minimized modal is always 50px above the browser bottom bar regardless of whether or not it is visible.
+       This ensures the minimized modal is always 50px above the browser
+       bottom bar regardless of whether or not it is visible.
    */
     width: 100vw;
   }
@@ -44,7 +46,7 @@
   }
 
   .panel-body {
-    border-width: 0 0 1px 0;
+    border-width: 0 0 1px;
     border-style: solid;
     border-color: var(--border, $fallback--border);
   }
@@ -67,7 +69,7 @@
     z-index: 20;
     position: relative;
     shape-margin: 0.5em;
-    filter: drop-shadow(5px 5px 10px rgba(0,0,0,0.5));
+    filter: drop-shadow(5px 5px 10px rgb(0 0 0 / 50%));
     pointer-events: none;
   }
 
@@ -94,7 +96,7 @@
   }
 
   &.-peek {
-  /* Explanation:
+    /* Explanation:
    * 100vh - 100% = Distance between modal's top+bottom boundaries and screen
    * (100vh - 100%) / 2 = Distance between bottom (or top) boundary and screen
    */
@@ -103,7 +105,7 @@
     .pleroma-tan {
       float: right;
       z-index: 10;
-      shape-image-threshold: 0.7;
+      shape-image-threshold: 70%;
     }
 
     .extra-info-group {
diff --git a/src/components/user_avatar/user_avatar.vue b/src/components/user_avatar/user_avatar.vue
index f4d294df..91c17611 100644
--- a/src/components/user_avatar/user_avatar.vue
+++ b/src/components/user_avatar/user_avatar.vue
@@ -27,7 +27,7 @@
 
 <script src="./user_avatar.js"></script>
 <style lang="scss">
-@import '../../_variables.scss';
+@import "../../variables";
 
 .Avatar {
   --_avatarShadowBox: var(--avatarStatusShadow);
@@ -85,10 +85,9 @@
     right: 0;
     margin: -0.2em;
     padding: 0.2em;
-    background: rgba(127, 127, 127, 0.5);
+    background: rgb(127 127 127 / 50%);
     color: #fff;
     border-radius: var(--tooltipRadius);
   }
-
 }
 </style>
diff --git a/src/components/user_card/user_card.scss b/src/components/user_card/user_card.scss
index cdb8cb57..942673c4 100644
--- a/src/components/user_card/user_card.scss
+++ b/src/components/user_card/user_card.scss
@@ -1,4 +1,4 @@
-@import '../../_variables.scss';
+@import "../../variables";
 
 .user-card {
   position: relative;
@@ -11,7 +11,7 @@
   }
 
   .panel-heading {
-    padding: .5em 0;
+    padding: 0.5em 0;
     text-align: center;
     box-shadow: none;
     background: transparent;
@@ -35,17 +35,19 @@
     left: 0;
     right: 0;
     bottom: 0;
-    mask: linear-gradient(to top, white, transparent) bottom no-repeat,
-          linear-gradient(to top, white, white);
+    mask:
+      linear-gradient(to top, white, transparent) bottom no-repeat,
+      linear-gradient(to top, white, white);
     // Autoprefixer seem to ignore this one, and also syntax is different
-    -webkit-mask-composite: xor;
+    mask-composite: xor;
     mask-composite: exclude;
     background-size: cover;
     mask-size: 100% 60%;
-    border-top-left-radius: calc(var(--__roundnessTop, --panelRadius) - 1px);
-    border-top-right-radius: calc(var(--__roundnessTop, --panelRadius) - 1px);
-    border-bottom-left-radius: calc(var(--__roundnessBottom, --panelRadius) - 1px);
-    border-bottom-right-radius: calc(var(--__roundnessBottom, --panelRadius) - 1px);
+    border-radius:
+      calc(var(--__roundnessTop, --panelRadius) - 1px)
+      calc(var(--__roundnessTop, --panelRadius) - 1px)
+      calc(var(--__roundnessBottom, --panelRadius) - 1px)
+      calc(var(--__roundnessBottom, --panelRadius) - 1px);
     background-color: var(--profileBg);
     z-index: -2;
 
@@ -159,17 +161,17 @@
       top: 0;
       right: 0;
       bottom: 0;
-      background-color: rgba(0, 0, 0, 0.3);
+      background-color: rgb(0 0 0 / 30%);
       display: flex;
       justify-content: center;
       align-items: center;
       border-radius: $fallback--avatarRadius;
       border-radius: var(--avatarRadius, $fallback--avatarRadius);
       opacity: 0;
-      transition: opacity .2s ease;
+      transition: opacity 0.2s ease;
 
       svg {
-        color: #FFF;
+        color: #fff;
       }
     }
 
@@ -178,7 +180,8 @@
     }
   }
 
-  .external-link-button, .edit-profile-button {
+  .external-link-button,
+  .edit-profile-button {
     cursor: pointer;
     width: 2.5em;
     text-align: center;
@@ -191,34 +194,6 @@
     }
   }
 
-  .user-summary {
-    display: block;
-    margin-left: 0.6em;
-    text-align: left;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    flex: 1 1 0;
-    // This is so that text doesn't get overlapped by avatar's shadow if it has
-    // big one
-    z-index: 1;
-    line-height: 2em;
-
-    --emoji-size: 1.7em;
-
-    .top-line,
-    .bottom-line {
-      display: flex;
-    }
-  }
-
-  .user-name {
-    text-overflow: ellipsis;
-    overflow: hidden;
-    flex: 1 1 auto;
-    margin-right: 1em;
-    font-size: 1.1em;
-  }
-
   .bottom-line {
     font-weight: light;
     font-size: 1.1em;
@@ -253,8 +228,36 @@
     }
   }
 
+  .user-summary {
+    display: block;
+    margin-left: 0.6em;
+    text-align: left;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    flex: 1 1 0;
+    // This is so that text doesn't get overlapped by avatar's shadow if it has
+    // big one
+    z-index: 1;
+    line-height: 2em;
+
+    --emoji-size: 1.7em;
+
+    .top-line,
+    .bottom-line {
+      display: flex;
+    }
+  }
+
+  .user-name {
+    text-overflow: ellipsis;
+    overflow: hidden;
+    flex: 1 1 auto;
+    margin-right: 1em;
+    font-size: 1.1em;
+  }
+
   .user-meta {
-    margin-bottom: .15em;
+    margin-bottom: 0.15em;
     display: flex;
     align-items: baseline;
     line-height: 22px;
@@ -263,7 +266,7 @@
     .following {
       flex: 1 0 auto;
       margin: 0;
-      margin-bottom: .25em;
+      margin-bottom: 0.25em;
       text-align: left;
     }
 
@@ -271,7 +274,7 @@
       flex: 0 1 auto;
       display: flex;
       flex-wrap: wrap;
-      margin-right: -.5em;
+      margin-right: -0.5em;
       align-self: start;
 
       .userHighlightCl {
@@ -294,19 +297,20 @@
       .userHighlightText,
       .userHighlightSel {
         vertical-align: top;
-        margin-right: .5em;
-        margin-bottom: .25em;
+        margin-right: 0.5em;
+        margin-bottom: 0.25em;
       }
     }
   }
+
   .user-interactions {
     position: relative;
     display: flex;
     flex-flow: row wrap;
-    margin-right: -.75em;
+    margin-right: -0.75em;
 
     > * {
-      margin: 0 .75em .6em 0;
+      margin: 0 0.75em 0.6em 0;
       white-space: nowrap;
       min-width: 95px;
     }
@@ -317,7 +321,7 @@
   }
 
   .user-note {
-    margin: 0 .75em .6em 0;
+    margin: 0 0.75em 0.6em 0;
   }
 }
 
@@ -327,8 +331,8 @@
 
 .user-counts {
   display: flex;
-  line-height:16px;
-  padding: .5em 1.5em 0em 1.5em;
+  line-height: 16px;
+  padding: 0.5em 1.5em 0;
   text-align: center;
   justify-content: space-between;
   color: $fallback--lightText;
@@ -338,14 +342,16 @@
 
 .user-count {
   flex: 1 0 auto;
-  padding: .5em 0 .5em 0;
-  margin: 0 .5em;
+  padding: 0.5em 0;
+  margin: 0 0.5em;
 
   h5 {
-    font-size:1em;
+    font-size: 1em;
     font-weight: bolder;
     margin: 0 0 0.25em;
   }
+
+  /* stylelint-disable-next-line no-descending-specificity */
   a {
     text-decoration: none;
   }
diff --git a/src/components/user_list_popover/user_list_popover.vue b/src/components/user_list_popover/user_list_popover.vue
index 635dc7f6..8307cc8a 100644
--- a/src/components/user_list_popover/user_list_popover.vue
+++ b/src/components/user_list_popover/user_list_popover.vue
@@ -48,7 +48,7 @@
 <script src="./user_list_popover.js"></script>
 
 <style lang="scss">
-@import '../../_variables.scss';
+@import "../../variables";
 
 .user-list-popover {
   padding: 0.5em;
diff --git a/src/components/user_note/user_note.vue b/src/components/user_note/user_note.vue
index 4286e017..4e05951f 100644
--- a/src/components/user_note/user_note.vue
+++ b/src/components/user_note/user_note.vue
@@ -48,7 +48,7 @@
 <script src="./user_note.js"></script>
 
 <style lang="scss">
-@import '../../variables';
+@import "../../variables";
 
 .user-note {
   display: flex;
diff --git a/src/components/user_popover/user_popover.vue b/src/components/user_popover/user_popover.vue
index 53d51fc4..3b2bbc45 100644
--- a/src/components/user_popover/user_popover.vue
+++ b/src/components/user_popover/user_popover.vue
@@ -24,10 +24,12 @@
 <script src="./user_popover.js"></script>
 
 <style lang="scss">
-@import '../../_variables.scss';
+@import "../../variables";
 
 /* popover styles load on-demand, so we need to override */
+/* stylelint-disable block-no-empty */
 .user-popover.popover {
 }
+/* stylelint-enable block-no-empty */
 
 </style>
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index d5e8d230..2720f052 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -140,7 +140,7 @@
 <script src="./user_profile.js"></script>
 
 <style lang="scss">
-@import '../../_variables.scss';
+@import "../../variables";
 
 .user-profile {
   flex: 2;
@@ -186,7 +186,8 @@
         margin: 0 0 0 0.25em;
       }
 
-      .user-profile-field-name, .user-profile-field-value {
+      .user-profile-field-name,
+      .user-profile-field-value {
         line-height: 1.3;
         text-overflow: ellipsis;
         white-space: nowrap;
@@ -204,6 +205,7 @@
     padding: 2em;
   }
 }
+
 .user-profile-placeholder {
   .panel-body {
     display: flex;
diff --git a/src/components/user_reporting_modal/user_reporting_modal.vue b/src/components/user_reporting_modal/user_reporting_modal.vue
index 8c42ab7b..092c514e 100644
--- a/src/components/user_reporting_modal/user_reporting_modal.vue
+++ b/src/components/user_reporting_modal/user_reporting_modal.vue
@@ -72,7 +72,7 @@
 <script src="./user_reporting_modal.js"></script>
 
 <style lang="scss">
-@import '../../_variables.scss';
+@import "../../variables";
 
 .user-reporting-panel {
   width: 90vw;
@@ -121,7 +121,7 @@
     }
 
     .alert {
-      margin: 1em 0 0 0;
+      margin: 1em 0 0;
       line-height: 1.3em;
     }
   }
diff --git a/src/components/who_to_follow/who_to_follow.vue b/src/components/who_to_follow/who_to_follow.vue
index 3a17d0e2..56543d91 100644
--- a/src/components/who_to_follow/who_to_follow.vue
+++ b/src/components/who_to_follow/who_to_follow.vue
@@ -15,6 +15,3 @@
 </template>
 
 <script src="./who_to_follow.js"></script>
-
-<style lang="scss">
-</style>
diff --git a/src/components/who_to_follow_panel/who_to_follow_panel.vue b/src/components/who_to_follow_panel/who_to_follow_panel.vue
index c1ba6fb1..0fecec0b 100644
--- a/src/components/who_to_follow_panel/who_to_follow_panel.vue
+++ b/src/components/who_to_follow_panel/who_to_follow_panel.vue
@@ -33,24 +33,28 @@
   .who-to-follow * {
     vertical-align: middle;
   }
+
   .who-to-follow img {
     width: 32px;
     height: 32px;
   }
+
   .who-to-follow {
-    padding: 0em 1em;
-    margin: 0px;
+    padding: 0 1em;
+    margin: 0;
   }
+
   .who-to-follow-items {
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
-    padding: 0px;
-    margin: 1em 0em;
+    padding: 0;
+    margin: 1em 0;
   }
+
   .who-to-follow-more {
-    padding: 0px;
-    margin: 1em 0em;
+    padding: 0;
+    margin: 1em 0;
     text-align: center;
   }
 </style>
diff --git a/src/hocs/with_load_more/with_load_more.scss b/src/hocs/with_load_more/with_load_more.scss
index de86ed4a..bad852f4 100644
--- a/src/hocs/with_load_more/with_load_more.scss
+++ b/src/hocs/with_load_more/with_load_more.scss
@@ -1,5 +1,4 @@
-
-@import '../../_variables.scss';
+@import "../../variables";
 
 .with-load-more {
   &-footer {
diff --git a/src/hocs/with_subscription/with_subscription.scss b/src/hocs/with_subscription/with_subscription.scss
index 7fd83802..996045b4 100644
--- a/src/hocs/with_subscription/with_subscription.scss
+++ b/src/hocs/with_subscription/with_subscription.scss
@@ -7,4 +7,4 @@
       font-size: 1rem;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/panel.scss b/src/panel.scss
index a53e47c6..9471da11 100644
--- a/src/panel.scss
+++ b/src/panel.scss
@@ -1,3 +1,4 @@
+/* stylelint-disable no-descending-specificity */
 .panel {
   position: relative;
   display: flex;
@@ -12,14 +13,14 @@
   }
 
   &::after {
-    content: '';
+    content: "";
     position: absolute;
     top: 0;
     bottom: 0;
     left: 0;
     right: 0;
     z-index: 5;
-    box-shadow: 1px 1px 4px rgba(0, 0, 0, 0.6);
+    box-shadow: 1px 1px 4px rgb(0 0 0 / 60%);
     box-shadow: var(--panelShadow);
     pointer-events: none;
   }
@@ -87,7 +88,7 @@
 
   &::after,
   &::before {
-    content: '';
+    content: "";
     position: absolute;
     top: 0;
     bottom: 0;
@@ -126,7 +127,7 @@
 .panel-heading {
   border-radius: $fallback--panelRadius $fallback--panelRadius 0 0;
   border-radius: var(--panelRadius, $fallback--panelRadius) var(--panelRadius, $fallback--panelRadius) 0 0;
-  border-width: 0 0 1px 0;
+  border-width: 0 0 1px;
   align-items: start;
   // panel theme
   color: var(--panelText);
@@ -150,7 +151,7 @@
 
   .button-unstyled:hover,
   a:hover {
-    i[class*=icon-],
+    i[class*="icon-"],
     .svg-inline--fa,
     .iconLetter {
       color: var(--panelText);
@@ -173,7 +174,7 @@
       flex-shrink: 0;
 
       &,
-      i[class*=icon-] {
+      i[class*="icon-"] {
         color: $fallback--text;
         color: var(--btnPanelText, $fallback--text);
       }
@@ -234,7 +235,8 @@
   border-radius: 0 0 $fallback--panelRadius $fallback--panelRadius;
   border-radius: 0 0 var(--panelRadius, $fallback--panelRadius) var(--panelRadius, $fallback--panelRadius);
   align-items: center;
-  border-width: 1px 0 0 0;
+  border-width: 1px 0 0;
   border-style: solid;
   border-color: var(--border, $fallback--border);
 }
+/* stylelint-enable no-descending-specificity */
diff --git a/yarn.lock b/yarn.lock
index c0061cf8..e2e06dec 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5278,7 +5278,7 @@ jest-worker@^27.4.5:
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
-jest-worker@^28.0.2:
+jest-worker@^28.0.2, jest-worker@^28.1.0:
   version "28.1.3"
   resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-28.1.3.tgz#7e3c4ce3fa23d1bb6accb169e7f396f98ed4bb98"
   integrity sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==
@@ -8014,6 +8014,17 @@ stylelint-scss@^4.0.0:
     postcss-selector-parser "^6.0.6"
     postcss-value-parser "^4.1.0"
 
+stylelint-webpack-plugin@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/stylelint-webpack-plugin/-/stylelint-webpack-plugin-3.3.0.tgz#3ba40e2b2b2b7d1802fa53618e01fc28bc21ffb3"
+  integrity sha512-F53bapIZ9zI16ero8IWm6TrUE6SSibZBphJE9b5rR2FxtvmGmm1YmS+a5xjQzn63+cv71GVSCu4byX66fBLpEw==
+  dependencies:
+    globby "^11.1.0"
+    jest-worker "^28.1.0"
+    micromatch "^4.0.5"
+    normalize-path "^3.0.0"
+    schema-utils "^4.0.0"
+
 stylelint@14.16.1:
   version "14.16.1"
   resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-14.16.1.tgz#b911063530619a1bbe44c2b875fd8181ebdc742d"
-- 
cgit v1.2.3-70-g09d2


From aea9f92d39df4af5e7579e9d0ec443d3fb18a756 Mon Sep 17 00:00:00 2001
From: flxy <flxy@staycomfy.dev>
Date: Wed, 11 Jan 2023 13:52:49 +0100
Subject: Adjust query selector to actually get the popover now

---
 src/components/react_button/react_button.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/components/react_button/react_button.js b/src/components/react_button/react_button.js
index 2a0dac85..58fbb61b 100644
--- a/src/components/react_button/react_button.js
+++ b/src/components/react_button/react_button.js
@@ -41,7 +41,7 @@ const ReactButton = {
     },
     focusInput () {
       this.$nextTick(() => {
-        const input = this.$el.querySelector('input')
+        const input = document.querySelector('.popover.ReactButton').querySelector('input')
         if (input) input.focus()
       })
     },
-- 
cgit v1.2.3-70-g09d2


From d81fdafacb86b120714b6541bd83cf588ab8b577 Mon Sep 17 00:00:00 2001
From: flxy <flxy@staycomfy.dev>
Date: Wed, 11 Jan 2023 14:12:29 +0100
Subject: Pick a better query selector

---
 src/components/react_button/react_button.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/components/react_button/react_button.js b/src/components/react_button/react_button.js
index 58fbb61b..47a48623 100644
--- a/src/components/react_button/react_button.js
+++ b/src/components/react_button/react_button.js
@@ -41,7 +41,7 @@ const ReactButton = {
     },
     focusInput () {
       this.$nextTick(() => {
-        const input = document.querySelector('.popover.ReactButton').querySelector('input')
+        const input = document.querySelector('.reaction-picker-filter > input')
         if (input) input.focus()
       })
     },
-- 
cgit v1.2.3-70-g09d2


From d21ce77670d1a639929aac468e0b4c88cf0b2186 Mon Sep 17 00:00:00 2001
From: flxy <flxy@staycomfy.dev>
Date: Thu, 12 Jan 2023 09:45:10 +0100
Subject: Use splice instead of delete

---
 src/components/settings_modal/tabs/profile_tab.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/components/settings_modal/tabs/profile_tab.js b/src/components/settings_modal/tabs/profile_tab.js
index b86faef0..ff2ccef2 100644
--- a/src/components/settings_modal/tabs/profile_tab.js
+++ b/src/components/settings_modal/tabs/profile_tab.js
@@ -153,7 +153,7 @@ const ProfileTab = {
       return false
     },
     deleteField (index, event) {
-      this.$delete(this.newFields, index)
+      this.newFields.splice(index, 1)
     },
     uploadFile (slot, e) {
       const file = e.target.files[0]
-- 
cgit v1.2.3-70-g09d2


From a28032fa58ff341b8815a0651d621ed358efd168 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Fri, 13 Jan 2023 00:37:42 -0500
Subject: Disable no-shorthand for certain props for better readability

---
 .stylelintrc.json                           | 17 ++++++++++++++++-
 src/App.scss                                |  2 --
 src/components/desktop_nav/desktop_nav.scss |  2 --
 src/components/user_card/user_card.scss     |  9 ++++-----
 4 files changed, 20 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/.stylelintrc.json b/.stylelintrc.json
index 7517362c..d6689cc0 100644
--- a/.stylelintrc.json
+++ b/.stylelintrc.json
@@ -21,6 +21,21 @@
     "import-notation": null,
     "custom-property-pattern": null,
     "keyframes-name-pattern": null,
-    "scss/operator-no-newline-after": null
+    "scss/operator-no-newline-after": null,
+    "declaration-block-no-redundant-longhand-properties": [
+      true,
+      {
+        "ignoreShorthands": [
+          "grid-template",
+          "margin",
+          "padding",
+          "border",
+          "border-width",
+          "border-style",
+          "border-color",
+          "border-radius"
+        ]
+      }
+    ]
   }
 }
diff --git a/src/App.scss b/src/App.scss
index 0d2daa7d..be5dce9d 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -214,10 +214,8 @@ nav {
   grid-template-columns:
     var(--effectiveSidebarColumnWidth)
     var(--effectiveContentColumnWidth);
-  /* stylelint-disable declaration-block-no-redundant-longhand-properties */
   grid-template-areas: "sidebar content";
   grid-template-rows: 1fr;
-  /* stylelint-enable declaration-block-no-redundant-longhand-properties */
   box-sizing: border-box;
   margin: 0 auto;
   align-content: flex-start;
diff --git a/src/components/desktop_nav/desktop_nav.scss b/src/components/desktop_nav/desktop_nav.scss
index 00f434bf..c7e02936 100644
--- a/src/components/desktop_nav/desktop_nav.scss
+++ b/src/components/desktop_nav/desktop_nav.scss
@@ -14,11 +14,9 @@
 
   .inner-nav {
     display: grid;
-    /* stylelint-disable declaration-block-no-redundant-longhand-properties */
     grid-template-rows: var(--navbar-height);
     grid-template-columns: 2fr auto 2fr;
     grid-template-areas: "sitename logo actions";
-    /* stylelint-enable declaration-block-no-redundant-longhand-properties */
     box-sizing: border-box;
     padding: 0 1.2em;
     margin: auto;
diff --git a/src/components/user_card/user_card.scss b/src/components/user_card/user_card.scss
index 942673c4..d56b6672 100644
--- a/src/components/user_card/user_card.scss
+++ b/src/components/user_card/user_card.scss
@@ -43,11 +43,10 @@
     mask-composite: exclude;
     background-size: cover;
     mask-size: 100% 60%;
-    border-radius:
-      calc(var(--__roundnessTop, --panelRadius) - 1px)
-      calc(var(--__roundnessTop, --panelRadius) - 1px)
-      calc(var(--__roundnessBottom, --panelRadius) - 1px)
-      calc(var(--__roundnessBottom, --panelRadius) - 1px);
+    border-top-left-radius: calc(var(--__roundnessTop, --panelRadius) - 1px);
+    border-top-right-radius: calc(var(--__roundnessTop, --panelRadius) - 1px);
+    border-bottom-left-radius: calc(var(--__roundnessBottom, --panelRadius) - 1px);
+    border-bottom-right-radius: calc(var(--__roundnessBottom, --panelRadius) - 1px);
     background-color: var(--profileBg);
     z-index: -2;
 
-- 
cgit v1.2.3-70-g09d2


From 274d384572f5699ddf0b43065235b32304954ca1 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Sat, 14 Jan 2023 10:19:08 -0500
Subject: Make modal easier to close if there is only one image

---
 src/components/media_modal/media_modal.js  | 5 +++++
 src/components/media_modal/media_modal.vue | 1 +
 src/components/swipe_click/swipe_click.js  | 7 +++++++
 3 files changed, 13 insertions(+)

(limited to 'src')

diff --git a/src/components/media_modal/media_modal.js b/src/components/media_modal/media_modal.js
index ff993664..05ef9fbe 100644
--- a/src/components/media_modal/media_modal.js
+++ b/src/components/media_modal/media_modal.js
@@ -63,6 +63,11 @@ const MediaModal = {
     },
     type () {
       return this.currentMedia ? this.getType(this.currentMedia) : null
+    },
+    swipeDisableClickThreshold () {
+      // If there is only one media, allow more mouse movements to close the modal
+      // because there is less chance that the user wants to switch to another image
+      return () => this.canNavigate ? 1 : 30
     }
   },
   methods: {
diff --git a/src/components/media_modal/media_modal.vue b/src/components/media_modal/media_modal.vue
index d59055b3..8e1adda5 100644
--- a/src/components/media_modal/media_modal.vue
+++ b/src/components/media_modal/media_modal.vue
@@ -10,6 +10,7 @@
       class="modal-image-container"
       :direction="swipeDirection"
       :threshold="swipeThreshold"
+      :disable-click-threshold="swipeDisableClickThreshold"
       @preview-requested="handleSwipePreview"
       @swipe-finished="handleSwipeEnd"
       @swipeless-clicked="hide"
diff --git a/src/components/swipe_click/swipe_click.js b/src/components/swipe_click/swipe_click.js
index 238e6df8..2a423901 100644
--- a/src/components/swipe_click/swipe_click.js
+++ b/src/components/swipe_click/swipe_click.js
@@ -5,6 +5,8 @@ import GestureService from '../../services/gesture_service/gesture_service'
  *   direction: a vector that indicates the direction of the intended swipe
  *   threshold: the minimum distance in pixels the swipe has moved on `direction'
  *              for swipe-finished() to have a non-zero sign
+ *   disableClickThreshold: the minimum distance in pixels for the swipe to
+ *                          not trigger a click
  *   perpendicularTolerance: see gesture_service
  *
  * Events:
@@ -34,6 +36,10 @@ const SwipeClick = {
       type: Function,
       default: () => 30
     },
+    disableClickThreshold: {
+      type: Function,
+      default: () => 1
+    },
     perpendicularTolerance: {
       type: Number,
       default: 1.0
@@ -72,6 +78,7 @@ const SwipeClick = {
     this.$gesture = new GestureService.SwipeAndClickGesture({
       direction: this.direction,
       threshold: this.threshold,
+      disableClickThreshold: this.disableClickThreshold,
       perpendicularTolerance: this.perpendicularTolerance,
       swipePreviewCallback: this.preview,
       swipeEndCallback: this.end,
-- 
cgit v1.2.3-70-g09d2


From c69878cee7a77364afe6ed44a6df109e84273f3b Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Sat, 14 Jan 2023 22:17:21 -0500
Subject: Display better error message for unauthenticated timelines

---
 src/services/api/api.service.js | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

(limited to 'src')

diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index 00d1c020..af12265e 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -734,26 +734,22 @@ const fetchTimeline = ({
   const queryString = map(params, (param) => `${param[0]}=${param[1]}`).join('&')
   url += `?${queryString}`
 
-  let status = ''
-  let statusText = ''
-
-  let pagination = {}
   return fetch(url, { headers: authHeaders(credentials) })
-    .then((data) => {
-      status = data.status
-      statusText = data.statusText
-      pagination = parseLinkHeaderPagination(data.headers.get('Link'), {
-        flakeId: timeline !== 'bookmarks' && timeline !== 'notifications'
-      })
-      return data
-    })
-    .then((data) => data.json())
-    .then((data) => {
-      if (!data.errors) {
+    .then(async (response) => {
+      const success = response.ok
+
+      const data = await response.json()
+
+      if (success && !data.errors) {
+        const pagination = parseLinkHeaderPagination(response.headers.get('Link'), {
+          flakeId: timeline !== 'bookmarks' && timeline !== 'notifications'
+        })
+
         return { data: data.map(isNotifications ? parseNotification : parseStatus), pagination }
       } else {
-        data.status = status
-        data.statusText = statusText
+        data.errors ||= []
+        data.status = response.status
+        data.statusText = response.statusText
         return data
       }
     })
-- 
cgit v1.2.3-70-g09d2


From 8acbc31a20069c737a65a9bc38f760741560574d Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Sat, 14 Jan 2023 22:36:21 -0500
Subject: Use bdi to isolate repeater name

---
 src/components/status/status.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 82eb7ac6..f3bdb19d 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -84,7 +84,7 @@
           :user="statusoid.user"
         />
         <div class="right-side faint">
-          <span
+          <bdi
             class="status-username repeater-name"
             :title="retweeter"
           >
@@ -101,7 +101,7 @@
               v-else
               :to="retweeterProfileLink"
             >{{ retweeter }}</router-link>
-          </span>
+          </bdi>
           {{ ' ' }}
           <FAIcon
             icon="retweet"
-- 
cgit v1.2.3-70-g09d2


From fa3b07352bf37a3cb90282726b74e75b40067722 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Sat, 14 Jan 2023 22:43:18 -0500
Subject: Debounce mute word setting

---
 src/components/settings_modal/tabs/filtering_tab.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/components/settings_modal/tabs/filtering_tab.js b/src/components/settings_modal/tabs/filtering_tab.js
index 5354e5db..7c37f0bc 100644
--- a/src/components/settings_modal/tabs/filtering_tab.js
+++ b/src/components/settings_modal/tabs/filtering_tab.js
@@ -1,4 +1,4 @@
-import { filter, trim } from 'lodash'
+import { filter, trim, debounce } from 'lodash'
 import BooleanSetting from '../helpers/boolean_setting.vue'
 import ChoiceSetting from '../helpers/choice_setting.vue'
 import IntegerSetting from '../helpers/integer_setting.vue'
@@ -29,11 +29,16 @@ const FilteringTab = {
       },
       set (value) {
         this.muteWordsStringLocal = value
+        this.debouncedSetMuteWords(value)
+      }
+    },
+    debouncedSetMuteWords () {
+      return debounce((value) => {
         this.$store.dispatch('setOption', {
           name: 'muteWords',
           value: filter(value.split('\n'), (word) => trim(word).length > 0)
         })
-      }
+      }, 1000)
     }
   },
   // Updating nested properties
-- 
cgit v1.2.3-70-g09d2


From a58a6d3c357592f34007c67bbf7fdf740864212a Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Sat, 14 Jan 2023 23:20:28 -0500
Subject: Fix notification attachment icon overflow

---
 src/components/attachment/attachment.js          | 4 +++-
 src/components/attachment/attachment.scss        | 7 ++++++-
 src/components/attachment/attachment.vue         | 5 +++--
 src/components/gallery/gallery.js                | 1 +
 src/components/gallery/gallery.vue               | 1 +
 src/components/status_content/status_content.vue | 1 +
 6 files changed, 15 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/components/attachment/attachment.js b/src/components/attachment/attachment.js
index 5dc50475..6e14b24d 100644
--- a/src/components/attachment/attachment.js
+++ b/src/components/attachment/attachment.js
@@ -36,6 +36,7 @@ library.add(
 const Attachment = {
   props: [
     'attachment',
+    'compact',
     'description',
     'hideDescription',
     'nsfw',
@@ -71,7 +72,8 @@ const Attachment = {
         {
           '-loading': this.loading,
           '-nsfw-placeholder': this.hidden,
-          '-editable': this.edit !== undefined
+          '-editable': this.edit !== undefined,
+          '-compact': this.compact
         },
         '-type-' + this.type,
         this.size && '-size-' + this.size,
diff --git a/src/components/attachment/attachment.scss b/src/components/attachment/attachment.scss
index b2dea98d..966acc68 100644
--- a/src/components/attachment/attachment.scss
+++ b/src/components/attachment/attachment.scss
@@ -102,7 +102,6 @@
     padding-top: 0.5em;
   }
 
-
   .play-icon {
     position: absolute;
     font-size: 64px;
@@ -265,4 +264,10 @@
       object-fit: cover;
     }
   }
+
+  &.-compact {
+    .placeholder-container {
+      padding-bottom: 0.5em;
+    }
+  }
 }
diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue
index 2a89886d..79f62806 100644
--- a/src/components/attachment/attachment.vue
+++ b/src/components/attachment/attachment.vue
@@ -162,10 +162,11 @@
         target="_blank"
       >
         <FAIcon
-          size="5x"
+          :size="compact ? '2x' : '5x'"
           :icon="placeholderIconClass"
+          :title="localDescription"
         />
-        <p>
+        <p v-if="!compact">
           {{ localDescription }}
         </p>
       </a>
diff --git a/src/components/gallery/gallery.js b/src/components/gallery/gallery.js
index 4e1bda55..e86a3eea 100644
--- a/src/components/gallery/gallery.js
+++ b/src/components/gallery/gallery.js
@@ -4,6 +4,7 @@ import { sumBy, set } from 'lodash'
 const Gallery = {
   props: [
     'attachments',
+    'compact',
     'limitRows',
     'descriptions',
     'limit',
diff --git a/src/components/gallery/gallery.vue b/src/components/gallery/gallery.vue
index ccf6e3e2..bc18f545 100644
--- a/src/components/gallery/gallery.vue
+++ b/src/components/gallery/gallery.vue
@@ -20,6 +20,7 @@
             v-for="(attachment, attachmentIndex) in row.items"
             :key="attachment.id"
             class="gallery-item"
+            :compact="compact"
             :nsfw="nsfw"
             :attachment="attachment"
             :size="size"
diff --git a/src/components/status_content/status_content.vue b/src/components/status_content/status_content.vue
index e2120f7a..c0e5c0b9 100644
--- a/src/components/status_content/status_content.vue
+++ b/src/components/status_content/status_content.vue
@@ -33,6 +33,7 @@
       <gallery
         v-if="status.attachments.length !== 0"
         class="attachments media-body"
+        :compact="compact"
         :nsfw="nsfwClickthrough"
         :attachments="status.attachments"
         :limit="compact ? 1 : 0"
-- 
cgit v1.2.3-70-g09d2


From 10af09280002cc347e7b033e1a99ece072b4d804 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Sun, 15 Jan 2023 00:08:59 -0500
Subject: Add status authors from search results to store

---
 src/modules/statuses.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 5a5c7b1b..77dd7e1c 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -765,6 +765,7 @@ const statuses = {
       return store.rootState.api.backendInteractor.search2({ q, resolve, limit, offset, following, type })
         .then((data) => {
           store.commit('addNewUsers', data.accounts)
+          store.commit('addNewUsers', data.statuses.map(s => s.user).filter(u => u))
           store.commit('addNewStatuses', { statuses: data.statuses })
           return data
         })
-- 
cgit v1.2.3-70-g09d2


From bd58ccd3b6db00c98520987c42fdea40d8e8dd2f Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Sun, 15 Jan 2023 22:39:20 -0500
Subject: Fix mobile layout margin

---
 src/App.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/App.scss b/src/App.scss
index be5dce9d..1c4c8941 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -335,7 +335,7 @@ nav {
 
     .column {
       padding-top: 0;
-      margin-top: var(--navbar-height) 0 0 0;
+      margin: var(--navbar-height) 0 0 0;
     }
 
     .panel-heading,
-- 
cgit v1.2.3-70-g09d2


From 5b56b6b9fdd9ad82a8f1c24d03024be0e7902c80 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Tue, 17 Jan 2023 19:55:16 -0500
Subject: Populate user card on receiving chats

---
 src/modules/chats.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/modules/chats.js b/src/modules/chats.js
index f28c2603..0f1540db 100644
--- a/src/modules/chats.js
+++ b/src/modules/chats.js
@@ -65,6 +65,7 @@ const chats = {
       const newChatMessageSideEffects = (chat) => {
         maybeShowChatNotification(store, chat)
       }
+      commit('addNewUsers', chats.map(k => k.account).filter(k => k))
       commit('addNewChats', { dispatch, chats, rootGetters, newChatMessageSideEffects })
     },
     updateChat ({ commit }, { chat }) {
-- 
cgit v1.2.3-70-g09d2


From d1876503bc560b9c62d03e219021593cb954fcf4 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Fri, 20 Jan 2023 12:33:19 -0500
Subject: Display delete status errors

---
 src/i18n/en.json                |  1 +
 src/modules/statuses.js         | 14 ++++++++++++--
 src/services/api/api.service.js |  5 +++--
 3 files changed, 16 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/i18n/en.json b/src/i18n/en.json
index 1ee1147a..5e653ad8 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -844,6 +844,7 @@
     "favorites": "Favorites",
     "repeats": "Repeats",
     "delete": "Delete status",
+    "delete_error": "Error deleting status: {0}",
     "edit": "Edit status",
     "edited_at": "(last edited {time})",
     "pin": "Pin on profile",
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 77dd7e1c..93a4a957 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -615,9 +615,19 @@ const statuses = {
     fetchStatusHistory ({ rootState, dispatch }, status) {
       return apiService.fetchStatusHistory({ status })
     },
-    deleteStatus ({ rootState, commit }, status) {
-      commit('setDeleted', { status })
+    deleteStatus ({ rootState, commit, dispatch }, status) {
       apiService.deleteStatus({ id: status.id, credentials: rootState.users.currentUser.credentials })
+        .then((_) => {
+          commit('setDeleted', { status })
+        })
+        .catch((e) => {
+          dispatch('pushGlobalNotice', {
+            level: 'error',
+            messageKey: 'status.delete_error',
+            messageArgs: [e.message],
+            timeout: 5000
+          })
+        })
     },
     deleteStatusById ({ rootState, commit }, id) {
       const status = rootState.statuses.allStatusesObject[id]
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index af12265e..609f6790 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -923,8 +923,9 @@ const editStatus = ({
 }
 
 const deleteStatus = ({ id, credentials }) => {
-  return fetch(MASTODON_DELETE_URL(id), {
-    headers: authHeaders(credentials),
+  return promisedRequest({
+    url: MASTODON_DELETE_URL(id),
+    credentials,
     method: 'DELETE'
   })
 }
-- 
cgit v1.2.3-70-g09d2


From 3ad5df805e22ddd473fdaa9a92df335a61fad7fc Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Wed, 9 Feb 2022 15:04:53 -0500
Subject: Add delete status confirm modal

---
 src/components/extra_buttons/extra_buttons.js  | 31 +++++++++++++++++++++-----
 src/components/extra_buttons/extra_buttons.vue | 10 +++++++++
 src/modules/config.js                          |  6 +++++
 src/modules/instance.js                        |  6 +++++
 4 files changed, 47 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/components/extra_buttons/extra_buttons.js b/src/components/extra_buttons/extra_buttons.js
index 3dc968c9..b1458d30 100644
--- a/src/components/extra_buttons/extra_buttons.js
+++ b/src/components/extra_buttons/extra_buttons.js
@@ -1,4 +1,5 @@
 import Popover from '../popover/popover.vue'
+import ConfirmModal from '../confirm_modal/confirm_modal.vue'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faEllipsisH,
@@ -32,10 +33,14 @@ library.add(
 
 const ExtraButtons = {
   props: ['status'],
-  components: { Popover },
+  components: {
+    Popover,
+    ConfirmModal
+  },
   data () {
     return {
-      expanded: false
+      expanded: false,
+      showingDeleteDialog: false
     }
   },
   methods: {
@@ -46,11 +51,22 @@ const ExtraButtons = {
       this.expanded = false
     },
     deleteStatus () {
-      const confirmed = window.confirm(this.$t('status.delete_confirm'))
-      if (confirmed) {
-        this.$store.dispatch('deleteStatus', { id: this.status.id })
+      if (this.shouldConfirmDelete) {
+        this.showDeleteStatusConfirmDialog()
+      } else {
+        this.doDeleteStatus()
       }
     },
+    doDeleteStatus () {
+      this.$store.dispatch('deleteStatus', { id: this.status.id })
+      hideDeleteStatusConfirmDialog()
+    },
+    showDeleteStatusConfirmDialog () {
+      this.showingDeleteDialog = true
+    },
+    hideDeleteStatusConfirmDialog () {
+      this.showingDeleteDialog = false
+    },
     pinStatus () {
       this.$store.dispatch('pinStatus', this.status.id)
         .then(() => this.$emit('onSuccess'))
@@ -133,7 +149,10 @@ const ExtraButtons = {
     isEdited () {
       return this.status.edited_at !== null
     },
-    editingAvailable () { return this.$store.state.instance.editingAvailable }
+    editingAvailable () { return this.$store.state.instance.editingAvailable },
+    shouldConfirmDelete () {
+      return this.$store.getters.mergedConfig.modalOnDelete
+    }
   }
 }
 
diff --git a/src/components/extra_buttons/extra_buttons.vue b/src/components/extra_buttons/extra_buttons.vue
index a84d47f6..293f6d68 100644
--- a/src/components/extra_buttons/extra_buttons.vue
+++ b/src/components/extra_buttons/extra_buttons.vue
@@ -165,6 +165,16 @@
           />
         </FALayers>
       </span>
+      <ConfirmModal
+        :showing="showingDeleteDialog"
+        :title="$t('status.delete_confirm_title')"
+        :cancel-text="$t('status.delete_confirm_cancel_button')"
+        :confirm-text="$t('status.delete_confirm_accept_button')"
+        @cancelled="hideDeleteStatusConfirmDialog"
+        @accepted="doDeleteStatus"
+      >
+        {{ $t('status.delete_confirm') }}
+      </ConfirmModal>
     </template>
   </Popover>
 </template>
diff --git a/src/modules/config.js b/src/modules/config.js
index 3cd6888f..a8949030 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -78,6 +78,12 @@ export const defaultState = {
   minimalScopesMode: undefined, // instance default
   // This hides statuses filtered via a word filter
   hideFilteredStatuses: undefined, // instance default
+  modalOnRepeat: undefined, // instance default
+  modalOnUnfollow: undefined, // instance default
+  modalOnBlock: undefined, // instance default
+  modalOnMute: undefined, // instance default
+  modalOnDelete: undefined, // instance default
+  modalOnLogout: undefined, // instance default
   playVideosInModal: false,
   useOneClickNsfw: false,
   useContainFit: true,
diff --git a/src/modules/instance.js b/src/modules/instance.js
index 8e8d13d3..6fc3830c 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -71,6 +71,12 @@ const defaultState = {
   hideSitename: false,
   hideUserStats: false,
   muteBotStatuses: false,
+  modalOnRepeat: false,
+  modalOnUnfollow: false,
+  modalOnBlock: true,
+  modalOnMute: false,
+  modalOnDelete: true,
+  modalOnLogout: true,
   loginMethod: 'password',
   logo: '/static/logo.svg',
   logoMargin: '.2em',
-- 
cgit v1.2.3-70-g09d2


From 1e352fbfacddc205397153bf5087484d550129e6 Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Wed, 9 Feb 2022 15:05:21 -0500
Subject: Add English translations for delete status confirm modal

---
 src/components/extra_buttons/extra_buttons.js | 2 +-
 src/i18n/en.json                              | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/components/extra_buttons/extra_buttons.js b/src/components/extra_buttons/extra_buttons.js
index b1458d30..48b960b2 100644
--- a/src/components/extra_buttons/extra_buttons.js
+++ b/src/components/extra_buttons/extra_buttons.js
@@ -59,7 +59,7 @@ const ExtraButtons = {
     },
     doDeleteStatus () {
       this.$store.dispatch('deleteStatus', { id: this.status.id })
-      hideDeleteStatusConfirmDialog()
+      this.hideDeleteStatusConfirmDialog()
     },
     showDeleteStatusConfirmDialog () {
       this.showingDeleteDialog = true
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 1ee1147a..b2bec692 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -852,6 +852,9 @@
     "bookmark": "Bookmark",
     "unbookmark": "Unbookmark",
     "delete_confirm": "Do you really want to delete this status?",
+    "delete_confirm_title": "Delete confirmation",
+    "delete_confirm_accept_button": "Delete",
+    "delete_confirm_cancel_button": "Keep",
     "reply_to": "Reply to",
     "mentions": "Mentions",
     "replies_list": "Replies:",
-- 
cgit v1.2.3-70-g09d2


From 1ff2948aeb485ef48a4add6310ba8fb9d43d262c Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Wed, 9 Feb 2022 15:17:06 -0500
Subject: Add setting entries for whether to show confirmation dialogs

---
 src/components/settings_modal/tabs/general_tab.vue | 35 ++++++++++++++++++++++
 1 file changed, 35 insertions(+)

(limited to 'src')

diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index 582cb288..906c3758 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -148,6 +148,41 @@
             </SizeSetting>
           </div>
         </li>
+        <li class="select-multiple">
+          <span class="label">{{ $t('settings.confirm_dialogs') }}</span>
+          <ul class="option-list">
+            <li>
+              <BooleanSetting path="modalOnRepeat">
+                {{ $t('settings.confirm_dialogs_repeat') }}
+              </BooleanSetting>
+            </li>
+            <li>
+              <BooleanSetting path="modalOnUnfollow">
+                {{ $t('settings.confirm_dialogs_unfollow') }}
+              </BooleanSetting>
+            </li>
+            <li>
+              <BooleanSetting path="modalOnBlock">
+                {{ $t('settings.confirm_dialogs_block') }}
+              </BooleanSetting>
+            </li>
+            <li>
+              <BooleanSetting path="modalOnMute">
+                {{ $t('settings.confirm_dialogs_mute') }}
+              </BooleanSetting>
+            </li>
+            <li>
+              <BooleanSetting path="modalOnDelete">
+                {{ $t('settings.confirm_dialogs_delete') }}
+              </BooleanSetting>
+            </li>
+            <li>
+              <BooleanSetting path="modalOnLogout">
+                {{ $t('settings.confirm_dialogs_logout') }}
+              </BooleanSetting>
+            </li>
+          </ul>
+        </li>
       </ul>
     </div>
     <div class="setting-item">
-- 
cgit v1.2.3-70-g09d2


From f8b522e36dd08a08cd7071c30b5e4e61832275aa Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Wed, 9 Feb 2022 15:17:49 -0500
Subject: Add English translations for setting entries

---
 src/i18n/en.json | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src')

diff --git a/src/i18n/en.json b/src/i18n/en.json
index b2bec692..ed21e2a5 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -416,6 +416,13 @@
     "composing": "Composing",
     "confirm_new_password": "Confirm new password",
     "current_password": "Current password",
+    "confirm_dialogs": "Ask for confirmation when",
+    "confirm_dialogs_repeat": "repeating a status",
+    "confirm_dialogs_unfollow": "unfollowing a user",
+    "confirm_dialogs_block": "blocking a user",
+    "confirm_dialogs_mute": "muting a user",
+    "confirm_dialogs_delete": "deleting a status",
+    "confirm_dialogs_logout": "logging out",
     "mutes_and_blocks": "Mutes and Blocks",
     "data_import_export_tab": "Data import / export",
     "default_vis": "Default visibility scope",
-- 
cgit v1.2.3-70-g09d2


From 4d175235f1bc72c369c5e5fc8ed1997b384c0b83 Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Wed, 9 Feb 2022 15:49:39 -0500
Subject: Add confirmation for repeating

---
 src/components/retweet_button/retweet_button.js  | 24 +++++++++++++++++++++++-
 src/components/retweet_button/retweet_button.vue | 10 ++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/components/retweet_button/retweet_button.js b/src/components/retweet_button/retweet_button.js
index 4d92b5fa..198b6c14 100644
--- a/src/components/retweet_button/retweet_button.js
+++ b/src/components/retweet_button/retweet_button.js
@@ -1,3 +1,4 @@
+import ConfirmModal from '../confirm_modal/confirm_modal.vue'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faRetweet,
@@ -15,13 +16,24 @@ library.add(
 
 const RetweetButton = {
   props: ['status', 'loggedIn', 'visibility'],
+  components: {
+    ConfirmModal
+  },
   data () {
     return {
-      animated: false
+      animated: false,
+      showingConfirmDialog: false
     }
   },
   methods: {
     retweet () {
+      if (!this.status.repeated && this.shouldConfirmRepeat) {
+        this.showConfirmDialog()
+      } else {
+        this.doRetweet()
+      }
+    },
+    doRetweet () {
       if (!this.status.repeated) {
         this.$store.dispatch('retweet', { id: this.status.id })
       } else {
@@ -31,6 +43,13 @@ const RetweetButton = {
       setTimeout(() => {
         this.animated = false
       }, 500)
+      this.hideConfirmDialog()
+    },
+    showConfirmDialog () {
+      this.showingConfirmDialog = true
+    },
+    hideConfirmDialog () {
+      this.showingConfirmDialog = false
     }
   },
   computed: {
@@ -39,6 +58,9 @@ const RetweetButton = {
     },
     remoteInteractionLink () {
       return this.$store.getters.remoteInteractionLink({ statusId: this.status.id })
+    },
+    shouldConfirmRepeat () {
+      return this.mergedConfig.modalOnRepeat
     }
   }
 }
diff --git a/src/components/retweet_button/retweet_button.vue b/src/components/retweet_button/retweet_button.vue
index 7700ee0d..38d4dc3f 100644
--- a/src/components/retweet_button/retweet_button.vue
+++ b/src/components/retweet_button/retweet_button.vue
@@ -59,6 +59,16 @@
     >
       {{ status.repeat_num }}
     </span>
+    <confirm-modal
+      :showing="showingConfirmDialog"
+      :title="$t('status.repeat_confirm_title')"
+      :confirm-text="$t('status.repeat_confirm_accept_button')"
+      :cancel-text="$t('status.repeat_confirm_cancel_button')"
+      @accepted="doRetweet"
+      @cancelled="hideConfirmDialog"
+    >
+      {{ $t('status.repeat_confirm') }}
+    </confirm-modal>
   </div>
 </template>
 
-- 
cgit v1.2.3-70-g09d2


From a0b886459bf5e146b8b7654d97ba8838bfac29de Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Wed, 9 Feb 2022 15:50:04 -0500
Subject: Add confirmation for following

---
 src/components/follow_button/follow_button.js  | 25 ++++++++++++++++-
 src/components/follow_button/follow_button.vue | 38 ++++++++++++++++++++------
 2 files changed, 53 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/components/follow_button/follow_button.js b/src/components/follow_button/follow_button.js
index 3edbcb86..0a74a7a1 100644
--- a/src/components/follow_button/follow_button.js
+++ b/src/components/follow_button/follow_button.js
@@ -1,12 +1,20 @@
+import ConfirmModal from '../confirm_modal/confirm_modal.vue'
 import { requestFollow, requestUnfollow } from '../../services/follow_manipulate/follow_manipulate'
 export default {
   props: ['relationship', 'user', 'labelFollowing', 'buttonClass'],
+  components: {
+    ConfirmModal
+  },
   data () {
     return {
-      inProgress: false
+      inProgress: false,
+      showingConfirmUnfollow: false,
     }
   },
   computed: {
+    shouldConfirmUnfollow () {
+      return this.$store.getters.mergedConfig.modalOnUnfollow
+    },
     isPressed () {
       return this.inProgress || this.relationship.following
     },
@@ -35,6 +43,12 @@ export default {
     }
   },
   methods: {
+    showConfirmUnfollow () {
+      this.showingConfirmUnfollow = true
+    },
+    hideConfirmUnfollow () {
+      this.showingConfirmUnfollow = false
+    },
     onClick () {
       this.relationship.following || this.relationship.requested ? this.unfollow() : this.follow()
     },
@@ -45,12 +59,21 @@ export default {
       })
     },
     unfollow () {
+      if (this.shouldConfirmUnfollow) {
+        this.showConfirmUnfollow()
+      } else {
+        this.doUnfollow()
+      }
+    },
+    doUnfollow () {
       const store = this.$store
       this.inProgress = true
       requestUnfollow(this.relationship.id, store).then(() => {
         this.inProgress = false
         store.commit('removeStatus', { timeline: 'friends', userId: this.relationship.id })
       })
+
+      this.hideConfirmUnfollow()
     }
   }
 }
diff --git a/src/components/follow_button/follow_button.vue b/src/components/follow_button/follow_button.vue
index 965d5256..4fc2233a 100644
--- a/src/components/follow_button/follow_button.vue
+++ b/src/components/follow_button/follow_button.vue
@@ -1,13 +1,33 @@
 <template>
-  <button
-    class="btn button-default follow-button"
-    :class="{ toggled: isPressed }"
-    :disabled="disabled"
-    :title="title"
-    @click="onClick"
-  >
-    {{ label }}
-  </button>
+  <div>
+    <button
+      class="btn button-default follow-button"
+      :class="{ toggled: isPressed }"
+      :disabled="disabled"
+      :title="title"
+      @click="onClick"
+    >
+      {{ label }}
+    </button>
+    <confirm-modal
+      :showing="showingConfirmUnfollow"
+      :title="$t('user_card.unfollow_confirm_title')"
+      :confirm-text="$t('user_card.unfollow_confirm_accept_button')"
+      :cancel-text="$t('user_card.unfollow_confirm_cancel_button')"
+      @accepted="doUnfollow"
+      @cancelled="hideConfirmUnfollow"
+    >
+      <i18n
+        path="user_card.unfollow_confirm"
+        tag="span"
+      >
+        <span
+          place="user"
+          v-text="user.screen_name_ui"
+        />
+      </i18n>
+    </confirm-modal>
+  </div>
 </template>
 
 <script src="./follow_button.js"></script>
-- 
cgit v1.2.3-70-g09d2


From 0684f19d1b903a7d941aa7cfa366044b98d97659 Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Wed, 9 Feb 2022 15:50:25 -0500
Subject: Add ConfirmModal comp

---
 src/components/confirm_modal/confirm_modal.js  | 42 ++++++++++++++++++++++++++
 src/components/confirm_modal/confirm_modal.vue | 28 +++++++++++++++++
 2 files changed, 70 insertions(+)
 create mode 100644 src/components/confirm_modal/confirm_modal.js
 create mode 100644 src/components/confirm_modal/confirm_modal.vue

(limited to 'src')

diff --git a/src/components/confirm_modal/confirm_modal.js b/src/components/confirm_modal/confirm_modal.js
new file mode 100644
index 00000000..bb5e9d97
--- /dev/null
+++ b/src/components/confirm_modal/confirm_modal.js
@@ -0,0 +1,42 @@
+import DialogModal from '../dialog_modal/dialog_modal.vue'
+
+/**
+ * This component emits the following events:
+ * cancelled, emitted when the action should not be performed;
+ * accepted, emitted when the action should be performed;
+ *
+ * The caller should close this dialog after receiving any of the two events.
+ */
+const ConfirmModal = {
+  components: {
+    DialogModal
+  },
+  data: {
+  },
+  props: {
+    showing: {
+      type: Boolean
+    },
+    title: {
+      type: String
+    },
+    cancelText: {
+      type: String
+    },
+    confirmText: {
+      type: String
+    }
+  },
+  computed: {
+  },
+  methods: {
+    onCancel () {
+      this.$emit('cancelled')
+    },
+    onAccept () {
+      this.$emit('accepted')
+    }
+  }
+}
+
+export default ConfirmModal
diff --git a/src/components/confirm_modal/confirm_modal.vue b/src/components/confirm_modal/confirm_modal.vue
new file mode 100644
index 00000000..250a6984
--- /dev/null
+++ b/src/components/confirm_modal/confirm_modal.vue
@@ -0,0 +1,28 @@
+<template>
+  <dialog-modal
+    v-if="showing"
+    :onCancel="onCancel"
+  >
+    <template v-slot:header>
+      <span v-text="title"></span>
+    </template>
+
+    <slot></slot>
+
+    <template v-slot:footer>
+      <button
+        class="btn button-default"
+        v-text="confirmText"
+        @click.prevent="onAccept"
+      ></button>
+
+      <button
+        class="btn button-default"
+        v-text="cancelText"
+        @click.prevent="onCancel"
+      ></button>
+    </template>
+  </dialog-modal>
+</template>
+
+<script src="./confirm_modal.js"></script>
-- 
cgit v1.2.3-70-g09d2


From a0c6d642af277954585b32724de4f2b157b02e42 Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Wed, 9 Feb 2022 16:08:47 -0500
Subject: Add English translations for repeat and unfollow confirmation

---
 src/i18n/en.json | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src')

diff --git a/src/i18n/en.json b/src/i18n/en.json
index ed21e2a5..7e23a849 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -850,6 +850,10 @@
   "status": {
     "favorites": "Favorites",
     "repeats": "Repeats",
+    "repeat_confirm": "Do you really want to repeat this status?",
+    "repeat_confirm_title": "Repeat confirmation",
+    "repeat_confirm_accept_button": "Repeat",
+    "repeat_confirm_cancel_button": "Do not repeat",
     "delete": "Delete status",
     "edit": "Edit status",
     "edited_at": "(last edited {time})",
@@ -919,6 +923,10 @@
     "follow_sent": "Request sent!",
     "follow_progress": "Requesting…",
     "follow_unfollow": "Unfollow",
+    "unfollow_confirm_title": "Unfollow confirmation",
+    "unfollow_confirm": "Do you really want to unfollow {user}?",
+    "unfollow_confirm_accept_button": "Unfollow",
+    "unfollow_confirm_cancel_button": "Do not unfollow",
     "followees": "Following",
     "followers": "Followers",
     "following": "Following!",
-- 
cgit v1.2.3-70-g09d2


From e7e35ead09589e1673dd6b6fdd24f7679ef108bf Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Wed, 9 Feb 2022 16:21:19 -0500
Subject: Add confirmation for muting

---
 src/components/user_card/user_card.js  | 24 ++++++++++++++++++++++--
 src/components/user_card/user_card.vue | 18 ++++++++++++++++++
 2 files changed, 40 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/components/user_card/user_card.js b/src/components/user_card/user_card.js
index 67879307..1bcc4341 100644
--- a/src/components/user_card/user_card.js
+++ b/src/components/user_card/user_card.js
@@ -8,6 +8,7 @@ import UserNote from '../user_note/user_note.vue'
 import Select from '../select/select.vue'
 import UserLink from '../user_link/user_link.vue'
 import RichContent from 'src/components/rich_content/rich_content.jsx'
+import ConfirmModal from '../confirm_modal/confirm_modal.vue'
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
 import { mapGetters } from 'vuex'
 import { library } from '@fortawesome/fontawesome-svg-core'
@@ -46,7 +47,8 @@ export default {
   data () {
     return {
       followRequestInProgress: false,
-      betterShadow: this.$store.state.interface.browserSupport.cssFilter
+      betterShadow: this.$store.state.interface.browserSupport.cssFilter,
+      showingConfirmMute: false
     }
   },
   created () {
@@ -137,6 +139,9 @@ export default {
     supportsNote () {
       return 'note' in this.relationship
     },
+    shouldConfirmMute () {
+      return this.mergedConfig.modalOnMute
+    },
     ...mapGetters(['mergedConfig'])
   },
   components: {
@@ -149,11 +154,26 @@ export default {
     Select,
     RichContent,
     UserLink,
-    UserNote
+    UserNote,
+    ConfirmModal
   },
   methods: {
+    showConfirmMute () {
+      this.showingConfirmMute = true
+    },
+    hideConfirmMute () {
+      this.showingConfirmMute = false
+    },
     muteUser () {
+      if (!this.shouldConfirmMute) {
+        this.doMuteUser()
+      } else {
+        this.showConfirmMute()
+      }
+    },
+    doMuteUser () {
       this.$store.dispatch('muteUser', this.user.id)
+      this.hideConfirmMute()
     },
     unmuteUser () {
       this.$store.dispatch('unmuteUser', this.user.id)
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index 349c7cb1..fac900a9 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -314,6 +314,24 @@
         :handle-links="true"
       />
     </div>
+    <confirm-modal
+      :showing="showingConfirmMute"
+      :title="$t('user_card.mute_confirm_title')"
+      :confirm-text="$t('user_card.mute_confirm_accept_button')"
+      :cancel-text="$t('user_card.mute_confirm_cancel_button')"
+      @accepted="doMuteUser"
+      @cancelled="hideConfirmMute"
+    >
+      <i18n
+        path="user_card.mute_confirm"
+        tag="span"
+      >
+        <span
+          place="user"
+          v-text="user.screen_name_ui"
+        />
+      </i18n>
+    </confirm-modal>
   </div>
 </template>
 
-- 
cgit v1.2.3-70-g09d2


From c032b48219ba601df5dabc7fd271444fe7db0321 Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Wed, 9 Feb 2022 16:21:30 -0500
Subject: Add English translation for mute confirmation

---
 src/i18n/en.json | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src')

diff --git a/src/i18n/en.json b/src/i18n/en.json
index 7e23a849..fa359f88 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -938,6 +938,10 @@
     "message": "Message",
     "mute": "Mute",
     "muted": "Muted",
+    "mute_confirm_title": "Mute confirmation",
+    "mute_confirm": "Do you really want to mute {user}?",
+    "mute_confirm_accept_button": "Mute",
+    "mute_confirm_cancel_button": "Do not mute",
     "per_day": "per day",
     "remote_follow": "Remote follow",
     "remove_follower": "Remove follower",
-- 
cgit v1.2.3-70-g09d2


From 3b7aaae2b366abe1162c22a29918336c4210446f Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Wed, 9 Feb 2022 16:26:30 -0500
Subject: Add confirmation for blocking

---
 src/components/account_actions/account_actions.js  | 25 ++++++++++++++++++++--
 src/components/account_actions/account_actions.vue | 18 ++++++++++++++++
 2 files changed, 41 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/components/account_actions/account_actions.js b/src/components/account_actions/account_actions.js
index c23407f9..7dec0c3d 100644
--- a/src/components/account_actions/account_actions.js
+++ b/src/components/account_actions/account_actions.js
@@ -2,6 +2,7 @@ import { mapState } from 'vuex'
 import ProgressButton from '../progress_button/progress_button.vue'
 import Popover from '../popover/popover.vue'
 import UserListMenu from 'src/components/user_list_menu/user_list_menu.vue'
+import ConfirmModal from '../confirm_modal/confirm_modal.vue'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faEllipsisV
@@ -16,14 +17,23 @@ const AccountActions = {
     'user', 'relationship'
   ],
   data () {
-    return { }
+    return {
+      showingConfirmBlock: false
+    }
   },
   components: {
     ProgressButton,
     Popover,
-    UserListMenu
+    UserListMenu,
+    ConfirmModal
   },
   methods: {
+    showConfirmBlock () {
+      this.showingConfirmBlock = true
+    },
+    hideConfirmBlock () {
+      this.showingConfirmBlock = false
+    },
     showRepeats () {
       this.$store.dispatch('showReblogs', this.user.id)
     },
@@ -31,7 +41,15 @@ const AccountActions = {
       this.$store.dispatch('hideReblogs', this.user.id)
     },
     blockUser () {
+      if (!this.shouldConfirmBlock) {
+        this.doBlockUser()
+      } else {
+        this.showConfirmBlock()
+      }
+    },
+    doBlockUser () {
       this.$store.dispatch('blockUser', this.user.id)
+      this.hideConfirmBlock()
     },
     unblockUser () {
       this.$store.dispatch('unblockUser', this.user.id)
@@ -50,6 +68,9 @@ const AccountActions = {
     }
   },
   computed: {
+    shouldConfirmBlock () {
+      return this.$store.getters.mergedConfig.modalOnBlock
+    },
     ...mapState({
       pleromaChatMessagesAvailable: state => state.instance.pleromaChatMessagesAvailable
     })
diff --git a/src/components/account_actions/account_actions.vue b/src/components/account_actions/account_actions.vue
index 973a5935..dfe1f706 100644
--- a/src/components/account_actions/account_actions.vue
+++ b/src/components/account_actions/account_actions.vue
@@ -74,6 +74,24 @@
         </button>
       </template>
     </Popover>
+    <confirm-modal
+      :showing="showingConfirmBlock"
+      :title="$t('user_card.block_confirm_title')"
+      :confirm-text="$t('user_card.block_confirm_accept_button')"
+      :cancel-text="$t('user_card.block_confirm_cancel_button')"
+      @accepted="doBlockUser"
+      @cancelled="hideConfirmBlock"
+    >
+      <i18n
+        path="user_card.block_confirm"
+        tag="span"
+      >
+        <span
+          place="user"
+          v-text="user.screen_name_ui"
+        />
+      </i18n>
+    </confirm-modal>
   </div>
 </template>
 
-- 
cgit v1.2.3-70-g09d2


From 0bfe100ef77ca36e2789310b204987ea54ec2696 Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Wed, 9 Feb 2022 16:26:42 -0500
Subject: Add English translation for block confirmation

---
 src/i18n/en.json | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src')

diff --git a/src/i18n/en.json b/src/i18n/en.json
index fa359f88..1dec4b90 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -914,6 +914,10 @@
     "approve": "Approve",
     "block": "Block",
     "blocked": "Blocked!",
+    "block_confirm_title": "Block confirmation",
+    "block_confirm": "Do you really want to block {user}?",
+    "block_confirm_accept_button": "Block",
+    "block_confirm_cancel_button": "Do not block",
     "deactivated": "Deactivated",
     "deny": "Deny",
     "edit_profile": "Edit profile",
-- 
cgit v1.2.3-70-g09d2


From c202c89ca0f8c9bc1957bff3bbe3ea39e21ddbba Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Wed, 9 Feb 2022 16:51:13 -0500
Subject: Add confirmation for logout

---
 src/components/confirm_modal/confirm_modal.vue |  1 +
 src/components/desktop_nav/desktop_nav.js      | 26 ++++++++++++++++++++++---
 src/components/desktop_nav/desktop_nav.vue     | 10 ++++++++++
 src/components/mobile_nav/mobile_nav.js        | 27 +++++++++++++++++++++++---
 src/components/mobile_nav/mobile_nav.vue       | 18 +++++++++++++++++
 5 files changed, 76 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/components/confirm_modal/confirm_modal.vue b/src/components/confirm_modal/confirm_modal.vue
index 250a6984..fa354285 100644
--- a/src/components/confirm_modal/confirm_modal.vue
+++ b/src/components/confirm_modal/confirm_modal.vue
@@ -1,6 +1,7 @@
 <template>
   <dialog-modal
     v-if="showing"
+    class="confirm-modal"
     :onCancel="onCancel"
   >
     <template v-slot:header>
diff --git a/src/components/desktop_nav/desktop_nav.js b/src/components/desktop_nav/desktop_nav.js
index 08c0e44e..745b1a81 100644
--- a/src/components/desktop_nav/desktop_nav.js
+++ b/src/components/desktop_nav/desktop_nav.js
@@ -1,4 +1,5 @@
 import SearchBar from 'components/search_bar/search_bar.vue'
+import ConfirmModal from '../confirm_modal/confirm_modal.vue'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faSignInAlt,
@@ -30,7 +31,8 @@ library.add(
 
 export default {
   components: {
-    SearchBar
+    SearchBar,
+    ConfirmModal
   },
   data: () => ({
     searchBarHidden: true,
@@ -40,7 +42,8 @@ export default {
         window.CSS.supports('-moz-mask-size', 'contain') ||
         window.CSS.supports('-ms-mask-size', 'contain') ||
         window.CSS.supports('-o-mask-size', 'contain')
-    )
+    ),
+    showingConfirmLogout: false
   }),
   computed: {
     enableMask () { return this.supportsMask && this.$store.state.instance.logoMask },
@@ -73,15 +76,32 @@ export default {
     hideSitename () { return this.$store.state.instance.hideSitename },
     logoLeft () { return this.$store.state.instance.logoLeft },
     currentUser () { return this.$store.state.users.currentUser },
-    privateMode () { return this.$store.state.instance.private }
+    privateMode () { return this.$store.state.instance.private },
+    shouldConfirmLogout () {
+      return this.$store.getters.mergedConfig.modalOnLogout
+    }
   },
   methods: {
     scrollToTop () {
       window.scrollTo(0, 0)
     },
+    showConfirmLogout () {
+      this.showingConfirmLogout = true
+    },
+    hideConfirmLogout () {
+      this.showingConfirmLogout = false
+    },
     logout () {
+      if (!this.shouldConfirmLogout) {
+        this.doLogout()
+      } else {
+        this.showConfirmLogout()
+      }
+    },
+    doLogout () {
       this.$router.replace('/main/public')
       this.$store.dispatch('logout')
+      this.hideConfirmLogout()
     },
     onSearchBarToggled (hidden) {
       this.searchBarHidden = hidden
diff --git a/src/components/desktop_nav/desktop_nav.vue b/src/components/desktop_nav/desktop_nav.vue
index 07bf8005..7db94a37 100644
--- a/src/components/desktop_nav/desktop_nav.vue
+++ b/src/components/desktop_nav/desktop_nav.vue
@@ -76,6 +76,16 @@
         </button>
       </div>
     </div>
+    <confirm-modal
+      :showing="showingConfirmLogout"
+      :title="$t('login.mute_confirm_title')"
+      :confirm-text="$t('login.logout_confirm_accept_button')"
+      :cancel-text="$t('login.logout_confirm_cancel_button')"
+      @accepted="doLogout"
+      @cancelled="hideConfirmLogout"
+    >
+      {{ $t('login.logout_confirm') }}
+    </confirm-modal>
   </nav>
 </template>
 <script src="./desktop_nav.js"></script>
diff --git a/src/components/mobile_nav/mobile_nav.js b/src/components/mobile_nav/mobile_nav.js
index cdbbb812..dad1f6aa 100644
--- a/src/components/mobile_nav/mobile_nav.js
+++ b/src/components/mobile_nav/mobile_nav.js
@@ -1,5 +1,6 @@
 import SideDrawer from '../side_drawer/side_drawer.vue'
 import Notifications from '../notifications/notifications.vue'
+import ConfirmModal from '../confirm_modal/confirm_modal.vue'
 import { unseenNotificationsFromStore } from '../../services/notification_utils/notification_utils'
 import GestureService from '../../services/gesture_service/gesture_service'
 import NavigationPins from 'src/components/navigation/navigation_pins.vue'
@@ -25,12 +26,14 @@ const MobileNav = {
   components: {
     SideDrawer,
     Notifications,
-    NavigationPins
+    NavigationPins,
+    ConfirmModal
   },
   data: () => ({
     notificationsCloseGesture: undefined,
     notificationsOpen: false,
-    notificationsAtTop: true
+    notificationsAtTop: true,
+    showingConfirmLogout: false
   }),
   created () {
     this.notificationsCloseGesture = GestureService.swipeGesture(
@@ -57,7 +60,11 @@ const MobileNav = {
     ...mapGetters(['unreadChatCount', 'unreadAnnouncementCount']),
     chatsPinned () {
       return new Set(this.$store.state.serverSideStorage.prefsStorage.collections.pinnedNavItems).has('chats')
-    }
+    },
+    shouldConfirmLogout () {
+      return this.$store.getters.mergedConfig.modalOnLogout
+    },
+    ...mapGetters(['unreadChatCount'])
   },
   methods: {
     toggleMobileSidebar () {
@@ -88,9 +95,23 @@ const MobileNav = {
     scrollMobileNotificationsToTop () {
       this.$refs.mobileNotifications.scrollTo(0, 0)
     },
+    showConfirmLogout () {
+      this.showingConfirmLogout = true
+    },
+    hideConfirmLogout () {
+      this.showingConfirmLogout = false
+    },
     logout () {
+      if (!this.shouldConfirmLogout) {
+        this.doLogout()
+      } else {
+        this.showConfirmLogout()
+      }
+    },
+    doLogout () {
       this.$router.replace('/main/public')
       this.$store.dispatch('logout')
+      this.hideConfirmLogout()
     },
     markNotificationsAsSeen () {
       // this.$refs.notifications.markAsSeen()
diff --git a/src/components/mobile_nav/mobile_nav.vue b/src/components/mobile_nav/mobile_nav.vue
index d6fe102c..de97624b 100644
--- a/src/components/mobile_nav/mobile_nav.vue
+++ b/src/components/mobile_nav/mobile_nav.vue
@@ -88,6 +88,16 @@
       ref="sideDrawer"
       :logout="logout"
     />
+    <confirm-modal
+      :showing="showingConfirmLogout"
+      :title="$t('login.mute_confirm_title')"
+      :confirm-text="$t('login.logout_confirm_accept_button')"
+      :cancel-text="$t('login.logout_confirm_cancel_button')"
+      @accepted="doLogout"
+      @cancelled="hideConfirmLogout"
+    >
+      {{ $t('login.logout_confirm') }}
+    </confirm-modal>
   </div>
 </template>
 
@@ -235,6 +245,14 @@
       }
     }
   }
+  .confirm-modal.dark-overlay {
+    &::before {
+      z-index: 3000;
+    }
+    .dialog-modal.panel {
+      z-index: 3001;
+    }
+  }
 }
 
 </style>
-- 
cgit v1.2.3-70-g09d2


From 5c048321e787b880f4c228e52b956b59edc3fc4f Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Wed, 9 Feb 2022 16:51:32 -0500
Subject: Add English translation for logout confirmation

---
 src/i18n/en.json | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src')

diff --git a/src/i18n/en.json b/src/i18n/en.json
index 1dec4b90..f7d83aa3 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -137,6 +137,10 @@
     "login": "Log in",
     "description": "Log in with OAuth",
     "logout": "Log out",
+    "logout_confirm_title": "Logout confirmation",
+    "logout_confirm": "Do you really want to logout?",
+    "logout_confirm_accept_button": "Logout",
+    "logout_confirm_cancel_button": "Do not logout",
     "password": "Password",
     "placeholder": "e.g. lain",
     "register": "Register",
-- 
cgit v1.2.3-70-g09d2


From 8c8a8232c8c23f706b82c03c7ddadbd94ca2f3df Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Wed, 9 Feb 2022 17:03:17 -0500
Subject: Lint

---
 src/components/confirm_modal/confirm_modal.vue | 14 +++++++-------
 src/components/follow_button/follow_button.js  |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/components/confirm_modal/confirm_modal.vue b/src/components/confirm_modal/confirm_modal.vue
index fa354285..59e46dc1 100644
--- a/src/components/confirm_modal/confirm_modal.vue
+++ b/src/components/confirm_modal/confirm_modal.vue
@@ -2,26 +2,26 @@
   <dialog-modal
     v-if="showing"
     class="confirm-modal"
-    :onCancel="onCancel"
+    :on-cancel="onCancel"
   >
     <template v-slot:header>
-      <span v-text="title"></span>
+      <span v-text="title" />
     </template>
 
-    <slot></slot>
+    <slot />
 
     <template v-slot:footer>
       <button
         class="btn button-default"
-        v-text="confirmText"
         @click.prevent="onAccept"
-      ></button>
+        v-text="confirmText"
+      />
 
       <button
         class="btn button-default"
-        v-text="cancelText"
         @click.prevent="onCancel"
-      ></button>
+        v-text="cancelText"
+      />
     </template>
   </dialog-modal>
 </template>
diff --git a/src/components/follow_button/follow_button.js b/src/components/follow_button/follow_button.js
index 0a74a7a1..443aa9bc 100644
--- a/src/components/follow_button/follow_button.js
+++ b/src/components/follow_button/follow_button.js
@@ -8,7 +8,7 @@ export default {
   data () {
     return {
       inProgress: false,
-      showingConfirmUnfollow: false,
+      showingConfirmUnfollow: false
     }
   },
   computed: {
-- 
cgit v1.2.3-70-g09d2


From 51ade260660b1a6586b5c0091d89c9701b684870 Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Fri, 11 Feb 2022 10:18:20 -0500
Subject: Fix logout confirm dialog title

---
 src/components/desktop_nav/desktop_nav.vue | 2 +-
 src/components/mobile_nav/mobile_nav.vue   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/components/desktop_nav/desktop_nav.vue b/src/components/desktop_nav/desktop_nav.vue
index 7db94a37..0f5b3136 100644
--- a/src/components/desktop_nav/desktop_nav.vue
+++ b/src/components/desktop_nav/desktop_nav.vue
@@ -78,7 +78,7 @@
     </div>
     <confirm-modal
       :showing="showingConfirmLogout"
-      :title="$t('login.mute_confirm_title')"
+      :title="$t('login.logout_confirm_title')"
       :confirm-text="$t('login.logout_confirm_accept_button')"
       :cancel-text="$t('login.logout_confirm_cancel_button')"
       @accepted="doLogout"
diff --git a/src/components/mobile_nav/mobile_nav.vue b/src/components/mobile_nav/mobile_nav.vue
index de97624b..0f23b7ac 100644
--- a/src/components/mobile_nav/mobile_nav.vue
+++ b/src/components/mobile_nav/mobile_nav.vue
@@ -90,7 +90,7 @@
     />
     <confirm-modal
       :showing="showingConfirmLogout"
-      :title="$t('login.mute_confirm_title')"
+      :title="$t('login.logout_confirm_title')"
       :confirm-text="$t('login.logout_confirm_accept_button')"
       :cancel-text="$t('login.logout_confirm_cancel_button')"
       @accepted="doLogout"
-- 
cgit v1.2.3-70-g09d2


From 39e4746f615970001839309e06a0f13d9613b175 Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Thu, 17 Mar 2022 00:06:26 -0400
Subject: Use portal for modals

---
 src/components/account_actions/account_actions.vue | 36 +++++++-------
 src/components/confirm_modal/confirm_modal.js      |  5 --
 src/components/confirm_modal/confirm_modal.vue     |  1 -
 src/components/desktop_nav/desktop_nav.vue         | 22 +++++----
 src/components/extra_buttons/extra_buttons.vue     | 22 +++++----
 src/components/follow_button/follow_button.vue     | 56 +++++++++++-----------
 src/components/mobile_nav/mobile_nav.vue           | 22 +++++----
 src/components/retweet_button/retweet_button.vue   | 22 +++++----
 src/components/user_card/user_card.vue             | 36 +++++++-------
 9 files changed, 114 insertions(+), 108 deletions(-)

(limited to 'src')

diff --git a/src/components/account_actions/account_actions.vue b/src/components/account_actions/account_actions.vue
index dfe1f706..273aac69 100644
--- a/src/components/account_actions/account_actions.vue
+++ b/src/components/account_actions/account_actions.vue
@@ -74,24 +74,26 @@
         </button>
       </template>
     </Popover>
-    <confirm-modal
-      :showing="showingConfirmBlock"
-      :title="$t('user_card.block_confirm_title')"
-      :confirm-text="$t('user_card.block_confirm_accept_button')"
-      :cancel-text="$t('user_card.block_confirm_cancel_button')"
-      @accepted="doBlockUser"
-      @cancelled="hideConfirmBlock"
-    >
-      <i18n
-        path="user_card.block_confirm"
-        tag="span"
+    <portal to="modal">
+      <confirm-modal
+        v-if="showingConfirmBlock"
+        :title="$t('user_card.block_confirm_title')"
+        :confirm-text="$t('user_card.block_confirm_accept_button')"
+        :cancel-text="$t('user_card.block_confirm_cancel_button')"
+        @accepted="doBlockUser"
+        @cancelled="hideConfirmBlock"
       >
-        <span
-          place="user"
-          v-text="user.screen_name_ui"
-        />
-      </i18n>
-    </confirm-modal>
+        <i18n
+          path="user_card.block_confirm"
+          tag="span"
+        >
+          <span
+            place="user"
+            v-text="user.screen_name_ui"
+          />
+        </i18n>
+      </confirm-modal>
+    </portal>
   </div>
 </template>
 
diff --git a/src/components/confirm_modal/confirm_modal.js b/src/components/confirm_modal/confirm_modal.js
index bb5e9d97..96ddc118 100644
--- a/src/components/confirm_modal/confirm_modal.js
+++ b/src/components/confirm_modal/confirm_modal.js
@@ -11,12 +11,7 @@ const ConfirmModal = {
   components: {
     DialogModal
   },
-  data: {
-  },
   props: {
-    showing: {
-      type: Boolean
-    },
     title: {
       type: String
     },
diff --git a/src/components/confirm_modal/confirm_modal.vue b/src/components/confirm_modal/confirm_modal.vue
index 59e46dc1..5b5014c5 100644
--- a/src/components/confirm_modal/confirm_modal.vue
+++ b/src/components/confirm_modal/confirm_modal.vue
@@ -1,6 +1,5 @@
 <template>
   <dialog-modal
-    v-if="showing"
     class="confirm-modal"
     :on-cancel="onCancel"
   >
diff --git a/src/components/desktop_nav/desktop_nav.vue b/src/components/desktop_nav/desktop_nav.vue
index 0f5b3136..18630385 100644
--- a/src/components/desktop_nav/desktop_nav.vue
+++ b/src/components/desktop_nav/desktop_nav.vue
@@ -76,16 +76,18 @@
         </button>
       </div>
     </div>
-    <confirm-modal
-      :showing="showingConfirmLogout"
-      :title="$t('login.logout_confirm_title')"
-      :confirm-text="$t('login.logout_confirm_accept_button')"
-      :cancel-text="$t('login.logout_confirm_cancel_button')"
-      @accepted="doLogout"
-      @cancelled="hideConfirmLogout"
-    >
-      {{ $t('login.logout_confirm') }}
-    </confirm-modal>
+    <portal to="modal">
+      <confirm-modal
+        v-if="showingConfirmLogout"
+        :title="$t('login.logout_confirm_title')"
+        :confirm-text="$t('login.logout_confirm_accept_button')"
+        :cancel-text="$t('login.logout_confirm_cancel_button')"
+        @accepted="doLogout"
+        @cancelled="hideConfirmLogout"
+      >
+        {{ $t('login.logout_confirm') }}
+      </confirm-modal>
+    </portal>
   </nav>
 </template>
 <script src="./desktop_nav.js"></script>
diff --git a/src/components/extra_buttons/extra_buttons.vue b/src/components/extra_buttons/extra_buttons.vue
index 293f6d68..4641947a 100644
--- a/src/components/extra_buttons/extra_buttons.vue
+++ b/src/components/extra_buttons/extra_buttons.vue
@@ -165,16 +165,18 @@
           />
         </FALayers>
       </span>
-      <ConfirmModal
-        :showing="showingDeleteDialog"
-        :title="$t('status.delete_confirm_title')"
-        :cancel-text="$t('status.delete_confirm_cancel_button')"
-        :confirm-text="$t('status.delete_confirm_accept_button')"
-        @cancelled="hideDeleteStatusConfirmDialog"
-        @accepted="doDeleteStatus"
-      >
-        {{ $t('status.delete_confirm') }}
-      </ConfirmModal>
+      <portal to="modal">
+        <ConfirmModal
+          v-if="showingDeleteDialog"
+          :title="$t('status.delete_confirm_title')"
+          :cancel-text="$t('status.delete_confirm_cancel_button')"
+          :confirm-text="$t('status.delete_confirm_accept_button')"
+          @cancelled="hideDeleteStatusConfirmDialog"
+          @accepted="doDeleteStatus"
+        >
+          {{ $t('status.delete_confirm') }}
+        </ConfirmModal>
+      </portal>
     </template>
   </Popover>
 </template>
diff --git a/src/components/follow_button/follow_button.vue b/src/components/follow_button/follow_button.vue
index 4fc2233a..5c799406 100644
--- a/src/components/follow_button/follow_button.vue
+++ b/src/components/follow_button/follow_button.vue
@@ -1,33 +1,33 @@
 <template>
-  <div>
-    <button
-      class="btn button-default follow-button"
-      :class="{ toggled: isPressed }"
-      :disabled="disabled"
-      :title="title"
-      @click="onClick"
-    >
-      {{ label }}
-    </button>
-    <confirm-modal
-      :showing="showingConfirmUnfollow"
-      :title="$t('user_card.unfollow_confirm_title')"
-      :confirm-text="$t('user_card.unfollow_confirm_accept_button')"
-      :cancel-text="$t('user_card.unfollow_confirm_cancel_button')"
-      @accepted="doUnfollow"
-      @cancelled="hideConfirmUnfollow"
-    >
-      <i18n
-        path="user_card.unfollow_confirm"
-        tag="span"
+  <button
+    class="btn button-default follow-button"
+    :class="{ toggled: isPressed }"
+    :disabled="disabled"
+    :title="title"
+    @click="onClick"
+  >
+    {{ label }}
+    <portal to="modal">
+      <confirm-modal
+        v-if="showingConfirmUnfollow"
+        :title="$t('user_card.unfollow_confirm_title')"
+        :confirm-text="$t('user_card.unfollow_confirm_accept_button')"
+        :cancel-text="$t('user_card.unfollow_confirm_cancel_button')"
+        @accepted="doUnfollow"
+        @cancelled="hideConfirmUnfollow"
       >
-        <span
-          place="user"
-          v-text="user.screen_name_ui"
-        />
-      </i18n>
-    </confirm-modal>
-  </div>
+        <i18n
+          path="user_card.unfollow_confirm"
+          tag="span"
+        >
+          <span
+            place="user"
+            v-text="user.screen_name_ui"
+          />
+        </i18n>
+      </confirm-modal>
+    </portal>
+  </button>
 </template>
 
 <script src="./follow_button.js"></script>
diff --git a/src/components/mobile_nav/mobile_nav.vue b/src/components/mobile_nav/mobile_nav.vue
index 0f23b7ac..6b6b8f21 100644
--- a/src/components/mobile_nav/mobile_nav.vue
+++ b/src/components/mobile_nav/mobile_nav.vue
@@ -88,16 +88,18 @@
       ref="sideDrawer"
       :logout="logout"
     />
-    <confirm-modal
-      :showing="showingConfirmLogout"
-      :title="$t('login.logout_confirm_title')"
-      :confirm-text="$t('login.logout_confirm_accept_button')"
-      :cancel-text="$t('login.logout_confirm_cancel_button')"
-      @accepted="doLogout"
-      @cancelled="hideConfirmLogout"
-    >
-      {{ $t('login.logout_confirm') }}
-    </confirm-modal>
+    <portal to="modal">
+      <confirm-modal
+        v-if="showingConfirmLogout"
+        :title="$t('login.logout_confirm_title')"
+        :confirm-text="$t('login.logout_confirm_accept_button')"
+        :cancel-text="$t('login.logout_confirm_cancel_button')"
+        @accepted="doLogout"
+        @cancelled="hideConfirmLogout"
+      >
+        {{ $t('login.logout_confirm') }}
+      </confirm-modal>
+    </portal>
   </div>
 </template>
 
diff --git a/src/components/retweet_button/retweet_button.vue b/src/components/retweet_button/retweet_button.vue
index 38d4dc3f..9ed24bd5 100644
--- a/src/components/retweet_button/retweet_button.vue
+++ b/src/components/retweet_button/retweet_button.vue
@@ -59,16 +59,18 @@
     >
       {{ status.repeat_num }}
     </span>
-    <confirm-modal
-      :showing="showingConfirmDialog"
-      :title="$t('status.repeat_confirm_title')"
-      :confirm-text="$t('status.repeat_confirm_accept_button')"
-      :cancel-text="$t('status.repeat_confirm_cancel_button')"
-      @accepted="doRetweet"
-      @cancelled="hideConfirmDialog"
-    >
-      {{ $t('status.repeat_confirm') }}
-    </confirm-modal>
+    <portal to="modal">
+      <confirm-modal
+        v-if="showingConfirmDialog"
+        :title="$t('status.repeat_confirm_title')"
+        :confirm-text="$t('status.repeat_confirm_accept_button')"
+        :cancel-text="$t('status.repeat_confirm_cancel_button')"
+        @accepted="doRetweet"
+        @cancelled="hideConfirmDialog"
+      >
+        {{ $t('status.repeat_confirm') }}
+      </confirm-modal>
+    </portal>
   </div>
 </template>
 
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index fac900a9..5a848ead 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -314,24 +314,26 @@
         :handle-links="true"
       />
     </div>
-    <confirm-modal
-      :showing="showingConfirmMute"
-      :title="$t('user_card.mute_confirm_title')"
-      :confirm-text="$t('user_card.mute_confirm_accept_button')"
-      :cancel-text="$t('user_card.mute_confirm_cancel_button')"
-      @accepted="doMuteUser"
-      @cancelled="hideConfirmMute"
-    >
-      <i18n
-        path="user_card.mute_confirm"
-        tag="span"
+    <portal to="modal">
+      <confirm-modal
+        v-if="showingConfirmMute"
+        :title="$t('user_card.mute_confirm_title')"
+        :confirm-text="$t('user_card.mute_confirm_accept_button')"
+        :cancel-text="$t('user_card.mute_confirm_cancel_button')"
+        @accepted="doMuteUser"
+        @cancelled="hideConfirmMute"
       >
-        <span
-          place="user"
-          v-text="user.screen_name_ui"
-        />
-      </i18n>
-    </confirm-modal>
+        <i18n
+          path="user_card.mute_confirm"
+          tag="span"
+        >
+          <span
+            place="user"
+            v-text="user.screen_name_ui"
+          />
+        </i18n>
+      </confirm-modal>
+    </portal>
   </div>
 </template>
 
-- 
cgit v1.2.3-70-g09d2


From dc04c8cbd48dd8dcfc6b1937663e57983d38562a Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Wed, 6 Apr 2022 14:54:58 -0400
Subject: Use vue3 teleport instead of portal

---
 src/components/account_actions/account_actions.vue | 4 ++--
 src/components/desktop_nav/desktop_nav.vue         | 4 ++--
 src/components/extra_buttons/extra_buttons.vue     | 4 ++--
 src/components/follow_button/follow_button.vue     | 4 ++--
 src/components/mobile_nav/mobile_nav.vue           | 4 ++--
 src/components/retweet_button/retweet_button.vue   | 4 ++--
 src/components/user_card/user_card.vue             | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/components/account_actions/account_actions.vue b/src/components/account_actions/account_actions.vue
index 273aac69..fc303271 100644
--- a/src/components/account_actions/account_actions.vue
+++ b/src/components/account_actions/account_actions.vue
@@ -74,7 +74,7 @@
         </button>
       </template>
     </Popover>
-    <portal to="modal">
+    <teleport to="#modal">
       <confirm-modal
         v-if="showingConfirmBlock"
         :title="$t('user_card.block_confirm_title')"
@@ -93,7 +93,7 @@
           />
         </i18n>
       </confirm-modal>
-    </portal>
+    </teleport>
   </div>
 </template>
 
diff --git a/src/components/desktop_nav/desktop_nav.vue b/src/components/desktop_nav/desktop_nav.vue
index 18630385..92622cf9 100644
--- a/src/components/desktop_nav/desktop_nav.vue
+++ b/src/components/desktop_nav/desktop_nav.vue
@@ -76,7 +76,7 @@
         </button>
       </div>
     </div>
-    <portal to="modal">
+    <teleport to="#modal">
       <confirm-modal
         v-if="showingConfirmLogout"
         :title="$t('login.logout_confirm_title')"
@@ -87,7 +87,7 @@
       >
         {{ $t('login.logout_confirm') }}
       </confirm-modal>
-    </portal>
+    </teleport>
   </nav>
 </template>
 <script src="./desktop_nav.js"></script>
diff --git a/src/components/extra_buttons/extra_buttons.vue b/src/components/extra_buttons/extra_buttons.vue
index 4641947a..c1c15c0f 100644
--- a/src/components/extra_buttons/extra_buttons.vue
+++ b/src/components/extra_buttons/extra_buttons.vue
@@ -165,7 +165,7 @@
           />
         </FALayers>
       </span>
-      <portal to="modal">
+      <teleport to="#modal">
         <ConfirmModal
           v-if="showingDeleteDialog"
           :title="$t('status.delete_confirm_title')"
@@ -176,7 +176,7 @@
         >
           {{ $t('status.delete_confirm') }}
         </ConfirmModal>
-      </portal>
+      </teleport>
     </template>
   </Popover>
 </template>
diff --git a/src/components/follow_button/follow_button.vue b/src/components/follow_button/follow_button.vue
index 5c799406..b4567348 100644
--- a/src/components/follow_button/follow_button.vue
+++ b/src/components/follow_button/follow_button.vue
@@ -7,7 +7,7 @@
     @click="onClick"
   >
     {{ label }}
-    <portal to="modal">
+    <teleport to="#modal">
       <confirm-modal
         v-if="showingConfirmUnfollow"
         :title="$t('user_card.unfollow_confirm_title')"
@@ -26,7 +26,7 @@
           />
         </i18n>
       </confirm-modal>
-    </portal>
+    </teleport>
   </button>
 </template>
 
diff --git a/src/components/mobile_nav/mobile_nav.vue b/src/components/mobile_nav/mobile_nav.vue
index 6b6b8f21..6d826622 100644
--- a/src/components/mobile_nav/mobile_nav.vue
+++ b/src/components/mobile_nav/mobile_nav.vue
@@ -88,7 +88,7 @@
       ref="sideDrawer"
       :logout="logout"
     />
-    <portal to="modal">
+    <teleport to="#modal">
       <confirm-modal
         v-if="showingConfirmLogout"
         :title="$t('login.logout_confirm_title')"
@@ -99,7 +99,7 @@
       >
         {{ $t('login.logout_confirm') }}
       </confirm-modal>
-    </portal>
+    </teleport>
   </div>
 </template>
 
diff --git a/src/components/retweet_button/retweet_button.vue b/src/components/retweet_button/retweet_button.vue
index 9ed24bd5..134fcb36 100644
--- a/src/components/retweet_button/retweet_button.vue
+++ b/src/components/retweet_button/retweet_button.vue
@@ -59,7 +59,7 @@
     >
       {{ status.repeat_num }}
     </span>
-    <portal to="modal">
+    <teleport to="#modal">
       <confirm-modal
         v-if="showingConfirmDialog"
         :title="$t('status.repeat_confirm_title')"
@@ -70,7 +70,7 @@
       >
         {{ $t('status.repeat_confirm') }}
       </confirm-modal>
-    </portal>
+    </teleport>
   </div>
 </template>
 
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index 5a848ead..856ed54b 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -314,7 +314,7 @@
         :handle-links="true"
       />
     </div>
-    <portal to="modal">
+    <teleport to="#modal">
       <confirm-modal
         v-if="showingConfirmMute"
         :title="$t('user_card.mute_confirm_title')"
@@ -333,7 +333,7 @@
           />
         </i18n>
       </confirm-modal>
-    </portal>
+    </teleport>
   </div>
 </template>
 
-- 
cgit v1.2.3-70-g09d2


From 76d99c08d6740886b8c52ee4a0291706dc68ca3f Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Wed, 6 Apr 2022 15:02:21 -0400
Subject: Move modal out of vue tree

---
 index.html  | 1 +
 src/App.vue | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/index.html b/index.html
index 4af84a59..c02bf308 100644
--- a/index.html
+++ b/index.html
@@ -9,6 +9,7 @@
   <body class="hidden">
     <noscript>To use Pleroma, please enable JavaScript.</noscript>
     <div id="app"></div>
+    <div id="modal" />
     <!-- built files will be auto injected -->
     <div id="popovers" />
   </body>
diff --git a/src/App.vue b/src/App.vue
index 23a388a6..fe214ce7 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -71,7 +71,6 @@
     <StatusHistoryModal v-if="editingAvailable" />
     <SettingsModal />
     <UpdateNotification />
-    <div id="modal" />
     <GlobalNoticeList />
   </div>
 </template>
-- 
cgit v1.2.3-70-g09d2


From 0b914d78155b8b5a5adfbeba91198766e315b9a0 Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Wed, 6 Apr 2022 15:05:09 -0400
Subject: Make modal display over the top bar

---
 src/components/dialog_modal/dialog_modal.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/components/dialog_modal/dialog_modal.vue b/src/components/dialog_modal/dialog_modal.vue
index 24d65142..341cf105 100644
--- a/src/components/dialog_modal/dialog_modal.vue
+++ b/src/components/dialog_modal/dialog_modal.vue
@@ -39,7 +39,7 @@
     right: 0;
     top: 0;
     background: rgb(27 31 35 / 50%);
-    z-index: 99;
+    z-index: 2000;
   }
 }
 
@@ -51,7 +51,7 @@
   margin: 15vh auto;
   position: fixed;
   transform: translateX(-50%);
-  z-index: 999;
+  z-index: 2001;
   cursor: default;
   display: block;
   background-color: $fallback--bg;
-- 
cgit v1.2.3-70-g09d2


From 91c4a57fe50fae8b6e8defe08f09c8a7090bf649 Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Sat, 9 Apr 2022 23:11:19 -0400
Subject: Make page unscrollable when confirm modal is shown

Or we could scroll until the component is ... hidden
due to virtual-scrolling, and the modal disappears!
---
 src/components/confirm_modal/confirm_modal.vue | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/components/confirm_modal/confirm_modal.vue b/src/components/confirm_modal/confirm_modal.vue
index 5b5014c5..1ac64b62 100644
--- a/src/components/confirm_modal/confirm_modal.vue
+++ b/src/components/confirm_modal/confirm_modal.vue
@@ -1,5 +1,6 @@
 <template>
   <dialog-modal
+    v-body-scroll-lock="true"
     class="confirm-modal"
     :on-cancel="onCancel"
   >
-- 
cgit v1.2.3-70-g09d2


From ec957d41620fecc5103474f1b07bbb96f5cae446 Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Sat, 9 Apr 2022 23:26:27 -0400
Subject: Make confirm dialogs work with vue-i18n 9

---
 src/components/account_actions/account_actions.vue | 15 ++++++++-------
 src/components/follow_button/follow_button.vue     | 15 ++++++++-------
 src/components/user_card/user_card.vue             | 15 ++++++++-------
 3 files changed, 24 insertions(+), 21 deletions(-)

(limited to 'src')

diff --git a/src/components/account_actions/account_actions.vue b/src/components/account_actions/account_actions.vue
index fc303271..161bab09 100644
--- a/src/components/account_actions/account_actions.vue
+++ b/src/components/account_actions/account_actions.vue
@@ -83,15 +83,16 @@
         @accepted="doBlockUser"
         @cancelled="hideConfirmBlock"
       >
-        <i18n
-          path="user_card.block_confirm"
+        <i18n-t
+          keypath="user_card.block_confirm"
           tag="span"
         >
-          <span
-            place="user"
-            v-text="user.screen_name_ui"
-          />
-        </i18n>
+          <template #user>
+            <span
+              v-text="user.screen_name_ui"
+            />
+          </template>
+        </i18n-t>
       </confirm-modal>
     </teleport>
   </div>
diff --git a/src/components/follow_button/follow_button.vue b/src/components/follow_button/follow_button.vue
index b4567348..e421c15b 100644
--- a/src/components/follow_button/follow_button.vue
+++ b/src/components/follow_button/follow_button.vue
@@ -16,15 +16,16 @@
         @accepted="doUnfollow"
         @cancelled="hideConfirmUnfollow"
       >
-        <i18n
-          path="user_card.unfollow_confirm"
+        <i18n-t
+          keypath="user_card.unfollow_confirm"
           tag="span"
         >
-          <span
-            place="user"
-            v-text="user.screen_name_ui"
-          />
-        </i18n>
+          <template #user>
+            <span
+              v-text="user.screen_name_ui"
+            />
+          </template>
+        </i18n-t>
       </confirm-modal>
     </teleport>
   </button>
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index 856ed54b..01882aa8 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -323,15 +323,16 @@
         @accepted="doMuteUser"
         @cancelled="hideConfirmMute"
       >
-        <i18n
-          path="user_card.mute_confirm"
+        <i18n-t
+          keypath="user_card.mute_confirm"
           tag="span"
         >
-          <span
-            place="user"
-            v-text="user.screen_name_ui"
-          />
-        </i18n>
+          <template #user>
+            <span
+              v-text="user.screen_name_ui"
+            />
+          </template>
+        </i18n-t>
       </confirm-modal>
     </teleport>
   </div>
-- 
cgit v1.2.3-70-g09d2


From 228a9afdf5ecc10a17de31f88bd88ad1efbe0004 Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Sat, 30 Apr 2022 11:08:19 -0400
Subject: Add timed-mute functionality

---
 src/components/poll/poll_form.js        | 13 ++-----------
 src/components/user_card/user_card.js   | 13 +++++++++++--
 src/components/user_card/user_card.scss |  5 +++++
 src/components/user_card/user_card.vue  | 28 +++++++++++++++++++++++++++-
 src/modules/users.js                    |  7 +++++--
 src/services/api/api.service.js         |  8 ++++++--
 src/services/date_utils/date_utils.js   | 16 ++++++++++++++++
 7 files changed, 72 insertions(+), 18 deletions(-)

(limited to 'src')

diff --git a/src/components/poll/poll_form.js b/src/components/poll/poll_form.js
index e30645c3..a2070155 100644
--- a/src/components/poll/poll_form.js
+++ b/src/components/poll/poll_form.js
@@ -94,19 +94,10 @@ export default {
     },
     convertExpiryToUnit (unit, amount) {
       // Note: we want seconds and not milliseconds
-      switch (unit) {
-        case 'minutes': return (1000 * amount) / DateUtils.MINUTE
-        case 'hours': return (1000 * amount) / DateUtils.HOUR
-        case 'days': return (1000 * amount) / DateUtils.DAY
-      }
+      return DateUtils.secondsToUnit(unit, amount)
     },
     convertExpiryFromUnit (unit, amount) {
-      // Note: we want seconds and not milliseconds
-      switch (unit) {
-        case 'minutes': return 0.001 * amount * DateUtils.MINUTE
-        case 'hours': return 0.001 * amount * DateUtils.HOUR
-        case 'days': return 0.001 * amount * DateUtils.DAY
-      }
+      return DateUtils.unitToSeconds(unit, amount)
     },
     expiryAmountChange () {
       this.expiryAmount =
diff --git a/src/components/user_card/user_card.js b/src/components/user_card/user_card.js
index 1bcc4341..e17bf8eb 100644
--- a/src/components/user_card/user_card.js
+++ b/src/components/user_card/user_card.js
@@ -1,3 +1,4 @@
+import { unitToSeconds } from 'src/services/date_utils/date_utils.js'
 import UserAvatar from '../user_avatar/user_avatar.vue'
 import RemoteFollow from '../remote_follow/remote_follow.vue'
 import ProgressButton from '../progress_button/progress_button.vue'
@@ -48,7 +49,9 @@ export default {
     return {
       followRequestInProgress: false,
       betterShadow: this.$store.state.interface.browserSupport.cssFilter,
-      showingConfirmMute: false
+      showingConfirmMute: false,
+      muteExpiryAmount: 0,
+      muteExpiryUnit: 'minutes'
     }
   },
   created () {
@@ -142,6 +145,9 @@ export default {
     shouldConfirmMute () {
       return this.mergedConfig.modalOnMute
     },
+    muteExpiryUnits () {
+      return ['minutes', 'hours', 'days']
+    },
     ...mapGetters(['mergedConfig'])
   },
   components: {
@@ -172,7 +178,10 @@ export default {
       }
     },
     doMuteUser () {
-      this.$store.dispatch('muteUser', this.user.id)
+      this.$store.dispatch('muteUser', {
+        id: this.user.id,
+        expiresIn: this.shouldConfirmMute ? unitToSeconds(this.muteExpiryUnit, this.muteExpiryAmount) : 0
+      })
       this.hideConfirmMute()
     },
     unmuteUser () {
diff --git a/src/components/user_card/user_card.scss b/src/components/user_card/user_card.scss
index d56b6672..4ab93a8a 100644
--- a/src/components/user_card/user_card.scss
+++ b/src/components/user_card/user_card.scss
@@ -355,3 +355,8 @@
     text-decoration: none;
   }
 }
+
+.mute-expiry {
+  display: flex;
+  flex-direction: row;
+}
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index 01882aa8..2de14063 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -325,7 +325,7 @@
       >
         <i18n-t
           keypath="user_card.mute_confirm"
-          tag="span"
+          tag="div"
         >
           <template #user>
             <span
@@ -333,6 +333,32 @@
             />
           </template>
         </i18n-t>
+        <div
+          class="mute-expiry"
+        >
+          <label>
+            {{ $t('user_card.mute_duration_prompt') }}
+          </label>
+          <input
+            v-model="muteExpiryAmount"
+            type="number"
+            class="expiry-amount hide-number-spinner"
+            :min="0"
+          >
+          <Select
+            v-model="muteExpiryUnit"
+            unstyled="true"
+            class="expiry-unit"
+          >
+            <option
+              v-for="unit in muteExpiryUnits"
+              :key="unit"
+              :value="unit"
+            >
+              {{ $t(`time.${unit}_short`, ['']) }}
+            </option>
+          </Select>
+        </div>
       </confirm-modal>
     </teleport>
   </div>
diff --git a/src/modules/users.js b/src/modules/users.js
index 053e44b6..a1316ba2 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -61,13 +61,16 @@ const editUserNote = (store, { id, comment }) => {
     .then((relationship) => store.commit('updateUserRelationship', [relationship]))
 }
 
-const muteUser = (store, id) => {
+const muteUser = (store, args) => {
+  const id = typeof args === 'object' ? args.id : args
+  const expiresIn = typeof args === 'object' ? args.expiresIn : 0
+
   const predictedRelationship = store.state.relationships[id] || { id }
   predictedRelationship.muting = true
   store.commit('updateUserRelationship', [predictedRelationship])
   store.commit('addMuteId', id)
 
-  return store.rootState.api.backendInteractor.muteUser({ id })
+  return store.rootState.api.backendInteractor.muteUser({ id, expiresIn })
     .then((relationship) => {
       store.commit('updateUserRelationship', [relationship])
       store.commit('addMuteId', id)
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index af12265e..c7a36af9 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -1118,8 +1118,12 @@ const fetchMutes = ({ credentials }) => {
     .then((users) => users.map(parseUser))
 }
 
-const muteUser = ({ id, credentials }) => {
-  return promisedRequest({ url: MASTODON_MUTE_USER_URL(id), credentials, method: 'POST' })
+const muteUser = ({ id, expiresIn, credentials }) => {
+  const payload = {}
+  if (expiresIn) {
+    payload['expires_in'] = expiresIn
+  }
+  return promisedRequest({ url: MASTODON_MUTE_USER_URL(id), credentials, method: 'POST', payload })
 }
 
 const unmuteUser = ({ id, credentials }) => {
diff --git a/src/services/date_utils/date_utils.js b/src/services/date_utils/date_utils.js
index c93d2176..ed8e1417 100644
--- a/src/services/date_utils/date_utils.js
+++ b/src/services/date_utils/date_utils.js
@@ -41,3 +41,19 @@ export const relativeTimeShort = (date, nowThreshold = 1) => {
   r.key += '_short'
   return r
 }
+
+export const unitToSeconds = (unit, amount) => {
+  switch (unit) {
+    case 'minutes': return 0.001 * amount * MINUTE
+    case 'hours': return 0.001 * amount * HOUR
+    case 'days': return 0.001 * amount * DAY
+  }
+}
+
+export const secondsToUnit = (unit, amount) => {
+  switch (unit) {
+    case 'minutes': return (1000 * amount) / MINUTE
+    case 'hours': return (1000 * amount) / HOUR
+    case 'days': return (1000 * amount) / DAY
+  }
+}
-- 
cgit v1.2.3-70-g09d2


From b7af37fce8bf11492681f206cfc2afcf00ff5ded Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Sat, 30 Apr 2022 11:08:37 -0400
Subject: Add English translation for mute duration

---
 src/i18n/en.json | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/i18n/en.json b/src/i18n/en.json
index f7d83aa3..fc0de3ac 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -950,6 +950,7 @@
     "mute_confirm": "Do you really want to mute {user}?",
     "mute_confirm_accept_button": "Mute",
     "mute_confirm_cancel_button": "Do not mute",
+    "mute_duration_prompt": "Mute this user for (0 for indefinite time):",
     "per_day": "per day",
     "remote_follow": "Remote follow",
     "remove_follower": "Remove follower",
-- 
cgit v1.2.3-70-g09d2


From 547e85c7c6f9bf8779cc06344c4eebaaa8f9d775 Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Tue, 7 Jun 2022 12:37:16 -0400
Subject: Add confirm dialogs for accept & deny follow requests

---
 .../follow_request_card/follow_request_card.js     | 49 +++++++++++++++++++++-
 .../follow_request_card/follow_request_card.vue    | 22 ++++++++++
 src/components/notification/notification.js        | 43 ++++++++++++++++++-
 src/components/notification/notification.vue       | 22 ++++++++++
 src/components/settings_modal/tabs/general_tab.vue | 10 +++++
 src/modules/config.js                              |  2 +
 src/modules/instance.js                            |  2 +
 7 files changed, 147 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/components/follow_request_card/follow_request_card.js b/src/components/follow_request_card/follow_request_card.js
index cbd75311..b0873bb1 100644
--- a/src/components/follow_request_card/follow_request_card.js
+++ b/src/components/follow_request_card/follow_request_card.js
@@ -1,10 +1,18 @@
 import BasicUserCard from '../basic_user_card/basic_user_card.vue'
+import ConfirmModal from '../confirm_modal/confirm_modal.vue'
 import { notificationsFromStore } from '../../services/notification_utils/notification_utils.js'
 
 const FollowRequestCard = {
   props: ['user'],
   components: {
-    BasicUserCard
+    BasicUserCard,
+    ConfirmModal
+  },
+  data () {
+    return {
+      showingApproveConfirmDialog: false,
+      showingDenyConfirmDialog: false
+    }
   },
   methods: {
     findFollowRequestNotificationId () {
@@ -13,7 +21,26 @@ const FollowRequestCard = {
       )
       return notif && notif.id
     },
+    showApproveConfirmDialog () {
+      this.showingApproveConfirmDialog = true
+    },
+    hideApproveConfirmDialog () {
+      this.showingApproveConfirmDialog = false
+    },
+    showDenyConfirmDialog () {
+      this.showingDenyConfirmDialog = true
+    },
+    hideDenyConfirmDialog () {
+      this.showingDenyConfirmDialog = false
+    },
     approveUser () {
+      if (this.shouldConfirmApprove) {
+        this.showApproveConfirmDialog()
+      } else {
+        this.doApprove()
+      }
+    },
+    doApprove () {
       this.$store.state.api.backendInteractor.approveUser({ id: this.user.id })
       this.$store.dispatch('removeFollowRequest', this.user)
 
@@ -25,14 +52,34 @@ const FollowRequestCard = {
           notification.type = 'follow'
         }
       })
+      this.hideApproveConfirmDialog()
     },
     denyUser () {
+      if (this.shouldConfirmDeny) {
+        this.showDenyConfirmDialog()
+      } else {
+        this.doDeny()
+      }
+    },
+    doDeny () {
       const notifId = this.findFollowRequestNotificationId()
       this.$store.state.api.backendInteractor.denyUser({ id: this.user.id })
         .then(() => {
           this.$store.dispatch('dismissNotificationLocal', { id: notifId })
           this.$store.dispatch('removeFollowRequest', this.user)
         })
+      this.hideDenyConfirmDialog()
+    }
+  },
+  computed: {
+    mergedConfig () {
+      return this.$store.getters.mergedConfig
+    },
+    shouldConfirmApprove () {
+      return this.mergedConfig.modalOnApproveFollow
+    },
+    shouldConfirmDeny () {
+      return this.mergedConfig.modalOnDenyFollow
     }
   }
 }
diff --git a/src/components/follow_request_card/follow_request_card.vue b/src/components/follow_request_card/follow_request_card.vue
index eb222cc7..55b65112 100644
--- a/src/components/follow_request_card/follow_request_card.vue
+++ b/src/components/follow_request_card/follow_request_card.vue
@@ -14,6 +14,28 @@
         {{ $t('user_card.deny') }}
       </button>
     </div>
+    <teleport to="#modal">
+      <confirm-modal
+        v-if="showingApproveConfirmDialog"
+        :title="$t('user_card.approve_confirm_title')"
+        :confirm-text="$t('user_card.approve_confirm_accept_button')"
+        :cancel-text="$t('user_card.approve_confirm_cancel_button')"
+        @accepted="doApprove"
+        @cancelled="hideApproveConfirmDialog"
+      >
+        {{ $t('user_card.approve_confirm', { user: user.screen_name_ui }) }}
+      </confirm-modal>
+      <confirm-modal
+        v-if="showingDenyConfirmDialog"
+        :title="$t('user_card.deny_confirm_title')"
+        :confirm-text="$t('user_card.deny_confirm_accept_button')"
+        :cancel-text="$t('user_card.deny_confirm_cancel_button')"
+        @accepted="doDeny"
+        @cancelled="hideDenyConfirmDialog"
+      >
+        {{ $t('user_card.deny_confirm', { user: user.screen_name_ui }) }}
+      </confirm-modal>
+    </teleport>
   </basic-user-card>
 </template>
 
diff --git a/src/components/notification/notification.js b/src/components/notification/notification.js
index 265aaee0..0ce8892e 100644
--- a/src/components/notification/notification.js
+++ b/src/components/notification/notification.js
@@ -8,6 +8,7 @@ import Report from '../report/report.vue'
 import UserLink from '../user_link/user_link.vue'
 import RichContent from 'src/components/rich_content/rich_content.jsx'
 import UserPopover from '../user_popover/user_popover.vue'
+import ConfirmModal from '../confirm_modal/confirm_modal.vue'
 import { isStatusNotification } from '../../services/notification_utils/notification_utils.js'
 import { highlightClass, highlightStyle } from '../../services/user_highlighter/user_highlighter.js'
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
@@ -43,7 +44,9 @@ const Notification = {
     return {
       statusExpanded: false,
       betterShadow: this.$store.state.interface.browserSupport.cssFilter,
-      unmuted: false
+      unmuted: false,
+      showingApproveConfirmDialog: false,
+      showingDenyConfirmDialog: false
     }
   },
   props: ['notification'],
@@ -56,7 +59,8 @@ const Notification = {
     Report,
     RichContent,
     UserPopover,
-    UserLink
+    UserLink,
+    ConfirmModal
   },
   methods: {
     toggleStatusExpanded () {
@@ -71,7 +75,26 @@ const Notification = {
     toggleMute () {
       this.unmuted = !this.unmuted
     },
+    showApproveConfirmDialog () {
+      this.showingApproveConfirmDialog = true
+    },
+    hideApproveConfirmDialog () {
+      this.showingApproveConfirmDialog = false
+    },
+    showDenyConfirmDialog () {
+      this.showingDenyConfirmDialog = true
+    },
+    hideDenyConfirmDialog () {
+      this.showingDenyConfirmDialog = false
+    },
     approveUser () {
+      if (this.shouldConfirmApprove) {
+        this.showApproveConfirmDialog()
+      } else {
+        this.doApprove()
+      }
+    },
+    doApprove () {
       this.$store.state.api.backendInteractor.approveUser({ id: this.user.id })
       this.$store.dispatch('removeFollowRequest', this.user)
       this.$store.dispatch('markSingleNotificationAsSeen', { id: this.notification.id })
@@ -83,6 +106,13 @@ const Notification = {
       })
     },
     denyUser () {
+      if (this.shouldConfirmDeny) {
+        this.showDenyConfirmDialog()
+      } else {
+        this.doDeny()
+      }
+    },
+    doDeny () {
       this.$store.state.api.backendInteractor.denyUser({ id: this.user.id })
         .then(() => {
           this.$store.dispatch('dismissNotificationLocal', { id: this.notification.id })
@@ -117,6 +147,15 @@ const Notification = {
     isStatusNotification () {
       return isStatusNotification(this.notification.type)
     },
+    mergedConfig () {
+      return this.$store.getters.mergedConfig
+    },
+    shouldConfirmApprove () {
+      return this.mergedConfig.modalOnApproveFollow
+    },
+    shouldConfirmDeny () {
+      return this.mergedConfig.modalOnDenyFollow
+    },
     ...mapState({
       currentUser: state => state.users.currentUser
     })
diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue
index f1aa5420..e1ea42ad 100644
--- a/src/components/notification/notification.vue
+++ b/src/components/notification/notification.vue
@@ -243,6 +243,28 @@
         </template>
       </div>
     </div>
+    <teleport to="#modal">
+      <confirm-modal
+        v-if="showingApproveConfirmDialog"
+        :title="$t('user_card.approve_confirm_title')"
+        :confirm-text="$t('user_card.approve_confirm_accept_button')"
+        :cancel-text="$t('user_card.approve_confirm_cancel_button')"
+        @accepted="doApprove"
+        @cancelled="hideApproveConfirmDialog"
+      >
+        {{ $t('user_card.approve_confirm', { user: user.screen_name_ui }) }}
+      </confirm-modal>
+      <confirm-modal
+        v-if="showingDenyConfirmDialog"
+        :title="$t('user_card.deny_confirm_title')"
+        :confirm-text="$t('user_card.deny_confirm_accept_button')"
+        :cancel-text="$t('user_card.deny_confirm_cancel_button')"
+        @accepted="doDeny"
+        @cancelled="hideDenyConfirmDialog"
+      >
+        {{ $t('user_card.deny_confirm', { user: user.screen_name_ui }) }}
+      </confirm-modal>
+    </teleport>
   </article>
 </template>
 
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index 906c3758..9de3ed81 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -181,6 +181,16 @@
                 {{ $t('settings.confirm_dialogs_logout') }}
               </BooleanSetting>
             </li>
+            <li>
+              <BooleanSetting path="modalOnApproveFollow">
+                {{ $t('settings.confirm_dialogs_approve_follow') }}
+              </BooleanSetting>
+            </li>
+            <li>
+              <BooleanSetting path="modalOnDenyFollow">
+                {{ $t('settings.confirm_dialogs_deny_follow') }}
+              </BooleanSetting>
+            </li>
           </ul>
         </li>
       </ul>
diff --git a/src/modules/config.js b/src/modules/config.js
index a8949030..1df279a2 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -84,6 +84,8 @@ export const defaultState = {
   modalOnMute: undefined, // instance default
   modalOnDelete: undefined, // instance default
   modalOnLogout: undefined, // instance default
+  modalOnApproveFollow: undefined, // instance default
+  modalOnDenyFollow: undefined, // instance default
   playVideosInModal: false,
   useOneClickNsfw: false,
   useContainFit: true,
diff --git a/src/modules/instance.js b/src/modules/instance.js
index 6fc3830c..fcb6eecc 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -77,6 +77,8 @@ const defaultState = {
   modalOnMute: false,
   modalOnDelete: true,
   modalOnLogout: true,
+  modalOnApproveFollow: false,
+  modalOnDenyFollow: false,
   loginMethod: 'password',
   logo: '/static/logo.svg',
   logoMargin: '.2em',
-- 
cgit v1.2.3-70-g09d2


From 041bbb162299b896f5d0583c1ed4e8dcdc035c38 Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Tue, 7 Jun 2022 12:37:38 -0400
Subject: Add English translation for accept & deny follow requests

---
 src/i18n/en.json | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'src')

diff --git a/src/i18n/en.json b/src/i18n/en.json
index fc0de3ac..213f9cf0 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -427,6 +427,8 @@
     "confirm_dialogs_mute": "muting a user",
     "confirm_dialogs_delete": "deleting a status",
     "confirm_dialogs_logout": "logging out",
+    "confirm_dialogs_approve_follow": "approving a follower",
+    "confirm_dialogs_deny_follow": "denying a follower",
     "mutes_and_blocks": "Mutes and Blocks",
     "data_import_export_tab": "Data import / export",
     "default_vis": "Default visibility scope",
@@ -916,6 +918,10 @@
   },
   "user_card": {
     "approve": "Approve",
+    "approve_confirm_title": "Approve confirmation",
+    "approve_confirm_accept_button": "Approve",
+    "approve_confirm_cancel_button": "Do not approve",
+    "approve_confirm": "Do you want to approve {user}'s follow request?",
     "block": "Block",
     "blocked": "Blocked!",
     "block_confirm_title": "Block confirmation",
@@ -924,6 +930,10 @@
     "block_confirm_cancel_button": "Do not block",
     "deactivated": "Deactivated",
     "deny": "Deny",
+    "deny_confirm_title": "Deny confirmation",
+    "deny_confirm_accept_button": "Deny",
+    "deny_confirm_cancel_button": "Do not deny",
+    "deny_confirm": "Do you want to deny {user}'s follow request?",
     "edit_profile": "Edit profile",
     "favorites": "Favorites",
     "follow": "Follow",
-- 
cgit v1.2.3-70-g09d2


From 1856eeda40e76618717a66b51ffc49a1ecf8c967 Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Fri, 10 Jun 2022 15:55:31 -0400
Subject: Auto close confirm dialog after approve/deny

---
 src/components/notification/notification.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

diff --git a/src/components/notification/notification.js b/src/components/notification/notification.js
index 0ce8892e..420db4f0 100644
--- a/src/components/notification/notification.js
+++ b/src/components/notification/notification.js
@@ -104,6 +104,7 @@ const Notification = {
           notification.type = 'follow'
         }
       })
+      this.hideApproveConfirmDialog()
     },
     denyUser () {
       if (this.shouldConfirmDeny) {
@@ -118,6 +119,7 @@ const Notification = {
           this.$store.dispatch('dismissNotificationLocal', { id: this.notification.id })
           this.$store.dispatch('removeFollowRequest', this.user)
         })
+      this.hideDenyConfirmDialog()
     }
   },
   computed: {
-- 
cgit v1.2.3-70-g09d2


From 8a99d129dcc4a07375727b4f8959c7fa775b8ec0 Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Mon, 1 Aug 2022 11:02:21 -0400
Subject: Fix confirm modal lint

---
 src/components/confirm_modal/confirm_modal.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/components/confirm_modal/confirm_modal.vue b/src/components/confirm_modal/confirm_modal.vue
index 1ac64b62..3b98174a 100644
--- a/src/components/confirm_modal/confirm_modal.vue
+++ b/src/components/confirm_modal/confirm_modal.vue
@@ -4,13 +4,13 @@
     class="confirm-modal"
     :on-cancel="onCancel"
   >
-    <template v-slot:header>
+    <template #header>
       <span v-text="title" />
     </template>
 
     <slot />
 
-    <template v-slot:footer>
+    <template #footer>
       <button
         class="btn button-default"
         @click.prevent="onAccept"
-- 
cgit v1.2.3-70-g09d2


From 5359633c743455739a8b6fe64e246c832656b4d0 Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Mon, 1 Aug 2022 11:08:32 -0400
Subject: Fix timed mute lint

---
 src/services/api/api.service.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index c7a36af9..b8c10b21 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -1121,7 +1121,7 @@ const fetchMutes = ({ credentials }) => {
 const muteUser = ({ id, expiresIn, credentials }) => {
   const payload = {}
   if (expiresIn) {
-    payload['expires_in'] = expiresIn
+    payload.expires_in = expiresIn
   }
   return promisedRequest({ url: MASTODON_MUTE_USER_URL(id), credentials, method: 'POST', payload })
 }
-- 
cgit v1.2.3-70-g09d2


From 4db7f07421a6dc49f07dee9140a024ef5195a934 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Thu, 24 Nov 2022 23:26:31 -0500
Subject: Make autocomplete items buttons

---
 src/components/emoji_input/emoji_input.vue | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/components/emoji_input/emoji_input.vue b/src/components/emoji_input/emoji_input.vue
index ccba0393..6df2cebe 100644
--- a/src/components/emoji_input/emoji_input.vue
+++ b/src/components/emoji_input/emoji_input.vue
@@ -53,6 +53,7 @@
             v-for="(suggestion, index) in suggestions"
             :key="index"
             class="autocomplete-item"
+            role="button"
             :class="{ highlighted: index === highlighted }"
             @click.stop.prevent="onClick($event, suggestion)"
           >
-- 
cgit v1.2.3-70-g09d2


From 6235af4592c52a657415ffae772bd83ec106bc13 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Sat, 21 Jan 2023 01:07:07 -0500
Subject: Make screenreaders read out autocomplete results

---
 src/components/emoji_input/emoji_input.js          | 53 ++++++++++++++--------
 src/components/emoji_input/emoji_input.vue         | 19 +++++++-
 .../post_status_form/post_status_form.vue          | 53 ++++++++++++----------
 .../screen_reader_notice/screen_reader_notice.js   | 21 +++++++++
 .../screen_reader_notice/screen_reader_notice.vue  | 21 +++++++++
 src/i18n/en.json                                   |  3 +-
 6 files changed, 126 insertions(+), 44 deletions(-)
 create mode 100644 src/components/screen_reader_notice/screen_reader_notice.js
 create mode 100644 src/components/screen_reader_notice/screen_reader_notice.vue

(limited to 'src')

diff --git a/src/components/emoji_input/emoji_input.js b/src/components/emoji_input/emoji_input.js
index ba5f7552..020e9fde 100644
--- a/src/components/emoji_input/emoji_input.js
+++ b/src/components/emoji_input/emoji_input.js
@@ -1,6 +1,7 @@
 import Completion from '../../services/completion/completion.js'
 import EmojiPicker from '../emoji_picker/emoji_picker.vue'
 import Popover from 'src/components/popover/popover.vue'
+import ScreenReaderNotice from 'src/components/screen_reader_notice/screen_reader_notice.vue'
 import UnicodeDomainIndicator from '../unicode_domain_indicator/unicode_domain_indicator.vue'
 import { take } from 'lodash'
 import { findOffset } from '../../services/offset_finder/offset_finder.service.js'
@@ -109,9 +110,10 @@ const EmojiInput = {
   },
   data () {
     return {
+      randomSeed: `${Math.random()}`.replace('.', '-'),
       input: undefined,
       caretEl: undefined,
-      highlighted: 0,
+      highlighted: -1,
       caret: 0,
       focused: false,
       blurTimeout: null,
@@ -125,7 +127,8 @@ const EmojiInput = {
   components: {
     Popover,
     EmojiPicker,
-    UnicodeDomainIndicator
+    UnicodeDomainIndicator,
+    ScreenReaderNotice
   },
   computed: {
     padEmoji () {
@@ -203,6 +206,12 @@ const EmojiInput = {
         top: this.input.scrollTop,
         left: this.input.scrollLeft
       })
+    },
+    suggestionListId () {
+      return `suggestions-${this.randomSeed}`
+    },
+    suggestionItemId () {
+      return (index) => `suggestion-item-${index}-${this.randomSeed}`
     }
   },
   mounted () {
@@ -278,6 +287,10 @@ const EmojiInput = {
           ...rest,
           img: imageUrl || ''
         }))
+      this.$refs.screenReaderNotice.announce(
+        this.$tc('tool_tip.autocomplete_available',
+          this.suggestions.length,
+          { number: this.suggestions.length }))
     }
   },
   methods: {
@@ -374,27 +387,24 @@ const EmojiInput = {
     },
     cycleBackward (e) {
       const len = this.suggestions.length || 0
-      if (len > 1) {
-        this.highlighted -= 1
-        if (this.highlighted < 0) {
-          this.highlighted = this.suggestions.length - 1
-        }
-        e.preventDefault()
-      } else {
-        this.highlighted = 0
+
+      this.highlighted -= 1
+      if (this.highlighted === -1) {
+        this.input.focus()
+      } else if (this.highlighted < -1) {
+        this.highlighted = len - 1
       }
+      e.preventDefault()
     },
     cycleForward (e) {
       const len = this.suggestions.length || 0
-      if (len > 1) {
-        this.highlighted += 1
-        if (this.highlighted >= len) {
-          this.highlighted = 0
-        }
-        e.preventDefault()
-      } else {
-        this.highlighted = 0
+
+      this.highlighted += 1
+      if (this.highlighted >= len) {
+        this.highlighted = -1
+        this.input.focus()
       }
+      e.preventDefault()
     },
     scrollIntoView () {
       const rootRef = this.$refs.picker.$el
@@ -540,6 +550,13 @@ const EmojiInput = {
       })
     },
     resize () {
+    },
+    autoCompleteItemLabel (suggestion) {
+      if (suggestion.user) {
+        return suggestion.displayText + ' ' + suggestion.detailText
+      } else {
+        return this.maybeLocalizedEmojiName(suggestion)
+      }
     }
   }
 }
diff --git a/src/components/emoji_input/emoji_input.vue b/src/components/emoji_input/emoji_input.vue
index 6df2cebe..4a7b0fa8 100644
--- a/src/components/emoji_input/emoji_input.vue
+++ b/src/components/emoji_input/emoji_input.vue
@@ -4,7 +4,13 @@
     class="emoji-input"
     :class="{ 'with-picker': !hideEmojiButton }"
   >
-    <slot />
+    <slot
+      :id="'textbox-' + randomSeed"
+      :aria-owns="suggestionListId"
+      aria-autocomplete="both"
+      :aria-expanded="showSuggestions"
+      :aria-activedescendant="(!showSuggestions || highlighted === -1) ? '' : suggestionItemId(highlighted)"
+    />
     <!-- TODO: make the 'x' disappear if at the end maybe? -->
     <div
       ref="hiddenOverlay"
@@ -18,6 +24,10 @@
       >x</span>
       <span>{{ postText }}</span>
     </div>
+    <screen-reader-notice
+      ref="screenReaderNotice"
+      aria-live="assertive"
+    />
     <template v-if="enableEmojiPicker">
       <button
         v-if="!hideEmojiButton"
@@ -46,15 +56,20 @@
     >
       <template #content>
         <div
+          :id="suggestionListId"
           ref="panel-body"
           class="autocomplete-panel-body"
+          role="listbox"
         >
           <div
             v-for="(suggestion, index) in suggestions"
+            :id="suggestionItemId(index)"
             :key="index"
             class="autocomplete-item"
-            role="button"
+            role="option"
             :class="{ highlighted: index === highlighted }"
+            :aria-label="autoCompleteItemLabel(suggestion)"
+            :aria-selected="index === highlighted"
             @click.stop.prevent="onClick($event, suggestion)"
           >
             <span class="image">
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index c51639db..26a5acc4 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -148,29 +148,36 @@
           @sticker-upload-failed="uploadFailed"
           @shown="handleEmojiInputShow"
         >
-          <textarea
-            ref="textarea"
-            v-model="newStatus.status"
-            :placeholder="placeholder || $t('post_status.default')"
-            rows="1"
-            cols="1"
-            :disabled="posting && !optimisticPosting"
-            class="form-post-body"
-            :class="{ 'scrollable-form': !!maxHeight }"
-            @keydown.exact.enter="submitOnEnter && postStatus($event, newStatus)"
-            @keydown.meta.enter="postStatus($event, newStatus)"
-            @keydown.ctrl.enter="!submitOnEnter && postStatus($event, newStatus)"
-            @input="resize"
-            @compositionupdate="resize"
-            @paste="paste"
-          />
-          <p
-            v-if="hasStatusLengthLimit"
-            class="character-counter faint"
-            :class="{ error: isOverLengthLimit }"
-          >
-            {{ charactersLeft }}
-          </p>
+          <template #default="inputProps">
+            <textarea
+              ref="textarea"
+              v-model="newStatus.status"
+              :placeholder="placeholder || $t('post_status.default')"
+              rows="1"
+              cols="1"
+              :disabled="posting && !optimisticPosting"
+              class="form-post-body"
+              :class="{ 'scrollable-form': !!maxHeight }"
+              v-bind="inputProps"
+              :aria-owns="inputProps.ariaOwns"
+              :aria-autocomplete="inputProps.ariaAutocomplete"
+              :aria-activedescendant="inputProps.ariaActiveDescendant"
+              :aria-expanded="inputProps.ariaExpanded"
+              @keydown.exact.enter="submitOnEnter && postStatus($event, newStatus)"
+              @keydown.meta.enter="postStatus($event, newStatus)"
+              @keydown.ctrl.enter="!submitOnEnter && postStatus($event, newStatus)"
+              @input="resize"
+              @compositionupdate="resize"
+              @paste="paste"
+            />
+            <p
+              v-if="hasStatusLengthLimit"
+              class="character-counter faint"
+              :class="{ error: isOverLengthLimit }"
+            >
+              {{ charactersLeft }}
+            </p>
+          </template>
         </EmojiInput>
         <div
           v-if="!disableScopeSelector"
diff --git a/src/components/screen_reader_notice/screen_reader_notice.js b/src/components/screen_reader_notice/screen_reader_notice.js
new file mode 100644
index 00000000..3b8eaf37
--- /dev/null
+++ b/src/components/screen_reader_notice/screen_reader_notice.js
@@ -0,0 +1,21 @@
+const ScreenReaderNotice = {
+  props: {
+    ariaLive: {
+      type: String,
+      defualt: 'assertive'
+    }
+  },
+  data () {
+    return {
+      currentText: ''
+    }
+  },
+  methods: {
+    announce (text) {
+      this.currentText = text
+      setTimeout(() => { this.currentText = '' }, 1000)
+    }
+  }
+}
+
+export default ScreenReaderNotice
diff --git a/src/components/screen_reader_notice/screen_reader_notice.vue b/src/components/screen_reader_notice/screen_reader_notice.vue
new file mode 100644
index 00000000..5098b94f
--- /dev/null
+++ b/src/components/screen_reader_notice/screen_reader_notice.vue
@@ -0,0 +1,21 @@
+<template>
+  <div
+    class="screen-reader-text"
+    :aria-live="ariaLive"
+  >
+    {{ currentText }}
+  </div>
+</template>
+
+<script src="./screen_reader_notice.js"></script>
+
+<style lang="scss">
+.screen-reader-text {
+  display: block;
+  width: 1px;
+  height: 1px;
+  margin: -1px;
+  overflow: hidden;
+  visibility: visible;
+}
+</style>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 1ee1147a..6166a510 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -996,7 +996,8 @@
     "reject_follow_request": "Reject follow request",
     "bookmark": "Bookmark",
     "toggle_expand": "Expand or collapse notification to show post in full",
-    "toggle_mute": "Expand or collapse notification to reveal muted content"
+    "toggle_mute": "Expand or collapse notification to reveal muted content",
+    "autocomplete_available": "{number} result is available | {number} results are available"
   },
   "upload": {
     "error": {
-- 
cgit v1.2.3-70-g09d2


From 72cb9e8bdbd41b66f72f8dd0dcd52cc04c7a2245 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Sat, 21 Jan 2023 01:28:43 -0500
Subject: Make all emoji inputs screen-reader-friendly

---
 src/components/emoji_input/emoji_input.js          |  1 +
 .../post_status_form/post_status_form.js           |  4 ++
 .../post_status_form/post_status_form.vue          | 25 ++++++------
 src/components/settings_modal/tabs/profile_tab.js  |  4 ++
 src/components/settings_modal/tabs/profile_tab.vue | 46 ++++++++++++++--------
 .../attributes_helper/attributes_helper.service.js |  8 ++++
 6 files changed, 58 insertions(+), 30 deletions(-)
 create mode 100644 src/services/attributes_helper/attributes_helper.service.js

(limited to 'src')

diff --git a/src/components/emoji_input/emoji_input.js b/src/components/emoji_input/emoji_input.js
index 020e9fde..3b0db786 100644
--- a/src/components/emoji_input/emoji_input.js
+++ b/src/components/emoji_input/emoji_input.js
@@ -287,6 +287,7 @@ const EmojiInput = {
           ...rest,
           img: imageUrl || ''
         }))
+      this.highlighted = -1
       this.$refs.screenReaderNotice.announce(
         this.$tc('tool_tip.autocomplete_available',
           this.suggestions.length,
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index eb55cfcc..b75fee69 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -8,6 +8,7 @@ import Gallery from 'src/components/gallery/gallery.vue'
 import StatusContent from '../status_content/status_content.vue'
 import fileTypeService from '../../services/file_type/file_type.service.js'
 import { findOffset } from '../../services/offset_finder/offset_finder.service.js'
+import { propsToNative } from '../../services/attributes_helper/attributes_helper.service.js'
 import { reject, map, uniqBy, debounce } from 'lodash'
 import suggestor from '../emoji_input/suggestor.js'
 import { mapGetters, mapState } from 'vuex'
@@ -629,6 +630,9 @@ const PostStatusForm = {
     },
     openProfileTab () {
       this.$store.dispatch('openSettingsModalTab', 'profile')
+    },
+    propsToNative (props) {
+      return propsToNative(props)
     }
   }
 }
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 26a5acc4..328e145f 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -124,14 +124,17 @@
           :suggest="emojiSuggestor"
           class="form-control"
         >
-          <input
-            v-model="newStatus.spoilerText"
-            type="text"
-            :placeholder="$t('post_status.content_warning')"
-            :disabled="posting && !optimisticPosting"
-            size="1"
-            class="form-post-subject"
-          >
+          <template #default="inputProps">
+            <input
+              v-model="newStatus.spoilerText"
+              type="text"
+              :placeholder="$t('post_status.content_warning')"
+              :disabled="posting && !optimisticPosting"
+              v-bind="propsToNative(inputProps)"
+              size="1"
+              class="form-post-subject"
+            >
+          </template>
         </EmojiInput>
         <EmojiInput
           ref="emoji-input"
@@ -158,11 +161,7 @@
               :disabled="posting && !optimisticPosting"
               class="form-post-body"
               :class="{ 'scrollable-form': !!maxHeight }"
-              v-bind="inputProps"
-              :aria-owns="inputProps.ariaOwns"
-              :aria-autocomplete="inputProps.ariaAutocomplete"
-              :aria-activedescendant="inputProps.ariaActiveDescendant"
-              :aria-expanded="inputProps.ariaExpanded"
+              v-bind="propsToNative(inputProps)"
               @keydown.exact.enter="submitOnEnter && postStatus($event, newStatus)"
               @keydown.meta.enter="postStatus($event, newStatus)"
               @keydown.ctrl.enter="!submitOnEnter && postStatus($event, newStatus)"
diff --git a/src/components/settings_modal/tabs/profile_tab.js b/src/components/settings_modal/tabs/profile_tab.js
index ff2ccef2..50de733e 100644
--- a/src/components/settings_modal/tabs/profile_tab.js
+++ b/src/components/settings_modal/tabs/profile_tab.js
@@ -12,6 +12,7 @@ import InterfaceLanguageSwitcher from 'src/components/interface_language_switche
 import BooleanSetting from '../helpers/boolean_setting.vue'
 import SharedComputedObject from '../helpers/shared_computed_object.js'
 import localeService from 'src/services/locale/locale.service.js'
+import { propsToNative } from 'src/services/attributes_helper/attributes_helper.service.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
@@ -257,6 +258,9 @@ const ProfileTab = {
         messageArgs: [error.message],
         level: 'error'
       })
+    },
+    propsToNative (props) {
+      return propsToNative(props)
     }
   }
 }
diff --git a/src/components/settings_modal/tabs/profile_tab.vue b/src/components/settings_modal/tabs/profile_tab.vue
index 642d54ca..54704dad 100644
--- a/src/components/settings_modal/tabs/profile_tab.vue
+++ b/src/components/settings_modal/tabs/profile_tab.vue
@@ -8,11 +8,14 @@
         enable-emoji-picker
         :suggest="emojiSuggestor"
       >
-        <input
-          id="username"
-          v-model="newName"
-          class="name-changer"
-        >
+        <template #default="inputProps">
+          <input
+            id="username"
+            v-model="newName"
+            class="name-changer"
+            v-bind="propsToNative(inputProps)"
+          >
+        </template>
       </EmojiInput>
       <p>{{ $t('settings.bio') }}</p>
       <EmojiInput
@@ -20,10 +23,13 @@
         enable-emoji-picker
         :suggest="emojiUserSuggestor"
       >
-        <textarea
-          v-model="newBio"
-          class="bio resize-height"
-        />
+        <template #default="inputProps">
+          <textarea
+            v-model="newBio"
+            class="bio resize-height"
+            v-bind="propsToNative(inputProps)"
+          />
+        </template>
       </EmojiInput>
       <p v-if="role === 'admin' || role === 'moderator'">
         <Checkbox v-model="showRole">
@@ -48,10 +54,13 @@
             hide-emoji-button
             :suggest="userSuggestor"
           >
-            <input
-              v-model="newFields[i].name"
-              :placeholder="$t('settings.profile_fields.name')"
-            >
+            <template #default="inputProps">
+              <input
+                v-model="newFields[i].name"
+                :placeholder="$t('settings.profile_fields.name')"
+                v-bind="propsToNative(inputProps)"
+              >
+            </template>
           </EmojiInput>
           <EmojiInput
             v-model="newFields[i].value"
@@ -59,10 +68,13 @@
             hide-emoji-button
             :suggest="userSuggestor"
           >
-            <input
-              v-model="newFields[i].value"
-              :placeholder="$t('settings.profile_fields.value')"
-            >
+            <template #default="inputProps">
+              <input
+                v-model="newFields[i].value"
+                :placeholder="$t('settings.profile_fields.value')"
+                v-bind="propsToNative(inputProps)"
+              >
+            </template>
           </EmojiInput>
           <button
             class="delete-field button-unstyled -hover-highlight"
diff --git a/src/services/attributes_helper/attributes_helper.service.js b/src/services/attributes_helper/attributes_helper.service.js
new file mode 100644
index 00000000..74d3323c
--- /dev/null
+++ b/src/services/attributes_helper/attributes_helper.service.js
@@ -0,0 +1,8 @@
+import { kebabCase } from 'lodash'
+
+const propsToNative = props => Object.keys(props).reduce((acc, cur) => {
+  acc[kebabCase(cur)] = props[cur]
+  return acc
+}, {})
+
+export { propsToNative }
-- 
cgit v1.2.3-70-g09d2


From 246593970b739138f518e1aa9545fd2f5168eb2a Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Sat, 21 Jan 2023 01:30:44 -0500
Subject: Make autocomplete prompt more user-friendly

---
 src/i18n/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/i18n/en.json b/src/i18n/en.json
index 6166a510..ebd7d0af 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -997,7 +997,7 @@
     "bookmark": "Bookmark",
     "toggle_expand": "Expand or collapse notification to show post in full",
     "toggle_mute": "Expand or collapse notification to reveal muted content",
-    "autocomplete_available": "{number} result is available | {number} results are available"
+    "autocomplete_available": "{number} result is available. Use up and down keys to navigate through them. | {number} results are available. Use up and down keys to navigate through them."
   },
   "upload": {
     "error": {
-- 
cgit v1.2.3-70-g09d2


From 280ff3520d92fe0c345fa91178bbe38704ebe82e Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Mon, 16 Jan 2023 14:02:30 +0000
Subject: Translated using Weblate (Esperanto)

Currently translated at 97.7% (904 of 925 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/eo/
---
 src/i18n/eo.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/i18n/eo.json b/src/i18n/eo.json
index 3596065c..e013edee 100644
--- a/src/i18n/eo.json
+++ b/src/i18n/eo.json
@@ -603,7 +603,7 @@
     "use_websockets": "Uzi teĥnikaron «websockets» (tuja ĝisdatigo)",
     "mention_link_display_full_for_remote": "plene nur je uzantoj foraj (ekz. {'@'}zozo{'@'}ekzemplo.org)",
     "expert_mode": "Montri altnivelajn",
-    "setting_server_side": "Ĉi tiu agordo estas ligita al via profilo, kaj efektiviĝon en ĉiuj viaj salutoj kaj klientoj",
+    "setting_server_side": "Ĉi tiu agordo estas ligita al via profilo, kaj efektiviĝos en ĉiuj viaj salutoj kaj klientoj",
     "post_look_feel": "Aspekto de afiŝoj",
     "mention_links": "Menciaj ligiloj",
     "email_language": "Lingvo de leteroj ricevotaj de la servilo",
-- 
cgit v1.2.3-70-g09d2


From 883a8004f2318faf64f8661a5696f568d3066ec0 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Wed, 18 Jan 2023 03:34:43 +0000
Subject: Translated using Weblate (Chinese (Simplified))

Currently translated at 86.8% (803 of 925 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hans/
---
 src/i18n/zh.json | 49 ++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 46 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/i18n/zh.json b/src/i18n/zh.json
index cf5f384c..8f0b04bd 100644
--- a/src/i18n/zh.json
+++ b/src/i18n/zh.json
@@ -53,7 +53,13 @@
       "direct": "私讯",
       "private": "仅关注者",
       "unlisted": "列外"
-    }
+    },
+    "scroll_to_top": "滚动至顶",
+    "generic_error_message": "发生一个错误：{0}",
+    "never_show_again": "不再显示",
+    "undo": "撤销",
+    "yes": "是",
+    "no": "否"
   },
   "image_cropper": {
     "crop_picture": "裁剪图片",
@@ -109,7 +115,12 @@
     "chats": "聊天",
     "timelines": "时间线",
     "bookmarks": "书签",
-    "home_timeline": "主页时间线"
+    "home_timeline": "主页时间线",
+    "lists": "列表",
+    "edit_finish": "完成编辑",
+    "mobile_notifications": "打开通知（有未读的）",
+    "mobile_notifications_close": "关闭通知",
+    "announcements": "公告"
   },
   "notifications": {
     "broken_favorite": "未知的状态，正在搜索中…",
@@ -890,7 +901,18 @@
     "search_emoji": "搜索表情符号",
     "emoji": "表情符号",
     "load_all": "加载所有表情符号（共 {emojiAmount} 个）",
-    "load_all_hint": "最先加载的 {saneAmount} 表情符号，加载全部表情符号可能会带来性能问题。"
+    "load_all_hint": "最先加载的 {saneAmount} 表情符号，加载全部表情符号可能会带来性能问题。",
+    "unicode_groups": {
+      "flags": "旗帜",
+      "food-and-drink": "饮食",
+      "objects": "物件",
+      "people-and-body": "人和身体",
+      "symbols": "符号",
+      "travel-and-places": "旅行和地点",
+      "activities": "活动",
+      "animals-and-nature": "动物和自然"
+    },
+    "regional_indicator": "地区指示符 {letter}"
   },
   "about": {
     "mrf": {
@@ -958,5 +980,26 @@
     "delete": "删除",
     "message_user": "发消息给 {nickname}",
     "you": "你："
+  },
+  "announcements": {
+    "page_header": "公告",
+    "title": "公告",
+    "mark_as_read_action": "标为已读",
+    "post_form_header": "发布公告",
+    "post_placeholder": "在这里输入公告内容...",
+    "post_action": "发布",
+    "post_error": "错误：{error}",
+    "close_error": "关闭",
+    "delete_action": "删除",
+    "start_time_prompt": "起始时间： ",
+    "end_time_prompt": "终止时间： ",
+    "all_day_prompt": "这是全天的事件",
+    "published_time_display": "发表于 {time}",
+    "start_time_display": "开始于 {time}",
+    "end_time_display": "结束于 {time}",
+    "edit_action": "编辑",
+    "submit_edit_action": "提交",
+    "cancel_edit_action": "取消",
+    "inactive_message": "这个公告不活跃"
   }
 }
-- 
cgit v1.2.3-70-g09d2


From 5478192e2074fc4c4f2d9ef1a751618c89fb3582 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Sat, 21 Jan 2023 14:50:57 -0500
Subject: Make keys work as intended when there is no suggestions

---
 src/components/emoji_input/emoji_input.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/components/emoji_input/emoji_input.js b/src/components/emoji_input/emoji_input.js
index 3b0db786..8a8d098d 100644
--- a/src/components/emoji_input/emoji_input.js
+++ b/src/components/emoji_input/emoji_input.js
@@ -395,7 +395,9 @@ const EmojiInput = {
       } else if (this.highlighted < -1) {
         this.highlighted = len - 1
       }
-      e.preventDefault()
+      if (len > 0) {
+        e.preventDefault()
+      }
     },
     cycleForward (e) {
       const len = this.suggestions.length || 0
@@ -405,7 +407,9 @@ const EmojiInput = {
         this.highlighted = -1
         this.input.focus()
       }
-      e.preventDefault()
+      if (len > 0) {
+        e.preventDefault()
+      }
     },
     scrollIntoView () {
       const rootRef = this.$refs.picker.$el
-- 
cgit v1.2.3-70-g09d2


From 524363267811ce34ab82786ccf392ceb2708ac16 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Sat, 21 Jan 2023 15:08:17 -0500
Subject: Label buttons in top bar

---
 src/components/desktop_nav/desktop_nav.vue | 7 ++++---
 src/components/search_bar/search_bar.vue   | 4 ++++
 src/i18n/en.json                           | 1 +
 3 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/components/desktop_nav/desktop_nav.vue b/src/components/desktop_nav/desktop_nav.vue
index 07bf8005..e0ee39c3 100644
--- a/src/components/desktop_nav/desktop_nav.vue
+++ b/src/components/desktop_nav/desktop_nav.vue
@@ -20,6 +20,7 @@
         class="logo"
         :to="{ name: 'root' }"
         :style="logoBgStyle"
+        :title="sitename"
       >
         <div
           class="mask"
@@ -38,13 +39,13 @@
         />
         <button
           class="button-unstyled nav-icon"
+          :title="$t('nav.preferences')"
           @click.stop="openSettingsModal"
         >
           <FAIcon
             fixed-width
             class="fa-scale-110 fa-old-padding"
             icon="cog"
-            :title="$t('nav.preferences')"
           />
         </button>
         <a
@@ -52,26 +53,26 @@
           href="/pleroma/admin/#/login-pleroma"
           class="nav-icon"
           target="_blank"
+          :title="$t('nav.administration')"
           @click.stop
         >
           <FAIcon
             fixed-width
             class="fa-scale-110 fa-old-padding"
             icon="tachometer-alt"
-            :title="$t('nav.administration')"
           />
         </a>
         <span class="spacer" />
         <button
           v-if="currentUser"
           class="button-unstyled nav-icon"
+          :title="$t('login.logout')"
           @click.stop.prevent="logout"
         >
           <FAIcon
             fixed-width
             class="fa-scale-110 fa-old-padding"
             icon="sign-out-alt"
-            :title="$t('login.logout')"
           />
         </button>
       </div>
diff --git a/src/components/search_bar/search_bar.vue b/src/components/search_bar/search_bar.vue
index 3969d8de..9da2b272 100644
--- a/src/components/search_bar/search_bar.vue
+++ b/src/components/search_bar/search_bar.vue
@@ -8,6 +8,7 @@
       class="button-unstyled nav-icon"
       :title="$t('nav.search')"
       type="button"
+      :aria-expanded="!hidden"
       @click.prevent.stop="toggleHidden"
     >
       <FAIcon
@@ -29,6 +30,7 @@
       <button
         class="button-default search-button"
         type="submit"
+        :title="$t('nav.search')"
         @click="find(searchTerm)"
       >
         <FAIcon
@@ -39,6 +41,8 @@
       <button
         class="button-unstyled cancel-search"
         type="button"
+        :title="$t('nav.search_close')"
+        :aria-expanded="!hidden"
         @click.prevent.stop="toggleHidden"
       >
         <FAIcon
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 1ee1147a..5b97bdcd 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -172,6 +172,7 @@
     "bookmarks": "Bookmarks",
     "user_search": "User Search",
     "search": "Search",
+    "search_close": "Close search bar",
     "who_to_follow": "Who to follow",
     "preferences": "Preferences",
     "timelines": "Timelines",
-- 
cgit v1.2.3-70-g09d2


From 1ab958ba6b0ad1e1449fd8fe6b0bc8729520ce12 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Sat, 21 Jan 2023 15:30:23 -0500
Subject: Make quick settings menus more accessible

---
 .../quick_filter_settings.vue                      | 29 +++++++++-
 .../quick_view_settings/quick_view_settings.vue    | 65 +++++++++++++++-------
 2 files changed, 73 insertions(+), 21 deletions(-)

(limited to 'src')

diff --git a/src/components/quick_filter_settings/quick_filter_settings.vue b/src/components/quick_filter_settings/quick_filter_settings.vue
index f2aa61ee..b81215a1 100644
--- a/src/components/quick_filter_settings/quick_filter_settings.vue
+++ b/src/components/quick_filter_settings/quick_filter_settings.vue
@@ -6,36 +6,51 @@
     :trigger-attrs="{ title: $t('timeline.quick_filter_settings') }"
   >
     <template #content>
-      <div class="dropdown-menu">
-        <div v-if="loggedIn">
+      <div
+        class="dropdown-menu"
+        role="menu"
+      >
+        <div
+          v-if="loggedIn"
+          role="group"
+        >
           <button
             v-if="!conversation"
             class="button-default dropdown-item"
+            :aria-checked="replyVisibilityAll"
+            role="menuitemradio"
             @click="replyVisibilityAll = true"
           >
             <span
               class="menu-checkbox -radio"
               :class="{ 'menu-checkbox-checked': replyVisibilityAll }"
+              :aria-hidden="true"
             />{{ $t('settings.reply_visibility_all') }}
           </button>
           <button
             v-if="!conversation"
             class="button-default dropdown-item"
+            :aria-checked="replyVisibilityFollowing"
+            role="menuitemradio"
             @click="replyVisibilityFollowing = true"
           >
             <span
               class="menu-checkbox -radio"
               :class="{ 'menu-checkbox-checked': replyVisibilityFollowing }"
+              :aria-hidden="true"
             />{{ $t('settings.reply_visibility_following_short') }}
           </button>
           <button
             v-if="!conversation"
             class="button-default dropdown-item"
+            :aria-checked="replyVisibilitySelf"
+            role="menuitemradio"
             @click="replyVisibilitySelf = true"
           >
             <span
               class="menu-checkbox -radio"
               :class="{ 'menu-checkbox-checked': replyVisibilitySelf }"
+              :aria-hidden="true"
             />{{ $t('settings.reply_visibility_self_short') }}
           </button>
           <div
@@ -46,33 +61,43 @@
         </div>
         <button
           class="button-default dropdown-item"
+          role="menuitemcheckbox"
+          :aria-checked="muteBotStatuses"
           @click="muteBotStatuses = !muteBotStatuses"
         >
           <span
             class="menu-checkbox"
             :class="{ 'menu-checkbox-checked': muteBotStatuses }"
+            :aria-hidden="true"
           />{{ $t('settings.mute_bot_posts') }}
         </button>
         <button
           class="button-default dropdown-item"
+          role="menuitemcheckbox"
+          :aria-checked="hideMedia"
           @click="hideMedia = !hideMedia"
         >
           <span
             class="menu-checkbox"
             :class="{ 'menu-checkbox-checked': hideMedia }"
+            :aria-hidden="true"
           />{{ $t('settings.hide_media_previews') }}
         </button>
         <button
           class="button-default dropdown-item"
+          role="menuitemcheckbox"
+          :aria-checked="hideMutedPosts"
           @click="hideMutedPosts = !hideMutedPosts"
         >
           <span
             class="menu-checkbox"
             :class="{ 'menu-checkbox-checked': hideMutedPosts }"
+            :aria-hidden="true"
           />{{ $t('settings.hide_all_muted_posts') }}
         </button>
         <button
           class="button-default dropdown-item dropdown-item-icon"
+          role="menuitem"
           @click="openTab('filtering')"
         >
           <FAIcon icon="font" />{{ $t('settings.word_filter_and_more') }}
diff --git a/src/components/quick_view_settings/quick_view_settings.vue b/src/components/quick_view_settings/quick_view_settings.vue
index 4bd81c5b..9f5cdabc 100644
--- a/src/components/quick_view_settings/quick_view_settings.vue
+++ b/src/components/quick_view_settings/quick_view_settings.vue
@@ -6,60 +6,87 @@
     :trigger-attrs="{ title: $t('timeline.quick_view_settings') }"
   >
     <template #content>
-      <div class="dropdown-menu">
-        <button
-          class="button-default dropdown-item"
-          @click="conversationDisplay = 'tree'"
-        >
-          <span
-            class="menu-checkbox -radio"
-            :class="{ 'menu-checkbox-checked': conversationDisplay === 'tree' }"
-          /><FAIcon icon="folder-tree" /> {{ $t('settings.conversation_display_tree_quick') }}
-        </button>
-        <button
-          class="button-default dropdown-item"
-          @click="conversationDisplay = 'linear'"
-        >
-          <span
-            class="menu-checkbox -radio"
-            :class="{ 'menu-checkbox-checked': conversationDisplay === 'linear' }"
-          /><FAIcon icon="list" /> {{ $t('settings.conversation_display_linear_quick') }}
-        </button>
+      <div
+        class="dropdown-menu"
+        role="menu"
+      >
+        <div role="group">
+          <button
+            class="button-default dropdown-item"
+            :aria-checked="conversationDisplay === 'tree'"
+            role="menuitemradio"
+            @click="conversationDisplay = 'tree'"
+          >
+            <span
+              class="menu-checkbox -radio"
+              :aria-hidden="true"
+              :class="{ 'menu-checkbox-checked': conversationDisplay === 'tree' }"
+            /><FAIcon
+              icon="folder-tree"
+              :aria-hidden="true"
+            /> {{ $t('settings.conversation_display_tree_quick') }}
+          </button>
+          <button
+            class="button-default dropdown-item"
+            :aria-checked="conversationDisplay === 'linear'"
+            role="menuitemradio"
+            @click="conversationDisplay = 'linear'"
+          >
+            <span
+              class="menu-checkbox -radio"
+              :class="{ 'menu-checkbox-checked': conversationDisplay === 'linear' }"
+              :aria-hidden="true"
+            /><FAIcon
+              icon="list"
+              :aria-hidden="true"
+            /> {{ $t('settings.conversation_display_linear_quick') }}
+          </button>
+        </div>
         <div
           role="separator"
           class="dropdown-divider"
         />
         <button
           class="button-default dropdown-item"
+          role="menuitemcheckbox"
+          :aria-checked="showUserAvatars"
           @click="showUserAvatars = !showUserAvatars"
         >
           <span
             class="menu-checkbox"
             :class="{ 'menu-checkbox-checked': showUserAvatars }"
+            :aria-hidden="true"
           />{{ $t('settings.mention_link_show_avatar_quick') }}
         </button>
         <button
           v-if="!conversation"
           class="button-default dropdown-item"
+          role="menuitemcheckbox"
+          :aria-checked="autoUpdate"
           @click="autoUpdate = !autoUpdate"
         >
           <span
             class="menu-checkbox"
             :class="{ 'menu-checkbox-checked': autoUpdate }"
+            :aria-hidden="true"
           />{{ $t('settings.auto_update') }}
         </button>
         <button
           v-if="!conversation"
           class="button-default dropdown-item"
+          role="menuitemcheckbox"
+          :aria-checked="collapseWithSubjects"
           @click="collapseWithSubjects = !collapseWithSubjects"
         >
           <span
             class="menu-checkbox"
             :class="{ 'menu-checkbox-checked': collapseWithSubjects }"
+            :aria-hidden="true"
           />{{ $t('settings.collapse_subject') }}
         </button>
         <button
           class="button-default dropdown-item dropdown-item-icon"
+          role="menuitem"
           @click="openTab('general')"
         >
           <FAIcon icon="wrench" />{{ $t('settings.more_settings') }}
-- 
cgit v1.2.3-70-g09d2


From 68110ce8251610888348defc2e971c9c6af6a55b Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Sun, 16 Jan 2022 01:19:52 -0500
Subject: Make interact buttons accessible for anonymous users

---
 src/components/favorite_button/favorite_button.vue | 17 ++++++++++++-----
 src/components/reply_button/reply_button.vue       | 18 +++++++++++++-----
 src/components/retweet_button/retweet_button.vue   | 17 ++++++++++++-----
 3 files changed, 37 insertions(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/components/favorite_button/favorite_button.vue b/src/components/favorite_button/favorite_button.vue
index 58d14945..8c883c13 100644
--- a/src/components/favorite_button/favorite_button.vue
+++ b/src/components/favorite_button/favorite_button.vue
@@ -38,13 +38,20 @@
       class="button-unstyled interactive"
       target="_blank"
       role="button"
+      :title="$t('tool_tip.favorite')"
       :href="remoteInteractionLink"
     >
-      <FAIcon
-        class="fa-scale-110 fa-old-padding"
-        :title="$t('tool_tip.favorite')"
-        :icon="['far', 'star']"
-      />
+      <FALayers class="fa-scale-110 fa-old-padding-layer">
+        <FAIcon
+          class="fa-scale-110"
+          :icon="['far', 'star']"
+        />
+        <FAIcon
+          class="focus-marker"
+          transform="shrink-6 up-9 right-12"
+          icon="plus"
+        />
+      </FALayers>
     </a>
     <span
       v-if="!mergedConfig.hidePostStats && status.fave_num > 0"
diff --git a/src/components/reply_button/reply_button.vue b/src/components/reply_button/reply_button.vue
index 6e3964b7..60a40a08 100644
--- a/src/components/reply_button/reply_button.vue
+++ b/src/components/reply_button/reply_button.vue
@@ -32,12 +32,20 @@
       target="_blank"
       role="button"
       :href="remoteInteractionLink"
+      :title="$t('tool_tip.reply')"
     >
-      <FAIcon
-        icon="reply"
-        class="fa-scale-110 fa-old-padding"
-        :title="$t('tool_tip.reply')"
-      />
+      <FALayers class="fa-old-padding-layer">
+        <FAIcon
+          class="fa-scale-110"
+          icon="reply"
+        />
+        <FAIcon
+          v-if="!replying"
+          class="focus-marker"
+          transform="shrink-6 up-8 right-16"
+          icon="plus"
+        />
+      </FALayers>
     </a>
     <span
       v-if="status.replies_count > 0"
diff --git a/src/components/retweet_button/retweet_button.vue b/src/components/retweet_button/retweet_button.vue
index 7700ee0d..8804cc6b 100644
--- a/src/components/retweet_button/retweet_button.vue
+++ b/src/components/retweet_button/retweet_button.vue
@@ -45,13 +45,20 @@
       class="button-unstyled interactive"
       target="_blank"
       role="button"
+      :title="$t('tool_tip.repeat')"
       :href="remoteInteractionLink"
     >
-      <FAIcon
-        class="fa-scale-110 fa-old-padding"
-        icon="retweet"
-        :title="$t('tool_tip.repeat')"
-      />
+      <FALayers class="fa-old-padding-layer">
+        <FAIcon
+          class="fa-scale-110"
+          icon="retweet"
+        />
+        <FAIcon
+          class="focus-marker"
+          transform="shrink-6 up-9 right-12"
+          icon="plus"
+        />
+      </FALayers>
     </a>
     <span
       v-if="!mergedConfig.hidePostStats && status.repeat_num > 0"
-- 
cgit v1.2.3-70-g09d2


From d1590311211cbf1036c870eef8c7e9e80fab7a3e Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Sat, 21 Jan 2023 16:28:33 -0500
Subject: Add some aria to post status form

---
 src/components/emoji_input/emoji_input.vue           |  3 +++
 src/components/emoji_picker/emoji_picker.vue         |  1 +
 src/components/post_status_form/post_status_form.vue | 10 ++++++++++
 src/components/select/select.js                      |  3 ++-
 src/components/select/select.vue                     |  1 +
 src/i18n/en.json                                     |  2 ++
 6 files changed, 19 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/components/emoji_input/emoji_input.vue b/src/components/emoji_input/emoji_input.vue
index 4a7b0fa8..7f9ecc99 100644
--- a/src/components/emoji_input/emoji_input.vue
+++ b/src/components/emoji_input/emoji_input.vue
@@ -16,6 +16,7 @@
       ref="hiddenOverlay"
       class="hidden-overlay"
       :style="overlayStyle"
+      :aria-hidden="true"
     >
       <span>{{ preText }}</span>
       <span
@@ -33,6 +34,7 @@
         v-if="!hideEmojiButton"
         class="button-unstyled emoji-picker-icon"
         type="button"
+        :title="$t('emoji.add_emoji')"
         @click.prevent="togglePicker"
       >
         <FAIcon :icon="['far', 'smile-beam']" />
@@ -53,6 +55,7 @@
       ref="suggestorPopover"
       class="autocomplete-panel"
       placement="bottom"
+      :trigger-attrs="{ 'aria-hidden': true }"
     >
       <template #content>
         <div
diff --git a/src/components/emoji_picker/emoji_picker.vue b/src/components/emoji_picker/emoji_picker.vue
index ca90bf26..6972164b 100644
--- a/src/components/emoji_picker/emoji_picker.vue
+++ b/src/components/emoji_picker/emoji_picker.vue
@@ -3,6 +3,7 @@
     ref="popover"
     trigger="click"
     popover-class="emoji-picker popover-default"
+    :trigger-attrs="{ 'aria-hidden': true }"
     @show="onPopoverShown"
     @close="onPopoverClosed"
   >
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 328e145f..64a8887c 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -30,6 +30,9 @@
           <span>{{ $t('post_status.scope_notice.public') }}</span>
           <a
             class="fa-scale-110 fa-old-padding dismiss"
+            :title="$t('post_status.scope_notice_dismiss')"
+            role="button"
+            tabindex="0"
             @click.prevent="dismissScopeNotice()"
           >
             <FAIcon icon="times" />
@@ -42,6 +45,9 @@
           <span>{{ $t('post_status.scope_notice.unlisted') }}</span>
           <a
             class="fa-scale-110 fa-old-padding dismiss"
+            :title="$t('post_status.scope_notice_dismiss')"
+            role="button"
+            tabindex="0"
             @click.prevent="dismissScopeNotice()"
           >
             <FAIcon icon="times" />
@@ -54,6 +60,9 @@
           <span>{{ $t('post_status.scope_notice.private') }}</span>
           <a
             class="fa-scale-110 fa-old-padding dismiss"
+            :title="$t('post_status.scope_notice_dismiss')"
+            role="button"
+            tabindex="0"
             @click.prevent="dismissScopeNotice()"
           >
             <FAIcon icon="times" />
@@ -199,6 +208,7 @@
               id="post-content-type"
               v-model="newStatus.contentType"
               class="form-control"
+              :attrs="{ 'aria-label': $t('post_status.content_type_selection') }"
             >
               <option
                 v-for="postFormat in postFormats"
diff --git a/src/components/select/select.js b/src/components/select/select.js
index ec571a14..34d64fd2 100644
--- a/src/components/select/select.js
+++ b/src/components/select/select.js
@@ -13,6 +13,7 @@ export default {
     'modelValue',
     'disabled',
     'unstyled',
-    'kind'
+    'kind',
+    'attrs'
   ]
 }
diff --git a/src/components/select/select.vue b/src/components/select/select.vue
index 0ce4ea82..1797afc8 100644
--- a/src/components/select/select.vue
+++ b/src/components/select/select.vue
@@ -6,6 +6,7 @@
     <select
       :disabled="disabled"
       :value="modelValue"
+      v-bind="attrs"
       @change="$emit('update:modelValue', $event.target.value)"
     >
       <slot />
diff --git a/src/i18n/en.json b/src/i18n/en.json
index ebd7d0af..d0965f84 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -266,6 +266,7 @@
       "text/markdown": "Markdown",
       "text/bbcode": "BBCode"
     },
+    "content_type_selection": "Post format",
     "content_warning": "Subject (optional)",
     "default": "Just landed in L.A.",
     "direct_warning_to_all": "This post will be visible to all the mentioned users.",
@@ -283,6 +284,7 @@
       "private": "This post will be visible to your followers only",
       "unlisted": "This post will not be visible in Public Timeline and The Whole Known Network"
     },
+    "scope_notice_dismiss": "Close this notice",
     "scope": {
       "direct": "Direct - post to mentioned users only",
       "private": "Followers-only - post to followers only",
-- 
cgit v1.2.3-70-g09d2


From ce8101e60a1dc1a768f793a34fb6e9cca70b4858 Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Tue, 27 Sep 2022 18:47:50 -0400
Subject: Add remove follower confirmation

---
 src/components/account_actions/account_actions.js  | 20 +++++++++++++++-
 src/components/account_actions/account_actions.vue | 21 +++++++++++++++++
 src/components/follow_card/follow_card.vue         |  1 +
 .../remove_follower_button.js                      | 27 ++++++++++++++++++++--
 .../remove_follower_button.vue                     | 21 +++++++++++++++++
 src/components/settings_modal/tabs/general_tab.vue |  5 ++++
 src/i18n/en.json                                   |  5 ++++
 src/modules/config.js                              |  1 +
 src/modules/instance.js                            |  1 +
 9 files changed, 99 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/components/account_actions/account_actions.js b/src/components/account_actions/account_actions.js
index 7dec0c3d..acd93e06 100644
--- a/src/components/account_actions/account_actions.js
+++ b/src/components/account_actions/account_actions.js
@@ -18,7 +18,8 @@ const AccountActions = {
   ],
   data () {
     return {
-      showingConfirmBlock: false
+      showingConfirmBlock: false,
+      showingConfirmRemoveFollower: false
     }
   },
   components: {
@@ -34,6 +35,12 @@ const AccountActions = {
     hideConfirmBlock () {
       this.showingConfirmBlock = false
     },
+    showConfirmRemoveUserFromFollowers () {
+      this.showingConfirmRemoveFollower = true
+    },
+    hideConfirmRemoveUserFromFollowers () {
+      this.showingConfirmRemoveFollower = false
+    },
     showRepeats () {
       this.$store.dispatch('showReblogs', this.user.id)
     },
@@ -55,7 +62,15 @@ const AccountActions = {
       this.$store.dispatch('unblockUser', this.user.id)
     },
     removeUserFromFollowers () {
+      if (!this.shouldConfirmRemoveUserFromFollowers) {
+        this.doRemoveUserFromFollowers()
+      } else {
+        this.showConfirmRemoveUserFromFollowers()
+      }
+    },
+    doRemoveUserFromFollowers () {
       this.$store.dispatch('removeUserFromFollowers', this.user.id)
+      this.hideConfirmRemoveUserFromFollowers()
     },
     reportUser () {
       this.$store.dispatch('openUserReportingModal', { userId: this.user.id })
@@ -71,6 +86,9 @@ const AccountActions = {
     shouldConfirmBlock () {
       return this.$store.getters.mergedConfig.modalOnBlock
     },
+    shouldConfirmRemoveUserFromFollowers () {
+      return this.$store.getters.mergedConfig.modalOnRemoveUserFromFollowers
+    },
     ...mapState({
       pleromaChatMessagesAvailable: state => state.instance.pleromaChatMessagesAvailable
     })
diff --git a/src/components/account_actions/account_actions.vue b/src/components/account_actions/account_actions.vue
index 161bab09..ce19291a 100644
--- a/src/components/account_actions/account_actions.vue
+++ b/src/components/account_actions/account_actions.vue
@@ -95,6 +95,27 @@
         </i18n-t>
       </confirm-modal>
     </teleport>
+    <teleport to="#modal">
+      <confirm-modal
+        v-if="showingConfirmRemoveFollower"
+        :title="$t('user_card.remove_follower_confirm_title')"
+        :confirm-text="$t('user_card.remove_follower_confirm_accept_button')"
+        :cancel-text="$t('user_card.remove_follower_confirm_cancel_button')"
+        @accepted="doRemoveUserFromFollowers"
+        @cancelled="hideConfirmRemoveUserFromFollowers"
+      >
+        <i18n-t
+          keypath="user_card.remove_follower_confirm"
+          tag="span"
+        >
+          <template #user>
+            <span
+              v-text="user.screen_name_ui"
+            />
+          </template>
+        </i18n-t>
+      </confirm-modal>
+    </teleport>
   </div>
 </template>
 
diff --git a/src/components/follow_card/follow_card.vue b/src/components/follow_card/follow_card.vue
index eff69fb2..bdb6b809 100644
--- a/src/components/follow_card/follow_card.vue
+++ b/src/components/follow_card/follow_card.vue
@@ -24,6 +24,7 @@
         />
         <RemoveFollowerButton
           v-if="noFollowsYou && relationship.followed_by"
+          :user="user"
           :relationship="relationship"
           class="follow-card-button"
         />
diff --git a/src/components/remove_follower_button/remove_follower_button.js b/src/components/remove_follower_button/remove_follower_button.js
index e1a7531b..052a519f 100644
--- a/src/components/remove_follower_button/remove_follower_button.js
+++ b/src/components/remove_follower_button/remove_follower_button.js
@@ -1,10 +1,16 @@
+import ConfirmModal from '../confirm_modal/confirm_modal.vue'
+
 export default {
-  props: ['relationship'],
+  props: ['user', 'relationship'],
   data () {
     return {
-      inProgress: false
+      inProgress: false,
+      showingConfirmRemoveFollower: false
     }
   },
+  components: {
+    ConfirmModal
+  },
   computed: {
     label () {
       if (this.inProgress) {
@@ -12,14 +18,31 @@ export default {
       } else {
         return this.$t('user_card.remove_follower')
       }
+    },
+    shouldConfirmRemoveUserFromFollowers () {
+      return this.$store.getters.mergedConfig.modalOnRemoveUserFromFollowers
     }
   },
   methods: {
+    showConfirmRemoveUserFromFollowers () {
+      this.showingConfirmRemoveFollower = true
+    },
+    hideConfirmRemoveUserFromFollowers () {
+      this.showingConfirmRemoveFollower = false
+    },
     onClick () {
+      if (!this.shouldConfirmRemoveUserFromFollowers) {
+        this.doRemoveUserFromFollowers()
+      } else {
+        this.showConfirmRemoveUserFromFollowers()
+      }
+    },
+    doRemoveUserFromFollowers () {
       this.inProgress = true
       this.$store.dispatch('removeUserFromFollowers', this.relationship.id).then(() => {
         this.inProgress = false
       })
+      this.hideConfirmRemoveUserFromFollowers()
     }
   }
 }
diff --git a/src/components/remove_follower_button/remove_follower_button.vue b/src/components/remove_follower_button/remove_follower_button.vue
index a3a4c242..0012aebd 100644
--- a/src/components/remove_follower_button/remove_follower_button.vue
+++ b/src/components/remove_follower_button/remove_follower_button.vue
@@ -7,6 +7,27 @@
     @click="onClick"
   >
     {{ label }}
+    <teleport to="#modal">
+      <confirm-modal
+        v-if="showingConfirmRemoveFollower"
+        :title="$t('user_card.remove_follower_confirm_title')"
+        :confirm-text="$t('user_card.remove_follower_confirm_accept_button')"
+        :cancel-text="$t('user_card.remove_follower_confirm_cancel_button')"
+        @accepted="doRemoveUserFromFollowers"
+        @cancelled="hideConfirmRemoveUserFromFollowers"
+      >
+        <i18n-t
+          keypath="user_card.remove_follower_confirm"
+          tag="span"
+        >
+          <template #user>
+            <span
+              v-text="user.screen_name_ui"
+            />
+          </template>
+        </i18n-t>
+      </confirm-modal>
+    </teleport>
   </button>
 </template>
 
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index 9de3ed81..703e94a0 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -191,6 +191,11 @@
                 {{ $t('settings.confirm_dialogs_deny_follow') }}
               </BooleanSetting>
             </li>
+            <li>
+              <BooleanSetting path="modalOnRemoveUserFromFollowers">
+                {{ $t('settings.confirm_dialogs_remove_follower') }}
+              </BooleanSetting>
+            </li>
           </ul>
         </li>
       </ul>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 213f9cf0..ca022c82 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -429,6 +429,7 @@
     "confirm_dialogs_logout": "logging out",
     "confirm_dialogs_approve_follow": "approving a follower",
     "confirm_dialogs_deny_follow": "denying a follower",
+    "confirm_dialogs_remove_follower": "removing a follower",
     "mutes_and_blocks": "Mutes and Blocks",
     "data_import_export_tab": "Data import / export",
     "default_vis": "Default visibility scope",
@@ -964,6 +965,10 @@
     "per_day": "per day",
     "remote_follow": "Remote follow",
     "remove_follower": "Remove follower",
+    "remove_follower_confirm_title": "Remove follower confirmation",
+    "remove_follower_confirm_accept_button": "Remove",
+    "remove_follower_confirm_cancel_button": "Keep",
+    "remove_follower_confirm": "Do you really want to remove {user} from your followers?",
     "report": "Report",
     "statuses": "Statuses",
     "subscribe": "Subscribe",
diff --git a/src/modules/config.js b/src/modules/config.js
index 1df279a2..8e6b2c3d 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -86,6 +86,7 @@ export const defaultState = {
   modalOnLogout: undefined, // instance default
   modalOnApproveFollow: undefined, // instance default
   modalOnDenyFollow: undefined, // instance default
+  modalOnRemoveUserFromFollowers: undefined, // instance default
   playVideosInModal: false,
   useOneClickNsfw: false,
   useContainFit: true,
diff --git a/src/modules/instance.js b/src/modules/instance.js
index fcb6eecc..ce958907 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -79,6 +79,7 @@ const defaultState = {
   modalOnLogout: true,
   modalOnApproveFollow: false,
   modalOnDenyFollow: false,
+  modalOnRemoveUserFromFollowers: false,
   loginMethod: 'password',
   logo: '/static/logo.svg',
   logoMargin: '.2em',
-- 
cgit v1.2.3-70-g09d2


From c7c68340f1c8838cead855de3f624e0796fbc6c7 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Sun, 15 Jan 2023 12:11:39 -0500
Subject: Fix mobile nav stylelint

---
 src/components/mobile_nav/mobile_nav.vue | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

diff --git a/src/components/mobile_nav/mobile_nav.vue b/src/components/mobile_nav/mobile_nav.vue
index 6d826622..c2746abe 100644
--- a/src/components/mobile_nav/mobile_nav.vue
+++ b/src/components/mobile_nav/mobile_nav.vue
@@ -247,10 +247,12 @@
       }
     }
   }
+
   .confirm-modal.dark-overlay {
     &::before {
       z-index: 3000;
     }
+
     .dialog-modal.panel {
       z-index: 3001;
     }
-- 
cgit v1.2.3-70-g09d2


From dd97a23ce70fc564d3142eb9d218ff1a929107b1 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Sun, 22 Jan 2023 11:15:52 -0500
Subject: Add birthday to registration form

---
 src/boot/after_store.js                      |  2 ++
 src/components/registration/registration.js  | 27 +++++++++++++++++++++-
 src/components/registration/registration.vue | 34 ++++++++++++++++++++++++++++
 src/i18n/en.json                             |  8 +++++--
 src/modules/instance.js                      |  2 ++
 5 files changed, 70 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index 1fa9dd2a..d2e7f488 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -60,6 +60,8 @@ const getInstanceConfig = async ({ store }) => {
 
       store.dispatch('setInstanceOption', { name: 'textlimit', value: textlimit })
       store.dispatch('setInstanceOption', { name: 'accountApprovalRequired', value: data.approval_required })
+      store.dispatch('setInstanceOption', { name: 'birthdayRequired', value: !!data.pleroma.metadata.birthday_required })
+      store.dispatch('setInstanceOption', { name: 'birthdayMinAge', value: data.pleroma.metadata.birthday_min_age || 0 })
 
       if (vapidPublicKey) {
         store.dispatch('setInstanceOption', { name: 'vapidPublicKey', value: vapidPublicKey })
diff --git a/src/components/registration/registration.js b/src/components/registration/registration.js
index 6eb316d0..3139bdd2 100644
--- a/src/components/registration/registration.js
+++ b/src/components/registration/registration.js
@@ -3,6 +3,7 @@ import { required, requiredIf, sameAs } from '@vuelidate/validators'
 import { mapActions, mapState } from 'vuex'
 import InterfaceLanguageSwitcher from '../interface_language_switcher/interface_language_switcher.vue'
 import localeService from '../../services/locale/locale.service.js'
+import { DAY } from 'src/services/date_utils/date_utils.js'
 
 const registration = {
   setup () { return { v$: useVuelidate() } },
@@ -13,6 +14,7 @@ const registration = {
       username: '',
       password: '',
       confirm: '',
+      birthday: '',
       reason: '',
       language: ''
     },
@@ -32,6 +34,12 @@ const registration = {
           required,
           sameAs: sameAs(this.user.password)
         },
+        birthday: {
+          required: requiredIf(() => this.birthdayRequired),
+          maxValue: value => {
+            return !this.birthdayRequired || new Date(value).getTime() <= this.birthdayMin.getTime()
+          }
+        },
         reason: { required: requiredIf(() => this.accountApprovalRequired) },
         language: {}
       }
@@ -52,6 +60,21 @@ const registration = {
     reasonPlaceholder () {
       return this.replaceNewlines(this.$t('registration.reason_placeholder'))
     },
+    birthdayMin () {
+      const minAge = this.birthdayMinAge
+      const today = new Date()
+      today.setUTCMilliseconds(0)
+      today.setUTCSeconds(0)
+      today.setUTCMinutes(0)
+      today.setUTCHours(0)
+      const minDate = new Date()
+      minDate.setTime(today.getTime() - minAge * DAY)
+      return minDate
+    },
+    birthdayMinFormatted () {
+      const browserLocale = localeService.internalToBrowserLocale(this.$i18n.locale)
+      return this.user.birthday && new Date(Date.parse(this.birthdayMin)).toLocaleDateString(browserLocale, { timeZone: 'UTC', day: 'numeric', month: 'long', year: 'numeric' })
+    },
     ...mapState({
       registrationOpen: (state) => state.instance.registrationOpen,
       signedIn: (state) => !!state.users.currentUser,
@@ -59,7 +82,9 @@ const registration = {
       serverValidationErrors: (state) => state.users.signUpErrors,
       termsOfService: (state) => state.instance.tos,
       accountActivationRequired: (state) => state.instance.accountActivationRequired,
-      accountApprovalRequired: (state) => state.instance.accountApprovalRequired
+      accountApprovalRequired: (state) => state.instance.accountApprovalRequired,
+      birthdayRequired: (state) => state.instance.birthdayRequired,
+      birthdayMinAge: (state) => state.instance.birthdayMinAge
     })
   },
   methods: {
diff --git a/src/components/registration/registration.vue b/src/components/registration/registration.vue
index a26162f0..6d7fe76e 100644
--- a/src/components/registration/registration.vue
+++ b/src/components/registration/registration.vue
@@ -167,6 +167,40 @@
               </ul>
             </div>
 
+            <div
+              class="form-group"
+              :class="{ 'form-group--error': v$.user.birthday.$error }"
+            >
+              <label
+                class="form--label"
+                for="sign-up-birthday"
+              >
+                {{ birthdayRequired ? $t('registration.birthday') : $t('registration.birthday_optional') }}
+              </label>
+              <input
+                id="sign-up-birthday"
+                v-model="user.birthday"
+                :disabled="isPending"
+                class="form-control"
+                type="date"
+                max="birthdayMin"
+                :aria-required="birthdayRequired"
+              >
+            </div>
+            <div
+              v-if="v$.user.birthday.$dirty"
+              class="form-error"
+            >
+              <ul>
+                <li v-if="v$.user.birthday.required.$invalid">
+                  <span>{{ $t('registration.validations.birthday_required') }}</span>
+                </li>
+                <li v-if="v$.user.birthday.maxValue.$invalid">
+                  <span>{{ $tc('registration.validations.birthday_min_age', { date: birthdayMinFormatted }) }}</span>
+                </li>
+              </ul>
+            </div>
+
             <div
               class="form-group"
               :class="{ 'form-group--error': v$.user.language.$error }"
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 1846c4c5..15d3bec4 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -312,9 +312,13 @@
       "email_required": "cannot be left blank",
       "password_required": "cannot be left blank",
       "password_confirmation_required": "cannot be left blank",
-      "password_confirmation_match": "should be the same as password"
+      "password_confirmation_match": "should be the same as password",
+      "birthday_required": "cannot be left blank",
+      "birthday_min_age": "must be on or before {date}"
     },
-    "email_language": "In which language do you want to receive emails from the server?"
+    "email_language": "In which language do you want to receive emails from the server?",
+    "birthday": "Birthday:",
+    "birthday_optional": "Birthday (optional):"
   },
   "remote_user_resolver": {
     "remote_user_resolver": "Remote user resolver",
diff --git a/src/modules/instance.js b/src/modules/instance.js
index 8e8d13d3..72694e2c 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -107,6 +107,8 @@ const defaultState = {
   restrictedNicknames: [],
   safeDM: true,
   knownDomains: [],
+  birthdayRequired: false,
+  birthdayMinAge: 0,
 
   // Feature-set, apparently, not everything here is reported...
   shoutAvailable: false,
-- 
cgit v1.2.3-70-g09d2


From 03d5c2e140fc70937d3533665fa88d055ab486f1 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Sun, 22 Jan 2023 11:22:24 -0500
Subject: Make date picker aware of the birthday max value

---
 src/components/registration/registration.js  | 3 +++
 src/components/registration/registration.vue | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/components/registration/registration.js b/src/components/registration/registration.js
index 3139bdd2..22ca6ad6 100644
--- a/src/components/registration/registration.js
+++ b/src/components/registration/registration.js
@@ -71,6 +71,9 @@ const registration = {
       minDate.setTime(today.getTime() - minAge * DAY)
       return minDate
     },
+    birthdayMinAttr () {
+      return this.birthdayMin.toJSON().replace(/T.+$/, '')
+    },
     birthdayMinFormatted () {
       const browserLocale = localeService.internalToBrowserLocale(this.$i18n.locale)
       return this.user.birthday && new Date(Date.parse(this.birthdayMin)).toLocaleDateString(browserLocale, { timeZone: 'UTC', day: 'numeric', month: 'long', year: 'numeric' })
diff --git a/src/components/registration/registration.vue b/src/components/registration/registration.vue
index 6d7fe76e..5701b05e 100644
--- a/src/components/registration/registration.vue
+++ b/src/components/registration/registration.vue
@@ -183,7 +183,7 @@
                 :disabled="isPending"
                 class="form-control"
                 type="date"
-                max="birthdayMin"
+                :max="birthdayRequired ? birthdayMinAttr : undefined"
                 :aria-required="birthdayRequired"
               >
             </div>
-- 
cgit v1.2.3-70-g09d2


From 817432bd62c781d25ad407eeec89909e5a9b4d61 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Wed, 25 Jan 2023 19:01:29 -0500
Subject: Fix stylelint

---
 .../interface_language_switcher/interface_language_switcher.vue         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/components/interface_language_switcher/interface_language_switcher.vue b/src/components/interface_language_switcher/interface_language_switcher.vue
index c9e7506b..a57e8761 100644
--- a/src/components/interface_language_switcher/interface_language_switcher.vue
+++ b/src/components/interface_language_switcher/interface_language_switcher.vue
@@ -102,7 +102,7 @@ export default {
 </script>
 
 <style lang="scss">
-@import '../../_variables.scss';
+@import "../../variables";
 
 .interface-language-switcher {
   .language-select {
-- 
cgit v1.2.3-70-g09d2


From 6158b8667e6c76c5a5a09b480b82d6f04b8e4885 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Sat, 28 Jan 2023 22:10:06 -0500
Subject: Make checkbox settings accessible

---
 src/_mixins.scss                                             | 12 ++++++++++++
 src/components/checkbox/checkbox.vue                         |  8 ++++++--
 src/components/screen_reader_notice/screen_reader_notice.vue |  9 +++------
 3 files changed, 21 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/_mixins.scss b/src/_mixins.scss
index e99fe26f..677bc210 100644
--- a/src/_mixins.scss
+++ b/src/_mixins.scss
@@ -16,3 +16,15 @@
     @content;
   }
 }
+
+@mixin visible-for-screenreader-only {
+  display: block;
+  width: 1px;
+  height: 1px;
+  margin: -1px;
+  overflow: hidden;
+  visibility: visible;
+  clip: rect(0 0 0 0);
+  padding: 0;
+  position: absolute;
+}
diff --git a/src/components/checkbox/checkbox.vue b/src/components/checkbox/checkbox.vue
index 7139d4fc..ac7acd52 100644
--- a/src/components/checkbox/checkbox.vue
+++ b/src/components/checkbox/checkbox.vue
@@ -10,7 +10,10 @@
       :indeterminate="indeterminate"
       @change="$emit('update:modelValue', $event.target.checked)"
     >
-    <i class="checkbox-indicator" />
+    <i
+      class="checkbox-indicator"
+      :aria-hidden="true"
+    />
     <span
       v-if="!!$slots.default"
       class="label"
@@ -33,6 +36,7 @@ export default {
 
 <style lang="scss">
 @import "../../variables";
+@import "../../mixins";
 
 .checkbox {
   position: relative;
@@ -81,7 +85,7 @@ export default {
   }
 
   input[type="checkbox"] {
-    display: none;
+    @include visible-for-screenreader-only;
 
     &:checked + .checkbox-indicator::before {
       color: $fallback--text;
diff --git a/src/components/screen_reader_notice/screen_reader_notice.vue b/src/components/screen_reader_notice/screen_reader_notice.vue
index 5098b94f..1cd908ae 100644
--- a/src/components/screen_reader_notice/screen_reader_notice.vue
+++ b/src/components/screen_reader_notice/screen_reader_notice.vue
@@ -10,12 +10,9 @@
 <script src="./screen_reader_notice.js"></script>
 
 <style lang="scss">
+@import "../../mixins";
+
 .screen-reader-text {
-  display: block;
-  width: 1px;
-  height: 1px;
-  margin: -1px;
-  overflow: hidden;
-  visibility: visible;
+  @include visible-for-screenreader-only;
 }
 </style>
-- 
cgit v1.2.3-70-g09d2


From 902954b29825647eaf5435c89e379ef4babe7931 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Thu, 9 Feb 2023 21:35:56 -0500
Subject: Use class to style screenreader-only text

---
 src/App.scss                                               | 14 ++++++++++++--
 src/_mixins.scss                                           | 12 ------------
 src/components/checkbox/checkbox.vue                       |  3 +--
 .../screen_reader_notice/screen_reader_notice.vue          | 10 +---------
 .../settings_modal/helpers/modified_indicator.vue          |  2 +-
 5 files changed, 15 insertions(+), 26 deletions(-)

(limited to 'src')

diff --git a/src/App.scss b/src/App.scss
index 1c4c8941..3f352e8d 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -580,8 +580,6 @@ textarea,
   }
 
   &[type="checkbox"] {
-    display: none;
-
     &:checked + label::before {
       color: $fallback--text;
       color: var(--inputText, $fallback--text);
@@ -887,3 +885,15 @@ option {
   opacity: 0;
 }
 /* stylelint-enable no-descending-specificity */
+
+.visible-for-screenreader-only {
+  display: block;
+  width: 1px;
+  height: 1px;
+  margin: -1px;
+  overflow: hidden;
+  visibility: visible;
+  clip: rect(0 0 0 0);
+  padding: 0;
+  position: absolute;
+}
diff --git a/src/_mixins.scss b/src/_mixins.scss
index 677bc210..e99fe26f 100644
--- a/src/_mixins.scss
+++ b/src/_mixins.scss
@@ -16,15 +16,3 @@
     @content;
   }
 }
-
-@mixin visible-for-screenreader-only {
-  display: block;
-  width: 1px;
-  height: 1px;
-  margin: -1px;
-  overflow: hidden;
-  visibility: visible;
-  clip: rect(0 0 0 0);
-  padding: 0;
-  position: absolute;
-}
diff --git a/src/components/checkbox/checkbox.vue b/src/components/checkbox/checkbox.vue
index ac7acd52..42f89be9 100644
--- a/src/components/checkbox/checkbox.vue
+++ b/src/components/checkbox/checkbox.vue
@@ -5,6 +5,7 @@
   >
     <input
       type="checkbox"
+      class="visible-for-screenreader-only"
       :disabled="disabled"
       :checked="modelValue"
       :indeterminate="indeterminate"
@@ -85,8 +86,6 @@ export default {
   }
 
   input[type="checkbox"] {
-    @include visible-for-screenreader-only;
-
     &:checked + .checkbox-indicator::before {
       color: $fallback--text;
       color: var(--inputText, $fallback--text);
diff --git a/src/components/screen_reader_notice/screen_reader_notice.vue b/src/components/screen_reader_notice/screen_reader_notice.vue
index 1cd908ae..8384ae6b 100644
--- a/src/components/screen_reader_notice/screen_reader_notice.vue
+++ b/src/components/screen_reader_notice/screen_reader_notice.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    class="screen-reader-text"
+    class="visible-for-screenreader-only"
     :aria-live="ariaLive"
   >
     {{ currentText }}
@@ -8,11 +8,3 @@
 </template>
 
 <script src="./screen_reader_notice.js"></script>
-
-<style lang="scss">
-@import "../../mixins";
-
-.screen-reader-text {
-  @include visible-for-screenreader-only;
-}
-</style>
diff --git a/src/components/settings_modal/helpers/modified_indicator.vue b/src/components/settings_modal/helpers/modified_indicator.vue
index 8311533a..45db3fc2 100644
--- a/src/components/settings_modal/helpers/modified_indicator.vue
+++ b/src/components/settings_modal/helpers/modified_indicator.vue
@@ -5,12 +5,12 @@
   >
     <Popover
       trigger="hover"
+      :trigger-attrs="{ 'aria-label': $t('settings.setting_changed') }"
     >
       <template #trigger>
         &nbsp;
         <FAIcon
           icon="wrench"
-          :aria-label="$t('settings.setting_changed')"
         />
       </template>
       <template #content>
-- 
cgit v1.2.3-70-g09d2


From 79f1d79c4e8b55c23c88fe4def30afd34d103428 Mon Sep 17 00:00:00 2001
From: Ryan Chiang <her.mine@outlook.com>
Date: Sun, 22 Jan 2023 13:52:01 +0000
Subject: Translated using Weblate (Chinese (Simplified))

Currently translated at 89.0% (824 of 925 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hans/
---
 src/i18n/zh.json | 37 +++++++++++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/i18n/zh.json b/src/i18n/zh.json
index 8f0b04bd..00bd2ac9 100644
--- a/src/i18n/zh.json
+++ b/src/i18n/zh.json
@@ -59,7 +59,9 @@
     "never_show_again": "不再显示",
     "undo": "撤销",
     "yes": "是",
-    "no": "否"
+    "no": "否",
+    "unpin": "取消固定该项",
+    "pin": "固定该项"
   },
   "image_cropper": {
     "crop_picture": "裁剪图片",
@@ -120,7 +122,10 @@
     "edit_finish": "完成编辑",
     "mobile_notifications": "打开通知（有未读的）",
     "mobile_notifications_close": "关闭通知",
-    "announcements": "公告"
+    "announcements": "公告",
+    "edit_nav_mobile": "自定义导航栏",
+    "edit_pinned": "编辑固定的项目",
+    "mobile_sidebar": "切换移动设备侧栏"
   },
   "notifications": {
     "broken_favorite": "未知的状态，正在搜索中…",
@@ -135,7 +140,8 @@
     "migrated_to": "迁移到了",
     "follow_request": "想要关注你",
     "error": "取得通知时发生错误：{0}",
-    "poll_ended": "投票结束了"
+    "poll_ended": "投票结束了",
+    "submitted_report": "提交举报"
   },
   "polls": {
     "add_poll": "增加投票",
@@ -194,7 +200,10 @@
     "media_description": "媒体描述",
     "media_description_error": "更新媒体失败，请重试",
     "empty_status_error": "不能发布没有内容、没有附件的发文",
-    "post": "发送"
+    "post": "发送",
+    "edit_remote_warning": "其他远程实例可能不支持编辑并且无法接收您的帖子的最新版本。",
+    "edit_unsupported_warning": "Pleroma 不支持对提及或投票进行编辑。",
+    "edit_status": "编辑状态"
   },
   "registration": {
     "bio": "简介",
@@ -219,7 +228,9 @@
     "reason_placeholder": "此实例的注册需要手动批准。\n请让管理员知道您为什么想要注册。",
     "reason": "注册理由",
     "register": "注册",
-    "email_language": "你想从服务器收到什么语言的邮件？"
+    "email_language": "你想从服务器收到什么语言的邮件？",
+    "bio_optional": "介绍（可选）",
+    "email_optional": "电子邮件（可选）"
   },
   "selectable_list": {
     "select_all": "选择全部"
@@ -642,7 +653,11 @@
     "move_account_notes": "如果你想把账号移动到别的地方，你必须去目标账号，然后加一个指向这里的别名。",
     "wordfilter": "词语过滤器",
     "user_profiles": "用户资料",
-    "third_column_mode_notifications": "消息栏"
+    "third_column_mode_notifications": "消息栏",
+    "backup_running": "此备份正在进行，已处理 {number} 条记录。 |此备份正在进行，已处理 {number} 条记录。",
+    "lists_navigation": "在导航中显示列表",
+    "word_filter_and_more": "词过滤器及其他...",
+    "backup_failed": "此备份已失败。"
   },
   "time": {
     "day": "{0} 天",
@@ -1001,5 +1016,15 @@
     "submit_edit_action": "提交",
     "cancel_edit_action": "取消",
     "inactive_message": "这个公告不活跃"
+  },
+  "report": {
+    "reported_user": "被举报者：",
+    "state_closed": "已关闭",
+    "state_resolved": "已解决",
+    "reporter": "举报者：",
+    "state_open": "开启"
+  },
+  "unicode_domain_indicator": {
+    "tooltip": "此域名包含非 ascii 字符。"
   }
 }
-- 
cgit v1.2.3-70-g09d2


From 6dc683f6025e94764d8ae65ae3eaf9ee1c4d1dd9 Mon Sep 17 00:00:00 2001
From: Poesty Li <poesty7450@gmail.com>
Date: Thu, 26 Jan 2023 07:04:08 +0000
Subject: Translated using Weblate (Chinese (Simplified))

Currently translated at 99.6% (979 of 982 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hans/
---
 src/i18n/zh.json | 214 ++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 189 insertions(+), 25 deletions(-)

(limited to 'src')

diff --git a/src/i18n/zh.json b/src/i18n/zh.json
index 00bd2ac9..86181689 100644
--- a/src/i18n/zh.json
+++ b/src/i18n/zh.json
@@ -90,7 +90,11 @@
     "heading": {
       "totp": "双重因素验证",
       "recovery": "双重因素恢复"
-    }
+    },
+    "logout_confirm_cancel_button": "不要登出",
+    "logout_confirm_title": "确认登出",
+    "logout_confirm_accept_button": "登出",
+    "logout_confirm": "您确定要登出吗？"
   },
   "media_modal": {
     "previous": "往前",
@@ -166,7 +170,9 @@
     "favs_repeats": "转发和喜欢",
     "follows": "新的关注者",
     "load_older": "加载更早的互动",
-    "moves": "用户迁移"
+    "moves": "用户迁移",
+    "reports": "举报",
+    "emoji_reactions": "表情回应"
   },
   "post_status": {
     "new_status": "发布新状态",
@@ -201,7 +207,7 @@
     "media_description_error": "更新媒体失败，请重试",
     "empty_status_error": "不能发布没有内容、没有附件的发文",
     "post": "发送",
-    "edit_remote_warning": "其他远程实例可能不支持编辑并且无法接收您的帖子的最新版本。",
+    "edit_remote_warning": "其它远程实例可能不支持编辑并且无法接收您的帖子的最新版本。",
     "edit_unsupported_warning": "Pleroma 不支持对提及或投票进行编辑。",
     "edit_status": "编辑状态"
   },
@@ -223,14 +229,18 @@
       "email_required": "不能留空",
       "password_required": "不能留空",
       "password_confirmation_required": "不能留空",
-      "password_confirmation_match": "密码不一致"
+      "password_confirmation_match": "密码不一致",
+      "birthday_required": "不能为空",
+      "birthday_min_age": "必须在 {date} 或之前"
     },
     "reason_placeholder": "此实例的注册需要手动批准。\n请让管理员知道您为什么想要注册。",
     "reason": "注册理由",
     "register": "注册",
     "email_language": "你想从服务器收到什么语言的邮件？",
     "bio_optional": "介绍（可选）",
-    "email_optional": "电子邮件（可选）"
+    "email_optional": "电子邮件（可选）",
+    "birthday": "生日：",
+    "birthday_optional": "生日（可选）："
   },
   "selectable_list": {
     "select_all": "选择全部"
@@ -621,7 +631,7 @@
       "backup_settings": "备份设置到文件",
       "backup_restore": "设置备份"
     },
-    "right_sidebar": "在右侧显示侧边栏",
+    "right_sidebar": "反转分栏的顺序",
     "hide_shoutbox": "隐藏实例留言板",
     "expert_mode": "显示高级",
     "download_backup": "下载",
@@ -653,11 +663,78 @@
     "move_account_notes": "如果你想把账号移动到别的地方，你必须去目标账号，然后加一个指向这里的别名。",
     "wordfilter": "词语过滤器",
     "user_profiles": "用户资料",
-    "third_column_mode_notifications": "消息栏",
+    "third_column_mode_notifications": "通知栏",
     "backup_running": "此备份正在进行，已处理 {number} 条记录。 |此备份正在进行，已处理 {number} 条记录。",
     "lists_navigation": "在导航中显示列表",
-    "word_filter_and_more": "词过滤器及其他...",
-    "backup_failed": "此备份已失败。"
+    "word_filter_and_more": "词过滤器及其它...",
+    "backup_failed": "此备份已失败。",
+    "birthday": {
+      "label": "生日",
+      "show_birthday": "展示我的生日"
+    },
+    "hide_favorites_description": "不显示我的喜欢列表（人们仍然会收到通知）",
+    "third_column_mode": "当有足够的空间时，显示第三栏包含",
+    "third_column_mode_postform": "主要的发文形式和导航",
+    "columns": "分栏",
+    "user_popover_avatar_overlay": "在用户头像上显示用户弹出窗口",
+    "navbar_column_stretch": "延伸导航栏至分栏宽度",
+    "posts": "帖子",
+    "conversation_display_linear_quick": "线性视图",
+    "conversation_other_replies_button": "显示 “其它回复” 按钮",
+    "confirm_dialogs_delete": "删除状态",
+    "confirm_dialogs_mute": "隐藏用户",
+    "column_sizes": "分栏大小",
+    "column_sizes_sidebar": "侧栏",
+    "column_sizes_content": "內容",
+    "column_sizes_notifs": "通知",
+    "conversation_other_replies_button_below": "在状态下方",
+    "conversation_other_replies_button_inside": "在状态中",
+    "auto_update": "自动显示新的帖子",
+    "use_websockets": "使用 websockets（实时更新）",
+    "max_depth_in_thread": "默认显示同主题帖子中的最大层数",
+    "hide_wordfiltered_statuses": "隐藏经过词语过滤的状态",
+    "hide_muted_threads": "不显示已隐藏的同主题帖子",
+    "notification_visibility_polls": "你所投的投票的结束于",
+    "tree_advanced": "允许在树状视图中进行更灵活的导航",
+    "tree_fade_ancestors": "以模糊的文字显示当前状态的原型",
+    "conversation_display_linear": "线性样式",
+    "mention_link_fade_domain": "淡化域名（例如：{'@'}example.org 中的 {'@'}foo{'@'}example.org）",
+    "mention_link_bolden_you": "当你被提及时突出显示提及你",
+    "user_popover_avatar_action": "弹出式头像点击动作",
+    "user_popover_avatar_action_zoom": "缩放头像",
+    "user_popover_avatar_action_close": "关闭弹出窗口",
+    "show_yous": "显示 (You)s",
+    "add_language": "添加备用语言",
+    "remove_language": "移除",
+    "primary_language": "主要语言：",
+    "fallback_language": "备用语言 {index}：",
+    "account_privacy": "隐私",
+    "conversation_display": "对话显示样式",
+    "conversation_display_tree": "树状样式",
+    "conversation_display_tree_quick": "树状视图",
+    "disable_sticky_headers": "不要把分栏的顶栏固定在屏幕的顶部",
+    "confirm_dialogs": "请求确认于",
+    "confirm_dialogs_logout": "登出",
+    "confirm_dialogs_deny_follow": "拒绝关注请求",
+    "confirm_dialogs_approve_follow": "批准关注请求",
+    "confirm_dialogs_block": "屏蔽用户",
+    "confirm_dialogs_unfollow": "取消关注用户",
+    "confirm_dialogs_repeat": "转发状态",
+    "confirm_dialogs_remove_follower": "移除关注者",
+    "mute_bot_posts": "隐藏机器人的帖子",
+    "hide_bot_indication": "隐藏帖子中的机器人提示",
+    "always_show_post_button": "始终显示浮动的新帖子按钮",
+    "show_scrollbars": "显示侧栏的滚动条",
+    "third_column_mode_none": "完全不显示第三栏",
+    "use_at_icon": "将 {'@'} 符号显示为图标而不是文本",
+    "mention_link_display": "显示提及链接",
+    "mention_link_display_short": "始终以简称的形式出现（例如：{'@'}foo）",
+    "mention_link_display_full_for_remote": "仅远程实例用户以全名的形式出现（例如：{'@'}foo{'@'}example.org）",
+    "mention_link_display_full": "始终以全名的形式出现（例如：{'@'}foo{'@'}example.org）",
+    "mention_link_use_tooltip": "点击提及链接时显示用户卡片",
+    "mention_link_show_avatar": "在链接旁边显示用户头像",
+    "mention_link_show_avatar_quick": "在提及内容旁边显示用户头像",
+    "user_popover_avatar_action_open": "打开个人资料"
   },
   "time": {
     "day": "{0} 天",
@@ -723,7 +800,9 @@
     "reload": "重新载入",
     "error": "取得时间轴时发生错误：{0}",
     "socket_broke": "丢失实时连接：CloseEvent code {0}",
-    "socket_reconnected": "已建立实时连接"
+    "socket_reconnected": "已建立实时连接",
+    "quick_view_settings": "快速视图设置",
+    "quick_filter_settings": "快速过滤设置"
   },
   "status": {
     "favorites": "喜欢",
@@ -732,7 +811,7 @@
     "pin": "在个人资料置顶",
     "unpin": "取消在个人资料置顶",
     "pinned": "置顶",
-    "delete_confirm": "你真的想要删除这条状态吗？",
+    "delete_confirm": "您确定要删除这条状态吗？",
     "reply_to": "回复",
     "replies_list": "回复：",
     "mute_conversation": "隐藏对话",
@@ -741,7 +820,7 @@
     "show_content": "显示内容",
     "hide_full_subject": "隐藏此部分标题",
     "show_full_subject": "显示全部标题",
-    "thread_muted": "此系列消息已被隐藏",
+    "thread_muted": "同主题帖子已被隐藏",
     "copy_link": "复制状态链接",
     "status_unavailable": "状态不可取得",
     "unbookmark": "取消书签",
@@ -762,10 +841,10 @@
     "attachment_stop_flash": "停止 Flash 播放器",
     "move_up": "把附件左移",
     "open_gallery": "打开图库",
-    "thread_hide": "隐藏这个线索",
-    "thread_show": "显示这个线索",
+    "thread_hide": "隐藏这个同主题帖子",
+    "thread_show": "显示这个同主题帖子",
     "thread_show_full_with_icon": "{icon} {text}",
-    "thread_follow": "查看这个线索的剩余部分（一共有 {numStatus} 个状态）",
+    "thread_follow": "查看这个同主题帖子的剩余部分（一共有 {numStatus} 个状态）",
     "thread_follow_with_icon": "{icon} {text}",
     "ancestor_follow": "查看这个状态下的别的 {numReplies} 个回复",
     "ancestor_follow_with_icon": "{icon} {text}",
@@ -774,8 +853,19 @@
     "mentions": "提及",
     "replies_list_with_others": "回复（另外 +{numReplies} 个）：",
     "move_down": "把附件右移",
-    "thread_show_full": "显示这个线索下的所有东西（一共有 {numStatus} 个状态，最大深度 {depth}）",
-    "show_only_conversation_under_this": "只显示这个状态的回复"
+    "thread_show_full": "显示这个同主题帖子下的所有东西（一共有 {numStatus} 个状态，最大深度 {depth}）",
+    "show_only_conversation_under_this": "只显示这个状态的回复",
+    "repeat_confirm": "您确定要转发这条状态吗？",
+    "repeat_confirm_title": "确认转发",
+    "repeat_confirm_accept_button": "转发",
+    "repeat_confirm_cancel_button": "不要转发",
+    "edit": "编辑状态",
+    "edited_at": "（最后编辑于 {time}）",
+    "delete_confirm_title": "确认删除",
+    "delete_confirm_accept_button": "删除",
+    "delete_confirm_cancel_button": "保留",
+    "show_attachment_in_modal": "在媒体模式中显示",
+    "status_history": "状态历史"
   },
   "user_card": {
     "approve": "核准",
@@ -823,7 +913,8 @@
       "disable_remote_subscription": "禁止从远程实例关注用户",
       "disable_any_subscription": "完全禁止关注用户",
       "quarantine": "从联合实例中禁止用户帖子",
-      "delete_user": "删除用户"
+      "delete_user": "删除用户",
+      "delete_user_data_and_deactivate_confirmation": "这将永久删除该账户的数据并停用该账户。你完全确定吗？"
     },
     "hidden": "已隐藏",
     "show_repeats": "显示转发",
@@ -837,7 +928,41 @@
       "solid": "单一颜色背景",
       "disabled": "不突出显示"
     },
-    "edit_profile": "编辑个人资料"
+    "edit_profile": "编辑个人资料",
+    "approve_confirm_title": "确认批准",
+    "approve_confirm_accept_button": "批准",
+    "block_confirm_accept_button": "屏蔽",
+    "block_confirm_cancel_button": "不要屏蔽",
+    "deactivated": "已停用",
+    "deny_confirm_title": "确认拒绝",
+    "deny_confirm_accept_button": "拒绝",
+    "deny_confirm_cancel_button": "不要拒绝",
+    "deny_confirm": "您是否要拒绝 {user} 的关注请求？",
+    "follow_cancel": "取消请求",
+    "unfollow_confirm_title": "确认取消关注",
+    "unfollow_confirm": "您确定要取消关注 {user} 吗？",
+    "unfollow_confirm_accept_button": "取消关注",
+    "unfollow_confirm_cancel_button": "不要取消关注",
+    "mute_confirm_title": "确认隐藏",
+    "mute_confirm_accept_button": "隐藏",
+    "mute_confirm_cancel_button": "不要隐藏",
+    "mute_duration_prompt": "让这个用户隐藏（0表示无限期）：",
+    "remove_follower": "移除关注者",
+    "remove_follower_confirm_title": "确认移除关注者",
+    "remove_follower_confirm_cancel_button": "保留",
+    "remove_follower_confirm": "您确定要将 {user} 从您的关注者里移除吗？",
+    "birthday": "生于 {birthday}",
+    "note": "备注",
+    "approve_confirm_cancel_button": "不要批准",
+    "approve_confirm": "您是否要批准 {user} 的关注请求？",
+    "block_confirm_title": "确认屏蔽",
+    "block_confirm": "您确定要屏蔽 {user} 吗？",
+    "mute_confirm": "您确定要隐藏 {user} 吗？",
+    "remove_follower_confirm_accept_button": "移除",
+    "note_blank": "（空）",
+    "edit_note": "编辑备注",
+    "edit_note_apply": "应用",
+    "edit_note_cancel": "取消"
   },
   "user_profile": {
     "timeline_title": "用户时间线",
@@ -866,7 +991,9 @@
     "reject_follow_request": "拒绝关注请求",
     "add_reaction": "添加互动",
     "bookmark": "书签",
-    "accept_follow_request": "接受关注请求"
+    "accept_follow_request": "接受关注请求",
+    "toggle_expand": "展开或折叠通知以显示帖子全文",
+    "toggle_mute": "展开或折叠通知以显示已隐藏的内容"
   },
   "upload": {
     "error": {
@@ -888,7 +1015,9 @@
     "hashtags": "话题标签",
     "person_talking": "{count} 人正在讨论",
     "people_talking": "{count} 人正在讨论",
-    "no_results": "没有搜索结果"
+    "no_results": "没有搜索结果",
+    "no_more_results": "没有更多结果",
+    "load_more": "加载更多结果"
   },
   "password_reset": {
     "forgot_password": "忘记密码了？",
@@ -925,9 +1054,11 @@
       "symbols": "符号",
       "travel-and-places": "旅行和地点",
       "activities": "活动",
-      "animals-and-nature": "动物和自然"
+      "animals-and-nature": "动物和自然",
+      "smileys-and-emotion": "表情与情感"
     },
-    "regional_indicator": "地区指示符 {letter}"
+    "regional_indicator": "地区指示符 {letter}",
+    "unpacked": "拆分的表情符号"
   },
   "about": {
     "mrf": {
@@ -987,7 +1118,7 @@
     "empty_chat_list_placeholder": "您还没有任何聊天记录。开始聊天吧！",
     "error_sending_message": "发送消息时出了点问题。",
     "error_loading_chat": "加载聊天时出了点问题。",
-    "delete_confirm": "您确实要删除此消息吗？",
+    "delete_confirm": "您确定要删除此消息吗？",
     "more": "更多",
     "empty_message_error": "无法发布空消息",
     "new": "新聊天",
@@ -1022,9 +1153,42 @@
     "state_closed": "已关闭",
     "state_resolved": "已解决",
     "reporter": "举报者：",
-    "state_open": "开启"
+    "state_open": "开启",
+    "reported_statuses": "已举报的状态：",
+    "notes": "备注：",
+    "state": "状态："
   },
   "unicode_domain_indicator": {
     "tooltip": "此域名包含非 ascii 字符。"
+  },
+  "update": {
+    "update_bugs_gitlab": "Pleroma GitLab",
+    "update_changelog": "关于变化的更多细节，请参见 {theFullChangelog} 。",
+    "update_changelog_here": "完整的更新日志",
+    "big_update_title": "请忍耐一下",
+    "big_update_content": "我们已经有一段时间没有发布发行版，所以事情的外观和感觉可能与你习惯的不一样。",
+    "update_bugs": "请在 {pleromaGitlab} 上报告任何问题和bug，因为我们已经改变了很多，虽然我们进行了彻底的测试，并且自己使用了开发版本，但我们可能错过了一些东西。我们欢迎你对你可能遇到的问题或如何改进Pleroma和Pleroma-FE提出反馈和建议。",
+    "art_by": "Art by {linkToArtist}"
+  },
+  "lists": {
+    "search": "搜索用户",
+    "create": "创建",
+    "save": "保存更改",
+    "delete": "删除列表",
+    "following_only": "限制于正在关注",
+    "manage_lists": "管理列表",
+    "manage_members": "管理列表成员",
+    "add_members": "搜索更多用户",
+    "remove_from_list": "从列表中移除",
+    "add_to_list": "添加到列表",
+    "is_in_list": "已在列表中",
+    "editing_list": "正在编辑列表 {listTitle}",
+    "creating_list": "正在创建新的列表",
+    "update_title": "保存标题",
+    "really_delete": "真的要删除列表吗？",
+    "error": "操作列表时出错：{0}",
+    "lists": "列表",
+    "new": "新的列表",
+    "title": "列表标题"
   }
 }
-- 
cgit v1.2.3-70-g09d2


From cb18497902c0a1b02c6d41871aa466685e1c60de Mon Sep 17 00:00:00 2001
From: Poesty Li <poesty7450@gmail.com>
Date: Sun, 29 Jan 2023 06:22:43 +0000
Subject: Translated using Weblate (Chinese (Simplified))

Currently translated at 99.6% (983 of 986 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hans/
---
 src/i18n/zh.json | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/i18n/zh.json b/src/i18n/zh.json
index 86181689..90f840a7 100644
--- a/src/i18n/zh.json
+++ b/src/i18n/zh.json
@@ -129,7 +129,8 @@
     "announcements": "公告",
     "edit_nav_mobile": "自定义导航栏",
     "edit_pinned": "编辑固定的项目",
-    "mobile_sidebar": "切换移动设备侧栏"
+    "mobile_sidebar": "切换移动设备侧栏",
+    "search_close": "关闭搜索栏"
   },
   "notifications": {
     "broken_favorite": "未知的状态，正在搜索中…",
@@ -209,7 +210,9 @@
     "post": "发送",
     "edit_remote_warning": "其它远程实例可能不支持编辑并且无法接收您的帖子的最新版本。",
     "edit_unsupported_warning": "Pleroma 不支持对提及或投票进行编辑。",
-    "edit_status": "编辑状态"
+    "edit_status": "编辑状态",
+    "content_type_selection": "发帖格式",
+    "scope_notice_dismiss": "关闭此提示"
   },
   "registration": {
     "bio": "简介",
@@ -993,7 +996,8 @@
     "bookmark": "书签",
     "accept_follow_request": "接受关注请求",
     "toggle_expand": "展开或折叠通知以显示帖子全文",
-    "toggle_mute": "展开或折叠通知以显示已隐藏的内容"
+    "toggle_mute": "展开或折叠通知以显示已隐藏的内容",
+    "autocomplete_available": "共有 {number} 个结果可用。使用向上和向下键浏览它们。"
   },
   "upload": {
     "error": {
-- 
cgit v1.2.3-70-g09d2


From 2e9014abd72352bf9994834e5341373805236a10 Mon Sep 17 00:00:00 2001
From: nixe neko <nixeneko.info@gmail.com>
Date: Sat, 4 Feb 2023 02:35:07 +0000
Subject: Translated using Weblate (Japanese (ja_EASY))

Currently translated at 99.6% (983 of 986 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ja_EASY/
---
 src/i18n/ja_easy.json | 588 +++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 555 insertions(+), 33 deletions(-)

(limited to 'src')

diff --git a/src/i18n/ja_easy.json b/src/i18n/ja_easy.json
index abca262b..21b27d12 100644
--- a/src/i18n/ja_easy.json
+++ b/src/i18n/ja_easy.json
@@ -17,7 +17,17 @@
         "media_removal": "メディアをのぞく",
         "media_removal_desc": "このインスタンスは、これらのインスタンスからおくられてきたメディアを、とりのぞきます:",
         "media_nsfw": "メディアをすべてセンシティブにする",
-        "media_nsfw_desc": "このインスタンスは、これらのインスタンスからおくられてきたメディアを、すべて、センシティブにマークします:"
+        "media_nsfw_desc": "このインスタンスは、これらのインスタンスからおくられてきたメディアを、すべて、センシティブにマークします:",
+        "reason": "りゆう",
+        "instance": "インスタンス",
+        "not_applicable": "なし"
+      },
+      "keyword": {
+        "keyword_policies": "キーワードポリシー",
+        "reject": "おことわり",
+        "replace": "おきかえ",
+        "ftl_removal": "「つながっているすべてのネットワーク」タイムラインからのぞく",
+        "is_replaced_by": "→"
       }
     },
     "staff": "スタッフ"
@@ -36,7 +46,10 @@
     "scope_options": "こうかいはんいせんたく",
     "text_limit": "もじのかず",
     "title": "ゆうこうなきのう",
-    "who_to_follow": "おすすめユーザー"
+    "who_to_follow": "おすすめユーザー",
+    "pleroma_chat_messages": "Pleroma チャット",
+    "upload_limit": "アップロードできるファイルのおおきさ",
+    "shout": "Shoutbox"
   },
   "finder": {
     "error_fetching_user": "ユーザーけんさくがエラーになりました",
@@ -54,7 +67,34 @@
     "disable": "なし",
     "enable": "あり",
     "confirm": "たしかめる",
-    "verify": "たしかめる"
+    "verify": "たしかめる",
+    "retry": "もういちど、ためしてください",
+    "loading": "よみこんでいます…",
+    "undo": "もとにもどす",
+    "yes": "はい",
+    "no": "いいえ",
+    "unpin": "ピンどめするのをやめる",
+    "scroll_to_top": "いちばんうえにもどる",
+    "role": {
+      "moderator": "モデレーター",
+      "admin": "かんりするひと"
+    },
+    "flash_security": "Flash コンテンツはどんなコードでもじっこうできるので、あぶないかもしれません。",
+    "flash_fail": "Flash コンテンツをよみこむことに、しっぱいしました。コンソールで、くわしいないようを、よむことができます。",
+    "scope_in_timeline": {
+      "private": "フォロワーげんてい",
+      "public": "パブリック",
+      "unlisted": "アンリステッド",
+      "direct": "ダイレクト"
+    },
+    "pin": "ピンどめする",
+    "flash_content": "Flash コンテンツを、 Ruffle をつかってひょうじする (うごかないかもしれません)。",
+    "generic_error_message": "エラーになりました: {0}",
+    "error_retry": "もういちど、ためしてください",
+    "never_show_again": "にどとひょうじしない",
+    "close": "とじる",
+    "dismiss": "むしする",
+    "peek": "かくす"
   },
   "image_cropper": {
     "crop_picture": "がぞうをきりぬく",
@@ -83,11 +123,17 @@
     "heading": {
       "totp": "2-ファクターにんしょう",
       "recovery": "2-ファクターリカバリー"
-    }
+    },
+    "logout_confirm_title": "ログアウトのかくにん",
+    "logout_confirm": "ほんとうに、ログアウトしますか？",
+    "logout_confirm_accept_button": "ログアウトする",
+    "logout_confirm_cancel_button": "ログアウトしない"
   },
   "media_modal": {
     "previous": "まえ",
-    "next": "つぎ"
+    "next": "つぎ",
+    "counter": "{current} / {total}",
+    "hide": "メディアビューアーをとじる"
   },
   "nav": {
     "about": "これはなに？",
@@ -104,7 +150,20 @@
     "user_search": "ユーザーをさがす",
     "search": "さがす",
     "who_to_follow": "おすすめユーザー",
-    "preferences": "せってい"
+    "preferences": "せってい",
+    "home_timeline": "ホームタイムライン",
+    "bookmarks": "ブックマーク",
+    "timelines": "タイムライン",
+    "chats": "チャット",
+    "lists": "リスト",
+    "mobile_notifications": "つうちをひらく (よんでないものがあります)",
+    "mobile_notifications_close": "つうちをとじる",
+    "announcements": "おしらせ",
+    "edit_pinned": "ピンどめをへんしゅう",
+    "search_close": "けんさくバーをとじる",
+    "edit_nav_mobile": "ナビゲーションバーのせっていをかえる",
+    "mobile_sidebar": "モバイルのサイドバーをきりかえる",
+    "edit_finish": "へんしゅうをおわりにする"
   },
   "notifications": {
     "broken_favorite": "ステータスがみつかりません。さがしています…",
@@ -114,21 +173,29 @@
     "notifications": "つうち",
     "read": "よんだ！",
     "repeated_you": "あなたのステータスがリピートされました",
-    "no_more_notifications": "つうちはありません"
+    "no_more_notifications": "つうちはありません",
+    "error": "つうちをとりにいくことに、しっぱいしました: {0}",
+    "follow_request": "あなたをフォローしたいです",
+    "migrated_to": "インスタンスを、ひっこしました",
+    "reacted_with": "{0} でリアクションしました",
+    "poll_ended": "とうひょうが、おわりました",
+    "submitted_report": "つうほうしました"
   },
   "polls": {
-    "add_poll": "いれふだをはじめる",
+    "add_poll": "とうひょうをはじめる",
     "add_option": "オプションをふやす",
     "option": "オプション",
-    "votes": "いれふだ",
-    "vote": "ふだをいれる",
-    "type": "いれふだのかた",
+    "votes": "ひょう",
+    "vote": "とうひょうする",
+    "type": "とうひょうのけいしき",
     "single_choice": "ひとつえらぶ",
     "multiple_choices": "いくつでもえらべる",
-    "expiry": "いれふだのながさ",
-    "expires_in": "いれふだは {0} で、おわります",
-    "expired": "いれふだは {0} まえに、おわりました",
-    "not_enough_options": "ユニークなオプションが、たりません"
+    "expiry": "とうひょうのながさ",
+    "expires_in": "とうひょうは {0} で、おわります",
+    "expired": "とうひょうは {0} まえに、おわりました",
+    "not_enough_options": "ユニークなオプションが、たりません",
+    "people_voted_count": "{count} にんが、とうひょうしました",
+    "votes_count": "{count} ひょう"
   },
   "emoji": {
     "stickers": "ステッカー",
@@ -139,7 +206,19 @@
     "custom": "カスタムえもじ",
     "unicode": "ユニコードえもじ",
     "load_all_hint": "はじめの {saneAmount} このえもじだけがロードされています。すべてのえもじをロードすると、パフォーマンスがわるくなるかもしれません。",
-    "load_all": "すべてのえもじをロード ({emojiAmount} こあります)"
+    "load_all": "すべてのえもじをロード ({emojiAmount} こあります)",
+    "unicode_groups": {
+      "flags": "はた",
+      "activities": "かつどう",
+      "animals-and-nature": "どうぶつ・しぜん",
+      "food-and-drink": "たべもの・のみもの",
+      "objects": "もの",
+      "people-and-body": "ひと・からだ",
+      "smileys-and-emotion": "えがお・きもち",
+      "symbols": "きごう",
+      "travel-and-places": "りょこう・ばしょ"
+    },
+    "regional_indicator": "ばしょをしめすきごう {letter}"
   },
   "stickers": {
     "add_sticker": "ステッカーをふやす"
@@ -147,7 +226,10 @@
   "interactions": {
     "favs_repeats": "リピートとおきにいり",
     "follows": "あたらしいフォロー",
-    "load_older": "ふるいやりとりをみる"
+    "load_older": "ふるいやりとりをみる",
+    "emoji_reactions": "えもじリアクション",
+    "moves": "ユーザーのひっこし",
+    "reports": "つうほう"
   },
   "post_status": {
     "new_status": "とうこうする",
@@ -176,7 +258,18 @@
       "private": "フォロワーげんてい: フォロワーのみにとどきます",
       "public": "パブリック: パブリックタイムラインにとどきます",
       "unlisted": "アンリステッド: パブリックタイムラインにとどきません"
-    }
+    },
+    "media_description_error": "メディアのアップロードにしっぱいしました。もういちどためしてください",
+    "edit_status": "ステータスをへんしゅうする",
+    "media_description": "メディアのせつめい",
+    "content_type_selection": "とうこうのけいしき",
+    "edit_remote_warning": "ほかのリモートインスタンスは、へんしゅうをサポートしていないかもしれません。そして、へんしゅうされたとうこうをうけとることができないかもしれません。",
+    "post": "とうこう",
+    "edit_unsupported_warning": "Pleroma は、メンションやとうひょうのへんしゅうを、サポートしていません。",
+    "preview": "プレビュー",
+    "preview_empty": "なにもありません",
+    "empty_status_error": "とうこうないようを、にゅうりょくしてください",
+    "scope_notice_dismiss": "このつうちをとじる"
   },
   "registration": {
     "bio": "プロフィール",
@@ -196,8 +289,18 @@
       "email_required": "なにかかいてください",
       "password_required": "なにかかいてください",
       "password_confirmation_required": "なにかかいてください",
-      "password_confirmation_match": "パスワードがちがいます"
-    }
+      "password_confirmation_match": "パスワードがちがいます",
+      "birthday_required": "なにかかいてください",
+      "birthday_min_age": "{date} か、それよりまえにしてください"
+    },
+    "reason_placeholder": "このインスタンスでは、ひとがかくにんして、とうろくをうけいれています。\nなぜあなたがとうろくしたいのかを、かんりしているひとに、おしえてください。",
+    "bio_optional": "プロフィール (かかなくてもよい)",
+    "reason": "とうろくするりゆう",
+    "email_optional": "Eメール (かかなくてもよい)",
+    "register": "とうろくする",
+    "email_language": "サーバーからのメールは、なにご(どのことば)がいいですか？",
+    "birthday": "たんじょうび:",
+    "birthday_optional": "たんじょうび (かかなくてもよい):"
   },
   "remote_user_resolver": {
     "remote_user_resolver": "リモートユーザーリゾルバー",
@@ -393,7 +496,24 @@
         "save_load_hint": "「のこす」オプションをONにすると、テーマをえらんだときとロードしたとき、いまのせっていをのこします。また、テーマをエクスポートするとき、これらのオプションをストアします。すべてのチェックボックスをOFFにすると、テーマをエクスポートしたとき、すべてのせっていをセーブします。",
         "reset": "リセット",
         "clear_all": "すべてクリア",
-        "clear_opacity": "とうめいどをクリア"
+        "clear_opacity": "とうめいどをクリア",
+        "help": {
+          "older_version_imported": "ふるいバージョンのフロントエンドでつくられたファイルをインポートしました。",
+          "snapshot_missing": "ファイルにはテーマのスナップショットがありません。おもっていたみためと、ちがうかもしれません。",
+          "migration_snapshot_ok": "あんぜんのため、テーマのスナップショットがよみこまれました。テーマのデータをよみこむことができます。",
+          "snapshot_source_mismatch": "バージョンがただしくないです。フロントエンドのバージョンをもとにもどしたあと、あたらしくしたことが、りゆうかもしれません。ふるいフロントエンドでテーマをへんこうしていたばあい、ふるいバージョンをつかうのがいいです。そうでないばあい、あたらしいバージョンをつかってください。",
+          "snapshot_present": "テーマのスナップショットをよみこみました。せっていはうわがきされました。かわりに、テーマのじっさいのデータをよみこむことができます。",
+          "fe_upgraded": "フロントエンドといっしょに、テーマエンジンもあたらしくなりました。",
+          "fe_downgraded": "フロントエンドが、まえのバージョンにもどりました。",
+          "migration_napshot_gone": "スナップショットがありません。おぼえているみためと、ちがうかもしれません。",
+          "upgraded_from_v2": "PleromaFEがあたらしくなったので、いままでのみためとすこしちがうかもしれません。",
+          "v2_imported": "ふるいフロントエンドのためのファイルをインポートしました。せっていしたのとは、すこしちがうかもしれません。",
+          "future_version_imported": "あたらしいフロントエンドでつくられたファイルをインポートしました。"
+        },
+        "load_theme": "テーマをよみこむ",
+        "keep_as_is": "そのままにする",
+        "use_snapshot": "ふるいバージョン",
+        "use_source": "あたらしいバージョン"
       },
       "common": {
         "color": "いろ",
@@ -429,7 +549,26 @@
         "borders": "さかいめ",
         "buttons": "ボタン",
         "inputs": "インプットフィールド",
-        "faint_text": "うすいテキスト"
+        "faint_text": "うすいテキスト",
+        "post": "とうこう / プロフィール",
+        "wallpaper": "かべがみ",
+        "icons": "アイコン",
+        "highlight": "よくみえるようにした、ようそ",
+        "pressed": "おしたとき",
+        "chat": {
+          "border": "さかいめ",
+          "incoming": "うけとったもの",
+          "outgoing": "おくったもの"
+        },
+        "underlay": "アンダーレイ",
+        "alert_neutral": "それいがい",
+        "popover": "ツールチップ、メニュー、ポップオーバー",
+        "poll": "とうひょうのグラフ",
+        "selectedPost": "えらんだとうこう",
+        "selectedMenu": "えらんだメニューアイテム",
+        "disabled": "つかえないとき",
+        "toggled": "きりかえたとき",
+        "tabs": "タブ"
       },
       "radii": {
         "_tab_label": "まるさ"
@@ -462,7 +601,8 @@
           "buttonPressed": "ボタン (おされているとき)",
           "buttonPressedHover": "ボタン (ホバー、かつ、おされているとき)",
           "input": "インプットフィールド"
-        }
+        },
+        "hintV3": "かげのばあいは、 {0} というかきかたをつかうことができます。そうすると、ほかのいろのスロットをつかうことができます。"
       },
       "fonts": {
         "_tab_label": "フォント",
@@ -497,7 +637,167 @@
       "title": "バージョン",
       "backend_version": "バックエンドのバージョン",
       "frontend_version": "フロントエンドのバージョン"
-    }
+    },
+    "notification_visibility_polls": "あなたがさんかしたとうひょうが、おわりました",
+    "setting_server_side": "このせっていは、あなたのプロフィールについてのものです。へんこうすると、すべてのセッションとクライアントにえいきょうします",
+    "mute_import_error": "ミュートのインポートが、エラーになりました",
+    "account_backup_description": "あなたのアカウントじょうほうや、とうこうのアーカイブを、ダウンロードすることができます。しかし、 Pleroma アカウントにインポートすることはまだできません。",
+    "list_backups_error": "バックアップリストをとりにいくことが、エラーになりました: {error}",
+    "list_aliases_error": "エイリアスをとりにいくときに、エラーになりました: {error}",
+    "added_alias": "エイリアスをつくりました。",
+    "move_account_notes": "もしあなたがアカウントをほかのインスタンスにひっこしたいのなら、ひっこすさきのアカウントからここへのエイリアスをつくってください。",
+    "file_export_import": {
+      "backup_settings_theme": "せっていとテーマをファイルにバックアップする",
+      "restore_settings": "ファイルからせっていをもとにもどす",
+      "errors": {
+        "file_too_new": "メジャーバージョン({fileMajor})がちがいます。この PleromaFE (せっていのバージョン {feMajor}) はふるいので、つかうことができません",
+        "file_slightly_new": "ファイルのマイナーバージョンがちがっています。いくつかのせっていは、よみこまれないかもしれません",
+        "invalid_file": "これは Pleroma のせっていをバックアップしたファイルではありません。",
+        "file_too_old": "メジャーバージョン({fileMajor})がちがいます。ファイルのバージョンが古いので、使うことができません(バージョン {feMajor} いじょうのせっていバージョンをつかってください)"
+      },
+      "backup_settings": "せっていをファイルにバックアップする",
+      "backup_restore": "せっていのバックアップ"
+    },
+    "hide_wallpaper": "このインスタンスのバックグラウンドをかくす",
+    "reply_visibility_following_short": "わたしのフォローしているひとにあてられたリプライをみる",
+    "reply_visibility_self_short": "じぶんにあてられたリプライだけをみる",
+    "save": "へんこうをほぞんする",
+    "reset_banner_confirm": "ほんとうに、バナーをリセットしますか？",
+    "tree_advanced": "ツリービューで、ナビゲーションをもっとじゅうなんにする",
+    "third_column_mode": "じゅうぶんなくうかんがあれば、3ばんめのれつをひょうじする",
+    "conversation_other_replies_button": "「ほかのリプライ」ボタンをひょうじするばしょ",
+    "user_popover_avatar_action_open": "プロフィールをひらく",
+    "notification_setting_filters": "フィルター",
+    "notification_setting_hide_notification_contents": "おくったひとと、ないようを、プッシュつうちにひょうじしない",
+    "backup_running": "バックアップしています。{number}このデータをしょりしました。",
+    "word_filter_and_more": "ことばのフィルターと、そのほか…",
+    "account_privacy": "プライバシー",
+    "posts": "とうこう",
+    "move_account": "アカウントをひっこす",
+    "move_account_target": "ひっこしさきのアカウント (れい: {example})",
+    "mute_bot_posts": "Bot のとうこうをミュートする",
+    "hide_bot_indication": "Bot によるとうこうであることを、とうこうにひょうじしない",
+    "hide_all_muted_posts": "ミュートしたとうこうをかくす",
+    "hide_shoutbox": "Shoutbox をかくす",
+    "conversation_display_tree": "ツリーけいしき",
+    "mention_link_display_full_for_remote": "リモートユーザーだけ、ながいなまえでひょうじする (れい: {'@'}hoge{'@'}example.org)",
+    "mention_link_bolden_you": "あなたがメンションされたとき、あなたへのメンションを、よくみえるようにする",
+    "user_popover_avatar_action": "ポップオーバーのアバターをクリックしたとき",
+    "user_popover_avatar_action_zoom": "アバターをおおきくする",
+    "user_popover_avatar_action_close": "ポップオーバーをとじる",
+    "always_show_post_button": "とうこうボタンをいつもひょうじする",
+    "auto_update": "あたらしいとうこうを、じどうてきにみせる",
+    "user_mutes": "ユーザー",
+    "useStreamingApi": "とうこうとつうちを、リアルタイムにうけとる",
+    "use_websockets": "Websockets をつかう (リアルタイムアップデート)",
+    "mutes_and_blocks": "ミュートとブロック",
+    "emoji_reactions_on_timeline": "えもじリアクションをタイムラインにひょうじする",
+    "accent": "アクセント",
+    "domain_mutes": "ドメイン",
+    "import_mutes_from_a_csv_file": "CSVファイルからミュートをインポートする",
+    "reset_avatar": "アバターをリセットする",
+    "remove_language": "とりのぞく",
+    "primary_language": "いちばんわかることば:",
+    "add_language": "よびとしてつかうことばを、ついかする",
+    "fallback_language": "よびとしてつかうことば {index}:",
+    "lists_navigation": "ナビゲーションにリストをひょうじする",
+    "account_alias": "アカウントのエイリアス",
+    "mention_link_display_full": "いつも、ながいなまえをひょうじする (れい: {'@'}hoge{'@'}example.org)",
+    "setting_changed": "せっていは、デフォルトとちがっています",
+    "email_language": "サーバーからうけとるEメールのことば",
+    "mute_export": "ミュートのエクスポート",
+    "mute_export_button": "あなたのミュートを、 CSV ファイルにエクスポートします",
+    "mute_import": "ミュートのインポート",
+    "mutes_imported": "ミュートをインポートしました！すこしじかんがかかるかもしれません。",
+    "account_backup": "アカウントのバックアップ",
+    "account_backup_table_head": "バックアップ",
+    "download_backup": "ダウンロード",
+    "backup_not_ready": "バックアップのじゅんびが、まだできていません。",
+    "backup_failed": "バックアップにしっぱいしました。",
+    "remove_backup": "とりのぞく",
+    "add_backup": "あたらしいバックアップをつくる",
+    "added_backup": "あたらしいバックアップをつくりました。",
+    "add_backup_error": "あたらしいバックアップをつくるときに、エラーになりました: {error}",
+    "bot": "これは bot アカウントです",
+    "account_alias_table_head": "エイリアス",
+    "hide_list_aliases_error_action": "とじる",
+    "remove_alias": "このエイリアスをけす",
+    "add_alias_error": "エイリアスをつくるときに、エラーになりました: {error}",
+    "new_alias_target": "あたらしいエイリアスをつくる (れい: {example})",
+    "moved_account": "アカウントをひっこしました。",
+    "move_account_error": "アカウントをひっこしているときに、エラーになりました: {error}",
+    "wordfilter": "ことばのフィルター",
+    "hide_media_previews": "メディアのプレビューをかくす",
+    "right_sidebar": "サイドバーをみぎにひょうじする",
+    "hide_wordfiltered_statuses": "ことばのフィルターでフィルターされたステータスをかくす",
+    "hide_muted_threads": "ミュートされたスレッドをかくす",
+    "navbar_column_stretch": "ナビゲーションバーをれつのはばまでのばす",
+    "birthday": {
+      "label": "たんじょうび",
+      "show_birthday": "たんじょうびを、ひょうじする"
+    },
+    "profile_fields": {
+      "label": "プロフィールのメタデータ",
+      "add_field": "フィールドをふやす",
+      "name": "ラベル",
+      "value": "ないよう"
+    },
+    "user_profiles": "ユーザープロフィール",
+    "notification_visibility_moves": "ユーザーのひっこし",
+    "notification_visibility_emoji_reactions": "リアクション",
+    "hide_favorites_description": "おきにいりのリストをみせない (つうちはおくられます)",
+    "reset_profile_background": "プロフィールバックグラウンドをリセットする",
+    "reset_profile_banner": "プロフィールバナーをリセットする",
+    "reset_avatar_confirm": "ほんとうに、アバターをリセットしますか？",
+    "reset_background_confirm": "ほんとうに、バックグラウンドをリセットしますか？",
+    "column_sizes_sidebar": "サイドバー",
+    "column_sizes_notifs": "つうち",
+    "columns": "れつ",
+    "column_sizes": "れつのおおきさ",
+    "column_sizes_content": "コンテンツ",
+    "conversation_display": "スレッドのひょうじけいしき",
+    "conversation_display_linear": "リニアけいしき",
+    "conversation_display_linear_quick": "リニアビュー",
+    "show_scrollbars": "よこのれつにスクロールバーをひょうじする",
+    "third_column_mode_none": "3ばんめのれつをひょうじしない",
+    "third_column_mode_postform": "とうこうフォームとナビゲーション",
+    "third_column_mode_notifications": "つうちのれつをひょうじする",
+    "tree_fade_ancestors": "げんざいのステータスのおやを、うすいいろのもじでひょうじする",
+    "conversation_other_replies_button_below": "ステータスのした",
+    "conversation_other_replies_button_inside": "ステータスのなか",
+    "max_depth_in_thread": "デフォルトでひょうじするスレッドのふかさ",
+    "sensitive_by_default": "デフォルトで、とうこうをNSFWにする",
+    "type_domains_to_mute": "ミュートしたいドメインを、ここでけんさくできます",
+    "mention_link_use_tooltip": "メンションのリンクをクリックしたとき、ユーザーカードをみせる",
+    "mention_link_show_avatar": "ユーザーのアバターをリンクのよこにひょうじする",
+    "mention_link_show_avatar_quick": "ユーザーのアバターをメンションのとなりにひょうじする",
+    "mention_link_fade_domain": "ドメイン(れい: {'@'}hoge{'@'}example.org のなかの {'@'}example.org)を、うすいいろにする",
+    "user_popover_avatar_overlay": "ユーザーのポップオーバーを、ユーザーのアバターのうえにひょうじする",
+    "show_yous": "(あなた)をひょうじする",
+    "notification_setting_block_from_strangers": "フォローしていないユーザーからのつうちをブロックする",
+    "notification_setting_privacy": "プライバシー",
+    "more_settings": "そのたのせってい",
+    "expert_mode": "くわしいせっていを、ひょうじする",
+    "mention_links": "メンションのリンク",
+    "post_look_feel": "とうこうのみためとかんかく",
+    "allow_following_move": "フォローしているアカウントがインスタンスをひっこしたばあい、じどうでフォローしてもよい",
+    "chatMessageRadius": "チャットメッセージ",
+    "confirm_dialogs": "つぎのばあいに、かくにんをする",
+    "confirm_dialogs_repeat": "ステータスをリピートするとき",
+    "confirm_dialogs_unfollow": "ユーザーのフォローをはずすとき",
+    "confirm_dialogs_block": "ユーザーをブロックするとき",
+    "confirm_dialogs_mute": "ユーザーをミュートするとき",
+    "confirm_dialogs_delete": "ステータスをけすとき",
+    "confirm_dialogs_logout": "ログアウトするとき",
+    "confirm_dialogs_approve_follow": "フォローをうけいれるとき",
+    "confirm_dialogs_deny_follow": "フォローをことわるとき",
+    "confirm_dialogs_remove_follower": "フォロワーをとりのぞくとき",
+    "conversation_display_tree_quick": "ツリービュー",
+    "disable_sticky_headers": "れつのヘッダーを、がめんのいちばんうえにこていしない",
+    "virtual_scrolling": "タイムラインのレンダリングをよくする",
+    "use_at_icon": "{'@'} きごうを、もじのかわりに、アイコンでひょうじする",
+    "mention_link_display_short": "いつも、みじかいなまえにする (れい: {'@'}hoge)",
+    "mention_link_display": "メンションのリンクをひょうじするけいしき"
   },
   "time": {
     "day": "{0}日",
@@ -531,7 +831,23 @@
     "year": "{0}年",
     "years": "{0}年",
     "year_short": "{0}年",
-    "years_short": "{0}年"
+    "years_short": "{0}年",
+    "unit": {
+      "minutes": "{0}ふん",
+      "seconds_short": "{0}びょう",
+      "weeks": "{0}しゅうかん",
+      "weeks_short": "{0}しゅう",
+      "years": "{0}ねん",
+      "years_short": "{0}ねん",
+      "days": "{0}にち",
+      "days_short": "{0}にち",
+      "hours": "{0}じかん",
+      "hours_short": "{0}じかん",
+      "minutes_short": "{0}ふん",
+      "months": "{0}かげつ",
+      "months_short": "{0}かげつ",
+      "seconds": "{0}びょう"
+    }
   },
   "timeline": {
     "collapse": "たたむ",
@@ -543,7 +859,11 @@
     "show_new": "よみこみ",
     "up_to_date": "さいしん",
     "no_more_statuses": "これでおわりです",
-    "no_statuses": "ありません"
+    "no_statuses": "ありません",
+    "socket_broke": "コード{0}により、リアルタイムでつながることがなくなりました",
+    "socket_reconnected": "リアルタイムでつながることを、つくりました",
+    "reload": "もういちど、よみこむ",
+    "error": "タイムラインをとりにいくときに、エラーになりました: {0}"
   },
   "status": {
     "favorites": "おきにいり",
@@ -556,7 +876,57 @@
     "reply_to": "へんしん:",
     "replies_list": "へんしん:",
     "mute_conversation": "スレッドをミュートする",
-    "unmute_conversation": "スレッドをミュートするのをやめる"
+    "unmute_conversation": "スレッドをミュートするのをやめる",
+    "repeat_confirm_title": "リピートのかくにん",
+    "mentions": "メンション",
+    "thread_muted": "ミュートされたスレッド",
+    "collapse_attachments": "ファイルをかくす",
+    "remove_attachment": "ファイルをとりのぞく",
+    "thread_show_full": "このスレッドのすべてのとうこうをみる (ぜんぶで{numStatus}このステータス、ふかさ{depth})",
+    "show_all_attachments": "すべてのファイルをみる",
+    "hide_full_subject": "かくす",
+    "nsfw": "NSFW",
+    "hide_content": "かくす",
+    "status_deleted": "このとうこうは、けされました",
+    "you": "(あなた)",
+    "expand": "ひろげる",
+    "repeat_confirm_accept_button": "リピートする",
+    "repeat_confirm_cancel_button": "リピートしない",
+    "edited_at": "({time} まえにへんしゅう)",
+    "delete_confirm_title": "けすことのかくにん",
+    "delete_confirm_accept_button": "けす",
+    "delete_confirm_cancel_button": "のこす",
+    "edit": "ステータスをへんしゅうする",
+    "bookmark": "ブックマークする",
+    "unbookmark": "ブックマークをはずす",
+    "replies_list_with_others": "へんしん (ほかに +{numReplies}こ):",
+    "status_unavailable": "ステータスがありません",
+    "copy_link": "リンクをコピー",
+    "external_source": "そとにあるソース",
+    "thread_muted_and_words": "つぎのことばをふくむので:",
+    "show_content": "みる",
+    "plus_more": "あと {number}こ",
+    "many_attachments": "とうこうには、{number}このファイルがついています",
+    "show_attachment_in_modal": "メディアモーダルでみる",
+    "show_attachment_description": "せつめいのプレビュー (ぜんぶみるには、ファイルをひらいてください)",
+    "hide_attachment": "ファイルをかくす",
+    "attachment_stop_flash": "Flash プレーヤーをとめる",
+    "move_up": "ファイルをひだりにうごかす",
+    "move_down": "ファイルをみぎにうごかす",
+    "open_gallery": "ギャラリーをひらく",
+    "thread_hide": "スレッドをかくす",
+    "thread_show": "スレッドをみる",
+    "show_full_subject": "すべてをみる",
+    "repeat_confirm": "ほんとうに、このステータスをリピートしますか？",
+    "show_all_conversation": "このスレッドをぜんぶみる (あと {numStatus}このステータス)",
+    "show_only_conversation_under_this": "このステータスへのへんしんだけをみる",
+    "status_history": "ステータスのれきし",
+    "thread_show_full_with_icon": "{icon} {text}",
+    "thread_follow": "のこりのとうこうをみる (ぜんぶで {numStatus}このステータス)",
+    "thread_follow_with_icon": "{icon} {text}",
+    "ancestor_follow": "このステータスよりしたの、{numReplies}このへんしんをみる",
+    "ancestor_follow_with_icon": "{icon} {text}",
+    "show_all_conversation_with_icon": "{icon} {text}"
   },
   "user_card": {
     "approve": "うけいれ",
@@ -577,7 +947,7 @@
     "media": "メディア",
     "mention": "メンション",
     "mute": "ミュート",
-    "muted": "ミュートしています！",
+    "muted": "ミュートしています",
     "per_day": "/日",
     "remote_follow": "リモートフォロー",
     "report": "つうほう",
@@ -608,8 +978,52 @@
       "disable_remote_subscription": "ほかのインスタンスからフォローされないようにする",
       "disable_any_subscription": "フォローされないようにする",
       "quarantine": "ほかのインスタンスのユーザーのとうこうをとめる",
-      "delete_user": "ユーザーをけす"
-    }
+      "delete_user": "ユーザーをけす",
+      "delete_user_data_and_deactivate_confirmation": "これをすると、このアカウントのデータがきえて、にどとつかえなくなります。ほんとうに、していいですか？"
+    },
+    "mute_confirm_accept_button": "ミュートする",
+    "unfollow_confirm_title": "フォローをやめることのかくにん",
+    "mute_confirm": "ほんとうに、 {user} をミュートしますか？",
+    "mute_duration_prompt": "このユーザーをつぎのじかんだけミュートする (0にすると、おわりがありません):",
+    "edit_note_apply": "てきよう",
+    "block_confirm": "ほんとうに、 {user} をブロックしますか？",
+    "deactivated": "つかえない",
+    "remove_follower": "フォロワーをとりのぞく",
+    "highlight": {
+      "solid": "バッググラウンドをひとつのいろにする",
+      "striped": "しまもようのバックグラウンドにする",
+      "side": "はじにせんをつける",
+      "disabled": "めだたせない"
+    },
+    "mute_confirm_cancel_button": "ミュートしない",
+    "unfollow_confirm_accept_button": "フォローをやめる",
+    "unfollow_confirm": "ほんとうに、 {user} のフォローをやめますか？",
+    "unfollow_confirm_cancel_button": "フォローしたままにする",
+    "mute_confirm_title": "ミュートのかくにん",
+    "block_confirm_accept_button": "ブロックする",
+    "block_confirm_cancel_button": "ブロックしない",
+    "deny_confirm_title": "おことわりのかくにん",
+    "deny_confirm_accept_button": "ことわる",
+    "deny_confirm_cancel_button": "ことわらない",
+    "deny_confirm": "{user} のフォローリクエストをことわりますか？",
+    "follow_cancel": "リクエストをキャンセル",
+    "birthday": "{birthday} に、うまれました",
+    "remove_follower_confirm_title": "フォロワーをとりのぞくことのかくにん",
+    "remove_follower_confirm_accept_button": "とりのぞく",
+    "remove_follower_confirm_cancel_button": "のこす",
+    "remove_follower_confirm": "ほんとうに、 {user} をあなたのフォロワーからとりのぞきますか？",
+    "edit_note": "メモをへんしゅうする",
+    "edit_note_cancel": "キャンセル",
+    "message": "メッセージ",
+    "bot": "bot",
+    "approve_confirm_title": "うけいれのかくにん",
+    "approve_confirm_accept_button": "うけいれる",
+    "approve_confirm_cancel_button": "うけいれない",
+    "approve_confirm": "{user} のフォローリクエストをうけいれますか？",
+    "edit_profile": "プロフィールをへんしゅう",
+    "block_confirm_title": "ブロックのかくにん",
+    "note_blank": "(なし)",
+    "note": "メモ"
   },
   "user_profile": {
     "timeline_title": "ユーザータイムライン",
@@ -634,13 +1048,21 @@
     "repeat": "リピート",
     "reply": "リプライ",
     "favorite": "おきにいり",
-    "user_settings": "ユーザーせってい"
+    "user_settings": "ユーザーせってい",
+    "accept_follow_request": "フォローのおねがいを、うけいれる",
+    "toggle_mute": "ミュートされたないようをみるために、つうちをひらくか、とじる",
+    "autocomplete_available": "{number}このけっかが、あります。うえとしたのキーをつかって、けっかをみることができます。",
+    "add_reaction": "リアクションをつける",
+    "reject_follow_request": "フォローのおねがいを、ことわる",
+    "bookmark": "ブックマーク",
+    "toggle_expand": "とうこうをすべてみるために、つうちをひらくか、とじる"
   },
   "upload": {
     "error": {
       "base": "アップロードにしっぱいしました。",
       "file_too_big": "ファイルがおおきすぎます [{filesize} {filesizeunit} / {allowedsize} {allowedsizeunit}]",
-      "default": "しばらくしてから、ためしてください"
+      "default": "しばらくしてから、ためしてください",
+      "message": "アップロードにしっぱいしました: {0}"
     },
     "file_size_units": {
       "B": "B",
@@ -655,7 +1077,9 @@
     "hashtags": "ハッシュタグ",
     "person_talking": "{count} にんが、はなしています",
     "people_talking": "{count} にんが、はなしています",
-    "no_results": "みつかりませんでした"
+    "no_results": "みつかりませんでした",
+    "no_more_results": "これでおわりです",
+    "load_more": "もっとみる"
   },
   "password_reset": {
     "forgot_password": "パスワードを、わすれましたか？",
@@ -668,5 +1092,103 @@
     "password_reset_disabled": "このインスタンスでは、パスワードリセットは、できません。インスタンスのアドミニストレーターに、おといあわせください。",
     "password_reset_required": "ログインするには、パスワードをリセットしてください。",
     "password_reset_required_but_mailer_is_disabled": "あなたはパスワードのリセットがひつようです。しかし、まずいことに、このインスタンスでは、パスワードのリセットができなくなっています。このインスタンスのアドミニストレーターに、おといあわせください。"
+  },
+  "announcements": {
+    "post_placeholder": "おしらせのないようを、にゅうりょくしてください。",
+    "end_time_prompt": "おわるじかん: ",
+    "inactive_message": "このおしらせは、つかわれていません",
+    "page_header": "おしらせ",
+    "title": "おしらせ",
+    "post_action": "とうこう",
+    "post_form_header": "おしらせをとうこう",
+    "mark_as_read_action": "よんだことにする",
+    "post_error": "エラー: {error}",
+    "close_error": "とじる",
+    "delete_action": "けす",
+    "start_time_display": "{time}にはじまります",
+    "end_time_display": "{time}におわります",
+    "edit_action": "へんしゅう",
+    "start_time_prompt": "はじまるじかん: ",
+    "all_day_prompt": "このイベントはいちにちじゅうやります",
+    "published_time_display": "{time}にこうかいされました",
+    "submit_edit_action": "そうしん",
+    "cancel_edit_action": "キャンセル"
+  },
+  "report": {
+    "reported_statuses": "つうほうされたステータス:",
+    "reporter": "つうほうしたひと:",
+    "state_closed": "クローズ",
+    "state_resolved": "かいけつしました",
+    "reported_user": "つうほうされたユーザー:",
+    "notes": "メモ:",
+    "state": "じょうたい:",
+    "state_open": "オープン"
+  },
+  "update": {
+    "update_bugs": "もんだいや、バグがあれば、 {pleromaGitlab} でおしえてください。ちゃんとテストはしているのですが、たくさんのことをかえているので、そしてかいはつバージョンをつかっているので、もんだいやバグに、きづかないことがあります。あなたがきづいたもんだいについての、フィードバックやていあんを、まっています。 Pleroma や Pleroma-FE をよくするやりかたについても、おしえてください。",
+    "update_changelog_here": "すべてのかわったことのきろく",
+    "art_by": "{linkToArtist}によるさくひん",
+    "big_update_title": "すこし、まってください",
+    "big_update_content": "しばらくリリースがありませんでした。おもっていたみためと、ちがうかもしれません。",
+    "update_bugs_gitlab": "Pleroma GitLab",
+    "update_changelog": "かわったことをすべてみるには、{theFullChangelog}をみてください。"
+  },
+  "chats": {
+    "new": "あたらしいチャット",
+    "chats": "チャット",
+    "you": "あなた:",
+    "message_user": "{nickname} にメッセージ",
+    "delete": "けす",
+    "empty_message_error": "なにかかいてください",
+    "more": "もっとみる",
+    "delete_confirm": "ほんとうに、このメッセージをけしますか？",
+    "error_loading_chat": "チャットをよみこむことに、しっぱいしました。",
+    "error_sending_message": "メッセージをおくることに、しっぱいしました。",
+    "empty_chat_list_placeholder": "チャットがありません。あたらしいチャットボタンをおして、はじめてください！"
+  },
+  "shoutbox": {
+    "title": "Shoutbox"
+  },
+  "errors": {
+    "storage_unavailable": "Pleroma はブラウザーのストレージにアクセスすることができません。あなたがログインしたことと、あなたのローカルのせっていは、ほぞんされません。ほかにももんだいがおきるかもしれません。 Cookie をゆうこうにしてください。"
+  },
+  "lists": {
+    "lists": "リスト",
+    "new": "あたらしいリスト",
+    "search": "ユーザーをさがす",
+    "title": "リストのなまえ",
+    "create": "つくる",
+    "save": "へんこうをほぞんする",
+    "delete": "リストをけす",
+    "following_only": "フォローしているひとげんていにする",
+    "manage_lists": "リストをかんりする",
+    "manage_members": "リストにふくまれるひとを、かんりする",
+    "add_members": "もっとユーザーをさがす",
+    "remove_from_list": "リストからとりのぞく",
+    "add_to_list": "リストにいれる",
+    "editing_list": "リスト {listTitle} をへんしゅうしています",
+    "creating_list": "あたらしいリストをつくっています",
+    "update_title": "なまえをほぞんする",
+    "really_delete": "ほんとうに、リストをけしますか？",
+    "is_in_list": "すでにリストのなかにあります",
+    "error": "リストをへんしゅうするときに、エラーになりました: {0}"
+  },
+  "file_type": {
+    "audio": "オーディオ",
+    "video": "ビデオ",
+    "image": "がぞう",
+    "file": "ファイル"
+  },
+  "display_date": {
+    "today": "きょう"
+  },
+  "unicode_domain_indicator": {
+    "tooltip": "このドメインは、ASCIIいがいのもじをふくんでいます。"
+  },
+  "domain_mute_card": {
+    "mute": "ミュート",
+    "mute_progress": "ミュートしています…",
+    "unmute": "ミュートをやめる",
+    "unmute_progress": "ミュートをやめています…"
   }
 }
-- 
cgit v1.2.3-70-g09d2


From 30f1502df6194216af1f34b6e3ba9f072c319349 Mon Sep 17 00:00:00 2001
From: Dmytro Poltavchenko <xinit.info@gmail.com>
Date: Tue, 7 Feb 2023 16:56:03 +0000
Subject: Translated using Weblate (Ukrainian)

Currently translated at 84.9% (838 of 986 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/uk/
---
 src/i18n/uk.json | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/i18n/uk.json b/src/i18n/uk.json
index c781b1f6..cbb1a21f 100644
--- a/src/i18n/uk.json
+++ b/src/i18n/uk.json
@@ -118,7 +118,10 @@
       "totp": "Двофакторна автентифікація"
     },
     "enter_two_factor_code": "Введіть двофакторний код автентифікації",
-    "placeholder": "напр. stepan"
+    "placeholder": "напр. stepan",
+    "logout_confirm": "Ви дійсно хочете вийти?",
+    "logout_confirm_accept_button": "Вийти",
+    "logout_confirm_cancel_button": "Ні, хочу назад!"
   },
   "importer": {
     "error": "Під час імпортування файлу сталася помилка.",
@@ -189,7 +192,8 @@
     "mobile_notifications": "Відкрити сповіщення (є непрочитані)",
     "mobile_notifications_close": "Закрити сповіщення",
     "edit_nav_mobile": "Редагувати панель навігації",
-    "announcements": "Анонси"
+    "announcements": "Анонси",
+    "search_close": "Закрити панель пошуку"
   },
   "media_modal": {
     "next": "Наступна",
-- 
cgit v1.2.3-70-g09d2


From 597c069e3630eeb198735ba31ccc56b6bdb7ad43 Mon Sep 17 00:00:00 2001
From: Pacific Coast Highway <fedi@pchxyz.anonaddy.com>
Date: Tue, 7 Feb 2023 08:14:33 +0000
Subject: Translated using Weblate (Chinese (Traditional))

Currently translated at 72.4% (714 of 986 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hant/
---
 src/i18n/zh_Hant.json | 46 +++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 41 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/i18n/zh_Hant.json b/src/i18n/zh_Hant.json
index 6f0f63b5..96c75215 100644
--- a/src/i18n/zh_Hant.json
+++ b/src/i18n/zh_Hant.json
@@ -113,12 +113,23 @@
     "submit": "提交",
     "apply": "應用",
     "role": {
-      "moderator": "主持人",
+      "moderator": "審查者",
       "admin": "管理員"
     },
     "flash_content": "點擊以使用 Ruffle 顯示 Flash 內容（實驗性，可能無效）。",
     "flash_security": "請注意，這可能有潜在的危險，因為Flash內容仍然是武斷的程式碼。",
-    "flash_fail": "無法加載flash內容，請參閱控制台瞭解詳細資訊。"
+    "flash_fail": "無法加載flash內容，請參閱控制台瞭解詳細資訊。",
+    "no": "否",
+    "generic_error_message": "發生了一個錯誤： {0}",
+    "never_show_again": "不再顯示",
+    "yes": "是",
+    "undo": "復原",
+    "scroll_to_top": "滾動至頂部",
+    "pin": "置頂",
+    "scope_in_timeline": {
+      "private": "僅關注者"
+    },
+    "unpin": "停止置頂"
   },
   "finder": {
     "find_user": "尋找用戶",
@@ -133,7 +144,8 @@
     "pleroma_chat_messages": "Pleroma 聊天",
     "chat": "聊天",
     "gopher": "Gopher",
-    "upload_limit": "上傳限制"
+    "upload_limit": "上傳限制",
+    "shout": "留言板"
   },
   "exporter": {
     "processing": "正在處理，稍後會提示您下載文件",
@@ -164,11 +176,14 @@
         "reject": "拒絕",
         "accept_desc": "本實例只接收來自下列實例的消息：",
         "simple_policies": "站規",
-        "accept": "接受"
+        "accept": "接受",
+        "instance": "實例",
+        "reason": "原因",
+        "not_applicable": "N/A"
       },
       "mrf_policies_desc": "MRF 策略會影響本實例的互通行為。以下策略已啟用：",
       "keyword": {
-        "ftl_removal": "從“全部已知網絡”時間線上移除",
+        "ftl_removal": "從「全部已知網絡」時間線上移除",
         "replace": "取代",
         "reject": "拒絕",
         "is_replaced_by": "→",
@@ -865,5 +880,26 @@
     "password_reset_disabled": "密碼重置已經被禁用。請聯繫你的實例管理員。",
     "password_reset_required": "您必須重置密碼才能登陸。",
     "password_reset_required_but_mailer_is_disabled": "您必須重置密碼，但是密碼重置被禁用了。請聯繫您所在實例的管理員。"
+  },
+  "announcements": {
+    "post_error": "錯誤： {error}",
+    "close_error": "關閉",
+    "delete_action": "刪除",
+    "start_time_prompt": "開始時間： ",
+    "end_time_prompt": "結束時間： ",
+    "all_day_prompt": "這是全日活動",
+    "start_time_display": "{time} 開始",
+    "end_time_display": "{time} 結束",
+    "published_time_display": "{time} 發布",
+    "edit_action": "編輯",
+    "submit_edit_action": "送出",
+    "cancel_edit_action": "取消",
+    "inactive_message": "此公告無效",
+    "page_header": "公告",
+    "title": "公告",
+    "mark_as_read_action": "標示為以閱讀",
+    "post_placeholder": "在此輸入您的公告內容……",
+    "post_form_header": "發布公告",
+    "post_action": "發布"
   }
 }
-- 
cgit v1.2.3-70-g09d2


From 65d78ced93aab31217a74624cb313be6ff7114f9 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Sun, 12 Feb 2023 15:38:36 -0500
Subject: Fix registration error with email language selected

---
 src/components/registration/registration.js  | 4 ++--
 src/components/registration/registration.vue | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/components/registration/registration.js b/src/components/registration/registration.js
index 22ca6ad6..b88bdeec 100644
--- a/src/components/registration/registration.js
+++ b/src/components/registration/registration.js
@@ -16,7 +16,7 @@ const registration = {
       confirm: '',
       birthday: '',
       reason: '',
-      language: ''
+      language: ['']
     },
     captcha: {}
   }),
@@ -100,7 +100,7 @@ const registration = {
       this.user.captcha_token = this.captcha.token
       this.user.captcha_answer_data = this.captcha.answer_data
       if (this.user.language) {
-        this.user.language = localeService.internalToBackendLocale(this.user.language)
+        this.user.language = localeService.internalToBackendLocaleMulti(this.user.language.filter(k => k))
       }
 
       this.v$.$touch()
diff --git a/src/components/registration/registration.vue b/src/components/registration/registration.vue
index 5701b05e..7438a5f4 100644
--- a/src/components/registration/registration.vue
+++ b/src/components/registration/registration.vue
@@ -210,6 +210,7 @@
                 :prompt-text="$t('registration.email_language')"
                 :language="v$.user.language.$model"
                 :set-language="val => v$.user.language.$model = val"
+                @click.stop.prevent
               />
             </div>
 
-- 
cgit v1.2.3-70-g09d2


From 2316bcc842052a1b656acd00c1a270913741228f Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Sat, 18 Feb 2023 13:40:42 -0500
Subject: Fix poll interaction

---
 src/components/poll/poll.js  |  3 +-
 src/components/poll/poll.vue | 92 +++++++++++++++++++++++++-------------------
 2 files changed, 55 insertions(+), 40 deletions(-)

(limited to 'src')

diff --git a/src/components/poll/poll.js b/src/components/poll/poll.js
index eda1733a..e4d6869a 100644
--- a/src/components/poll/poll.js
+++ b/src/components/poll/poll.js
@@ -12,7 +12,8 @@ export default {
   data () {
     return {
       loading: false,
-      choices: []
+      choices: [],
+      randomSeed: `${Math.random()}`.replace('.', '-')
     }
   },
   created () {
diff --git a/src/components/poll/poll.vue b/src/components/poll/poll.vue
index cacc3298..b3a74c49 100644
--- a/src/components/poll/poll.vue
+++ b/src/components/poll/poll.vue
@@ -4,53 +4,63 @@
     :class="containerClass"
   >
     <div
-      v-for="(option, index) in options"
-      :key="index"
-      class="poll-option"
+      :role="showResults ? 'section' : (poll.multiple ? 'group' : 'radiogroup')"
     >
       <div
-        v-if="showResults"
-        :title="resultTitle(option)"
-        class="option-result"
+        v-for="(option, index) in options"
+        :key="index"
+        class="poll-option"
       >
-        <div class="option-result-label">
-          <span class="result-percentage">
-            {{ percentageForOption(option.votes_count) }}%
-          </span>
-          <RichContent
-            :html="option.title_html"
-            :handle-links="false"
-            :emoji="emoji"
+        <div
+          v-if="showResults"
+          :title="resultTitle(option)"
+          class="option-result"
+        >
+          <div class="option-result-label">
+            <span class="result-percentage">
+              {{ percentageForOption(option.votes_count) }}%
+            </span>
+            <RichContent
+              :html="option.title_html"
+              :handle-links="false"
+              :emoji="emoji"
+            />
+          </div>
+          <div
+            class="result-fill"
+            :style="{ 'width': `${percentageForOption(option.votes_count)}%` }"
           />
         </div>
         <div
-          class="result-fill"
-          :style="{ 'width': `${percentageForOption(option.votes_count)}%` }"
-        />
-      </div>
-      <div
-        v-else
-        @click="activateOption(index)"
-      >
-        <input
-          v-if="poll.multiple"
-          type="checkbox"
-          :disabled="loading"
-          :value="index"
-        >
-        <input
           v-else
-          type="radio"
-          :disabled="loading"
-          :value="index"
+          tabindex="0"
+          :role="poll.multiple ? 'checkbox' : 'radio'"
+          :aria-labelledby="`option-vote-${randomSeed}-${index}`"
+          :aria-checked="choices[index]"
+          @click="activateOption(index)"
         >
-        <label class="option-vote">
-          <RichContent
-            :html="option.title_html"
-            :handle-links="false"
-            :emoji="emoji"
-          />
-        </label>
+          <input
+            v-if="poll.multiple"
+            type="checkbox"
+            class="poll-checkbox"
+            :disabled="loading"
+            :value="index"
+          >
+          <input
+            v-else
+            type="radio"
+            :disabled="loading"
+            :value="index"
+          >
+          <label class="option-vote">
+            <RichContent
+              :id="`option-vote-${randomSeed}-${index}`"
+              :html="option.title_html"
+              :handle-links="false"
+              :emoji="emoji"
+            />
+          </label>
+        </div>
       </div>
     </div>
     <div class="footer faint">
@@ -161,5 +171,9 @@
     padding: 0 0.5em;
     margin-right: 0.5em;
   }
+
+  .poll-checkbox {
+    display: none;
+  }
 }
 </style>
-- 
cgit v1.2.3-70-g09d2


From 5468309f6aefbc61467338d2a96f29d6c416cc54 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Mon, 20 Feb 2023 23:49:34 -0500
Subject: Make it possible to auto-select the first candidate in autocomplete

---
 src/components/emoji_input/emoji_input.js          | 5 ++++-
 src/components/settings_modal/tabs/general_tab.vue | 8 ++++++++
 src/i18n/en.json                                   | 1 +
 src/modules/config.js                              | 3 ++-
 src/modules/instance.js                            | 1 +
 5 files changed, 16 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/components/emoji_input/emoji_input.js b/src/components/emoji_input/emoji_input.js
index 8a8d098d..68654f69 100644
--- a/src/components/emoji_input/emoji_input.js
+++ b/src/components/emoji_input/emoji_input.js
@@ -134,6 +134,9 @@ const EmojiInput = {
     padEmoji () {
       return this.$store.getters.mergedConfig.padEmoji
     },
+    defaultCandidateIndex () {
+      return this.$store.getters.mergedConfig.autocompleteSelect ? 0 : -1
+    },
     preText () {
       return this.modelValue.slice(0, this.caret)
     },
@@ -287,7 +290,7 @@ const EmojiInput = {
           ...rest,
           img: imageUrl || ''
         }))
-      this.highlighted = -1
+      this.highlighted = this.defaultCandidateIndex
       this.$refs.screenReaderNotice.announce(
         this.$tc('tool_tip.autocomplete_available',
           this.suggestions.length,
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index 703e94a0..65248ac1 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -501,6 +501,14 @@
             {{ $t('settings.pad_emoji') }}
           </BooleanSetting>
         </li>
+        <li>
+          <BooleanSetting
+            path="autocompleteSelect"
+            expert="1"
+          >
+            {{ $t('settings.autocomplete_select_first') }}
+          </BooleanSetting>
+        </li>
       </ul>
     </div>
   </div>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index dba8a13f..6c9bc8e2 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -465,6 +465,7 @@
     "domain_mutes": "Domains",
     "avatar_size_instruction": "The recommended minimum size for avatar images is 150x150 pixels.",
     "pad_emoji": "Pad emoji with spaces when adding from picker",
+    "autocomplete_select_first": "Automatically select the first candidate when autocomplete results are available",
     "emoji_reactions_on_timeline": "Show emoji reactions on timeline",
     "export_theme": "Save preset",
     "filtering": "Filtering",
diff --git a/src/modules/config.js b/src/modules/config.js
index eb33f95f..3d9cf591 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -115,7 +115,8 @@ export const defaultState = {
   conversationTreeAdvanced: undefined, // instance default
   conversationOtherRepliesButton: undefined, // instance default
   conversationTreeFadeAncestors: undefined, // instance default
-  maxDepthInThread: undefined // instance default
+  maxDepthInThread: undefined, // instance default
+  autocompleteSelect: undefined // instance default
 }
 
 // caching the instance default properties
diff --git a/src/modules/instance.js b/src/modules/instance.js
index 16f72583..938ca64d 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -104,6 +104,7 @@ const defaultState = {
   conversationOtherRepliesButton: 'below',
   conversationTreeFadeAncestors: false,
   maxDepthInThread: 6,
+  autocompleteSelect: false,
 
   // Nasty stuff
   customEmoji: [],
-- 
cgit v1.2.3-70-g09d2


From e516eee479cf6e943b6fc43d0a9d18793c141ba0 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Tue, 21 Feb 2023 00:39:16 -0500
Subject: Make block & mute lists able to load more

---
 src/components/list/list.vue                       |  6 +++-
 .../settings_modal/tabs/mutes_and_blocks_tab.js    |  7 ++--
 src/hocs/with_load_more/with_load_more.jsx         |  2 +-
 src/modules/users.js                               | 38 ++++++++++++++++++----
 src/services/api/api.service.js                    | 16 ++++++---
 5 files changed, 55 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/components/list/list.vue b/src/components/list/list.vue
index f17766b4..a3562c5d 100644
--- a/src/components/list/list.vue
+++ b/src/components/list/list.vue
@@ -1,9 +1,13 @@
 <template>
-  <div class="list">
+  <div
+    class="list"
+    role="list"
+  >
     <div
       v-for="item in items"
       :key="getKey(item)"
       class="list-item"
+      role="listitem"
     >
       <slot
         name="item"
diff --git a/src/components/settings_modal/tabs/mutes_and_blocks_tab.js b/src/components/settings_modal/tabs/mutes_and_blocks_tab.js
index 6cfeea35..51974f9f 100644
--- a/src/components/settings_modal/tabs/mutes_and_blocks_tab.js
+++ b/src/components/settings_modal/tabs/mutes_and_blocks_tab.js
@@ -9,17 +9,20 @@ import DomainMuteCard from 'src/components/domain_mute_card/domain_mute_card.vue
 import SelectableList from 'src/components/selectable_list/selectable_list.vue'
 import ProgressButton from 'src/components/progress_button/progress_button.vue'
 import withSubscription from 'src/components/../hocs/with_subscription/with_subscription'
+import withLoadMore from 'src/components/../hocs/with_load_more/with_load_more'
 import Checkbox from 'src/components/checkbox/checkbox.vue'
 
-const BlockList = withSubscription({
+const BlockList = withLoadMore({
   fetch: (props, $store) => $store.dispatch('fetchBlocks'),
   select: (props, $store) => get($store.state.users.currentUser, 'blockIds', []),
+  destroy: () => {},
   childPropName: 'items'
 })(SelectableList)
 
-const MuteList = withSubscription({
+const MuteList = withLoadMore({
   fetch: (props, $store) => $store.dispatch('fetchMutes'),
   select: (props, $store) => get($store.state.users.currentUser, 'muteIds', []),
+  destroy: () => {},
   childPropName: 'items'
 })(SelectableList)
 
diff --git a/src/hocs/with_load_more/with_load_more.jsx b/src/hocs/with_load_more/with_load_more.jsx
index c0ae1856..4e5bb50f 100644
--- a/src/hocs/with_load_more/with_load_more.jsx
+++ b/src/hocs/with_load_more/with_load_more.jsx
@@ -98,7 +98,7 @@ const withLoadMore = ({
               </button>
             }
             {!this.error && this.loading && <FAIcon spin icon="circle-notch"/>}
-            {!this.error && !this.loading && !this.bottomedOut && <a onClick={this.fetchEntries}>{this.$t('general.more')}</a>}
+            {!this.error && !this.loading && !this.bottomedOut && <a onClick={this.fetchEntries} role="button" tabindex="0">{this.$t('general.more')}</a>}
           </div>
         </div>
       )
diff --git a/src/modules/users.js b/src/modules/users.js
index a1316ba2..7b41fab6 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -195,9 +195,15 @@ export const mutations = {
       state.currentUser.blockIds.push(blockId)
     }
   },
+  setBlockIdsMaxId (state, blockIdsMaxId) {
+    state.currentUser.blockIdsMaxId = blockIdsMaxId
+  },
   saveMuteIds (state, muteIds) {
     state.currentUser.muteIds = muteIds
   },
+  setMuteIdsMaxId (state, muteIdsMaxId) {
+    state.currentUser.muteIdsMaxId = muteIdsMaxId
+  },
   addMuteId (state, muteId) {
     if (state.currentUser.muteIds.indexOf(muteId) === -1) {
       state.currentUser.muteIds.push(muteId)
@@ -320,10 +326,20 @@ const users = {
           .then((inLists) => store.commit('updateUserInLists', { id, inLists }))
       }
     },
-    fetchBlocks (store) {
-      return store.rootState.api.backendInteractor.fetchBlocks()
+    fetchBlocks (store, args) {
+      const { reset } = args || {}
+
+      const maxId = store.state.currentUser.blockIdsMaxId
+      return store.rootState.api.backendInteractor.fetchBlocks({ maxId })
         .then((blocks) => {
-          store.commit('saveBlockIds', map(blocks, 'id'))
+          if (reset) {
+            store.commit('saveBlockIds', map(blocks, 'id'))
+          } else {
+            map(blocks, 'id').map(id => store.commit('addBlockId', id))
+          }
+          if (blocks.length) {
+            store.commit('setBlockIdsMaxId', last(blocks).id)
+          }
           store.commit('addNewUsers', blocks)
           return blocks
         })
@@ -346,10 +362,20 @@ const users = {
     editUserNote (store, args) {
       return editUserNote(store, args)
     },
-    fetchMutes (store) {
-      return store.rootState.api.backendInteractor.fetchMutes()
+    fetchMutes (store, args) {
+      const { reset } = args || {}
+
+      const maxId = store.state.currentUser.muteIdsMaxId
+      return store.rootState.api.backendInteractor.fetchMutes({ maxId })
         .then((mutes) => {
-          store.commit('saveMuteIds', map(mutes, 'id'))
+          if (reset) {
+            store.commit('saveMuteIds', map(mutes, 'id'))
+          } else {
+            map(mutes, 'id').map(id => store.commit('addMuteId', id))
+          }
+          if (mutes.length) {
+            store.commit('setMuteIdsMaxId', last(mutes).id)
+          }
           store.commit('addNewUsers', mutes)
           return mutes
         })
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index b8c10b21..94bb0c54 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -1113,8 +1113,12 @@ const generateMfaBackupCodes = ({ credentials }) => {
   }).then((data) => data.json())
 }
 
-const fetchMutes = ({ credentials }) => {
-  return promisedRequest({ url: MASTODON_USER_MUTES_URL, credentials })
+const fetchMutes = ({ maxId, credentials }) => {
+  const query = new URLSearchParams({ with_relationships: true })
+  if (maxId) {
+    query.append('max_id', maxId)
+  }
+  return promisedRequest({ url: `${MASTODON_USER_MUTES_URL}?${query.toString()}`, credentials })
     .then((users) => users.map(parseUser))
 }
 
@@ -1138,8 +1142,12 @@ const unsubscribeUser = ({ id, credentials }) => {
   return promisedRequest({ url: MASTODON_UNSUBSCRIBE_USER(id), credentials, method: 'POST' })
 }
 
-const fetchBlocks = ({ credentials }) => {
-  return promisedRequest({ url: MASTODON_USER_BLOCKS_URL, credentials })
+const fetchBlocks = ({ maxId, credentials }) => {
+  const query = new URLSearchParams({ with_relationships: true })
+  if (maxId) {
+    query.append('max_id', maxId)
+  }
+  return promisedRequest({ url: `${MASTODON_USER_BLOCKS_URL}?${query.toString()}`, credentials })
     .then((users) => users.map(parseUser))
 }
 
-- 
cgit v1.2.3-70-g09d2


From 763ae182b8ec321647beef25e9d954abaf2303e7 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Tue, 28 Feb 2023 22:39:53 -0500
Subject: Remove @touchstart in post status button

---
 src/components/post_status_form/post_status_form.vue | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src')

diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 64a8887c..86c1f907 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -281,12 +281,10 @@
         >
           {{ $t('post_status.post') }}
         </button>
-        <!-- touchstart is used to keep the OSK at the same position after a message send -->
         <button
           v-else
           :disabled="uploadingFiles || disableSubmit"
           class="btn button-default"
-          @touchstart.stop.prevent="postStatus($event, newStatus)"
           @click.stop.prevent="postStatus($event, newStatus)"
         >
           {{ $t('post_status.post') }}
-- 
cgit v1.2.3-70-g09d2


From 1a852b96eff060c8eaab9477c85eb4a3bd91c748 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Thu, 2 Mar 2023 21:15:43 -0500
Subject: Give tab switcher a role

---
 src/components/tab_switcher/tab_switcher.jsx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/components/tab_switcher/tab_switcher.jsx b/src/components/tab_switcher/tab_switcher.jsx
index c8d390bc..a7ef8560 100644
--- a/src/components/tab_switcher/tab_switcher.jsx
+++ b/src/components/tab_switcher/tab_switcher.jsx
@@ -117,6 +117,7 @@ export default {
                 onClick={this.clickTab(index)}
                 class={classesTab.join(' ')}
                 type="button"
+                role="tab"
               >
                 <img src={props.image} title={props['image-tooltip']}/>
                 {props.label ? '' : props.label}
@@ -131,6 +132,7 @@ export default {
               onClick={this.clickTab(index)}
               class={classesTab.join(' ')}
               type="button"
+              role="tab"
             >
               {!props.icon ? '' : (<FAIcon class="tab-icon" size="2x" fixed-width icon={props.icon}/>)}
               <span class="text">
@@ -167,11 +169,15 @@ export default {
 
     return (
       <div class={'tab-switcher ' + (this.sideTabBar ? 'side-tabs' : 'top-tabs')}>
-        <div class="tabs">
+        <div
+          class="tabs"
+          role="tablist"
+        >
           {tabs}
         </div>
         <div
           ref="contents"
+          role="tabpanel"
           class={'contents' + (this.scrollableTabs ? ' scrollable-tabs' : '')}
           v-body-scroll-lock={this.bodyScrollLock}
         >
-- 
cgit v1.2.3-70-g09d2


From 88db5571417a269df459b243dd96053bf8a9c852 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Thu, 2 Mar 2023 23:47:55 -0500
Subject: Make suggestor ignore users without valid names

Otherwise it might have undefined issues.
Resolves https://git.pleroma.social/pleroma/pleroma-fe/-/issues/1249
---
 src/components/emoji_input/suggestor.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/components/emoji_input/suggestor.js b/src/components/emoji_input/suggestor.js
index adaa879e..e746dcd7 100644
--- a/src/components/emoji_input/suggestor.js
+++ b/src/components/emoji_input/suggestor.js
@@ -94,8 +94,9 @@ export const suggestUsers = ({ dispatch, state }) => {
 
     const newSuggestions = state.users.users.filter(
       user =>
-        user.screen_name.toLowerCase().startsWith(noPrefix) ||
-        user.name.toLowerCase().startsWith(noPrefix)
+        user.screen_name && user.name && (
+          user.screen_name.toLowerCase().startsWith(noPrefix) ||
+            user.name.toLowerCase().startsWith(noPrefix))
     ).slice(0, 20).sort((a, b) => {
       let aScore = 0
       let bScore = 0
-- 
cgit v1.2.3-70-g09d2


From da46c30893a4ae5e3aaf2de2213e73281e87aaf2 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Fri, 3 Mar 2023 23:38:56 -0500
Subject: Fix display of theme checkboxes

---
 src/components/font_control/font_control.vue     | 5 ++++-
 src/components/range_input/range_input.vue       | 8 ++++++--
 src/components/shadow_control/shadow_control.vue | 3 ++-
 3 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/components/font_control/font_control.vue b/src/components/font_control/font_control.vue
index bb7e64bc..e2ba74d1 100644
--- a/src/components/font_control/font_control.vue
+++ b/src/components/font_control/font_control.vue
@@ -4,6 +4,7 @@
     :class="{ custom: isCustom }"
   >
     <label
+      :id="name + '-label'"
       :for="preset === 'custom' ? name : name + '-font-switcher'"
       class="label"
     >
@@ -12,7 +13,8 @@
     <input
       v-if="typeof fallback !== 'undefined'"
       :id="name + '-o'"
-      class="opt exlcude-disabled"
+      :aria-labelledby="name + '-label'"
+      class="opt exlcude-disabled visible-for-screenreader-only"
       type="checkbox"
       :checked="present"
       @change="$emit('update:modelValue', typeof modelValue === 'undefined' ? fallback : undefined)"
@@ -21,6 +23,7 @@
       v-if="typeof fallback !== 'undefined'"
       class="opt-l"
       :for="name + '-o'"
+      :aria-hidden="true"
     />
     {{ ' ' }}
     <Select
diff --git a/src/components/range_input/range_input.vue b/src/components/range_input/range_input.vue
index 1e7e42d5..1e720105 100644
--- a/src/components/range_input/range_input.vue
+++ b/src/components/range_input/range_input.vue
@@ -4,6 +4,7 @@
     :class="{ disabled: !present || disabled }"
   >
     <label
+      :id="name + '-label'"
       :for="name"
       class="label"
     >
@@ -12,7 +13,8 @@
     <input
       v-if="typeof fallback !== 'undefined'"
       :id="name + '-o'"
-      class="opt"
+      :aria-labelledby="name + '-label'"
+      class="opt visible-for-screenreader-only"
       type="checkbox"
       :checked="present"
       @change="$emit('update:modelValue', !present ? fallback : undefined)"
@@ -21,6 +23,7 @@
       v-if="typeof fallback !== 'undefined'"
       class="opt-l"
       :for="name + '-o'"
+      :aria-hidden="true"
     />
     <input
       :id="name"
@@ -34,9 +37,10 @@
       @input="$emit('update:modelValue', $event.target.value)"
     >
     <input
-      :id="name"
+      :id="name + '-numeric'"
       class="input-number"
       type="number"
+      :aria-labelledby="name + '-label'"
       :value="modelValue || fallback"
       :disabled="!present || disabled"
       :max="hardMax"
diff --git a/src/components/shadow_control/shadow_control.vue b/src/components/shadow_control/shadow_control.vue
index 7546535d..1f3c26aa 100644
--- a/src/components/shadow_control/shadow_control.vue
+++ b/src/components/shadow_control/shadow_control.vue
@@ -129,12 +129,13 @@
           v-model="selected.inset"
           :disabled="!present"
           name="inset"
-          class="input-inset"
+          class="input-inset visible-for-screenreader-only"
           type="checkbox"
         >
         <label
           class="checkbox-label"
           for="inset"
+          :aria-hidden="true"
         />
       </div>
       <div
-- 
cgit v1.2.3-70-g09d2


From af0cd5422304d7b2111739d85c279b3fa175a853 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Sun, 12 Mar 2023 14:32:13 +0200
Subject: serverSideConfig renamed into profileSettingConfig to avoid confusion
 with serverSideStorage, reduced overall need for SharedComputedObject in
 settings tabs, moved copypaste code of "setting" type of helpers into a
 separate file.

---
 .../settings_modal/helpers/boolean_setting.js      |  53 +-------
 .../settings_modal/helpers/boolean_setting.vue     |   4 +-
 .../settings_modal/helpers/choice_setting.js       |  51 ++------
 .../settings_modal/helpers/choice_setting.vue      |   2 +-
 .../settings_modal/helpers/integer_setting.js      |  39 +-----
 .../helpers/profile_setting_indicator.vue          |  51 ++++++++
 .../helpers/server_side_indicator.vue              |  51 --------
 src/components/settings_modal/helpers/setting.js   |  84 +++++++++++++
 .../helpers/shared_computed_object.js              |  18 ---
 .../settings_modal/helpers/size_setting.js         |  48 ++-----
 .../settings_modal/tabs/filtering_tab.vue          |  14 +--
 src/components/settings_modal/tabs/general_tab.js  |   6 +-
 src/components/settings_modal/tabs/general_tab.vue |  29 ++---
 .../settings_modal/tabs/notifications_tab.vue      |   4 +-
 src/components/settings_modal/tabs/profile_tab.vue |  32 +++--
 src/main.js                                        |   4 +-
 src/modules/config.js                              |   3 +-
 src/modules/profileConfig.js                       | 140 +++++++++++++++++++++
 src/modules/serverSideConfig.js                    | 140 ---------------------
 19 files changed, 351 insertions(+), 422 deletions(-)
 create mode 100644 src/components/settings_modal/helpers/profile_setting_indicator.vue
 delete mode 100644 src/components/settings_modal/helpers/server_side_indicator.vue
 create mode 100644 src/components/settings_modal/helpers/setting.js
 create mode 100644 src/modules/profileConfig.js
 delete mode 100644 src/modules/serverSideConfig.js

(limited to 'src')

diff --git a/src/components/settings_modal/helpers/boolean_setting.js b/src/components/settings_modal/helpers/boolean_setting.js
index 2e6992cb..078cc5ff 100644
--- a/src/components/settings_modal/helpers/boolean_setting.js
+++ b/src/components/settings_modal/helpers/boolean_setting.js
@@ -1,56 +1,13 @@
-import { get, set } from 'lodash'
 import Checkbox from 'src/components/checkbox/checkbox.vue'
 import ModifiedIndicator from './modified_indicator.vue'
-import ServerSideIndicator from './server_side_indicator.vue'
+import ProfileSettingIndicator from './profile_setting_indicator.vue'
+import Setting from './setting.js'
+
 export default {
   components: {
     Checkbox,
     ModifiedIndicator,
-    ServerSideIndicator
+    ProfileSettingIndicator
   },
-  props: [
-    'path',
-    'disabled',
-    'expert'
-  ],
-  computed: {
-    pathDefault () {
-      const [firstSegment, ...rest] = this.path.split('.')
-      return [firstSegment + 'DefaultValue', ...rest].join('.')
-    },
-    state () {
-      const value = get(this.$parent, this.path)
-      if (value === undefined) {
-        return this.defaultState
-      } else {
-        return value
-      }
-    },
-    defaultState () {
-      return get(this.$parent, this.pathDefault)
-    },
-    isServerSide () {
-      return this.path.startsWith('serverSide_')
-    },
-    isChanged () {
-      return !this.path.startsWith('serverSide_') && this.state !== this.defaultState
-    },
-    matchesExpertLevel () {
-      return (this.expert || 0) <= this.$parent.expertLevel
-    }
-  },
-  methods: {
-    update (e) {
-      const [firstSegment, ...rest] = this.path.split('.')
-      set(this.$parent, this.path, e)
-      // Updating nested properties does not trigger update on its parent.
-      // probably still not as reliable, but works for depth=1 at least
-      if (rest.length > 0) {
-        set(this.$parent, firstSegment, { ...get(this.$parent, firstSegment) })
-      }
-    },
-    reset () {
-      set(this.$parent, this.path, this.defaultState)
-    }
-  }
+  ...Setting
 }
diff --git a/src/components/settings_modal/helpers/boolean_setting.vue b/src/components/settings_modal/helpers/boolean_setting.vue
index 41142966..bc014bc9 100644
--- a/src/components/settings_modal/helpers/boolean_setting.vue
+++ b/src/components/settings_modal/helpers/boolean_setting.vue
@@ -5,7 +5,7 @@
   >
     <Checkbox
       :model-value="state"
-      :disabled="disabled"
+      :disabled="shouldBeDisabled"
       @update:modelValue="update"
     >
       <span
@@ -19,7 +19,7 @@
         :changed="isChanged"
         :onclick="reset"
       />
-      <ServerSideIndicator :server-side="isServerSide" />
+      <ProfileSettingIndicator :is-profile="isProfileTied" />
     </Checkbox>
   </label>
 </template>
diff --git a/src/components/settings_modal/helpers/choice_setting.js b/src/components/settings_modal/helpers/choice_setting.js
index 3da559fe..8aa5f54b 100644
--- a/src/components/settings_modal/helpers/choice_setting.js
+++ b/src/components/settings_modal/helpers/choice_setting.js
@@ -1,51 +1,20 @@
-import { get, set } from 'lodash'
 import Select from 'src/components/select/select.vue'
 import ModifiedIndicator from './modified_indicator.vue'
-import ServerSideIndicator from './server_side_indicator.vue'
+import ProfileSettingIndicator from './profile_setting_indicator.vue'
+import Setting from './setting.js'
+
 export default {
   components: {
     Select,
     ModifiedIndicator,
-    ServerSideIndicator
+    ProfileSettingIndicator
   },
-  props: [
-    'path',
-    'disabled',
-    'options',
-    'expert'
-  ],
-  computed: {
-    pathDefault () {
-      const [firstSegment, ...rest] = this.path.split('.')
-      return [firstSegment + 'DefaultValue', ...rest].join('.')
-    },
-    state () {
-      const value = get(this.$parent, this.path)
-      if (value === undefined) {
-        return this.defaultState
-      } else {
-        return value
-      }
-    },
-    defaultState () {
-      return get(this.$parent, this.pathDefault)
-    },
-    isServerSide () {
-      return this.path.startsWith('serverSide_')
-    },
-    isChanged () {
-      return !this.path.startsWith('serverSide_') && this.state !== this.defaultState
-    },
-    matchesExpertLevel () {
-      return (this.expert || 0) <= this.$parent.expertLevel
-    }
-  },
-  methods: {
-    update (e) {
-      set(this.$parent, this.path, e)
-    },
-    reset () {
-      set(this.$parent, this.path, this.defaultState)
+  ...Setting,
+  props: {
+    ...Setting.props,
+    options: {
+      type: Array,
+      required: true
     }
   }
 }
diff --git a/src/components/settings_modal/helpers/choice_setting.vue b/src/components/settings_modal/helpers/choice_setting.vue
index 8fdbb5d3..4c4cdefe 100644
--- a/src/components/settings_modal/helpers/choice_setting.vue
+++ b/src/components/settings_modal/helpers/choice_setting.vue
@@ -23,7 +23,7 @@
       :changed="isChanged"
       :onclick="reset"
     />
-    <ServerSideIndicator :server-side="isServerSide" />
+    <ProfileSettingIndicator :is-profile="isProfileSetting" />
   </label>
 </template>
 
diff --git a/src/components/settings_modal/helpers/integer_setting.js b/src/components/settings_modal/helpers/integer_setting.js
index e64d0cee..0f29f11a 100644
--- a/src/components/settings_modal/helpers/integer_setting.js
+++ b/src/components/settings_modal/helpers/integer_setting.js
@@ -1,44 +1,15 @@
-import { get, set } from 'lodash'
 import ModifiedIndicator from './modified_indicator.vue'
+import Setting from './setting.js'
+
 export default {
   components: {
     ModifiedIndicator
   },
-  props: {
-    path: String,
-    disabled: Boolean,
-    min: Number,
-    expert: [Number, String]
-  },
-  computed: {
-    pathDefault () {
-      const [firstSegment, ...rest] = this.path.split('.')
-      return [firstSegment + 'DefaultValue', ...rest].join('.')
-    },
-    state () {
-      const value = get(this.$parent, this.path)
-      if (value === undefined) {
-        return this.defaultState
-      } else {
-        return value
-      }
-    },
-    defaultState () {
-      return get(this.$parent, this.pathDefault)
-    },
-    isChanged () {
-      return this.state !== this.defaultState
-    },
-    matchesExpertLevel () {
-      return (this.expert || 0) <= this.$parent.expertLevel
-    }
-  },
+  ...Setting,
   methods: {
+    ...Setting.methods,
     update (e) {
-      set(this.$parent, this.path, parseInt(e.target.value))
-    },
-    reset () {
-      set(this.$parent, this.path, this.defaultState)
+      this.configSink(this.path, parseInt(e.target.value))
     }
   }
 }
diff --git a/src/components/settings_modal/helpers/profile_setting_indicator.vue b/src/components/settings_modal/helpers/profile_setting_indicator.vue
new file mode 100644
index 00000000..d160781b
--- /dev/null
+++ b/src/components/settings_modal/helpers/profile_setting_indicator.vue
@@ -0,0 +1,51 @@
+<template>
+  <span
+    v-if="isProfile"
+    class="ProfileSettingIndicator"
+  >
+    <Popover
+      trigger="hover"
+    >
+      <template #trigger>
+        &nbsp;
+        <FAIcon
+          icon="server"
+          :aria-label="$t('settings.setting_server_side')"
+        />
+      </template>
+      <template #content>
+        <div class="profilesetting-tooltip">
+          {{ $t('settings.setting_server_side') }}
+        </div>
+      </template>
+    </Popover>
+  </span>
+</template>
+
+<script>
+import Popover from 'src/components/popover/popover.vue'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import { faServer } from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faServer
+)
+
+export default {
+  components: { Popover },
+  props: ['isProfile']
+}
+</script>
+
+<style lang="scss">
+.ProfileSettingIndicator {
+  display: inline-block;
+  position: relative;
+}
+
+.profilesetting-tooltip {
+  margin: 0.5em 1em;
+  min-width: 10em;
+  text-align: center;
+}
+</style>
diff --git a/src/components/settings_modal/helpers/server_side_indicator.vue b/src/components/settings_modal/helpers/server_side_indicator.vue
deleted file mode 100644
index bf181959..00000000
--- a/src/components/settings_modal/helpers/server_side_indicator.vue
+++ /dev/null
@@ -1,51 +0,0 @@
-<template>
-  <span
-    v-if="serverSide"
-    class="ServerSideIndicator"
-  >
-    <Popover
-      trigger="hover"
-    >
-      <template #trigger>
-        &nbsp;
-        <FAIcon
-          icon="server"
-          :aria-label="$t('settings.setting_server_side')"
-        />
-      </template>
-      <template #content>
-        <div class="serverside-tooltip">
-          {{ $t('settings.setting_server_side') }}
-        </div>
-      </template>
-    </Popover>
-  </span>
-</template>
-
-<script>
-import Popover from 'src/components/popover/popover.vue'
-import { library } from '@fortawesome/fontawesome-svg-core'
-import { faServer } from '@fortawesome/free-solid-svg-icons'
-
-library.add(
-  faServer
-)
-
-export default {
-  components: { Popover },
-  props: ['serverSide']
-}
-</script>
-
-<style lang="scss">
-.ServerSideIndicator {
-  display: inline-block;
-  position: relative;
-}
-
-.serverside-tooltip {
-  margin: 0.5em 1em;
-  min-width: 10em;
-  text-align: center;
-}
-</style>
diff --git a/src/components/settings_modal/helpers/setting.js b/src/components/settings_modal/helpers/setting.js
new file mode 100644
index 00000000..dc37675c
--- /dev/null
+++ b/src/components/settings_modal/helpers/setting.js
@@ -0,0 +1,84 @@
+import { get, set } from 'lodash'
+export default {
+  props: {
+    path: {
+      type: String,
+      required: true
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    parentPath: {
+      type: String
+    },
+    parentInvert: {
+      type: Boolean,
+      default: false
+    },
+    expert: {
+      type: [Number, String],
+      default: 0
+    },
+    source: {
+      type: String,
+      default: 'default'
+    }
+  },
+  computed: {
+    state () {
+      const value = get(this.configSource, this.path)
+      if (value === undefined) {
+        return this.defaultState
+      } else {
+        return value
+      }
+    },
+    shouldBeDisabled () {
+      const parentValue = this.parentPath !== undefined ? get(this.configSource, this.parentPath) : null
+      return this.disabled || (parentValue !== null ? (this.parentInvert ? parentValue : !parentValue) : false)
+    },
+    configSource () {
+      switch (this.source) {
+        case 'profile':
+          return this.$store.state.profileConfig
+        default:
+          return this.$store.getters.mergedConfig
+      }
+    },
+    configSink () {
+      switch (this.source) {
+        case 'profile':
+          return (k, v) => this.$store.dispatch('setProfileOption', { name: k, value: v })
+        default:
+          return (k, v) => this.$store.dispatch('setOption', { name: k, value: v })
+      }
+    },
+    defaultState () {
+      switch (this.source) {
+        case 'profile':
+          return {}
+        default:
+          return get(this.$store.getters.defaultConfig, this.path)
+      }
+    },
+    isProfileTied () {
+      return this.source === 'profile'
+    },
+    isChanged () {
+      return !this.source === 'default' && this.state !== this.defaultState
+    },
+    matchesExpertLevel () {
+      return (this.expert || 0) <= this.$store.state.config.expertLevel > 0
+    }
+  },
+  methods: {
+    update (e) {
+      console.log('U', this.path, e)
+      this.configSink(this.path, e)
+    },
+    reset () {
+      set(this.$store.getters.mergedConfig, this.path, this.defaultState)
+    }
+  }
+}
diff --git a/src/components/settings_modal/helpers/shared_computed_object.js b/src/components/settings_modal/helpers/shared_computed_object.js
index 12431dca..6b22174d 100644
--- a/src/components/settings_modal/helpers/shared_computed_object.js
+++ b/src/components/settings_modal/helpers/shared_computed_object.js
@@ -1,19 +1,9 @@
 import { defaultState as configDefaultState } from 'src/modules/config.js'
-import { defaultState as serverSideConfigDefaultState } from 'src/modules/serverSideConfig.js'
 
 const SharedComputedObject = () => ({
   user () {
     return this.$store.state.users.currentUser
   },
-  // Getting values for default properties
-  ...Object.keys(configDefaultState)
-    .map(key => [
-      key + 'DefaultValue',
-      function () {
-        return this.$store.getters.defaultConfig[key]
-      }
-    ])
-    .reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {}),
   // Generating computed values for vuex properties
   ...Object.keys(configDefaultState)
     .map(key => [key, {
@@ -23,14 +13,6 @@ const SharedComputedObject = () => ({
       }
     }])
     .reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {}),
-  ...Object.keys(serverSideConfigDefaultState)
-    .map(key => ['serverSide_' + key, {
-      get () { return this.$store.state.serverSideConfig[key] },
-      set (value) {
-        this.$store.dispatch('setServerSideOption', { name: key, value })
-      }
-    }])
-    .reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {}),
   // Special cases (need to transform values or perform actions first)
   useStreamingApi: {
     get () { return this.$store.getters.mergedConfig.useStreamingApi },
diff --git a/src/components/settings_modal/helpers/size_setting.js b/src/components/settings_modal/helpers/size_setting.js
index 58697412..4a0f7e48 100644
--- a/src/components/settings_modal/helpers/size_setting.js
+++ b/src/components/settings_modal/helpers/size_setting.js
@@ -1,6 +1,6 @@
-import { get, set } from 'lodash'
 import ModifiedIndicator from './modified_indicator.vue'
 import Select from 'src/components/select/select.vue'
+import Setting from './setting.js'
 
 export const allCssUnits = ['cm', 'mm', 'in', 'px', 'pt', 'pc', 'em', 'ex', 'ch', 'rem', 'vw', 'vh', 'vmin', 'vmax', '%']
 export const defaultHorizontalUnits = ['px', 'rem', 'vw']
@@ -11,57 +11,31 @@ export default {
     ModifiedIndicator,
     Select
   },
+  ...Setting,
   props: {
-    path: String,
-    disabled: Boolean,
+    ...Setting.props,
     min: Number,
     units: {
-      type: [String],
+      type: Array,
       default: () => allCssUnits
-    },
-    expert: [Number, String]
+    }
   },
   computed: {
-    pathDefault () {
-      const [firstSegment, ...rest] = this.path.split('.')
-      return [firstSegment + 'DefaultValue', ...rest].join('.')
-    },
+    ...Setting.computed,
     stateUnit () {
-      return (this.state || '').replace(/\d+/, '')
+      return this.state.replace(/\d+/, '')
     },
     stateValue () {
-      return (this.state || '').replace(/\D+/, '')
-    },
-    state () {
-      const value = get(this.$parent, this.path)
-      if (value === undefined) {
-        return this.defaultState
-      } else {
-        return value
-      }
-    },
-    defaultState () {
-      return get(this.$parent, this.pathDefault)
-    },
-    isChanged () {
-      return this.state !== this.defaultState
-    },
-    matchesExpertLevel () {
-      return (this.expert || 0) <= this.$parent.expertLevel
+      return this.state.replace(/\D+/, '')
     }
   },
   methods: {
-    update (e) {
-      set(this.$parent, this.path, e)
-    },
-    reset () {
-      set(this.$parent, this.path, this.defaultState)
-    },
+    ...Setting.methods,
     updateValue (e) {
-      set(this.$parent, this.path, parseInt(e.target.value) + this.stateUnit)
+      this.configSink(this.path, parseInt(e.target.value) + this.stateUnit)
     },
     updateUnit (e) {
-      set(this.$parent, this.path, this.stateValue + e.target.value)
+      this.configSink(this.path, this.stateValue + e.target.value)
     }
   }
 }
diff --git a/src/components/settings_modal/tabs/filtering_tab.vue b/src/components/settings_modal/tabs/filtering_tab.vue
index 97046ff0..46c6bc5c 100644
--- a/src/components/settings_modal/tabs/filtering_tab.vue
+++ b/src/components/settings_modal/tabs/filtering_tab.vue
@@ -7,13 +7,11 @@
           <BooleanSetting path="hideFilteredStatuses">
             {{ $t('settings.hide_filtered_statuses') }}
           </BooleanSetting>
-          <ul
-            class="setting-list suboptions"
-            :class="[{disabled: !streaming}]"
-          >
+          <ul class="setting-list suboptions">
             <li>
               <BooleanSetting
-                :disabled="hideFilteredStatuses"
+                parentPath="hideFilteredStatuses"
+                :parentInvert="true"
                 path="hideWordFilteredPosts"
               >
                 {{ $t('settings.hide_wordfiltered_statuses') }}
@@ -22,7 +20,8 @@
             <li>
               <BooleanSetting
                 v-if="user"
-                :disabled="hideFilteredStatuses"
+                parentPath="hideFilteredStatuses"
+                :parentInvert="true"
                 path="hideMutedThreads"
               >
                 {{ $t('settings.hide_muted_threads') }}
@@ -31,7 +30,8 @@
             <li>
               <BooleanSetting
                 v-if="user"
-                :disabled="hideFilteredStatuses"
+                parentPath="hideFilteredStatuses"
+                :parentInvert="true"
                 path="hideMutedPosts"
               >
                 {{ $t('settings.hide_muted_posts') }}
diff --git a/src/components/settings_modal/tabs/general_tab.js b/src/components/settings_modal/tabs/general_tab.js
index ea24d6ad..e8f7016e 100644
--- a/src/components/settings_modal/tabs/general_tab.js
+++ b/src/components/settings_modal/tabs/general_tab.js
@@ -6,7 +6,7 @@ import SizeSetting, { defaultHorizontalUnits } from '../helpers/size_setting.vue
 import InterfaceLanguageSwitcher from 'src/components/interface_language_switcher/interface_language_switcher.vue'
 
 import SharedComputedObject from '../helpers/shared_computed_object.js'
-import ServerSideIndicator from '../helpers/server_side_indicator.vue'
+import ProfileSettingIndicator from '../helpers/profile_setting_indicator.vue'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faGlobe
@@ -65,7 +65,7 @@ const GeneralTab = {
     SizeSetting,
     InterfaceLanguageSwitcher,
     ScopeSelector,
-    ServerSideIndicator
+    ProfileSettingIndicator
   },
   computed: {
     horizontalUnits () {
@@ -108,7 +108,7 @@ const GeneralTab = {
   },
   methods: {
     changeDefaultScope (value) {
-      this.$store.dispatch('setServerSideOption', { name: 'defaultScope', value })
+      this.$store.dispatch('setProfileOption', { name: 'defaultScope', value })
     }
   }
 }
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index 65248ac1..0eb3d06c 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -29,14 +29,11 @@
           <BooleanSetting path="streaming">
             {{ $t('settings.streaming') }}
           </BooleanSetting>
-          <ul
-            class="setting-list suboptions"
-            :class="[{disabled: !streaming}]"
-          >
+          <ul class="setting-list suboptions">
             <li>
               <BooleanSetting
                 path="pauseOnUnfocused"
-                :disabled="!streaming"
+                parentPath="streaming"
               >
                 {{ $t('settings.pause_on_unfocused') }}
               </BooleanSetting>
@@ -265,7 +262,7 @@
         <li>
           <BooleanSetting
             v-if="user"
-            path="serverSide_stripRichContent"
+            source="profile" path="stripRichContent"
             expert="1"
           >
             {{ $t('settings.no_rich_text_description') }}
@@ -290,7 +287,7 @@
             <BooleanSetting
               path="preloadImage"
               expert="1"
-              :disabled="!hideNsfw"
+              parentPath="hideNsfw"
             >
               {{ $t('settings.preload_images') }}
             </BooleanSetting>
@@ -299,7 +296,7 @@
             <BooleanSetting
               path="useOneClickNsfw"
               expert="1"
-              :disabled="!hideNsfw"
+              parentPath="hideNsfw"
             >
               {{ $t('settings.use_one_click_nsfw') }}
             </BooleanSetting>
@@ -312,15 +309,13 @@
           >
             {{ $t('settings.loop_video') }}
           </BooleanSetting>
-          <ul
-            class="setting-list suboptions"
-            :class="[{disabled: !streaming}]"
-          >
+          <ul class="setting-list suboptions">
             <li>
               <BooleanSetting
                 path="loopVideoSilentOnly"
                 expert="1"
-                :disabled="!loopVideo || !loopSilentAvailable"
+                parentPath="loopVideo"
+                :disabled="!loopSilentAvailable"
               >
                 {{ $t('settings.loop_video_silent_only') }}
               </BooleanSetting>
@@ -418,18 +413,18 @@
       <ul class="setting-list">
         <li>
           <label for="default-vis">
-            {{ $t('settings.default_vis') }} <ServerSideIndicator :server-side="true" />
+            {{ $t('settings.default_vis') }} <ProfileSettingIndicator :is-profile="true" />
             <ScopeSelector
               class="scope-selector"
               :show-all="true"
-              :user-default="serverSide_defaultScope"
-              :initial-scope="serverSide_defaultScope"
+              :user-default="$store.state.profileConfig.defaultScope"
+              :initial-scope="$store.state.profileConfig.defaultScope"
               :on-scope-change="changeDefaultScope"
             />
           </label>
         </li>
         <li>
-          <!-- <BooleanSetting path="serverSide_defaultNSFW"> -->
+          <!-- <BooleanSetting source="profile" path="defaultNSFW"> -->
           <BooleanSetting path="sensitiveByDefault">
             {{ $t('settings.sensitive_by_default') }}
           </BooleanSetting>
diff --git a/src/components/settings_modal/tabs/notifications_tab.vue b/src/components/settings_modal/tabs/notifications_tab.vue
index dd3806ed..ea095372 100644
--- a/src/components/settings_modal/tabs/notifications_tab.vue
+++ b/src/components/settings_modal/tabs/notifications_tab.vue
@@ -4,7 +4,7 @@
       <h2>{{ $t('settings.notification_setting_filters') }}</h2>
       <ul class="setting-list">
         <li>
-          <BooleanSetting path="serverSide_blockNotificationsFromStrangers">
+          <BooleanSetting source="profile" path="blockNotificationsFromStrangers">
             {{ $t('settings.notification_setting_block_from_strangers') }}
           </BooleanSetting>
         </li>
@@ -67,7 +67,7 @@
         </li>
         <li>
           <BooleanSetting
-            path="serverSide_webPushHideContents"
+            source="profile" path="webPushHideContents"
             expert="1"
           >
             {{ $t('settings.notification_setting_hide_notification_contents') }}
diff --git a/src/components/settings_modal/tabs/profile_tab.vue b/src/components/settings_modal/tabs/profile_tab.vue
index 6a5b478a..74652990 100644
--- a/src/components/settings_modal/tabs/profile_tab.vue
+++ b/src/components/settings_modal/tabs/profile_tab.vue
@@ -254,37 +254,35 @@
       <h2>{{ $t('settings.account_privacy') }}</h2>
       <ul class="setting-list">
         <li>
-          <BooleanSetting path="serverSide_locked">
+          <BooleanSetting source="profile" path="locked">
             {{ $t('settings.lock_account_description') }}
           </BooleanSetting>
         </li>
         <li>
-          <BooleanSetting path="serverSide_discoverable">
+          <BooleanSetting source="profile" path="discoverable">
             {{ $t('settings.discoverable') }}
           </BooleanSetting>
         </li>
         <li>
-          <BooleanSetting path="serverSide_allowFollowingMove">
+          <BooleanSetting source="profile" path="allowFollowingMove">
             {{ $t('settings.allow_following_move') }}
           </BooleanSetting>
         </li>
         <li>
-          <BooleanSetting path="serverSide_hideFavorites">
+          <BooleanSetting source="profile" path="hideFavorites">
             {{ $t('settings.hide_favorites_description') }}
           </BooleanSetting>
         </li>
         <li>
-          <BooleanSetting path="serverSide_hideFollowers">
+          <BooleanSetting source="profile" path="hideFollowers">
             {{ $t('settings.hide_followers_description') }}
           </BooleanSetting>
-          <ul
-            class="setting-list suboptions"
-            :class="[{disabled: !serverSide_hideFollowers}]"
-          >
+          <ul class="setting-list suboptions">
             <li>
               <BooleanSetting
-                path="serverSide_hideFollowersCount"
-                :disabled="!serverSide_hideFollowers"
+                source="profile"
+                path="hideFollowersCount"
+                parentPath="hideFollowers"
               >
                 {{ $t('settings.hide_followers_count_description') }}
               </BooleanSetting>
@@ -292,17 +290,15 @@
           </ul>
         </li>
         <li>
-          <BooleanSetting path="serverSide_hideFollows">
+          <BooleanSetting source="profile" path="hideFollows">
             {{ $t('settings.hide_follows_description') }}
           </BooleanSetting>
-          <ul
-            class="setting-list suboptions"
-            :class="[{disabled: !serverSide_hideFollows}]"
-          >
+          <ul class="setting-list suboptions">
             <li>
               <BooleanSetting
-                path="serverSide_hideFollowsCount"
-                :disabled="!serverSide_hideFollows"
+                source="profile"
+                path="hideFollowsCount"
+                parentPath="hideFollows"
               >
                 {{ $t('settings.hide_follows_count_description') }}
               </BooleanSetting>
diff --git a/src/main.js b/src/main.js
index d3e60a0f..fd712113 100644
--- a/src/main.js
+++ b/src/main.js
@@ -10,7 +10,7 @@ import listsModule from './modules/lists.js'
 import usersModule from './modules/users.js'
 import apiModule from './modules/api.js'
 import configModule from './modules/config.js'
-import serverSideConfigModule from './modules/serverSideConfig.js'
+import profileConfigModule from './modules/profileConfig.js'
 import serverSideStorageModule from './modules/serverSideStorage.js'
 import shoutModule from './modules/shout.js'
 import oauthModule from './modules/oauth.js'
@@ -80,7 +80,7 @@ const persistedStateOptions = {
       lists: listsModule,
       api: apiModule,
       config: configModule,
-      serverSideConfig: serverSideConfigModule,
+      profileConfig: profileConfigModule,
       serverSideStorage: serverSideStorageModule,
       shout: shoutModule,
       oauth: oauthModule,
diff --git a/src/modules/config.js b/src/modules/config.js
index 3d9cf591..6ab59d6d 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -1,6 +1,7 @@
 import Cookies from 'js-cookie'
 import { setPreset, applyTheme, applyConfig } from '../services/style_setter/style_setter.js'
 import messages from '../i18n/messages'
+import { set } from 'lodash'
 import localeService from '../services/locale/locale.service.js'
 
 const BACKEND_LANGUAGE_COOKIE_NAME = 'userLanguage'
@@ -147,7 +148,7 @@ const config = {
   },
   mutations: {
     setOption (state, { name, value }) {
-      state[name] = value
+      set(state, name, value)
     },
     setHighlight (state, { user, color, type }) {
       const data = this.state.config.highlight[user]
diff --git a/src/modules/profileConfig.js b/src/modules/profileConfig.js
new file mode 100644
index 00000000..2cb2014a
--- /dev/null
+++ b/src/modules/profileConfig.js
@@ -0,0 +1,140 @@
+import { get, set } from 'lodash'
+
+const defaultApi = ({ rootState, commit }, { path, value }) => {
+  const params = {}
+  set(params, path, value)
+  return rootState
+    .api
+    .backendInteractor
+    .updateProfile({ params })
+    .then(result => {
+      commit('addNewUsers', [result])
+      commit('setCurrentUser', result)
+    })
+}
+
+const notificationsApi = ({ rootState, commit }, { path, value, oldValue }) => {
+  const settings = {}
+  set(settings, path, value)
+  return rootState
+    .api
+    .backendInteractor
+    .updateNotificationSettings({ settings })
+    .then(result => {
+      if (result.status === 'success') {
+        commit('confirmProfileOption', { name, value })
+      } else {
+        commit('confirmProfileOption', { name, value: oldValue })
+      }
+    })
+}
+
+/**
+ * Map that stores relation between path for reading (from user profile),
+ * for writing (into API) an what API to use.
+ *
+ * Shorthand - instead of { get, set, api? } object it's possible to use string
+ * in case default api is used and get = set
+ *
+ * If no api is specified, defaultApi is used (see above)
+ */
+export const settingsMap = {
+  defaultScope: 'source.privacy',
+  defaultNSFW: 'source.sensitive', // BROKEN: pleroma/pleroma#2837
+  stripRichContent: {
+    get: 'source.pleroma.no_rich_text',
+    set: 'no_rich_text'
+  },
+  // Privacy
+  locked: 'locked',
+  acceptChatMessages: {
+    get: 'pleroma.accepts_chat_messages',
+    set: 'accepts_chat_messages'
+  },
+  allowFollowingMove: {
+    get: 'pleroma.allow_following_move',
+    set: 'allow_following_move'
+  },
+  discoverable: {
+    get: 'source.pleroma.discoverable',
+    set: 'discoverable'
+  },
+  hideFavorites: {
+    get: 'pleroma.hide_favorites',
+    set: 'hide_favorites'
+  },
+  hideFollowers: {
+    get: 'pleroma.hide_followers',
+    set: 'hide_followers'
+  },
+  hideFollows: {
+    get: 'pleroma.hide_follows',
+    set: 'hide_follows'
+  },
+  hideFollowersCount: {
+    get: 'pleroma.hide_followers_count',
+    set: 'hide_followers_count'
+  },
+  hideFollowsCount: {
+    get: 'pleroma.hide_follows_count',
+    set: 'hide_follows_count'
+  },
+  // NotificationSettingsAPIs
+  webPushHideContents: {
+    get: 'pleroma.notification_settings.hide_notification_contents',
+    set: 'hide_notification_contents',
+    api: notificationsApi
+  },
+  blockNotificationsFromStrangers: {
+    get: 'pleroma.notification_settings.block_from_strangers',
+    set: 'block_from_strangers',
+    api: notificationsApi
+  }
+}
+
+export const defaultState = Object.fromEntries(Object.keys(settingsMap).map(key => [key, null]))
+
+const profileConfig = {
+  state: { ...defaultState },
+  mutations: {
+    confirmProfileOption (state, { name, value }) {
+      set(state, name, value)
+    },
+    wipeProfileOption (state, { name }) {
+      set(state, name, null)
+    },
+    wipeAllProfileOptions (state) {
+      Object.keys(settingsMap).forEach(key => {
+        set(state, key, null)
+      })
+    },
+    // Set the settings based on their path location
+    setCurrentUser (state, user) {
+      Object.entries(settingsMap).forEach((map) => {
+        const [name, value] = map
+        const { get: path = value } = value
+        set(state, name, get(user._original, path))
+      })
+    }
+  },
+  actions: {
+    setProfileOption ({ rootState, state, commit, dispatch }, { name, value }) {
+      const oldValue = get(state, name)
+      const map = settingsMap[name]
+      if (!map) throw new Error('Invalid server-side setting')
+      const { set: path = map, api = defaultApi } = map
+      commit('wipeProfileOption', { name })
+
+      api({ rootState, commit }, { path, value, oldValue })
+        .catch((e) => {
+          console.warn('Error setting server-side option:', e)
+          commit('confirmProfileOption', { name, value: oldValue })
+        })
+    },
+    logout ({ commit }) {
+      commit('wipeAllProfileOptions')
+    }
+  }
+}
+
+export default profileConfig
diff --git a/src/modules/serverSideConfig.js b/src/modules/serverSideConfig.js
deleted file mode 100644
index 476263bc..00000000
--- a/src/modules/serverSideConfig.js
+++ /dev/null
@@ -1,140 +0,0 @@
-import { get, set } from 'lodash'
-
-const defaultApi = ({ rootState, commit }, { path, value }) => {
-  const params = {}
-  set(params, path, value)
-  return rootState
-    .api
-    .backendInteractor
-    .updateProfile({ params })
-    .then(result => {
-      commit('addNewUsers', [result])
-      commit('setCurrentUser', result)
-    })
-}
-
-const notificationsApi = ({ rootState, commit }, { path, value, oldValue }) => {
-  const settings = {}
-  set(settings, path, value)
-  return rootState
-    .api
-    .backendInteractor
-    .updateNotificationSettings({ settings })
-    .then(result => {
-      if (result.status === 'success') {
-        commit('confirmServerSideOption', { name, value })
-      } else {
-        commit('confirmServerSideOption', { name, value: oldValue })
-      }
-    })
-}
-
-/**
- * Map that stores relation between path for reading (from user profile),
- * for writing (into API) an what API to use.
- *
- * Shorthand - instead of { get, set, api? } object it's possible to use string
- * in case default api is used and get = set
- *
- * If no api is specified, defaultApi is used (see above)
- */
-export const settingsMap = {
-  defaultScope: 'source.privacy',
-  defaultNSFW: 'source.sensitive', // BROKEN: pleroma/pleroma#2837
-  stripRichContent: {
-    get: 'source.pleroma.no_rich_text',
-    set: 'no_rich_text'
-  },
-  // Privacy
-  locked: 'locked',
-  acceptChatMessages: {
-    get: 'pleroma.accepts_chat_messages',
-    set: 'accepts_chat_messages'
-  },
-  allowFollowingMove: {
-    get: 'pleroma.allow_following_move',
-    set: 'allow_following_move'
-  },
-  discoverable: {
-    get: 'source.pleroma.discoverable',
-    set: 'discoverable'
-  },
-  hideFavorites: {
-    get: 'pleroma.hide_favorites',
-    set: 'hide_favorites'
-  },
-  hideFollowers: {
-    get: 'pleroma.hide_followers',
-    set: 'hide_followers'
-  },
-  hideFollows: {
-    get: 'pleroma.hide_follows',
-    set: 'hide_follows'
-  },
-  hideFollowersCount: {
-    get: 'pleroma.hide_followers_count',
-    set: 'hide_followers_count'
-  },
-  hideFollowsCount: {
-    get: 'pleroma.hide_follows_count',
-    set: 'hide_follows_count'
-  },
-  // NotificationSettingsAPIs
-  webPushHideContents: {
-    get: 'pleroma.notification_settings.hide_notification_contents',
-    set: 'hide_notification_contents',
-    api: notificationsApi
-  },
-  blockNotificationsFromStrangers: {
-    get: 'pleroma.notification_settings.block_from_strangers',
-    set: 'block_from_strangers',
-    api: notificationsApi
-  }
-}
-
-export const defaultState = Object.fromEntries(Object.keys(settingsMap).map(key => [key, null]))
-
-const serverSideConfig = {
-  state: { ...defaultState },
-  mutations: {
-    confirmServerSideOption (state, { name, value }) {
-      set(state, name, value)
-    },
-    wipeServerSideOption (state, { name }) {
-      set(state, name, null)
-    },
-    wipeAllServerSideOptions (state) {
-      Object.keys(settingsMap).forEach(key => {
-        set(state, key, null)
-      })
-    },
-    // Set the settings based on their path location
-    setCurrentUser (state, user) {
-      Object.entries(settingsMap).forEach((map) => {
-        const [name, value] = map
-        const { get: path = value } = value
-        set(state, name, get(user._original, path))
-      })
-    }
-  },
-  actions: {
-    setServerSideOption ({ rootState, state, commit, dispatch }, { name, value }) {
-      const oldValue = get(state, name)
-      const map = settingsMap[name]
-      if (!map) throw new Error('Invalid server-side setting')
-      const { set: path = map, api = defaultApi } = map
-      commit('wipeServerSideOption', { name })
-
-      api({ rootState, commit }, { path, value, oldValue })
-        .catch((e) => {
-          console.warn('Error setting server-side option:', e)
-          commit('confirmServerSideOption', { name, value: oldValue })
-        })
-    },
-    logout ({ commit }) {
-      commit('wipeAllServerSideOptions')
-    }
-  }
-}
-
-export default serverSideConfig
-- 
cgit v1.2.3-70-g09d2


From ac32997f8b17ba3f2209c992c27394c48a1594c7 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Sun, 12 Mar 2023 16:51:50 +0200
Subject: move websocket connection logic into module

---
 .../helpers/shared_computed_object.js              | 19 +-----
 src/modules/config.js                              | 70 ++++++++++++++--------
 2 files changed, 46 insertions(+), 43 deletions(-)

(limited to 'src')

diff --git a/src/components/settings_modal/helpers/shared_computed_object.js b/src/components/settings_modal/helpers/shared_computed_object.js
index 6b22174d..e898c8ac 100644
--- a/src/components/settings_modal/helpers/shared_computed_object.js
+++ b/src/components/settings_modal/helpers/shared_computed_object.js
@@ -12,24 +12,7 @@ const SharedComputedObject = () => ({
         this.$store.dispatch('setOption', { name: key, value })
       }
     }])
-    .reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {}),
-  // Special cases (need to transform values or perform actions first)
-  useStreamingApi: {
-    get () { return this.$store.getters.mergedConfig.useStreamingApi },
-    set (value) {
-      const promise = value
-        ? this.$store.dispatch('enableMastoSockets')
-        : this.$store.dispatch('disableMastoSockets')
-
-      promise.then(() => {
-        this.$store.dispatch('setOption', { name: 'useStreamingApi', value })
-      }).catch((e) => {
-        console.error('Failed starting MastoAPI Streaming socket', e)
-        this.$store.dispatch('disableMastoSockets')
-        this.$store.dispatch('setOption', { name: 'useStreamingApi', value: false })
-      })
-    }
-  }
+    .reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {})
 })
 
 export default SharedComputedObject
diff --git a/src/modules/config.js b/src/modules/config.js
index 6ab59d6d..5e3f0105 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -178,31 +178,51 @@ const config = {
       commit('setHighlight', { user, color, type })
     },
     setOption ({ commit, dispatch, state }, { name, value }) {
-      commit('setOption', { name, value })
-      switch (name) {
-        case 'theme':
-          setPreset(value)
-          break
-        case 'sidebarColumnWidth':
-        case 'contentColumnWidth':
-        case 'notifsColumnWidth':
-          applyConfig(state)
-          break
-        case 'customTheme':
-        case 'customThemeSource':
-          applyTheme(value)
-          break
-        case 'interfaceLanguage':
-          messages.setLanguage(this.getters.i18n, value)
-          dispatch('loadUnicodeEmojiData', value)
-          Cookies.set(
-            BACKEND_LANGUAGE_COOKIE_NAME,
-            localeService.internalToBackendLocaleMulti(value)
-          )
-          break
-        case 'thirdColumnMode':
-          dispatch('setLayoutWidth', undefined)
-          break
+      const exceptions = new Set([
+        'useStreamingApi'
+      ])
+
+      if (exceptions.has(name)) {
+        switch (name) {
+          case 'useStreamingApi': {
+            const action = value ? 'enableMastoSockets' : 'disableMastoSockets'
+
+            dispatch(action).then(() => {
+              commit('setOption', { name: 'useStreamingApi', value })
+            }).catch((e) => {
+              console.error('Failed starting MastoAPI Streaming socket', e)
+              dispatch('disableMastoSockets')
+              dispatch('setOption', { name: 'useStreamingApi', value: false })
+            })
+          }
+        }
+      } else {
+        commit('setOption', { name, value })
+        switch (name) {
+          case 'theme':
+            setPreset(value)
+            break
+          case 'sidebarColumnWidth':
+          case 'contentColumnWidth':
+          case 'notifsColumnWidth':
+            applyConfig(state)
+            break
+          case 'customTheme':
+          case 'customThemeSource':
+            applyTheme(value)
+            break
+          case 'interfaceLanguage':
+            messages.setLanguage(this.getters.i18n, value)
+            dispatch('loadUnicodeEmojiData', value)
+            Cookies.set(
+              BACKEND_LANGUAGE_COOKIE_NAME,
+              localeService.internalToBackendLocaleMulti(value)
+            )
+            break
+          case 'thirdColumnMode':
+            dispatch('setLayoutWidth', undefined)
+            break
+        }
       }
     }
   }
-- 
cgit v1.2.3-70-g09d2


From 947b73f8702ff4b7c5f74620204e86a4f375315c Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Sun, 12 Mar 2023 16:55:39 +0200
Subject: minimize the rest of the sharedcomputedobject

---
 .../settings_modal/helpers/shared_computed_object.js       | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/components/settings_modal/helpers/shared_computed_object.js b/src/components/settings_modal/helpers/shared_computed_object.js
index e898c8ac..b8a016e6 100644
--- a/src/components/settings_modal/helpers/shared_computed_object.js
+++ b/src/components/settings_modal/helpers/shared_computed_object.js
@@ -1,18 +1,10 @@
-import { defaultState as configDefaultState } from 'src/modules/config.js'
-
 const SharedComputedObject = () => ({
   user () {
     return this.$store.state.users.currentUser
   },
-  // Generating computed values for vuex properties
-  ...Object.keys(configDefaultState)
-    .map(key => [key, {
-      get () { return this.$store.getters.mergedConfig[key] },
-      set (value) {
-        this.$store.dispatch('setOption', { name: key, value })
-      }
-    }])
-    .reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {})
+  expertLevel () {
+    return this.$store.getters.mergedConfig.expertLevel > 0
+  }
 })
 
 export default SharedComputedObject
-- 
cgit v1.2.3-70-g09d2


From 6a7b182af11af6c50439c62bc5ee37cc5960810e Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Sun, 12 Mar 2023 17:11:20 +0200
Subject: fixes for stuff i missed

---
 .../settings_modal/helpers/boolean_setting.vue     |  2 +-
 src/components/settings_modal/helpers/setting.js   |  2 +-
 .../helpers/shared_computed_object.js              |  3 +++
 src/components/settings_modal/tabs/general_tab.vue |  2 +-
 .../tabs/security_tab/security_tab.vue             | 22 +++++++++++-----------
 5 files changed, 17 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/components/settings_modal/helpers/boolean_setting.vue b/src/components/settings_modal/helpers/boolean_setting.vue
index bc014bc9..260ee75e 100644
--- a/src/components/settings_modal/helpers/boolean_setting.vue
+++ b/src/components/settings_modal/helpers/boolean_setting.vue
@@ -19,7 +19,7 @@
         :changed="isChanged"
         :onclick="reset"
       />
-      <ProfileSettingIndicator :is-profile="isProfileTied" />
+      <ProfileSettingIndicator :is-profile="isProfileSetting" />
     </Checkbox>
   </label>
 </template>
diff --git a/src/components/settings_modal/helpers/setting.js b/src/components/settings_modal/helpers/setting.js
index dc37675c..a766e6dc 100644
--- a/src/components/settings_modal/helpers/setting.js
+++ b/src/components/settings_modal/helpers/setting.js
@@ -62,7 +62,7 @@ export default {
           return get(this.$store.getters.defaultConfig, this.path)
       }
     },
-    isProfileTied () {
+    isProfileSetting () {
       return this.source === 'profile'
     },
     isChanged () {
diff --git a/src/components/settings_modal/helpers/shared_computed_object.js b/src/components/settings_modal/helpers/shared_computed_object.js
index b8a016e6..912999ce 100644
--- a/src/components/settings_modal/helpers/shared_computed_object.js
+++ b/src/components/settings_modal/helpers/shared_computed_object.js
@@ -4,6 +4,9 @@ const SharedComputedObject = () => ({
   },
   expertLevel () {
     return this.$store.getters.mergedConfig.expertLevel > 0
+  },
+  mergedConfig () {
+    return this.$store.getters.mergedConfig
   }
 })
 
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index 0eb3d06c..eb2cef9b 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -210,7 +210,7 @@
           </ChoiceSetting>
         </li>
         <ul
-          v-if="conversationDisplay !== 'linear'"
+          v-if="mergedConfig.conversationDisplay !== 'linear'"
           class="setting-list suboptions"
         >
           <li>
diff --git a/src/components/settings_modal/tabs/security_tab/security_tab.vue b/src/components/settings_modal/tabs/security_tab/security_tab.vue
index 6e03bef4..d36d478f 100644
--- a/src/components/settings_modal/tabs/security_tab/security_tab.vue
+++ b/src/components/settings_modal/tabs/security_tab/security_tab.vue
@@ -143,8 +143,8 @@
         />
       </div>
       <div>
-        <i18n
-          path="settings.new_alias_target"
+        <i18n-t
+          keypath="settings.new_alias_target"
           tag="p"
         >
           <code
@@ -152,7 +152,7 @@
           >
             foo@example.org
           </code>
-        </i18n>
+        </i18n-t>
         <input
           v-model="addAliasTarget"
         >
@@ -175,16 +175,16 @@
       <h2>{{ $t('settings.move_account') }}</h2>
       <p>{{ $t('settings.move_account_notes') }}</p>
       <div>
-        <i18n
-          path="settings.move_account_target"
+        <i18n-t
+          keypath="settings.move_account_target"
           tag="p"
         >
-          <code
-            place="example"
-          >
-            foo@example.org
-          </code>
-        </i18n>
+          <template #example>
+            <code>
+              foo@example.org
+            </code>
+          </template>
+        </i18n-t>
         <input
           v-model="moveAccountTarget"
         >
-- 
cgit v1.2.3-70-g09d2


From 55ea6df40b7e2cfe2b1b5bde33204d4c03e54a12 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Sun, 12 Mar 2023 17:28:14 +0200
Subject: lint

---
 .../interface_language_switcher.vue                |  4 ++-
 .../settings_modal/tabs/filtering_tab.vue          | 12 ++++----
 src/components/settings_modal/tabs/general_tab.vue | 11 +++----
 .../settings_modal/tabs/notifications_tab.vue      |  8 +++--
 src/components/settings_modal/tabs/profile_tab.vue | 34 +++++++++++++++++-----
 5 files changed, 47 insertions(+), 22 deletions(-)

(limited to 'src')

diff --git a/src/components/interface_language_switcher/interface_language_switcher.vue b/src/components/interface_language_switcher/interface_language_switcher.vue
index a57e8761..364791a1 100644
--- a/src/components/interface_language_switcher/interface_language_switcher.vue
+++ b/src/components/interface_language_switcher/interface_language_switcher.vue
@@ -36,7 +36,9 @@
         <button
           class="button-default btn"
           @click="addLanguage"
-        >{{ $t('settings.add_language') }}</button>
+        >
+          {{ $t('settings.add_language') }}
+        </button>
       </li>
     </ul>
   </div>
diff --git a/src/components/settings_modal/tabs/filtering_tab.vue b/src/components/settings_modal/tabs/filtering_tab.vue
index 46c6bc5c..41d1b54f 100644
--- a/src/components/settings_modal/tabs/filtering_tab.vue
+++ b/src/components/settings_modal/tabs/filtering_tab.vue
@@ -10,8 +10,8 @@
           <ul class="setting-list suboptions">
             <li>
               <BooleanSetting
-                parentPath="hideFilteredStatuses"
-                :parentInvert="true"
+                parent-path="hideFilteredStatuses"
+                :parent-invert="true"
                 path="hideWordFilteredPosts"
               >
                 {{ $t('settings.hide_wordfiltered_statuses') }}
@@ -20,8 +20,8 @@
             <li>
               <BooleanSetting
                 v-if="user"
-                parentPath="hideFilteredStatuses"
-                :parentInvert="true"
+                parent-path="hideFilteredStatuses"
+                :parent-invert="true"
                 path="hideMutedThreads"
               >
                 {{ $t('settings.hide_muted_threads') }}
@@ -30,8 +30,8 @@
             <li>
               <BooleanSetting
                 v-if="user"
-                parentPath="hideFilteredStatuses"
-                :parentInvert="true"
+                parent-path="hideFilteredStatuses"
+                :parent-invert="true"
                 path="hideMutedPosts"
               >
                 {{ $t('settings.hide_muted_posts') }}
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index eb2cef9b..641d850a 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -33,7 +33,7 @@
             <li>
               <BooleanSetting
                 path="pauseOnUnfocused"
-                parentPath="streaming"
+                parent-path="streaming"
               >
                 {{ $t('settings.pause_on_unfocused') }}
               </BooleanSetting>
@@ -262,7 +262,8 @@
         <li>
           <BooleanSetting
             v-if="user"
-            source="profile" path="stripRichContent"
+            source="profile"
+            path="stripRichContent"
             expert="1"
           >
             {{ $t('settings.no_rich_text_description') }}
@@ -287,7 +288,7 @@
             <BooleanSetting
               path="preloadImage"
               expert="1"
-              parentPath="hideNsfw"
+              parent-path="hideNsfw"
             >
               {{ $t('settings.preload_images') }}
             </BooleanSetting>
@@ -296,7 +297,7 @@
             <BooleanSetting
               path="useOneClickNsfw"
               expert="1"
-              parentPath="hideNsfw"
+              parent-path="hideNsfw"
             >
               {{ $t('settings.use_one_click_nsfw') }}
             </BooleanSetting>
@@ -314,7 +315,7 @@
               <BooleanSetting
                 path="loopVideoSilentOnly"
                 expert="1"
-                parentPath="loopVideo"
+                parent-path="loopVideo"
                 :disabled="!loopSilentAvailable"
               >
                 {{ $t('settings.loop_video_silent_only') }}
diff --git a/src/components/settings_modal/tabs/notifications_tab.vue b/src/components/settings_modal/tabs/notifications_tab.vue
index ea095372..fcb92135 100644
--- a/src/components/settings_modal/tabs/notifications_tab.vue
+++ b/src/components/settings_modal/tabs/notifications_tab.vue
@@ -4,7 +4,10 @@
       <h2>{{ $t('settings.notification_setting_filters') }}</h2>
       <ul class="setting-list">
         <li>
-          <BooleanSetting source="profile" path="blockNotificationsFromStrangers">
+          <BooleanSetting
+            source="profile"
+            path="blockNotificationsFromStrangers"
+          >
             {{ $t('settings.notification_setting_block_from_strangers') }}
           </BooleanSetting>
         </li>
@@ -67,7 +70,8 @@
         </li>
         <li>
           <BooleanSetting
-            source="profile" path="webPushHideContents"
+            source="profile"
+            path="webPushHideContents"
             expert="1"
           >
             {{ $t('settings.notification_setting_hide_notification_contents') }}
diff --git a/src/components/settings_modal/tabs/profile_tab.vue b/src/components/settings_modal/tabs/profile_tab.vue
index 74652990..1cc850cb 100644
--- a/src/components/settings_modal/tabs/profile_tab.vue
+++ b/src/components/settings_modal/tabs/profile_tab.vue
@@ -254,27 +254,42 @@
       <h2>{{ $t('settings.account_privacy') }}</h2>
       <ul class="setting-list">
         <li>
-          <BooleanSetting source="profile" path="locked">
+          <BooleanSetting
+            source="profile"
+            path="locked"
+          >
             {{ $t('settings.lock_account_description') }}
           </BooleanSetting>
         </li>
         <li>
-          <BooleanSetting source="profile" path="discoverable">
+          <BooleanSetting
+            source="profile"
+            path="discoverable"
+          >
             {{ $t('settings.discoverable') }}
           </BooleanSetting>
         </li>
         <li>
-          <BooleanSetting source="profile" path="allowFollowingMove">
+          <BooleanSetting
+            source="profile"
+            path="allowFollowingMove"
+          >
             {{ $t('settings.allow_following_move') }}
           </BooleanSetting>
         </li>
         <li>
-          <BooleanSetting source="profile" path="hideFavorites">
+          <BooleanSetting
+            source="profile"
+            path="hideFavorites"
+          >
             {{ $t('settings.hide_favorites_description') }}
           </BooleanSetting>
         </li>
         <li>
-          <BooleanSetting source="profile" path="hideFollowers">
+          <BooleanSetting
+            source="profile"
+            path="hideFollowers"
+          >
             {{ $t('settings.hide_followers_description') }}
           </BooleanSetting>
           <ul class="setting-list suboptions">
@@ -282,7 +297,7 @@
               <BooleanSetting
                 source="profile"
                 path="hideFollowersCount"
-                parentPath="hideFollowers"
+                parent-path="hideFollowers"
               >
                 {{ $t('settings.hide_followers_count_description') }}
               </BooleanSetting>
@@ -290,7 +305,10 @@
           </ul>
         </li>
         <li>
-          <BooleanSetting source="profile" path="hideFollows">
+          <BooleanSetting
+            source="profile"
+            path="hideFollows"
+          >
             {{ $t('settings.hide_follows_description') }}
           </BooleanSetting>
           <ul class="setting-list suboptions">
@@ -298,7 +316,7 @@
               <BooleanSetting
                 source="profile"
                 path="hideFollowsCount"
-                parentPath="hideFollows"
+                parent-path="hideFollows"
               >
                 {{ $t('settings.hide_follows_count_description') }}
               </BooleanSetting>
-- 
cgit v1.2.3-70-g09d2


From 9632b77786a9d3735f04ecf4a814311fad926ad0 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 13 Mar 2023 00:09:47 +0200
Subject: initial implementation of an admin settings module

---
 src/main.js                     |  2 ++
 src/modules/adminSettings.js    | 48 +++++++++++++++++++++++++++++++++++++++++
 src/modules/users.js            | 39 ++++++++++++++++++---------------
 src/services/api/api.service.js | 21 +++++++++++++++++-
 4 files changed, 92 insertions(+), 18 deletions(-)
 create mode 100644 src/modules/adminSettings.js

(limited to 'src')

diff --git a/src/main.js b/src/main.js
index fd712113..71f19a82 100644
--- a/src/main.js
+++ b/src/main.js
@@ -12,6 +12,7 @@ import apiModule from './modules/api.js'
 import configModule from './modules/config.js'
 import profileConfigModule from './modules/profileConfig.js'
 import serverSideStorageModule from './modules/serverSideStorage.js'
+import adminSettingsModule from './modules/adminSettings.js'
 import shoutModule from './modules/shout.js'
 import oauthModule from './modules/oauth.js'
 import authFlowModule from './modules/auth_flow.js'
@@ -82,6 +83,7 @@ const persistedStateOptions = {
       config: configModule,
       profileConfig: profileConfigModule,
       serverSideStorage: serverSideStorageModule,
+      adminSettings: adminSettingsModule,
       shout: shoutModule,
       oauth: oauthModule,
       authFlow: authFlowModule,
diff --git a/src/modules/adminSettings.js b/src/modules/adminSettings.js
new file mode 100644
index 00000000..01e9a49e
--- /dev/null
+++ b/src/modules/adminSettings.js
@@ -0,0 +1,48 @@
+import { set, cloneDeep } from 'lodash'
+
+export const defaultState = {
+  needsReboot: null,
+  config: null,
+  modifiedPaths: null
+}
+
+export const newUserFlags = {
+  ...defaultState.flagStorage
+}
+
+const serverSideStorage = {
+  state: {
+    ...cloneDeep(defaultState)
+  },
+  mutations: {
+    updateAdminSettings (state, { config, modifiedPaths }) {
+      state.config = config
+      state.modifiedPaths = modifiedPaths
+    }
+  },
+  actions: {
+    setInstanceAdminSettings ({ state, commit, dispatch }, { backendDbConfig }) {
+      const config = {}
+      const modifiedPaths = new Set()
+      backendDbConfig.configs.forEach(c => {
+        const path = c.group + '.' + c.key
+        if (c.db) {
+          c.db.forEach(x => modifiedPaths.add(path + '.' + x))
+        }
+        const convert = (value) => {
+          if (Array.isArray(value) && value.length > 0 && value[0].tuple) {
+            return value.reduce((acc, c) => {
+              return { ...acc, [c.tuple[0]]: convert(c.tuple[1]) }
+            }, {})
+          } else {
+            return value
+          }
+        }
+        set(config, path, convert(c.value))
+      })
+      commit('updateAdminSettings', { config, modifiedPaths })
+    }
+  }
+}
+
+export default serverSideStorage
diff --git a/src/modules/users.js b/src/modules/users.js
index a1316ba2..74dbdffc 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -551,6 +551,7 @@ const users = {
     loginUser (store, accessToken) {
       return new Promise((resolve, reject) => {
         const commit = store.commit
+        const dispatch = store.dispatch
         commit('beginLogin')
         store.rootState.api.backendInteractor.verifyCredentials(accessToken)
           .then((data) => {
@@ -563,59 +564,63 @@ const users = {
               user.domainMutes = []
               commit('setCurrentUser', user)
               commit('setServerSideStorage', user)
+              if (user.rights.moderator || user.rights.admin) {
+                store.rootState.api.backendInteractor.fetchInstanceDBConfig()
+                  .then(backendDbConfig => dispatch('setInstanceAdminSettings', { backendDbConfig }))
+              }
               commit('addNewUsers', [user])
 
-              store.dispatch('fetchEmoji')
+              dispatch('fetchEmoji')
 
               getNotificationPermission()
                 .then(permission => commit('setNotificationPermission', permission))
 
               // Set our new backend interactor
               commit('setBackendInteractor', backendInteractorService(accessToken))
-              store.dispatch('pushServerSideStorage')
+              dispatch('pushServerSideStorage')
 
               if (user.token) {
-                store.dispatch('setWsToken', user.token)
+                dispatch('setWsToken', user.token)
 
                 // Initialize the shout socket.
-                store.dispatch('initializeSocket')
+                dispatch('initializeSocket')
               }
 
               const startPolling = () => {
                 // Start getting fresh posts.
-                store.dispatch('startFetchingTimeline', { timeline: 'friends' })
+                dispatch('startFetchingTimeline', { timeline: 'friends' })
 
                 // Start fetching notifications
-                store.dispatch('startFetchingNotifications')
+                dispatch('startFetchingNotifications')
 
                 // Start fetching chats
-                store.dispatch('startFetchingChats')
+                dispatch('startFetchingChats')
               }
 
-              store.dispatch('startFetchingLists')
+              dispatch('startFetchingLists')
 
               if (user.locked) {
-                store.dispatch('startFetchingFollowRequests')
+                dispatch('startFetchingFollowRequests')
               }
 
               if (store.getters.mergedConfig.useStreamingApi) {
-                store.dispatch('fetchTimeline', { timeline: 'friends', since: null })
-                store.dispatch('fetchNotifications', { since: null })
-                store.dispatch('enableMastoSockets', true).catch((error) => {
+                dispatch('fetchTimeline', { timeline: 'friends', since: null })
+                dispatch('fetchNotifications', { since: null })
+                dispatch('enableMastoSockets', true).catch((error) => {
                   console.error('Failed initializing MastoAPI Streaming socket', error)
                 }).then(() => {
-                  store.dispatch('fetchChats', { latest: true })
-                  setTimeout(() => store.dispatch('setNotificationsSilence', false), 10000)
+                  dispatch('fetchChats', { latest: true })
+                  setTimeout(() => dispatch('setNotificationsSilence', false), 10000)
                 })
               } else {
                 startPolling()
               }
 
               // Get user mutes
-              store.dispatch('fetchMutes')
+              dispatch('fetchMutes')
 
-              store.dispatch('setLayoutWidth', windowWidth())
-              store.dispatch('setLayoutHeight', windowHeight())
+              dispatch('setLayoutWidth', windowWidth())
+              dispatch('setLayoutHeight', windowHeight())
 
               // Fetch our friends
               store.rootState.api.backendInteractor.fetchFriends({ id: user.id })
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index b8c10b21..f0aa898a 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -108,6 +108,8 @@ const PLEROMA_POST_ANNOUNCEMENT_URL = '/api/v1/pleroma/admin/announcements'
 const PLEROMA_EDIT_ANNOUNCEMENT_URL = id => `/api/v1/pleroma/admin/announcements/${id}`
 const PLEROMA_DELETE_ANNOUNCEMENT_URL = id => `/api/v1/pleroma/admin/announcements/${id}`
 
+const PLEROMA_ADMIN_CONFIG_URL = '/api/v1/pleroma/admin/config'
+
 const oldfetch = window.fetch
 
 const fetch = (url, options) => {
@@ -1659,6 +1661,22 @@ const setReportState = ({ id, state, credentials }) => {
     })
 }
 
+// ADMIN STUFF // EXPERIMENTAL
+const fetchInstanceDBConfig = ({ credentials }) => {
+  return fetch(PLEROMA_ADMIN_CONFIG_URL, {
+    headers: authHeaders(credentials)
+  })
+    .then((response) => {
+      if (response.ok) {
+        return response.json()
+      } else {
+        return {
+          error: response
+        }
+      }
+    })
+}
+
 const apiService = {
   verifyCredentials,
   fetchTimeline,
@@ -1772,7 +1790,8 @@ const apiService = {
   postAnnouncement,
   editAnnouncement,
   deleteAnnouncement,
-  adminFetchAnnouncements
+  adminFetchAnnouncements,
+  fetchInstanceDBConfig
 }
 
 export default apiService
-- 
cgit v1.2.3-70-g09d2


From 4d23d31fecf480abfccc4db3ac79c6640078dc3b Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 14 Mar 2023 21:50:43 +0200
Subject: initial admin settings prototype (WIP)

---
 src/components/admin_modal/admin_modal.js          |  68 ++++++++++++
 src/components/admin_modal/admin_modal.scss        |  80 ++++++++++++++
 src/components/admin_modal/admin_modal.vue         | 121 +++++++++++++++++++++
 src/components/admin_modal/admin_modal_content.js  |  88 +++++++++++++++
 .../admin_modal/admin_modal_content.scss           |  56 ++++++++++
 src/components/admin_modal/tabs/general_tab.js     |  33 ++++++
 src/components/desktop_nav/desktop_nav.js          |   5 +-
 src/components/desktop_nav/desktop_nav.vue         |   9 +-
 src/components/notification/notification.vue       |   2 +-
 .../settings_modal/admin_tabs/instance_tab.js      |  29 +++++
 .../settings_modal/admin_tabs/instance_tab.vue     |  35 ++++++
 src/components/settings_modal/helpers/setting.js   |  14 ++-
 .../settings_modal/helpers/string_setting.js       |   9 ++
 .../settings_modal/helpers/string_setting.vue      |  25 +++++
 src/components/settings_modal/settings_modal.js    |  23 +++-
 src/components/settings_modal/settings_modal.vue   |   3 +-
 .../settings_modal/settings_modal_admin_content.js |  76 +++++++++++++
 .../settings_modal_admin_content.scss              |  56 ++++++++++
 .../settings_modal_admin_content.vue               |  21 ++++
 .../settings_modal/settings_modal_content.js       |  88 ---------------
 .../settings_modal/settings_modal_content.scss     |  56 ----------
 .../settings_modal/settings_modal_content.vue      |  83 --------------
 .../settings_modal/settings_modal_user_content.js  |  88 +++++++++++++++
 .../settings_modal_user_content.scss               |  56 ++++++++++
 .../settings_modal/settings_modal_user_content.vue |  83 ++++++++++++++
 src/components/tab_switcher/tab_switcher.jsx       |   8 +-
 src/modules/adminSettings.js                       |   5 +-
 src/modules/interface.js                           |  21 +++-
 28 files changed, 985 insertions(+), 256 deletions(-)
 create mode 100644 src/components/admin_modal/admin_modal.js
 create mode 100644 src/components/admin_modal/admin_modal.scss
 create mode 100644 src/components/admin_modal/admin_modal.vue
 create mode 100644 src/components/admin_modal/admin_modal_content.js
 create mode 100644 src/components/admin_modal/admin_modal_content.scss
 create mode 100644 src/components/admin_modal/tabs/general_tab.js
 create mode 100644 src/components/settings_modal/admin_tabs/instance_tab.js
 create mode 100644 src/components/settings_modal/admin_tabs/instance_tab.vue
 create mode 100644 src/components/settings_modal/helpers/string_setting.js
 create mode 100644 src/components/settings_modal/helpers/string_setting.vue
 create mode 100644 src/components/settings_modal/settings_modal_admin_content.js
 create mode 100644 src/components/settings_modal/settings_modal_admin_content.scss
 create mode 100644 src/components/settings_modal/settings_modal_admin_content.vue
 delete mode 100644 src/components/settings_modal/settings_modal_content.js
 delete mode 100644 src/components/settings_modal/settings_modal_content.scss
 delete mode 100644 src/components/settings_modal/settings_modal_content.vue
 create mode 100644 src/components/settings_modal/settings_modal_user_content.js
 create mode 100644 src/components/settings_modal/settings_modal_user_content.scss
 create mode 100644 src/components/settings_modal/settings_modal_user_content.vue

(limited to 'src')

diff --git a/src/components/admin_modal/admin_modal.js b/src/components/admin_modal/admin_modal.js
new file mode 100644
index 00000000..525f09aa
--- /dev/null
+++ b/src/components/admin_modal/admin_modal.js
@@ -0,0 +1,68 @@
+import Modal from 'src/components/modal/modal.vue'
+import PanelLoading from 'src/components/panel_loading/panel_loading.vue'
+import AsyncComponentError from 'src/components/async_component_error/async_component_error.vue'
+import getResettableAsyncComponent from 'src/services/resettable_async_component.js'
+import Popover from '../popover/popover.vue'
+import Checkbox from 'src/components/checkbox/checkbox.vue'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  newImporter,
+  newExporter
+} from 'src/services/export_import/export_import.js'
+import {
+  faTimes,
+  faFileUpload,
+  faFileDownload,
+  faChevronDown
+} from '@fortawesome/free-solid-svg-icons'
+import {
+  faWindowMinimize
+} from '@fortawesome/free-regular-svg-icons'
+
+library.add(
+  faTimes,
+  faWindowMinimize,
+  faFileUpload,
+  faFileDownload,
+  faChevronDown
+)
+
+const AdminModal = {
+  data () {
+    return {}
+  },
+  components: {
+    Modal,
+    Popover,
+    Checkbox,
+    AdminModalContent: getResettableAsyncComponent(
+      () => import('./admin_modal_content.vue'),
+      {
+        loadingComponent: PanelLoading,
+        errorComponent: AsyncComponentError,
+        delay: 0
+      }
+    )
+  },
+  methods: {
+    closeModal () {
+      this.$store.dispatch('closeAdminModal')
+    },
+    peekModal () {
+      this.$store.dispatch('togglePeekAdminModal')
+    }
+  },
+  computed: {
+    modalActivated () {
+      return this.$store.state.interface.adminModalState !== 'hidden'
+    },
+    modalOpenedOnce () {
+      return this.$store.state.interface.adminModalLoaded
+    },
+    modalPeeked () {
+      return this.$store.state.interface.adminModalState === 'minimized'
+    }
+  }
+}
+
+export default AdminModal
diff --git a/src/components/admin_modal/admin_modal.scss b/src/components/admin_modal/admin_modal.scss
new file mode 100644
index 00000000..0d916f32
--- /dev/null
+++ b/src/components/admin_modal/admin_modal.scss
@@ -0,0 +1,80 @@
+@import "src/variables";
+
+.admin-modal {
+  overflow: hidden;
+
+  .setting-list,
+  .option-list {
+    list-style-type: none;
+    padding-left: 2em;
+
+    li {
+      margin-bottom: 0.5em;
+    }
+
+    .suboptions {
+      margin-top: 0.3em;
+    }
+  }
+
+  .admin-modal-panel {
+    overflow: hidden;
+    transition: transform;
+    transition-timing-function: ease-in-out;
+    transition-duration: 300ms;
+    width: 1000px;
+    max-width: 90vw;
+    height: 90vh;
+
+    @media all and (max-width: 800px) {
+      max-width: 100vw;
+      height: 100%;
+    }
+
+    >.panel-body {
+      height: 100%;
+      overflow-y: hidden;
+
+      .btn {
+        min-height: 2em;
+        min-width: 10em;
+        padding: 0 2em;
+      }
+    }
+  }
+
+  .admin-footer {
+    display: flex;
+
+    >* {
+      margin-right: 0.5em;
+    }
+
+    .extra-content {
+      display: flex;
+      flex-grow: 1;
+    }
+  }
+
+  &.peek {
+    .admin-modal-panel {
+      /* Explanation:
+       * Modal is positioned vertically centered.
+       * 100vh - 100% = Distance between modal's top+bottom boundaries and screen
+       * (100vh - 100%) / 2 = Distance between bottom (or top) boundary and screen
+       * + 100% - we move modal completely off-screen, it's top boundary touches
+       *   bottom of the screen
+       * - 50px - leaving tiny amount of space so that titlebar + tiny amount of modal is visible
+       */
+      transform: translateY(calc(((100vh - 100%) / 2 + 100%) - 50px));
+
+      @media all and (max-width: 800px) {
+        /* For mobile, the modal takes 100% of the available screen.
+           This ensures the minimized modal is always 50px above the browser bottom
+           bar regardless of whether or not it is visible.
+        */
+        transform: translateY(calc(100% - 50px));
+      }
+    }
+  }
+}
diff --git a/src/components/admin_modal/admin_modal.vue b/src/components/admin_modal/admin_modal.vue
new file mode 100644
index 00000000..d7e5a80f
--- /dev/null
+++ b/src/components/admin_modal/admin_modal.vue
@@ -0,0 +1,121 @@
+<template>
+  <Modal
+    :is-open="modalActivated"
+    class="admin-modal"
+    :class="{ peek: modalPeeked }"
+    :no-background="modalPeeked"
+  >
+    <div class="admin-modal-panel panel">
+      <div class="panel-heading">
+        <span class="title">
+          {{ $t('admin.settings') }}
+        </span>
+        <transition name="fade">
+          <div
+            v-if="currentSaveStateNotice"
+            class="alert"
+            :class="{ transparent: !currentSaveStateNotice.error, error: currentSaveStateNotice.error}"
+            @click.prevent
+          >
+            {{ currentSaveStateNotice.error ? $t('admin.saving_err') : $t('settings.saving_ok') }}
+          </div>
+        </transition>
+        <button
+          class="btn button-default"
+          :title="$t('general.peek')"
+          @click="peekModal"
+        >
+          <FAIcon
+            :icon="['far', 'window-minimize']"
+            fixed-width
+          />
+        </button>
+        <button
+          class="btn button-default"
+          :title="$t('general.close')"
+          @click="closeModal"
+        >
+          <FAIcon
+            icon="times"
+            fixed-width
+          />
+        </button>
+      </div>
+      <div class="panel-body">
+        <AdminModalContent v-if="modalOpenedOnce" />
+      </div>
+      <div class="panel-footer admin-footer">
+        <Popover
+          class="export"
+          trigger="click"
+          placement="top"
+          :offset="{ y: 5, x: 5 }"
+          :bound-to="{ x: 'container' }"
+          remove-padding
+        >
+          <template #trigger>
+            <button
+              class="btn button-default"
+              :title="$t('general.close')"
+            >
+              <span>{{ $t("admin.file_export_import.backup_restore") }}</span>
+              {{ ' ' }}
+              <FAIcon
+                icon="chevron-down"
+              />
+            </button>
+          </template>
+          <template #content="{close}">
+            <div class="dropdown-menu">
+              <button
+                class="button-default dropdown-item dropdown-item-icon"
+                @click.prevent="backup"
+                @click="close"
+              >
+                <FAIcon
+                  icon="file-download"
+                  fixed-width
+                /><span>{{ $t("admin.file_export_import.backup_settings") }}</span>
+              </button>
+              <button
+                class="button-default dropdown-item dropdown-item-icon"
+                @click.prevent="backupWithTheme"
+                @click="close"
+              >
+                <FAIcon
+                  icon="file-download"
+                  fixed-width
+                /><span>{{ $t("admin.file_export_import.backup_settings_theme") }}</span>
+              </button>
+              <button
+                class="button-default dropdown-item dropdown-item-icon"
+                @click.prevent="restore"
+                @click="close"
+              >
+                <FAIcon
+                  icon="file-upload"
+                  fixed-width
+                /><span>{{ $t("admin.file_export_import.restore_settings") }}</span>
+              </button>
+            </div>
+          </template>
+        </Popover>
+
+        <Checkbox
+          :model-value="!!expertLevel"
+          @update:modelValue="expertLevel = Number($event)"
+        >
+          {{ $t("admin.expert_mode") }}
+        </Checkbox>
+        <span
+          id="unscrolled-content"
+          class="extra-content"
+        />
+      </div>
+    </div>
+  </Modal>
+</template>
+
+<script src="./admin_modal.js"></script>
+
+<style src="./admin_modal.scss" lang="scss"></style>
diff --git a/src/components/admin_modal/admin_modal_content.js b/src/components/admin_modal/admin_modal_content.js
new file mode 100644
index 00000000..897cc163
--- /dev/null
+++ b/src/components/admin_modal/admin_modal_content.js
@@ -0,0 +1,88 @@
+import TabSwitcher from 'src/components/tab_switcher/tab_switcher.jsx'
+
+import DataImportExportTab from './tabs/data_import_export_tab.vue'
+import MutesAndBlocksTab from './tabs/mutes_and_blocks_tab.vue'
+import NotificationsTab from './tabs/notifications_tab.vue'
+import FilteringTab from './tabs/filtering_tab.vue'
+import SecurityTab from './tabs/security_tab/security_tab.vue'
+import ProfileTab from './tabs/profile_tab.vue'
+import GeneralTab from './tabs/general_tab.vue'
+import VersionTab from './tabs/version_tab.vue'
+import ThemeTab from './tabs/theme_tab/theme_tab.vue'
+
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faWrench,
+  faUser,
+  faFilter,
+  faPaintBrush,
+  faBell,
+  faDownload,
+  faEyeSlash,
+  faInfo
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faWrench,
+  faUser,
+  faFilter,
+  faPaintBrush,
+  faBell,
+  faDownload,
+  faEyeSlash,
+  faInfo
+)
+
+const AdminModalContent = {
+  components: {
+    TabSwitcher,
+
+    DataImportExportTab,
+    MutesAndBlocksTab,
+    NotificationsTab,
+    FilteringTab,
+    SecurityTab,
+    ProfileTab,
+    GeneralTab,
+    VersionTab,
+    ThemeTab
+  },
+  computed: {
+    isLoggedIn () {
+      return !!this.$store.state.users.currentUser
+    },
+    open () {
+      return this.$store.state.interface.AdminModalState !== 'hidden'
+    },
+    bodyLock () {
+      return this.$store.state.interface.AdminModalState === 'visible'
+    }
+  },
+  methods: {
+    onOpen () {
+      const targetTab = this.$store.state.interface.AdminModalTargetTab
+      // We're being told to open in specific tab
+      if (targetTab) {
+        const tabIndex = this.$refs.tabSwitcher.$slots.default().findIndex(elm => {
+          return elm.props && elm.props['data-tab-name'] === targetTab
+        })
+        if (tabIndex >= 0) {
+          this.$refs.tabSwitcher.setTab(tabIndex)
+        }
+      }
+      // Clear the state of target tab, so that next time Admin is opened
+      // it doesn't force it.
+      this.$store.dispatch('clearAdminModalTargetTab')
+    }
+  },
+  mounted () {
+    this.onOpen()
+  },
+  watch: {
+    open: function (value) {
+      if (value) this.onOpen()
+    }
+  }
+}
+
+export default AdminModalContent
diff --git a/src/components/admin_modal/admin_modal_content.scss b/src/components/admin_modal/admin_modal_content.scss
new file mode 100644
index 00000000..2db7b2f8
--- /dev/null
+++ b/src/components/admin_modal/admin_modal_content.scss
@@ -0,0 +1,56 @@
+@import "src/variables";
+
+.admin_tab-switcher {
+  height: 100%;
+
+  .setting-item {
+    border-bottom: 2px solid var(--fg, $fallback--fg);
+    margin: 1em 1em 1.4em;
+    padding-bottom: 1.4em;
+
+    > div,
+    > label {
+      display: block;
+      margin-bottom: 0.5em;
+
+      &:last-child {
+        margin-bottom: 0;
+      }
+    }
+
+    .select-multiple {
+      display: flex;
+
+      .option-list {
+        margin: 0;
+        padding-left: 0.5em;
+      }
+    }
+
+    &:last-child {
+      border-bottom: none;
+      padding-bottom: 0;
+      margin-bottom: 1em;
+    }
+
+    select {
+      min-width: 10em;
+    }
+
+    textarea {
+      width: 100%;
+      max-width: 100%;
+      height: 100px;
+    }
+
+    .unavailable,
+    .unavailable svg {
+      color: var(--cRed, $fallback--cRed);
+      color: $fallback--cRed;
+    }
+
+    .number-input {
+      max-width: 6em;
+    }
+  }
+}
diff --git a/src/components/admin_modal/tabs/general_tab.js b/src/components/admin_modal/tabs/general_tab.js
new file mode 100644
index 00000000..8c166f19
--- /dev/null
+++ b/src/components/admin_modal/tabs/general_tab.js
@@ -0,0 +1,33 @@
+import BooleanSetting from '../settings_modal/helpers/boolean_setting.vue'
+import ChoiceSetting from '../settings_modal/helpers/choice_setting.vue'
+import IntegerSetting from '../settings_modal/helpers/integer_setting.vue'
+
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faGlobe
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faGlobe
+)
+
+const GeneralTab = {
+  components: {
+    BooleanSetting,
+    ChoiceSetting,
+    IntegerSetting,
+  },
+  computed: {
+    mergedConfig () {
+      console.log(this.$store.state)
+      return this.$store.state
+    }
+  },
+  methods: {
+    changeDefaultScope (value) {
+      this.$store.dispatch('setProfileOption', { name: 'defaultScope', value })
+    }
+  }
+}
+
+export default GeneralTab
diff --git a/src/components/desktop_nav/desktop_nav.js b/src/components/desktop_nav/desktop_nav.js
index 745b1a81..f6a2e294 100644
--- a/src/components/desktop_nav/desktop_nav.js
+++ b/src/components/desktop_nav/desktop_nav.js
@@ -107,7 +107,10 @@ export default {
       this.searchBarHidden = hidden
     },
     openSettingsModal () {
-      this.$store.dispatch('openSettingsModal')
+      this.$store.dispatch('openSettingsModal', 'user')
+    },
+    openAdminModal () {
+      this.$store.dispatch('openSettingsModal', 'admin')
     }
   }
 }
diff --git a/src/components/desktop_nav/desktop_nav.vue b/src/components/desktop_nav/desktop_nav.vue
index dc8bbfd3..49382f8e 100644
--- a/src/components/desktop_nav/desktop_nav.vue
+++ b/src/components/desktop_nav/desktop_nav.vue
@@ -48,20 +48,19 @@
             icon="cog"
           />
         </button>
-        <a
+        <button
           v-if="currentUser && currentUser.role === 'admin'"
-          href="/pleroma/admin/#/login-pleroma"
-          class="nav-icon"
+          class="button-unstyled nav-icon"
           target="_blank"
           :title="$t('nav.administration')"
-          @click.stop
+          @click.stop="openAdminModal"
         >
           <FAIcon
             fixed-width
             class="fa-scale-110 fa-old-padding"
             icon="tachometer-alt"
           />
-        </a>
+        </button>
         <span class="spacer" />
         <button
           v-if="currentUser"
diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue
index e1ea42ad..8d4cc2d1 100644
--- a/src/components/notification/notification.vue
+++ b/src/components/notification/notification.vue
@@ -153,9 +153,9 @@
             </router-link>
             <button
               class="button-unstyled expand-icon"
-              @click.prevent="toggleStatusExpanded"
               :title="$t('tool_tip.toggle_expand')"
               :aria-expanded="statusExpanded"
+              @click.prevent="toggleStatusExpanded"
             >
               <FAIcon
                 class="fa-scale-110"
diff --git a/src/components/settings_modal/admin_tabs/instance_tab.js b/src/components/settings_modal/admin_tabs/instance_tab.js
new file mode 100644
index 00000000..4a261659
--- /dev/null
+++ b/src/components/settings_modal/admin_tabs/instance_tab.js
@@ -0,0 +1,29 @@
+import BooleanSetting from '../helpers/boolean_setting.vue'
+import ChoiceSetting from '../helpers/choice_setting.vue'
+import IntegerSetting from '../helpers/integer_setting.vue'
+import StringSetting from '../helpers/string_setting.vue'
+
+import SharedComputedObject from '../helpers/shared_computed_object.js'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faGlobe
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faGlobe
+)
+
+const InstanceTab = {
+  data () {},
+  components: {
+    BooleanSetting,
+    ChoiceSetting,
+    IntegerSetting,
+    StringSetting
+  },
+  computed: {
+    ...SharedComputedObject()
+  }
+}
+
+export default InstanceTab
diff --git a/src/components/settings_modal/admin_tabs/instance_tab.vue b/src/components/settings_modal/admin_tabs/instance_tab.vue
new file mode 100644
index 00000000..65b3d12f
--- /dev/null
+++ b/src/components/settings_modal/admin_tabs/instance_tab.vue
@@ -0,0 +1,35 @@
+<template>
+  <div :label="$t('settings.general')">
+    <div class="setting-item">
+      <h2>{{ $t('admin_dash.instance') }}</h2>
+      <ul class="setting-list">
+        <li>
+          <StringSetting source="admin" path=":pleroma.:instance.:name">
+            NAME
+          </StringSetting>
+        </li>
+        <li>
+          <StringSetting source="admin" path=":pleroma.:instance.:description">
+            DESCRIPTION
+          </StringSetting>
+        </li>
+      </ul>
+    </div>
+  </div>
+</template>
+
+<script src="./instance_tab.js"></script>
+
+<style lang="scss">
+.column-settings {
+  display: flex;
+  justify-content: space-evenly;
+  flex-wrap: wrap;
+}
+
+.column-settings .size-label {
+  display: block;
+  margin-bottom: 0.5em;
+  margin-top: 0.5em;
+}
+</style>
diff --git a/src/components/settings_modal/helpers/setting.js b/src/components/settings_modal/helpers/setting.js
index a766e6dc..9195d3e9 100644
--- a/src/components/settings_modal/helpers/setting.js
+++ b/src/components/settings_modal/helpers/setting.js
@@ -42,6 +42,8 @@ export default {
       switch (this.source) {
         case 'profile':
           return this.$store.state.profileConfig
+        case 'admin':
+          return this.$store.state.adminSettings.config
         default:
           return this.$store.getters.mergedConfig
       }
@@ -50,6 +52,8 @@ export default {
       switch (this.source) {
         case 'profile':
           return (k, v) => this.$store.dispatch('setProfileOption', { name: k, value: v })
+        case 'admin':
+          return (k, v) => console.log(this.path, k, v)
         default:
           return (k, v) => this.$store.dispatch('setOption', { name: k, value: v })
       }
@@ -66,7 +70,15 @@ export default {
       return this.source === 'profile'
     },
     isChanged () {
-      return !this.source === 'default' && this.state !== this.defaultState
+      switch (this.source) {
+        case 'profile':
+          return false
+        case 'admin':
+          console.log(this.$store.state.adminSettings.modifiedPaths)
+          return this.$store.state.adminSettings.modifiedPaths.has(this.path)
+        default:
+          return this.state !== this.defaultState
+      }
     },
     matchesExpertLevel () {
       return (this.expert || 0) <= this.$store.state.config.expertLevel > 0
diff --git a/src/components/settings_modal/helpers/string_setting.js b/src/components/settings_modal/helpers/string_setting.js
new file mode 100644
index 00000000..64f8772d
--- /dev/null
+++ b/src/components/settings_modal/helpers/string_setting.js
@@ -0,0 +1,9 @@
+import ModifiedIndicator from './modified_indicator.vue'
+import Setting from './setting.js'
+
+export default {
+  components: {
+    ModifiedIndicator
+  },
+  ...Setting
+}
diff --git a/src/components/settings_modal/helpers/string_setting.vue b/src/components/settings_modal/helpers/string_setting.vue
new file mode 100644
index 00000000..e4bd2de9
--- /dev/null
+++ b/src/components/settings_modal/helpers/string_setting.vue
@@ -0,0 +1,25 @@
+<template>
+  <label
+    v-if="matchesExpertLevel"
+    class="StringSetting"
+  >
+    <label :for="path">
+      <slot />
+    </label>
+    <input
+      :id="path"
+      class="string-input"
+      step="1"
+      :disabled="disabled"
+      :value="state"
+      @change="update"
+    >
+    {{ ' ' }}
+    <ModifiedIndicator
+      :changed="isChanged"
+      :onclick="reset"
+    />
+  </label>
+</template>
+
+<script src="./boolean_setting.js"></script>
diff --git a/src/components/settings_modal/settings_modal.js b/src/components/settings_modal/settings_modal.js
index 0a72dca1..e033d999 100644
--- a/src/components/settings_modal/settings_modal.js
+++ b/src/components/settings_modal/settings_modal.js
@@ -53,8 +53,16 @@ const SettingsModal = {
     Modal,
     Popover,
     Checkbox,
-    SettingsModalContent: getResettableAsyncComponent(
-      () => import('./settings_modal_content.vue'),
+    SettingsModalUserContent: getResettableAsyncComponent(
+      () => import('./settings_modal_user_content.vue'),
+      {
+        loadingComponent: PanelLoading,
+        errorComponent: AsyncComponentError,
+        delay: 0
+      }
+    ),
+    SettingsModalAdminContent: getResettableAsyncComponent(
+      () => import('./settings_modal_admin_content.vue'),
       {
         loadingComponent: PanelLoading,
         errorComponent: AsyncComponentError,
@@ -156,8 +164,14 @@ const SettingsModal = {
     modalActivated () {
       return this.$store.state.interface.settingsModalState !== 'hidden'
     },
-    modalOpenedOnce () {
-      return this.$store.state.interface.settingsModalLoaded
+    modalMode () {
+      return this.$store.state.interface.settingsModalMode
+    },
+    modalOpenedOnceUser () {
+      return this.$store.state.interface.settingsModalLoadedUser
+    },
+    modalOpenedOnceAdmin () {
+      return this.$store.state.interface.settingsModalLoadedAdmin
     },
     modalPeeked () {
       return this.$store.state.interface.settingsModalState === 'minimized'
@@ -167,7 +181,6 @@ const SettingsModal = {
         return this.$store.state.config.expertLevel > 0
       },
       set (value) {
-        console.log(value)
         this.$store.dispatch('setOption', { name: 'expertLevel', value: value ? 1 : 0 })
       }
     }
diff --git a/src/components/settings_modal/settings_modal.vue b/src/components/settings_modal/settings_modal.vue
index 7b457371..73e1524a 100644
--- a/src/components/settings_modal/settings_modal.vue
+++ b/src/components/settings_modal/settings_modal.vue
@@ -42,7 +42,8 @@
         </button>
       </div>
       <div class="panel-body">
-        <SettingsModalContent v-if="modalOpenedOnce" />
+        <SettingsModalUserContent v-if="modalMode === 'user' && modalOpenedOnceUser" />
+        <SettingsModalAdminContent v-if="modalMode === 'admin' && modalOpenedOnceAdmin" />
       </div>
       <div class="panel-footer settings-footer">
         <Popover
diff --git a/src/components/settings_modal/settings_modal_admin_content.js b/src/components/settings_modal/settings_modal_admin_content.js
new file mode 100644
index 00000000..88ba1755
--- /dev/null
+++ b/src/components/settings_modal/settings_modal_admin_content.js
@@ -0,0 +1,76 @@
+import TabSwitcher from 'src/components/tab_switcher/tab_switcher.jsx'
+
+import DataImportExportTab from './tabs/data_import_export_tab.vue'
+import MutesAndBlocksTab from './tabs/mutes_and_blocks_tab.vue'
+import InstanceTab from './admin_tabs/instance_tab.vue'
+
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faWrench,
+  faUser,
+  faFilter,
+  faPaintBrush,
+  faBell,
+  faDownload,
+  faEyeSlash,
+  faInfo
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faWrench,
+  faUser,
+  faFilter,
+  faPaintBrush,
+  faBell,
+  faDownload,
+  faEyeSlash,
+  faInfo
+)
+
+const SettingsModalAdminContent = {
+  components: {
+    TabSwitcher,
+
+    DataImportExportTab,
+    MutesAndBlocksTab,
+    InstanceTab
+  },
+  computed: {
+    isLoggedIn () {
+      return !!this.$store.state.users.currentUser
+    },
+    open () {
+      return this.$store.state.interface.settingsModalState !== 'hidden'
+    },
+    bodyLock () {
+      return this.$store.state.interface.settingsModalState === 'visible'
+    }
+  },
+  methods: {
+    onOpen () {
+      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 => {
+          return elm.props && elm.props['data-tab-name'] === targetTab
+        })
+        if (tabIndex >= 0) {
+          this.$refs.tabSwitcher.setTab(tabIndex)
+        }
+      }
+      // Clear the state of target tab, so that next time settings is opened
+      // it doesn't force it.
+      this.$store.dispatch('clearSettingsModalTargetTab')
+    }
+  },
+  mounted () {
+    this.onOpen()
+  },
+  watch: {
+    open: function (value) {
+      if (value) this.onOpen()
+    }
+  }
+}
+
+export default SettingsModalAdminContent
diff --git a/src/components/settings_modal/settings_modal_admin_content.scss b/src/components/settings_modal/settings_modal_admin_content.scss
new file mode 100644
index 00000000..87df7982
--- /dev/null
+++ b/src/components/settings_modal/settings_modal_admin_content.scss
@@ -0,0 +1,56 @@
+@import "src/variables";
+
+.settings_tab-switcher {
+  height: 100%;
+
+  .setting-item {
+    border-bottom: 2px solid var(--fg, $fallback--fg);
+    margin: 1em 1em 1.4em;
+    padding-bottom: 1.4em;
+
+    > div,
+    > label {
+      display: block;
+      margin-bottom: 0.5em;
+
+      &:last-child {
+        margin-bottom: 0;
+      }
+    }
+
+    .select-multiple {
+      display: flex;
+
+      .option-list {
+        margin: 0;
+        padding-left: 0.5em;
+      }
+    }
+
+    &:last-child {
+      border-bottom: none;
+      padding-bottom: 0;
+      margin-bottom: 1em;
+    }
+
+    select {
+      min-width: 10em;
+    }
+
+    textarea {
+      width: 100%;
+      max-width: 100%;
+      height: 100px;
+    }
+
+    .unavailable,
+    .unavailable svg {
+      color: var(--cRed, $fallback--cRed);
+      color: $fallback--cRed;
+    }
+
+    .number-input {
+      max-width: 6em;
+    }
+  }
+}
diff --git a/src/components/settings_modal/settings_modal_admin_content.vue b/src/components/settings_modal/settings_modal_admin_content.vue
new file mode 100644
index 00000000..9873b127
--- /dev/null
+++ b/src/components/settings_modal/settings_modal_admin_content.vue
@@ -0,0 +1,21 @@
+<template>
+  <tab-switcher
+    ref="tabSwitcher"
+    class="settings_tab-switcher"
+    :side-tab-bar="true"
+    :scrollable-tabs="true"
+    :body-scroll-lock="bodyLock"
+  >
+    <div
+      :label="$t('settings.general')"
+      icon="wrench"
+      data-tab-name="general"
+    >
+      <InstanceTab />
+    </div>
+  </tab-switcher>
+</template>
+
+<script src="./settings_modal_admin_content.js"></script>
+
+<style src="./settings_modal_admin_content.scss" lang="scss"></style>
diff --git a/src/components/settings_modal/settings_modal_content.js b/src/components/settings_modal/settings_modal_content.js
deleted file mode 100644
index 9ac0301f..00000000
--- a/src/components/settings_modal/settings_modal_content.js
+++ /dev/null
@@ -1,88 +0,0 @@
-import TabSwitcher from 'src/components/tab_switcher/tab_switcher.jsx'
-
-import DataImportExportTab from './tabs/data_import_export_tab.vue'
-import MutesAndBlocksTab from './tabs/mutes_and_blocks_tab.vue'
-import NotificationsTab from './tabs/notifications_tab.vue'
-import FilteringTab from './tabs/filtering_tab.vue'
-import SecurityTab from './tabs/security_tab/security_tab.vue'
-import ProfileTab from './tabs/profile_tab.vue'
-import GeneralTab from './tabs/general_tab.vue'
-import VersionTab from './tabs/version_tab.vue'
-import ThemeTab from './tabs/theme_tab/theme_tab.vue'
-
-import { library } from '@fortawesome/fontawesome-svg-core'
-import {
-  faWrench,
-  faUser,
-  faFilter,
-  faPaintBrush,
-  faBell,
-  faDownload,
-  faEyeSlash,
-  faInfo
-} from '@fortawesome/free-solid-svg-icons'
-
-library.add(
-  faWrench,
-  faUser,
-  faFilter,
-  faPaintBrush,
-  faBell,
-  faDownload,
-  faEyeSlash,
-  faInfo
-)
-
-const SettingsModalContent = {
-  components: {
-    TabSwitcher,
-
-    DataImportExportTab,
-    MutesAndBlocksTab,
-    NotificationsTab,
-    FilteringTab,
-    SecurityTab,
-    ProfileTab,
-    GeneralTab,
-    VersionTab,
-    ThemeTab
-  },
-  computed: {
-    isLoggedIn () {
-      return !!this.$store.state.users.currentUser
-    },
-    open () {
-      return this.$store.state.interface.settingsModalState !== 'hidden'
-    },
-    bodyLock () {
-      return this.$store.state.interface.settingsModalState === 'visible'
-    }
-  },
-  methods: {
-    onOpen () {
-      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 => {
-          return elm.props && elm.props['data-tab-name'] === targetTab
-        })
-        if (tabIndex >= 0) {
-          this.$refs.tabSwitcher.setTab(tabIndex)
-        }
-      }
-      // Clear the state of target tab, so that next time settings is opened
-      // it doesn't force it.
-      this.$store.dispatch('clearSettingsModalTargetTab')
-    }
-  },
-  mounted () {
-    this.onOpen()
-  },
-  watch: {
-    open: function (value) {
-      if (value) this.onOpen()
-    }
-  }
-}
-
-export default SettingsModalContent
diff --git a/src/components/settings_modal/settings_modal_content.scss b/src/components/settings_modal/settings_modal_content.scss
deleted file mode 100644
index 87df7982..00000000
--- a/src/components/settings_modal/settings_modal_content.scss
+++ /dev/null
@@ -1,56 +0,0 @@
-@import "src/variables";
-
-.settings_tab-switcher {
-  height: 100%;
-
-  .setting-item {
-    border-bottom: 2px solid var(--fg, $fallback--fg);
-    margin: 1em 1em 1.4em;
-    padding-bottom: 1.4em;
-
-    > div,
-    > label {
-      display: block;
-      margin-bottom: 0.5em;
-
-      &:last-child {
-        margin-bottom: 0;
-      }
-    }
-
-    .select-multiple {
-      display: flex;
-
-      .option-list {
-        margin: 0;
-        padding-left: 0.5em;
-      }
-    }
-
-    &:last-child {
-      border-bottom: none;
-      padding-bottom: 0;
-      margin-bottom: 1em;
-    }
-
-    select {
-      min-width: 10em;
-    }
-
-    textarea {
-      width: 100%;
-      max-width: 100%;
-      height: 100px;
-    }
-
-    .unavailable,
-    .unavailable svg {
-      color: var(--cRed, $fallback--cRed);
-      color: $fallback--cRed;
-    }
-
-    .number-input {
-      max-width: 6em;
-    }
-  }
-}
diff --git a/src/components/settings_modal/settings_modal_content.vue b/src/components/settings_modal/settings_modal_content.vue
deleted file mode 100644
index 0be76d22..00000000
--- a/src/components/settings_modal/settings_modal_content.vue
+++ /dev/null
@@ -1,83 +0,0 @@
-<template>
-  <tab-switcher
-    ref="tabSwitcher"
-    class="settings_tab-switcher"
-    :side-tab-bar="true"
-    :scrollable-tabs="true"
-    :body-scroll-lock="bodyLock"
-  >
-    <div
-      :label="$t('settings.general')"
-      icon="wrench"
-      data-tab-name="general"
-    >
-      <GeneralTab />
-    </div>
-    <div
-      v-if="isLoggedIn"
-      :label="$t('settings.profile_tab')"
-      icon="user"
-      data-tab-name="profile"
-    >
-      <ProfileTab />
-    </div>
-    <div
-      v-if="isLoggedIn"
-      :label="$t('settings.security_tab')"
-      icon="lock"
-      data-tab-name="security"
-    >
-      <SecurityTab />
-    </div>
-    <div
-      :label="$t('settings.filtering')"
-      icon="filter"
-      data-tab-name="filtering"
-    >
-      <FilteringTab />
-    </div>
-    <div
-      :label="$t('settings.theme')"
-      icon="paint-brush"
-      data-tab-name="theme"
-    >
-      <ThemeTab />
-    </div>
-    <div
-      v-if="isLoggedIn"
-      :label="$t('settings.notifications')"
-      icon="bell"
-      data-tab-name="notifications"
-    >
-      <NotificationsTab />
-    </div>
-    <div
-      v-if="isLoggedIn"
-      :label="$t('settings.data_import_export_tab')"
-      icon="download"
-      data-tab-name="dataImportExport"
-    >
-      <DataImportExportTab />
-    </div>
-    <div
-      v-if="isLoggedIn"
-      :label="$t('settings.mutes_and_blocks')"
-      :fullHeight="true"
-      icon="eye-slash"
-      data-tab-name="mutesAndBlocks"
-    >
-      <MutesAndBlocksTab />
-    </div>
-    <div
-      :label="$t('settings.version.title')"
-      icon="info"
-      data-tab-name="version"
-    >
-      <VersionTab />
-    </div>
-  </tab-switcher>
-</template>
-
-<script src="./settings_modal_content.js"></script>
-
-<style src="./settings_modal_content.scss" lang="scss"></style>
diff --git a/src/components/settings_modal/settings_modal_user_content.js b/src/components/settings_modal/settings_modal_user_content.js
new file mode 100644
index 00000000..9ac0301f
--- /dev/null
+++ b/src/components/settings_modal/settings_modal_user_content.js
@@ -0,0 +1,88 @@
+import TabSwitcher from 'src/components/tab_switcher/tab_switcher.jsx'
+
+import DataImportExportTab from './tabs/data_import_export_tab.vue'
+import MutesAndBlocksTab from './tabs/mutes_and_blocks_tab.vue'
+import NotificationsTab from './tabs/notifications_tab.vue'
+import FilteringTab from './tabs/filtering_tab.vue'
+import SecurityTab from './tabs/security_tab/security_tab.vue'
+import ProfileTab from './tabs/profile_tab.vue'
+import GeneralTab from './tabs/general_tab.vue'
+import VersionTab from './tabs/version_tab.vue'
+import ThemeTab from './tabs/theme_tab/theme_tab.vue'
+
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faWrench,
+  faUser,
+  faFilter,
+  faPaintBrush,
+  faBell,
+  faDownload,
+  faEyeSlash,
+  faInfo
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faWrench,
+  faUser,
+  faFilter,
+  faPaintBrush,
+  faBell,
+  faDownload,
+  faEyeSlash,
+  faInfo
+)
+
+const SettingsModalContent = {
+  components: {
+    TabSwitcher,
+
+    DataImportExportTab,
+    MutesAndBlocksTab,
+    NotificationsTab,
+    FilteringTab,
+    SecurityTab,
+    ProfileTab,
+    GeneralTab,
+    VersionTab,
+    ThemeTab
+  },
+  computed: {
+    isLoggedIn () {
+      return !!this.$store.state.users.currentUser
+    },
+    open () {
+      return this.$store.state.interface.settingsModalState !== 'hidden'
+    },
+    bodyLock () {
+      return this.$store.state.interface.settingsModalState === 'visible'
+    }
+  },
+  methods: {
+    onOpen () {
+      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 => {
+          return elm.props && elm.props['data-tab-name'] === targetTab
+        })
+        if (tabIndex >= 0) {
+          this.$refs.tabSwitcher.setTab(tabIndex)
+        }
+      }
+      // Clear the state of target tab, so that next time settings is opened
+      // it doesn't force it.
+      this.$store.dispatch('clearSettingsModalTargetTab')
+    }
+  },
+  mounted () {
+    this.onOpen()
+  },
+  watch: {
+    open: function (value) {
+      if (value) this.onOpen()
+    }
+  }
+}
+
+export default SettingsModalContent
diff --git a/src/components/settings_modal/settings_modal_user_content.scss b/src/components/settings_modal/settings_modal_user_content.scss
new file mode 100644
index 00000000..87df7982
--- /dev/null
+++ b/src/components/settings_modal/settings_modal_user_content.scss
@@ -0,0 +1,56 @@
+@import "src/variables";
+
+.settings_tab-switcher {
+  height: 100%;
+
+  .setting-item {
+    border-bottom: 2px solid var(--fg, $fallback--fg);
+    margin: 1em 1em 1.4em;
+    padding-bottom: 1.4em;
+
+    > div,
+    > label {
+      display: block;
+      margin-bottom: 0.5em;
+
+      &:last-child {
+        margin-bottom: 0;
+      }
+    }
+
+    .select-multiple {
+      display: flex;
+
+      .option-list {
+        margin: 0;
+        padding-left: 0.5em;
+      }
+    }
+
+    &:last-child {
+      border-bottom: none;
+      padding-bottom: 0;
+      margin-bottom: 1em;
+    }
+
+    select {
+      min-width: 10em;
+    }
+
+    textarea {
+      width: 100%;
+      max-width: 100%;
+      height: 100px;
+    }
+
+    .unavailable,
+    .unavailable svg {
+      color: var(--cRed, $fallback--cRed);
+      color: $fallback--cRed;
+    }
+
+    .number-input {
+      max-width: 6em;
+    }
+  }
+}
diff --git a/src/components/settings_modal/settings_modal_user_content.vue b/src/components/settings_modal/settings_modal_user_content.vue
new file mode 100644
index 00000000..0221cccb
--- /dev/null
+++ b/src/components/settings_modal/settings_modal_user_content.vue
@@ -0,0 +1,83 @@
+<template>
+  <tab-switcher
+    ref="tabSwitcher"
+    class="settings_tab-switcher"
+    :side-tab-bar="true"
+    :scrollable-tabs="true"
+    :body-scroll-lock="bodyLock"
+  >
+    <div
+      :label="$t('settings.general')"
+      icon="wrench"
+      data-tab-name="general"
+    >
+      <GeneralTab />
+    </div>
+    <div
+      v-if="isLoggedIn"
+      :label="$t('settings.profile_tab')"
+      icon="user"
+      data-tab-name="profile"
+    >
+      <ProfileTab />
+    </div>
+    <div
+      v-if="isLoggedIn"
+      :label="$t('settings.security_tab')"
+      icon="lock"
+      data-tab-name="security"
+    >
+      <SecurityTab />
+    </div>
+    <div
+      :label="$t('settings.filtering')"
+      icon="filter"
+      data-tab-name="filtering"
+    >
+      <FilteringTab />
+    </div>
+    <div
+      :label="$t('settings.theme')"
+      icon="paint-brush"
+      data-tab-name="theme"
+    >
+      <ThemeTab />
+    </div>
+    <div
+      v-if="isLoggedIn"
+      :label="$t('settings.notifications')"
+      icon="bell"
+      data-tab-name="notifications"
+    >
+      <NotificationsTab />
+    </div>
+    <div
+      v-if="isLoggedIn"
+      :label="$t('settings.data_import_export_tab')"
+      icon="download"
+      data-tab-name="dataImportExport"
+    >
+      <DataImportExportTab />
+    </div>
+    <div
+      v-if="isLoggedIn"
+      :label="$t('settings.mutes_and_blocks')"
+      :fullHeight="true"
+      icon="eye-slash"
+      data-tab-name="mutesAndBlocks"
+    >
+      <MutesAndBlocksTab />
+    </div>
+    <div
+      :label="$t('settings.version.title')"
+      icon="info"
+      data-tab-name="version"
+    >
+      <VersionTab />
+    </div>
+  </tab-switcher>
+</template>
+
+<script src="./settings_modal_user_content.js"></script>
+
+<style src="./settings_modal_user_content.scss" lang="scss"></style>
diff --git a/src/components/tab_switcher/tab_switcher.jsx b/src/components/tab_switcher/tab_switcher.jsx
index a7ef8560..b444da43 100644
--- a/src/components/tab_switcher/tab_switcher.jsx
+++ b/src/components/tab_switcher/tab_switcher.jsx
@@ -60,13 +60,7 @@ export default {
         const isWanted = slot => slot.props && slot.props['data-tab-name'] === tabName
         return this.$slots.default().findIndex(isWanted) === this.activeIndex
       }
-    },
-    settingsModalVisible () {
-      return this.settingsModalState === 'visible'
-    },
-    ...mapState({
-      settingsModalState: state => state.interface.settingsModalState
-    })
+    }
   },
   beforeUpdate () {
     const currentSlot = this.slots()[this.active]
diff --git a/src/modules/adminSettings.js b/src/modules/adminSettings.js
index 01e9a49e..8006717d 100644
--- a/src/modules/adminSettings.js
+++ b/src/modules/adminSettings.js
@@ -10,7 +10,7 @@ export const newUserFlags = {
   ...defaultState.flagStorage
 }
 
-const serverSideStorage = {
+const adminSettingsStorage = {
   state: {
     ...cloneDeep(defaultState)
   },
@@ -40,9 +40,10 @@ const serverSideStorage = {
         }
         set(config, path, convert(c.value))
       })
+      console.log(config)
       commit('updateAdminSettings', { config, modifiedPaths })
     }
   }
 }
 
-export default serverSideStorage
+export default adminSettingsStorage
diff --git a/src/modules/interface.js b/src/modules/interface.js
index a86193ea..2d012f1b 100644
--- a/src/modules/interface.js
+++ b/src/modules/interface.js
@@ -1,7 +1,9 @@
 const defaultState = {
   settingsModalState: 'hidden',
-  settingsModalLoaded: false,
+  settingsModalLoadedUser: false,
+  settingsModalLoadedAdmin: false,
   settingsModalTargetTab: null,
+  settingsModalMode: 'user',
   settings: {
     currentSaveStateNotice: null,
     noticeClearTimeout: null,
@@ -54,10 +56,17 @@ const interfaceMod = {
           throw new Error('Illegal minimization state of settings modal')
       }
     },
-    openSettingsModal (state) {
+    openSettingsModal (state, value) {
+      state.settingsModalMode = value
       state.settingsModalState = 'visible'
-      if (!state.settingsModalLoaded) {
-        state.settingsModalLoaded = true
+      if (value === 'user') {
+        if (!state.settingsModalLoadedUser) {
+          state.settingsModalLoadedUser = true
+        }
+      } else if (value === 'admin') {
+        if (!state.settingsModalLoadedAdmin) {
+          state.settingsModalLoadedAdmin = true
+        }
       }
     },
     setSettingsModalTargetTab (state, value) {
@@ -92,8 +101,8 @@ const interfaceMod = {
     closeSettingsModal ({ commit }) {
       commit('closeSettingsModal')
     },
-    openSettingsModal ({ commit }) {
-      commit('openSettingsModal')
+    openSettingsModal ({ commit }, value = 'user') {
+      commit('openSettingsModal', value)
     },
     togglePeekSettingsModal ({ commit }) {
       commit('togglePeekSettingsModal')
-- 
cgit v1.2.3-70-g09d2


From bfd802ad046886230574cf2262f9c2e5f1b03a3f Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 16 Mar 2023 23:18:55 +0200
Subject: setting admin settings works now. also now we have draftable settings

---
 .../settings_modal/admin_tabs/instance_tab.vue     |  23 ++++-
 .../settings_modal/helpers/boolean_setting.js      |  15 +--
 .../settings_modal/helpers/boolean_setting.vue     |   3 +-
 .../settings_modal/helpers/choice_setting.js       |   9 +-
 .../settings_modal/helpers/draft_buttons.vue       | 102 +++++++++++++++++++++
 .../settings_modal/helpers/integer_setting.js      |   8 +-
 .../settings_modal/helpers/integer_setting.vue     |   4 +-
 src/components/settings_modal/helpers/setting.js   |  70 ++++++++++++--
 .../settings_modal/helpers/size_setting.js         |   5 +-
 .../settings_modal/helpers/string_setting.js       |   4 -
 .../settings_modal/helpers/string_setting.vue      |   6 +-
 src/modules/adminSettings.js                       |  52 ++++++++++-
 src/modules/users.js                               |   2 +-
 src/services/api/api.service.js                    |  26 +++++-
 14 files changed, 284 insertions(+), 45 deletions(-)
 create mode 100644 src/components/settings_modal/helpers/draft_buttons.vue

(limited to 'src')

diff --git a/src/components/settings_modal/admin_tabs/instance_tab.vue b/src/components/settings_modal/admin_tabs/instance_tab.vue
index 65b3d12f..18ba6127 100644
--- a/src/components/settings_modal/admin_tabs/instance_tab.vue
+++ b/src/components/settings_modal/admin_tabs/instance_tab.vue
@@ -1,18 +1,35 @@
 <template>
-  <div :label="$t('settings.general')">
+  <div :label="$t('admin_dash.instance')">
     <div class="setting-item">
       <h2>{{ $t('admin_dash.instance') }}</h2>
       <ul class="setting-list">
         <li>
-          <StringSetting source="admin" path=":pleroma.:instance.:name">
+          <StringSetting
+            source="admin"
+            path=":pleroma.:instance.:name"
+            draft-mode
+          >
             NAME
           </StringSetting>
         </li>
         <li>
-          <StringSetting source="admin" path=":pleroma.:instance.:description">
+          <StringSetting
+            source="admin"
+            path=":pleroma.:instance.:description"
+            draft-mode
+          >
             DESCRIPTION
           </StringSetting>
         </li>
+        <li>
+          <IntegerSetting
+            source="admin"
+            path=":pleroma.:instance.:limit"
+            draft-mode
+          >
+            POST LIMIT
+          </IntegerSetting>
+        </li>
       </ul>
     </div>
   </div>
diff --git a/src/components/settings_modal/helpers/boolean_setting.js b/src/components/settings_modal/helpers/boolean_setting.js
index 078cc5ff..0df01d31 100644
--- a/src/components/settings_modal/helpers/boolean_setting.js
+++ b/src/components/settings_modal/helpers/boolean_setting.js
@@ -1,13 +1,16 @@
 import Checkbox from 'src/components/checkbox/checkbox.vue'
-import ModifiedIndicator from './modified_indicator.vue'
-import ProfileSettingIndicator from './profile_setting_indicator.vue'
 import Setting from './setting.js'
 
 export default {
+  ...Setting,
   components: {
-    Checkbox,
-    ModifiedIndicator,
-    ProfileSettingIndicator
+    ...Setting.components,
+    Checkbox
   },
-  ...Setting
+  methods: {
+    ...Setting.methods,
+    getValue (e) {
+      return e
+    }
+  }
 }
diff --git a/src/components/settings_modal/helpers/boolean_setting.vue b/src/components/settings_modal/helpers/boolean_setting.vue
index 260ee75e..7e05fe85 100644
--- a/src/components/settings_modal/helpers/boolean_setting.vue
+++ b/src/components/settings_modal/helpers/boolean_setting.vue
@@ -4,7 +4,7 @@
     class="BooleanSetting"
   >
     <Checkbox
-      :model-value="state"
+      :model-value="draftMode ? draft :state"
       :disabled="shouldBeDisabled"
       @update:modelValue="update"
     >
@@ -20,6 +20,7 @@
         :onclick="reset"
       />
       <ProfileSettingIndicator :is-profile="isProfileSetting" />
+      <DraftButtons />
     </Checkbox>
   </label>
 </template>
diff --git a/src/components/settings_modal/helpers/choice_setting.js b/src/components/settings_modal/helpers/choice_setting.js
index 8aa5f54b..a3c3bf44 100644
--- a/src/components/settings_modal/helpers/choice_setting.js
+++ b/src/components/settings_modal/helpers/choice_setting.js
@@ -1,15 +1,12 @@
 import Select from 'src/components/select/select.vue'
-import ModifiedIndicator from './modified_indicator.vue'
-import ProfileSettingIndicator from './profile_setting_indicator.vue'
 import Setting from './setting.js'
 
 export default {
+  ...Setting,
   components: {
-    Select,
-    ModifiedIndicator,
-    ProfileSettingIndicator
+    ...Setting.components,
+    Select
   },
-  ...Setting,
   props: {
     ...Setting.props,
     options: {
diff --git a/src/components/settings_modal/helpers/draft_buttons.vue b/src/components/settings_modal/helpers/draft_buttons.vue
new file mode 100644
index 00000000..0d99da13
--- /dev/null
+++ b/src/components/settings_modal/helpers/draft_buttons.vue
@@ -0,0 +1,102 @@
+<!-- this is a helper exclusive to Setting components -->
+<!-- TODO make it reusable -->
+<template>
+  <span
+    class="DraftButtons"
+  >
+    <Popover
+      trigger="hover"
+      :trigger-attrs="{ 'aria-label': $t('settings.commit_value_tooltip') }"
+    >
+      <template #trigger>
+        &nbsp;
+        <button
+        v-if="$parent.isDirty"
+        class="button button-default btn"
+        type="button"
+        :title="$t('settings.commit_value')"
+        @click="$parent.commitDraft"
+        >
+        {{ $t('settings.commit_value') }}
+        </button>
+      </template>
+      <template #content>
+        <div class="modified-tooltip">
+          {{ $t('settings.commit_value_tooltip') }}
+        </div>
+      </template>
+    </Popover>
+    <Popover
+      trigger="hover"
+      :trigger-attrs="{ 'aria-label': $t('settings.reset_value_tooltip') }"
+    >
+      <template #trigger>
+        &nbsp;
+        <button
+        v-if="$parent.isDirty"
+        class="button button-default btn"
+        type="button"
+        :title="$t('settings.reset_value')"
+        @click="$parent.reset"
+        >
+        {{ $t('settings.reset_value') }}
+        </button>
+      </template>
+      <template #content>
+        <div class="modified-tooltip">
+          {{ $t('settings.reset_value_tooltip') }}
+        </div>
+      </template>
+    </Popover>
+    <Popover
+      trigger="hover"
+      :trigger-attrs="{ 'aria-label': $t('settings.hard_reset_value_tooltip') }"
+    >
+      <template #trigger>
+        &nbsp;
+        <button
+        v-if="$parent.canHardReset"
+        class="button button-default btn"
+        type="button"
+        :title="$t('settings.hard_reset_value')"
+        @click="$parent.hardReset"
+        >
+        {{ $t('settings.hard_reset_value') }}
+        </button>
+      </template>
+      <template #content>
+        <div class="modified-tooltip">
+          {{ $t('settings.hard_reset_value_tooltip') }}
+        </div>
+      </template>
+    </Popover>
+  </span>
+</template>
+
+<script>
+import Popover from 'src/components/popover/popover.vue'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import { faWrench } from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faWrench
+)
+
+export default {
+  components: { Popover },
+  props: ['changed']
+}
+</script>
+
+<style lang="scss">
+.DraftButtons {
+  display: inline-block;
+  position: relative;
+}
+
+.draft-tooltip {
+  margin: 0.5em 1em;
+  min-width: 10em;
+  text-align: center;
+}
+</style>
diff --git a/src/components/settings_modal/helpers/integer_setting.js b/src/components/settings_modal/helpers/integer_setting.js
index 0f29f11a..8ad033e7 100644
--- a/src/components/settings_modal/helpers/integer_setting.js
+++ b/src/components/settings_modal/helpers/integer_setting.js
@@ -1,15 +1,11 @@
-import ModifiedIndicator from './modified_indicator.vue'
 import Setting from './setting.js'
 
 export default {
-  components: {
-    ModifiedIndicator
-  },
   ...Setting,
   methods: {
     ...Setting.methods,
-    update (e) {
-      this.configSink(this.path, parseInt(e.target.value))
+    getValue (e) {
+      return parseInt(e.target.value)
     }
   }
 }
diff --git a/src/components/settings_modal/helpers/integer_setting.vue b/src/components/settings_modal/helpers/integer_setting.vue
index 695e2673..e900b87c 100644
--- a/src/components/settings_modal/helpers/integer_setting.vue
+++ b/src/components/settings_modal/helpers/integer_setting.vue
@@ -13,7 +13,7 @@
       step="1"
       :disabled="disabled"
       :min="min || 0"
-      :value="state"
+      :value="draftMode ? draft :state"
       @change="update"
     >
     {{ ' ' }}
@@ -21,6 +21,8 @@
       :changed="isChanged"
       :onclick="reset"
     />
+    <ProfileSettingIndicator :is-profile="isProfileSetting" />
+    <DraftButtons />
   </span>
 </template>
 
diff --git a/src/components/settings_modal/helpers/setting.js b/src/components/settings_modal/helpers/setting.js
index 9195d3e9..0971b919 100644
--- a/src/components/settings_modal/helpers/setting.js
+++ b/src/components/settings_modal/helpers/setting.js
@@ -1,5 +1,16 @@
+import Checkbox from 'src/components/checkbox/checkbox.vue'
+import ModifiedIndicator from './modified_indicator.vue'
+import ProfileSettingIndicator from './profile_setting_indicator.vue'
+import DraftButtons from './draft_buttons.vue'
 import { get, set } from 'lodash'
+
 export default {
+  components: {
+    Checkbox,
+    ModifiedIndicator,
+    DraftButtons,
+    ProfileSettingIndicator
+  },
   props: {
     path: {
       type: String,
@@ -23,6 +34,20 @@ export default {
     source: {
       type: String,
       default: 'default'
+    },
+    draftMode: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data () {
+    return {
+      draft: null
+    }
+  },
+  created () {
+    if (this.draftMode) {
+      this.draft = this.state
     }
   },
   computed: {
@@ -53,7 +78,7 @@ export default {
         case 'profile':
           return (k, v) => this.$store.dispatch('setProfileOption', { name: k, value: v })
         case 'admin':
-          return (k, v) => console.log(this.path, k, v)
+          return (k, v) => this.$store.dispatch('pushAdminSetting', { path: k, value: v })
         default:
           return (k, v) => this.$store.dispatch('setOption', { name: k, value: v })
       }
@@ -72,25 +97,56 @@ export default {
     isChanged () {
       switch (this.source) {
         case 'profile':
-          return false
         case 'admin':
-          console.log(this.$store.state.adminSettings.modifiedPaths)
-          return this.$store.state.adminSettings.modifiedPaths.has(this.path)
+          return false
         default:
           return this.state !== this.defaultState
       }
     },
+    isDirty () {
+      return this.draftMode && this.draft !== this.state
+    },
+    canHardReset () {
+      return this.source === 'admin' && this.$store.state.adminSettings.modifiedPaths.has(this.path)
+    },
     matchesExpertLevel () {
       return (this.expert || 0) <= this.$store.state.config.expertLevel > 0
     }
   },
   methods: {
+    getValue (e) {
+      return e.target.value
+    },
     update (e) {
-      console.log('U', this.path, e)
-      this.configSink(this.path, e)
+      if (this.draftMode) {
+        this.draft = this.getValue(e)
+      } else {
+        this.configSink(this.path, this.getValue(e))
+      }
+    },
+    commitDraft () {
+      if (this.draftMode) {
+        this.configSink(this.path, this.draft)
+      }
     },
     reset () {
-      set(this.$store.getters.mergedConfig, this.path, this.defaultState)
+      console.log('reset')
+      if (this.draftMode) {
+        console.log(this.draft)
+        console.log(this.state)
+        this.draft = this.state
+      } else {
+        set(this.$store.getters.mergedConfig, this.path, this.defaultState)
+      }
+    },
+    hardReset () {
+      switch (this.source) {
+        case 'admin':
+          return this.$store.dispatch('resetAdminSetting', { path: this.path })
+            .then(() => { this.draft = this.state })
+        default:
+          console.warn('Hard reset not implemented yet!')
+      }
     }
   }
 }
diff --git a/src/components/settings_modal/helpers/size_setting.js b/src/components/settings_modal/helpers/size_setting.js
index 4a0f7e48..12cef705 100644
--- a/src/components/settings_modal/helpers/size_setting.js
+++ b/src/components/settings_modal/helpers/size_setting.js
@@ -1,4 +1,3 @@
-import ModifiedIndicator from './modified_indicator.vue'
 import Select from 'src/components/select/select.vue'
 import Setting from './setting.js'
 
@@ -7,11 +6,11 @@ export const defaultHorizontalUnits = ['px', 'rem', 'vw']
 export const defaultVerticalUnits = ['px', 'rem', 'vh']
 
 export default {
+  ...Setting,
   components: {
-    ModifiedIndicator,
+    ...Setting.components,
     Select
   },
-  ...Setting,
   props: {
     ...Setting.props,
     min: Number,
diff --git a/src/components/settings_modal/helpers/string_setting.js b/src/components/settings_modal/helpers/string_setting.js
index 64f8772d..b368cfc8 100644
--- a/src/components/settings_modal/helpers/string_setting.js
+++ b/src/components/settings_modal/helpers/string_setting.js
@@ -1,9 +1,5 @@
-import ModifiedIndicator from './modified_indicator.vue'
 import Setting from './setting.js'
 
 export default {
-  components: {
-    ModifiedIndicator
-  },
   ...Setting
 }
diff --git a/src/components/settings_modal/helpers/string_setting.vue b/src/components/settings_modal/helpers/string_setting.vue
index e4bd2de9..0a71aeab 100644
--- a/src/components/settings_modal/helpers/string_setting.vue
+++ b/src/components/settings_modal/helpers/string_setting.vue
@@ -11,7 +11,7 @@
       class="string-input"
       step="1"
       :disabled="disabled"
-      :value="state"
+      :value="draftMode ? draft :state"
       @change="update"
     >
     {{ ' ' }}
@@ -19,7 +19,9 @@
       :changed="isChanged"
       :onclick="reset"
     />
+    <ProfileSettingIndicator :is-profile="isProfileSetting" />
+    <DraftButtons />
   </label>
 </template>
 
-<script src="./boolean_setting.js"></script>
+<script src="./string_setting.js"></script>
diff --git a/src/modules/adminSettings.js b/src/modules/adminSettings.js
index 8006717d..d1df67d4 100644
--- a/src/modules/adminSettings.js
+++ b/src/modules/adminSettings.js
@@ -22,8 +22,8 @@ const adminSettingsStorage = {
   },
   actions: {
     setInstanceAdminSettings ({ state, commit, dispatch }, { backendDbConfig }) {
-      const config = {}
-      const modifiedPaths = new Set()
+      const config = state.config || {}
+      const modifiedPaths = state.modifiedPaths || new Set()
       backendDbConfig.configs.forEach(c => {
         const path = c.group + '.' + c.key
         if (c.db) {
@@ -40,8 +40,54 @@ const adminSettingsStorage = {
         }
         set(config, path, convert(c.value))
       })
-      console.log(config)
       commit('updateAdminSettings', { config, modifiedPaths })
+    },
+    pushAdminSetting ({ rootState, state, commit, dispatch }, { path, value }) {
+      const [group, key, ...rest] = path.split(/\./g)
+      const clone = {} // not actually cloning the entire thing to avoid excessive writes
+      set(clone, rest.join('.'), value)
+
+      // TODO cleanup paths in modifiedPaths
+      const convert = (value) => {
+        if (typeof value !== 'object') {
+          return value
+        } else if (Array.isArray(value)) {
+          return value.map(convert)
+        } else {
+          return Object.entries(value).map(([k, v]) => ({ tuple: [k, v] }))
+        }
+      }
+
+      rootState.api.backendInteractor.pushInstanceDBConfig({
+        payload: {
+          configs: [{
+            group,
+            key,
+            value: convert(clone)
+          }]
+        }
+      })
+        .then(() => rootState.api.backendInteractor.fetchInstanceDBConfig())
+        .then(backendDbConfig => dispatch('setInstanceAdminSettings', { backendDbConfig }))
+    },
+    resetAdminSetting ({ rootState, state, commit, dispatch }, { path }) {
+      console.log('ASS')
+      const [group, key, subkey] = path.split(/\./g)
+
+      state.modifiedPaths.delete(path)
+
+      return rootState.api.backendInteractor.pushInstanceDBConfig({
+        payload: {
+          configs: [{
+            group,
+            key,
+            delete: true,
+            subkeys: [subkey]
+          }]
+        }
+      })
+        .then(() => rootState.api.backendInteractor.fetchInstanceDBConfig())
+        .then(backendDbConfig => dispatch('setInstanceAdminSettings', { backendDbConfig }))
     }
   }
 }
diff --git a/src/modules/users.js b/src/modules/users.js
index 74dbdffc..12e582f4 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -564,7 +564,7 @@ const users = {
               user.domainMutes = []
               commit('setCurrentUser', user)
               commit('setServerSideStorage', user)
-              if (user.rights.moderator || user.rights.admin) {
+              if (user.rights.admin) {
                 store.rootState.api.backendInteractor.fetchInstanceDBConfig()
                   .then(backendDbConfig => dispatch('setInstanceAdminSettings', { backendDbConfig }))
               }
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index f0aa898a..71ba1dec 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -108,7 +108,7 @@ const PLEROMA_POST_ANNOUNCEMENT_URL = '/api/v1/pleroma/admin/announcements'
 const PLEROMA_EDIT_ANNOUNCEMENT_URL = id => `/api/v1/pleroma/admin/announcements/${id}`
 const PLEROMA_DELETE_ANNOUNCEMENT_URL = id => `/api/v1/pleroma/admin/announcements/${id}`
 
-const PLEROMA_ADMIN_CONFIG_URL = '/api/v1/pleroma/admin/config'
+const PLEROMA_ADMIN_CONFIG_URL = '/api/pleroma/admin/config'
 
 const oldfetch = window.fetch
 
@@ -1677,6 +1677,27 @@ const fetchInstanceDBConfig = ({ credentials }) => {
     })
 }
 
+const pushInstanceDBConfig = ({ credentials, payload }) => {
+  return fetch(PLEROMA_ADMIN_CONFIG_URL, {
+    headers: {
+      Accept: 'application/json',
+      'Content-Type': 'application/json',
+      ...authHeaders(credentials)
+    },
+    method: 'POST',
+    body: JSON.stringify(payload)
+  })
+    .then((response) => {
+      if (response.ok) {
+        return response.json()
+      } else {
+        return {
+          error: response
+        }
+      }
+    })
+}
+
 const apiService = {
   verifyCredentials,
   fetchTimeline,
@@ -1791,7 +1812,8 @@ const apiService = {
   editAnnouncement,
   deleteAnnouncement,
   adminFetchAnnouncements,
-  fetchInstanceDBConfig
+  fetchInstanceDBConfig,
+  pushInstanceDBConfig
 }
 
 export default apiService
-- 
cgit v1.2.3-70-g09d2


From 27f63d5e50de0ccb005f8591baa9a117969fee56 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Fri, 17 Mar 2023 00:06:31 +0200
Subject: lint

---
 src/components/admin_modal/tabs/general_tab.js     |  2 +-
 .../settings_modal/helpers/draft_buttons.vue       | 36 +++++++++++-----------
 2 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'src')

diff --git a/src/components/admin_modal/tabs/general_tab.js b/src/components/admin_modal/tabs/general_tab.js
index 8c166f19..68b0ac4b 100644
--- a/src/components/admin_modal/tabs/general_tab.js
+++ b/src/components/admin_modal/tabs/general_tab.js
@@ -15,7 +15,7 @@ const GeneralTab = {
   components: {
     BooleanSetting,
     ChoiceSetting,
-    IntegerSetting,
+    IntegerSetting
   },
   computed: {
     mergedConfig () {
diff --git a/src/components/settings_modal/helpers/draft_buttons.vue b/src/components/settings_modal/helpers/draft_buttons.vue
index 0d99da13..53ddc9b4 100644
--- a/src/components/settings_modal/helpers/draft_buttons.vue
+++ b/src/components/settings_modal/helpers/draft_buttons.vue
@@ -11,13 +11,13 @@
       <template #trigger>
         &nbsp;
         <button
-        v-if="$parent.isDirty"
-        class="button button-default btn"
-        type="button"
-        :title="$t('settings.commit_value')"
-        @click="$parent.commitDraft"
+          v-if="$parent.isDirty"
+          class="button button-default btn"
+          type="button"
+          :title="$t('settings.commit_value')"
+          @click="$parent.commitDraft"
         >
-        {{ $t('settings.commit_value') }}
+          {{ $t('settings.commit_value') }}
         </button>
       </template>
       <template #content>
@@ -33,13 +33,13 @@
       <template #trigger>
         &nbsp;
         <button
-        v-if="$parent.isDirty"
-        class="button button-default btn"
-        type="button"
-        :title="$t('settings.reset_value')"
-        @click="$parent.reset"
+          v-if="$parent.isDirty"
+          class="button button-default btn"
+          type="button"
+          :title="$t('settings.reset_value')"
+          @click="$parent.reset"
         >
-        {{ $t('settings.reset_value') }}
+          {{ $t('settings.reset_value') }}
         </button>
       </template>
       <template #content>
@@ -55,13 +55,13 @@
       <template #trigger>
         &nbsp;
         <button
-        v-if="$parent.canHardReset"
-        class="button button-default btn"
-        type="button"
-        :title="$t('settings.hard_reset_value')"
-        @click="$parent.hardReset"
+          v-if="$parent.canHardReset"
+          class="button button-default btn"
+          type="button"
+          :title="$t('settings.hard_reset_value')"
+          @click="$parent.hardReset"
         >
-        {{ $t('settings.hard_reset_value') }}
+          {{ $t('settings.hard_reset_value') }}
         </button>
       </template>
       <template #content>
-- 
cgit v1.2.3-70-g09d2


From ab5408d36e74b435bb38f6c8fb6389b4babc388d Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Fri, 17 Mar 2023 00:10:37 +0200
Subject: remove obsolete files

---
 src/components/admin_modal/admin_modal.js          |  68 ------------
 src/components/admin_modal/admin_modal.scss        |  80 --------------
 src/components/admin_modal/admin_modal.vue         | 121 ---------------------
 src/components/admin_modal/admin_modal_content.js  |  88 ---------------
 .../admin_modal/admin_modal_content.scss           |  56 ----------
 src/components/admin_modal/tabs/general_tab.js     |  33 ------
 6 files changed, 446 deletions(-)
 delete mode 100644 src/components/admin_modal/admin_modal.js
 delete mode 100644 src/components/admin_modal/admin_modal.scss
 delete mode 100644 src/components/admin_modal/admin_modal.vue
 delete mode 100644 src/components/admin_modal/admin_modal_content.js
 delete mode 100644 src/components/admin_modal/admin_modal_content.scss
 delete mode 100644 src/components/admin_modal/tabs/general_tab.js

(limited to 'src')

diff --git a/src/components/admin_modal/admin_modal.js b/src/components/admin_modal/admin_modal.js
deleted file mode 100644
index 525f09aa..00000000
--- a/src/components/admin_modal/admin_modal.js
+++ /dev/null
@@ -1,68 +0,0 @@
-import Modal from 'src/components/modal/modal.vue'
-import PanelLoading from 'src/components/panel_loading/panel_loading.vue'
-import AsyncComponentError from 'src/components/async_component_error/async_component_error.vue'
-import getResettableAsyncComponent from 'src/services/resettable_async_component.js'
-import Popover from '../popover/popover.vue'
-import Checkbox from 'src/components/checkbox/checkbox.vue'
-import { library } from '@fortawesome/fontawesome-svg-core'
-import {
-  newImporter,
-  newExporter
-} from 'src/services/export_import/export_import.js'
-import {
-  faTimes,
-  faFileUpload,
-  faFileDownload,
-  faChevronDown
-} from '@fortawesome/free-solid-svg-icons'
-import {
-  faWindowMinimize
-} from '@fortawesome/free-regular-svg-icons'
-
-library.add(
-  faTimes,
-  faWindowMinimize,
-  faFileUpload,
-  faFileDownload,
-  faChevronDown
-)
-
-const AdminModal = {
-  data () {
-    return {}
-  },
-  components: {
-    Modal,
-    Popover,
-    Checkbox,
-    AdminModalContent: getResettableAsyncComponent(
-      () => import('./admin_modal_content.vue'),
-      {
-        loadingComponent: PanelLoading,
-        errorComponent: AsyncComponentError,
-        delay: 0
-      }
-    )
-  },
-  methods: {
-    closeModal () {
-      this.$store.dispatch('closeAdminModal')
-    },
-    peekModal () {
-      this.$store.dispatch('togglePeekAdminModal')
-    }
-  },
-  computed: {
-    modalActivated () {
-      return this.$store.state.interface.adminModalState !== 'hidden'
-    },
-    modalOpenedOnce () {
-      return this.$store.state.interface.adminModalLoaded
-    },
-    modalPeeked () {
-      return this.$store.state.interface.adminModalState === 'minimized'
-    }
-  }
-}
-
-export default AdminModal
diff --git a/src/components/admin_modal/admin_modal.scss b/src/components/admin_modal/admin_modal.scss
deleted file mode 100644
index 0d916f32..00000000
--- a/src/components/admin_modal/admin_modal.scss
+++ /dev/null
@@ -1,80 +0,0 @@
-@import "src/variables";
-
-.admin-modal {
-  overflow: hidden;
-
-  .setting-list,
-  .option-list {
-    list-style-type: none;
-    padding-left: 2em;
-
-    li {
-      margin-bottom: 0.5em;
-    }
-
-    .suboptions {
-      margin-top: 0.3em;
-    }
-  }
-
-  .admin-modal-panel {
-    overflow: hidden;
-    transition: transform;
-    transition-timing-function: ease-in-out;
-    transition-duration: 300ms;
-    width: 1000px;
-    max-width: 90vw;
-    height: 90vh;
-
-    @media all and (max-width: 800px) {
-      max-width: 100vw;
-      height: 100%;
-    }
-
-    >.panel-body {
-      height: 100%;
-      overflow-y: hidden;
-
-      .btn {
-        min-height: 2em;
-        min-width: 10em;
-        padding: 0 2em;
-      }
-    }
-  }
-
-  .admin-footer {
-    display: flex;
-
-    >* {
-      margin-right: 0.5em;
-    }
-
-    .extra-content {
-      display: flex;
-      flex-grow: 1;
-    }
-  }
-
-  &.peek {
-    .admin-modal-panel {
-      /* Explanation:
-       * Modal is positioned vertically centered.
-       * 100vh - 100% = Distance between modal's top+bottom boundaries and screen
-       * (100vh - 100%) / 2 = Distance between bottom (or top) boundary and screen
-       * + 100% - we move modal completely off-screen, it's top boundary touches
-       *   bottom of the screen
-       * - 50px - leaving tiny amount of space so that titlebar + tiny amount of modal is visible
-       */
-      transform: translateY(calc(((100vh - 100%) / 2 + 100%) - 50px));
-
-      @media all and (max-width: 800px) {
-        /* For mobile, the modal takes 100% of the available screen.
-           This ensures the minimized modal is always 50px above the browser bottom
-           bar regardless of whether or not it is visible.
-        */
-        transform: translateY(calc(100% - 50px));
-      }
-    }
-  }
-}
diff --git a/src/components/admin_modal/admin_modal.vue b/src/components/admin_modal/admin_modal.vue
deleted file mode 100644
index d7e5a80f..00000000
--- a/src/components/admin_modal/admin_modal.vue
+++ /dev/null
@@ -1,121 +0,0 @@
-<template>
-  <Modal
-    :is-open="modalActivated"
-    class="admin-modal"
-    :class="{ peek: modalPeeked }"
-    :no-background="modalPeeked"
-  >
-    <div class="admin-modal-panel panel">
-      <div class="panel-heading">
-        <span class="title">
-          {{ $t('admin.settings') }}
-        </span>
-        <transition name="fade">
-          <div
-            v-if="currentSaveStateNotice"
-            class="alert"
-            :class="{ transparent: !currentSaveStateNotice.error, error: currentSaveStateNotice.error}"
-            @click.prevent
-          >
-            {{ currentSaveStateNotice.error ? $t('admin.saving_err') : $t('settings.saving_ok') }}
-          </div>
-        </transition>
-        <button
-          class="btn button-default"
-          :title="$t('general.peek')"
-          @click="peekModal"
-        >
-          <FAIcon
-            :icon="['far', 'window-minimize']"
-            fixed-width
-          />
-        </button>
-        <button
-          class="btn button-default"
-          :title="$t('general.close')"
-          @click="closeModal"
-        >
-          <FAIcon
-            icon="times"
-            fixed-width
-          />
-        </button>
-      </div>
-      <div class="panel-body">
-        <AdminModalContent v-if="modalOpenedOnce" />
-      </div>
-      <div class="panel-footer admin-footer">
-        <Popover
-          class="export"
-          trigger="click"
-          placement="top"
-          :offset="{ y: 5, x: 5 }"
-          :bound-to="{ x: 'container' }"
-          remove-padding
-        >
-          <template #trigger>
-            <button
-              class="btn button-default"
-              :title="$t('general.close')"
-            >
-              <span>{{ $t("admin.file_export_import.backup_restore") }}</span>
-              {{ ' ' }}
-              <FAIcon
-                icon="chevron-down"
-              />
-            </button>
-          </template>
-          <template #content="{close}">
-            <div class="dropdown-menu">
-              <button
-                class="button-default dropdown-item dropdown-item-icon"
-                @click.prevent="backup"
-                @click="close"
-              >
-                <FAIcon
-                  icon="file-download"
-                  fixed-width
-                /><span>{{ $t("admin.file_export_import.backup_settings") }}</span>
-              </button>
-              <button
-                class="button-default dropdown-item dropdown-item-icon"
-                @click.prevent="backupWithTheme"
-                @click="close"
-              >
-                <FAIcon
-                  icon="file-download"
-                  fixed-width
-                /><span>{{ $t("admin.file_export_import.backup_settings_theme") }}</span>
-              </button>
-              <button
-                class="button-default dropdown-item dropdown-item-icon"
-                @click.prevent="restore"
-                @click="close"
-              >
-                <FAIcon
-                  icon="file-upload"
-                  fixed-width
-                /><span>{{ $t("admin.file_export_import.restore_settings") }}</span>
-              </button>
-            </div>
-          </template>
-        </Popover>
-
-        <Checkbox
-          :model-value="!!expertLevel"
-          @update:modelValue="expertLevel = Number($event)"
-        >
-          {{ $t("admin.expert_mode") }}
-        </Checkbox>
-        <span
-          id="unscrolled-content"
-          class="extra-content"
-        />
-      </div>
-    </div>
-  </Modal>
-</template>
-
-<script src="./admin_modal.js"></script>
-
-<style src="./admin_modal.scss" lang="scss"></style>
diff --git a/src/components/admin_modal/admin_modal_content.js b/src/components/admin_modal/admin_modal_content.js
deleted file mode 100644
index 897cc163..00000000
--- a/src/components/admin_modal/admin_modal_content.js
+++ /dev/null
@@ -1,88 +0,0 @@
-import TabSwitcher from 'src/components/tab_switcher/tab_switcher.jsx'
-
-import DataImportExportTab from './tabs/data_import_export_tab.vue'
-import MutesAndBlocksTab from './tabs/mutes_and_blocks_tab.vue'
-import NotificationsTab from './tabs/notifications_tab.vue'
-import FilteringTab from './tabs/filtering_tab.vue'
-import SecurityTab from './tabs/security_tab/security_tab.vue'
-import ProfileTab from './tabs/profile_tab.vue'
-import GeneralTab from './tabs/general_tab.vue'
-import VersionTab from './tabs/version_tab.vue'
-import ThemeTab from './tabs/theme_tab/theme_tab.vue'
-
-import { library } from '@fortawesome/fontawesome-svg-core'
-import {
-  faWrench,
-  faUser,
-  faFilter,
-  faPaintBrush,
-  faBell,
-  faDownload,
-  faEyeSlash,
-  faInfo
-} from '@fortawesome/free-solid-svg-icons'
-
-library.add(
-  faWrench,
-  faUser,
-  faFilter,
-  faPaintBrush,
-  faBell,
-  faDownload,
-  faEyeSlash,
-  faInfo
-)
-
-const AdminModalContent = {
-  components: {
-    TabSwitcher,
-
-    DataImportExportTab,
-    MutesAndBlocksTab,
-    NotificationsTab,
-    FilteringTab,
-    SecurityTab,
-    ProfileTab,
-    GeneralTab,
-    VersionTab,
-    ThemeTab
-  },
-  computed: {
-    isLoggedIn () {
-      return !!this.$store.state.users.currentUser
-    },
-    open () {
-      return this.$store.state.interface.AdminModalState !== 'hidden'
-    },
-    bodyLock () {
-      return this.$store.state.interface.AdminModalState === 'visible'
-    }
-  },
-  methods: {
-    onOpen () {
-      const targetTab = this.$store.state.interface.AdminModalTargetTab
-      // We're being told to open in specific tab
-      if (targetTab) {
-        const tabIndex = this.$refs.tabSwitcher.$slots.default().findIndex(elm => {
-          return elm.props && elm.props['data-tab-name'] === targetTab
-        })
-        if (tabIndex >= 0) {
-          this.$refs.tabSwitcher.setTab(tabIndex)
-        }
-      }
-      // Clear the state of target tab, so that next time Admin is opened
-      // it doesn't force it.
-      this.$store.dispatch('clearAdminModalTargetTab')
-    }
-  },
-  mounted () {
-    this.onOpen()
-  },
-  watch: {
-    open: function (value) {
-      if (value) this.onOpen()
-    }
-  }
-}
-
-export default AdminModalContent
diff --git a/src/components/admin_modal/admin_modal_content.scss b/src/components/admin_modal/admin_modal_content.scss
deleted file mode 100644
index 2db7b2f8..00000000
--- a/src/components/admin_modal/admin_modal_content.scss
+++ /dev/null
@@ -1,56 +0,0 @@
-@import "src/variables";
-
-.admin_tab-switcher {
-  height: 100%;
-
-  .setting-item {
-    border-bottom: 2px solid var(--fg, $fallback--fg);
-    margin: 1em 1em 1.4em;
-    padding-bottom: 1.4em;
-
-    > div,
-    > label {
-      display: block;
-      margin-bottom: 0.5em;
-
-      &:last-child {
-        margin-bottom: 0;
-      }
-    }
-
-    .select-multiple {
-      display: flex;
-
-      .option-list {
-        margin: 0;
-        padding-left: 0.5em;
-      }
-    }
-
-    &:last-child {
-      border-bottom: none;
-      padding-bottom: 0;
-      margin-bottom: 1em;
-    }
-
-    select {
-      min-width: 10em;
-    }
-
-    textarea {
-      width: 100%;
-      max-width: 100%;
-      height: 100px;
-    }
-
-    .unavailable,
-    .unavailable svg {
-      color: var(--cRed, $fallback--cRed);
-      color: $fallback--cRed;
-    }
-
-    .number-input {
-      max-width: 6em;
-    }
-  }
-}
diff --git a/src/components/admin_modal/tabs/general_tab.js b/src/components/admin_modal/tabs/general_tab.js
deleted file mode 100644
index 68b0ac4b..00000000
--- a/src/components/admin_modal/tabs/general_tab.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import BooleanSetting from '../settings_modal/helpers/boolean_setting.vue'
-import ChoiceSetting from '../settings_modal/helpers/choice_setting.vue'
-import IntegerSetting from '../settings_modal/helpers/integer_setting.vue'
-
-import { library } from '@fortawesome/fontawesome-svg-core'
-import {
-  faGlobe
-} from '@fortawesome/free-solid-svg-icons'
-
-library.add(
-  faGlobe
-)
-
-const GeneralTab = {
-  components: {
-    BooleanSetting,
-    ChoiceSetting,
-    IntegerSetting
-  },
-  computed: {
-    mergedConfig () {
-      console.log(this.$store.state)
-      return this.$store.state
-    }
-  },
-  methods: {
-    changeDefaultScope (value) {
-      this.$store.dispatch('setProfileOption', { name: 'defaultScope', value })
-    }
-  }
-}
-
-export default GeneralTab
-- 
cgit v1.2.3-70-g09d2


From 998aa8f732bbf9d074abeb5916ceb5effd8afe5c Mon Sep 17 00:00:00 2001
From: Alexander Tumin <iamtakingiteasy@eientei.org>
Date: Sun, 18 Dec 2022 22:04:58 +0300
Subject: Allow custom emoji reactions

---
 src/components/emoji_reactions/emoji_reactions.vue |  27 +++++-
 src/components/notification/notification.vue       |  15 ++-
 src/components/notifications/notifications.scss    |   7 ++
 src/components/react_button/react_button.js        |  92 ++----------------
 src/components/react_button/react_button.vue       | 108 +++++++--------------
 .../entity_normalizer/entity_normalizer.service.js |   1 +
 6 files changed, 89 insertions(+), 161 deletions(-)

(limited to 'src')

diff --git a/src/components/emoji_reactions/emoji_reactions.vue b/src/components/emoji_reactions/emoji_reactions.vue
index a63daa97..12783114 100644
--- a/src/components/emoji_reactions/emoji_reactions.vue
+++ b/src/components/emoji_reactions/emoji_reactions.vue
@@ -2,7 +2,7 @@
   <div class="EmojiReactions">
     <UserListPopover
       v-for="(reaction) in emojiReactions"
-      :key="reaction.name"
+      :key="reaction.url || reaction.name"
       :users="accountsForEmoji[reaction.name]"
     >
       <button
@@ -11,7 +11,21 @@
         @click="emojiOnClick(reaction.name, $event)"
         @mouseenter="fetchEmojiReactionsByIfMissing()"
       >
-        <span class="reaction-emoji">{{ reaction.name }}</span>
+        <span
+          v-if="reaction.url"
+          class="reaction-emoji"
+        >
+          <img
+            :src="reaction.url"
+            :title="reaction.name"
+            class="reaction-emoji-content"
+            width="1em"
+          >
+        </span>
+        <span
+          v-else
+          class="reaction-emoji reaction-emoji-content"
+        >{{ reaction.name }}</span>
         <span>{{ reaction.count }}</span>
       </button>
     </UserListPopover>
@@ -46,9 +60,18 @@
 
     .reaction-emoji {
       width: 1.25em;
+      height: 1.25em;
       margin-right: 0.25em;
     }
 
+    .reaction-emoji-content {
+      max-width: 1.25em;
+      max-height: 1.25em;
+      width: auto;
+      height: auto;
+      overflow: hidden;
+    }
+
     &:focus {
       outline: none;
     }
diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue
index e1ea42ad..4d801c5e 100644
--- a/src/components/notification/notification.vue
+++ b/src/components/notification/notification.vue
@@ -121,7 +121,16 @@
                   scope="global"
                   keypath="notifications.reacted_with"
                 >
-                  <span class="emoji-reaction-emoji">{{ notification.emoji }}</span>
+                  <img
+                    v-if="notification.emoji_url"
+                    class="emoji-reaction-emoji emoji-reaction-emoji-image"
+                    :src="notification.emoji_url"
+                    :name="notification.emoji"
+                  >
+                  <span
+                    v-else
+                    class="emoji-reaction-emoji"
+                  >{{ notification.emoji }}</span>
                 </i18n-t>
               </small>
             </span>
@@ -153,9 +162,9 @@
             </router-link>
             <button
               class="button-unstyled expand-icon"
-              @click.prevent="toggleStatusExpanded"
-              :title="$t('tool_tip.toggle_expand')"
               :aria-expanded="statusExpanded"
+              :title="$t('tool_tip.toggle_expand')"
+              @click.prevent="toggleStatusExpanded"
             >
               <FAIcon
                 class="fa-scale-110"
diff --git a/src/components/notifications/notifications.scss b/src/components/notifications/notifications.scss
index 41cfcef0..61f7317e 100644
--- a/src/components/notifications/notifications.scss
+++ b/src/components/notifications/notifications.scss
@@ -129,6 +129,13 @@
 
   .emoji-reaction-emoji {
     font-size: 1.3em;
+    max-width: 1.25em;
+    height: 1.25em;
+    width: auto;
+  }
+
+  .emoji-reaction-emoji-image {
+    vertical-align: middle;
   }
 
   .notification-details {
diff --git a/src/components/react_button/react_button.js b/src/components/react_button/react_button.js
index 47a48623..11bee8b0 100644
--- a/src/components/react_button/react_button.js
+++ b/src/components/react_button/react_button.js
@@ -1,9 +1,8 @@
 import Popover from '../popover/popover.vue'
-import { ensureFinalFallback } from '../../i18n/languages.js'
+import EmojiPicker from '../emoji_picker/emoji_picker.vue'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faPlus, faTimes } from '@fortawesome/free-solid-svg-icons'
 import { faSmileBeam } from '@fortawesome/free-regular-svg-icons'
-import { trim } from 'lodash'
 
 library.add(
   faPlus,
@@ -20,103 +19,32 @@ const ReactButton = {
     }
   },
   components: {
-    Popover
+    Popover,
+    EmojiPicker
   },
   methods: {
-    addReaction (event, emoji, close) {
+    addReaction (event) {
+      const emoji = event.insertion
       const existingReaction = this.status.emoji_reactions.find(r => r.name === emoji)
       if (existingReaction && existingReaction.me) {
         this.$store.dispatch('unreactWithEmoji', { id: this.status.id, emoji })
       } else {
         this.$store.dispatch('reactWithEmoji', { id: this.status.id, emoji })
       }
-      close()
+    },
+    show () {
+      if (!this.expanded) {
+        this.$refs.picker.showPicker()
+      }
     },
     onShow () {
       this.expanded = true
-      this.focusInput()
     },
     onClose () {
       this.expanded = false
-    },
-    focusInput () {
-      this.$nextTick(() => {
-        const input = document.querySelector('.reaction-picker-filter > input')
-        if (input) input.focus()
-      })
-    },
-    // Vaguely adjusted copypaste from emoji_input and emoji_picker!
-    maybeLocalizedEmojiNamesAndKeywords (emoji) {
-      const names = [emoji.displayText]
-      const keywords = []
-
-      if (emoji.displayTextI18n) {
-        names.push(this.$t(emoji.displayTextI18n.key, emoji.displayTextI18n.args))
-      }
-
-      if (emoji.annotations) {
-        this.languages.forEach(lang => {
-          names.push(emoji.annotations[lang]?.name)
-
-          keywords.push(...(emoji.annotations[lang]?.keywords || []))
-        })
-      }
-
-      return {
-        names: names.filter(k => k),
-        keywords: keywords.filter(k => k)
-      }
-    },
-    maybeLocalizedEmojiName (emoji) {
-      if (!emoji.annotations) {
-        return emoji.displayText
-      }
-
-      if (emoji.displayTextI18n) {
-        return this.$t(emoji.displayTextI18n.key, emoji.displayTextI18n.args)
-      }
-
-      for (const lang of this.languages) {
-        if (emoji.annotations[lang]?.name) {
-          return emoji.annotations[lang].name
-        }
-      }
-
-      return emoji.displayText
     }
   },
   computed: {
-    commonEmojis () {
-      const hardcodedSet = new Set(['👍', '😠', '👀', '😂', '🔥'])
-      return this.$store.getters.standardEmojiList.filter(emoji => hardcodedSet.has(emoji.replacement))
-    },
-    languages () {
-      return ensureFinalFallback(this.$store.getters.mergedConfig.interfaceLanguage)
-    },
-    emojis () {
-      if (this.filterWord !== '') {
-        const keywordLowercase = trim(this.filterWord.toLowerCase())
-
-        const orderedEmojiList = []
-        for (const emoji of this.$store.getters.standardEmojiList) {
-          const indices = this.maybeLocalizedEmojiNamesAndKeywords(emoji)
-            .keywords
-            .map(k => k.toLowerCase().indexOf(keywordLowercase))
-            .filter(k => k > -1)
-
-          const indexOfKeyword = indices.length ? Math.min(...indices) : -1
-
-          if (indexOfKeyword > -1) {
-            if (!Array.isArray(orderedEmojiList[indexOfKeyword])) {
-              orderedEmojiList[indexOfKeyword] = []
-            }
-            orderedEmojiList[indexOfKeyword].push(emoji)
-          }
-        }
-        return orderedEmojiList.flat()
-      }
-      return this.$store.getters.standardEmojiList || []
-    },
     mergedConfig () {
       return this.$store.getters.mergedConfig
     }
diff --git a/src/components/react_button/react_button.vue b/src/components/react_button/react_button.vue
index a813b6fd..de08dd4c 100644
--- a/src/components/react_button/react_button.vue
+++ b/src/components/react_button/react_button.vue
@@ -1,73 +1,38 @@
 <template>
-  <Popover
-    trigger="click"
-    class="ReactButton"
-    placement="top"
-    :offset="{ y: 5 }"
-    :bound-to="{ x: 'container' }"
-    remove-padding
-    popover-class="ReactButton popover-default"
-    @show="onShow"
-    @close="onClose"
-  >
-    <template #content="{close}">
-      <div class="reaction-picker-filter">
-        <input
-          v-model="filterWord"
-          size="1"
-          :placeholder="$t('emoji.search_emoji')"
-          @input="$event.target.composing = false"
-        >
-      </div>
-      <div class="reaction-picker">
-        <span
-          v-for="emoji in commonEmojis"
-          :key="emoji.replacement"
-          class="emoji-button"
-          :title="maybeLocalizedEmojiName(emoji)"
-          @click="addReaction($event, emoji.replacement, close)"
-        >
-          {{ emoji.replacement }}
-        </span>
-        <div class="reaction-picker-divider" />
-        <span
-          v-for="(emoji, key) in emojis"
-          :key="key"
-          class="emoji-button"
-          :title="maybeLocalizedEmojiName(emoji)"
-          @click="addReaction($event, emoji.replacement, close)"
-        >
-          {{ emoji.replacement }}
-        </span>
-        <div class="reaction-bottom-fader" />
-      </div>
-    </template>
-    <template #trigger>
-      <span
-        class="button-unstyled popover-trigger"
-        :title="$t('tool_tip.add_reaction')"
-      >
-        <FALayers>
-          <FAIcon
-            class="fa-scale-110 fa-old-padding"
-            :icon="['far', 'smile-beam']"
-          />
-          <FAIcon
-            v-show="!expanded"
-            class="focus-marker"
-            transform="shrink-6 up-9 right-17"
-            icon="plus"
-          />
-          <FAIcon
-            v-show="expanded"
-            class="focus-marker"
-            transform="shrink-6 up-9 right-17"
-            icon="times"
-          />
-        </FALayers>
-      </span>
-    </template>
-  </Popover>
+  <span class="ReactButton">
+    <EmojiPicker
+      ref="picker"
+      :enable-sticker-picker="enableStickerPicker"
+      class="emoji-picker-panel"
+      @emoji="addReaction"
+      @show="onShow"
+      @close="onClose"
+    />
+    <span
+      class="button-unstyled popover-trigger"
+      :title="$t('tool_tip.add_reaction')"
+      @click.stop.prevent="show"
+    >
+      <FALayers>
+        <FAIcon
+          class="fa-scale-110 fa-old-padding"
+          :icon="['far', 'smile-beam']"
+        />
+        <FAIcon
+          v-show="!expanded"
+          class="focus-marker"
+          transform="shrink-6 up-9 right-17"
+          icon="plus"
+        />
+        <FAIcon
+          v-show="expanded"
+          class="focus-marker"
+          transform="shrink-6 up-9 right-17"
+          icon="times"
+        />
+      </FALayers>
+    </span>
+  </span>
 </template>
 
 <script src="./react_button.js"></script>
@@ -135,11 +100,6 @@
       color: $fallback--text;
       color: var(--text, $fallback--text);
     }
-  }
-
-  .popover-trigger-button {
-    /* override of popover internal stuff */
-    width: auto;
 
     @include unfocused-style {
       .focus-marker {
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index 53c3108c..adefc5a5 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -441,6 +441,7 @@ export const parseNotification = (data) => {
       : parseUser(data.target)
     output.from_profile = parseUser(data.account)
     output.emoji = data.emoji
+    output.emoji_url = data.emoji_url
     if (data.report) {
       output.report = data.report
       output.report.content = data.report.content
-- 
cgit v1.2.3-70-g09d2


From 832019b2c26f7b219db75e47060ab95251c14c26 Mon Sep 17 00:00:00 2001
From: Alexander Tumin <iamtakingiteasy@eientei.org>
Date: Thu, 2 Mar 2023 11:13:05 +0300
Subject: Hide custom emoji in reaction picker when BE does not advertise
 pleroma_custom_emoji_reactions

---
 src/boot/after_store.js                      | 1 +
 src/components/emoji_picker/emoji_picker.js  | 8 ++++++++
 src/components/react_button/react_button.js  | 4 ++--
 src/components/react_button/react_button.vue | 1 +
 src/modules/instance.js                      | 1 +
 5 files changed, 13 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index d2e7f488..9c1f007b 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -253,6 +253,7 @@ const getNodeInfo = async ({ store }) => {
       store.dispatch('setInstanceOption', { name: 'safeDM', value: features.includes('safe_dm_mentions') })
       store.dispatch('setInstanceOption', { name: 'shoutAvailable', value: features.includes('chat') })
       store.dispatch('setInstanceOption', { name: 'pleromaChatMessagesAvailable', value: features.includes('pleroma_chat_messages') })
+      store.dispatch('setInstanceOption', { name: 'pleromaCustomEmojiReactionsAvailable', value: features.includes('pleroma_custom_emoji_reactions') })
       store.dispatch('setInstanceOption', { name: 'gopherAvailable', value: features.includes('gopher') })
       store.dispatch('setInstanceOption', { name: 'pollsAvailable', value: features.includes('polls') })
       store.dispatch('setInstanceOption', { name: 'editingAvailable', value: features.includes('editing') })
diff --git a/src/components/emoji_picker/emoji_picker.js b/src/components/emoji_picker/emoji_picker.js
index 0d7ca812..349b043d 100644
--- a/src/components/emoji_picker/emoji_picker.js
+++ b/src/components/emoji_picker/emoji_picker.js
@@ -98,6 +98,11 @@ const EmojiPicker = {
       required: false,
       type: Boolean,
       default: false
+    },
+    hideCustomEmoji: {
+      required: false,
+      type: Boolean,
+      default: false
     }
   },
   data () {
@@ -280,6 +285,9 @@ const EmojiPicker = {
       return 0
     },
     allCustomGroups () {
+      if (this.hideCustomEmoji) {
+        return {}
+      }
       const emojis = this.$store.getters.groupedCustomEmojis
       if (emojis.unpacked) {
         emojis.unpacked.text = this.$t('emoji.unpacked')
diff --git a/src/components/react_button/react_button.js b/src/components/react_button/react_button.js
index 11bee8b0..8eed4b60 100644
--- a/src/components/react_button/react_button.js
+++ b/src/components/react_button/react_button.js
@@ -45,8 +45,8 @@ const ReactButton = {
     }
   },
   computed: {
-    mergedConfig () {
-      return this.$store.getters.mergedConfig
+    hideCustomEmoji () {
+      return !this.$store.state.instance.pleromaChatMessagesAvailable
     }
   }
 }
diff --git a/src/components/react_button/react_button.vue b/src/components/react_button/react_button.vue
index de08dd4c..947536a1 100644
--- a/src/components/react_button/react_button.vue
+++ b/src/components/react_button/react_button.vue
@@ -3,6 +3,7 @@
     <EmojiPicker
       ref="picker"
       :enable-sticker-picker="enableStickerPicker"
+      :hide-custom-emoji="hideCustomEmoji"
       class="emoji-picker-panel"
       @emoji="addReaction"
       @show="onShow"
diff --git a/src/modules/instance.js b/src/modules/instance.js
index 938ca64d..bb0292da 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -123,6 +123,7 @@ const defaultState = {
   // Feature-set, apparently, not everything here is reported...
   shoutAvailable: false,
   pleromaChatMessagesAvailable: false,
+  pleromaCustomEmojiReactionsAvailable: false,
   gopherAvailable: false,
   mediaProxyAvailable: false,
   suggestionsEnabled: false,
-- 
cgit v1.2.3-70-g09d2


From 306e254c15c7cb7a19b680a5666695f429445729 Mon Sep 17 00:00:00 2001
From: Alexander Tumin <iamtakingiteasy@eientei.org>
Date: Fri, 17 Mar 2023 22:24:22 +0300
Subject: Fix user-profile route crash on pinned favorites route

---
 src/components/navigation/navigation.js       | 18 ++++++++++++++++++
 src/components/navigation/navigation_entry.js | 14 ++------------
 src/components/navigation/navigation_pins.js  | 11 ++---------
 3 files changed, 22 insertions(+), 21 deletions(-)

(limited to 'src')

diff --git a/src/components/navigation/navigation.js b/src/components/navigation/navigation.js
index 7f096316..face430e 100644
--- a/src/components/navigation/navigation.js
+++ b/src/components/navigation/navigation.js
@@ -80,3 +80,21 @@ export const ROOT_ITEMS = {
     criteria: ['announcements']
   }
 }
+
+export function routeTo (item, currentUser) {
+  if (!item.route && !item.routeObject) return null
+
+  let route
+
+  if (item.routeObject) {
+    route = item.routeObject
+  } else {
+    route = { name: (item.anon || currentUser) ? item.route : item.anonRoute }
+  }
+
+  if (USERNAME_ROUTES.has(route.name)) {
+    route.params = { username: currentUser.screen_name, name: currentUser.screen_name }
+  }
+
+  return route
+}
diff --git a/src/components/navigation/navigation_entry.js b/src/components/navigation/navigation_entry.js
index 81cc936a..22ed77d9 100644
--- a/src/components/navigation/navigation_entry.js
+++ b/src/components/navigation/navigation_entry.js
@@ -1,5 +1,5 @@
 import { mapState } from 'vuex'
-import { USERNAME_ROUTES } from 'src/components/navigation/navigation.js'
+import { routeTo } from 'src/components/navigation/navigation.js'
 import OptionalRouterLink from 'src/components/optional_router_link/optional_router_link.vue'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faThumbtack } from '@fortawesome/free-solid-svg-icons'
@@ -26,17 +26,7 @@ const NavigationEntry = {
   },
   computed: {
     routeTo () {
-      if (!this.item.route && !this.item.routeObject) return null
-      let route
-      if (this.item.routeObject) {
-        route = this.item.routeObject
-      } else {
-        route = { name: (this.item.anon || this.currentUser) ? this.item.route : this.item.anonRoute }
-      }
-      if (USERNAME_ROUTES.has(route.name)) {
-        route.params = { username: this.currentUser.screen_name, name: this.currentUser.screen_name }
-      }
-      return route
+      return routeTo(this.item, this.currentUser)
     },
     getters () {
       return this.$store.getters
diff --git a/src/components/navigation/navigation_pins.js b/src/components/navigation/navigation_pins.js
index 9dd795aa..ef78e44c 100644
--- a/src/components/navigation/navigation_pins.js
+++ b/src/components/navigation/navigation_pins.js
@@ -1,5 +1,5 @@
 import { mapState } from 'vuex'
-import { TIMELINES, ROOT_ITEMS, USERNAME_ROUTES } from 'src/components/navigation/navigation.js'
+import { TIMELINES, ROOT_ITEMS, routeTo } from 'src/components/navigation/navigation.js'
 import { getListEntries, filterNavigation } from 'src/components/navigation/filter.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
@@ -31,14 +31,7 @@ const NavPanel = {
   props: ['limit'],
   methods: {
     getRouteTo (item) {
-      if (item.routeObject) {
-        return item.routeObject
-      }
-      const route = { name: (item.anon || this.currentUser) ? item.route : item.anonRoute }
-      if (USERNAME_ROUTES.has(route.name)) {
-        route.params = { username: this.currentUser.screen_name }
-      }
-      return route
+      return routeTo(item, this.currentUser)
     }
   },
   computed: {
-- 
cgit v1.2.3-70-g09d2


From 3403f6a1ed5388291244487ae7eb3190d7c4353e Mon Sep 17 00:00:00 2001
From: Alexander Tumin <iamtakingiteasy@eientei.org>
Date: Fri, 17 Mar 2023 23:30:46 +0300
Subject: Allow custom emoji reactions: add option to scale reaction buttons

---
 src/components/emoji_reactions/emoji_reactions.vue | 27 ++++++++++++++--------
 src/components/settings_modal/tabs/general_tab.vue |  9 ++++++++
 src/i18n/en.json                                   |  1 +
 src/modules/config.js                              |  2 ++
 src/services/style_setter/style_setter.js          |  4 ++--
 5 files changed, 32 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/components/emoji_reactions/emoji_reactions.vue b/src/components/emoji_reactions/emoji_reactions.vue
index 12783114..eb46018e 100644
--- a/src/components/emoji_reactions/emoji_reactions.vue
+++ b/src/components/emoji_reactions/emoji_reactions.vue
@@ -12,20 +12,20 @@
         @mouseenter="fetchEmojiReactionsByIfMissing()"
       >
         <span
-          v-if="reaction.url"
           class="reaction-emoji"
         >
           <img
+            v-if="reaction.url"
             :src="reaction.url"
             :title="reaction.name"
             class="reaction-emoji-content"
             width="1em"
           >
+          <span
+            v-else
+            class="reaction-emoji reaction-emoji-content"
+          >{{ reaction.name }}</span>
         </span>
-        <span
-          v-else
-          class="reaction-emoji reaction-emoji-content"
-        >{{ reaction.name }}</span>
         <span>{{ reaction.count }}</span>
       </button>
     </UserListPopover>
@@ -49,6 +49,8 @@
   margin-top: 0.25em;
   flex-wrap: wrap;
 
+  --emoji-size: calc(1.25em * var(--emojiReactionsScale, 1));
+
   .emoji-reaction {
     padding: 0 0.5em;
     margin-right: 0.5em;
@@ -59,17 +61,24 @@
     box-sizing: border-box;
 
     .reaction-emoji {
-      width: 1.25em;
-      height: 1.25em;
+      width: var(--emoji-size);
+      height: var(--emoji-size);
       margin-right: 0.25em;
+      line-height: var(--emoji-size);
+      display: flex;
+      justify-content: center;
+      align-items: center;
     }
 
     .reaction-emoji-content {
-      max-width: 1.25em;
-      max-height: 1.25em;
+      max-width: 100%;
+      max-height: 100%;
       width: auto;
       height: auto;
+      line-height: inherit;
       overflow: hidden;
+      font-size: calc(var(--emoji-size) * 0.8);
+      margin: 0;
     }
 
     &:focus {
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index 65248ac1..17afc5ba 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -271,6 +271,15 @@
             {{ $t('settings.no_rich_text_description') }}
           </BooleanSetting>
         </li>
+        <li>
+          <IntegerSetting
+            v-if="user"
+            path="emojiReactionsScale"
+            expert="1"
+          >
+            {{ $t('settings.emoji_reactions_scale') }}
+          </IntegerSetting>
+        </li>
         <h3>{{ $t('settings.attachments') }}</h3>
         <li>
           <BooleanSetting
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 6c9bc8e2..10ba2ef8 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -467,6 +467,7 @@
     "pad_emoji": "Pad emoji with spaces when adding from picker",
     "autocomplete_select_first": "Automatically select the first candidate when autocomplete results are available",
     "emoji_reactions_on_timeline": "Show emoji reactions on timeline",
+    "emoji_reactions_scale": "Reactions scale factor",
     "export_theme": "Save preset",
     "filtering": "Filtering",
     "wordfilter": "Wordfilter",
diff --git a/src/modules/config.js b/src/modules/config.js
index 3d9cf591..7597886e 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -97,6 +97,7 @@ export const defaultState = {
   sidebarColumnWidth: '25rem',
   contentColumnWidth: '45rem',
   notifsColumnWidth: '25rem',
+  emojiReactionsScale: 1.0,
   navbarColumnStretch: false,
   greentext: undefined, // instance default
   useAtIcon: undefined, // instance default
@@ -185,6 +186,7 @@ const config = {
         case 'sidebarColumnWidth':
         case 'contentColumnWidth':
         case 'notifsColumnWidth':
+        case 'emojiReactionsScale':
           applyConfig(state)
           break
         case 'customTheme':
diff --git a/src/services/style_setter/style_setter.js b/src/services/style_setter/style_setter.js
index d6e973a1..43fe3c73 100644
--- a/src/services/style_setter/style_setter.js
+++ b/src/services/style_setter/style_setter.js
@@ -21,8 +21,8 @@ export const applyTheme = (input) => {
   body.classList.remove('hidden')
 }
 
-const configColumns = ({ sidebarColumnWidth, contentColumnWidth, notifsColumnWidth }) =>
-  ({ sidebarColumnWidth, contentColumnWidth, notifsColumnWidth })
+const configColumns = ({ sidebarColumnWidth, contentColumnWidth, notifsColumnWidth, emojiReactionsScale }) =>
+  ({ sidebarColumnWidth, contentColumnWidth, notifsColumnWidth, emojiReactionsScale })
 
 const defaultConfigColumns = configColumns(defaultState)
 
-- 
cgit v1.2.3-70-g09d2


From 493120b5456282756d05d9afaf66b11a2f87d8fc Mon Sep 17 00:00:00 2001
From: Alexander Tumin <iamtakingiteasy@eientei.org>
Date: Sat, 18 Mar 2023 20:48:36 +0300
Subject: Generalize IntegerSetting into NumberSetting, add Integer/Float
 wrappers

---
 .../settings_modal/helpers/float_setting.vue       | 16 +++++++
 .../settings_modal/helpers/integer_setting.js      | 44 -----------------
 .../settings_modal/helpers/integer_setting.vue     | 36 +++++---------
 .../settings_modal/helpers/number_setting.js       | 56 ++++++++++++++++++++++
 .../settings_modal/helpers/number_setting.vue      | 27 +++++++++++
 src/components/settings_modal/tabs/general_tab.js  |  2 +
 src/components/settings_modal/tabs/general_tab.vue |  4 +-
 7 files changed, 116 insertions(+), 69 deletions(-)
 create mode 100644 src/components/settings_modal/helpers/float_setting.vue
 delete mode 100644 src/components/settings_modal/helpers/integer_setting.js
 create mode 100644 src/components/settings_modal/helpers/number_setting.js
 create mode 100644 src/components/settings_modal/helpers/number_setting.vue

(limited to 'src')

diff --git a/src/components/settings_modal/helpers/float_setting.vue b/src/components/settings_modal/helpers/float_setting.vue
new file mode 100644
index 00000000..15edb3c3
--- /dev/null
+++ b/src/components/settings_modal/helpers/float_setting.vue
@@ -0,0 +1,16 @@
+<template>
+  <NumberSetting
+    v-bind="$attrs"
+  >
+    <slot />
+  </NumberSetting>
+</template>
+
+<script>
+import NumberSetting from './number_setting.vue'
+export default {
+  components: {
+    NumberSetting
+  }
+}
+</script>
diff --git a/src/components/settings_modal/helpers/integer_setting.js b/src/components/settings_modal/helpers/integer_setting.js
deleted file mode 100644
index e64d0cee..00000000
--- a/src/components/settings_modal/helpers/integer_setting.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import { get, set } from 'lodash'
-import ModifiedIndicator from './modified_indicator.vue'
-export default {
-  components: {
-    ModifiedIndicator
-  },
-  props: {
-    path: String,
-    disabled: Boolean,
-    min: Number,
-    expert: [Number, String]
-  },
-  computed: {
-    pathDefault () {
-      const [firstSegment, ...rest] = this.path.split('.')
-      return [firstSegment + 'DefaultValue', ...rest].join('.')
-    },
-    state () {
-      const value = get(this.$parent, this.path)
-      if (value === undefined) {
-        return this.defaultState
-      } else {
-        return value
-      }
-    },
-    defaultState () {
-      return get(this.$parent, this.pathDefault)
-    },
-    isChanged () {
-      return this.state !== this.defaultState
-    },
-    matchesExpertLevel () {
-      return (this.expert || 0) <= this.$parent.expertLevel
-    }
-  },
-  methods: {
-    update (e) {
-      set(this.$parent, this.path, parseInt(e.target.value))
-    },
-    reset () {
-      set(this.$parent, this.path, this.defaultState)
-    }
-  }
-}
diff --git a/src/components/settings_modal/helpers/integer_setting.vue b/src/components/settings_modal/helpers/integer_setting.vue
index 695e2673..43fa7e1a 100644
--- a/src/components/settings_modal/helpers/integer_setting.vue
+++ b/src/components/settings_modal/helpers/integer_setting.vue
@@ -1,27 +1,17 @@
 <template>
-  <span
-    v-if="matchesExpertLevel"
-    class="IntegerSetting"
+  <NumberSetting
+    v-bind="$attrs"
+    truncate="1"
   >
-    <label :for="path">
-      <slot />
-    </label>
-    <input
-      :id="path"
-      class="number-input"
-      type="number"
-      step="1"
-      :disabled="disabled"
-      :min="min || 0"
-      :value="state"
-      @change="update"
-    >
-    {{ ' ' }}
-    <ModifiedIndicator
-      :changed="isChanged"
-      :onclick="reset"
-    />
-  </span>
+    <slot />
+  </NumberSetting>
 </template>
 
-<script src="./integer_setting.js"></script>
+<script>
+import NumberSetting from './number_setting.vue'
+export default {
+  components: {
+    NumberSetting
+  }
+}
+</script>
diff --git a/src/components/settings_modal/helpers/number_setting.js b/src/components/settings_modal/helpers/number_setting.js
new file mode 100644
index 00000000..73c39948
--- /dev/null
+++ b/src/components/settings_modal/helpers/number_setting.js
@@ -0,0 +1,56 @@
+import { get, set } from 'lodash'
+import ModifiedIndicator from './modified_indicator.vue'
+export default {
+  components: {
+    ModifiedIndicator
+  },
+  props: {
+    path: String,
+    disabled: Boolean,
+    min: Number,
+    step: Number,
+    truncate: Number,
+    expert: [Number, String]
+  },
+  computed: {
+    pathDefault () {
+      const [firstSegment, ...rest] = this.path.split('.')
+      return [firstSegment + 'DefaultValue', ...rest].join('.')
+    },
+    parent () {
+      return this.$parent.$parent
+    },
+    state () {
+      const value = get(this.parent, this.path)
+      if (value === undefined) {
+        return this.defaultState
+      } else {
+        return value
+      }
+    },
+    defaultState () {
+      return get(this.parent, this.pathDefault)
+    },
+    isChanged () {
+      return this.state !== this.defaultState
+    },
+    matchesExpertLevel () {
+      return (this.expert || 0) <= this.parent.expertLevel
+    }
+  },
+  methods: {
+    truncateValue (value) {
+      if (!this.truncate) {
+        return value
+      }
+
+      return Math.trunc(value / this.truncate) * this.truncate
+    },
+    update (e) {
+      set(this.parent, this.path, this.truncateValue(parseFloat(e.target.value)))
+    },
+    reset () {
+      set(this.parent, this.path, this.defaultState)
+    }
+  }
+}
diff --git a/src/components/settings_modal/helpers/number_setting.vue b/src/components/settings_modal/helpers/number_setting.vue
new file mode 100644
index 00000000..3eab5178
--- /dev/null
+++ b/src/components/settings_modal/helpers/number_setting.vue
@@ -0,0 +1,27 @@
+<template>
+  <span
+    v-if="matchesExpertLevel"
+    class="NumberSetting"
+  >
+    <label :for="path">
+      <slot />
+    </label>
+    <input
+      :id="path"
+      class="number-input"
+      type="number"
+      :step="step || 1"
+      :disabled="disabled"
+      :min="min || 0"
+      :value="state"
+      @change="update"
+    >
+    {{ ' ' }}
+    <ModifiedIndicator
+      :changed="isChanged"
+      :onclick="reset"
+    />
+  </span>
+</template>
+
+<script src="./number_setting.js"></script>
diff --git a/src/components/settings_modal/tabs/general_tab.js b/src/components/settings_modal/tabs/general_tab.js
index ea24d6ad..be97710f 100644
--- a/src/components/settings_modal/tabs/general_tab.js
+++ b/src/components/settings_modal/tabs/general_tab.js
@@ -2,6 +2,7 @@ import BooleanSetting from '../helpers/boolean_setting.vue'
 import ChoiceSetting from '../helpers/choice_setting.vue'
 import ScopeSelector from 'src/components/scope_selector/scope_selector.vue'
 import IntegerSetting from '../helpers/integer_setting.vue'
+import FloatSetting from '../helpers/float_setting.vue'
 import SizeSetting, { defaultHorizontalUnits } from '../helpers/size_setting.vue'
 import InterfaceLanguageSwitcher from 'src/components/interface_language_switcher/interface_language_switcher.vue'
 
@@ -62,6 +63,7 @@ const GeneralTab = {
     BooleanSetting,
     ChoiceSetting,
     IntegerSetting,
+    FloatSetting,
     SizeSetting,
     InterfaceLanguageSwitcher,
     ScopeSelector,
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index 17afc5ba..21e2d855 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -272,13 +272,13 @@
           </BooleanSetting>
         </li>
         <li>
-          <IntegerSetting
+          <FloatSetting
             v-if="user"
             path="emojiReactionsScale"
             expert="1"
           >
             {{ $t('settings.emoji_reactions_scale') }}
-          </IntegerSetting>
+          </FloatSetting>
         </li>
         <h3>{{ $t('settings.attachments') }}</h3>
         <li>
-- 
cgit v1.2.3-70-g09d2


From 332ad77e3579d2b512ba236b3f2c94ad8875864d Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Sun, 19 Mar 2023 21:27:07 +0200
Subject: limits tab, backend descriptions

---
 .../settings_modal/admin_tabs/instance_tab.vue     | 103 +++++++++++---
 .../settings_modal/admin_tabs/limits_tab.js        |  29 ++++
 .../settings_modal/admin_tabs/limits_tab.vue       | 152 +++++++++++++++++++++
 .../settings_modal/helpers/boolean_setting.vue     |  13 +-
 .../settings_modal/helpers/integer_setting.vue     |  13 +-
 src/components/settings_modal/helpers/setting.js   |  10 ++
 .../settings_modal/helpers/string_setting.vue      |  13 +-
 src/components/settings_modal/settings_modal.scss  |   6 +
 .../settings_modal/settings_modal_admin_content.js |   4 +-
 .../settings_modal_admin_content.vue               |   9 +-
 src/modules/adminSettings.js                       |  24 +++-
 src/modules/users.js                               |   2 +
 src/services/api/api.service.js                    |  17 +++
 13 files changed, 370 insertions(+), 25 deletions(-)
 create mode 100644 src/components/settings_modal/admin_tabs/limits_tab.js
 create mode 100644 src/components/settings_modal/admin_tabs/limits_tab.vue

(limited to 'src')

diff --git a/src/components/settings_modal/admin_tabs/instance_tab.vue b/src/components/settings_modal/admin_tabs/instance_tab.vue
index 18ba6127..ad271293 100644
--- a/src/components/settings_modal/admin_tabs/instance_tab.vue
+++ b/src/components/settings_modal/admin_tabs/instance_tab.vue
@@ -12,6 +12,15 @@
             NAME
           </StringSetting>
         </li>
+        <li>
+          <StringSetting
+            source="admin"
+            path=":pleroma.:instance.:email"
+            draft-mode
+          >
+            ADMIN EMAIL
+          </StringSetting>
+        </li>
         <li>
           <StringSetting
             source="admin"
@@ -22,13 +31,85 @@
           </StringSetting>
         </li>
         <li>
-          <IntegerSetting
+          <StringSetting
             source="admin"
-            path=":pleroma.:instance.:limit"
+            path=":pleroma.:instance.:short_description"
             draft-mode
           >
-            POST LIMIT
-          </IntegerSetting>
+            SHORT DESCRIPTION
+          </StringSetting>
+        </li>
+        <li>
+          <StringSetting
+            source="admin"
+            path=":pleroma.:instance.:instance_thumbnail"
+            draft-mode
+          >
+            INSTANCE THUMBNAIL
+          </StringSetting>
+        </li>
+        <li>
+          <StringSetting
+            source="admin"
+            path=":pleroma.:instance.:background_image"
+            draft-mode
+          >
+            BACKGROUND IMAGE
+          </StringSetting>
+        </li>
+        <li>
+          <BooleanSetting
+            source="admin"
+            path=":pleroma.:instance.:public"
+            draft-mode
+          >
+            PUBLIC
+          </BooleanSetting>
+        </li>
+      </ul>
+    </div>
+    <div class="setting-item">
+      <h2>{{ $t('admin_dash.registrations') }}</h2>
+      <ul class="setting-list">
+        <li>
+          <BooleanSetting
+            source="admin"
+            path=":pleroma.:instance.:registrations_open"
+            draft-mode
+          >
+            REGISTRATIONS OPEN
+          </BooleanSetting>
+          <ul class="setting-list suboptions">
+            <li>
+              <BooleanSetting
+                source="admin"
+                path=":pleroma.:instance.:invites_enabled"
+                parent-path=":pleroma.:instance.:registrations_open"
+                :parent-invert="true"
+                draft-mode
+              >
+                INVITES ENABLED
+              </BooleanSetting>
+            </li>
+          </ul>
+        </li>
+        <li>
+          <BooleanSetting
+            source="admin"
+            path=":pleroma.:instance.:account_activation_required"
+            draft-mode
+          >
+            ACTIVATION REQUIRED
+          </BooleanSetting>
+        </li>
+        <li>
+          <BooleanSetting
+            source="admin"
+            path=":pleroma.:instance.:account_approval_required"
+            draft-mode
+          >
+            APPROVAL REQUIRED
+          </BooleanSetting>
         </li>
       </ul>
     </div>
@@ -36,17 +117,3 @@
 </template>
 
 <script src="./instance_tab.js"></script>
-
-<style lang="scss">
-.column-settings {
-  display: flex;
-  justify-content: space-evenly;
-  flex-wrap: wrap;
-}
-
-.column-settings .size-label {
-  display: block;
-  margin-bottom: 0.5em;
-  margin-top: 0.5em;
-}
-</style>
diff --git a/src/components/settings_modal/admin_tabs/limits_tab.js b/src/components/settings_modal/admin_tabs/limits_tab.js
new file mode 100644
index 00000000..684739c3
--- /dev/null
+++ b/src/components/settings_modal/admin_tabs/limits_tab.js
@@ -0,0 +1,29 @@
+import BooleanSetting from '../helpers/boolean_setting.vue'
+import ChoiceSetting from '../helpers/choice_setting.vue'
+import IntegerSetting from '../helpers/integer_setting.vue'
+import StringSetting from '../helpers/string_setting.vue'
+
+import SharedComputedObject from '../helpers/shared_computed_object.js'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faGlobe
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faGlobe
+)
+
+const LimitsTab = {
+  data () {},
+  components: {
+    BooleanSetting,
+    ChoiceSetting,
+    IntegerSetting,
+    StringSetting
+  },
+  computed: {
+    ...SharedComputedObject()
+  }
+}
+
+export default LimitsTab
diff --git a/src/components/settings_modal/admin_tabs/limits_tab.vue b/src/components/settings_modal/admin_tabs/limits_tab.vue
new file mode 100644
index 00000000..3f07c554
--- /dev/null
+++ b/src/components/settings_modal/admin_tabs/limits_tab.vue
@@ -0,0 +1,152 @@
+<template>
+  <div :label="$t('admin_dash.instance')">
+    <div class="setting-item">
+      <h2>{{ $t('admin_dash.arbitrary_limits') }}</h2>
+      <ul class="setting-list">
+        <li>
+          <h3>{{ $t('admin_dash.limits.posts') }}</h3>
+        </li>
+        <li>
+          <IntegerSetting
+            source="admin"
+            path=":pleroma.:instance.:limit"
+            draft-mode
+          >
+            POST LIMIT
+          </IntegerSetting>
+        </li>
+        <li>
+          <IntegerSetting
+            source="admin"
+            path=":pleroma.:instance.:remote_limit"
+            draft-mode
+          >
+            POST LIMIT (remote)
+          </IntegerSetting>
+        </li>
+        <li>
+          <h3>{{ $t('admin_dash.limits.uploads') }}</h3>
+        </li>
+        <li>
+          <IntegerSetting
+            source="admin"
+            path=":pleroma.:instance.:description_limit"
+            draft-mode
+          >
+            IMAGE DESCRIPTION LIMIT
+          </IntegerSetting>
+        </li>
+        <li>
+          <IntegerSetting
+            source="admin"
+            path=":pleroma.:instance.:upload_limit"
+            draft-mode
+          >
+            UPLOAD LIMIT KiB
+          </IntegerSetting>
+        </li>
+        <li>
+          <IntegerSetting
+            source="admin"
+            path=":pleroma.:instance.:max_media_attachments"
+            draft-mode
+          >
+            MAX ATTACHMENTS
+          </IntegerSetting>
+        </li>
+        <li>
+          <h3>{{ $t('admin_dash.limits.users') }}</h3>
+        </li>
+        <li>
+          <IntegerSetting
+            source="admin"
+            path=":pleroma.:instance.:user_bio_length"
+            draft-mode
+          >
+            BIO LENGTH
+          </IntegerSetting>
+        </li>
+        <li>
+          <IntegerSetting
+            source="admin"
+            path=":pleroma.:instance.:user_name_length"
+            draft-mode
+          >
+            NAME LENGTH
+          </IntegerSetting>
+        </li>
+        <li>
+          <h4>{{ $t('admin_dash.limits.profile_fields') }}</h4>
+        </li>
+        <li>
+          <IntegerSetting
+            source="admin"
+            path=":pleroma.:instance.:max_account_fields"
+            draft-mode
+          >
+            MAX ACCOUNT FIELDS
+          </IntegerSetting>
+        </li>
+        <li>
+          <IntegerSetting
+            source="admin"
+            path=":pleroma.:instance.:max_remote_account_fields"
+            draft-mode
+          >
+            MAX ACCOUNT FIELDS (remote)
+          </IntegerSetting>
+        </li>
+        <li>
+          <IntegerSetting
+            source="admin"
+            path=":pleroma.:instance.:account_field_name_length"
+            draft-mode
+          >
+            MAX ACCOUNT FIELD NAME
+          </IntegerSetting>
+        </li>
+        <li>
+          <IntegerSetting
+            source="admin"
+            path=":pleroma.:instance.:account_field_value_length"
+            draft-mode
+          >
+            MAX ACCOUNT VALUE NAME
+          </IntegerSetting>
+        </li>
+        <li>
+          <h4>{{ $t('admin_dash.limits.user_uploads') }}</h4>
+        </li>
+        <li>
+          <IntegerSetting
+            source="admin"
+            path=":pleroma.:instance.:avatar_upload_limit"
+            draft-mode
+          >
+            MAX AVATAR SIZE KiB
+          </IntegerSetting>
+        </li>
+        <li>
+          <IntegerSetting
+            source="admin"
+            path=":pleroma.:instance.:banner_upload_limit"
+            draft-mode
+          >
+            MAX BANNER SIZE KiB
+          </IntegerSetting>
+        </li>
+        <li>
+          <IntegerSetting
+            source="admin"
+            path=":pleroma.:instance.:max_pinned_statuses"
+            draft-mode
+          >
+            MAX PINNED POSTS
+          </IntegerSetting>
+        </li>
+      </ul>
+    </div>
+  </div>
+</template>
+
+<script src="./limits_tab.js"></script>
diff --git a/src/components/settings_modal/helpers/boolean_setting.vue b/src/components/settings_modal/helpers/boolean_setting.vue
index 7e05fe85..aedbf23e 100644
--- a/src/components/settings_modal/helpers/boolean_setting.vue
+++ b/src/components/settings_modal/helpers/boolean_setting.vue
@@ -12,7 +12,12 @@
         v-if="!!$slots.default"
         class="label"
       >
-        <slot />
+        <template v-if="backendDescription">
+          {{ backendDescriptionLabel + ' ' }}
+        </template>
+        <template v-else>
+          <slot />
+        </template>
       </span>
       {{ ' ' }}
       <ModifiedIndicator
@@ -21,6 +26,12 @@
       />
       <ProfileSettingIndicator :is-profile="isProfileSetting" />
       <DraftButtons />
+      <p
+        v-if="backendDescriptionDescription"
+        class="setting-description"
+      >
+        {{ backendDescriptionDescription + ' ' }}
+      </p>
     </Checkbox>
   </label>
 </template>
diff --git a/src/components/settings_modal/helpers/integer_setting.vue b/src/components/settings_modal/helpers/integer_setting.vue
index e900b87c..e935dfb0 100644
--- a/src/components/settings_modal/helpers/integer_setting.vue
+++ b/src/components/settings_modal/helpers/integer_setting.vue
@@ -4,7 +4,12 @@
     class="IntegerSetting"
   >
     <label :for="path">
-      <slot />
+      <template v-if="backendDescription">
+        {{ backendDescriptionLabel + ' ' }}
+      </template>
+      <template v-else>
+        <slot />
+      </template>
     </label>
     <input
       :id="path"
@@ -23,6 +28,12 @@
     />
     <ProfileSettingIndicator :is-profile="isProfileSetting" />
     <DraftButtons />
+    <p
+      v-if="backendDescriptionDescription"
+      class="setting-description"
+    >
+      {{ backendDescriptionDescription + ' ' }}
+    </p>
   </span>
 </template>
 
diff --git a/src/components/settings_modal/helpers/setting.js b/src/components/settings_modal/helpers/setting.js
index 0971b919..f270216f 100644
--- a/src/components/settings_modal/helpers/setting.js
+++ b/src/components/settings_modal/helpers/setting.js
@@ -59,6 +59,16 @@ export default {
         return value
       }
     },
+    backendDescription () {
+      console.log(get(this.$store.state.adminSettings.descriptions, this.path))
+      return get(this.$store.state.adminSettings.descriptions, this.path)
+    },
+    backendDescriptionLabel () {
+      return this.backendDescription.label
+    },
+    backendDescriptionDescription () {
+      return this.backendDescription.description
+    },
     shouldBeDisabled () {
       const parentValue = this.parentPath !== undefined ? get(this.configSource, this.parentPath) : null
       return this.disabled || (parentValue !== null ? (this.parentInvert ? parentValue : !parentValue) : false)
diff --git a/src/components/settings_modal/helpers/string_setting.vue b/src/components/settings_modal/helpers/string_setting.vue
index 0a71aeab..91a4afa4 100644
--- a/src/components/settings_modal/helpers/string_setting.vue
+++ b/src/components/settings_modal/helpers/string_setting.vue
@@ -4,7 +4,12 @@
     class="StringSetting"
   >
     <label :for="path">
-      <slot />
+      <template v-if="backendDescription">
+        {{ backendDescriptionLabel + ' ' }}
+      </template>
+      <template v-else>
+        <slot />
+      </template>
     </label>
     <input
       :id="path"
@@ -21,6 +26,12 @@
     />
     <ProfileSettingIndicator :is-profile="isProfileSetting" />
     <DraftButtons />
+    <p
+      v-if="backendDescriptionDescription"
+      class="setting-description"
+    >
+      {{ backendDescriptionDescription + ' ' }}
+    </p>
   </label>
 </template>
 
diff --git a/src/components/settings_modal/settings_modal.scss b/src/components/settings_modal/settings_modal.scss
index f5861229..4cce6099 100644
--- a/src/components/settings_modal/settings_modal.scss
+++ b/src/components/settings_modal/settings_modal.scss
@@ -17,6 +17,12 @@
     }
   }
 
+  .setting-description {
+    margin-top: 0.2em;
+    margin-bottom: 2em;
+    font-size: 70%;
+  }
+
   .settings-modal-panel {
     overflow: hidden;
     transition: transform;
diff --git a/src/components/settings_modal/settings_modal_admin_content.js b/src/components/settings_modal/settings_modal_admin_content.js
index 88ba1755..c6c8837f 100644
--- a/src/components/settings_modal/settings_modal_admin_content.js
+++ b/src/components/settings_modal/settings_modal_admin_content.js
@@ -3,6 +3,7 @@ import TabSwitcher from 'src/components/tab_switcher/tab_switcher.jsx'
 import DataImportExportTab from './tabs/data_import_export_tab.vue'
 import MutesAndBlocksTab from './tabs/mutes_and_blocks_tab.vue'
 import InstanceTab from './admin_tabs/instance_tab.vue'
+import LimitsTab from './admin_tabs/limits_tab.vue'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
@@ -33,7 +34,8 @@ const SettingsModalAdminContent = {
 
     DataImportExportTab,
     MutesAndBlocksTab,
-    InstanceTab
+    InstanceTab,
+    LimitsTab
   },
   computed: {
     isLoggedIn () {
diff --git a/src/components/settings_modal/settings_modal_admin_content.vue b/src/components/settings_modal/settings_modal_admin_content.vue
index 9873b127..16b55828 100644
--- a/src/components/settings_modal/settings_modal_admin_content.vue
+++ b/src/components/settings_modal/settings_modal_admin_content.vue
@@ -7,12 +7,19 @@
     :body-scroll-lock="bodyLock"
   >
     <div
-      :label="$t('settings.general')"
+      :label="$t('admin_dash.instance')"
       icon="wrench"
       data-tab-name="general"
     >
       <InstanceTab />
     </div>
+    <div
+      :label="$t('admin_dash.limits')"
+      icon="wrench"
+      data-tab-name="limits"
+    >
+      <LimitsTab />
+    </div>
   </tab-switcher>
 </template>
 
diff --git a/src/modules/adminSettings.js b/src/modules/adminSettings.js
index d1df67d4..44a4d409 100644
--- a/src/modules/adminSettings.js
+++ b/src/modules/adminSettings.js
@@ -3,7 +3,8 @@ import { set, cloneDeep } from 'lodash'
 export const defaultState = {
   needsReboot: null,
   config: null,
-  modifiedPaths: null
+  modifiedPaths: null,
+  descriptions: null
 }
 
 export const newUserFlags = {
@@ -18,6 +19,9 @@ const adminSettingsStorage = {
     updateAdminSettings (state, { config, modifiedPaths }) {
       state.config = config
       state.modifiedPaths = modifiedPaths
+    },
+    updateAdminDescriptions (state, { descriptions }) {
+      state.descriptions = descriptions
     }
   },
   actions: {
@@ -40,8 +44,25 @@ const adminSettingsStorage = {
         }
         set(config, path, convert(c.value))
       })
+      console.log(config[':pleroma'][':welcome'])
       commit('updateAdminSettings', { config, modifiedPaths })
     },
+    setInstanceAdminDescriptions ({ state, commit, dispatch }, { backendDescriptions }) {
+      const convert = ({ children, description, label, key = '<ROOT>', group, suggestions }, path, acc) => {
+        const newPath = group ? group + '.' + key : key
+        const obj = { description, label, suggestions }
+        if (Array.isArray(children)) {
+          children.forEach(c => {
+            convert(c, '.' + newPath, obj)
+          })
+        }
+        set(acc, newPath, obj)
+      }
+
+      const descriptions = {}
+      backendDescriptions.forEach(d => convert(d, '', descriptions))
+      commit('updateAdminDescriptions', { descriptions })
+    },
     pushAdminSetting ({ rootState, state, commit, dispatch }, { path, value }) {
       const [group, key, ...rest] = path.split(/\./g)
       const clone = {} // not actually cloning the entire thing to avoid excessive writes
@@ -71,7 +92,6 @@ const adminSettingsStorage = {
         .then(backendDbConfig => dispatch('setInstanceAdminSettings', { backendDbConfig }))
     },
     resetAdminSetting ({ rootState, state, commit, dispatch }, { path }) {
-      console.log('ASS')
       const [group, key, subkey] = path.split(/\./g)
 
       state.modifiedPaths.delete(path)
diff --git a/src/modules/users.js b/src/modules/users.js
index 12e582f4..45cba334 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -567,6 +567,8 @@ const users = {
               if (user.rights.admin) {
                 store.rootState.api.backendInteractor.fetchInstanceDBConfig()
                   .then(backendDbConfig => dispatch('setInstanceAdminSettings', { backendDbConfig }))
+                store.rootState.api.backendInteractor.fetchInstanceConfigDescriptions()
+                  .then(backendDescriptions => dispatch('setInstanceAdminDescriptions', { backendDescriptions }))
               }
               commit('addNewUsers', [user])
 
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index 71ba1dec..073f40a3 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -109,6 +109,7 @@ const PLEROMA_EDIT_ANNOUNCEMENT_URL = id => `/api/v1/pleroma/admin/announcements
 const PLEROMA_DELETE_ANNOUNCEMENT_URL = id => `/api/v1/pleroma/admin/announcements/${id}`
 
 const PLEROMA_ADMIN_CONFIG_URL = '/api/pleroma/admin/config'
+const PLEROMA_ADMIN_DESCRIPTIONS_URL = '/api/pleroma/admin/config/descriptions'
 
 const oldfetch = window.fetch
 
@@ -1677,6 +1678,21 @@ const fetchInstanceDBConfig = ({ credentials }) => {
     })
 }
 
+const fetchInstanceConfigDescriptions = ({ credentials }) => {
+  return fetch(PLEROMA_ADMIN_DESCRIPTIONS_URL, {
+    headers: authHeaders(credentials)
+  })
+    .then((response) => {
+      if (response.ok) {
+        return response.json()
+      } else {
+        return {
+          error: response
+        }
+      }
+    })
+}
+
 const pushInstanceDBConfig = ({ credentials, payload }) => {
   return fetch(PLEROMA_ADMIN_CONFIG_URL, {
     headers: {
@@ -1813,6 +1829,7 @@ const apiService = {
   deleteAnnouncement,
   adminFetchAnnouncements,
   fetchInstanceDBConfig,
+  fetchInstanceConfigDescriptions,
   pushInstanceDBConfig
 }
 
-- 
cgit v1.2.3-70-g09d2


From 624da7240e72bacb3476d512691c17bafdb4dfed Mon Sep 17 00:00:00 2001
From: Poesty Li <poesty7450@gmail.com>
Date: Wed, 8 Mar 2023 14:07:46 +0000
Subject: Translated using Weblate (Chinese (Simplified))

Currently translated at 99.6% (984 of 987 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hans/
---
 src/i18n/zh.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/i18n/zh.json b/src/i18n/zh.json
index 90f840a7..8ea4c1e0 100644
--- a/src/i18n/zh.json
+++ b/src/i18n/zh.json
@@ -295,7 +295,7 @@
     "change_password_error": "修改密码的时候出了点问题。",
     "changed_password": "成功修改了密码！",
     "collapse_subject": "折叠带主题的内容",
-    "composing": "写作",
+    "composing": "撰写",
     "confirm_new_password": "确认新密码",
     "current_avatar": "当前头像",
     "current_password": "当前密码",
@@ -737,7 +737,8 @@
     "mention_link_use_tooltip": "点击提及链接时显示用户卡片",
     "mention_link_show_avatar": "在链接旁边显示用户头像",
     "mention_link_show_avatar_quick": "在提及内容旁边显示用户头像",
-    "user_popover_avatar_action_open": "打开个人资料"
+    "user_popover_avatar_action_open": "打开个人资料",
+    "autocomplete_select_first": "当有自动完成的结果时，自动选择第一个候选项"
   },
   "time": {
     "day": "{0} 天",
-- 
cgit v1.2.3-70-g09d2


From 0b5e536b4c96a81ec78f323be9bece6deae61773 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 20 Mar 2023 23:36:47 +0200
Subject: ChoiceSetting support added, added captcha settings

---
 .../settings_modal/admin_tabs/instance_tab.vue     | 51 ++++++++++++++++++++++
 .../settings_modal/helpers/choice_setting.js       | 27 +++++++++++-
 .../settings_modal/helpers/choice_setting.vue      | 18 ++++++--
 .../settings_modal/helpers/number_setting.vue      | 15 ++++++-
 src/components/settings_modal/helpers/setting.js   |  7 ++-
 .../helpers/shared_computed_object.js              |  3 ++
 src/modules/adminSettings.js                       | 13 +++---
 7 files changed, 121 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/components/settings_modal/admin_tabs/instance_tab.vue b/src/components/settings_modal/admin_tabs/instance_tab.vue
index ad271293..ff784287 100644
--- a/src/components/settings_modal/admin_tabs/instance_tab.vue
+++ b/src/components/settings_modal/admin_tabs/instance_tab.vue
@@ -111,6 +111,57 @@
             APPROVAL REQUIRED
           </BooleanSetting>
         </li>
+        <li>
+          <h3>{{ $t('admin_dash.captcha.header') }}</h3>
+        </li>
+        <li>
+          <BooleanSetting
+            source="admin"
+            :path="[':pleroma', 'Pleroma.Captcha', ':enabled']"
+            draft-mode
+          >
+            CAPTCHA
+          </BooleanSetting>
+          <ul class="setting-list suboptions">
+            <li>
+              <ChoiceSetting
+                source="admin"
+                :path="[':pleroma', 'Pleroma.Captcha', ':method']"
+                :parent-path="[':pleroma', 'Pleroma.Captcha', ':enabled']"
+                :option-label-map="{
+                  'Pleroma.Captcha.Native': $t('admin_dash.captcha.native'),
+                  'Pleroma.Captcha.Kocaptcha': $t('admin_dash.captcha.kocaptcha')
+                }"
+                draft-mode
+              >
+                CAPTCHA TYPE
+              </ChoiceSetting>
+              <IntegerSetting
+                source="admin"
+                :path="[':pleroma', 'Pleroma.Captcha', ':seconds_valid']"
+                :parent-path="[':pleroma', 'Pleroma.Captcha', ':enabled']"
+                draft-mode
+              >
+                VALID
+              </IntegerSetting>
+            </li>
+          </ul>
+          <ul
+            v-if="adminConfig[':pleroma']['Pleroma.Captcha'][':enabled'] && adminConfig[':pleroma']['Pleroma.Captcha'][':method'] === 'Pleroma.Captcha.Kocaptcha'"
+            class="setting-list suboptions"
+          >
+            <h4>{{ $t('admin_dash.kocaptcha') }}</h4>
+            <li>
+              <StringSetting
+                source="admin"
+                :path="[':pleroma', 'Pleroma.Captcha.Kocaptcha', ':endpoint']"
+                draft-mode
+              >
+                cockAPTCHA ENDPOINT
+              </StringSetting>
+            </li>
+          </ul>
+        </li>
       </ul>
     </div>
   </div>
diff --git a/src/components/settings_modal/helpers/choice_setting.js b/src/components/settings_modal/helpers/choice_setting.js
index a3c3bf44..3ff81bc9 100644
--- a/src/components/settings_modal/helpers/choice_setting.js
+++ b/src/components/settings_modal/helpers/choice_setting.js
@@ -11,7 +11,32 @@ export default {
     ...Setting.props,
     options: {
       type: Array,
-      required: true
+      required: false
+    },
+    optionLabelMap: {
+      type: Object,
+      required: false,
+      default: {}
+    }
+  },
+  computed: {
+    ...Setting.computed,
+    realOptions () {
+      if (this.source === 'admin') {
+        console.log(this.backendDescriptionSuggestions)
+        return this.backendDescriptionSuggestions.map(x => ({
+          key: x,
+          value: x,
+          label: this.optionLabelMap[x] || x
+        }))
+      }
+      return this.options
+    }
+  },
+  methods: {
+    ...Setting.methods,
+    getValue (e) {
+      return e
     }
   }
 }
diff --git a/src/components/settings_modal/helpers/choice_setting.vue b/src/components/settings_modal/helpers/choice_setting.vue
index 4c4cdefe..55f9a62c 100644
--- a/src/components/settings_modal/helpers/choice_setting.vue
+++ b/src/components/settings_modal/helpers/choice_setting.vue
@@ -3,15 +3,20 @@
     v-if="matchesExpertLevel"
     class="ChoiceSetting"
   >
-    <slot />
+    <template v-if="backendDescription">
+      {{ backendDescriptionLabel }}
+    </template>
+    <template v-else>
+      <slot />
+    </template>
     {{ ' ' }}
     <Select
-      :model-value="state"
+      :model-value="draftMode ? draft :state"
       :disabled="disabled"
       @update:modelValue="update"
     >
       <option
-        v-for="option in options"
+        v-for="option in realOptions"
         :key="option.key"
         :value="option.value"
       >
@@ -24,6 +29,13 @@
       :onclick="reset"
     />
     <ProfileSettingIndicator :is-profile="isProfileSetting" />
+    <DraftButtons />
+    <p
+      v-if="backendDescriptionDescription"
+      class="setting-description"
+    >
+      {{ backendDescriptionDescription + ' ' }}
+    </p>
   </label>
 </template>
 
diff --git a/src/components/settings_modal/helpers/number_setting.vue b/src/components/settings_modal/helpers/number_setting.vue
index 81335762..93a7a79a 100644
--- a/src/components/settings_modal/helpers/number_setting.vue
+++ b/src/components/settings_modal/helpers/number_setting.vue
@@ -4,7 +4,12 @@
     class="NumberSetting"
   >
     <label :for="path">
-      <slot />
+      <template v-if="backendDescription">
+        {{ backendDescriptionLabel + ' ' }}
+      </template>
+      <template v-else>
+        <slot />
+      </template>
     </label>
     <input
       :id="path"
@@ -21,6 +26,14 @@
       :changed="isChanged"
       :onclick="reset"
     />
+    <ProfileSettingIndicator :is-profile="isProfileSetting" />
+    <DraftButtons />
+    <p
+      v-if="backendDescriptionDescription"
+      class="setting-description"
+    >
+      {{ backendDescriptionDescription + ' ' }}
+    </p>
   </span>
 </template>
 
diff --git a/src/components/settings_modal/helpers/setting.js b/src/components/settings_modal/helpers/setting.js
index 8c7074a5..a6d35fb9 100644
--- a/src/components/settings_modal/helpers/setting.js
+++ b/src/components/settings_modal/helpers/setting.js
@@ -13,7 +13,7 @@ export default {
   },
   props: {
     path: {
-      type: String,
+      type: [String, Array],
       required: true
     },
     disabled: {
@@ -21,7 +21,7 @@ export default {
       default: false
     },
     parentPath: {
-      type: String
+      type: [String, Array]
     },
     parentInvert: {
       type: Boolean,
@@ -68,6 +68,9 @@ export default {
     backendDescriptionDescription () {
       return this.backendDescription?.description
     },
+    backendDescriptionSuggestions () {
+      return this.backendDescription?.suggestions
+    },
     shouldBeDisabled () {
       const parentValue = this.parentPath !== undefined ? get(this.configSource, this.parentPath) : null
       return this.disabled || (parentValue !== null ? (this.parentInvert ? parentValue : !parentValue) : false)
diff --git a/src/components/settings_modal/helpers/shared_computed_object.js b/src/components/settings_modal/helpers/shared_computed_object.js
index 912999ce..d02db542 100644
--- a/src/components/settings_modal/helpers/shared_computed_object.js
+++ b/src/components/settings_modal/helpers/shared_computed_object.js
@@ -7,6 +7,9 @@ const SharedComputedObject = () => ({
   },
   mergedConfig () {
     return this.$store.getters.mergedConfig
+  },
+  adminConfig () {
+    return this.$store.state.adminSettings.config
   }
 })
 
diff --git a/src/modules/adminSettings.js b/src/modules/adminSettings.js
index 44a4d409..a84fadbf 100644
--- a/src/modules/adminSettings.js
+++ b/src/modules/adminSettings.js
@@ -29,7 +29,7 @@ const adminSettingsStorage = {
       const config = state.config || {}
       const modifiedPaths = state.modifiedPaths || new Set()
       backendDbConfig.configs.forEach(c => {
-        const path = c.group + '.' + c.key
+        const path = [c.group, c.key]
         if (c.db) {
           c.db.forEach(x => modifiedPaths.add(path + '.' + x))
         }
@@ -44,16 +44,16 @@ const adminSettingsStorage = {
         }
         set(config, path, convert(c.value))
       })
-      console.log(config[':pleroma'][':welcome'])
+      console.log(config[':pleroma'])
       commit('updateAdminSettings', { config, modifiedPaths })
     },
     setInstanceAdminDescriptions ({ state, commit, dispatch }, { backendDescriptions }) {
       const convert = ({ children, description, label, key = '<ROOT>', group, suggestions }, path, acc) => {
-        const newPath = group ? group + '.' + key : key
+        const newPath = group ? [group, key] : [key]
         const obj = { description, label, suggestions }
         if (Array.isArray(children)) {
           children.forEach(c => {
-            convert(c, '.' + newPath, obj)
+            convert(c, newPath, obj)
           })
         }
         set(acc, newPath, obj)
@@ -61,12 +61,13 @@ const adminSettingsStorage = {
 
       const descriptions = {}
       backendDescriptions.forEach(d => convert(d, '', descriptions))
+      console.log(descriptions[':pleroma']['Pleroma.Captcha'])
       commit('updateAdminDescriptions', { descriptions })
     },
     pushAdminSetting ({ rootState, state, commit, dispatch }, { path, value }) {
-      const [group, key, ...rest] = path.split(/\./g)
+      const [group, key, ...rest] = Array.isArray(path) ? path : path.split(/\./g)
       const clone = {} // not actually cloning the entire thing to avoid excessive writes
-      set(clone, rest.join('.'), value)
+      set(clone, rest, value)
 
       // TODO cleanup paths in modifiedPaths
       const convert = (value) => {
-- 
cgit v1.2.3-70-g09d2


From 9a97e0d196c879e41dcb8bda8bd8128a039bacdc Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 21 Mar 2023 10:26:25 +0200
Subject: modal update, initial localization

---
 .../settings_modal/admin_tabs/instance_tab.vue     | 10 ++++----
 .../settings_modal/admin_tabs/limits_tab.vue       | 24 ++++++++++---------
 src/components/settings_modal/settings_modal.vue   | 15 +++++++++++-
 .../settings_modal/settings_modal_admin_content.js |  4 ++--
 .../settings_modal_admin_content.vue               |  6 ++---
 src/i18n/en.json                                   | 27 ++++++++++++++++++++++
 6 files changed, 64 insertions(+), 22 deletions(-)

(limited to 'src')

diff --git a/src/components/settings_modal/admin_tabs/instance_tab.vue b/src/components/settings_modal/admin_tabs/instance_tab.vue
index ff784287..411982cc 100644
--- a/src/components/settings_modal/admin_tabs/instance_tab.vue
+++ b/src/components/settings_modal/admin_tabs/instance_tab.vue
@@ -1,7 +1,7 @@
 <template>
-  <div :label="$t('admin_dash.instance')">
+  <div :label="$t('admin_dash.tabs.instance')">
     <div class="setting-item">
-      <h2>{{ $t('admin_dash.instance') }}</h2>
+      <h2>{{ $t('admin_dash.instance.instance') }}</h2>
       <ul class="setting-list">
         <li>
           <StringSetting
@@ -69,7 +69,7 @@
       </ul>
     </div>
     <div class="setting-item">
-      <h2>{{ $t('admin_dash.registrations') }}</h2>
+      <h2>{{ $t('admin_dash.instance.registrations') }}</h2>
       <ul class="setting-list">
         <li>
           <BooleanSetting
@@ -112,7 +112,7 @@
           </BooleanSetting>
         </li>
         <li>
-          <h3>{{ $t('admin_dash.captcha.header') }}</h3>
+          <h3>{{ $t('admin_dash.instance.captcha_header') }}</h3>
         </li>
         <li>
           <BooleanSetting
@@ -150,7 +150,7 @@
             v-if="adminConfig[':pleroma']['Pleroma.Captcha'][':enabled'] && adminConfig[':pleroma']['Pleroma.Captcha'][':method'] === 'Pleroma.Captcha.Kocaptcha'"
             class="setting-list suboptions"
           >
-            <h4>{{ $t('admin_dash.kocaptcha') }}</h4>
+            <h4>{{ $t('admin_dash.instance.kocaptcha') }}</h4>
             <li>
               <StringSetting
                 source="admin"
diff --git a/src/components/settings_modal/admin_tabs/limits_tab.vue b/src/components/settings_modal/admin_tabs/limits_tab.vue
index 3f07c554..f7a70c97 100644
--- a/src/components/settings_modal/admin_tabs/limits_tab.vue
+++ b/src/components/settings_modal/admin_tabs/limits_tab.vue
@@ -1,7 +1,7 @@
 <template>
-  <div :label="$t('admin_dash.instance')">
+  <div :label="$t('admin_dash.tabs.limits')">
     <div class="setting-item">
-      <h2>{{ $t('admin_dash.arbitrary_limits') }}</h2>
+      <h2>{{ $t('admin_dash.limits.arbitrary_limits') }}</h2>
       <ul class="setting-list">
         <li>
           <h3>{{ $t('admin_dash.limits.posts') }}</h3>
@@ -19,6 +19,7 @@
           <IntegerSetting
             source="admin"
             path=":pleroma.:instance.:remote_limit"
+            expert="1"
             draft-mode
           >
             POST LIMIT (remote)
@@ -57,6 +58,15 @@
         <li>
           <h3>{{ $t('admin_dash.limits.users') }}</h3>
         </li>
+        <li>
+          <IntegerSetting
+            source="admin"
+            path=":pleroma.:instance.:max_pinned_statuses"
+            draft-mode
+          >
+            MAX PINNED POSTS
+          </IntegerSetting>
+        </li>
         <li>
           <IntegerSetting
             source="admin"
@@ -92,6 +102,7 @@
             source="admin"
             path=":pleroma.:instance.:max_remote_account_fields"
             draft-mode
+            expert="1"
           >
             MAX ACCOUNT FIELDS (remote)
           </IntegerSetting>
@@ -135,15 +146,6 @@
             MAX BANNER SIZE KiB
           </IntegerSetting>
         </li>
-        <li>
-          <IntegerSetting
-            source="admin"
-            path=":pleroma.:instance.:max_pinned_statuses"
-            draft-mode
-          >
-            MAX PINNED POSTS
-          </IntegerSetting>
-        </li>
       </ul>
     </div>
   </div>
diff --git a/src/components/settings_modal/settings_modal.vue b/src/components/settings_modal/settings_modal.vue
index 73e1524a..303050e4 100644
--- a/src/components/settings_modal/settings_modal.vue
+++ b/src/components/settings_modal/settings_modal.vue
@@ -8,7 +8,7 @@
     <div class="settings-modal-panel panel">
       <div class="panel-heading">
         <span class="title">
-          {{ $t('settings.settings') }}
+          {{ modalMode === 'user' ? $t('settings.settings') : $t('admin_dash.window_title') }}
         </span>
         <transition name="fade">
           <div
@@ -47,6 +47,7 @@
       </div>
       <div class="panel-footer settings-footer">
         <Popover
+          v-if="modalMode === 'user'"
           class="export"
           trigger="click"
           placement="top"
@@ -108,6 +109,18 @@
         >
           {{ $t("settings.expert_mode") }}
         </Checkbox>
+        <span v-if="modalMode === 'admin'">
+          <i18n-t keypath="admin_dash.wip_notice">
+            <template #adminFeLink>
+              <a
+                href="/pleroma/admin/#/login-pleroma"
+                target="_blank"
+              >
+                {{ $t("admin_dash.old_ui_link") }}
+              </a>
+            </template>
+          </i18n-t>
+        </span>
         <span
           id="unscrolled-content"
           class="extra-content"
diff --git a/src/components/settings_modal/settings_modal_admin_content.js b/src/components/settings_modal/settings_modal_admin_content.js
index c6c8837f..07d4cf2e 100644
--- a/src/components/settings_modal/settings_modal_admin_content.js
+++ b/src/components/settings_modal/settings_modal_admin_content.js
@@ -8,7 +8,7 @@ import LimitsTab from './admin_tabs/limits_tab.vue'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faWrench,
-  faUser,
+  faHand,
   faFilter,
   faPaintBrush,
   faBell,
@@ -19,7 +19,7 @@ import {
 
 library.add(
   faWrench,
-  faUser,
+  faHand,
   faFilter,
   faPaintBrush,
   faBell,
diff --git a/src/components/settings_modal/settings_modal_admin_content.vue b/src/components/settings_modal/settings_modal_admin_content.vue
index 16b55828..52c6ddf5 100644
--- a/src/components/settings_modal/settings_modal_admin_content.vue
+++ b/src/components/settings_modal/settings_modal_admin_content.vue
@@ -7,15 +7,15 @@
     :body-scroll-lock="bodyLock"
   >
     <div
-      :label="$t('admin_dash.instance')"
+      :label="$t('admin_dash.tabs.instance')"
       icon="wrench"
       data-tab-name="general"
     >
       <InstanceTab />
     </div>
     <div
-      :label="$t('admin_dash.limits')"
-      icon="wrench"
+      :label="$t('admin_dash.tabs.limits')"
+      icon="hand"
       data-tab-name="limits"
     >
       <LimitsTab />
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 10ba2ef8..8e36a7b8 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -832,6 +832,33 @@
       "frontend_version": "Frontend version"
     }
   },
+  "admin_dash": {
+    "window_title": "Administration",
+    "wip_notice": "This admin dashboard is experimental and WIP, {adminFeLink}.",
+    "old_ui_link": "old admin UI available here",
+    "tabs": {
+      "instance": "Instance",
+      "limits": "Limits"
+    },
+    "captcha": {
+      "native": "Native",
+      "kocaptcha": "KoCaptcha"
+    },
+    "instance": {
+      "instance": "Instance information",
+      "registrations": "User sign-ups",
+      "captcha_header": "CAPTCHA",
+      "kocaptcha": "KoCaptcha settings"
+    },
+    "limits": {
+      "arbitrary_limits": "Arbitrary limits",
+      "posts": "Post limits",
+      "uploads": "Attachments limits",
+      "users": "User profile limits",
+      "profile_fields": "Profile fields limits",
+      "user_uploads": "Profile media limits"
+    }
+  },
   "time": {
     "unit": {
       "days": "{0} day | {0} days",
-- 
cgit v1.2.3-70-g09d2


From c9072ddb0b5ab1daef1f461982a6c57460a75dfe Mon Sep 17 00:00:00 2001
From: jonossa <hello@jonossaseuraava.net>
Date: Tue, 21 Mar 2023 16:43:16 +0200
Subject: add parseInt in poll expires_in to make sure FE sends integers in all
 cases

---
 src/services/api/api.service.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index b8c10b21..259e5b30 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -840,7 +840,7 @@ const postStatus = ({
   })
   if (pollOptions.some(option => option !== '')) {
     const normalizedPoll = {
-      expires_in: poll.expiresIn,
+      expires_in: parseInt(poll.expiresIn, 10),
       multiple: poll.multiple
     }
     Object.keys(normalizedPoll).forEach(key => {
@@ -897,7 +897,7 @@ const editStatus = ({
 
   if (pollOptions.some(option => option !== '')) {
     const normalizedPoll = {
-      expires_in: poll.expiresIn,
+      expires_in: parseInt(poll.expiresIn, 10),
       multiple: poll.multiple
     }
     Object.keys(normalizedPoll).forEach(key => {
-- 
cgit v1.2.3-70-g09d2


From 6b40fc989575fd52b3b9bf3e8d78d7fb4a6c7696 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 21 Mar 2023 22:26:11 +0200
Subject: fixes

---
 .../settings_modal/admin_tabs/instance_tab.js      |  1 -
 .../settings_modal/helpers/boolean_setting.vue     | 27 +++++++++++-----------
 .../settings_modal/helpers/draft_buttons.vue       |  4 ++--
 src/components/settings_modal/helpers/setting.js   |  2 --
 4 files changed, 15 insertions(+), 19 deletions(-)

(limited to 'src')

diff --git a/src/components/settings_modal/admin_tabs/instance_tab.js b/src/components/settings_modal/admin_tabs/instance_tab.js
index 4a261659..77a05d38 100644
--- a/src/components/settings_modal/admin_tabs/instance_tab.js
+++ b/src/components/settings_modal/admin_tabs/instance_tab.js
@@ -14,7 +14,6 @@ library.add(
 )
 
 const InstanceTab = {
-  data () {},
   components: {
     BooleanSetting,
     ChoiceSetting,
diff --git a/src/components/settings_modal/helpers/boolean_setting.vue b/src/components/settings_modal/helpers/boolean_setting.vue
index aedbf23e..07971b00 100644
--- a/src/components/settings_modal/helpers/boolean_setting.vue
+++ b/src/components/settings_modal/helpers/boolean_setting.vue
@@ -13,26 +13,25 @@
         class="label"
       >
         <template v-if="backendDescription">
-          {{ backendDescriptionLabel + ' ' }}
+          {{ backendDescriptionLabel }}
         </template>
         <template v-else>
           <slot />
         </template>
       </span>
-      {{ ' ' }}
-      <ModifiedIndicator
-        :changed="isChanged"
-        :onclick="reset"
-      />
-      <ProfileSettingIndicator :is-profile="isProfileSetting" />
-      <DraftButtons />
-      <p
-        v-if="backendDescriptionDescription"
-        class="setting-description"
-      >
-        {{ backendDescriptionDescription + ' ' }}
-      </p>
     </Checkbox>
+    <ModifiedIndicator
+      :changed="isChanged"
+      :onclick="reset"
+    />
+    <ProfileSettingIndicator :is-profile="isProfileSetting" />
+    <DraftButtons />
+    <p
+      v-if="backendDescriptionDescription"
+      class="setting-description"
+    >
+      {{ backendDescriptionDescription + ' ' }}
+    </p>
   </label>
 </template>
 
diff --git a/src/components/settings_modal/helpers/draft_buttons.vue b/src/components/settings_modal/helpers/draft_buttons.vue
index 53ddc9b4..9e972b14 100644
--- a/src/components/settings_modal/helpers/draft_buttons.vue
+++ b/src/components/settings_modal/helpers/draft_buttons.vue
@@ -5,13 +5,13 @@
     class="DraftButtons"
   >
     <Popover
+      v-if="$parent.isDirty"
       trigger="hover"
       :trigger-attrs="{ 'aria-label': $t('settings.commit_value_tooltip') }"
     >
       <template #trigger>
         &nbsp;
         <button
-          v-if="$parent.isDirty"
           class="button button-default btn"
           type="button"
           :title="$t('settings.commit_value')"
@@ -27,13 +27,13 @@
       </template>
     </Popover>
     <Popover
+      v-if="$parent.isDirty"
       trigger="hover"
       :trigger-attrs="{ 'aria-label': $t('settings.reset_value_tooltip') }"
     >
       <template #trigger>
         &nbsp;
         <button
-          v-if="$parent.isDirty"
           class="button button-default btn"
           type="button"
           :title="$t('settings.reset_value')"
diff --git a/src/components/settings_modal/helpers/setting.js b/src/components/settings_modal/helpers/setting.js
index a6d35fb9..fd730db9 100644
--- a/src/components/settings_modal/helpers/setting.js
+++ b/src/components/settings_modal/helpers/setting.js
@@ -1,4 +1,3 @@
-import Checkbox from 'src/components/checkbox/checkbox.vue'
 import ModifiedIndicator from './modified_indicator.vue'
 import ProfileSettingIndicator from './profile_setting_indicator.vue'
 import DraftButtons from './draft_buttons.vue'
@@ -6,7 +5,6 @@ import { get, set } from 'lodash'
 
 export default {
   components: {
-    Checkbox,
     ModifiedIndicator,
     DraftButtons,
     ProfileSettingIndicator
-- 
cgit v1.2.3-70-g09d2


From 2bf224e214d9b42333a2139a89c089ca9a544149 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 21 Mar 2023 22:46:40 +0200
Subject: made draft-mode and source inject-able

---
 .../settings_modal/admin_tabs/instance_tab.js      |  6 ++
 .../settings_modal/admin_tabs/instance_tab.vue     | 78 ++++------------------
 .../settings_modal/helpers/choice_setting.js       |  3 +-
 .../settings_modal/helpers/choice_setting.vue      |  2 +-
 .../settings_modal/helpers/number_setting.vue      |  2 +-
 src/components/settings_modal/helpers/setting.js   | 41 ++++++++----
 .../settings_modal/helpers/string_setting.vue      |  2 +-
 7 files changed, 50 insertions(+), 84 deletions(-)

(limited to 'src')

diff --git a/src/components/settings_modal/admin_tabs/instance_tab.js b/src/components/settings_modal/admin_tabs/instance_tab.js
index 77a05d38..7aaedbce 100644
--- a/src/components/settings_modal/admin_tabs/instance_tab.js
+++ b/src/components/settings_modal/admin_tabs/instance_tab.js
@@ -14,6 +14,12 @@ library.add(
 )
 
 const InstanceTab = {
+  provide () {
+    return {
+      defaultDraftMode: true,
+      defaultSource: 'admin'
+    }
+  },
   components: {
     BooleanSetting,
     ChoiceSetting,
diff --git a/src/components/settings_modal/admin_tabs/instance_tab.vue b/src/components/settings_modal/admin_tabs/instance_tab.vue
index 411982cc..43ad4c8c 100644
--- a/src/components/settings_modal/admin_tabs/instance_tab.vue
+++ b/src/components/settings_modal/admin_tabs/instance_tab.vue
@@ -4,65 +4,37 @@
       <h2>{{ $t('admin_dash.instance.instance') }}</h2>
       <ul class="setting-list">
         <li>
-          <StringSetting
-            source="admin"
-            path=":pleroma.:instance.:name"
-            draft-mode
-          >
+          <StringSetting path=":pleroma.:instance.:name">
             NAME
           </StringSetting>
         </li>
         <li>
-          <StringSetting
-            source="admin"
-            path=":pleroma.:instance.:email"
-            draft-mode
-          >
+          <StringSetting path=":pleroma.:instance.:email">
             ADMIN EMAIL
           </StringSetting>
         </li>
         <li>
-          <StringSetting
-            source="admin"
-            path=":pleroma.:instance.:description"
-            draft-mode
-          >
+          <StringSetting path=":pleroma.:instance.:description">
             DESCRIPTION
           </StringSetting>
         </li>
         <li>
-          <StringSetting
-            source="admin"
-            path=":pleroma.:instance.:short_description"
-            draft-mode
-          >
+          <StringSetting path=":pleroma.:instance.:short_description">
             SHORT DESCRIPTION
           </StringSetting>
         </li>
         <li>
-          <StringSetting
-            source="admin"
-            path=":pleroma.:instance.:instance_thumbnail"
-            draft-mode
-          >
+          <StringSetting path=":pleroma.:instance.:instance_thumbnail">
             INSTANCE THUMBNAIL
           </StringSetting>
         </li>
         <li>
-          <StringSetting
-            source="admin"
-            path=":pleroma.:instance.:background_image"
-            draft-mode
-          >
+          <StringSetting path=":pleroma.:instance.:background_image">
             BACKGROUND IMAGE
           </StringSetting>
         </li>
         <li>
-          <BooleanSetting
-            source="admin"
-            path=":pleroma.:instance.:public"
-            draft-mode
-          >
+          <BooleanSetting path=":pleroma.:instance.:public">
             PUBLIC
           </BooleanSetting>
         </li>
@@ -72,21 +44,15 @@
       <h2>{{ $t('admin_dash.instance.registrations') }}</h2>
       <ul class="setting-list">
         <li>
-          <BooleanSetting
-            source="admin"
-            path=":pleroma.:instance.:registrations_open"
-            draft-mode
-          >
+          <BooleanSetting path=":pleroma.:instance.:registrations_open">
             REGISTRATIONS OPEN
           </BooleanSetting>
           <ul class="setting-list suboptions">
             <li>
               <BooleanSetting
-                source="admin"
                 path=":pleroma.:instance.:invites_enabled"
                 parent-path=":pleroma.:instance.:registrations_open"
                 :parent-invert="true"
-                draft-mode
               >
                 INVITES ENABLED
               </BooleanSetting>
@@ -94,20 +60,12 @@
           </ul>
         </li>
         <li>
-          <BooleanSetting
-            source="admin"
-            path=":pleroma.:instance.:account_activation_required"
-            draft-mode
-          >
+          <BooleanSetting path=":pleroma.:instance.:account_activation_required">
             ACTIVATION REQUIRED
           </BooleanSetting>
         </li>
         <li>
-          <BooleanSetting
-            source="admin"
-            path=":pleroma.:instance.:account_approval_required"
-            draft-mode
-          >
+          <BooleanSetting path=":pleroma.:instance.:account_approval_required">
             APPROVAL REQUIRED
           </BooleanSetting>
         </li>
@@ -115,32 +73,24 @@
           <h3>{{ $t('admin_dash.instance.captcha_header') }}</h3>
         </li>
         <li>
-          <BooleanSetting
-            source="admin"
-            :path="[':pleroma', 'Pleroma.Captcha', ':enabled']"
-            draft-mode
-          >
+          <BooleanSetting :path="[':pleroma', 'Pleroma.Captcha', ':enabled']">
             CAPTCHA
           </BooleanSetting>
           <ul class="setting-list suboptions">
             <li>
               <ChoiceSetting
-                source="admin"
                 :path="[':pleroma', 'Pleroma.Captcha', ':method']"
                 :parent-path="[':pleroma', 'Pleroma.Captcha', ':enabled']"
                 :option-label-map="{
                   'Pleroma.Captcha.Native': $t('admin_dash.captcha.native'),
                   'Pleroma.Captcha.Kocaptcha': $t('admin_dash.captcha.kocaptcha')
                 }"
-                draft-mode
               >
                 CAPTCHA TYPE
               </ChoiceSetting>
               <IntegerSetting
-                source="admin"
                 :path="[':pleroma', 'Pleroma.Captcha', ':seconds_valid']"
                 :parent-path="[':pleroma', 'Pleroma.Captcha', ':enabled']"
-                draft-mode
               >
                 VALID
               </IntegerSetting>
@@ -152,11 +102,7 @@
           >
             <h4>{{ $t('admin_dash.instance.kocaptcha') }}</h4>
             <li>
-              <StringSetting
-                source="admin"
-                :path="[':pleroma', 'Pleroma.Captcha.Kocaptcha', ':endpoint']"
-                draft-mode
-              >
+              <StringSetting :path="[':pleroma', 'Pleroma.Captcha.Kocaptcha', ':endpoint']">
                 cockAPTCHA ENDPOINT
               </StringSetting>
             </li>
diff --git a/src/components/settings_modal/helpers/choice_setting.js b/src/components/settings_modal/helpers/choice_setting.js
index 3ff81bc9..bdeece76 100644
--- a/src/components/settings_modal/helpers/choice_setting.js
+++ b/src/components/settings_modal/helpers/choice_setting.js
@@ -22,8 +22,7 @@ export default {
   computed: {
     ...Setting.computed,
     realOptions () {
-      if (this.source === 'admin') {
-        console.log(this.backendDescriptionSuggestions)
+      if (this.realSource === 'admin') {
         return this.backendDescriptionSuggestions.map(x => ({
           key: x,
           value: x,
diff --git a/src/components/settings_modal/helpers/choice_setting.vue b/src/components/settings_modal/helpers/choice_setting.vue
index 55f9a62c..8713acf5 100644
--- a/src/components/settings_modal/helpers/choice_setting.vue
+++ b/src/components/settings_modal/helpers/choice_setting.vue
@@ -11,7 +11,7 @@
     </template>
     {{ ' ' }}
     <Select
-      :model-value="draftMode ? draft :state"
+      :model-value="realDraftMode ? draft :state"
       :disabled="disabled"
       @update:modelValue="update"
     >
diff --git a/src/components/settings_modal/helpers/number_setting.vue b/src/components/settings_modal/helpers/number_setting.vue
index 93a7a79a..f97d5cf2 100644
--- a/src/components/settings_modal/helpers/number_setting.vue
+++ b/src/components/settings_modal/helpers/number_setting.vue
@@ -18,7 +18,7 @@
       :step="step || 1"
       :disabled="disabled"
       :min="min || 0"
-      :value="draftMode ? draft :state"
+      :value="realDraftMode ? draft :state"
       @change="update"
     >
     {{ ' ' }}
diff --git a/src/components/settings_modal/helpers/setting.js b/src/components/settings_modal/helpers/setting.js
index fd730db9..7cad27b7 100644
--- a/src/components/settings_modal/helpers/setting.js
+++ b/src/components/settings_modal/helpers/setting.js
@@ -31,10 +31,18 @@ export default {
     },
     source: {
       type: String,
-      default: 'default'
+      default: undefined
     },
     draftMode: {
       type: Boolean,
+      default: undefined
+    }
+  },
+  inject: {
+    defaultSource: {
+      default: 'default'
+    },
+    defaultDraftMode: {
       default: false
     }
   },
@@ -44,7 +52,7 @@ export default {
     }
   },
   created () {
-    if (this.draftMode) {
+    if (this.realDraftMode) {
       this.draft = this.state
     }
   },
@@ -57,6 +65,12 @@ export default {
         return value
       }
     },
+    realSource () {
+      return this.source || this.defaultSource
+    },
+    realDraftMode () {
+      return typeof this.draftMode === 'undefined' ? this.defaultDraftMode : this.draftMode
+    },
     backendDescription () {
       return get(this.$store.state.adminSettings.descriptions, this.path)
     },
@@ -74,7 +88,8 @@ export default {
       return this.disabled || (parentValue !== null ? (this.parentInvert ? parentValue : !parentValue) : false)
     },
     configSource () {
-      switch (this.source) {
+      console.log('SRC', this.realSource)
+      switch (this.realSource) {
         case 'profile':
           return this.$store.state.profileConfig
         case 'admin':
@@ -84,7 +99,7 @@ export default {
       }
     },
     configSink () {
-      switch (this.source) {
+      switch (this.realSource) {
         case 'profile':
           return (k, v) => this.$store.dispatch('setProfileOption', { name: k, value: v })
         case 'admin':
@@ -94,7 +109,7 @@ export default {
       }
     },
     defaultState () {
-      switch (this.source) {
+      switch (this.realSource) {
         case 'profile':
           return {}
         default:
@@ -102,10 +117,10 @@ export default {
       }
     },
     isProfileSetting () {
-      return this.source === 'profile'
+      return this.realSource === 'profile'
     },
     isChanged () {
-      switch (this.source) {
+      switch (this.realSource) {
         case 'profile':
         case 'admin':
           return false
@@ -114,10 +129,10 @@ export default {
       }
     },
     isDirty () {
-      return this.draftMode && this.draft !== this.state
+      return this.realDraftMode && this.draft !== this.state
     },
     canHardReset () {
-      return this.source === 'admin' && this.$store.state.adminSettings.modifiedPaths.has(this.path)
+      return this.realSource === 'admin' && this.$store.state.adminSettings.modifiedPaths.has(this.path)
     },
     matchesExpertLevel () {
       return (this.expert || 0) <= this.$store.state.config.expertLevel > 0
@@ -128,20 +143,20 @@ export default {
       return e.target.value
     },
     update (e) {
-      if (this.draftMode) {
+      if (this.realDraftMode) {
         this.draft = this.getValue(e)
       } else {
         this.configSink(this.path, this.getValue(e))
       }
     },
     commitDraft () {
-      if (this.draftMode) {
+      if (this.realDraftMode) {
         this.configSink(this.path, this.draft)
       }
     },
     reset () {
       console.log('reset')
-      if (this.draftMode) {
+      if (this.realDraftMode) {
         console.log(this.draft)
         console.log(this.state)
         this.draft = this.state
@@ -150,7 +165,7 @@ export default {
       }
     },
     hardReset () {
-      switch (this.source) {
+      switch (this.realSource) {
         case 'admin':
           return this.$store.dispatch('resetAdminSetting', { path: this.path })
             .then(() => { this.draft = this.state })
diff --git a/src/components/settings_modal/helpers/string_setting.vue b/src/components/settings_modal/helpers/string_setting.vue
index 91a4afa4..fb91b5d9 100644
--- a/src/components/settings_modal/helpers/string_setting.vue
+++ b/src/components/settings_modal/helpers/string_setting.vue
@@ -16,7 +16,7 @@
       class="string-input"
       step="1"
       :disabled="disabled"
-      :value="draftMode ? draft :state"
+      :value="realDraftMode ? draft : state"
       @change="update"
     >
     {{ ' ' }}
-- 
cgit v1.2.3-70-g09d2


From 6992439c92c247bf5b48155a76ff4e39a57b0ec7 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 22 Mar 2023 00:00:52 +0200
Subject: fixes for diabled state, tri-state boolean and access control

---
 .../settings_modal/admin_tabs/instance_tab.vue     | 87 +++++++++++++++++++++-
 .../settings_modal/helpers/boolean_setting.js      | 15 ++++
 .../settings_modal/helpers/boolean_setting.vue     |  5 +-
 .../settings_modal/helpers/draft_buttons.vue       |  2 +-
 .../settings_modal/helpers/number_setting.vue      |  5 +-
 src/components/settings_modal/helpers/setting.js   |  4 +-
 .../settings_modal/helpers/string_setting.vue      |  5 +-
 7 files changed, 115 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/components/settings_modal/admin_tabs/instance_tab.vue b/src/components/settings_modal/admin_tabs/instance_tab.vue
index 43ad4c8c..96d8a17e 100644
--- a/src/components/settings_modal/admin_tabs/instance_tab.vue
+++ b/src/components/settings_modal/admin_tabs/instance_tab.vue
@@ -33,11 +33,81 @@
             BACKGROUND IMAGE
           </StringSetting>
         </li>
+      </ul>
+    </div>
+    <div class="setting-item">
+      <h2>{{ $t('admin_dash.instance.access') }}</h2>
+      <ul class="setting-list">
         <li>
           <BooleanSetting path=":pleroma.:instance.:public">
             PUBLIC
           </BooleanSetting>
         </li>
+        <li>
+          <h3>{{ $t('admin_dash.instance.restrict.header') }}</h3>
+        </li>
+        <li>
+          <ChoiceSetting path=":pleroma.:instance.:limit_to_local_content">
+            SEARCH RESTRICTION
+          </ChoiceSetting>
+        </li>
+        <li>
+          <h4>{{ $t('admin_dash.instance.restrict.timelines') }}</h4>
+        </li>
+        <li>
+          <BooleanSetting
+            path=":pleroma.:restrict_unauthenticated.:timelines.:local"
+            indeterminate-state=":if_instance_is_private"
+          >
+            LOCAL TIMELINES
+          </BooleanSetting>
+        </li>
+        <li>
+          <BooleanSetting
+            path=":pleroma.:restrict_unauthenticated.:timelines.:federated"
+            indeterminate-state=":if_instance_is_private"
+          >
+            FED TIMELINES
+          </BooleanSetting>
+        </li>
+        <li>
+          <h4>{{ $t('admin_dash.instance.restrict.profiles') }}</h4>
+        </li>
+        <li>
+          <BooleanSetting
+            path=":pleroma.:restrict_unauthenticated.:profiles.:local"
+            indeterminate-state=":if_instance_is_private"
+          >
+            LOCAL PROFILES
+          </BooleanSetting>
+        </li>
+        <li>
+          <BooleanSetting
+            path=":pleroma.:restrict_unauthenticated.:profiles.:remote"
+            indeterminate-state=":if_instance_is_private"
+          >
+            FED PROFILES
+          </BooleanSetting>
+        </li>
+        <li>
+          <h4>{{ $t('admin_dash.instance.restrict.activities') }}</h4>
+        </li>
+        <li>
+          <BooleanSetting
+            path=":pleroma.:restrict_unauthenticated.:activities.:local"
+            indeterminate-state=":if_instance_is_private"
+          >
+            LOCAL STATUSES
+          </BooleanSetting>
+        </li>
+        <li>
+          <BooleanSetting
+            path=":pleroma.:restrict_unauthenticated.:activities.:remote"
+            indeterminate-state=":if_instance_is_private"
+          >
+            FED STATUSES
+          </BooleanSetting>
+        </li>
       </ul>
     </div>
     <div class="setting-item">
@@ -52,13 +122,28 @@
               <BooleanSetting
                 path=":pleroma.:instance.:invites_enabled"
                 parent-path=":pleroma.:instance.:registrations_open"
-                :parent-invert="true"
+                parent-invert
               >
                 INVITES ENABLED
               </BooleanSetting>
             </li>
           </ul>
         </li>
+        <li>
+          <BooleanSetting path=":pleroma.:instance.:birthday_required">
+            BDEY REQUIRED
+          </BooleanSetting>
+          <ul class="setting-list suboptions">
+            <li>
+              <IntegerSetting
+                path=":pleroma.:instance.:birthday_min_age"
+                parent-path=":pleroma.:instance.:birthday_required"
+              >
+                BDEY age of consent
+              </IntegerSetting>
+            </li>
+          </ul>
+        </li>
         <li>
           <BooleanSetting path=":pleroma.:instance.:account_activation_required">
             ACTIVATION REQUIRED
diff --git a/src/components/settings_modal/helpers/boolean_setting.js b/src/components/settings_modal/helpers/boolean_setting.js
index 0df01d31..199d3d0f 100644
--- a/src/components/settings_modal/helpers/boolean_setting.js
+++ b/src/components/settings_modal/helpers/boolean_setting.js
@@ -3,13 +3,28 @@ import Setting from './setting.js'
 
 export default {
   ...Setting,
+  props: {
+    ...Setting.props,
+    indeterminateState: [String, Object]
+  },
   components: {
     ...Setting.components,
     Checkbox
   },
+  computed: {
+    ...Setting.computed,
+    isIndeterminate () {
+      return this.visibleState === this.indeterminateState
+    }
+  },
   methods: {
     ...Setting.methods,
     getValue (e) {
+      // Basic tri-state toggle implementation
+      if (!!this.indeterminateState && !e && this.visibleState === true) {
+        // If we have indeterminate state, switching from true to false first goes through indeterminate
+        return this.indeterminateState
+      }
       return e
     }
   }
diff --git a/src/components/settings_modal/helpers/boolean_setting.vue b/src/components/settings_modal/helpers/boolean_setting.vue
index 07971b00..6307d526 100644
--- a/src/components/settings_modal/helpers/boolean_setting.vue
+++ b/src/components/settings_modal/helpers/boolean_setting.vue
@@ -4,13 +4,15 @@
     class="BooleanSetting"
   >
     <Checkbox
-      :model-value="draftMode ? draft :state"
+      :model-value="visibleState"
       :disabled="shouldBeDisabled"
+      :indeterminate="isIndeterminate"
       @update:modelValue="update"
     >
       <span
         v-if="!!$slots.default"
         class="label"
+        :class="{ 'faint': shouldBeDisabled }"
       >
         <template v-if="backendDescription">
           {{ backendDescriptionLabel }}
@@ -29,6 +31,7 @@
     <p
       v-if="backendDescriptionDescription"
       class="setting-description"
+      :class="{ 'faint': shouldBeDisabled }"
     >
       {{ backendDescriptionDescription + ' ' }}
     </p>
diff --git a/src/components/settings_modal/helpers/draft_buttons.vue b/src/components/settings_modal/helpers/draft_buttons.vue
index 9e972b14..80da92e8 100644
--- a/src/components/settings_modal/helpers/draft_buttons.vue
+++ b/src/components/settings_modal/helpers/draft_buttons.vue
@@ -49,13 +49,13 @@
       </template>
     </Popover>
     <Popover
+      v-if="$parent.canHardReset"
       trigger="hover"
       :trigger-attrs="{ 'aria-label': $t('settings.hard_reset_value_tooltip') }"
     >
       <template #trigger>
         &nbsp;
         <button
-          v-if="$parent.canHardReset"
           class="button button-default btn"
           type="button"
           :title="$t('settings.hard_reset_value')"
diff --git a/src/components/settings_modal/helpers/number_setting.vue b/src/components/settings_modal/helpers/number_setting.vue
index f97d5cf2..2b90c336 100644
--- a/src/components/settings_modal/helpers/number_setting.vue
+++ b/src/components/settings_modal/helpers/number_setting.vue
@@ -3,7 +3,7 @@
     v-if="matchesExpertLevel"
     class="NumberSetting"
   >
-    <label :for="path">
+    <label :for="path" :class="{ 'faint': shouldBeDisabled }">
       <template v-if="backendDescription">
         {{ backendDescriptionLabel + ' ' }}
       </template>
@@ -16,7 +16,7 @@
       class="number-input"
       type="number"
       :step="step || 1"
-      :disabled="disabled"
+      :disabled="shouldBeDisabled"
       :min="min || 0"
       :value="realDraftMode ? draft :state"
       @change="update"
@@ -31,6 +31,7 @@
     <p
       v-if="backendDescriptionDescription"
       class="setting-description"
+      :class="{ 'faint': shouldBeDisabled }"
     >
       {{ backendDescriptionDescription + ' ' }}
     </p>
diff --git a/src/components/settings_modal/helpers/setting.js b/src/components/settings_modal/helpers/setting.js
index 7cad27b7..d42ae763 100644
--- a/src/components/settings_modal/helpers/setting.js
+++ b/src/components/settings_modal/helpers/setting.js
@@ -65,6 +65,9 @@ export default {
         return value
       }
     },
+    visibleState () {
+      return this.realDraftMode ? this.draft : this.state
+    },
     realSource () {
       return this.source || this.defaultSource
     },
@@ -88,7 +91,6 @@ export default {
       return this.disabled || (parentValue !== null ? (this.parentInvert ? parentValue : !parentValue) : false)
     },
     configSource () {
-      console.log('SRC', this.realSource)
       switch (this.realSource) {
         case 'profile':
           return this.$store.state.profileConfig
diff --git a/src/components/settings_modal/helpers/string_setting.vue b/src/components/settings_modal/helpers/string_setting.vue
index fb91b5d9..5ee75a84 100644
--- a/src/components/settings_modal/helpers/string_setting.vue
+++ b/src/components/settings_modal/helpers/string_setting.vue
@@ -3,7 +3,7 @@
     v-if="matchesExpertLevel"
     class="StringSetting"
   >
-    <label :for="path">
+    <label :for="path" :class="{ 'faint': shouldBeDisabled }">
       <template v-if="backendDescription">
         {{ backendDescriptionLabel + ' ' }}
       </template>
@@ -15,7 +15,7 @@
       :id="path"
       class="string-input"
       step="1"
-      :disabled="disabled"
+      :disabled="shouldBeDisabled"
       :value="realDraftMode ? draft : state"
       @change="update"
     >
@@ -29,6 +29,7 @@
     <p
       v-if="backendDescriptionDescription"
       class="setting-description"
+      :class="{ 'faint': shouldBeDisabled }"
     >
       {{ backendDescriptionDescription + ' ' }}
     </p>
-- 
cgit v1.2.3-70-g09d2


From c7a16bdfe2cebe51c232ae3fe3101d35c4f877a2 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 22 Mar 2023 12:43:53 +0200
Subject: grouped settings/managed drafts support added

---
 .../settings_modal/admin_tabs/instance_tab.js      |  4 ++-
 .../settings_modal/admin_tabs/instance_tab.vue     | 15 ++++++++++
 .../settings_modal/helpers/group_setting.js        | 14 ++++++++++
 .../settings_modal/helpers/group_setting.vue       | 15 ++++++++++
 src/components/settings_modal/helpers/setting.js   | 32 +++++++++++++++++++---
 src/modules/adminSettings.js                       | 24 ++++++++++++++--
 6 files changed, 96 insertions(+), 8 deletions(-)
 create mode 100644 src/components/settings_modal/helpers/group_setting.js
 create mode 100644 src/components/settings_modal/helpers/group_setting.vue

(limited to 'src')

diff --git a/src/components/settings_modal/admin_tabs/instance_tab.js b/src/components/settings_modal/admin_tabs/instance_tab.js
index 7aaedbce..f702afcf 100644
--- a/src/components/settings_modal/admin_tabs/instance_tab.js
+++ b/src/components/settings_modal/admin_tabs/instance_tab.js
@@ -2,6 +2,7 @@ import BooleanSetting from '../helpers/boolean_setting.vue'
 import ChoiceSetting from '../helpers/choice_setting.vue'
 import IntegerSetting from '../helpers/integer_setting.vue'
 import StringSetting from '../helpers/string_setting.vue'
+import GroupSetting from '../helpers/group_setting.vue'
 
 import SharedComputedObject from '../helpers/shared_computed_object.js'
 import { library } from '@fortawesome/fontawesome-svg-core'
@@ -24,7 +25,8 @@ const InstanceTab = {
     BooleanSetting,
     ChoiceSetting,
     IntegerSetting,
-    StringSetting
+    StringSetting,
+    GroupSetting
   },
   computed: {
     ...SharedComputedObject()
diff --git a/src/components/settings_modal/admin_tabs/instance_tab.vue b/src/components/settings_modal/admin_tabs/instance_tab.vue
index 96d8a17e..9291ddf8 100644
--- a/src/components/settings_modal/admin_tabs/instance_tab.vue
+++ b/src/components/settings_modal/admin_tabs/instance_tab.vue
@@ -70,6 +70,11 @@
             FED TIMELINES
           </BooleanSetting>
         </li>
+        <li>
+          <GroupSetting path=":pleroma.:restrict_unauthenticated.:timelines">
+            TIMELINES
+          </GroupSetting>
+        </li>
         <li>
           <h4>{{ $t('admin_dash.instance.restrict.profiles') }}</h4>
         </li>
@@ -89,6 +94,11 @@
             FED PROFILES
           </BooleanSetting>
         </li>
+        <li>
+          <GroupSetting path=":pleroma.:restrict_unauthenticated.:profiles">
+            PROFILES
+          </GroupSetting>
+        </li>
         <li>
           <h4>{{ $t('admin_dash.instance.restrict.activities') }}</h4>
         </li>
@@ -108,6 +118,11 @@
             FED STATUSES
           </BooleanSetting>
         </li>
+        <li>
+          <GroupSetting path=":pleroma.:restrict_unauthenticated.:activities">
+            STATUSES
+          </GroupSetting>
+        </li>
       </ul>
     </div>
     <div class="setting-item">
diff --git a/src/components/settings_modal/helpers/group_setting.js b/src/components/settings_modal/helpers/group_setting.js
new file mode 100644
index 00000000..12a49000
--- /dev/null
+++ b/src/components/settings_modal/helpers/group_setting.js
@@ -0,0 +1,14 @@
+import { isEqual } from 'lodash'
+
+import Setting from './setting.js'
+
+export default {
+  ...Setting,
+  computed: {
+    ...Setting.computed,
+    isDirty () {
+      console.log(this.state, this.draft)
+      return !isEqual(this.state, this.draft)
+    }
+  }
+}
diff --git a/src/components/settings_modal/helpers/group_setting.vue b/src/components/settings_modal/helpers/group_setting.vue
new file mode 100644
index 00000000..a4df4bf3
--- /dev/null
+++ b/src/components/settings_modal/helpers/group_setting.vue
@@ -0,0 +1,15 @@
+<template>
+  <span
+    v-if="matchesExpertLevel"
+    class="GroupSetting"
+  >
+    <ModifiedIndicator
+      :changed="isChanged"
+      :onclick="reset"
+    />
+    <ProfileSettingIndicator :is-profile="isProfileSetting" />
+    <DraftButtons />
+  </span>
+</template>
+
+<script src="./group_setting.js"></script>
diff --git a/src/components/settings_modal/helpers/setting.js b/src/components/settings_modal/helpers/setting.js
index d42ae763..d2e1a6f4 100644
--- a/src/components/settings_modal/helpers/setting.js
+++ b/src/components/settings_modal/helpers/setting.js
@@ -48,15 +48,32 @@ export default {
   },
   data () {
     return {
-      draft: null
+      localDraft: null
     }
   },
   created () {
-    if (this.realDraftMode) {
+    if (this.realDraftMode && this.realSource !== 'admin') {
       this.draft = this.state
     }
   },
   computed: {
+    draft: {
+      // TODO allow passing shared draft object?
+      get () {
+        if (this.realSource === 'admin') {
+          return get(this.$store.state.adminSettings.draft, this.path)
+        } else {
+          return this.localDraft
+        }
+      },
+      set (value) {
+        if (this.realSource === 'admin') {
+          this.$store.commit('updateAdminDraft', { path: this.canonPath, value })
+        } else {
+          this.localDraft = value
+        }
+      }
+    },
     state () {
       const value = get(this.configSource, this.path)
       if (value === undefined) {
@@ -130,11 +147,18 @@ export default {
           return this.state !== this.defaultState
       }
     },
+    canonPath () {
+      return Array.isArray(this.path) ? this.path : this.path.split('.')
+    },
     isDirty () {
-      return this.realDraftMode && this.draft !== this.state
+      if (this.realSource === 'admin' && this.canonPath.length > 3) {
+        return false // should not show draft buttons for "grouped" values
+      } else {
+        return this.realDraftMode && this.draft !== this.state
+      }
     },
     canHardReset () {
-      return this.realSource === 'admin' && this.$store.state.adminSettings.modifiedPaths.has(this.path)
+      return this.realSource === 'admin' && this.$store.state.adminSettings.modifiedPaths.has(this.canonPath.join(' -> '))
     },
     matchesExpertLevel () {
       return (this.expert || 0) <= this.$store.state.config.expertLevel > 0
diff --git a/src/modules/adminSettings.js b/src/modules/adminSettings.js
index a84fadbf..27d5b37d 100644
--- a/src/modules/adminSettings.js
+++ b/src/modules/adminSettings.js
@@ -1,10 +1,11 @@
-import { set, cloneDeep } from 'lodash'
+import { set, get, cloneDeep } from 'lodash'
 
 export const defaultState = {
   needsReboot: null,
   config: null,
   modifiedPaths: null,
-  descriptions: null
+  descriptions: null,
+  draft: null
 }
 
 export const newUserFlags = {
@@ -22,6 +23,20 @@ const adminSettingsStorage = {
     },
     updateAdminDescriptions (state, { descriptions }) {
       state.descriptions = descriptions
+    },
+    updateAdminDraft (state, { path, value }) {
+      const [group, key, subkey] = path
+      const parent = [group, key, subkey]
+
+      set(state.draft, path, value)
+
+      // force-updating grouped draft to trigger refresh of group settings
+      if (path.length > parent.length) {
+        set(state.draft, parent, cloneDeep(get(state.draft, parent)))
+      }
+    },
+    resetAdminDraft (state) {
+      state.draft = cloneDeep(state.config)
     }
   },
   actions: {
@@ -31,7 +46,9 @@ const adminSettingsStorage = {
       backendDbConfig.configs.forEach(c => {
         const path = [c.group, c.key]
         if (c.db) {
-          c.db.forEach(x => modifiedPaths.add(path + '.' + x))
+          // Path elements can contain dot, therefore we use ' -> ' as a separator instead
+          // Using strings for modified paths for easier searching
+          c.db.forEach(x => modifiedPaths.add([...path, x].join(' -> ')))
         }
         const convert = (value) => {
           if (Array.isArray(value) && value.length > 0 && value[0].tuple) {
@@ -46,6 +63,7 @@ const adminSettingsStorage = {
       })
       console.log(config[':pleroma'])
       commit('updateAdminSettings', { config, modifiedPaths })
+      commit('resetAdminDraft')
     },
     setInstanceAdminDescriptions ({ state, commit, dispatch }, { backendDescriptions }) {
       const convert = ({ children, description, label, key = '<ROOT>', group, suggestions }, path, acc) => {
-- 
cgit v1.2.3-70-g09d2


From 91534172027a587c7cab2cd3bedc51c1e24905ef Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 22 Mar 2023 12:48:21 +0200
Subject: localization strings

---
 src/i18n/en.json | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/i18n/en.json b/src/i18n/en.json
index 8e36a7b8..f84b5a34 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -830,7 +830,13 @@
       "title": "Version",
       "backend_version": "Backend version",
       "frontend_version": "Frontend version"
-    }
+    },
+    "commit_value": "Save",
+    "commit_value_tooltip": "Value is not saved, press this button to commit your changes",
+    "reset_value": "Reset",
+    "reset_value_tooltip": "Reset draft",
+    "hard_reset_value": "Hard reset",
+    "hard_reset_value_tooltip": "Remove setting from storage, forcing use of default value"
   },
   "admin_dash": {
     "window_title": "Administration",
-- 
cgit v1.2.3-70-g09d2


From ece69f01b790b4bc02387d31ca911a0588e0664c Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 22 Mar 2023 18:57:23 +0200
Subject: added mass-draft-push and mass-draft-reset, small stylistic fixes

---
 src/components/settings_modal/settings_modal.js   | 14 +++++-
 src/components/settings_modal/settings_modal.scss |  2 +
 src/components/settings_modal/settings_modal.vue  | 19 +++++++-
 src/modules/adminSettings.js                      | 57 ++++++++++++++++++++++-
 4 files changed, 88 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/components/settings_modal/settings_modal.js b/src/components/settings_modal/settings_modal.js
index e033d999..ff58f2c3 100644
--- a/src/components/settings_modal/settings_modal.js
+++ b/src/components/settings_modal/settings_modal.js
@@ -5,7 +5,7 @@ import getResettableAsyncComponent from 'src/services/resettable_async_component
 import Popover from '../popover/popover.vue'
 import Checkbox from 'src/components/checkbox/checkbox.vue'
 import { library } from '@fortawesome/fontawesome-svg-core'
-import { cloneDeep } from 'lodash'
+import { cloneDeep, isEqual } from 'lodash'
 import {
   newImporter,
   newExporter
@@ -155,6 +155,12 @@ const SettingsModal = {
         PLEROMAFE_SETTINGS_MINOR_VERSION
       ]
       return clone
+    },
+    resetAdminDraft () {
+      this.$store.commit('resetAdminDraft')
+    },
+    pushAdminDraft () {
+      this.$store.dispatch('pushAdminDraft')
     }
   },
   computed: {
@@ -183,6 +189,12 @@ const SettingsModal = {
       set (value) {
         this.$store.dispatch('setOption', { name: 'expertLevel', value: value ? 1 : 0 })
       }
+    },
+    adminDraftAny () {
+      return !isEqual(
+        this.$store.state.adminSettings.config,
+        this.$store.state.adminSettings.draft
+      )
     }
   }
 }
diff --git a/src/components/settings_modal/settings_modal.scss b/src/components/settings_modal/settings_modal.scss
index 4cce6099..4cb506f9 100644
--- a/src/components/settings_modal/settings_modal.scss
+++ b/src/components/settings_modal/settings_modal.scss
@@ -51,6 +51,8 @@
 
   .settings-footer {
     display: flex;
+    flex-wrap: wrap;
+    line-height: 2;
 
     >* {
       margin-right: 0.5em;
diff --git a/src/components/settings_modal/settings_modal.vue b/src/components/settings_modal/settings_modal.vue
index 303050e4..57ec5535 100644
--- a/src/components/settings_modal/settings_modal.vue
+++ b/src/components/settings_modal/settings_modal.vue
@@ -45,7 +45,7 @@
         <SettingsModalUserContent v-if="modalMode === 'user' && modalOpenedOnceUser" />
         <SettingsModalAdminContent v-if="modalMode === 'admin' && modalOpenedOnceAdmin" />
       </div>
-      <div class="panel-footer settings-footer">
+      <div class="panel-footer settings-footer -flexible-height">
         <Popover
           v-if="modalMode === 'user'"
           class="export"
@@ -125,6 +125,23 @@
           id="unscrolled-content"
           class="extra-content"
         />
+        <span class="admin-buttons" v-if="modalMode === 'admin'">
+          <button
+            class="button-default btn"
+            @click="resetAdminDraft"
+            :disabled="!adminDraftAny"
+          >
+              {{ $t("admin_dash.reset_all") }}
+          </button>
+          {{ ' ' }}
+          <button
+            class="button-default btn"
+            @click="pushAdminDraft"
+            :disabled="!adminDraftAny"
+          >
+              {{ $t("admin_dash.commit_all") }}
+          </button>
+        </span>
       </div>
     </div>
   </Modal>
diff --git a/src/modules/adminSettings.js b/src/modules/adminSettings.js
index 27d5b37d..25fb8e50 100644
--- a/src/modules/adminSettings.js
+++ b/src/modules/adminSettings.js
@@ -1,4 +1,4 @@
-import { set, get, cloneDeep } from 'lodash'
+import { set, get, cloneDeep, differenceWith, isEqual, flatten } from 'lodash'
 
 export const defaultState = {
   needsReboot: null,
@@ -42,7 +42,7 @@ const adminSettingsStorage = {
   actions: {
     setInstanceAdminSettings ({ state, commit, dispatch }, { backendDbConfig }) {
       const config = state.config || {}
-      const modifiedPaths = state.modifiedPaths || new Set()
+      const modifiedPaths = new Set()
       backendDbConfig.configs.forEach(c => {
         const path = [c.group, c.key]
         if (c.db) {
@@ -82,6 +82,59 @@ const adminSettingsStorage = {
       console.log(descriptions[':pleroma']['Pleroma.Captcha'])
       commit('updateAdminDescriptions', { descriptions })
     },
+
+    // This action takes draft state, diffs it with live config state and then pushes
+    // only differences between the two. Difference detection only work up to subkey (third) level.
+    pushAdminDraft ({ rootState, state, commit, dispatch }) {
+      // TODO cleanup paths in modifiedPaths
+      const convert = (value) => {
+        if (typeof value !== 'object') {
+          return value
+        } else if (Array.isArray(value)) {
+          return value.map(convert)
+        } else {
+          return Object.entries(value).map(([k, v]) => ({ tuple: [k, v] }))
+        }
+      }
+
+      // Getting all group-keys used in config
+      const allGroupKeys = flatten(
+        Object
+          .entries(state.config)
+          .map(
+            ([group, lv1data]) => Object
+              .keys(lv1data)
+              .map((key) => ({ group, key }))
+          )
+      )
+
+      // Only using group-keys where there are changes detected
+      const changedGroupKeys = allGroupKeys.filter(({ group, key }) => {
+        return !isEqual(state.config[group][key], state.draft[group][key])
+      })
+
+      // Here we take all changed group-keys and get all changed subkeys
+      const changed = changedGroupKeys.map(({ group, key }) => {
+        const config = state.config[group][key]
+        const draft = state.draft[group][key]
+
+        // We convert group-key value into entries arrays
+        const eConfig = Object.entries(config)
+        const eDraft = Object.entries(draft)
+
+        // Then those entries array we diff so only changed subkey entries remain
+        // We use the diffed array to reconstruct the object and then shove it into convert()
+        return ({ group, key, value: convert(Object.fromEntries(differenceWith(eDraft, eConfig, isEqual))) })
+      })
+
+      rootState.api.backendInteractor.pushInstanceDBConfig({
+        payload: {
+          configs: changed
+        }
+      })
+        .then(() => rootState.api.backendInteractor.fetchInstanceDBConfig())
+        .then(backendDbConfig => dispatch('setInstanceAdminSettings', { backendDbConfig }))
+    },
     pushAdminSetting ({ rootState, state, commit, dispatch }, { path, value }) {
       const [group, key, ...rest] = Array.isArray(path) ? path : path.split(/\./g)
       const clone = {} // not actually cloning the entire thing to avoid excessive writes
-- 
cgit v1.2.3-70-g09d2


From df9fe6d261ca554b8f886e45ccf70b44b47e53f5 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 22 Mar 2023 19:23:36 +0200
Subject: localization strings

---
 src/i18n/en.json | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

diff --git a/src/i18n/en.json b/src/i18n/en.json
index f84b5a34..dd78d148 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -842,6 +842,8 @@
     "window_title": "Administration",
     "wip_notice": "This admin dashboard is experimental and WIP, {adminFeLink}.",
     "old_ui_link": "old admin UI available here",
+    "reset_all": "Reset all",
+    "commit_all": "Save all",
     "tabs": {
       "instance": "Instance",
       "limits": "Limits"
-- 
cgit v1.2.3-70-g09d2


From 4c3af5c362574aad4d851990265ebc7252c6f990 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 27 Mar 2023 22:57:50 +0300
Subject: handle db config disabled case

---
 .../settings_modal/settings_modal_admin_content.js | 18 ++++++++--
 .../settings_modal_admin_content.vue               | 39 ++++++++++++++++++++++
 src/i18n/en.json                                   | 10 +++++-
 src/modules/adminSettings.js                       | 30 ++++++++++++++++-
 src/modules/users.js                               |  6 ----
 5 files changed, 93 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/components/settings_modal/settings_modal_admin_content.js b/src/components/settings_modal/settings_modal_admin_content.js
index 07d4cf2e..1c239e59 100644
--- a/src/components/settings_modal/settings_modal_admin_content.js
+++ b/src/components/settings_modal/settings_modal_admin_content.js
@@ -9,7 +9,7 @@ import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faWrench,
   faHand,
-  faFilter,
+  faLaptopCode,
   faPaintBrush,
   faBell,
   faDownload,
@@ -20,7 +20,7 @@ import {
 library.add(
   faWrench,
   faHand,
-  faFilter,
+  faLaptopCode,
   faPaintBrush,
   faBell,
   faDownload,
@@ -38,6 +38,9 @@ const SettingsModalAdminContent = {
     LimitsTab
   },
   computed: {
+    user () {
+      return this.$store.state.users.currentUser
+    },
     isLoggedIn () {
       return !!this.$store.state.users.currentUser
     },
@@ -46,6 +49,17 @@ const SettingsModalAdminContent = {
     },
     bodyLock () {
       return this.$store.state.interface.settingsModalState === 'visible'
+    },
+    adminDbLoaded () {
+      return this.$store.state.adminSettings.loaded
+    },
+    noDb () {
+      return this.$store.state.adminSettings.dbConfigEnabled === false
+    }
+  },
+  created () {
+    if (this.user.rights.admin) {
+      this.$store.dispatch('loadAdminStuff')
     }
   },
   methods: {
diff --git a/src/components/settings_modal/settings_modal_admin_content.vue b/src/components/settings_modal/settings_modal_admin_content.vue
index 52c6ddf5..ae670a90 100644
--- a/src/components/settings_modal/settings_modal_admin_content.vue
+++ b/src/components/settings_modal/settings_modal_admin_content.vue
@@ -4,9 +4,40 @@
     class="settings_tab-switcher"
     :side-tab-bar="true"
     :scrollable-tabs="true"
+    :render-only-focused="true"
     :body-scroll-lock="bodyLock"
   >
     <div
+      v-if="noDb"
+      :label="$t('admin_dash.tabs.nodb')"
+      icon="exclamation-triangle"
+      data-tab-name="nodb-notice"
+    >
+      <div :label="$t('admin_dash.tabs.nodb')">
+        <div class="setting-item">
+          <h2>{{ $t('admin_dash.nodb.heading') }}</h2>
+          <i18n-t keypath="admin_dash.nodb.text">
+            <template #documentation>
+              <a
+                href="https://docs-develop.pleroma.social/backend/configuration/howto_database_config/"
+                target="_blank"
+              >
+                {{ $t("admin_dash.nodb.documentation") }}
+              </a>
+            </template>
+            <template #property>
+              <code>config :pleroma, configurable_from_database</code>
+            </template>
+            <template #value>
+              <code>true</code>
+            </template>
+          </i18n-t>
+          <p>{{ $t('admin_dash.nodb.text2') }}</p>
+        </div>
+      </div>
+    </div>
+    <div
+      v-if="adminDbLoaded"
       :label="$t('admin_dash.tabs.instance')"
       icon="wrench"
       data-tab-name="general"
@@ -14,12 +45,20 @@
       <InstanceTab />
     </div>
     <div
+      v-if="adminDbLoaded"
       :label="$t('admin_dash.tabs.limits')"
       icon="hand"
       data-tab-name="limits"
     >
       <LimitsTab />
     </div>
+    <div
+      :label="$t('admin_dash.tabs.frontends')"
+      icon="laptop-code"
+      data-tab-name="frontends"
+    >
+      <FrontendsTab />
+    </div>
   </tab-switcher>
 </template>
 
diff --git a/src/i18n/en.json b/src/i18n/en.json
index dd78d148..86ae7f06 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -845,8 +845,16 @@
     "reset_all": "Reset all",
     "commit_all": "Save all",
     "tabs": {
+      "nodb": "No DB Config",
       "instance": "Instance",
-      "limits": "Limits"
+      "limits": "Limits",
+      "frontends": "Front-ends"
+    },
+    "nodb": {
+      "heading": "Database config is disabled",
+      "text": "You need to change backend config files so that {property} is set to {value}, see more in {documentation}.",
+      "documentation": "documentation",
+      "text2": "Most configuration options will be unavailable."
     },
     "captcha": {
       "native": "Native",
diff --git a/src/modules/adminSettings.js b/src/modules/adminSettings.js
index 25fb8e50..fef73974 100644
--- a/src/modules/adminSettings.js
+++ b/src/modules/adminSettings.js
@@ -1,11 +1,13 @@
 import { set, get, cloneDeep, differenceWith, isEqual, flatten } from 'lodash'
 
 export const defaultState = {
+  loaded: false,
   needsReboot: null,
   config: null,
   modifiedPaths: null,
   descriptions: null,
-  draft: null
+  draft: null,
+  dbConfigEnabled: null
 }
 
 export const newUserFlags = {
@@ -17,7 +19,13 @@ const adminSettingsStorage = {
     ...cloneDeep(defaultState)
   },
   mutations: {
+    setInstanceAdminNoDbConfig (state) {
+      state.loaded = false
+      state.dbConfigEnabled = false
+    },
     updateAdminSettings (state, { config, modifiedPaths }) {
+      state.loaded = true
+      state.dbConfigEnabled = true
       state.config = config
       state.modifiedPaths = modifiedPaths
     },
@@ -40,6 +48,26 @@ const adminSettingsStorage = {
     }
   },
   actions: {
+    loadAdminStuff ({ state, rootState, dispatch, commit }) {
+      rootState.api.backendInteractor.fetchInstanceDBConfig()
+        .then(backendDbConfig => {
+          if (backendDbConfig.error) {
+            if (backendDbConfig.error.status === 400) {
+              backendDbConfig.error.json().then(errorJson => {
+                if (/configurable_from_database/.test(errorJson.error)) {
+                  commit('setInstanceAdminNoDbConfig')
+                }
+              })
+            }
+          } else {
+            dispatch('setInstanceAdminSettings', { backendDbConfig })
+          }
+        })
+      if (state.descriptions === null) {
+        rootState.api.backendInteractor.fetchInstanceConfigDescriptions()
+          .then(backendDescriptions => this.$store.dispatch('setInstanceAdminDescriptions', { backendDescriptions }))
+      }
+    },
     setInstanceAdminSettings ({ state, commit, dispatch }, { backendDbConfig }) {
       const config = state.config || {}
       const modifiedPaths = new Set()
diff --git a/src/modules/users.js b/src/modules/users.js
index 45cba334..a23f6d7d 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -564,12 +564,6 @@ const users = {
               user.domainMutes = []
               commit('setCurrentUser', user)
               commit('setServerSideStorage', user)
-              if (user.rights.admin) {
-                store.rootState.api.backendInteractor.fetchInstanceDBConfig()
-                  .then(backendDbConfig => dispatch('setInstanceAdminSettings', { backendDbConfig }))
-                store.rootState.api.backendInteractor.fetchInstanceConfigDescriptions()
-                  .then(backendDescriptions => dispatch('setInstanceAdminDescriptions', { backendDescriptions }))
-              }
               commit('addNewUsers', [user])
 
               dispatch('fetchEmoji')
-- 
cgit v1.2.3-70-g09d2


From 3ac67ab7274c199766d026fcf168bd2a3d4e2692 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 27 Mar 2023 23:00:52 +0300
Subject: fix

---
 src/modules/adminSettings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/modules/adminSettings.js b/src/modules/adminSettings.js
index fef73974..b8265949 100644
--- a/src/modules/adminSettings.js
+++ b/src/modules/adminSettings.js
@@ -65,7 +65,7 @@ const adminSettingsStorage = {
         })
       if (state.descriptions === null) {
         rootState.api.backendInteractor.fetchInstanceConfigDescriptions()
-          .then(backendDescriptions => this.$store.dispatch('setInstanceAdminDescriptions', { backendDescriptions }))
+          .then(backendDescriptions => dispatch('setInstanceAdminDescriptions', { backendDescriptions }))
       }
     },
     setInstanceAdminSettings ({ state, commit, dispatch }, { backendDbConfig }) {
-- 
cgit v1.2.3-70-g09d2


From 7bb28bb23c61e2d648eecf5d59969d32631f78e8 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 29 Mar 2023 00:58:07 +0300
Subject: frontends tab initial implementation, now you can (re)install
 frontends! yay!

---
 src/App.scss                                       | 22 ++++++-
 .../settings_modal/admin_tabs/frontends_tab.js     | 58 +++++++++++++++++
 .../settings_modal/admin_tabs/frontends_tab.scss   | 13 ++++
 .../settings_modal/admin_tabs/frontends_tab.vue    | 72 ++++++++++++++++++++++
 src/components/settings_modal/settings_modal.scss  |  1 -
 .../settings_modal/settings_modal_admin_content.js |  8 +--
 src/i18n/en.json                                   |  8 +++
 src/modules/adminSettings.js                       | 15 +++++
 src/services/api/api.service.js                    | 42 ++++++++++++-
 9 files changed, 229 insertions(+), 10 deletions(-)
 create mode 100644 src/components/settings_modal/admin_tabs/frontends_tab.js
 create mode 100644 src/components/settings_modal/admin_tabs/frontends_tab.scss
 create mode 100644 src/components/settings_modal/admin_tabs/frontends_tab.vue

(limited to 'src')

diff --git a/src/App.scss b/src/App.scss
index 3f352e8d..149d640f 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -645,6 +645,19 @@ option {
   }
 }
 
+.cards-list {
+  display: grid;
+  grid-auto-flow: row dense;
+  grid-template-columns: 1fr 1fr;
+
+  li {
+    border: 1px solid var(--border);
+    border-radius: var(--inputRadius);
+    padding: 0.5em;
+    margin: 0.25em;
+  }
+}
+
 .btn-block {
   display: block;
   width: 100%;
@@ -655,16 +668,19 @@ option {
   display: inline-flex;
   vertical-align: middle;
 
-  button {
+  button,
+  .button-dropdown {
     position: relative;
     flex: 1 1 auto;
 
-    &:not(:last-child) {
+    &:not(:last-child),
+    &:not(:last-child) .button-default {
       border-top-right-radius: 0;
       border-bottom-right-radius: 0;
     }
 
-    &:not(:first-child) {
+    &:not(:first-child),
+    &:not(:first-child) .button-default {
       border-top-left-radius: 0;
       border-bottom-left-radius: 0;
     }
diff --git a/src/components/settings_modal/admin_tabs/frontends_tab.js b/src/components/settings_modal/admin_tabs/frontends_tab.js
new file mode 100644
index 00000000..a5d33cbe
--- /dev/null
+++ b/src/components/settings_modal/admin_tabs/frontends_tab.js
@@ -0,0 +1,58 @@
+import BooleanSetting from '../helpers/boolean_setting.vue'
+import ChoiceSetting from '../helpers/choice_setting.vue'
+import IntegerSetting from '../helpers/integer_setting.vue'
+import StringSetting from '../helpers/string_setting.vue'
+import GroupSetting from '../helpers/group_setting.vue'
+import Popover from 'src/components/popover/popover.vue'
+
+import SharedComputedObject from '../helpers/shared_computed_object.js'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faGlobe
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faGlobe
+)
+
+const FrontendsTab = {
+  provide () {
+    return {
+      defaultDraftMode: true,
+      defaultSource: 'admin'
+    }
+  },
+  components: {
+    BooleanSetting,
+    ChoiceSetting,
+    IntegerSetting,
+    StringSetting,
+    GroupSetting,
+    Popover
+  },
+  created () {
+    if (this.user.rights.admin) {
+      this.$store.dispatch('loadFrontendsStuff')
+    }
+  },
+  computed: {
+    frontends () {
+      return this.$store.state.adminSettings.frontends
+    },
+    ...SharedComputedObject()
+  },
+  methods: {
+    update (frontend, suggestRef) {
+      const ref = suggestRef || frontend.refs[0]
+      const { name } = frontend
+      const payload = { name, ref }
+
+      this.$store.state.api.backendInteractor.installFrontend({ payload })
+        .then((externalUser) => {
+          this.$store.dispatch('loadFrontendsStuff')
+        })
+    }
+  }
+}
+
+export default FrontendsTab
diff --git a/src/components/settings_modal/admin_tabs/frontends_tab.scss b/src/components/settings_modal/admin_tabs/frontends_tab.scss
new file mode 100644
index 00000000..1e1881ff
--- /dev/null
+++ b/src/components/settings_modal/admin_tabs/frontends_tab.scss
@@ -0,0 +1,13 @@
+.frontends-tab {
+  .cards-list {
+    padding: 0;
+  }
+
+  dd {
+    text-overflow: ellipsis;
+    word-wrap: nowrap;
+    white-space: nowrap;
+    overflow-x: hidden;
+    max-width: 80%;
+  }
+}
diff --git a/src/components/settings_modal/admin_tabs/frontends_tab.vue b/src/components/settings_modal/admin_tabs/frontends_tab.vue
new file mode 100644
index 00000000..48649dfb
--- /dev/null
+++ b/src/components/settings_modal/admin_tabs/frontends_tab.vue
@@ -0,0 +1,72 @@
+<template>
+  <div class="frontends-tab" :label="$t('admin_dash.tabs.frontends')">
+    <div class="setting-item">
+      <h2>{{ $t('admin_dash.tabs.frontends') }}</h2>
+      <ul class="setting-list cards-list">
+        <li v-for="frontend in frontends" :key="frontend.name">
+          <strong>{{ frontend.name }}</strong>
+          <dl>
+            <dt>{{ $t('admin_dash.frontend.repository') }}</dt>
+            <dd><a :href="frontend.git">{{ frontend.git }}</a></dd>
+            <dt v-if="expertLevel">{{ $t('admin_dash.frontend.versions') }}</dt>
+            <dd v-if="expertLevel">{{ frontend.refs }}</dd>
+            <dt v-if="expertLevel">{{ $t('admin_dash.frontend.build_url') }}</dt>
+            <dd v-if="expertLevel">{{ frontend.build_url }}</dd>
+          </dl>
+          <div>
+            <span class="btn-group">
+              <button
+                class="button button-default btn"
+                type="button"
+                :title="$t('admin_dash.frontend.update')"
+                @click="update(frontend)"
+              >
+                {{
+                    frontend.installed
+                    ? $t('admin_dash.frontend.reinstall')
+                    : $t('admin_dash.frontend.install')
+                }}
+              </button>
+              <Popover
+                v-if="frontend.refs.length > 1"
+                trigger="click"
+                class="button-dropdown"
+                placement="bottom"
+              >
+                <template #content>
+                  <div class="dropdown-menu">
+                    <button
+                      v-for="ref in frontend.refs"
+                      :key="ref"
+                      class="button-default dropdown-item"
+                      @click="update(frontend, ref)"
+                    >
+                      <i18n-t keypath="admin_dash.frontend.install_version">
+                        <template #version>
+                          <code>{{ ref }}</code>
+                        </template>
+                      </i18n-t>
+                    </button>
+                  </div>
+                </template>
+                <template #trigger>
+                  <button
+                    class="button button-default btn"
+                    type="button"
+                    :title="$t('admin_dash.frontend.update')"
+                  >
+                    <FAIcon icon="chevron-down" />
+                  </button>
+                </template>
+              </Popover>
+            </span>
+          </div>
+        </li>
+      </ul>
+    </div>
+  </div>
+</template>
+
+<script src="./frontends_tab.js"></script>
+
+<style lang="scss" src="./frontends_tab.scss"></style>
diff --git a/src/components/settings_modal/settings_modal.scss b/src/components/settings_modal/settings_modal.scss
index 4cb506f9..98de736b 100644
--- a/src/components/settings_modal/settings_modal.scss
+++ b/src/components/settings_modal/settings_modal.scss
@@ -43,7 +43,6 @@
 
       .btn {
         min-height: 2em;
-        min-width: 10em;
         padding: 0 2em;
       }
     }
diff --git a/src/components/settings_modal/settings_modal_admin_content.js b/src/components/settings_modal/settings_modal_admin_content.js
index 1c239e59..b7c0de57 100644
--- a/src/components/settings_modal/settings_modal_admin_content.js
+++ b/src/components/settings_modal/settings_modal_admin_content.js
@@ -1,9 +1,8 @@
 import TabSwitcher from 'src/components/tab_switcher/tab_switcher.jsx'
 
-import DataImportExportTab from './tabs/data_import_export_tab.vue'
-import MutesAndBlocksTab from './tabs/mutes_and_blocks_tab.vue'
 import InstanceTab from './admin_tabs/instance_tab.vue'
 import LimitsTab from './admin_tabs/limits_tab.vue'
+import FrontendsTab from './admin_tabs/frontends_tab.vue'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
@@ -32,10 +31,9 @@ const SettingsModalAdminContent = {
   components: {
     TabSwitcher,
 
-    DataImportExportTab,
-    MutesAndBlocksTab,
     InstanceTab,
-    LimitsTab
+    LimitsTab,
+    FrontendsTab
   },
   computed: {
     user () {
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 86ae7f06..ede5d494 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -873,6 +873,14 @@
       "users": "User profile limits",
       "profile_fields": "Profile fields limits",
       "user_uploads": "Profile media limits"
+    },
+    "frontend": {
+      "repository": "Repository link",
+      "versions": "Available versions",
+      "build_url": "Build URL",
+      "reinstall": "Reinstall",
+      "install": "Install",
+      "install_version": "Install version {version}"
     }
   },
   "time": {
diff --git a/src/modules/adminSettings.js b/src/modules/adminSettings.js
index b8265949..cad9c0ca 100644
--- a/src/modules/adminSettings.js
+++ b/src/modules/adminSettings.js
@@ -1,6 +1,7 @@
 import { set, get, cloneDeep, differenceWith, isEqual, flatten } from 'lodash'
 
 export const defaultState = {
+  frontends: [],
   loaded: false,
   needsReboot: null,
   config: null,
@@ -23,6 +24,16 @@ const adminSettingsStorage = {
       state.loaded = false
       state.dbConfigEnabled = false
     },
+    setAvailableFrontends (state, { frontends }) {
+      state.frontends = frontends.map(f => {
+        if (f.name === 'pleroma-fe') {
+          f.refs = ['master', 'develop']
+        } else {
+          f.refs = [f.ref]
+        }
+        return f
+      })
+    },
     updateAdminSettings (state, { config, modifiedPaths }) {
       state.loaded = true
       state.dbConfigEnabled = true
@@ -48,6 +59,10 @@ const adminSettingsStorage = {
     }
   },
   actions: {
+    loadFrontendsStuff ({ state, rootState, dispatch, commit }) {
+      rootState.api.backendInteractor.fetchAvailableFrontends()
+        .then(frontends => commit('setAvailableFrontends', { frontends }))
+    },
     loadAdminStuff ({ state, rootState, dispatch, commit }) {
       rootState.api.backendInteractor.fetchInstanceDBConfig()
         .then(backendDbConfig => {
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index 073f40a3..56e7de71 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -110,6 +110,8 @@ const PLEROMA_DELETE_ANNOUNCEMENT_URL = id => `/api/v1/pleroma/admin/announcemen
 
 const PLEROMA_ADMIN_CONFIG_URL = '/api/pleroma/admin/config'
 const PLEROMA_ADMIN_DESCRIPTIONS_URL = '/api/pleroma/admin/config/descriptions'
+const PLEROMA_ADMIN_FRONTENDS_URL = '/api/pleroma/admin/frontends'
+const PLEROMA_ADMIN_FRONTENDS_INSTALL_URL = '/api/pleroma/admin/frontends/install'
 
 const oldfetch = window.fetch
 
@@ -1693,6 +1695,21 @@ const fetchInstanceConfigDescriptions = ({ credentials }) => {
     })
 }
 
+const fetchAvailableFrontends = ({ credentials }) => {
+  return fetch(PLEROMA_ADMIN_FRONTENDS_URL, {
+    headers: authHeaders(credentials)
+  })
+    .then((response) => {
+      if (response.ok) {
+        return response.json()
+      } else {
+        return {
+          error: response
+        }
+      }
+    })
+}
+
 const pushInstanceDBConfig = ({ credentials, payload }) => {
   return fetch(PLEROMA_ADMIN_CONFIG_URL, {
     headers: {
@@ -1714,6 +1731,27 @@ const pushInstanceDBConfig = ({ credentials, payload }) => {
     })
 }
 
+const installFrontend = ({ credentials, payload }) => {
+  return fetch(PLEROMA_ADMIN_FRONTENDS_INSTALL_URL, {
+    headers: {
+      Accept: 'application/json',
+      'Content-Type': 'application/json',
+      ...authHeaders(credentials)
+    },
+    method: 'POST',
+    body: JSON.stringify(payload)
+  })
+    .then((response) => {
+      if (response.ok) {
+        return response.json()
+      } else {
+        return {
+          error: response
+        }
+      }
+    })
+}
+
 const apiService = {
   verifyCredentials,
   fetchTimeline,
@@ -1830,7 +1868,9 @@ const apiService = {
   adminFetchAnnouncements,
   fetchInstanceDBConfig,
   fetchInstanceConfigDescriptions,
-  pushInstanceDBConfig
+  fetchAvailableFrontends,
+  pushInstanceDBConfig,
+  installFrontend
 }
 
 export default apiService
-- 
cgit v1.2.3-70-g09d2


From ac75d051b720da2c47393de6b35663afe50d37cc Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 29 Mar 2023 23:26:57 +0300
Subject: better frontends tab, now you can set default frontend

---
 src/App.scss                                       |   1 +
 .../settings_modal/admin_tabs/frontends_tab.js     |   6 +
 .../settings_modal/admin_tabs/frontends_tab.scss   |   2 +-
 .../settings_modal/admin_tabs/frontends_tab.vue    | 204 +++++++++++++++------
 .../settings_modal/helpers/group_setting.js        |   1 -
 src/components/settings_modal/helpers/setting.js   |   4 +-
 .../helpers/shared_computed_object.js              |   3 +
 src/components/settings_modal/settings_modal.scss  |   3 +
 .../settings_modal/settings_modal_admin_content.js |   3 +
 .../settings_modal_admin_content.vue               |   1 +
 src/i18n/en.json                                   |  11 +-
 11 files changed, 177 insertions(+), 62 deletions(-)

(limited to 'src')

diff --git a/src/App.scss b/src/App.scss
index 149d640f..ef68ac50 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -646,6 +646,7 @@ option {
 }
 
 .cards-list {
+  list-style: none;
   display: grid;
   grid-auto-flow: row dense;
   grid-template-columns: 1fr 1fr;
diff --git a/src/components/settings_modal/admin_tabs/frontends_tab.js b/src/components/settings_modal/admin_tabs/frontends_tab.js
index a5d33cbe..a2c27c2a 100644
--- a/src/components/settings_modal/admin_tabs/frontends_tab.js
+++ b/src/components/settings_modal/admin_tabs/frontends_tab.js
@@ -51,6 +51,12 @@ const FrontendsTab = {
         .then((externalUser) => {
           this.$store.dispatch('loadFrontendsStuff')
         })
+    },
+    setDefault (frontend, suggestRef) {
+      const ref = suggestRef || frontend.refs[0]
+      const { name } = frontend
+
+      this.$store.commit('updateAdminDraft', { path: [':pleroma', ':frontends', ':primary'], value: { name, ref } })
     }
   }
 }
diff --git a/src/components/settings_modal/admin_tabs/frontends_tab.scss b/src/components/settings_modal/admin_tabs/frontends_tab.scss
index 1e1881ff..e3e04bc6 100644
--- a/src/components/settings_modal/admin_tabs/frontends_tab.scss
+++ b/src/components/settings_modal/admin_tabs/frontends_tab.scss
@@ -8,6 +8,6 @@
     word-wrap: nowrap;
     white-space: nowrap;
     overflow-x: hidden;
-    max-width: 80%;
+    max-width: 10em;
   }
 }
diff --git a/src/components/settings_modal/admin_tabs/frontends_tab.vue b/src/components/settings_modal/admin_tabs/frontends_tab.vue
index 48649dfb..71bbfa69 100644
--- a/src/components/settings_modal/admin_tabs/frontends_tab.vue
+++ b/src/components/settings_modal/admin_tabs/frontends_tab.vue
@@ -2,67 +2,157 @@
   <div class="frontends-tab" :label="$t('admin_dash.tabs.frontends')">
     <div class="setting-item">
       <h2>{{ $t('admin_dash.tabs.frontends') }}</h2>
-      <ul class="setting-list cards-list">
-        <li v-for="frontend in frontends" :key="frontend.name">
-          <strong>{{ frontend.name }}</strong>
-          <dl>
-            <dt>{{ $t('admin_dash.frontend.repository') }}</dt>
-            <dd><a :href="frontend.git">{{ frontend.git }}</a></dd>
-            <dt v-if="expertLevel">{{ $t('admin_dash.frontend.versions') }}</dt>
-            <dd v-if="expertLevel">{{ frontend.refs }}</dd>
-            <dt v-if="expertLevel">{{ $t('admin_dash.frontend.build_url') }}</dt>
-            <dd v-if="expertLevel">{{ frontend.build_url }}</dd>
-          </dl>
-          <div>
-            <span class="btn-group">
-              <button
-                class="button button-default btn"
-                type="button"
-                :title="$t('admin_dash.frontend.update')"
-                @click="update(frontend)"
-              >
-                {{
-                    frontend.installed
-                    ? $t('admin_dash.frontend.reinstall')
-                    : $t('admin_dash.frontend.install')
-                }}
-              </button>
-              <Popover
-                v-if="frontend.refs.length > 1"
-                trigger="click"
-                class="button-dropdown"
-                placement="bottom"
+      <p>{{ $t('admin_dash.frontend.wip_notice') }}</p>
+      <ul class="setting-list">
+        <li>
+          <h3>{{ $t('admin_dash.frontend.default_frontend') }}</h3>
+          <p>{{ $t('admin_dash.frontend.default_frontend_tip') }}</p>
+          <p>{{ $t('admin_dash.frontend.default_frontend_tip2') }}</p>
+        </li>
+        <li>
+          <StringSetting path=":pleroma.:frontends.:primary.name">
+            NAME
+          </StringSetting>
+        </li>
+        <li>
+          <StringSetting path=":pleroma.:frontends.:primary.ref">
+            REF
+          </StringSetting>
+        </li>
+        <li>
+          <GroupSetting path=":pleroma.:frontends.:primary"/>
+        </li>
+      </ul>
+      <div class="setting-list">
+        <h3>{{ $t('admin_dash.frontend.available_frontends') }}</h3>
+        <ul class="cards-list">
+          <li v-for="frontend in frontends" :key="frontend.name">
+            <strong>{{ frontend.name }}</strong>
+            {{ ' ' }}
+            <span v-if="adminDraft[':pleroma'][':frontends'][':primary'].name === frontend.name">
+              <i18n-t
+                keypath="admin_dash.frontend.is_default"
+                v-if="adminDraft[':pleroma'][':frontends'][':primary'].ref === frontend.refs[0]"
+              />
+              <i18n-t
+                keypath="admin_dash.frontend.is_default_custom"
+                v-else
               >
-                <template #content>
-                  <div class="dropdown-menu">
+                <template #version>
+                  <code>{{ adminDraft[':pleroma'][':frontends'][':primary'].ref }}</code>
+                </template>
+              </i18n-t>
+            </span>
+            <dl>
+              <dt>{{ $t('admin_dash.frontend.repository') }}</dt>
+              <dd><a :href="frontend.git" target="_blank">{{ frontend.git }}</a></dd>
+              <template v-if="expertLevel">
+                <dt>{{ $t('admin_dash.frontend.versions') }}</dt>
+                <dd v-for="ref in frontend.refs" :key="ref"><code>{{ ref }}</code></dd>
+              </template>
+              <dt v-if="expertLevel">{{ $t('admin_dash.frontend.build_url') }}</dt>
+              <dd v-if="expertLevel"><a :href="frontend.build_url" target="_blank">{{ frontend.build_url }}</a></dd>
+            </dl>
+            <div>
+              <span class="btn-group">
+                <button
+                  class="button button-default btn"
+                  type="button"
+                  :title="$t('admin_dash.frontend.update')"
+                  @click="update(frontend)"
+                >
+                  {{
+                      frontend.installed
+                      ? $t('admin_dash.frontend.reinstall')
+                      : $t('admin_dash.frontend.install')
+                  }}
+                </button>
+                <Popover
+                  v-if="frontend.refs.length > 1"
+                  trigger="click"
+                  class="button-dropdown"
+                  placement="bottom"
+                >
+                  <template #content>
+                    <div class="dropdown-menu">
+                      <button
+                        v-for="ref in frontend.refs"
+                        :key="ref"
+                        class="button-default dropdown-item"
+                        @click="update(frontend, ref)"
+                      >
+                        <i18n-t keypath="admin_dash.frontend.install_version">
+                          <template #version>
+                            <code>{{ ref }}</code>
+                          </template>
+                        </i18n-t>
+                      </button>
+                    </div>
+                  </template>
+                  <template #trigger>
                     <button
-                      v-for="ref in frontend.refs"
-                      :key="ref"
-                      class="button-default dropdown-item"
-                      @click="update(frontend, ref)"
+                      class="button button-default btn dropdown-button"
+                      type="button"
+                      :title="$t('admin_dash.frontend.update')"
                     >
-                      <i18n-t keypath="admin_dash.frontend.install_version">
-                        <template #version>
-                          <code>{{ ref }}</code>
-                        </template>
-                      </i18n-t>
+                      <FAIcon icon="chevron-down" />
                     </button>
-                  </div>
-                </template>
-                <template #trigger>
-                  <button
-                    class="button button-default btn"
-                    type="button"
-                    :title="$t('admin_dash.frontend.update')"
-                  >
-                    <FAIcon icon="chevron-down" />
-                  </button>
-                </template>
-              </Popover>
-            </span>
-          </div>
-        </li>
-      </ul>
+                  </template>
+                </Popover>
+              </span>
+              <span class="btn-group" v-if="frontend.name !== 'admin-fe'">
+                <button
+                  class="button button-default btn"
+                  type="button"
+                  :disabled="
+                             adminDraft[':pleroma'][':frontends'][':primary'].name === frontend.name &&
+                             adminDraft[':pleroma'][':frontends'][':primary'].ref === frontend.refs[0]
+                             "
+                  :title="$t('admin_dash.frontend.update')"
+                  @click="setDefault(frontend)"
+                >
+                  {{
+                      $t('admin_dash.frontend.set_default')
+                  }}
+                </button>
+                {{ ' ' }}
+                <Popover
+                  v-if="frontend.refs.length > 1"
+                  trigger="click"
+                  class="button-dropdown"
+                  placement="bottom"
+                >
+                  <template #content>
+                    <div class="dropdown-menu">
+                      <button
+                        v-for="ref in frontend.refs.slice(1)"
+                        :key="ref"
+                        class="button-default dropdown-item"
+                        @click="setDefault(frontend, ref)"
+                      >
+                        <i18n-t keypath="admin_dash.frontend.set_default_version">
+                          <template #version>
+                            <code>{{ ref }}</code>
+                          </template>
+                        </i18n-t>
+                      </button>
+                    </div>
+                  </template>
+                  <template #trigger>
+                    <button
+                      class="button button-default btn dropdown-button"
+                      type="button"
+                      :title="$t('admin_dash.frontend.update')"
+                    >
+                      <FAIcon icon="chevron-down" />
+                    </button>
+                  </template>
+                </Popover>
+              </span>
+            </div>
+          </li>
+        </ul>
+      </div>
     </div>
   </div>
 </template>
diff --git a/src/components/settings_modal/helpers/group_setting.js b/src/components/settings_modal/helpers/group_setting.js
index 12a49000..23a2a202 100644
--- a/src/components/settings_modal/helpers/group_setting.js
+++ b/src/components/settings_modal/helpers/group_setting.js
@@ -7,7 +7,6 @@ export default {
   computed: {
     ...Setting.computed,
     isDirty () {
-      console.log(this.state, this.draft)
       return !isEqual(this.state, this.draft)
     }
   }
diff --git a/src/components/settings_modal/helpers/setting.js b/src/components/settings_modal/helpers/setting.js
index d2e1a6f4..4f0be448 100644
--- a/src/components/settings_modal/helpers/setting.js
+++ b/src/components/settings_modal/helpers/setting.js
@@ -61,7 +61,7 @@ export default {
       // TODO allow passing shared draft object?
       get () {
         if (this.realSource === 'admin') {
-          return get(this.$store.state.adminSettings.draft, this.path)
+          return get(this.$store.state.adminSettings.draft, this.canonPath)
         } else {
           return this.localDraft
         }
@@ -75,7 +75,7 @@ export default {
       }
     },
     state () {
-      const value = get(this.configSource, this.path)
+      const value = get(this.configSource, this.canonPath)
       if (value === undefined) {
         return this.defaultState
       } else {
diff --git a/src/components/settings_modal/helpers/shared_computed_object.js b/src/components/settings_modal/helpers/shared_computed_object.js
index d02db542..bb3d36ac 100644
--- a/src/components/settings_modal/helpers/shared_computed_object.js
+++ b/src/components/settings_modal/helpers/shared_computed_object.js
@@ -10,6 +10,9 @@ const SharedComputedObject = () => ({
   },
   adminConfig () {
     return this.$store.state.adminSettings.config
+  },
+  adminDraft () {
+    return this.$store.state.adminSettings.draft
   }
 })
 
diff --git a/src/components/settings_modal/settings_modal.scss b/src/components/settings_modal/settings_modal.scss
index 98de736b..49ef83e0 100644
--- a/src/components/settings_modal/settings_modal.scss
+++ b/src/components/settings_modal/settings_modal.scss
@@ -43,6 +43,9 @@
 
       .btn {
         min-height: 2em;
+      }
+
+      .btn:not(.dropdown-button) {
         padding: 0 2em;
       }
     }
diff --git a/src/components/settings_modal/settings_modal_admin_content.js b/src/components/settings_modal/settings_modal_admin_content.js
index b7c0de57..f94721ec 100644
--- a/src/components/settings_modal/settings_modal_admin_content.js
+++ b/src/components/settings_modal/settings_modal_admin_content.js
@@ -51,6 +51,9 @@ const SettingsModalAdminContent = {
     adminDbLoaded () {
       return this.$store.state.adminSettings.loaded
     },
+    adminDescriptionsLoaded () {
+      return this.$store.state.adminSettings.descriptions !== null
+    },
     noDb () {
       return this.$store.state.adminSettings.dbConfigEnabled === false
     }
diff --git a/src/components/settings_modal/settings_modal_admin_content.vue b/src/components/settings_modal/settings_modal_admin_content.vue
index ae670a90..a7a2ac9a 100644
--- a/src/components/settings_modal/settings_modal_admin_content.vue
+++ b/src/components/settings_modal/settings_modal_admin_content.vue
@@ -1,5 +1,6 @@
 <template>
   <tab-switcher
+    v-if="adminDescriptionsLoaded && (noDb || adminDbLoaded)"
     ref="tabSwitcher"
     class="settings_tab-switcher"
     :side-tab-bar="true"
diff --git a/src/i18n/en.json b/src/i18n/en.json
index ede5d494..6ae31ee8 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -879,8 +879,17 @@
       "versions": "Available versions",
       "build_url": "Build URL",
       "reinstall": "Reinstall",
+      "is_default": "(Default)",
+      "is_default_custom": "(Default, version: {version})",
       "install": "Install",
-      "install_version": "Install version {version}"
+      "install_version": "Install version {version}",
+      "set_default": "Set default",
+      "set_default_version": "Set version {version} as default",
+      "wip_notice": "Please note that this section is a WIP and lacks certain features as backend implementation of front-end management is incomplete.",
+      "default_frontend": "Default front-end",
+      "default_frontend_tip": "Default front-end will be shown to all users. Currently there's no way to for a user to select personal front-end. If you switch away from PleromaFE you'll most likely have to use old and buggy AdminFE to do instance configuration until we replace it.",
+      "default_frontend_tip2": "WIP: Since Pleroma backend doesn't properly list all installed frontends you'll have to enter name and reference manually. List below provides shortcuts to fill the values.",
+      "available_frontends": "Available for install"
     }
   },
   "time": {
-- 
cgit v1.2.3-70-g09d2


From 9e5c7313c64c9f9eeff7184f5f474cc055d80715 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 29 Mar 2023 23:33:50 +0300
Subject: use draft state instead of live state in that one place

---
 src/components/settings_modal/admin_tabs/instance_tab.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/components/settings_modal/admin_tabs/instance_tab.vue b/src/components/settings_modal/admin_tabs/instance_tab.vue
index 9291ddf8..fc41af65 100644
--- a/src/components/settings_modal/admin_tabs/instance_tab.vue
+++ b/src/components/settings_modal/admin_tabs/instance_tab.vue
@@ -197,7 +197,7 @@
             </li>
           </ul>
           <ul
-            v-if="adminConfig[':pleroma']['Pleroma.Captcha'][':enabled'] && adminConfig[':pleroma']['Pleroma.Captcha'][':method'] === 'Pleroma.Captcha.Kocaptcha'"
+            v-if="adminDraft[':pleroma']['Pleroma.Captcha'][':enabled'] && adminDraft[':pleroma']['Pleroma.Captcha'][':method'] === 'Pleroma.Captcha.Kocaptcha'"
             class="setting-list suboptions"
           >
             <h4>{{ $t('admin_dash.instance.kocaptcha') }}</h4>
-- 
cgit v1.2.3-70-g09d2


From 5c0deb1e6f3a854ddcef99f4bdfa82672524f82c Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Thu, 6 Apr 2023 18:14:49 -0400
Subject: Fix bug where announcements cannot be pinned

---
 src/components/navigation/navigation_pins.js | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src')

diff --git a/src/components/navigation/navigation_pins.js b/src/components/navigation/navigation_pins.js
index ef78e44c..86c33d1f 100644
--- a/src/components/navigation/navigation_pins.js
+++ b/src/components/navigation/navigation_pins.js
@@ -45,6 +45,7 @@ const NavPanel = {
       privateMode: state => state.instance.private,
       federating: state => state.instance.federating,
       pleromaChatMessagesAvailable: state => state.instance.pleromaChatMessagesAvailable,
+      supportsAnnouncements: state => state.announcements.supportsAnnouncements,
       pinnedItems: state => new Set(state.serverSideStorage.prefsStorage.collections.pinnedNavItems)
     }),
     pinnedList () {
@@ -56,6 +57,7 @@ const NavPanel = {
         ],
         {
           hasChats: this.pleromaChatMessagesAvailable,
+          hasAnnouncements: this.supportsAnnouncements,
           isFederating: this.federating,
           isPrivate: this.privateMode,
           currentUser: this.currentUser
@@ -75,6 +77,7 @@ const NavPanel = {
         ],
         {
           hasChats: this.pleromaChatMessagesAvailable,
+          hasAnnouncements: this.supportsAnnouncements,
           isFederating: this.federating,
           isPrivate: this.privateMode,
           currentUser: this.currentUser
-- 
cgit v1.2.3-70-g09d2


From 01758a28ea40e32f0bbbedfd7d83f1bf5616df16 Mon Sep 17 00:00:00 2001
From: XYenon <i@xyenon.bid>
Date: Thu, 13 Apr 2023 00:03:36 +0800
Subject: Fix i18n

---
 src/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/main.js b/src/main.js
index d3e60a0f..9ca7eb91 100644
--- a/src/main.js
+++ b/src/main.js
@@ -44,7 +44,7 @@ const i18n = createI18n({
   messages: messages.default
 })
 
-messages.setLanguage(i18n, currentLocale)
+messages.setLanguage(i18n.global, currentLocale)
 
 const persistedStateOptions = {
   paths: [
-- 
cgit v1.2.3-70-g09d2


From 4c158e636bd7ae9ec03a202e54aa681e66645a78 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 12 Apr 2023 23:58:21 +0300
Subject: more i18n stuff, added missing labels and such

---
 .../settings_modal/admin_tabs/instance_tab.vue     | 12 +++++++
 .../settings_modal/helpers/boolean_setting.vue     |  2 +-
 .../settings_modal/helpers/choice_setting.vue      |  2 +-
 .../settings_modal/helpers/number_setting.vue      |  2 +-
 src/components/settings_modal/helpers/setting.js   | 41 ++++++++++++++++++++--
 .../settings_modal/helpers/string_setting.vue      |  2 +-
 src/i18n/en.json                                   | 23 +++++++++++-
 7 files changed, 77 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/components/settings_modal/admin_tabs/instance_tab.vue b/src/components/settings_modal/admin_tabs/instance_tab.vue
index fc41af65..40e33495 100644
--- a/src/components/settings_modal/admin_tabs/instance_tab.vue
+++ b/src/components/settings_modal/admin_tabs/instance_tab.vue
@@ -58,6 +58,8 @@
           <BooleanSetting
             path=":pleroma.:restrict_unauthenticated.:timelines.:local"
             indeterminate-state=":if_instance_is_private"
+            swap-description-and-label
+            hide-description
           >
             LOCAL TIMELINES
           </BooleanSetting>
@@ -66,6 +68,8 @@
           <BooleanSetting
             path=":pleroma.:restrict_unauthenticated.:timelines.:federated"
             indeterminate-state=":if_instance_is_private"
+            swap-description-and-label
+            hide-description
           >
             FED TIMELINES
           </BooleanSetting>
@@ -82,6 +86,8 @@
           <BooleanSetting
             path=":pleroma.:restrict_unauthenticated.:profiles.:local"
             indeterminate-state=":if_instance_is_private"
+            swap-description-and-label
+            hide-description
           >
             LOCAL PROFILES
           </BooleanSetting>
@@ -90,6 +96,8 @@
           <BooleanSetting
             path=":pleroma.:restrict_unauthenticated.:profiles.:remote"
             indeterminate-state=":if_instance_is_private"
+            swap-description-and-label
+            hide-description
           >
             FED PROFILES
           </BooleanSetting>
@@ -106,6 +114,8 @@
           <BooleanSetting
             path=":pleroma.:restrict_unauthenticated.:activities.:local"
             indeterminate-state=":if_instance_is_private"
+            swap-description-and-label
+            hide-description
           >
             LOCAL STATUSES
           </BooleanSetting>
@@ -114,6 +124,8 @@
           <BooleanSetting
             path=":pleroma.:restrict_unauthenticated.:activities.:remote"
             indeterminate-state=":if_instance_is_private"
+            swap-description-and-label
+            hide-description
           >
             FED STATUSES
           </BooleanSetting>
diff --git a/src/components/settings_modal/helpers/boolean_setting.vue b/src/components/settings_modal/helpers/boolean_setting.vue
index 6307d526..3089c3b3 100644
--- a/src/components/settings_modal/helpers/boolean_setting.vue
+++ b/src/components/settings_modal/helpers/boolean_setting.vue
@@ -14,7 +14,7 @@
         class="label"
         :class="{ 'faint': shouldBeDisabled }"
       >
-        <template v-if="backendDescription">
+        <template v-if="backendDescriptionLabel">
           {{ backendDescriptionLabel }}
         </template>
         <template v-else>
diff --git a/src/components/settings_modal/helpers/choice_setting.vue b/src/components/settings_modal/helpers/choice_setting.vue
index 8713acf5..114e9b7d 100644
--- a/src/components/settings_modal/helpers/choice_setting.vue
+++ b/src/components/settings_modal/helpers/choice_setting.vue
@@ -3,7 +3,7 @@
     v-if="matchesExpertLevel"
     class="ChoiceSetting"
   >
-    <template v-if="backendDescription">
+    <template v-if="backendDescriptionLabel">
       {{ backendDescriptionLabel }}
     </template>
     <template v-else>
diff --git a/src/components/settings_modal/helpers/number_setting.vue b/src/components/settings_modal/helpers/number_setting.vue
index 2b90c336..ce168570 100644
--- a/src/components/settings_modal/helpers/number_setting.vue
+++ b/src/components/settings_modal/helpers/number_setting.vue
@@ -4,7 +4,7 @@
     class="NumberSetting"
   >
     <label :for="path" :class="{ 'faint': shouldBeDisabled }">
-      <template v-if="backendDescription">
+      <template v-if="backendDescriptionLabel">
         {{ backendDescriptionLabel + ' ' }}
       </template>
       <template v-else>
diff --git a/src/components/settings_modal/helpers/setting.js b/src/components/settings_modal/helpers/setting.js
index 4f0be448..fec1b947 100644
--- a/src/components/settings_modal/helpers/setting.js
+++ b/src/components/settings_modal/helpers/setting.js
@@ -33,6 +33,18 @@ export default {
       type: String,
       default: undefined
     },
+    hideDescription: {
+      type: Boolean
+    },
+    swapDescriptionAndLabel: {
+      type: Boolean
+    },
+    overrideBackendDescription: {
+      type: Boolean
+    },
+    overrideBackendDescriptionLabel: {
+      type: Boolean
+    },
     draftMode: {
       type: Boolean,
       default: undefined
@@ -95,10 +107,35 @@ export default {
       return get(this.$store.state.adminSettings.descriptions, this.path)
     },
     backendDescriptionLabel () {
-      return this.backendDescription?.label
+      if (this.realSource !== 'admin') return ''
+      if (!this.backendDescription || this.overrideBackendDescriptionLabel) {
+        return this.$t([
+          'admin_dash',
+          'temp_overrides',
+          ...this.canonPath.map(p => p.replace(/\./g, '_DOT_')),
+          'label'
+        ].join('.'))
+      } else {
+        return this.swapDescriptionAndLabel
+          ? this.backendDescription?.description
+          : this.backendDescription?.label
+      }
     },
     backendDescriptionDescription () {
-      return this.backendDescription?.description
+      if (this.realSource !== 'admin') return ''
+      if (this.hideDescription) return null
+      if (!this.backendDescription || this.overrideBackendDescription) {
+        return this.$t([
+          'admin_dash',
+          'temp_overrides',
+          ...this.canonPath.map(p => p.replace(/\./g, '_DOT_')),
+          'description'
+        ].join('.'))
+      } else {
+        return this.swapDescriptionAndLabel
+          ? this.backendDescription?.label
+          : this.backendDescription?.description
+      }
     },
     backendDescriptionSuggestions () {
       return this.backendDescription?.suggestions
diff --git a/src/components/settings_modal/helpers/string_setting.vue b/src/components/settings_modal/helpers/string_setting.vue
index 5ee75a84..7e70b82f 100644
--- a/src/components/settings_modal/helpers/string_setting.vue
+++ b/src/components/settings_modal/helpers/string_setting.vue
@@ -4,7 +4,7 @@
     class="StringSetting"
   >
     <label :for="path" :class="{ 'faint': shouldBeDisabled }">
-      <template v-if="backendDescription">
+      <template v-if="backendDescriptionLabel">
         {{ backendDescriptionLabel + ' ' }}
       </template>
       <template v-else>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index f4c2df3e..082ad826 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -864,7 +864,14 @@
       "instance": "Instance information",
       "registrations": "User sign-ups",
       "captcha_header": "CAPTCHA",
-      "kocaptcha": "KoCaptcha settings"
+      "kocaptcha": "KoCaptcha settings",
+      "access": "Instance access",
+      "restrict": {
+        "header": "Restrict access",
+        "timelines": "Timelines access",
+        "profiles": "User profiles access",
+        "activities": "Statues/activities access"
+      }
     },
     "limits": {
       "arbitrary_limits": "Arbitrary limits",
@@ -890,6 +897,20 @@
       "default_frontend_tip": "Default front-end will be shown to all users. Currently there's no way to for a user to select personal front-end. If you switch away from PleromaFE you'll most likely have to use old and buggy AdminFE to do instance configuration until we replace it.",
       "default_frontend_tip2": "WIP: Since Pleroma backend doesn't properly list all installed frontends you'll have to enter name and reference manually. List below provides shortcuts to fill the values.",
       "available_frontends": "Available for install"
+    },
+    "temp_overrides": {
+      ":pleroma": {
+        ":instance": {
+          ":description_limit": {
+            "label": "Limit",
+            "description": "Character limit for attachment descriptions"
+          },
+          ":background_image": {
+            "label": "Background image",
+            "description": "Background image (primarily used by PleromaFE)"
+          }
+        }
+      }
     }
   },
   "time": {
-- 
cgit v1.2.3-70-g09d2


From d8ed541d12382ec58ea1ab75acb1ca153e22f2e4 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 13 Apr 2023 00:02:35 +0300
Subject: reordered registrations section to be above access since it's more
 likely to be used more often

---
 .../settings_modal/admin_tabs/instance_tab.vue     | 170 ++++++++++-----------
 1 file changed, 85 insertions(+), 85 deletions(-)

(limited to 'src')

diff --git a/src/components/settings_modal/admin_tabs/instance_tab.vue b/src/components/settings_modal/admin_tabs/instance_tab.vue
index 40e33495..535e4132 100644
--- a/src/components/settings_modal/admin_tabs/instance_tab.vue
+++ b/src/components/settings_modal/admin_tabs/instance_tab.vue
@@ -35,6 +35,91 @@
         </li>
       </ul>
     </div>
+    <div class="setting-item">
+      <h2>{{ $t('admin_dash.instance.registrations') }}</h2>
+      <ul class="setting-list">
+        <li>
+          <BooleanSetting path=":pleroma.:instance.:registrations_open">
+            REGISTRATIONS OPEN
+          </BooleanSetting>
+          <ul class="setting-list suboptions">
+            <li>
+              <BooleanSetting
+                path=":pleroma.:instance.:invites_enabled"
+                parent-path=":pleroma.:instance.:registrations_open"
+                parent-invert
+              >
+                INVITES ENABLED
+              </BooleanSetting>
+            </li>
+          </ul>
+        </li>
+        <li>
+          <BooleanSetting path=":pleroma.:instance.:birthday_required">
+            BDEY REQUIRED
+          </BooleanSetting>
+          <ul class="setting-list suboptions">
+            <li>
+              <IntegerSetting
+                path=":pleroma.:instance.:birthday_min_age"
+                parent-path=":pleroma.:instance.:birthday_required"
+              >
+                BDEY age of consent
+              </IntegerSetting>
+            </li>
+          </ul>
+        </li>
+        <li>
+          <BooleanSetting path=":pleroma.:instance.:account_activation_required">
+            ACTIVATION REQUIRED
+          </BooleanSetting>
+        </li>
+        <li>
+          <BooleanSetting path=":pleroma.:instance.:account_approval_required">
+            APPROVAL REQUIRED
+          </BooleanSetting>
+        </li>
+        <li>
+          <h3>{{ $t('admin_dash.instance.captcha_header') }}</h3>
+        </li>
+        <li>
+          <BooleanSetting :path="[':pleroma', 'Pleroma.Captcha', ':enabled']">
+            CAPTCHA
+          </BooleanSetting>
+          <ul class="setting-list suboptions">
+            <li>
+              <ChoiceSetting
+                :path="[':pleroma', 'Pleroma.Captcha', ':method']"
+                :parent-path="[':pleroma', 'Pleroma.Captcha', ':enabled']"
+                :option-label-map="{
+                  'Pleroma.Captcha.Native': $t('admin_dash.captcha.native'),
+                  'Pleroma.Captcha.Kocaptcha': $t('admin_dash.captcha.kocaptcha')
+                }"
+              >
+                CAPTCHA TYPE
+              </ChoiceSetting>
+              <IntegerSetting
+                :path="[':pleroma', 'Pleroma.Captcha', ':seconds_valid']"
+                :parent-path="[':pleroma', 'Pleroma.Captcha', ':enabled']"
+              >
+                VALID
+              </IntegerSetting>
+            </li>
+          </ul>
+          <ul
+            v-if="adminDraft[':pleroma']['Pleroma.Captcha'][':enabled'] && adminDraft[':pleroma']['Pleroma.Captcha'][':method'] === 'Pleroma.Captcha.Kocaptcha'"
+            class="setting-list suboptions"
+          >
+            <h4>{{ $t('admin_dash.instance.kocaptcha') }}</h4>
+            <li>
+              <StringSetting :path="[':pleroma', 'Pleroma.Captcha.Kocaptcha', ':endpoint']">
+                cockAPTCHA ENDPOINT
+              </StringSetting>
+            </li>
+          </ul>
+        </li>
+      </ul>
+    </div>
     <div class="setting-item">
       <h2>{{ $t('admin_dash.instance.access') }}</h2>
       <ul class="setting-list">
@@ -137,91 +222,6 @@
         </li>
       </ul>
     </div>
-    <div class="setting-item">
-      <h2>{{ $t('admin_dash.instance.registrations') }}</h2>
-      <ul class="setting-list">
-        <li>
-          <BooleanSetting path=":pleroma.:instance.:registrations_open">
-            REGISTRATIONS OPEN
-          </BooleanSetting>
-          <ul class="setting-list suboptions">
-            <li>
-              <BooleanSetting
-                path=":pleroma.:instance.:invites_enabled"
-                parent-path=":pleroma.:instance.:registrations_open"
-                parent-invert
-              >
-                INVITES ENABLED
-              </BooleanSetting>
-            </li>
-          </ul>
-        </li>
-        <li>
-          <BooleanSetting path=":pleroma.:instance.:birthday_required">
-            BDEY REQUIRED
-          </BooleanSetting>
-          <ul class="setting-list suboptions">
-            <li>
-              <IntegerSetting
-                path=":pleroma.:instance.:birthday_min_age"
-                parent-path=":pleroma.:instance.:birthday_required"
-              >
-                BDEY age of consent
-              </IntegerSetting>
-            </li>
-          </ul>
-        </li>
-        <li>
-          <BooleanSetting path=":pleroma.:instance.:account_activation_required">
-            ACTIVATION REQUIRED
-          </BooleanSetting>
-        </li>
-        <li>
-          <BooleanSetting path=":pleroma.:instance.:account_approval_required">
-            APPROVAL REQUIRED
-          </BooleanSetting>
-        </li>
-        <li>
-          <h3>{{ $t('admin_dash.instance.captcha_header') }}</h3>
-        </li>
-        <li>
-          <BooleanSetting :path="[':pleroma', 'Pleroma.Captcha', ':enabled']">
-            CAPTCHA
-          </BooleanSetting>
-          <ul class="setting-list suboptions">
-            <li>
-              <ChoiceSetting
-                :path="[':pleroma', 'Pleroma.Captcha', ':method']"
-                :parent-path="[':pleroma', 'Pleroma.Captcha', ':enabled']"
-                :option-label-map="{
-                  'Pleroma.Captcha.Native': $t('admin_dash.captcha.native'),
-                  'Pleroma.Captcha.Kocaptcha': $t('admin_dash.captcha.kocaptcha')
-                }"
-              >
-                CAPTCHA TYPE
-              </ChoiceSetting>
-              <IntegerSetting
-                :path="[':pleroma', 'Pleroma.Captcha', ':seconds_valid']"
-                :parent-path="[':pleroma', 'Pleroma.Captcha', ':enabled']"
-              >
-                VALID
-              </IntegerSetting>
-            </li>
-          </ul>
-          <ul
-            v-if="adminDraft[':pleroma']['Pleroma.Captcha'][':enabled'] && adminDraft[':pleroma']['Pleroma.Captcha'][':method'] === 'Pleroma.Captcha.Kocaptcha'"
-            class="setting-list suboptions"
-          >
-            <h4>{{ $t('admin_dash.instance.kocaptcha') }}</h4>
-            <li>
-              <StringSetting :path="[':pleroma', 'Pleroma.Captcha.Kocaptcha', ':endpoint']">
-                cockAPTCHA ENDPOINT
-              </StringSetting>
-            </li>
-          </ul>
-        </li>
-      </ul>
-    </div>
   </div>
 </template>
 
-- 
cgit v1.2.3-70-g09d2


From 9aaa8a86f52bc97838c768a8859919a3ad6fd54f Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 13 Apr 2023 01:11:20 +0300
Subject: initial implementation of attachmentsetting

---
 .../settings_modal/admin_tabs/instance_tab.js      |  2 +
 .../settings_modal/admin_tabs/instance_tab.vue     |  8 +--
 .../settings_modal/helpers/attachment_setting.js   | 42 +++++++++++++
 .../settings_modal/helpers/attachment_setting.vue  | 70 ++++++++++++++++++++++
 .../settings_modal/helpers/string_setting.vue      |  1 -
 src/services/file_type/file_type.service.js        | 18 +++++-
 6 files changed, 134 insertions(+), 7 deletions(-)
 create mode 100644 src/components/settings_modal/helpers/attachment_setting.js
 create mode 100644 src/components/settings_modal/helpers/attachment_setting.vue

(limited to 'src')

diff --git a/src/components/settings_modal/admin_tabs/instance_tab.js b/src/components/settings_modal/admin_tabs/instance_tab.js
index f702afcf..b07bafe8 100644
--- a/src/components/settings_modal/admin_tabs/instance_tab.js
+++ b/src/components/settings_modal/admin_tabs/instance_tab.js
@@ -3,6 +3,7 @@ import ChoiceSetting from '../helpers/choice_setting.vue'
 import IntegerSetting from '../helpers/integer_setting.vue'
 import StringSetting from '../helpers/string_setting.vue'
 import GroupSetting from '../helpers/group_setting.vue'
+import AttachmentSetting from '../helpers/attachment_setting.vue'
 
 import SharedComputedObject from '../helpers/shared_computed_object.js'
 import { library } from '@fortawesome/fontawesome-svg-core'
@@ -26,6 +27,7 @@ const InstanceTab = {
     ChoiceSetting,
     IntegerSetting,
     StringSetting,
+    AttachmentSetting,
     GroupSetting
   },
   computed: {
diff --git a/src/components/settings_modal/admin_tabs/instance_tab.vue b/src/components/settings_modal/admin_tabs/instance_tab.vue
index 535e4132..e519e135 100644
--- a/src/components/settings_modal/admin_tabs/instance_tab.vue
+++ b/src/components/settings_modal/admin_tabs/instance_tab.vue
@@ -24,14 +24,14 @@
           </StringSetting>
         </li>
         <li>
-          <StringSetting path=":pleroma.:instance.:instance_thumbnail">
+          <AttachmentSetting path=":pleroma.:instance.:instance_thumbnail">
             INSTANCE THUMBNAIL
-          </StringSetting>
+          </AttachmentSetting>
         </li>
         <li>
-          <StringSetting path=":pleroma.:instance.:background_image">
+          <AttachmentSetting path=":pleroma.:instance.:background_image">
             BACKGROUND IMAGE
-          </StringSetting>
+          </AttachmentSetting>
         </li>
       </ul>
     </div>
diff --git a/src/components/settings_modal/helpers/attachment_setting.js b/src/components/settings_modal/helpers/attachment_setting.js
new file mode 100644
index 00000000..a0a12ead
--- /dev/null
+++ b/src/components/settings_modal/helpers/attachment_setting.js
@@ -0,0 +1,42 @@
+import Setting from './setting.js'
+import { fileTypeExt } from 'src/services/file_type/file_type.service.js'
+import MediaUpload from 'src/components/media_upload/media_upload.vue'
+import Attachment from 'src/components/attachment/attachment.vue'
+
+export default {
+  ...Setting,
+  props: {
+    ...Setting.props,
+    type: {
+      type: Array,
+      required: false,
+      default: []
+    }
+  },
+  components: {
+    ...Setting.components,
+    MediaUpload,
+    Attachment
+  },
+  computed: {
+    ...Setting.computed,
+    attachment () {
+      const path = this.realDraftMode ? this.draft : this.state
+      const url = path.includes('://') ? path : this.$store.state.instance.server + path
+      return {
+        mimetype: fileTypeExt(url),
+        url
+      }
+    }
+  },
+  methods: {
+    ...Setting.methods,
+    setMediaFile (fileInfo) {
+      if (this.realDraftMode) {
+        this.draft = fileInfo.url
+      } else {
+        this.configSink(this.path, fileInfo.url)
+      }
+    }
+  }
+}
diff --git a/src/components/settings_modal/helpers/attachment_setting.vue b/src/components/settings_modal/helpers/attachment_setting.vue
new file mode 100644
index 00000000..3a933511
--- /dev/null
+++ b/src/components/settings_modal/helpers/attachment_setting.vue
@@ -0,0 +1,70 @@
+<template>
+  <span
+    v-if="matchesExpertLevel"
+    class="AttachmentSetting"
+  >
+    <label :for="path" :class="{ 'faint': shouldBeDisabled }">
+      <template v-if="backendDescriptionLabel">
+        {{ backendDescriptionLabel + ' ' }}
+      </template>
+      <template v-else>
+        <slot />
+      </template>
+
+    </label>
+    <p
+      v-if="backendDescriptionDescription"
+      class="setting-description"
+      :class="{ 'faint': shouldBeDisabled }"
+    >
+      {{ backendDescriptionDescription + ' ' }}
+    </p>
+    <div class="attachment-input">
+      <Attachment
+        class="attachment"
+        :compact="compact"
+        :attachment="attachment"
+        size="small"
+        hide-description
+        @setMedia="onMedia"
+        @naturalSizeLoad="onNaturalSizeLoad"
+      />
+      <div class="controls">
+        <media-upload
+          normal-button
+          ref="mediaUpload"
+          class="media-upload-icon"
+          :drop-files="dropFiles"
+          @uploaded="setMediaFile"
+          @upload-failed="uploadFailed"
+        />
+        <input
+          :id="path"
+          class="string-input"
+          :disabled="shouldBeDisabled"
+          :value="realDraftMode ? draft : state"
+          @change="update"
+        >
+        {{ ' ' }}
+        <ModifiedIndicator
+          :changed="isChanged"
+          :onclick="reset"
+        />
+        <ProfileSettingIndicator :is-profile="isProfileSetting" />
+      </div>
+    </div>
+    <DraftButtons />
+  </span>
+</template>
+
+<script src="./attachment_setting.js"></script>
+
+<style lang="scss">
+.AttachmentSetting {
+  .attachment {
+    display: block;
+    width: 20em;
+    height: 15em;
+  }
+}
+</style>
diff --git a/src/components/settings_modal/helpers/string_setting.vue b/src/components/settings_modal/helpers/string_setting.vue
index 7e70b82f..84d0a9d6 100644
--- a/src/components/settings_modal/helpers/string_setting.vue
+++ b/src/components/settings_modal/helpers/string_setting.vue
@@ -14,7 +14,6 @@
     <input
       :id="path"
       class="string-input"
-      step="1"
       :disabled="shouldBeDisabled"
       :value="realDraftMode ? draft : state"
       @change="update"
diff --git a/src/services/file_type/file_type.service.js b/src/services/file_type/file_type.service.js
index 5182ecd1..b92c6c64 100644
--- a/src/services/file_type/file_type.service.js
+++ b/src/services/file_type/file_type.service.js
@@ -1,7 +1,7 @@
 // TODO this func might as well take the entire file and use its mimetype
 // or the entire service could be just mimetype service that only operates
 // on mimetypes and not files. Currently the naming is confusing.
-const fileType = mimetype => {
+export const fileType = mimetype => {
   if (mimetype.match(/flash/)) {
     return 'flash'
   }
@@ -25,11 +25,25 @@ const fileType = mimetype => {
   return 'unknown'
 }
 
-const fileMatchesSomeType = (types, file) =>
+export const fileTypeExt = url => {
+  if (url.match(/\.(png|jpe?g|gif|webp|avif)$/)) {
+    return 'image'
+  }
+  if (url.match(/\.(ogv|mp4|webm|mov)$/)) {
+    return 'video'
+  }
+  if (url.match(/\.(it|s3m|mod|umx|mp3|aac|m4a|flac|alac|ogg|oga|opus|wav|ape|midi?)$/)) {
+    return 'audio'
+  }
+  return 'unknown'
+}
+
+export const fileMatchesSomeType = (types, file) =>
   types.some(type => fileType(file.mimetype) === type)
 
 const fileTypeService = {
   fileType,
+  fileTypeExt,
   fileMatchesSomeType
 }
 
-- 
cgit v1.2.3-70-g09d2


From e0fbeee88edb29f04a3260560d10d1a812f84029 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 24 Apr 2023 21:57:31 +0300
Subject: finish up attachment setting (right now only for admin section only)

---
 src/components/media_upload/media_upload.js        | 18 ++++++--
 src/components/media_upload/media_upload.vue       | 22 ++++++---
 .../settings_modal/helpers/attachment_setting.js   |  7 +--
 .../settings_modal/helpers/attachment_setting.vue  | 53 +++++++++++++++-------
 src/i18n/en.json                                   |  2 +
 5 files changed, 73 insertions(+), 29 deletions(-)

(limited to 'src')

diff --git a/src/components/media_upload/media_upload.js b/src/components/media_upload/media_upload.js
index cfd42d4c..8c9e5f71 100644
--- a/src/components/media_upload/media_upload.js
+++ b/src/components/media_upload/media_upload.js
@@ -23,6 +23,11 @@ const mediaUpload = {
     }
   },
   methods: {
+    onClick () {
+      if (this.uploadReady) {
+        this.$refs.input.click()
+      }
+    },
     uploadFile (file) {
       const self = this
       const store = this.$store
@@ -69,10 +74,15 @@ const mediaUpload = {
       this.multiUpload(target.files)
     }
   },
-  props: [
-    'dropFiles',
-    'disabled'
-  ],
+  props: {
+    dropFiles: Object,
+    disabled: Boolean,
+    normalButton: Boolean,
+    acceptTypes: {
+      type: String,
+      default: '*/*'
+    }
+  },
   watch: {
     dropFiles: function (fileInfos) {
       if (!this.uploading) {
diff --git a/src/components/media_upload/media_upload.vue b/src/components/media_upload/media_upload.vue
index 2799495b..c761b94f 100644
--- a/src/components/media_upload/media_upload.vue
+++ b/src/components/media_upload/media_upload.vue
@@ -1,8 +1,10 @@
 <template>
-  <label
+  <component
     class="media-upload"
-    :class="{ disabled: disabled }"
+    :is="normalButton ? 'button' : 'label'"
+    :class="{ disabled: disabled, ['media-upload button-default btn']: normalButton }"
     :title="$t('tool_tip.media_upload')"
+    @click="onClick"
   >
     <FAIcon
       v-if="uploading"
@@ -15,6 +17,10 @@
       class="new-icon"
       icon="upload"
     />
+    <template v-if="normalButton">
+      {{ ' ' }}
+      {{ uploading ? $t('general.loading') : $t('tool_tip.media_upload') }}
+    </template>
     <input
       v-if="uploadReady"
       class="hidden-input-file"
@@ -22,8 +28,10 @@
       type="file"
       multiple="true"
       @change="change"
+      ref="input"
+      :accept="acceptTypes"
     >
-  </label>
+  </component>
 </template>
 
 <script src="./media_upload.js"></script>
@@ -32,10 +40,12 @@
 @import "../../variables";
 
 .media-upload {
-  cursor: pointer; // We use <label> for interactivity... i wonder if it's fine
-
   .hidden-input-file {
     display: none;
   }
 }
- </style>
+
+label.media-upload {
+  cursor: pointer; // We use <label> for interactivity... i wonder if it's fine
+}
+</style>
diff --git a/src/components/settings_modal/helpers/attachment_setting.js b/src/components/settings_modal/helpers/attachment_setting.js
index a0a12ead..ac5c6f86 100644
--- a/src/components/settings_modal/helpers/attachment_setting.js
+++ b/src/components/settings_modal/helpers/attachment_setting.js
@@ -7,10 +7,10 @@ export default {
   ...Setting,
   props: {
     ...Setting.props,
-    type: {
-      type: Array,
+    acceptTypes: {
+      type: String,
       required: false,
-      default: []
+      default: 'image/*'
     }
   },
   components: {
@@ -22,6 +22,7 @@ export default {
     ...Setting.computed,
     attachment () {
       const path = this.realDraftMode ? this.draft : this.state
+      // The "server" part is primarily for local dev, but could be useful for alt-domain or multiuser usage.
       const url = path.includes('://') ? path : this.$store.state.instance.server + path
       return {
         mimetype: fileTypeExt(url),
diff --git a/src/components/settings_modal/helpers/attachment_setting.vue b/src/components/settings_modal/helpers/attachment_setting.vue
index 3a933511..cc2278b0 100644
--- a/src/components/settings_modal/helpers/attachment_setting.vue
+++ b/src/components/settings_modal/helpers/attachment_setting.vue
@@ -20,6 +20,23 @@
       {{ backendDescriptionDescription + ' ' }}
     </p>
     <div class="attachment-input">
+      <div>{{ $t('settings.url') }}</div>
+      <div class="controls">
+        <input
+          :id="path"
+          class="string-input"
+          :disabled="shouldBeDisabled"
+          :value="realDraftMode ? draft : state"
+          @change="update"
+        >
+        {{ ' ' }}
+        <ModifiedIndicator
+          :changed="isChanged"
+          :onclick="reset"
+        />
+        <ProfileSettingIndicator :is-profile="isProfileSetting" />
+      </div>
+      <div>{{ $t('settings.preview') }}</div>
       <Attachment
         class="attachment"
         :compact="compact"
@@ -30,27 +47,15 @@
         @naturalSizeLoad="onNaturalSizeLoad"
       />
       <div class="controls">
-        <media-upload
-          normal-button
+        <MediaUpload
           ref="mediaUpload"
           class="media-upload-icon"
           :drop-files="dropFiles"
           @uploaded="setMediaFile"
           @upload-failed="uploadFailed"
+          normal-button
+          :accept-types="acceptTypes"
         />
-        <input
-          :id="path"
-          class="string-input"
-          :disabled="shouldBeDisabled"
-          :value="realDraftMode ? draft : state"
-          @change="update"
-        >
-        {{ ' ' }}
-        <ModifiedIndicator
-          :changed="isChanged"
-          :onclick="reset"
-        />
-        <ProfileSettingIndicator :is-profile="isProfileSetting" />
       </div>
     </div>
     <DraftButtons />
@@ -63,8 +68,24 @@
 .AttachmentSetting {
   .attachment {
     display: block;
-    width: 20em;
+    width: 100%;
     height: 15em;
+    margin-bottom: 0.5em;
+  }
+
+  .attachment-input {
+    margin-left: 1em;
+    display: flex;
+    flex-direction: column;
+    width: 20em;
+  }
+
+  .controls {
+    margin-bottom: 0.5em;
+
+    input, button {
+      width: 100%;
+    }
   }
 }
 </style>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 082ad826..44998453 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -519,6 +519,8 @@
     "loop_video_silent_only": "Loop only videos without sound (i.e. Mastodon's \"gifs\")",
     "mutes_tab": "Mutes",
     "play_videos_in_modal": "Play videos in a popup frame",
+    "url": "URL",
+    "preview": "Preview",
     "file_export_import": {
       "backup_restore": "Settings backup",
       "backup_settings": "Backup settings to file",
-- 
cgit v1.2.3-70-g09d2


From 1492937a7e8e27a31699879dc710d3e36c67b953 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 24 Apr 2023 23:01:29 +0300
Subject: lint

---
 src/components/media_upload/media_upload.vue       |  6 +--
 .../settings_modal/admin_tabs/frontends_tab.vue    | 56 ++++++++++++++++------
 .../settings_modal/helpers/attachment_setting.vue  |  9 ++--
 .../settings_modal/helpers/number_setting.vue      |  5 +-
 .../settings_modal/helpers/string_setting.vue      |  5 +-
 src/components/settings_modal/settings_modal.vue   | 13 +++--
 6 files changed, 66 insertions(+), 28 deletions(-)

(limited to 'src')

diff --git a/src/components/media_upload/media_upload.vue b/src/components/media_upload/media_upload.vue
index c761b94f..993c01a4 100644
--- a/src/components/media_upload/media_upload.vue
+++ b/src/components/media_upload/media_upload.vue
@@ -1,7 +1,7 @@
 <template>
   <component
-    class="media-upload"
     :is="normalButton ? 'button' : 'label'"
+    class="media-upload"
     :class="{ disabled: disabled, ['media-upload button-default btn']: normalButton }"
     :title="$t('tool_tip.media_upload')"
     @click="onClick"
@@ -23,13 +23,13 @@
     </template>
     <input
       v-if="uploadReady"
+      ref="input"
       class="hidden-input-file"
       :disabled="disabled"
       type="file"
       multiple="true"
-      @change="change"
-      ref="input"
       :accept="acceptTypes"
+      @change="change"
     >
   </component>
 </template>
diff --git a/src/components/settings_modal/admin_tabs/frontends_tab.vue b/src/components/settings_modal/admin_tabs/frontends_tab.vue
index 71bbfa69..e108a963 100644
--- a/src/components/settings_modal/admin_tabs/frontends_tab.vue
+++ b/src/components/settings_modal/admin_tabs/frontends_tab.vue
@@ -1,5 +1,8 @@
 <template>
-  <div class="frontends-tab" :label="$t('admin_dash.tabs.frontends')">
+  <div
+    class="frontends-tab"
+    :label="$t('admin_dash.tabs.frontends')"
+  >
     <div class="setting-item">
       <h2>{{ $t('admin_dash.tabs.frontends') }}</h2>
       <p>{{ $t('admin_dash.frontend.wip_notice') }}</p>
@@ -20,23 +23,26 @@
           </StringSetting>
         </li>
         <li>
-          <GroupSetting path=":pleroma.:frontends.:primary"/>
+          <GroupSetting path=":pleroma.:frontends.:primary" />
         </li>
       </ul>
       <div class="setting-list">
         <h3>{{ $t('admin_dash.frontend.available_frontends') }}</h3>
         <ul class="cards-list">
-          <li v-for="frontend in frontends" :key="frontend.name">
+          <li
+            v-for="frontend in frontends"
+            :key="frontend.name"
+          >
             <strong>{{ frontend.name }}</strong>
             {{ ' ' }}
             <span v-if="adminDraft[':pleroma'][':frontends'][':primary'].name === frontend.name">
               <i18n-t
-                keypath="admin_dash.frontend.is_default"
                 v-if="adminDraft[':pleroma'][':frontends'][':primary'].ref === frontend.refs[0]"
+                keypath="admin_dash.frontend.is_default"
               />
               <i18n-t
-                keypath="admin_dash.frontend.is_default_custom"
                 v-else
+                keypath="admin_dash.frontend.is_default_custom"
               >
                 <template #version>
                   <code>{{ adminDraft[':pleroma'][':frontends'][':primary'].ref }}</code>
@@ -45,13 +51,30 @@
             </span>
             <dl>
               <dt>{{ $t('admin_dash.frontend.repository') }}</dt>
-              <dd><a :href="frontend.git" target="_blank">{{ frontend.git }}</a></dd>
+              <dd>
+                <a
+                  :href="frontend.git"
+                  target="_blank"
+                >{{ frontend.git }}</a>
+              </dd>
               <template v-if="expertLevel">
                 <dt>{{ $t('admin_dash.frontend.versions') }}</dt>
-                <dd v-for="ref in frontend.refs" :key="ref"><code>{{ ref }}</code></dd>
+                <dd
+                  v-for="ref in frontend.refs"
+                  :key="ref"
+                >
+                  <code>{{ ref }}</code>
+                </dd>
               </template>
-              <dt v-if="expertLevel">{{ $t('admin_dash.frontend.build_url') }}</dt>
-              <dd v-if="expertLevel"><a :href="frontend.build_url" target="_blank">{{ frontend.build_url }}</a></dd>
+              <dt v-if="expertLevel">
+                {{ $t('admin_dash.frontend.build_url') }}
+              </dt>
+              <dd v-if="expertLevel">
+                <a
+                  :href="frontend.build_url"
+                  target="_blank"
+                >{{ frontend.build_url }}</a>
+              </dd>
             </dl>
             <div>
               <span class="btn-group">
@@ -62,7 +85,7 @@
                   @click="update(frontend)"
                 >
                   {{
-                      frontend.installed
+                    frontend.installed
                       ? $t('admin_dash.frontend.reinstall')
                       : $t('admin_dash.frontend.install')
                   }}
@@ -100,19 +123,22 @@
                   </template>
                 </Popover>
               </span>
-              <span class="btn-group" v-if="frontend.name !== 'admin-fe'">
+              <span
+                v-if="frontend.name !== 'admin-fe'"
+                class="btn-group"
+              >
                 <button
                   class="button button-default btn"
                   type="button"
                   :disabled="
-                             adminDraft[':pleroma'][':frontends'][':primary'].name === frontend.name &&
-                             adminDraft[':pleroma'][':frontends'][':primary'].ref === frontend.refs[0]
-                             "
+                    adminDraft[':pleroma'][':frontends'][':primary'].name === frontend.name &&
+                      adminDraft[':pleroma'][':frontends'][':primary'].ref === frontend.refs[0]
+                  "
                   :title="$t('admin_dash.frontend.update')"
                   @click="setDefault(frontend)"
                 >
                   {{
-                      $t('admin_dash.frontend.set_default')
+                    $t('admin_dash.frontend.set_default')
                   }}
                 </button>
                 {{ ' ' }}
diff --git a/src/components/settings_modal/helpers/attachment_setting.vue b/src/components/settings_modal/helpers/attachment_setting.vue
index cc2278b0..0bede2c2 100644
--- a/src/components/settings_modal/helpers/attachment_setting.vue
+++ b/src/components/settings_modal/helpers/attachment_setting.vue
@@ -3,7 +3,10 @@
     v-if="matchesExpertLevel"
     class="AttachmentSetting"
   >
-    <label :for="path" :class="{ 'faint': shouldBeDisabled }">
+    <label
+      :for="path"
+      :class="{ 'faint': shouldBeDisabled }"
+    >
       <template v-if="backendDescriptionLabel">
         {{ backendDescriptionLabel + ' ' }}
       </template>
@@ -51,10 +54,10 @@
           ref="mediaUpload"
           class="media-upload-icon"
           :drop-files="dropFiles"
-          @uploaded="setMediaFile"
-          @upload-failed="uploadFailed"
           normal-button
           :accept-types="acceptTypes"
+          @uploaded="setMediaFile"
+          @upload-failed="uploadFailed"
         />
       </div>
     </div>
diff --git a/src/components/settings_modal/helpers/number_setting.vue b/src/components/settings_modal/helpers/number_setting.vue
index ce168570..065cfbcf 100644
--- a/src/components/settings_modal/helpers/number_setting.vue
+++ b/src/components/settings_modal/helpers/number_setting.vue
@@ -3,7 +3,10 @@
     v-if="matchesExpertLevel"
     class="NumberSetting"
   >
-    <label :for="path" :class="{ 'faint': shouldBeDisabled }">
+    <label
+      :for="path"
+      :class="{ 'faint': shouldBeDisabled }"
+    >
       <template v-if="backendDescriptionLabel">
         {{ backendDescriptionLabel + ' ' }}
       </template>
diff --git a/src/components/settings_modal/helpers/string_setting.vue b/src/components/settings_modal/helpers/string_setting.vue
index 84d0a9d6..9de99d78 100644
--- a/src/components/settings_modal/helpers/string_setting.vue
+++ b/src/components/settings_modal/helpers/string_setting.vue
@@ -3,7 +3,10 @@
     v-if="matchesExpertLevel"
     class="StringSetting"
   >
-    <label :for="path" :class="{ 'faint': shouldBeDisabled }">
+    <label
+      :for="path"
+      :class="{ 'faint': shouldBeDisabled }"
+    >
       <template v-if="backendDescriptionLabel">
         {{ backendDescriptionLabel + ' ' }}
       </template>
diff --git a/src/components/settings_modal/settings_modal.vue b/src/components/settings_modal/settings_modal.vue
index 57ec5535..4e7fd931 100644
--- a/src/components/settings_modal/settings_modal.vue
+++ b/src/components/settings_modal/settings_modal.vue
@@ -125,21 +125,24 @@
           id="unscrolled-content"
           class="extra-content"
         />
-        <span class="admin-buttons" v-if="modalMode === 'admin'">
+        <span
+          v-if="modalMode === 'admin'"
+          class="admin-buttons"
+        >
           <button
             class="button-default btn"
-            @click="resetAdminDraft"
             :disabled="!adminDraftAny"
+            @click="resetAdminDraft"
           >
-              {{ $t("admin_dash.reset_all") }}
+            {{ $t("admin_dash.reset_all") }}
           </button>
           {{ ' ' }}
           <button
             class="button-default btn"
-            @click="pushAdminDraft"
             :disabled="!adminDraftAny"
+            @click="pushAdminDraft"
           >
-              {{ $t("admin_dash.commit_all") }}
+            {{ $t("admin_dash.commit_all") }}
           </button>
         </span>
       </div>
-- 
cgit v1.2.3-70-g09d2


From 6816bc8badb34a41e41718b0d42e1021c974ff64 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Fri, 5 May 2023 01:50:41 +0300
Subject: remove unused stuff

---
 .../settings_modal/admin_tabs/frontends_tab.vue    |   8 +-
 .../settings_modal/admin_tabs/instance_tab.vue     | 108 ++++++---------------
 .../settings_modal/admin_tabs/limits_tab.vue       |  56 +++--------
 3 files changed, 43 insertions(+), 129 deletions(-)

(limited to 'src')

diff --git a/src/components/settings_modal/admin_tabs/frontends_tab.vue b/src/components/settings_modal/admin_tabs/frontends_tab.vue
index e108a963..5281ef22 100644
--- a/src/components/settings_modal/admin_tabs/frontends_tab.vue
+++ b/src/components/settings_modal/admin_tabs/frontends_tab.vue
@@ -13,14 +13,10 @@
           <p>{{ $t('admin_dash.frontend.default_frontend_tip2') }}</p>
         </li>
         <li>
-          <StringSetting path=":pleroma.:frontends.:primary.name">
-            NAME
-          </StringSetting>
+          <StringSetting path=":pleroma.:frontends.:primary.name"/>
         </li>
         <li>
-          <StringSetting path=":pleroma.:frontends.:primary.ref">
-            REF
-          </StringSetting>
+          <StringSetting path=":pleroma.:frontends.:primary.ref"/>
         </li>
         <li>
           <GroupSetting path=":pleroma.:frontends.:primary" />
diff --git a/src/components/settings_modal/admin_tabs/instance_tab.vue b/src/components/settings_modal/admin_tabs/instance_tab.vue
index e519e135..d537adb6 100644
--- a/src/components/settings_modal/admin_tabs/instance_tab.vue
+++ b/src/components/settings_modal/admin_tabs/instance_tab.vue
@@ -4,34 +4,22 @@
       <h2>{{ $t('admin_dash.instance.instance') }}</h2>
       <ul class="setting-list">
         <li>
-          <StringSetting path=":pleroma.:instance.:name">
-            NAME
-          </StringSetting>
+          <StringSetting path=":pleroma.:instance.:name"/>
         </li>
         <li>
-          <StringSetting path=":pleroma.:instance.:email">
-            ADMIN EMAIL
-          </StringSetting>
+          <StringSetting path=":pleroma.:instance.:email"/>
         </li>
         <li>
-          <StringSetting path=":pleroma.:instance.:description">
-            DESCRIPTION
-          </StringSetting>
+          <StringSetting path=":pleroma.:instance.:description"/>
         </li>
         <li>
-          <StringSetting path=":pleroma.:instance.:short_description">
-            SHORT DESCRIPTION
-          </StringSetting>
+          <StringSetting path=":pleroma.:instance.:short_description"/>
         </li>
         <li>
-          <AttachmentSetting path=":pleroma.:instance.:instance_thumbnail">
-            INSTANCE THUMBNAIL
-          </AttachmentSetting>
+          <AttachmentSetting path=":pleroma.:instance.:instance_thumbnail"/>
         </li>
         <li>
-          <AttachmentSetting path=":pleroma.:instance.:background_image">
-            BACKGROUND IMAGE
-          </AttachmentSetting>
+          <AttachmentSetting path=":pleroma.:instance.:background_image"/>
         </li>
       </ul>
     </div>
@@ -39,53 +27,39 @@
       <h2>{{ $t('admin_dash.instance.registrations') }}</h2>
       <ul class="setting-list">
         <li>
-          <BooleanSetting path=":pleroma.:instance.:registrations_open">
-            REGISTRATIONS OPEN
-          </BooleanSetting>
+          <BooleanSetting path=":pleroma.:instance.:registrations_open"/>
           <ul class="setting-list suboptions">
             <li>
               <BooleanSetting
                 path=":pleroma.:instance.:invites_enabled"
                 parent-path=":pleroma.:instance.:registrations_open"
                 parent-invert
-              >
-                INVITES ENABLED
-              </BooleanSetting>
+              />
             </li>
           </ul>
         </li>
         <li>
-          <BooleanSetting path=":pleroma.:instance.:birthday_required">
-            BDEY REQUIRED
-          </BooleanSetting>
+          <BooleanSetting path=":pleroma.:instance.:birthday_required"/>
           <ul class="setting-list suboptions">
             <li>
               <IntegerSetting
                 path=":pleroma.:instance.:birthday_min_age"
                 parent-path=":pleroma.:instance.:birthday_required"
-              >
-                BDEY age of consent
-              </IntegerSetting>
+              />
             </li>
           </ul>
         </li>
         <li>
-          <BooleanSetting path=":pleroma.:instance.:account_activation_required">
-            ACTIVATION REQUIRED
-          </BooleanSetting>
+          <BooleanSetting path=":pleroma.:instance.:account_activation_required"/>
         </li>
         <li>
-          <BooleanSetting path=":pleroma.:instance.:account_approval_required">
-            APPROVAL REQUIRED
-          </BooleanSetting>
+          <BooleanSetting path=":pleroma.:instance.:account_approval_required"/>
         </li>
         <li>
           <h3>{{ $t('admin_dash.instance.captcha_header') }}</h3>
         </li>
         <li>
-          <BooleanSetting :path="[':pleroma', 'Pleroma.Captcha', ':enabled']">
-            CAPTCHA
-          </BooleanSetting>
+          <BooleanSetting :path="[':pleroma', 'Pleroma.Captcha', ':enabled']"/>
           <ul class="setting-list suboptions">
             <li>
               <ChoiceSetting
@@ -95,15 +69,11 @@
                   'Pleroma.Captcha.Native': $t('admin_dash.captcha.native'),
                   'Pleroma.Captcha.Kocaptcha': $t('admin_dash.captcha.kocaptcha')
                 }"
-              >
-                CAPTCHA TYPE
-              </ChoiceSetting>
+              />
               <IntegerSetting
                 :path="[':pleroma', 'Pleroma.Captcha', ':seconds_valid']"
                 :parent-path="[':pleroma', 'Pleroma.Captcha', ':enabled']"
-              >
-                VALID
-              </IntegerSetting>
+              />
             </li>
           </ul>
           <ul
@@ -112,9 +82,7 @@
           >
             <h4>{{ $t('admin_dash.instance.kocaptcha') }}</h4>
             <li>
-              <StringSetting :path="[':pleroma', 'Pleroma.Captcha.Kocaptcha', ':endpoint']">
-                cockAPTCHA ENDPOINT
-              </StringSetting>
+              <StringSetting :path="[':pleroma', 'Pleroma.Captcha.Kocaptcha', ':endpoint']"/>
             </li>
           </ul>
         </li>
@@ -124,17 +92,13 @@
       <h2>{{ $t('admin_dash.instance.access') }}</h2>
       <ul class="setting-list">
         <li>
-          <BooleanSetting path=":pleroma.:instance.:public">
-            PUBLIC
-          </BooleanSetting>
+          <BooleanSetting path=":pleroma.:instance.:public"/>
         </li>
         <li>
           <h3>{{ $t('admin_dash.instance.restrict.header') }}</h3>
         </li>
         <li>
-          <ChoiceSetting path=":pleroma.:instance.:limit_to_local_content">
-            SEARCH RESTRICTION
-          </ChoiceSetting>
+          <ChoiceSetting path=":pleroma.:instance.:limit_to_local_content"/>
         </li>
         <li>
           <h4>{{ $t('admin_dash.instance.restrict.timelines') }}</h4>
@@ -145,9 +109,7 @@
             indeterminate-state=":if_instance_is_private"
             swap-description-and-label
             hide-description
-          >
-            LOCAL TIMELINES
-          </BooleanSetting>
+          />
         </li>
         <li>
           <BooleanSetting
@@ -155,14 +117,10 @@
             indeterminate-state=":if_instance_is_private"
             swap-description-and-label
             hide-description
-          >
-            FED TIMELINES
-          </BooleanSetting>
+          />
         </li>
         <li>
-          <GroupSetting path=":pleroma.:restrict_unauthenticated.:timelines">
-            TIMELINES
-          </GroupSetting>
+          <GroupSetting path=":pleroma.:restrict_unauthenticated.:timelines"/>
         </li>
         <li>
           <h4>{{ $t('admin_dash.instance.restrict.profiles') }}</h4>
@@ -173,9 +131,7 @@
             indeterminate-state=":if_instance_is_private"
             swap-description-and-label
             hide-description
-          >
-            LOCAL PROFILES
-          </BooleanSetting>
+          />
         </li>
         <li>
           <BooleanSetting
@@ -183,14 +139,10 @@
             indeterminate-state=":if_instance_is_private"
             swap-description-and-label
             hide-description
-          >
-            FED PROFILES
-          </BooleanSetting>
+          />
         </li>
         <li>
-          <GroupSetting path=":pleroma.:restrict_unauthenticated.:profiles">
-            PROFILES
-          </GroupSetting>
+          <GroupSetting path=":pleroma.:restrict_unauthenticated.:profiles"/>
         </li>
         <li>
           <h4>{{ $t('admin_dash.instance.restrict.activities') }}</h4>
@@ -201,9 +153,7 @@
             indeterminate-state=":if_instance_is_private"
             swap-description-and-label
             hide-description
-          >
-            LOCAL STATUSES
-          </BooleanSetting>
+          />
         </li>
         <li>
           <BooleanSetting
@@ -211,14 +161,10 @@
             indeterminate-state=":if_instance_is_private"
             swap-description-and-label
             hide-description
-          >
-            FED STATUSES
-          </BooleanSetting>
+          />
         </li>
         <li>
-          <GroupSetting path=":pleroma.:restrict_unauthenticated.:activities">
-            STATUSES
-          </GroupSetting>
+          <GroupSetting path=":pleroma.:restrict_unauthenticated.:activities"/>
         </li>
       </ul>
     </div>
diff --git a/src/components/settings_modal/admin_tabs/limits_tab.vue b/src/components/settings_modal/admin_tabs/limits_tab.vue
index f7a70c97..068f2cda 100644
--- a/src/components/settings_modal/admin_tabs/limits_tab.vue
+++ b/src/components/settings_modal/admin_tabs/limits_tab.vue
@@ -11,9 +11,7 @@
             source="admin"
             path=":pleroma.:instance.:limit"
             draft-mode
-          >
-            POST LIMIT
-          </IntegerSetting>
+          />
         </li>
         <li>
           <IntegerSetting
@@ -21,9 +19,7 @@
             path=":pleroma.:instance.:remote_limit"
             expert="1"
             draft-mode
-          >
-            POST LIMIT (remote)
-          </IntegerSetting>
+          />
         </li>
         <li>
           <h3>{{ $t('admin_dash.limits.uploads') }}</h3>
@@ -33,27 +29,21 @@
             source="admin"
             path=":pleroma.:instance.:description_limit"
             draft-mode
-          >
-            IMAGE DESCRIPTION LIMIT
-          </IntegerSetting>
+          />
         </li>
         <li>
           <IntegerSetting
             source="admin"
             path=":pleroma.:instance.:upload_limit"
             draft-mode
-          >
-            UPLOAD LIMIT KiB
-          </IntegerSetting>
+          />
         </li>
         <li>
           <IntegerSetting
             source="admin"
             path=":pleroma.:instance.:max_media_attachments"
             draft-mode
-          >
-            MAX ATTACHMENTS
-          </IntegerSetting>
+          />
         </li>
         <li>
           <h3>{{ $t('admin_dash.limits.users') }}</h3>
@@ -63,27 +53,21 @@
             source="admin"
             path=":pleroma.:instance.:max_pinned_statuses"
             draft-mode
-          >
-            MAX PINNED POSTS
-          </IntegerSetting>
+          />
         </li>
         <li>
           <IntegerSetting
             source="admin"
             path=":pleroma.:instance.:user_bio_length"
             draft-mode
-          >
-            BIO LENGTH
-          </IntegerSetting>
+          />
         </li>
         <li>
           <IntegerSetting
             source="admin"
             path=":pleroma.:instance.:user_name_length"
             draft-mode
-          >
-            NAME LENGTH
-          </IntegerSetting>
+          />
         </li>
         <li>
           <h4>{{ $t('admin_dash.limits.profile_fields') }}</h4>
@@ -93,9 +77,7 @@
             source="admin"
             path=":pleroma.:instance.:max_account_fields"
             draft-mode
-          >
-            MAX ACCOUNT FIELDS
-          </IntegerSetting>
+          />
         </li>
         <li>
           <IntegerSetting
@@ -103,27 +85,21 @@
             path=":pleroma.:instance.:max_remote_account_fields"
             draft-mode
             expert="1"
-          >
-            MAX ACCOUNT FIELDS (remote)
-          </IntegerSetting>
+          />
         </li>
         <li>
           <IntegerSetting
             source="admin"
             path=":pleroma.:instance.:account_field_name_length"
             draft-mode
-          >
-            MAX ACCOUNT FIELD NAME
-          </IntegerSetting>
+          />
         </li>
         <li>
           <IntegerSetting
             source="admin"
             path=":pleroma.:instance.:account_field_value_length"
             draft-mode
-          >
-            MAX ACCOUNT VALUE NAME
-          </IntegerSetting>
+          />
         </li>
         <li>
           <h4>{{ $t('admin_dash.limits.user_uploads') }}</h4>
@@ -133,18 +109,14 @@
             source="admin"
             path=":pleroma.:instance.:avatar_upload_limit"
             draft-mode
-          >
-            MAX AVATAR SIZE KiB
-          </IntegerSetting>
+          />
         </li>
         <li>
           <IntegerSetting
             source="admin"
             path=":pleroma.:instance.:banner_upload_limit"
             draft-mode
-          >
-            MAX BANNER SIZE KiB
-          </IntegerSetting>
+          />
         </li>
       </ul>
     </div>
-- 
cgit v1.2.3-70-g09d2


From 1935bf6bd4fdef1336b8b709c38dba0ee8d7448f Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 8 May 2023 20:49:44 +0300
Subject: fix media upload bug

---
 src/components/media_upload/media_upload.vue | 7 +++----
 src/i18n/en.json                             | 2 ++
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/components/media_upload/media_upload.vue b/src/components/media_upload/media_upload.vue
index 993c01a4..2ea5567a 100644
--- a/src/components/media_upload/media_upload.vue
+++ b/src/components/media_upload/media_upload.vue
@@ -1,8 +1,7 @@
 <template>
-  <component
-    :is="normalButton ? 'button' : 'label'"
+  <button
     class="media-upload"
-    :class="{ disabled: disabled, ['media-upload button-default btn']: normalButton }"
+    :class="[normalButton ? 'button-default btn' : 'button-unstyled', { disabled }]"
     :title="$t('tool_tip.media_upload')"
     @click="onClick"
   >
@@ -31,7 +30,7 @@
       :accept="acceptTypes"
       @change="change"
     >
-  </component>
+  </button>
 </template>
 
 <script src="./media_upload.js"></script>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 44998453..072ce952 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -892,6 +892,8 @@
       "is_default_custom": "(Default, version: {version})",
       "install": "Install",
       "install_version": "Install version {version}",
+      "more_install_options": "More install options",
+      "more_default_options": "More default setting options",
       "set_default": "Set default",
       "set_default_version": "Set version {version} as default",
       "wip_notice": "Please note that this section is a WIP and lacks certain features as backend implementation of front-end management is incomplete.",
-- 
cgit v1.2.3-70-g09d2


From b9c69a2272219865ff7e5b35dd1a0df7ead16538 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 8 May 2023 21:01:29 +0300
Subject: improve the semantics

---
 .../settings_modal/admin_tabs/frontends_tab.vue    |  28 +--
 .../settings_modal/admin_tabs/limits_tab.vue       | 222 +++++++++++----------
 2 files changed, 130 insertions(+), 120 deletions(-)

(limited to 'src')

diff --git a/src/components/settings_modal/admin_tabs/frontends_tab.vue b/src/components/settings_modal/admin_tabs/frontends_tab.vue
index 5281ef22..f09e6a80 100644
--- a/src/components/settings_modal/admin_tabs/frontends_tab.vue
+++ b/src/components/settings_modal/admin_tabs/frontends_tab.vue
@@ -11,15 +11,17 @@
           <h3>{{ $t('admin_dash.frontend.default_frontend') }}</h3>
           <p>{{ $t('admin_dash.frontend.default_frontend_tip') }}</p>
           <p>{{ $t('admin_dash.frontend.default_frontend_tip2') }}</p>
-        </li>
-        <li>
-          <StringSetting path=":pleroma.:frontends.:primary.name"/>
-        </li>
-        <li>
-          <StringSetting path=":pleroma.:frontends.:primary.ref"/>
-        </li>
-        <li>
-          <GroupSetting path=":pleroma.:frontends.:primary" />
+          <ul class="setting-list">
+            <li>
+              <StringSetting path=":pleroma.:frontends.:primary.name"/>
+            </li>
+            <li>
+              <StringSetting path=":pleroma.:frontends.:primary.ref"/>
+            </li>
+            <li>
+              <GroupSetting path=":pleroma.:frontends.:primary" />
+            </li>
+          </ul>
         </li>
       </ul>
       <div class="setting-list">
@@ -77,7 +79,6 @@
                 <button
                   class="button button-default btn"
                   type="button"
-                  :title="$t('admin_dash.frontend.update')"
                   @click="update(frontend)"
                 >
                   {{
@@ -112,7 +113,7 @@
                     <button
                       class="button button-default btn dropdown-button"
                       type="button"
-                      :title="$t('admin_dash.frontend.update')"
+                      :title="$t('admin_dash.frontend.more_install_options')"
                     >
                       <FAIcon icon="chevron-down" />
                     </button>
@@ -120,7 +121,7 @@
                 </Popover>
               </span>
               <span
-                v-if="frontend.name !== 'admin-fe'"
+                v-if="frontend.installed && frontend.name !== 'admin-fe'"
                 class="btn-group"
               >
                 <button
@@ -130,7 +131,6 @@
                     adminDraft[':pleroma'][':frontends'][':primary'].name === frontend.name &&
                       adminDraft[':pleroma'][':frontends'][':primary'].ref === frontend.refs[0]
                   "
-                  :title="$t('admin_dash.frontend.update')"
                   @click="setDefault(frontend)"
                 >
                   {{
@@ -164,7 +164,7 @@
                     <button
                       class="button button-default btn dropdown-button"
                       type="button"
-                      :title="$t('admin_dash.frontend.update')"
+                      :title="$t('admin_dash.frontend.more_default_options')"
                     >
                       <FAIcon icon="chevron-down" />
                     </button>
diff --git a/src/components/settings_modal/admin_tabs/limits_tab.vue b/src/components/settings_modal/admin_tabs/limits_tab.vue
index 068f2cda..ef4b9271 100644
--- a/src/components/settings_modal/admin_tabs/limits_tab.vue
+++ b/src/components/settings_modal/admin_tabs/limits_tab.vue
@@ -5,118 +5,128 @@
       <ul class="setting-list">
         <li>
           <h3>{{ $t('admin_dash.limits.posts') }}</h3>
-        </li>
-        <li>
-          <IntegerSetting
-            source="admin"
-            path=":pleroma.:instance.:limit"
-            draft-mode
-          />
-        </li>
-        <li>
-          <IntegerSetting
-            source="admin"
-            path=":pleroma.:instance.:remote_limit"
-            expert="1"
-            draft-mode
-          />
+          <ul class="setting-list">
+            <li>
+              <IntegerSetting
+                source="admin"
+                path=":pleroma.:instance.:limit"
+                draft-mode
+              />
+            </li>
+            <li>
+              <IntegerSetting
+                source="admin"
+                path=":pleroma.:instance.:remote_limit"
+                expert="1"
+                draft-mode
+              />
+            </li>
+          </ul>
         </li>
         <li>
           <h3>{{ $t('admin_dash.limits.uploads') }}</h3>
-        </li>
-        <li>
-          <IntegerSetting
-            source="admin"
-            path=":pleroma.:instance.:description_limit"
-            draft-mode
-          />
-        </li>
-        <li>
-          <IntegerSetting
-            source="admin"
-            path=":pleroma.:instance.:upload_limit"
-            draft-mode
-          />
-        </li>
-        <li>
-          <IntegerSetting
-            source="admin"
-            path=":pleroma.:instance.:max_media_attachments"
-            draft-mode
-          />
+          <ul class="setting-list">
+            <li>
+              <IntegerSetting
+                source="admin"
+                path=":pleroma.:instance.:description_limit"
+                draft-mode
+              />
+            </li>
+            <li>
+              <IntegerSetting
+                source="admin"
+                path=":pleroma.:instance.:upload_limit"
+                draft-mode
+              />
+            </li>
+            <li>
+              <IntegerSetting
+                source="admin"
+                path=":pleroma.:instance.:max_media_attachments"
+                draft-mode
+              />
+            </li>
+          </ul>
         </li>
         <li>
           <h3>{{ $t('admin_dash.limits.users') }}</h3>
-        </li>
-        <li>
-          <IntegerSetting
-            source="admin"
-            path=":pleroma.:instance.:max_pinned_statuses"
-            draft-mode
-          />
-        </li>
-        <li>
-          <IntegerSetting
-            source="admin"
-            path=":pleroma.:instance.:user_bio_length"
-            draft-mode
-          />
-        </li>
-        <li>
-          <IntegerSetting
-            source="admin"
-            path=":pleroma.:instance.:user_name_length"
-            draft-mode
-          />
-        </li>
-        <li>
-          <h4>{{ $t('admin_dash.limits.profile_fields') }}</h4>
-        </li>
-        <li>
-          <IntegerSetting
-            source="admin"
-            path=":pleroma.:instance.:max_account_fields"
-            draft-mode
-          />
-        </li>
-        <li>
-          <IntegerSetting
-            source="admin"
-            path=":pleroma.:instance.:max_remote_account_fields"
-            draft-mode
-            expert="1"
-          />
-        </li>
-        <li>
-          <IntegerSetting
-            source="admin"
-            path=":pleroma.:instance.:account_field_name_length"
-            draft-mode
-          />
-        </li>
-        <li>
-          <IntegerSetting
-            source="admin"
-            path=":pleroma.:instance.:account_field_value_length"
-            draft-mode
-          />
-        </li>
-        <li>
-          <h4>{{ $t('admin_dash.limits.user_uploads') }}</h4>
-        </li>
-        <li>
-          <IntegerSetting
-            source="admin"
-            path=":pleroma.:instance.:avatar_upload_limit"
-            draft-mode
-          />
-        </li>
-        <li>
-          <IntegerSetting
-            source="admin"
-            path=":pleroma.:instance.:banner_upload_limit"
-            draft-mode
-          />
+          <ul class="setting-list">
+            <li>
+              <IntegerSetting
+                source="admin"
+                path=":pleroma.:instance.:max_pinned_statuses"
+                draft-mode
+              />
+            </li>
+            <li>
+              <IntegerSetting
+                source="admin"
+                path=":pleroma.:instance.:user_bio_length"
+                draft-mode
+              />
+            </li>
+            <li>
+              <IntegerSetting
+                source="admin"
+                path=":pleroma.:instance.:user_name_length"
+                draft-mode
+              />
+            </li>
+            <li>
+              <h4>{{ $t('admin_dash.limits.profile_fields') }}</h4>
+              <ul class="setting-list">
+                <li>
+                  <IntegerSetting
+                    source="admin"
+                    path=":pleroma.:instance.:max_account_fields"
+                    draft-mode
+                  />
+                </li>
+                <li>
+                  <IntegerSetting
+                    source="admin"
+                    path=":pleroma.:instance.:max_remote_account_fields"
+                    draft-mode
+                    expert="1"
+                  />
+                </li>
+                <li>
+                  <IntegerSetting
+                    source="admin"
+                    path=":pleroma.:instance.:account_field_name_length"
+                    draft-mode
+                  />
+                </li>
+                <li>
+                  <IntegerSetting
+                    source="admin"
+                    path=":pleroma.:instance.:account_field_value_length"
+                    draft-mode
+                  />
+                </li>
+              </ul>
+            </li>
+            <li>
+              <h4>{{ $t('admin_dash.limits.user_uploads') }}</h4>
+              <ul class="setting-list">
+                <li>
+                  <IntegerSetting
+                    source="admin"
+                    path=":pleroma.:instance.:avatar_upload_limit"
+                    draft-mode
+                  />
+                </li>
+                <li>
+                  <IntegerSetting
+                    source="admin"
+                    path=":pleroma.:instance.:banner_upload_limit"
+                    draft-mode
+                  />
+                </li>
+              </ul>
+            </li>
+          </ul>
         </li>
       </ul>
     </div>
-- 
cgit v1.2.3-70-g09d2


From 05a7e612aa6d9f2a44eea22266b325933da6f5ad Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 8 May 2023 21:10:06 +0300
Subject: show warning for developer for missing labels

---
 .../settings_modal/helpers/attachment_setting.vue        |  5 +++--
 .../settings_modal/helpers/boolean_setting.vue           | 16 +++++++++++++---
 src/components/settings_modal/helpers/number_setting.vue |  5 +++--
 src/components/settings_modal/helpers/string_setting.vue |  5 +++--
 4 files changed, 22 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/components/settings_modal/helpers/attachment_setting.vue b/src/components/settings_modal/helpers/attachment_setting.vue
index 0bede2c2..447fa172 100644
--- a/src/components/settings_modal/helpers/attachment_setting.vue
+++ b/src/components/settings_modal/helpers/attachment_setting.vue
@@ -10,9 +10,10 @@
       <template v-if="backendDescriptionLabel">
         {{ backendDescriptionLabel + ' ' }}
       </template>
-      <template v-else>
-        <slot />
+      <template v-else-if="source === 'admin'">
+        MISSING LABEL FOR {{ path }}
       </template>
+      <slot v-else />
 
     </label>
     <p
diff --git a/src/components/settings_modal/helpers/boolean_setting.vue b/src/components/settings_modal/helpers/boolean_setting.vue
index 3089c3b3..5ddf5aad 100644
--- a/src/components/settings_modal/helpers/boolean_setting.vue
+++ b/src/components/settings_modal/helpers/boolean_setting.vue
@@ -10,16 +10,16 @@
       @update:modelValue="update"
     >
       <span
-        v-if="!!$slots.default"
         class="label"
         :class="{ 'faint': shouldBeDisabled }"
       >
         <template v-if="backendDescriptionLabel">
           {{ backendDescriptionLabel }}
         </template>
-        <template v-else>
-          <slot />
+        <template v-else-if="source === 'admin'">
+          MISSING LABEL FOR {{ path }}
         </template>
+        <slot v-else />
       </span>
     </Checkbox>
     <ModifiedIndicator
@@ -35,6 +35,16 @@
     >
       {{ backendDescriptionDescription + ' ' }}
     </p>
+    <!-- debugging -->
+    <!--
+    <p
+      v-else
+      class="setting-description"
+      :class="{ 'faint': shouldBeDisabled }"
+    >
+      MISSING DESCRIPTION FOR {{ path }}
+    </p>
+    -->
   </label>
 </template>
 
diff --git a/src/components/settings_modal/helpers/number_setting.vue b/src/components/settings_modal/helpers/number_setting.vue
index 065cfbcf..93f11331 100644
--- a/src/components/settings_modal/helpers/number_setting.vue
+++ b/src/components/settings_modal/helpers/number_setting.vue
@@ -10,9 +10,10 @@
       <template v-if="backendDescriptionLabel">
         {{ backendDescriptionLabel + ' ' }}
       </template>
-      <template v-else>
-        <slot />
+      <template v-else-if="source === 'admin'">
+        MISSING LABEL FOR {{ path }}
       </template>
+      <slot v-else />
     </label>
     <input
       :id="path"
diff --git a/src/components/settings_modal/helpers/string_setting.vue b/src/components/settings_modal/helpers/string_setting.vue
index 9de99d78..0cfa61ce 100644
--- a/src/components/settings_modal/helpers/string_setting.vue
+++ b/src/components/settings_modal/helpers/string_setting.vue
@@ -10,9 +10,10 @@
       <template v-if="backendDescriptionLabel">
         {{ backendDescriptionLabel + ' ' }}
       </template>
-      <template v-else>
-        <slot />
+      <template v-else-if="source === 'admin'">
+        MISSING LABEL FOR {{ path }}
       </template>
+      <slot v-else />
     </label>
     <input
       :id="path"
-- 
cgit v1.2.3-70-g09d2


From 0f812394515c2dd428e3889a924df2885bdf44f1 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 8 May 2023 21:11:48 +0300
Subject: remove restriction on number input's width

---
 src/components/settings_modal/settings_modal_admin_content.scss | 4 ----
 src/components/settings_modal/settings_modal_user_content.scss  | 4 ----
 2 files changed, 8 deletions(-)

(limited to 'src')

diff --git a/src/components/settings_modal/settings_modal_admin_content.scss b/src/components/settings_modal/settings_modal_admin_content.scss
index 87df7982..c984d703 100644
--- a/src/components/settings_modal/settings_modal_admin_content.scss
+++ b/src/components/settings_modal/settings_modal_admin_content.scss
@@ -48,9 +48,5 @@
       color: var(--cRed, $fallback--cRed);
       color: $fallback--cRed;
     }
-
-    .number-input {
-      max-width: 6em;
-    }
   }
 }
diff --git a/src/components/settings_modal/settings_modal_user_content.scss b/src/components/settings_modal/settings_modal_user_content.scss
index 87df7982..c984d703 100644
--- a/src/components/settings_modal/settings_modal_user_content.scss
+++ b/src/components/settings_modal/settings_modal_user_content.scss
@@ -48,9 +48,5 @@
       color: var(--cRed, $fallback--cRed);
       color: $fallback--cRed;
     }
-
-    .number-input {
-      max-width: 6em;
-    }
   }
 }
-- 
cgit v1.2.3-70-g09d2


From 2322646442365b0575393a897098a90c3bdc961f Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 8 May 2023 21:13:07 +0300
Subject: reintroduce width limit on number input but only for sizesetting

---
 .../settings_modal/helpers/size_setting.vue           | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/components/settings_modal/helpers/size_setting.vue b/src/components/settings_modal/helpers/size_setting.vue
index 5a78f100..6c3fbaeb 100644
--- a/src/components/settings_modal/helpers/size_setting.vue
+++ b/src/components/settings_modal/helpers/size_setting.vue
@@ -45,11 +45,18 @@
 <script src="./size_setting.js"></script>
 
 <style lang="scss">
-.css-unit-input,
-.css-unit-input select {
-  margin-left: 0.5em;
-  width: 4em;
-  max-width: 4em;
-  min-width: 4em;
+.SizeSetting {
+  .number-input {
+    max-width: 6.5em;
+  }
+
+  .css-unit-input,
+  .css-unit-input select {
+    margin-left: 0.5em;
+    width: 4em;
+    max-width: 4em;
+    min-width: 4em;
+  }
 }
+
 </style>
-- 
cgit v1.2.3-70-g09d2


From 09e3735e375b9b8248d9aa1153d065a118abca58 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 8 May 2023 21:36:18 +0300
Subject: semantics + description for instance access section

---
 .../settings_modal/admin_tabs/instance_tab.vue     | 206 ++++++++++++---------
 src/i18n/en.json                                   |  11 +-
 2 files changed, 124 insertions(+), 93 deletions(-)

(limited to 'src')

diff --git a/src/components/settings_modal/admin_tabs/instance_tab.vue b/src/components/settings_modal/admin_tabs/instance_tab.vue
index d537adb6..a7ef0f68 100644
--- a/src/components/settings_modal/admin_tabs/instance_tab.vue
+++ b/src/components/settings_modal/admin_tabs/instance_tab.vue
@@ -57,32 +57,35 @@
         </li>
         <li>
           <h3>{{ $t('admin_dash.instance.captcha_header') }}</h3>
-        </li>
-        <li>
-          <BooleanSetting :path="[':pleroma', 'Pleroma.Captcha', ':enabled']"/>
-          <ul class="setting-list suboptions">
+          <ul class="setting-list">
             <li>
-              <ChoiceSetting
-                :path="[':pleroma', 'Pleroma.Captcha', ':method']"
-                :parent-path="[':pleroma', 'Pleroma.Captcha', ':enabled']"
-                :option-label-map="{
-                  'Pleroma.Captcha.Native': $t('admin_dash.captcha.native'),
-                  'Pleroma.Captcha.Kocaptcha': $t('admin_dash.captcha.kocaptcha')
-                }"
-              />
-              <IntegerSetting
-                :path="[':pleroma', 'Pleroma.Captcha', ':seconds_valid']"
-                :parent-path="[':pleroma', 'Pleroma.Captcha', ':enabled']"
-              />
-            </li>
-          </ul>
-          <ul
-            v-if="adminDraft[':pleroma']['Pleroma.Captcha'][':enabled'] && adminDraft[':pleroma']['Pleroma.Captcha'][':method'] === 'Pleroma.Captcha.Kocaptcha'"
-            class="setting-list suboptions"
-          >
-            <h4>{{ $t('admin_dash.instance.kocaptcha') }}</h4>
-            <li>
-              <StringSetting :path="[':pleroma', 'Pleroma.Captcha.Kocaptcha', ':endpoint']"/>
+              <BooleanSetting :path="[':pleroma', 'Pleroma.Captcha', ':enabled']"/>
+              <ul class="setting-list suboptions">
+                <li>
+                  <ChoiceSetting
+                    :path="[':pleroma', 'Pleroma.Captcha', ':method']"
+                    :parent-path="[':pleroma', 'Pleroma.Captcha', ':enabled']"
+                    :option-label-map="{
+                      'Pleroma.Captcha.Native': $t('admin_dash.captcha.native'),
+                      'Pleroma.Captcha.Kocaptcha': $t('admin_dash.captcha.kocaptcha')
+                    }"
+                  />
+                  <IntegerSetting
+                    :path="[':pleroma', 'Pleroma.Captcha', ':seconds_valid']"
+                    :parent-path="[':pleroma', 'Pleroma.Captcha', ':enabled']"
+                  />
+                </li>
+                <li
+                  v-if="adminDraft[':pleroma']['Pleroma.Captcha'][':enabled'] && adminDraft[':pleroma']['Pleroma.Captcha'][':method'] === 'Pleroma.Captcha.Kocaptcha'"
+                >
+                  <h4>{{ $t('admin_dash.instance.kocaptcha') }}</h4>
+                  <ul class="setting-list">
+                    <li>
+                      <StringSetting :path="[':pleroma', 'Pleroma.Captcha.Kocaptcha', ':endpoint']"/>
+                    </li>
+                  </ul>
+                </li>
+              </ul>
             </li>
           </ul>
         </li>
@@ -91,80 +94,99 @@
     <div class="setting-item">
       <h2>{{ $t('admin_dash.instance.access') }}</h2>
       <ul class="setting-list">
-        <li>
-          <BooleanSetting path=":pleroma.:instance.:public"/>
-        </li>
-        <li>
-          <h3>{{ $t('admin_dash.instance.restrict.header') }}</h3>
-        </li>
-        <li>
-          <ChoiceSetting path=":pleroma.:instance.:limit_to_local_content"/>
-        </li>
-        <li>
-          <h4>{{ $t('admin_dash.instance.restrict.timelines') }}</h4>
-        </li>
-        <li>
-          <BooleanSetting
-            path=":pleroma.:restrict_unauthenticated.:timelines.:local"
-            indeterminate-state=":if_instance_is_private"
-            swap-description-and-label
-            hide-description
-          />
-        </li>
-        <li>
-          <BooleanSetting
-            path=":pleroma.:restrict_unauthenticated.:timelines.:federated"
-            indeterminate-state=":if_instance_is_private"
-            swap-description-and-label
-            hide-description
-          />
-        </li>
-        <li>
-          <GroupSetting path=":pleroma.:restrict_unauthenticated.:timelines"/>
-        </li>
-        <li>
-          <h4>{{ $t('admin_dash.instance.restrict.profiles') }}</h4>
-        </li>
-        <li>
-          <BooleanSetting
-            path=":pleroma.:restrict_unauthenticated.:profiles.:local"
-            indeterminate-state=":if_instance_is_private"
-            swap-description-and-label
-            hide-description
-          />
-        </li>
-        <li>
-          <BooleanSetting
-            path=":pleroma.:restrict_unauthenticated.:profiles.:remote"
-            indeterminate-state=":if_instance_is_private"
-            swap-description-and-label
-            hide-description
-          />
-        </li>
-        <li>
-          <GroupSetting path=":pleroma.:restrict_unauthenticated.:profiles"/>
-        </li>
-        <li>
-          <h4>{{ $t('admin_dash.instance.restrict.activities') }}</h4>
-        </li>
         <li>
           <BooleanSetting
-            path=":pleroma.:restrict_unauthenticated.:activities.:local"
-            indeterminate-state=":if_instance_is_private"
-            swap-description-and-label
-            hide-description
-          />
+            override-backend-description
+            override-backend-description-label
+            path=":pleroma.:instance.:public"
+            />
         </li>
         <li>
-          <BooleanSetting
-            path=":pleroma.:restrict_unauthenticated.:activities.:remote"
-            indeterminate-state=":if_instance_is_private"
-            swap-description-and-label
-            hide-description
+          <ChoiceSetting
+            override-backend-description
+            override-backend-description-label
+            path=":pleroma.:instance.:limit_to_local_content"
           />
         </li>
         <li>
-          <GroupSetting path=":pleroma.:restrict_unauthenticated.:activities"/>
+          <h3>{{ $t('admin_dash.instance.restrict.header') }}</h3>
+          <p>
+            {{ $t('admin_dash.instance.restrict.description') }}
+          </p>
+          <ul class="setting-list">
+            <li>
+              <h4>{{ $t('admin_dash.instance.restrict.timelines') }}</h4>
+              <ul class="setting-list">
+                <li>
+                  <BooleanSetting
+                    path=":pleroma.:restrict_unauthenticated.:timelines.:local"
+                    indeterminate-state=":if_instance_is_private"
+                    swap-description-and-label
+                    hide-description
+                    />
+                </li>
+                <li>
+                  <BooleanSetting
+                    path=":pleroma.:restrict_unauthenticated.:timelines.:federated"
+                    indeterminate-state=":if_instance_is_private"
+                    swap-description-and-label
+                    hide-description
+                    />
+                </li>
+                <li>
+                  <GroupSetting path=":pleroma.:restrict_unauthenticated.:timelines"/>
+                </li>
+              </ul>
+            </li>
+            <li>
+              <h4>{{ $t('admin_dash.instance.restrict.profiles') }}</h4>
+              <ul class="setting-list">
+                <li>
+                  <BooleanSetting
+                    path=":pleroma.:restrict_unauthenticated.:profiles.:local"
+                    indeterminate-state=":if_instance_is_private"
+                    swap-description-and-label
+                    hide-description
+                    />
+                </li>
+                <li>
+                  <BooleanSetting
+                    path=":pleroma.:restrict_unauthenticated.:profiles.:remote"
+                    indeterminate-state=":if_instance_is_private"
+                    swap-description-and-label
+                    hide-description
+                    />
+                </li>
+                <li>
+                  <GroupSetting path=":pleroma.:restrict_unauthenticated.:profiles"/>
+                </li>
+              </ul>
+            </li>
+            <li>
+              <h4>{{ $t('admin_dash.instance.restrict.activities') }}</h4>
+              <ul class="setting-list">
+                <li>
+                  <BooleanSetting
+                    path=":pleroma.:restrict_unauthenticated.:activities.:local"
+                    indeterminate-state=":if_instance_is_private"
+                    swap-description-and-label
+                    hide-description
+                    />
+                </li>
+                <li>
+                  <BooleanSetting
+                    path=":pleroma.:restrict_unauthenticated.:activities.:remote"
+                    indeterminate-state=":if_instance_is_private"
+                    swap-description-and-label
+                    hide-description
+                    />
+                </li>
+                <li>
+                  <GroupSetting path=":pleroma.:restrict_unauthenticated.:activities"/>
+                </li>
+              </ul>
+            </li>
+          </ul>
         </li>
       </ul>
     </div>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 072ce952..33f48225 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -869,7 +869,8 @@
       "kocaptcha": "KoCaptcha settings",
       "access": "Instance access",
       "restrict": {
-        "header": "Restrict access",
+        "header": "Restrict access for anonymous visitors",
+        "description": "Detailed setting for allowing/disallowing access to certain aspects of API. By default (indeterminate state) it will disallow if instance is not public, ticked checkbox means disallow access even if instance is public, unticked means allow access even if instance is private. Please note that unexpected behavior might happen if some settings are set, i.e. if profile access is disabled posts will show without profile information.",
         "timelines": "Timelines access",
         "profiles": "User profiles access",
         "activities": "Statues/activities access"
@@ -905,6 +906,14 @@
     "temp_overrides": {
       ":pleroma": {
         ":instance": {
+          ":public": {
+            "label": "Instance is public",
+            "description": "Disabling this will make all API accessible only for logged-in users, this will make Public and Federated timelines inaccessible to anonymous visitors."
+          },
+          ":limit_to_local_content": {
+            "label": "Limit search to local content",
+            "description": "Disables global network search for unauthenticated (default), all users or none"
+          },
           ":description_limit": {
             "label": "Limit",
             "description": "Character limit for attachment descriptions"
-- 
cgit v1.2.3-70-g09d2


From 039b6c61a2ac0c64b1d24295374401f8bf56af0a Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 8 May 2023 21:37:29 +0300
Subject: lint

---
 .../settings_modal/admin_tabs/frontends_tab.vue    |  4 +-
 .../settings_modal/admin_tabs/instance_tab.vue     | 44 +++++++++++-----------
 2 files changed, 24 insertions(+), 24 deletions(-)

(limited to 'src')

diff --git a/src/components/settings_modal/admin_tabs/frontends_tab.vue b/src/components/settings_modal/admin_tabs/frontends_tab.vue
index f09e6a80..13b8fa6b 100644
--- a/src/components/settings_modal/admin_tabs/frontends_tab.vue
+++ b/src/components/settings_modal/admin_tabs/frontends_tab.vue
@@ -13,10 +13,10 @@
           <p>{{ $t('admin_dash.frontend.default_frontend_tip2') }}</p>
           <ul class="setting-list">
             <li>
-              <StringSetting path=":pleroma.:frontends.:primary.name"/>
+              <StringSetting path=":pleroma.:frontends.:primary.name" />
             </li>
             <li>
-              <StringSetting path=":pleroma.:frontends.:primary.ref"/>
+              <StringSetting path=":pleroma.:frontends.:primary.ref" />
             </li>
             <li>
               <GroupSetting path=":pleroma.:frontends.:primary" />
diff --git a/src/components/settings_modal/admin_tabs/instance_tab.vue b/src/components/settings_modal/admin_tabs/instance_tab.vue
index a7ef0f68..cbc578f1 100644
--- a/src/components/settings_modal/admin_tabs/instance_tab.vue
+++ b/src/components/settings_modal/admin_tabs/instance_tab.vue
@@ -4,22 +4,22 @@
       <h2>{{ $t('admin_dash.instance.instance') }}</h2>
       <ul class="setting-list">
         <li>
-          <StringSetting path=":pleroma.:instance.:name"/>
+          <StringSetting path=":pleroma.:instance.:name" />
         </li>
         <li>
-          <StringSetting path=":pleroma.:instance.:email"/>
+          <StringSetting path=":pleroma.:instance.:email" />
         </li>
         <li>
-          <StringSetting path=":pleroma.:instance.:description"/>
+          <StringSetting path=":pleroma.:instance.:description" />
         </li>
         <li>
-          <StringSetting path=":pleroma.:instance.:short_description"/>
+          <StringSetting path=":pleroma.:instance.:short_description" />
         </li>
         <li>
-          <AttachmentSetting path=":pleroma.:instance.:instance_thumbnail"/>
+          <AttachmentSetting path=":pleroma.:instance.:instance_thumbnail" />
         </li>
         <li>
-          <AttachmentSetting path=":pleroma.:instance.:background_image"/>
+          <AttachmentSetting path=":pleroma.:instance.:background_image" />
         </li>
       </ul>
     </div>
@@ -27,7 +27,7 @@
       <h2>{{ $t('admin_dash.instance.registrations') }}</h2>
       <ul class="setting-list">
         <li>
-          <BooleanSetting path=":pleroma.:instance.:registrations_open"/>
+          <BooleanSetting path=":pleroma.:instance.:registrations_open" />
           <ul class="setting-list suboptions">
             <li>
               <BooleanSetting
@@ -39,7 +39,7 @@
           </ul>
         </li>
         <li>
-          <BooleanSetting path=":pleroma.:instance.:birthday_required"/>
+          <BooleanSetting path=":pleroma.:instance.:birthday_required" />
           <ul class="setting-list suboptions">
             <li>
               <IntegerSetting
@@ -50,16 +50,16 @@
           </ul>
         </li>
         <li>
-          <BooleanSetting path=":pleroma.:instance.:account_activation_required"/>
+          <BooleanSetting path=":pleroma.:instance.:account_activation_required" />
         </li>
         <li>
-          <BooleanSetting path=":pleroma.:instance.:account_approval_required"/>
+          <BooleanSetting path=":pleroma.:instance.:account_approval_required" />
         </li>
         <li>
           <h3>{{ $t('admin_dash.instance.captcha_header') }}</h3>
           <ul class="setting-list">
             <li>
-              <BooleanSetting :path="[':pleroma', 'Pleroma.Captcha', ':enabled']"/>
+              <BooleanSetting :path="[':pleroma', 'Pleroma.Captcha', ':enabled']" />
               <ul class="setting-list suboptions">
                 <li>
                   <ChoiceSetting
@@ -81,7 +81,7 @@
                   <h4>{{ $t('admin_dash.instance.kocaptcha') }}</h4>
                   <ul class="setting-list">
                     <li>
-                      <StringSetting :path="[':pleroma', 'Pleroma.Captcha.Kocaptcha', ':endpoint']"/>
+                      <StringSetting :path="[':pleroma', 'Pleroma.Captcha.Kocaptcha', ':endpoint']" />
                     </li>
                   </ul>
                 </li>
@@ -99,7 +99,7 @@
             override-backend-description
             override-backend-description-label
             path=":pleroma.:instance.:public"
-            />
+          />
         </li>
         <li>
           <ChoiceSetting
@@ -123,7 +123,7 @@
                     indeterminate-state=":if_instance_is_private"
                     swap-description-and-label
                     hide-description
-                    />
+                  />
                 </li>
                 <li>
                   <BooleanSetting
@@ -131,10 +131,10 @@
                     indeterminate-state=":if_instance_is_private"
                     swap-description-and-label
                     hide-description
-                    />
+                  />
                 </li>
                 <li>
-                  <GroupSetting path=":pleroma.:restrict_unauthenticated.:timelines"/>
+                  <GroupSetting path=":pleroma.:restrict_unauthenticated.:timelines" />
                 </li>
               </ul>
             </li>
@@ -147,7 +147,7 @@
                     indeterminate-state=":if_instance_is_private"
                     swap-description-and-label
                     hide-description
-                    />
+                  />
                 </li>
                 <li>
                   <BooleanSetting
@@ -155,10 +155,10 @@
                     indeterminate-state=":if_instance_is_private"
                     swap-description-and-label
                     hide-description
-                    />
+                  />
                 </li>
                 <li>
-                  <GroupSetting path=":pleroma.:restrict_unauthenticated.:profiles"/>
+                  <GroupSetting path=":pleroma.:restrict_unauthenticated.:profiles" />
                 </li>
               </ul>
             </li>
@@ -171,7 +171,7 @@
                     indeterminate-state=":if_instance_is_private"
                     swap-description-and-label
                     hide-description
-                    />
+                  />
                 </li>
                 <li>
                   <BooleanSetting
@@ -179,10 +179,10 @@
                     indeterminate-state=":if_instance_is_private"
                     swap-description-and-label
                     hide-description
-                    />
+                  />
                 </li>
                 <li>
-                  <GroupSetting path=":pleroma.:restrict_unauthenticated.:activities"/>
+                  <GroupSetting path=":pleroma.:restrict_unauthenticated.:activities" />
                 </li>
               </ul>
             </li>
-- 
cgit v1.2.3-70-g09d2


From b79f297692eeca5e774a1dd124cec2b3bc41b977 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 8 May 2023 22:04:05 +0300
Subject: fix double pushbuttons in the draft buttons

---
 src/components/popover/popover.js                  |  3 ++
 src/components/popover/popover.vue                 |  3 +-
 .../settings_modal/helpers/draft_buttons.vue       | 40 +++++++---------------
 3 files changed, 18 insertions(+), 28 deletions(-)

(limited to 'src')

diff --git a/src/components/popover/popover.js b/src/components/popover/popover.js
index d44b266b..bc078533 100644
--- a/src/components/popover/popover.js
+++ b/src/components/popover/popover.js
@@ -45,6 +45,9 @@ const Popover = {
     // Lets hover popover stay when clicking inside of it
     stayOnClick: Boolean,
 
+    // Use styled button (to avoid nested buttons)
+    normalButton: Boolean,
+
     triggerAttrs: {
       type: Object,
       default: {}
diff --git a/src/components/popover/popover.vue b/src/components/popover/popover.vue
index fd0fd821..1a4bffd9 100644
--- a/src/components/popover/popover.vue
+++ b/src/components/popover/popover.vue
@@ -5,7 +5,8 @@
   >
     <button
       ref="trigger"
-      class="button-unstyled popover-trigger-button"
+      class="popover-trigger-button"
+      :class="normalButton ? 'button-default btn' : 'button-unstyled'"
       type="button"
       v-bind="triggerAttrs"
       @click="onClick"
diff --git a/src/components/settings_modal/helpers/draft_buttons.vue b/src/components/settings_modal/helpers/draft_buttons.vue
index 80da92e8..fd6d50e3 100644
--- a/src/components/settings_modal/helpers/draft_buttons.vue
+++ b/src/components/settings_modal/helpers/draft_buttons.vue
@@ -7,18 +7,12 @@
     <Popover
       v-if="$parent.isDirty"
       trigger="hover"
+      normal-button
+      @click="$parent.commitDraft"
       :trigger-attrs="{ 'aria-label': $t('settings.commit_value_tooltip') }"
     >
       <template #trigger>
-        &nbsp;
-        <button
-          class="button button-default btn"
-          type="button"
-          :title="$t('settings.commit_value')"
-          @click="$parent.commitDraft"
-        >
-          {{ $t('settings.commit_value') }}
-        </button>
+        {{ $t('settings.commit_value') }}
       </template>
       <template #content>
         <div class="modified-tooltip">
@@ -29,18 +23,12 @@
     <Popover
       v-if="$parent.isDirty"
       trigger="hover"
+      normal-button
       :trigger-attrs="{ 'aria-label': $t('settings.reset_value_tooltip') }"
+      @click="$parent.reset"
     >
       <template #trigger>
-        &nbsp;
-        <button
-          class="button button-default btn"
-          type="button"
-          :title="$t('settings.reset_value')"
-          @click="$parent.reset"
-        >
-          {{ $t('settings.reset_value') }}
-        </button>
+        {{ $t('settings.reset_value') }}
       </template>
       <template #content>
         <div class="modified-tooltip">
@@ -51,18 +39,12 @@
     <Popover
       v-if="$parent.canHardReset"
       trigger="hover"
+      normal-button
+      @click="$parent.hardReset"
       :trigger-attrs="{ 'aria-label': $t('settings.hard_reset_value_tooltip') }"
     >
       <template #trigger>
-        &nbsp;
-        <button
-          class="button button-default btn"
-          type="button"
-          :title="$t('settings.hard_reset_value')"
-          @click="$parent.hardReset"
-        >
-          {{ $t('settings.hard_reset_value') }}
-        </button>
+        {{ $t('settings.hard_reset_value') }}
       </template>
       <template #content>
         <div class="modified-tooltip">
@@ -92,6 +74,10 @@ export default {
 .DraftButtons {
   display: inline-block;
   position: relative;
+
+  .button-default {
+    margin-left: 0.5em;
+  }
 }
 
 .draft-tooltip {
-- 
cgit v1.2.3-70-g09d2


From ad3916027a1994cbc2a5a7b6c35576ef7a971c12 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 8 May 2023 22:14:49 +0300
Subject: lint

---
 src/components/settings_modal/helpers/draft_buttons.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/components/settings_modal/helpers/draft_buttons.vue b/src/components/settings_modal/helpers/draft_buttons.vue
index fd6d50e3..46a70e86 100644
--- a/src/components/settings_modal/helpers/draft_buttons.vue
+++ b/src/components/settings_modal/helpers/draft_buttons.vue
@@ -8,8 +8,8 @@
       v-if="$parent.isDirty"
       trigger="hover"
       normal-button
-      @click="$parent.commitDraft"
       :trigger-attrs="{ 'aria-label': $t('settings.commit_value_tooltip') }"
+      @click="$parent.commitDraft"
     >
       <template #trigger>
         {{ $t('settings.commit_value') }}
@@ -40,8 +40,8 @@
       v-if="$parent.canHardReset"
       trigger="hover"
       normal-button
-      @click="$parent.hardReset"
       :trigger-attrs="{ 'aria-label': $t('settings.hard_reset_value_tooltip') }"
+      @click="$parent.hardReset"
     >
       <template #trigger>
         {{ $t('settings.hard_reset_value') }}
-- 
cgit v1.2.3-70-g09d2


From 4664d99af26bfebadf70be740abfd49acc045897 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 9 May 2023 23:29:30 +0300
Subject: lint

---
 src/components/settings_modal/helpers/attachment_setting.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/components/settings_modal/helpers/attachment_setting.vue b/src/components/settings_modal/helpers/attachment_setting.vue
index 447fa172..bbc5172c 100644
--- a/src/components/settings_modal/helpers/attachment_setting.vue
+++ b/src/components/settings_modal/helpers/attachment_setting.vue
@@ -87,7 +87,8 @@
   .controls {
     margin-bottom: 0.5em;
 
-    input, button {
+    input,
+    button {
       width: 100%;
     }
   }
-- 
cgit v1.2.3-70-g09d2


From 4b38fc5ffcad8fe9cce81a64d418c41480d6a97f Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Fri, 12 May 2023 09:57:22 -0400
Subject: Fix custom emojis shown in selector if backend does not support it

---
 src/components/react_button/react_button.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/components/react_button/react_button.js b/src/components/react_button/react_button.js
index 8eed4b60..0d252155 100644
--- a/src/components/react_button/react_button.js
+++ b/src/components/react_button/react_button.js
@@ -46,7 +46,7 @@ const ReactButton = {
   },
   computed: {
     hideCustomEmoji () {
-      return !this.$store.state.instance.pleromaChatMessagesAvailable
+      return !this.$store.state.instance.pleromaCustomEmojiReactionsAvailable
     }
   }
 }
-- 
cgit v1.2.3-70-g09d2


From 2e5412fbd8b0450d641c4762cbd3062bec81ae2a Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Sat, 8 Apr 2023 20:42:21 +0000
Subject: Translated using Weblate (Esperanto)

Currently translated at 98.0% (969 of 988 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/eo/
---
 src/i18n/eo.json | 88 +++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 77 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/i18n/eo.json b/src/i18n/eo.json
index e013edee..ce4e833b 100644
--- a/src/i18n/eo.json
+++ b/src/i18n/eo.json
@@ -55,8 +55,8 @@
     "undo": "Malfari",
     "yes": "Jes",
     "no": "Ne",
-    "unpin": "Malfiksi eron",
-    "pin": "Fiksi eron",
+    "unpin": "Malfiksi",
+    "pin": "Fiksi",
     "scroll_to_top": "Rulumi supren"
   },
   "image_cropper": {
@@ -81,7 +81,11 @@
     "recovery_code": "Rehava kodo",
     "enter_two_factor_code": "Enigu kodon de duobla aŭtentikigo",
     "enter_recovery_code": "Enigu rehavan kodon",
-    "authentication_code": "Aŭtentikiga kodo"
+    "authentication_code": "Aŭtentikiga kodo",
+    "logout_confirm_title": "Konfirmo de adiaŭo",
+    "logout_confirm": "Ĉu vi certe volas adiaŭi?",
+    "logout_confirm_accept_button": "Adiaŭi",
+    "logout_confirm_cancel_button": "Ne adiaŭi"
   },
   "media_modal": {
     "previous": "Antaŭa",
@@ -115,7 +119,9 @@
     "edit_finish": "Fini redakton",
     "mobile_notifications": "Malfermi sciigojn (estas nelegitaj)",
     "mobile_notifications_close": "Fermi sciigojn",
-    "announcements": "Anoncoj"
+    "announcements": "Anoncoj",
+    "search_close": "Fermi serĉujon",
+    "mobile_sidebar": "(Mal)ŝalti flankan breton por telefonoj"
   },
   "notifications": {
     "broken_favorite": "Nekonata afiŝo, serĉante ĝin…",
@@ -189,14 +195,18 @@
       "email_required": "ne povas resti malplena",
       "password_required": "ne povas resti malplena",
       "password_confirmation_required": "ne povas resti malplena",
-      "password_confirmation_match": "samu la pasvorton"
+      "password_confirmation_match": "samu la pasvorton",
+      "birthday_min_age": "ne povas esti post {date}",
+      "birthday_required": "ne povas resti malplena"
     },
     "reason_placeholder": "Ĉi-node oni aprobas registriĝojn permane.\nSciigu la administrantojn kial vi volas registriĝi.",
     "reason": "Kialo registriĝi",
     "register": "Registriĝi",
     "bio_optional": "Prio (malnepra)",
     "email_optional": "Retpoŝtadreso (malnepra)",
-    "email_language": "En kiu lingvo vi volus ricevi retleterojn de la servilo?"
+    "email_language": "En kiu lingvo vi volus ricevi retleterojn de la servilo?",
+    "birthday": "Naskiĝtago:",
+    "birthday_optional": "Naskiĝtago (malnepra):"
   },
   "settings": {
     "app_name": "Nomo de aplikaĵo",
@@ -666,7 +676,28 @@
     "user_popover_avatar_overlay": "Aperigi ŝprucaĵon pri uzanto sur profilbildo",
     "show_yous": "Montri la markon «(Vi)»",
     "user_popover_avatar_action_zoom": "Zomi la profilbildon",
-    "third_column_mode": "Kun sufiĉo da spaco, montri trian kolumnon kun"
+    "third_column_mode": "Kun sufiĉo da spaco, montri trian kolumnon kun",
+    "birthday": {
+      "show_birthday": "Montri mian naskiĝtagon",
+      "label": "Naskiĝtago"
+    },
+    "confirm_dialogs_delete": "forigo de afiŝo",
+    "backup_running": "Ĉi tiu savkopiado progresas, traktis {number} datumon. | Ĉi tiu savkopiado progresas, traktis {number} datumojn.",
+    "backup_failed": "Ĉi tiu savkopiado malsukcesis.",
+    "autocomplete_select_first": "Memage elekti unuan kandidaton kiam rezultoj de memaga konjektado disponeblas",
+    "confirm_dialogs_logout": "adiaŭo",
+    "user_popover_avatar_action": "Post klako sur profilbildon en ŝprucaĵo",
+    "remove_language": "Forigi",
+    "primary_language": "Ĉefa lingvo:",
+    "confirm_dialogs": "Peti konfirmon je",
+    "confirm_dialogs_repeat": "ripeto de afiŝo",
+    "confirm_dialogs_unfollow": "malabono de uzanto",
+    "confirm_dialogs_block": "blokado de uzanto",
+    "confirm_dialogs_mute": "silentigo de uzanto",
+    "confirm_dialogs_approve_follow": "aprobo de abonanto",
+    "confirm_dialogs_deny_follow": "malaprobo de abonanto",
+    "confirm_dialogs_remove_follower": "forigo de abonanto",
+    "tree_fade_ancestors": "Montri responditojn de la nuna afiŝo per teksto malvigla"
   },
   "timeline": {
     "collapse": "Maletendi",
@@ -753,7 +784,33 @@
     "note_blank": "(Neniu)",
     "edit_note_apply": "Apliki",
     "edit_note_cancel": "Nuligi",
-    "edit_note": "Redakti noton"
+    "edit_note": "Redakti noton",
+    "block_confirm": "Ĉu vi certe volas bloki uzanton {user}?",
+    "block_confirm_accept_button": "Bloki",
+    "remove_follower_confirm": "Ĉu vi certe volas forigi uzanton {user} de viaj abonantoj?",
+    "approve_confirm_accept_button": "Aprobi",
+    "approve_confirm_cancel_button": "Ne aprobi",
+    "approve_confirm": "Ĉu vi certe volas aprobi abonan peton de {user}?",
+    "block_confirm_title": "Konfirmo de blokado",
+    "approve_confirm_title": "Konfirmo de aprobo",
+    "block_confirm_cancel_button": "Ne bloki",
+    "deny_confirm_accept_button": "Malaprobi",
+    "deny_confirm_cancel_button": "Ne malaprobi",
+    "mute_confirm_title": "Silentigi konfirmon",
+    "deny_confirm_title": "Konfirmo de malaprobo",
+    "mute_confirm": "Ĉu vi certe volas silentigi uzanton {user}?",
+    "mute_confirm_accept_button": "Silentigi",
+    "mute_confirm_cancel_button": "Ne silentigi",
+    "mute_duration_prompt": "Silentigi ĉi tiun uzanton por (0 signifas senliman silentigon):",
+    "remove_follower_confirm_accept_button": "Forigi",
+    "remove_follower_confirm_title": "Konfirmo de forigo de abonanto",
+    "birthday": "Naskita je {birthday}",
+    "deny_confirm": "Ĉu vi certe volas malaprobi abonan peton de {user}?",
+    "unfollow_confirm_cancel_button": "Ne malaboni",
+    "unfollow_confirm_title": "Konfirmo de malabono",
+    "unfollow_confirm": "Ĉu vi certe volas malaboni uzanton {user}?",
+    "unfollow_confirm_accept_button": "Malaboni",
+    "remove_follower_confirm_cancel_button": "Ne forigi"
   },
   "user_profile": {
     "timeline_title": "Historio de uzanto",
@@ -775,7 +832,8 @@
     "accept_follow_request": "Akcepti abonpeton",
     "add_reaction": "Aldoni reagon",
     "toggle_expand": "Etendi aŭ maletendi sciigon por montri plenan afiŝon",
-    "toggle_mute": "Etendi aŭ maletendi afiŝon por montri silentigitan enhavon"
+    "toggle_mute": "Etendi aŭ maletendi afiŝon por montri silentigitan enhavon",
+    "autocomplete_available": "{number} rezulto disponeblas. Uzu la sagajn klavojn supren kaj suben por foliumi ilin. | {number} rezulto disponeblas. Uzu la sagajn klavojn supren kaj suben por foliumi ilin."
   },
   "upload": {
     "error": {
@@ -951,7 +1009,14 @@
     "show_all_conversation_with_icon": "{icon} {text}",
     "show_only_conversation_under_this": "Montri nur respondojn al ĉi tiu afiŝo",
     "status_history": "Historio de afiŝo",
-    "open_gallery": "Malfermi galerion"
+    "open_gallery": "Malfermi galerion",
+    "delete_confirm_title": "Konfirmo de forigo",
+    "delete_confirm_accept_button": "Forigi",
+    "repeat_confirm": "Ĉu vi certe volas ripeti ĉi tiun afiŝon?",
+    "repeat_confirm_title": "Konfirmo de ripeto",
+    "repeat_confirm_accept_button": "Ripeti",
+    "repeat_confirm_cancel_button": "Ne ripeti",
+    "delete_confirm_cancel_button": "Ne forigi"
   },
   "time": {
     "years_short": "{0}j",
@@ -1119,6 +1184,7 @@
     "edit_action": "Redakti",
     "submit_edit_action": "Afiŝi",
     "cancel_edit_action": "Nuligi",
-    "inactive_message": "Ĉi tiu anonco estas neaktiva"
+    "inactive_message": "Ĉi tiu anonco estas neaktiva",
+    "post_form_header": "Afiŝi anoncon"
   }
 }
-- 
cgit v1.2.3-70-g09d2


From 1dd5fa8bb756941d34e9e2c49dc79a6dd8b6c0d6 Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Sun, 9 Apr 2023 22:54:42 +0000
Subject: Translated using Weblate (Esperanto)

Currently translated at 98.2% (971 of 988 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/eo/
---
 src/i18n/eo.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/i18n/eo.json b/src/i18n/eo.json
index ce4e833b..252665cc 100644
--- a/src/i18n/eo.json
+++ b/src/i18n/eo.json
@@ -175,7 +175,9 @@
     "post": "Afiŝo",
     "edit_remote_warning": "Aliaj foraj nodoj eble ne subtenas redaktadon, kaj ne povos ricevi pli novan version de via afiŝo.",
     "edit_unsupported_warning": "Pleroma ne subtenas redaktadon de mencioj aŭ enketoj.",
-    "edit_status": "Redakti afiŝon"
+    "edit_status": "Redakti afiŝon",
+    "content_type_selection": "Formo de afiŝo",
+    "scope_notice_dismiss": "Fermi ĉi tiun avizon"
   },
   "registration": {
     "bio": "Priskribo",
-- 
cgit v1.2.3-70-g09d2


From 811adc5b1fcd6669489c87b85ae113f2a5ce628d Mon Sep 17 00:00:00 2001
From: Xnuk Shuman <xnuk+pleroma@xnu.kr>
Date: Tue, 11 Apr 2023 03:49:33 +0000
Subject: Translated using Weblate (Korean)

Currently translated at 96.6% (955 of 988 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ko/
---
 src/i18n/ko.json | 64 ++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 55 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/i18n/ko.json b/src/i18n/ko.json
index 657bb079..1e7e58c3 100644
--- a/src/i18n/ko.json
+++ b/src/i18n/ko.json
@@ -75,7 +75,11 @@
     "enter_two_factor_code": "2단계인증 코드를 입력하십시오",
     "enter_recovery_code": "복구 코드를 입력하십시오",
     "authentication_code": "인증 코드",
-    "hint": "로그인해서 대화에 참여"
+    "hint": "로그인해서 대화에 참여",
+    "logout_confirm_title": "로그아웃 확인",
+    "logout_confirm": "정말 로그아웃 하시겠습니까?",
+    "logout_confirm_accept_button": "로그아웃",
+    "logout_confirm_cancel_button": "로그아웃 안 함"
   },
   "nav": {
     "about": "인스턴스 소개",
@@ -104,7 +108,8 @@
     "edit_finish": "편집 종료",
     "mobile_notifications_close": "알림 닫기",
     "mobile_sidebar": "모바일 사이드바 토글",
-    "announcements": "공지사항"
+    "announcements": "공지사항",
+    "search_close": "검색 바 닫기"
   },
   "notifications": {
     "broken_favorite": "알 수 없는 게시물입니다, 검색합니다…",
@@ -158,7 +163,9 @@
     "edit_status": "수정",
     "edit_remote_warning": "수정 기능이 없는 다른 인스턴스에서는 수정한 사항이 반영되지 않을 수 있습니다.",
     "post": "게시",
-    "direct_warning_to_first_only": "맨 앞에 멘션한 사용자들에게만 보여집니다."
+    "direct_warning_to_first_only": "맨 앞에 멘션한 사용자들에게만 보여집니다.",
+    "content_type_selection": "게시물 형태",
+    "scope_notice_dismiss": "알림 닫기"
   },
   "registration": {
     "bio": "소개",
@@ -175,7 +182,9 @@
       "email_required": "공백으로 둘 수 없습니다",
       "password_required": "공백으로 둘 수 없습니다",
       "password_confirmation_required": "공백으로 둘 수 없습니다",
-      "password_confirmation_match": "패스워드와 일치해야 합니다"
+      "password_confirmation_match": "패스워드와 일치해야 합니다",
+      "birthday_required": "공백으로 둘 수 없습니다",
+      "birthday_min_age": "{date} 또는 그 이전 출생만 가능합니다"
     },
     "fullname_placeholder": "예: 김례인",
     "username_placeholder": "예: lain",
@@ -185,7 +194,9 @@
     "reason": "가입하려는 이유",
     "reason_placeholder": "이 인스턴스는 수동으로 가입을 승인하고 있습니다.\n왜 가입하고 싶은지 관리자에게 알려주세요.",
     "register": "가입",
-    "email_language": "무슨 언어로 이메일을 받길 원하시나요?"
+    "email_language": "무슨 언어로 이메일을 받길 원하시나요?",
+    "birthday": "생일:",
+    "birthday_optional": "생일 (선택):"
   },
   "settings": {
     "attachmentRadius": "첨부물",
@@ -383,7 +394,8 @@
         "highlight": "강조 요소",
         "pressed": "눌렸을 때",
         "toggled": "토글됨",
-        "tabs": "탭"
+        "tabs": "탭",
+        "underlay": "밑배경"
       },
       "radii": {
         "_tab_label": "둥글기"
@@ -652,7 +664,29 @@
     "post_status_content_type": "게시물 내용 형식",
     "list_aliases_error": "별칭을 가져오는 중 에러 발생: {error}",
     "add_alias_error": "별칭을 추가하는 중 에러 발생: {error}",
-    "mention_link_show_avatar_quick": "멘션 옆에 유저 프로필 사진을 보임"
+    "mention_link_show_avatar_quick": "멘션 옆에 유저 프로필 사진을 보임",
+    "backup_running": "백업 중입니다, {number}개 처리 완료. | 백업 중입니다, {number}개 처리 완료.",
+    "confirm_dialogs": "하기 전에 다시 물어보기",
+    "autocomplete_select_first": "자동완성이 가능하면 자동으로 첫 번째 후보를 선택",
+    "backup_failed": "백업에 실패했습니다.",
+    "emoji_reactions_scale": "리액션 크기",
+    "birthday": {
+      "label": "생일",
+      "show_birthday": "내 생일 보여주기"
+    },
+    "add_language": "보조 언어 추가",
+    "confirm_dialogs_repeat": "리핏",
+    "confirm_dialogs_unfollow": "언팔로우",
+    "confirm_dialogs_block": "차단",
+    "confirm_dialogs_mute": "뮤트",
+    "confirm_dialogs_delete": "게시물 삭제",
+    "confirm_dialogs_approve_follow": "팔로워 승인",
+    "confirm_dialogs_deny_follow": "팔로워 거절",
+    "confirm_dialogs_remove_follower": "팔로워 제거",
+    "remove_language": "삭제",
+    "primary_language": "주 언어:",
+    "fallback_language": "보조 언어 {index}:",
+    "confirm_dialogs_logout": "로그아웃"
   },
   "timeline": {
     "collapse": "접기",
@@ -735,7 +769,12 @@
       "striped": "줄무늬 배경",
       "solid": "단색 배경",
       "side": "옆트임"
-    }
+    },
+    "approve_confirm_title": "승인 확인",
+    "approve_confirm_accept_button": "승인",
+    "approve_confirm_cancel_button": "승인 안 함",
+    "approve_confirm": "{user}의 팔로우 요청을 승인할까요?",
+    "block_confirm_title": "차단 확인"
   },
   "user_profile": {
     "timeline_title": "사용자 타임라인",
@@ -1069,7 +1108,14 @@
     "ancestor_follow_with_icon": "{icon} {text}",
     "show_all_conversation_with_icon": "{icon} {text}",
     "ancestor_follow": "이 게시물 아래 {numReplies}개 답글 더 보기 | 이 게시물 아래 {numReplies}개 답글 더 보기",
-    "show_only_conversation_under_this": "이 게시물의 답글만 보기"
+    "show_only_conversation_under_this": "이 게시물의 답글만 보기",
+    "repeat_confirm": "리핏할까요?",
+    "repeat_confirm_title": "리핏 확인",
+    "repeat_confirm_accept_button": "리핏",
+    "repeat_confirm_cancel_button": "리핏 안 함",
+    "delete_confirm_title": "삭제 확인",
+    "delete_confirm_accept_button": "삭제",
+    "delete_confirm_cancel_button": "냅두기"
   },
   "errors": {
     "storage_unavailable": "Pleroma가 브라우저 저장소에 접근할 수 없습니다. 로그인이 풀리거나 로컬 설정이 초기화 되는 등 예상치 못한 문제를 겪을 수 있습니다. 쿠키를 활성화 해보세요."
-- 
cgit v1.2.3-70-g09d2


From 762cdc738f17c36ec0eecf370ccd805df50e07ae Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Sun, 7 May 2023 18:04:14 +0000
Subject: Translated using Weblate (Esperanto)

Currently translated at 98.1% (971 of 989 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/eo/
---
 src/i18n/eo.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/i18n/eo.json b/src/i18n/eo.json
index 252665cc..249a0aab 100644
--- a/src/i18n/eo.json
+++ b/src/i18n/eo.json
@@ -94,7 +94,7 @@
     "hide": "Fermi vidilon de vidaŭdaĵoj"
   },
   "nav": {
-    "about": "Pri",
+    "about": "Prio",
     "back": "Reen",
     "chat": "Loka babilejo",
     "friend_requests": "Petoj pri abono",
-- 
cgit v1.2.3-70-g09d2


From b171d831f2cce2b3c7aad658c63f2dc12ddd1ce3 Mon Sep 17 00:00:00 2001
From: baloo toumi <abidin24@disroot.org>
Date: Wed, 17 May 2023 11:36:14 +0000
Subject: Translated using Weblate (Arabic)

Currently translated at 14.2% (141 of 989 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ar/
---
 src/i18n/ar.json | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/i18n/ar.json b/src/i18n/ar.json
index cd9a410a..6a528d8b 100644
--- a/src/i18n/ar.json
+++ b/src/i18n/ar.json
@@ -211,11 +211,19 @@
         "keyword_policies": "سياسة الكلمات الدلالية"
       },
       "simple": {
-        "simple_policies": "سياسات الخادم"
+        "simple_policies": "سياسات الخادم",
+        "instance": "مثيل",
+        "reason": "السبب",
+        "accept": "قبول",
+        "reject": "رفض"
       },
       "federation": "الاتحاد",
       "mrf_policies": "تفعيل سياسات إعادة كتابة المنشور",
       "mrf_policies_desc": "خاصية إعادة كتابة المناشير تقوم بتعديل تفاعل الاتحاد مع هذا الخادم. السياسات التالية مفعّلة:"
     }
+  },
+  "announcements": {
+    "page_header": "إعلانات",
+    "title": "إعلان"
   }
 }
-- 
cgit v1.2.3-70-g09d2


From 6b0d72937e19c87ea8a925b41a1475704bbd1a56 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Sun, 21 May 2023 18:31:25 +0000
Subject: Apply 1 suggestion(s) to 1 file(s)

---
 src/components/settings_modal/helpers/boolean_setting.vue | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'src')

diff --git a/src/components/settings_modal/helpers/boolean_setting.vue b/src/components/settings_modal/helpers/boolean_setting.vue
index 5ddf5aad..5a9eab34 100644
--- a/src/components/settings_modal/helpers/boolean_setting.vue
+++ b/src/components/settings_modal/helpers/boolean_setting.vue
@@ -35,16 +35,6 @@
     >
       {{ backendDescriptionDescription + ' ' }}
     </p>
-    <!-- debugging -->
-    <!--
-    <p
-      v-else
-      class="setting-description"
-      :class="{ 'faint': shouldBeDisabled }"
-    >
-      MISSING DESCRIPTION FOR {{ path }}
-    </p>
-    -->
   </label>
 </template>
 
-- 
cgit v1.2.3-70-g09d2


From ed23f51838477dc04fb5daedb6bf1bdf96f2ca65 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Mon, 22 May 2023 22:02:22 -0400
Subject: Make reaction button accessible

---
 src/components/emoji_reactions/emoji_reactions.js  |  12 +++
 src/components/emoji_reactions/emoji_reactions.vue | 104 +++++++++++++++++++--
 2 files changed, 108 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/components/emoji_reactions/emoji_reactions.js b/src/components/emoji_reactions/emoji_reactions.js
index bb11b840..b3520a55 100644
--- a/src/components/emoji_reactions/emoji_reactions.js
+++ b/src/components/emoji_reactions/emoji_reactions.js
@@ -1,5 +1,17 @@
 import UserAvatar from '../user_avatar/user_avatar.vue'
 import UserListPopover from '../user_list_popover/user_list_popover.vue'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faPlus,
+  faMinus,
+  faCheck
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faPlus,
+  faMinus,
+  faCheck
+)
 
 const EMOJI_REACTION_COUNT_CUTOFF = 12
 
diff --git a/src/components/emoji_reactions/emoji_reactions.vue b/src/components/emoji_reactions/emoji_reactions.vue
index eb46018e..3171785b 100644
--- a/src/components/emoji_reactions/emoji_reactions.vue
+++ b/src/components/emoji_reactions/emoji_reactions.vue
@@ -1,15 +1,14 @@
 <template>
   <div class="EmojiReactions">
-    <UserListPopover
+    <span
       v-for="(reaction) in emojiReactions"
       :key="reaction.url || reaction.name"
-      :users="accountsForEmoji[reaction.name]"
+      class="emoji-reaction-container btn-group"
     >
       <button
         class="emoji-reaction btn button-default"
         :class="{ '-picked-reaction': reactedWith(reaction.name), 'not-clickable': !loggedIn }"
         @click="emojiOnClick(reaction.name, $event)"
-        @mouseenter="fetchEmojiReactionsByIfMissing()"
       >
         <span
           class="reaction-emoji"
@@ -26,9 +25,36 @@
             class="reaction-emoji reaction-emoji-content"
           >{{ reaction.name }}</span>
         </span>
-        <span>{{ reaction.count }}</span>
+        <FALayers>
+        <FAIcon
+          v-if="reactedWith(reaction.name)"
+          class="active-marker"
+          transform="shrink-6 up-9"
+          icon="check"
+        />
+        <FAIcon
+          v-if="!reactedWith(reaction.name)"
+          class="focus-marker"
+          transform="shrink-6 up-9"
+          icon="plus"
+        />
+        <FAIcon
+          v-else
+          class="focus-marker"
+          transform="shrink-6 up-9"
+          icon="minus"
+        />
+        </FALayers>
       </button>
+    <UserListPopover
+      :users="accountsForEmoji[reaction.name]"
+      class="emoji-reaction-popover"
+      @show="fetchEmojiReactionsByIfMissing()"
+      :trigger-attrs="{ class: ['btn', 'button-default', 'emoji-reaction-count-button', { '-picked-reaction': reactedWith(reaction.name) }] }"
+    >
+      <span class="emoji-reaction-counts">{{ reaction.count }}</span>
     </UserListPopover>
+    </span>
     <a
       v-if="tooManyReactions"
       class="emoji-reaction-expand faint"
@@ -43,6 +69,7 @@
 <script src="./emoji_reactions.js"></script>
 <style lang="scss">
 @import "../../variables";
+@import "../../mixins";
 
 .EmojiReactions {
   display: flex;
@@ -51,10 +78,36 @@
 
   --emoji-size: calc(1.25em * var(--emojiReactionsScale, 1));
 
-  .emoji-reaction {
-    padding: 0 0.5em;
-    margin-right: 0.5em;
+  .emoji-reaction-container {
+    display: flex;
+    align-items: stretch;
     margin-top: 0.5em;
+    margin-right: 0.5em;
+
+    .emoji-reaction-popover {
+      padding: 0;
+
+      .emoji-reaction-count-button {
+        background-color: var(--btn);
+        height: 100%;
+        border-top-left-radius: 0;
+        border-bottom-left-radius: 0;
+        box-sizing: border-box;
+        min-width: 2em;
+        display: inline-flex;
+        justify-content: center;
+        align-items: center;
+
+        &.-picked-reaction {
+          border: 1px solid var(--accent, $fallback--link);
+          margin-right: -1px;
+        }
+      }
+    }
+  }
+
+  .emoji-reaction {
+    padding-left: 0.5em;
     display: flex;
     align-items: center;
     justify-content: center;
@@ -97,7 +150,42 @@
     &.-picked-reaction {
       border: 1px solid var(--accent, $fallback--link);
       margin-left: -1px; // offset the border, can't use inset shadows either
-      margin-right: calc(0.5em - 1px);
+      margin-right: -1px;
+
+      .svg-inline--fa {
+        color: $fallback--link;
+        color: var(--accent, $fallback--link);
+      }
+    }
+
+    @include unfocused-style {
+      .svg-inline--fa {
+        color: $fallback--text;
+        color: var(--btnText, $fallback--text);
+      }
+
+      .focus-marker {
+        visibility: hidden;
+      }
+
+      .active-marker {
+        visibility: visible;
+      }
+    }
+
+    @include focused-style {
+      .svg-inline--fa {
+        color: $fallback--link;
+        color: var(--accent, $fallback--link);
+      }
+
+      .focus-marker {
+        visibility: visible;
+      }
+
+      .active-marker {
+        visibility: hidden;
+      }
     }
   }
 
-- 
cgit v1.2.3-70-g09d2


From 8a1074336c3cce8111a23281bbe71301b93c3420 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Mon, 22 May 2023 22:09:04 -0400
Subject: Make emoji reactions clickable when not logged in

---
 src/components/emoji_reactions/emoji_reactions.js  |  3 +++
 src/components/emoji_reactions/emoji_reactions.vue | 20 ++++++++------------
 2 files changed, 11 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/components/emoji_reactions/emoji_reactions.js b/src/components/emoji_reactions/emoji_reactions.js
index b3520a55..74cb844c 100644
--- a/src/components/emoji_reactions/emoji_reactions.js
+++ b/src/components/emoji_reactions/emoji_reactions.js
@@ -45,6 +45,9 @@ const EmojiReactions = {
     },
     loggedIn () {
       return !!this.$store.state.users.currentUser
+    },
+    remoteInteractionLink () {
+      return this.$store.getters.remoteInteractionLink({ statusId: this.status.id })
     }
   },
   methods: {
diff --git a/src/components/emoji_reactions/emoji_reactions.vue b/src/components/emoji_reactions/emoji_reactions.vue
index 3171785b..f30afcb2 100644
--- a/src/components/emoji_reactions/emoji_reactions.vue
+++ b/src/components/emoji_reactions/emoji_reactions.vue
@@ -5,9 +5,12 @@
       :key="reaction.url || reaction.name"
       class="emoji-reaction-container btn-group"
     >
-      <button
+      <component
+        :is="loggedIn ? 'button' : 'a'"
+        v-bind="!loggedIn ? { href: remoteInteractionLink } : {}"
+        role="button"
         class="emoji-reaction btn button-default"
-        :class="{ '-picked-reaction': reactedWith(reaction.name), 'not-clickable': !loggedIn }"
+        :class="{ '-picked-reaction': reactedWith(reaction.name) }"
         @click="emojiOnClick(reaction.name, $event)"
       >
         <span
@@ -45,7 +48,7 @@
           icon="minus"
         />
         </FALayers>
-      </button>
+      </component>
     <UserListPopover
       :users="accountsForEmoji[reaction.name]"
       class="emoji-reaction-popover"
@@ -112,6 +115,8 @@
     align-items: center;
     justify-content: center;
     box-sizing: border-box;
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
 
     .reaction-emoji {
       width: var(--emoji-size);
@@ -138,15 +143,6 @@
       outline: none;
     }
 
-    &.not-clickable {
-      cursor: default;
-
-      &:hover {
-        box-shadow: $fallback--buttonShadow;
-        box-shadow: var(--buttonShadow);
-      }
-    }
-
     &.-picked-reaction {
       border: 1px solid var(--accent, $fallback--link);
       margin-left: -1px; // offset the border, can't use inset shadows either
-- 
cgit v1.2.3-70-g09d2


From 0b2f676e50c5fb8da1d5e673ee6a2723ee7c9e1e Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Mon, 22 May 2023 22:14:44 -0400
Subject: Fix focus (unvisible) style

---
 src/components/emoji_reactions/emoji_reactions.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/components/emoji_reactions/emoji_reactions.vue b/src/components/emoji_reactions/emoji_reactions.vue
index f30afcb2..3f76cdc6 100644
--- a/src/components/emoji_reactions/emoji_reactions.vue
+++ b/src/components/emoji_reactions/emoji_reactions.vue
@@ -143,6 +143,11 @@
       outline: none;
     }
 
+    .svg-inline--fa {
+      color: $fallback--text;
+      color: var(--btnText, $fallback--text);
+    }
+
     &.-picked-reaction {
       border: 1px solid var(--accent, $fallback--link);
       margin-left: -1px; // offset the border, can't use inset shadows either
@@ -155,11 +160,6 @@
     }
 
     @include unfocused-style {
-      .svg-inline--fa {
-        color: $fallback--text;
-        color: var(--btnText, $fallback--text);
-      }
-
       .focus-marker {
         visibility: hidden;
       }
-- 
cgit v1.2.3-70-g09d2


From 48ee11fea35123090762d98f5249168679f05e3a Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Mon, 22 May 2023 22:18:42 -0400
Subject: Add aria for react button

---
 src/components/emoji_reactions/emoji_reactions.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/components/emoji_reactions/emoji_reactions.vue b/src/components/emoji_reactions/emoji_reactions.vue
index 3f76cdc6..1fdfb87b 100644
--- a/src/components/emoji_reactions/emoji_reactions.vue
+++ b/src/components/emoji_reactions/emoji_reactions.vue
@@ -11,6 +11,8 @@
         role="button"
         class="emoji-reaction btn button-default"
         :class="{ '-picked-reaction': reactedWith(reaction.name) }"
+        :title="reaction.url ? reaction.name : undefined"
+        :aria-pressed="reactedWith(reaction.name)"
         @click="emojiOnClick(reaction.name, $event)"
       >
         <span
@@ -19,7 +21,6 @@
           <img
             v-if="reaction.url"
             :src="reaction.url"
-            :title="reaction.name"
             class="reaction-emoji-content"
             width="1em"
           >
-- 
cgit v1.2.3-70-g09d2


From d3e251665f50c7d289066b0be0fdfa5b227c3b65 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Mon, 22 May 2023 22:20:09 -0400
Subject: Lint

---
 src/components/emoji_reactions/emoji_reactions.vue | 52 +++++++++++-----------
 1 file changed, 26 insertions(+), 26 deletions(-)

(limited to 'src')

diff --git a/src/components/emoji_reactions/emoji_reactions.vue b/src/components/emoji_reactions/emoji_reactions.vue
index 1fdfb87b..d475d5dc 100644
--- a/src/components/emoji_reactions/emoji_reactions.vue
+++ b/src/components/emoji_reactions/emoji_reactions.vue
@@ -30,34 +30,34 @@
           >{{ reaction.name }}</span>
         </span>
         <FALayers>
-        <FAIcon
-          v-if="reactedWith(reaction.name)"
-          class="active-marker"
-          transform="shrink-6 up-9"
-          icon="check"
-        />
-        <FAIcon
-          v-if="!reactedWith(reaction.name)"
-          class="focus-marker"
-          transform="shrink-6 up-9"
-          icon="plus"
-        />
-        <FAIcon
-          v-else
-          class="focus-marker"
-          transform="shrink-6 up-9"
-          icon="minus"
-        />
+          <FAIcon
+            v-if="reactedWith(reaction.name)"
+            class="active-marker"
+            transform="shrink-6 up-9"
+            icon="check"
+          />
+          <FAIcon
+            v-if="!reactedWith(reaction.name)"
+            class="focus-marker"
+            transform="shrink-6 up-9"
+            icon="plus"
+          />
+          <FAIcon
+            v-else
+            class="focus-marker"
+            transform="shrink-6 up-9"
+            icon="minus"
+          />
         </FALayers>
       </component>
-    <UserListPopover
-      :users="accountsForEmoji[reaction.name]"
-      class="emoji-reaction-popover"
-      @show="fetchEmojiReactionsByIfMissing()"
-      :trigger-attrs="{ class: ['btn', 'button-default', 'emoji-reaction-count-button', { '-picked-reaction': reactedWith(reaction.name) }] }"
-    >
-      <span class="emoji-reaction-counts">{{ reaction.count }}</span>
-    </UserListPopover>
+      <UserListPopover
+        :users="accountsForEmoji[reaction.name]"
+        class="emoji-reaction-popover"
+        :trigger-attrs="{ class: ['btn', 'button-default', 'emoji-reaction-count-button', { '-picked-reaction': reactedWith(reaction.name) }] }"
+        @show="fetchEmojiReactionsByIfMissing()"
+      >
+        <span class="emoji-reaction-counts">{{ reaction.count }}</span>
+      </UserListPopover>
     </span>
     <a
       v-if="tooManyReactions"
-- 
cgit v1.2.3-70-g09d2


From c67513002460f56901246c81a9e7b6dbad89be27 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Mon, 22 May 2023 22:30:54 -0400
Subject: Make reaction counter accessible

---
 src/components/emoji_reactions/emoji_reactions.js  | 11 +++++++++++
 src/components/emoji_reactions/emoji_reactions.vue |  2 +-
 src/i18n/en.json                                   |  3 ++-
 3 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/components/emoji_reactions/emoji_reactions.js b/src/components/emoji_reactions/emoji_reactions.js
index 74cb844c..b4936424 100644
--- a/src/components/emoji_reactions/emoji_reactions.js
+++ b/src/components/emoji_reactions/emoji_reactions.js
@@ -77,6 +77,17 @@ const EmojiReactions = {
       } else {
         this.reactWith(emoji)
       }
+    },
+    counterTriggerAttrs (reaction) {
+      return {
+        class: [
+          'btn',
+          'button-default',
+          'emoji-reaction-count-button',
+          { '-picked-reaction': this.reactedWith(reaction.name) }
+        ],
+        'aria-label': this.$tc('status.reaction_count_label', reaction.count, { num: reaction.count })
+      }
     }
   }
 }
diff --git a/src/components/emoji_reactions/emoji_reactions.vue b/src/components/emoji_reactions/emoji_reactions.vue
index d475d5dc..20a1f4a1 100644
--- a/src/components/emoji_reactions/emoji_reactions.vue
+++ b/src/components/emoji_reactions/emoji_reactions.vue
@@ -53,7 +53,7 @@
       <UserListPopover
         :users="accountsForEmoji[reaction.name]"
         class="emoji-reaction-popover"
-        :trigger-attrs="{ class: ['btn', 'button-default', 'emoji-reaction-count-button', { '-picked-reaction': reactedWith(reaction.name) }] }"
+        :trigger-attrs="counterTriggerAttrs(reaction)"
         @show="fetchEmojiReactionsByIfMissing()"
       >
         <span class="emoji-reaction-counts">{{ reaction.count }}</span>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index b051f088..01309d0e 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -933,7 +933,8 @@
     "show_all_conversation_with_icon": "{icon} {text}",
     "show_all_conversation": "Show full conversation ({numStatus} other status) | Show full conversation ({numStatus} other statuses)",
     "show_only_conversation_under_this": "Only show replies to this status",
-    "status_history": "Status history"
+    "status_history": "Status history",
+    "reaction_count_label": "{num} person reacted | {num} people reacted"
   },
   "user_card": {
     "approve": "Approve",
-- 
cgit v1.2.3-70-g09d2


From dc2ff9b2d293a444d4af261692a307f96f27a60f Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Mon, 22 May 2023 22:37:18 -0400
Subject: Add text label for custom emoji reactions

---
 src/components/notification/notification.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue
index 4d801c5e..5a32fc70 100644
--- a/src/components/notification/notification.vue
+++ b/src/components/notification/notification.vue
@@ -125,7 +125,8 @@
                     v-if="notification.emoji_url"
                     class="emoji-reaction-emoji emoji-reaction-emoji-image"
                     :src="notification.emoji_url"
-                    :name="notification.emoji"
+                    :alt="notification.emoji"
+                    :title="notification.emoji"
                   >
                   <span
                     v-else
-- 
cgit v1.2.3-70-g09d2


From b82f2a3543b733eda9ce52d60d6b7aba60f787d0 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Mon, 22 May 2023 23:09:05 -0400
Subject: Use button text in reaction counter

---
 src/components/emoji_reactions/emoji_reactions.vue | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

diff --git a/src/components/emoji_reactions/emoji_reactions.vue b/src/components/emoji_reactions/emoji_reactions.vue
index 20a1f4a1..92fc58ca 100644
--- a/src/components/emoji_reactions/emoji_reactions.vue
+++ b/src/components/emoji_reactions/emoji_reactions.vue
@@ -101,6 +101,8 @@
         display: inline-flex;
         justify-content: center;
         align-items: center;
+        color: $fallback--text;
+        color: var(--btnText, $fallback--text);
 
         &.-picked-reaction {
           border: 1px solid var(--accent, $fallback--link);
-- 
cgit v1.2.3-70-g09d2


From f4d3575804667a6b5eeeebb81600d0bcde09e113 Mon Sep 17 00:00:00 2001
From: baloo toumi <abidin24@disroot.org>
Date: Fri, 19 May 2023 20:23:52 +0000
Subject: Translated using Weblate (Arabic)

Currently translated at 37.4% (370 of 989 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ar/
---
 src/i18n/ar.json | 317 +++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 295 insertions(+), 22 deletions(-)

(limited to 'src')

diff --git a/src/i18n/ar.json b/src/i18n/ar.json
index 6a528d8b..7915e779 100644
--- a/src/i18n/ar.json
+++ b/src/i18n/ar.json
@@ -9,7 +9,8 @@
     "scope_options": "",
     "text_limit": "الحد الأقصى للنص",
     "title": "الميّزات",
-    "who_to_follow": "للمتابعة"
+    "who_to_follow": "للمتابعة",
+    "upload_limit": "حد الرفع"
   },
   "finder": {
     "error_fetching_user": "خطأ أثناء جلب صفحة المستخدم",
@@ -17,7 +18,35 @@
   },
   "general": {
     "apply": "تطبيق",
-    "submit": "إرسال"
+    "submit": "إرسال",
+    "error_retry": "حاول مجددًا",
+    "retry": "حاول مجدداً",
+    "optional": "اختياري",
+    "show_more": "اعرض المزيد",
+    "show_less": "اعرض أقل",
+    "cancel": "ألغ",
+    "disable": "عطّل",
+    "enable": "فعّل",
+    "confirm": "تأكيد",
+    "close": "أغلق",
+    "role": {
+      "admin": "مدير",
+      "moderator": "مشرف"
+    },
+    "generic_error_message": "حدث خطأ: {0}",
+    "never_show_again": "لا تظهره مجددًا",
+    "yes": "نعم",
+    "no": "لا",
+    "unpin": "ألغ تثبيت العنصر",
+    "undo": "تراجع",
+    "more": "المزيد",
+    "loading": "يحمل…",
+    "generic_error": "حدث خطأ",
+    "scope_in_timeline": {
+      "private": "المتابِعون فقط"
+    },
+    "scroll_to_top": "مرر لأعلى",
+    "pin": "ثبت العنصر"
   },
   "login": {
     "login": "تسجيل الدخول",
@@ -25,7 +54,19 @@
     "password": "الكلمة السرية",
     "placeholder": "مثال lain",
     "register": "انشاء حساب",
-    "username": "إسم المستخدم"
+    "username": "إسم المستخدم",
+    "logout_confirm_title": "تأكيد الخروج",
+    "logout_confirm": "أتريد الخروج؟",
+    "logout_confirm_accept_button": "خروج",
+    "logout_confirm_cancel_button": "لا تخرج",
+    "hint": "لِج للانضمام للمناقشة",
+    "authentication_code": "رمز الاستيثاق",
+    "enter_recovery_code": "أدخل رمز التأكيد",
+    "enter_two_factor_code": "أدخل رمز الاستيثاق بعاملين",
+    "recovery_code": "رمز الاستعادة",
+    "heading": {
+      "totp": "الاستيثاق بعاملين"
+    }
   },
   "nav": {
     "chat": "الدردشة المحلية",
@@ -33,23 +74,48 @@
     "mentions": "الإشارات",
     "public_tl": "الخيط الزمني العام",
     "timeline": "الخيط الزمني",
-    "twkn": "كافة الشبكة المعروفة"
+    "twkn": "كافة الشبكة المعروفة",
+    "search_close": "أغلق شربط البحث",
+    "back": "للخلف",
+    "administration": "الإدارة",
+    "preferences": "التفضيلات",
+    "chats": "المحادثات",
+    "lists": "القوائم",
+    "edit_nav_mobile": "خصص شريط التنقل",
+    "edit_pinned": "حرر العناصر المثبتة",
+    "mobile_notifications_close": "أغلق الاشعارات",
+    "announcements": "إعلانات",
+    "home_timeline": "الخط الزمني الرئيس",
+    "search": "بحث",
+    "who_to_follow": "للمتابعة",
+    "dms": "رسالة شخصية",
+    "edit_finish": "تم التحرير",
+    "timelines": "الخيوط الزمنية",
+    "mobile_notifications": "افتح الإشعارات (تتواجد اشعارات غير مقروءة)"
   },
   "notifications": {
     "broken_favorite": "منشور مجهول، جارٍ البحث عنه…",
     "favorited_you": "أعجِب بمنشورك",
     "followed_you": "يُتابعك",
     "load_older": "تحميل الإشعارات الأقدم",
-    "notifications": "الإخطارات",
+    "notifications": "الاشعارات",
     "read": "مقروء!",
-    "repeated_you": "شارَك منشورك"
+    "repeated_you": "شارَك منشورك",
+    "error": "خطأ أثناء جلب الاشعارات: {0}",
+    "follow_request": "يريد متابعتك",
+    "poll_ended": "انتهى الاستطلاع",
+    "no_more_notifications": "لا مزيد من الإشعارات",
+    "reacted_with": "تفاعل بـ{0}",
+    "submitted_report": "أرسل بلاغًا"
   },
   "post_status": {
     "account_not_locked_warning": "",
     "account_not_locked_warning_link": "مقفل",
     "attachments_sensitive": "اعتبر المرفقات كلها كمحتوى حساس",
     "content_type": {
-      "text/plain": "نص صافٍ"
+      "text/plain": "نص صِرف",
+      "text/html": "HTML",
+      "text/markdown": "ماركداون"
     },
     "content_warning": "الموضوع (اختياري)",
     "default": "وصلت للتوّ إلى لوس أنجلس.",
@@ -60,15 +126,47 @@
       "private": "",
       "public": "علني - يُنشر على الخيوط الزمنية العمومية",
       "unlisted": "غير مُدرَج - لا يُنشَر على الخيوط الزمنية العمومية"
-    }
+    },
+    "media_description": "وصف الوسائط",
+    "direct_warning_to_all": "سيكون عذا المنشور مرئيًا لكل المستخدمين المذكورين.",
+    "post": "انشر",
+    "preview": "معاينة",
+    "preview_empty": "فارغ",
+    "scope_notice": {
+      "public": "سيكون هذا المنشور مرئيًا للجميع",
+      "private": "سيكون هذا المنشور مرئيا لمتابِعيك فقط"
+    },
+    "direct_warning_to_first_only": "سيكون عذا المنشور مرئيًا للمستخدمين المذكورين في أول الرسالة.",
+    "edit_unsupported_warning": "بليروما لا يدعم تعديل الذكر والاستطلاع.",
+    "empty_status_error": "يتعذر نشر منشور فارغ دون ملفات"
   },
   "registration": {
     "bio": "السيرة الذاتية",
     "email": "عنوان البريد الإلكتروني",
-    "fullname": "الإسم المعروض",
+    "fullname": "الاسم العلني",
     "password_confirm": "تأكيد الكلمة السرية",
     "registration": "التسجيل",
-    "token": "رمز الدعوة"
+    "token": "رمز الدعوة",
+    "bio_optional": "سيرة (اختيارية)",
+    "email_optional": "بيرد إلكتروني (اختياري)",
+    "username_placeholder": "مثل lain",
+    "reason": "سبب التسجيل",
+    "register": "سجل",
+    "validations": {
+      "username_required": "لايمكن تركه فارغًا",
+      "email_required": "لايمكن تركه فارغًا",
+      "password_required": "لايمكن تركه فارغًا",
+      "password_confirmation_required": "لايمكن تركه فارغًا",
+      "fullname_required": "لايمكن تركه فارغًا",
+      "password_confirmation_match": "يلزم أن يطابق كلمة السر",
+      "birthday_required": "لايمكن تركه فارغًا",
+      "birthday_min_age": "يلزم أن يكون في {date} أو قبله"
+    },
+    "fullname_placeholder": "مثل Lain Iwakura",
+    "reason_placeholder": "قبول التسجيل في هذا المثيل يستلزم موافقة المدير\nلهذا يجب عليك إعلامه بسبب التسجيل.",
+    "birthday_optional": "تاريخ الميلاد (اختياري):",
+    "email_language": "بأي لغة تريد استلام رسائل البريد الإلكتروني؟",
+    "birthday": "تاريخ الميلاد:"
   },
   "settings": {
     "attachmentRadius": "المُرفَقات",
@@ -83,9 +181,9 @@
     "cGreen": "أخضر (إعادة النشر)",
     "cOrange": "برتقالي (مفضلة)",
     "cRed": "أحمر (إلغاء)",
-    "change_password": "تغيير كلمة السر",
-    "change_password_error": "وقع هناك خلل أثناء تعديل كلمتك السرية.",
-    "changed_password": "تم تغيير كلمة المرور بنجاح!",
+    "change_password": "غيّر كلمة السر",
+    "change_password_error": "حدث خلل أثناء تعديل كلمتك السرية.",
+    "changed_password": "نجح تغيير كلمة السر!",
     "collapse_subject": "",
     "confirm_new_password": "تأكيد كلمة السر الجديدة",
     "current_avatar": "صورتك الرمزية الحالية",
@@ -94,11 +192,11 @@
     "data_import_export_tab": "تصدير واستيراد البيانات",
     "default_vis": "أسلوب العرض الافتراضي",
     "delete_account": "حذف الحساب",
-    "delete_account_description": "حذف حسابك و كافة منشوراتك نهائيًا.",
-    "delete_account_error": "",
+    "delete_account_description": "حذف حسابك و كافة بياناتك نهائيًا.",
+    "delete_account_error": "حدثة مشكلة اثناء حذف حسابك، إذا استمرت تواصل مع مدير المثيل.",
     "delete_account_instructions": "يُرجى إدخال كلمتك السرية أدناه لتأكيد عملية حذف الحساب.",
     "export_theme": "حفظ النموذج",
-    "filtering": "التصفية",
+    "filtering": "الترشيح",
     "filtering_explanation": "سيتم إخفاء كافة المنشورات التي تحتوي على هذه الكلمات، كلمة واحدة في كل سطر",
     "follow_export": "تصدير الاشتراكات",
     "follow_export_button": "تصدير الاشتراكات كملف csv",
@@ -108,10 +206,10 @@
     "follows_imported": "",
     "foreground": "الأمامية",
     "general": "الإعدادات العامة",
-    "hide_attachments_in_convo": "إخفاء المرفقات على المحادثات",
-    "hide_attachments_in_tl": "إخفاء المرفقات على الخيط الزمني",
-    "hide_post_stats": "",
-    "hide_user_stats": "",
+    "hide_attachments_in_convo": "اخف المرفقات من المحادثات",
+    "hide_attachments_in_tl": "اخف المرفقات من الخيط الزمني",
+    "hide_post_stats": "اخف احصائيات المنشور (مثل عدد التفضيلات)",
+    "hide_user_stats": "اخف احصائيات المستخدم (مثل عدد المتابِعين)",
     "import_followers_from_a_csv_file": "",
     "import_theme": "تحميل نموذج",
     "inputRadius": "",
@@ -166,7 +264,92 @@
     "values": {
       "false": "لا",
       "true": "نعم"
-    }
+    },
+    "emoji_reactions_scale": "معامل تحجيم التفاعلات",
+    "app_name": "اسم تطبيق",
+    "security": "الأمن",
+    "enter_current_password_to_confirm": "أدخل كلمة السر الحالية لتيقن من هويتك",
+    "mfa": {
+      "title": "الاستيثاق بعاملين",
+      "generate_new_recovery_codes": "ولّد رموز استعادة جديدة",
+      "warning_of_generate_new_codes": "عند توليد رموز استعادة جديدة ستزال القديمة.",
+      "recovery_codes": "رموز الاستعادة.",
+      "recovery_codes_warning": "خزن هذه الرموز في مكان آمن. إذا فقدت هذه الرموز وتعذر عليك الوصول إلى تطبيق الاستيثاق بعاملين، لن تتمكن من الوصول لحسابك.",
+      "authentication_methods": "طرق الاستيثاق",
+      "scan": {
+        "title": "مسح",
+        "desc": "امسح رمز الاستجابة السريعة QR من تطبيق الاستيثاق أو أدخل المفتاح:",
+        "secret_code": "مفتاح"
+      },
+      "verify": {
+        "desc": "لتفعيل الاستيثاق بعاملين أدخل الرمز من تطبيق الاستيثاق:"
+      }
+    },
+    "block_import": "استيراد المحجوبين",
+    "import_mutes_from_a_csv_file": "استورد قائمة المكتومين من ملف csv",
+    "account_backup": "نسخ احتياطي للحساب",
+    "download_backup": "نزّل",
+    "account_backup_table_head": "نسخ احتياطي",
+    "backup_not_ready": "هذا النسخ الاحتياطي ليس جاهزًا.",
+    "backup_failed": "فشل النسخ الاحتياطي.",
+    "remove_backup": "أزل",
+    "list_backups_error": "خطأ أثناء حلب قائمة النُسخ الاحتياطية: {error}",
+    "added_backup": "أُضيفت نسخة احتياطية جديدة.",
+    "blocks_tab": "المحجوبون",
+    "confirm_dialogs_block": "حجب مستخدم",
+    "confirm_dialogs_mute": "كتم مستخدم",
+    "confirm_dialogs_delete": "حذف حالة",
+    "confirm_dialogs_logout": "خروج",
+    "confirm_dialogs_approve_follow": "قبول متابِع",
+    "confirm_dialogs_deny_follow": "رفض متابِع",
+    "list_aliases_error": "خطأ أثناء جلب الكنيات: {error}",
+    "hide_list_aliases_error_action": "أغلق",
+    "remove_alias": "أزل هذه الكنية",
+    "add_alias_error": "حدث خطأ أثناء إضافة الكنية: {error}",
+    "confirm_dialogs": "أطلب تأكيدًا عند",
+    "confirm_dialogs_repeat": "مشاركة حالة",
+    "mutes_and_blocks": "المكتومون والمحجوبون",
+    "move_account_target": "الحساب المستهدف (مثل {example})",
+    "wordfilter": "ترشيح الكلمات",
+    "always_show_post_button": "أظهر الزر العائم لإنشاء منشور جديد دائمًا",
+    "hide_wallpaper": "اخف خلفية المثيل",
+    "save": "احفظ التعديلات",
+    "lists_navigation": "أظهر القوائم في شريط التنقل",
+    "mute_export_button": "صدّر قائمة المكتومين إلى ملف csv",
+    "blocks_imported": "اُستورد المحجوبون! معالجة القائمة ستستغرق وقتًا.",
+    "mute_export": "تصدير المكتومين",
+    "mute_import": "استيراد المكتومين",
+    "mute_import_error": "خطأ أثناء استيراد المكتومين",
+    "change_email_error": "حدثت خلل أثناء تغيير بريدك الإلكتروني.",
+    "change_email": "غيّر البريد الإلكتروني",
+    "changed_email": "نجح تغيير البريد الإلكتروني!",
+    "account_alias_table_head": "الكنية",
+    "account_alias": "كنيات الحساب",
+    "move_account": "أنقل الحساب",
+    "moved_account": "نُقل الحساب.",
+    "hide_media_previews": "اخف معاينات الوسائط",
+    "hide_muted_posts": "اخف منشورات المستخدمين المكتومين",
+    "confirm_dialogs_unfollow": "الغاء متابعة مستخدم",
+    "confirm_dialogs_remove_follower": "إزالة متابع",
+    "new_alias_target": "أضف كنية جديدة (مثل {example})",
+    "added_alias": "أُضيفت الكنية.",
+    "move_account_error": "خطأ أثناء نقل الحساب: {error}",
+    "emoji_reactions_on_timeline": "أظهر التفاعلات في الخط الزمني",
+    "mutes_imported": "اُستورد المكتومون! معالجة القئمة ستستغرق وقتًا.",
+    "remove_language": "أزل",
+    "primary_language": "اللغة الرئيسية:",
+    "expert_mode": "أظهر الإعدادات المتقدمة",
+    "block_import_error": "خطأ أثناء استيراد قائمة المحجوبين",
+    "add_backup": "أنشئ نسخة احتياطية جديدة",
+    "add_backup_error": "خطأ أثناء إضافة نسخ احتياطي جديد: {error}",
+    "move_account_notes": "إذا أردت نقل حسابك عليك إضافة كنية تشير إلى هنا في الحساب المستهدف.",
+    "avatar_size_instruction": "أدنى حجم مستحسن للصورة الرمزية هو 150x150 بيكسل.",
+    "word_filter_and_more": "مرشح الكلمات والمزيد...",
+    "hide_all_muted_posts": "اخف المنشورات المكتومة",
+    "max_thumbnails": "أقصى عدد للصور المصغرة لكل منشور (فارغ = غير محدود)",
+    "block_export_button": "صدّر قائمة المحجوبين إلى ملف csv",
+    "block_export": "تصدير المحجوبين",
+    "use_one_click_nsfw": "افتح المرفقات ذات المحتوى الحساس NSFW بنقرة واحدة"
   },
   "timeline": {
     "collapse": "",
@@ -224,6 +407,96 @@
   },
   "announcements": {
     "page_header": "إعلانات",
-    "title": "إعلان"
+    "title": "إعلان",
+    "mark_as_read_action": "علّمه كمقروء",
+    "post_form_header": "انشر إعلانًا",
+    "post_placeholder": "اكتب محتوى الاعلان هنا...",
+    "post_action": "انشر",
+    "post_error": "خطأ: {error}",
+    "close_error": "أغلاق",
+    "delete_action": "احذف",
+    "start_time_prompt": "وقت البدأ: ",
+    "end_time_prompt": "وقت النهاية: ",
+    "all_day_prompt": "هذا حدث يوم كامل",
+    "start_time_display": "يبدأ في {time}",
+    "end_time_display": "ينتهي في {time}",
+    "edit_action": "حرر",
+    "submit_edit_action": "أرسل",
+    "cancel_edit_action": "ألغِ",
+    "inactive_message": "هذا الاعلان غير نشط",
+    "published_time_display": "نُشر في {time}"
+  },
+  "polls": {
+    "votes": "أصوات",
+    "vote": "صوّت",
+    "type": "نوع الاستطلاع",
+    "single_choice": "خيار واحد",
+    "multiple_choices": "متعدد الخيارات",
+    "expiry": "عمر الاستطلاع",
+    "expires_in": "ينتهي الاستطلاع في {0}",
+    "expired": "انتهى الاستطلاع منذ {0}",
+    "add_poll": "أضف استطلاعًا",
+    "add_option": "أضف خيارًا",
+    "option": "خيار"
+  },
+  "emoji": {
+    "stickers": "ملصقات",
+    "emoji": "إيموجي",
+    "search_emoji": "ابحث عن إيموجي",
+    "unicode_groups": {
+      "animals-and-nature": "حيوانات وطبيعة",
+      "food-and-drink": "أطعمة ومشروبات",
+      "symbols": "رموز",
+      "activities": "نشاطات",
+      "flags": "أعلام"
+    },
+    "add_emoji": "أدخل إيموجي",
+    "custom": "إيموجي مخصص"
+  },
+  "interactions": {
+    "emoji_reactions": "تفاعلات بالإيموجي",
+    "reports": "البلاغات",
+    "follows": "المتابعات الجديدة"
+  },
+  "report": {
+    "state_closed": "مغلق",
+    "state_resolved": "عولج",
+    "reported_statuses": "الحالة المبلغة عنها:",
+    "state_open": "مفتوح",
+    "notes": "ملاحظة:",
+    "state": "الحالة:",
+    "reporter": "المبلِّغ:",
+    "reported_user": "المُبلغ عنه:"
+  },
+  "selectable_list": {
+    "select_all": "اختر الكل"
+  },
+  "image_cropper": {
+    "save": "احفظ",
+    "cancel": "ألغ"
+  },
+  "importer": {
+    "submit": "أرسل",
+    "success": "نجح الاستيراد.",
+    "error": "حدث خطأ أثناء الاستيراد."
+  },
+  "domain_mute_card": {
+    "mute": "اكتم",
+    "mute_progress": "يكتم…",
+    "unmute": "ارفع الكتم",
+    "unmute_progress": "يرفع الكتم…"
+  },
+  "exporter": {
+    "export": "صدر",
+    "processing": "يُعالج. سيُطلب منك تنزيل الملف قريباً"
+  },
+  "media_modal": {
+    "previous": "السابق",
+    "next": "التالي",
+    "hide": "أغلق عارض الوسائط"
+  },
+  "remote_user_resolver": {
+    "searching_for": "يبحث عن",
+    "error": "لم يُعثر عليه."
   }
 }
-- 
cgit v1.2.3-70-g09d2


From 99f85069b8a3bc44c3c0a5c6cac35dbfbd740dd5 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 23 May 2023 18:52:10 +0300
Subject: fix indeterminate state animation

---
 src/components/checkbox/checkbox.vue | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/components/checkbox/checkbox.vue b/src/components/checkbox/checkbox.vue
index 42f89be9..274e8d0b 100644
--- a/src/components/checkbox/checkbox.vue
+++ b/src/components/checkbox/checkbox.vue
@@ -1,7 +1,7 @@
 <template>
   <label
     class="checkbox"
-    :class="{ disabled, indeterminate }"
+    :class="{ disabled, indeterminate, 'indeterminate-fix': indeterminateTransitionFix }"
   >
     <input
       type="checkbox"
@@ -14,6 +14,7 @@
     <i
       class="checkbox-indicator"
       :aria-hidden="true"
+      @transitionend.capture="onTransitionEnd"
     />
     <span
       v-if="!!$slots.default"
@@ -31,7 +32,22 @@ export default {
     'indeterminate',
     'disabled'
   ],
-  emits: ['update:modelValue']
+  emits: ['update:modelValue'],
+  data: () => ({
+    indeterminateTransitionFix: false
+  }),
+  watch: {
+    indeterminate (e) {
+      if (e) {
+        this.indeterminateTransitionFix = true
+      }
+    }
+  },
+  methods: {
+    onTransitionEnd (e) {
+      this.indeterminateTransitionFix = false
+    }
+  }
 }
 </script>
 
@@ -98,6 +114,12 @@ export default {
     }
   }
 
+  &.indeterminate-fix {
+    input[type="checkbox"] + .checkbox-indicator::before {
+      content: "–";
+    }
+  }
+
   & > span {
     margin-left: 0.5em;
   }
-- 
cgit v1.2.3-70-g09d2


From 9f77f910b86ada3ef9f7e537003ef62ec193c741 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 24 May 2023 11:29:59 +0300
Subject: fix animation when ideterminate is the initial state

---
 src/components/checkbox/checkbox.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/components/checkbox/checkbox.vue b/src/components/checkbox/checkbox.vue
index 274e8d0b..7d4e0e95 100644
--- a/src/components/checkbox/checkbox.vue
+++ b/src/components/checkbox/checkbox.vue
@@ -33,8 +33,8 @@ export default {
     'disabled'
   ],
   emits: ['update:modelValue'],
-  data: () => ({
-    indeterminateTransitionFix: false
+  data: (vm) => ({
+    indeterminateTransitionFix: vm.indeterminate
   }),
   watch: {
     indeterminate (e) {
-- 
cgit v1.2.3-70-g09d2


From d223683b2e1d7f3fc4c2dfc4e4a532cc6c3d67a1 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 24 May 2023 11:32:16 +0300
Subject: make detailed access restriction an expert section

---
 src/components/settings_modal/admin_tabs/instance_tab.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/components/settings_modal/admin_tabs/instance_tab.vue b/src/components/settings_modal/admin_tabs/instance_tab.vue
index cbc578f1..a6be776b 100644
--- a/src/components/settings_modal/admin_tabs/instance_tab.vue
+++ b/src/components/settings_modal/admin_tabs/instance_tab.vue
@@ -108,7 +108,7 @@
             path=":pleroma.:instance.:limit_to_local_content"
           />
         </li>
-        <li>
+        <li v-if="expertLevel">
           <h3>{{ $t('admin_dash.instance.restrict.header') }}</h3>
           <p>
             {{ $t('admin_dash.instance.restrict.description') }}
-- 
cgit v1.2.3-70-g09d2


From ed34b07b3f5e902a59638e3c1fd138a5d90d2d03 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 24 May 2023 11:44:26 +0300
Subject: fix transition when resetting to indeterminate state

---
 src/components/checkbox/checkbox.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/components/checkbox/checkbox.vue b/src/components/checkbox/checkbox.vue
index 7d4e0e95..b8b77e7c 100644
--- a/src/components/checkbox/checkbox.vue
+++ b/src/components/checkbox/checkbox.vue
@@ -45,7 +45,9 @@ export default {
   },
   methods: {
     onTransitionEnd (e) {
-      this.indeterminateTransitionFix = false
+      if (!this.indeterminate) {
+        this.indeterminateTransitionFix = false
+      }
     }
   }
 }
-- 
cgit v1.2.3-70-g09d2


From b3d0360699d2c4a05f92cdbc58493afc2aa55f7a Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 24 May 2023 11:44:41 +0300
Subject: fix and cleanup reset button

---
 src/components/settings_modal/helpers/setting.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/components/settings_modal/helpers/setting.js b/src/components/settings_modal/helpers/setting.js
index fec1b947..b3add346 100644
--- a/src/components/settings_modal/helpers/setting.js
+++ b/src/components/settings_modal/helpers/setting.js
@@ -1,7 +1,7 @@
 import ModifiedIndicator from './modified_indicator.vue'
 import ProfileSettingIndicator from './profile_setting_indicator.vue'
 import DraftButtons from './draft_buttons.vue'
-import { get, set } from 'lodash'
+import { get, set, cloneDeep } from 'lodash'
 
 export default {
   components: {
@@ -218,13 +218,10 @@ export default {
       }
     },
     reset () {
-      console.log('reset')
       if (this.realDraftMode) {
-        console.log(this.draft)
-        console.log(this.state)
-        this.draft = this.state
+        this.draft = cloneDeep(this.state)
       } else {
-        set(this.$store.getters.mergedConfig, this.path, this.defaultState)
+        set(this.$store.getters.mergedConfig, this.path, cloneDeep(this.defaultState))
       }
     },
     hardReset () {
-- 
cgit v1.2.3-70-g09d2


From cbd22d52b8d0cacf01f71edcb799294b93754f60 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 24 May 2023 12:00:16 +0300
Subject: make admin settings modal available on mobile

---
 src/components/side_drawer/side_drawer.js  | 5 ++++-
 src/components/side_drawer/side_drawer.vue | 8 ++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/components/side_drawer/side_drawer.js b/src/components/side_drawer/side_drawer.js
index 27019577..81c5a612 100644
--- a/src/components/side_drawer/side_drawer.js
+++ b/src/components/side_drawer/side_drawer.js
@@ -115,7 +115,10 @@ const SideDrawer = {
       GestureService.updateSwipe(e, this.closeGesture)
     },
     openSettingsModal () {
-      this.$store.dispatch('openSettingsModal')
+      this.$store.dispatch('openSettingsModal', 'user')
+    },
+    openAdminModal () {
+      this.$store.dispatch('openSettingsModal', 'admin')
     }
   }
 }
diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue
index 994ac953..09588767 100644
--- a/src/components/side_drawer/side_drawer.vue
+++ b/src/components/side_drawer/side_drawer.vue
@@ -180,16 +180,16 @@
           v-if="currentUser && currentUser.role === 'admin'"
           @click="toggleDrawer"
         >
-          <a
-            href="/pleroma/admin/#/login-pleroma"
-            target="_blank"
+          <button
+            class="button-unstyled -link -fullwidth"
+            @click.stop="openAdminModal"
           >
             <FAIcon
               fixed-width
               class="fa-scale-110 fa-old-padding"
               icon="tachometer-alt"
             /> {{ $t("nav.administration") }}
-          </a>
+          </button>
         </li>
         <li
           v-if="currentUser && supportsAnnouncements"
-- 
cgit v1.2.3-70-g09d2


From 8e9f0aabbad60049f013a5cfe4c54659f349f3a8 Mon Sep 17 00:00:00 2001
From: baloo toumi <abidin24@disroot.org>
Date: Tue, 23 May 2023 11:24:44 +0000
Subject: Translated using Weblate (Arabic)

Currently translated at 39.7% (394 of 990 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ar/
---
 src/i18n/ar.json | 57 ++++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 43 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/i18n/ar.json b/src/i18n/ar.json
index 7915e779..93367865 100644
--- a/src/i18n/ar.json
+++ b/src/i18n/ar.json
@@ -210,26 +210,26 @@
     "hide_attachments_in_tl": "اخف المرفقات من الخيط الزمني",
     "hide_post_stats": "اخف احصائيات المنشور (مثل عدد التفضيلات)",
     "hide_user_stats": "اخف احصائيات المستخدم (مثل عدد المتابِعين)",
-    "import_followers_from_a_csv_file": "",
+    "import_followers_from_a_csv_file": "استورد المتابِعين من ملف csv",
     "import_theme": "تحميل نموذج",
     "inputRadius": "",
-    "instance_default": "",
+    "instance_default": "(الافتراضي: {value})",
     "interfaceLanguage": "لغة الواجهة",
-    "invalid_theme_imported": "",
+    "invalid_theme_imported": "الملف المختار ليس سمة تدعمها بليروما.لن تطرأ تغييرات على سمتك.",
     "limited_availability": "غير متوفر على متصفحك",
     "links": "الروابط",
     "lock_account_description": "",
-    "loop_video": "",
-    "loop_video_silent_only": "",
+    "loop_video": "كرر الفيديوهات",
+    "loop_video_silent_only": "كرر فيديوهات بدون صوت (مثل gif في ماستودون)",
     "name": "الاسم",
     "name_bio": "الاسم والسيرة الذاتية",
     "new_password": "كلمة السر الجديدة",
     "no_rich_text_description": "",
     "notification_visibility": "نوع الإشعارات التي تريد عرضها",
     "notification_visibility_follows": "يتابع",
-    "notification_visibility_likes": "الإعجابات",
-    "notification_visibility_mentions": "الإشارات",
-    "notification_visibility_repeats": "",
+    "notification_visibility_likes": "المفضلة",
+    "notification_visibility_mentions": "ذِكر",
+    "notification_visibility_repeats": "مشاركات",
     "nsfw_clickthrough": "",
     "oauth_tokens": "رموز OAuth",
     "token": "رمز",
@@ -239,16 +239,16 @@
     "panelRadius": "",
     "pause_on_unfocused": "",
     "presets": "النماذج",
-    "profile_background": "خلفية الصفحة الشخصية",
+    "profile_background": "خلفية الملف التعريفي",
     "profile_banner": "رأسية الصفحة الشخصية",
-    "profile_tab": "الملف الشخصي",
+    "profile_tab": "الملف التعريفي",
     "radii_help": "",
-    "replies_in_timeline": "الردود على الخيط الزمني",
-    "reply_visibility_all": "عرض كافة الردود",
+    "replies_in_timeline": "المشاركات في الخيط الزمني",
+    "reply_visibility_all": "أظهر كل المشاركات",
     "reply_visibility_following": "",
     "reply_visibility_self": "",
     "saving_err": "خطأ أثناء حفظ الإعدادات",
-    "saving_ok": "تم حفظ الإعدادات",
+    "saving_ok": "حُفظت الإعدادات",
     "security_tab": "الأمان",
     "set_new_avatar": "اختيار صورة رمزية جديدة",
     "set_new_profile_background": "اختيار خلفية جديدة للملف الشخصي",
@@ -349,7 +349,36 @@
     "max_thumbnails": "أقصى عدد للصور المصغرة لكل منشور (فارغ = غير محدود)",
     "block_export_button": "صدّر قائمة المحجوبين إلى ملف csv",
     "block_export": "تصدير المحجوبين",
-    "use_one_click_nsfw": "افتح المرفقات ذات المحتوى الحساس NSFW بنقرة واحدة"
+    "use_one_click_nsfw": "افتح المرفقات ذات المحتوى الحساس NSFW بنقرة واحدة",
+    "account_privacy": "خصوصية",
+    "use_contain_fit": "لا تقتص الصور المصغرة للمرفقات",
+    "import_blocks_from_a_csv_file": "استورد المحجوبين من ملف csv",
+    "instance_default_simple": "(افتراضي)",
+    "interface": "واجهة",
+    "birthday": {
+      "label": "تاريخ الميلاد",
+      "show_birthday": "اظهر تاريخ ميلادي"
+    },
+    "profile_fields": {
+      "add_field": "أضف حقل",
+      "value": "محتوى"
+    },
+    "posts": "منشورات",
+    "user_profiles": "ملفات تعريفية للمستخدمين",
+    "notification_visibility_emoji_reactions": "تفاعلات",
+    "notification_visibility_polls": "انتهاء استطلاعات اشتركت بها",
+    "file_export_import": {
+      "restore_settings": "استرجع الإعدادات من ملف",
+      "backup_restore": "نسخ احتياطي للإعدادات"
+    },
+    "mutes_tab": "مكتومون",
+    "no_mutes": "لا يوجد مكتومون",
+    "hide_followers_count_description": "لا تظهر عدد المتابِعين",
+    "show_moderator_badge": "أظهر شارة \"مشرف\" في ملفي التعريفي",
+    "hide_follows_count_description": "لا تظهر عدد المتابَعين",
+    "hide_muted_threads": "اخف النقاشات المكتومة",
+    "no_blocks": "لا يوجد محجوبون",
+    "show_admin_badge": "أظهر شارة \"مدير\" في ملفي التعريفي"
   },
   "timeline": {
     "collapse": "",
-- 
cgit v1.2.3-70-g09d2


From 00b47e16736f8b472f20dab8def30fb22d54c8be Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 5 Jun 2023 21:49:47 +0300
Subject: fix regex misinterpreting tag name in badly formed HTML, prevent rich
 content from ever using dangerous tags

---
 src/components/rich_content/rich_content.jsx   | 4 +++-
 src/services/html_converter/utility.service.js | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/components/rich_content/rich_content.jsx b/src/components/rich_content/rich_content.jsx
index 7881e365..47ef517b 100644
--- a/src/components/rich_content/rich_content.jsx
+++ b/src/components/rich_content/rich_content.jsx
@@ -149,7 +149,9 @@ export default {
       // Handle tag nodes
       if (Array.isArray(item)) {
         const [opener, children, closer] = item
-        const Tag = getTagName(opener)
+        let Tag = getTagName(opener)
+        if (Tag === 'script') Tag = 'js-exploit'
+        if (Tag === 'style') Tag = 'css-exploit'
         const fullAttrs = getAttrs(opener, () => true)
         const attrs = getAttrs(opener)
         const previouslyMentions = currentMentions !== null
diff --git a/src/services/html_converter/utility.service.js b/src/services/html_converter/utility.service.js
index f1042971..a1301353 100644
--- a/src/services/html_converter/utility.service.js
+++ b/src/services/html_converter/utility.service.js
@@ -5,7 +5,7 @@
  * @return {String} - tagname, i.e. "div"
  */
 export const getTagName = (tag) => {
-  const result = /(?:<\/(\w+)>|<(\w+)\s?.*?\/?>)/gi.exec(tag)
+  const result = /(?:<\/(\w+)>|<(\w+)\s?.*?\/?>)/gis.exec(tag)
   return result && (result[1] || result[2])
 }
 
-- 
cgit v1.2.3-70-g09d2


From 0109724a5f16e58a78ab4c09c955c44982368c6f Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 5 Jun 2023 21:57:36 +0300
Subject: case insensititvy

---
 src/components/rich_content/rich_content.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/components/rich_content/rich_content.jsx b/src/components/rich_content/rich_content.jsx
index 47ef517b..b16ab242 100644
--- a/src/components/rich_content/rich_content.jsx
+++ b/src/components/rich_content/rich_content.jsx
@@ -150,8 +150,8 @@ export default {
       if (Array.isArray(item)) {
         const [opener, children, closer] = item
         let Tag = getTagName(opener)
-        if (Tag === 'script') Tag = 'js-exploit'
-        if (Tag === 'style') Tag = 'css-exploit'
+        if (Tag.toLowerCase() === 'script') Tag = 'js-exploit'
+        if (Tag.toLowerCase() === 'style') Tag = 'css-exploit'
         const fullAttrs = getAttrs(opener, () => true)
         const attrs = getAttrs(opener)
         const previouslyMentions = currentMentions !== null
-- 
cgit v1.2.3-70-g09d2


From 8ba22a248118dfd5869adc9da881794e464e564c Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Fri, 9 Jun 2023 16:11:15 -0400
Subject: Fix react button not working if reaction accounts are not loaded

---
 changelog.d/react-button.fix                      | 1 +
 src/components/emoji_reactions/emoji_reactions.js | 7 ++++---
 src/modules/statuses.js                           | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)
 create mode 100644 changelog.d/react-button.fix

(limited to 'src')

diff --git a/changelog.d/react-button.fix b/changelog.d/react-button.fix
new file mode 100644
index 00000000..c2222fb6
--- /dev/null
+++ b/changelog.d/react-button.fix
@@ -0,0 +1 @@
+Fix react button not working if reaction accounts are not loaded
diff --git a/src/components/emoji_reactions/emoji_reactions.js b/src/components/emoji_reactions/emoji_reactions.js
index b4936424..4d5c6c5a 100644
--- a/src/components/emoji_reactions/emoji_reactions.js
+++ b/src/components/emoji_reactions/emoji_reactions.js
@@ -57,10 +57,10 @@ const EmojiReactions = {
     reactedWith (emoji) {
       return this.status.emoji_reactions.find(r => r.name === emoji).me
     },
-    fetchEmojiReactionsByIfMissing () {
+    async fetchEmojiReactionsByIfMissing () {
       const hasNoAccounts = this.status.emoji_reactions.find(r => !r.accounts)
       if (hasNoAccounts) {
-        this.$store.dispatch('fetchEmojiReactionsBy', this.status.id)
+        return await this.$store.dispatch('fetchEmojiReactionsBy', this.status.id)
       }
     },
     reactWith (emoji) {
@@ -69,9 +69,10 @@ const EmojiReactions = {
     unreact (emoji) {
       this.$store.dispatch('unreactWithEmoji', { id: this.status.id, emoji })
     },
-    emojiOnClick (emoji, event) {
+    async emojiOnClick (emoji, event) {
       if (!this.loggedIn) return
 
+      await this.fetchEmojiReactionsByIfMissing()
       if (this.reactedWith(emoji)) {
         this.unreact(emoji)
       } else {
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 93a4a957..ed21a730 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -757,7 +757,7 @@ const statuses = {
       )
     },
     fetchEmojiReactionsBy ({ rootState, commit }, id) {
-      rootState.api.backendInteractor.fetchEmojiReactions({ id }).then(
+      return rootState.api.backendInteractor.fetchEmojiReactions({ id }).then(
         emojiReactions => {
           commit('addEmojiReactionsBy', { id, emojiReactions, currentUser: rootState.users.currentUser })
         }
-- 
cgit v1.2.3-70-g09d2


From 4e6af5bd234d9ce9be04286d7645d81a3cbc910b Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Tue, 13 Jun 2023 14:00:20 -0400
Subject: Fix openSettingsModalTab

---
 changelog.d/edit-profile-button.fix | 1 +
 src/modules/interface.js            | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/edit-profile-button.fix

(limited to 'src')

diff --git a/changelog.d/edit-profile-button.fix b/changelog.d/edit-profile-button.fix
new file mode 100644
index 00000000..5a92765c
--- /dev/null
+++ b/changelog.d/edit-profile-button.fix
@@ -0,0 +1 @@
+Fix openSettingsModalTab so that it correctly opens Settings modal instead of Admin modal
diff --git a/src/modules/interface.js b/src/modules/interface.js
index 2d012f1b..f8d62d87 100644
--- a/src/modules/interface.js
+++ b/src/modules/interface.js
@@ -112,7 +112,7 @@ const interfaceMod = {
     },
     openSettingsModalTab ({ commit }, value) {
       commit('setSettingsModalTargetTab', value)
-      commit('openSettingsModal')
+      commit('openSettingsModal', 'user')
     },
     pushGlobalNotice (
       { commit, dispatch, state },
-- 
cgit v1.2.3-70-g09d2


From db1643b94e47262bf5648d53d9a21f2d5cec7f00 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Tue, 13 Jun 2023 15:06:46 -0400
Subject: Keep aspect ratio of custom emoji reaction in notification

---
 changelog.d/custom-emoji-notif-width.fix        | 1 +
 src/components/notifications/notifications.scss | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 changelog.d/custom-emoji-notif-width.fix

(limited to 'src')

diff --git a/changelog.d/custom-emoji-notif-width.fix b/changelog.d/custom-emoji-notif-width.fix
new file mode 100644
index 00000000..da118f6b
--- /dev/null
+++ b/changelog.d/custom-emoji-notif-width.fix
@@ -0,0 +1 @@
+Keep aspect ratio of custom emoji reaction in notification
diff --git a/src/components/notifications/notifications.scss b/src/components/notifications/notifications.scss
index 61f7317e..5749e430 100644
--- a/src/components/notifications/notifications.scss
+++ b/src/components/notifications/notifications.scss
@@ -136,6 +136,7 @@
 
   .emoji-reaction-emoji-image {
     vertical-align: middle;
+    object-fit: contain;
   }
 
   .notification-details {
-- 
cgit v1.2.3-70-g09d2


From 66a881db4f2f7805042f60a78cfa22b821c7236b Mon Sep 17 00:00:00 2001
From: baloo toumi <abidin24@disroot.org>
Date: Sat, 27 May 2023 16:26:06 +0000
Subject: Translated using Weblate (Arabic)

Currently translated at 41.8% (441 of 1054 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ar/
---
 src/i18n/ar.json | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 61 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/i18n/ar.json b/src/i18n/ar.json
index 93367865..8fed47fc 100644
--- a/src/i18n/ar.json
+++ b/src/i18n/ar.json
@@ -219,7 +219,7 @@
     "limited_availability": "غير متوفر على متصفحك",
     "links": "الروابط",
     "lock_account_description": "",
-    "loop_video": "كرر الفيديوهات",
+    "loop_video": "كرر تشغيل الفيديوهات",
     "loop_video_silent_only": "كرر فيديوهات بدون صوت (مثل gif في ماستودون)",
     "name": "الاسم",
     "name_bio": "الاسم والسيرة الذاتية",
@@ -369,7 +369,9 @@
     "notification_visibility_polls": "انتهاء استطلاعات اشتركت بها",
     "file_export_import": {
       "restore_settings": "استرجع الإعدادات من ملف",
-      "backup_restore": "نسخ احتياطي للإعدادات"
+      "backup_restore": "نسخ احتياطي للإعدادات",
+      "backup_settings_theme": "احفظ النسخ الاحتياطي للإعدادات والسمة في ملف",
+      "backup_settings": "احفظ النسخ الاحتياطي للإعدادات في ملف"
     },
     "mutes_tab": "مكتومون",
     "no_mutes": "لا يوجد مكتومون",
@@ -378,7 +380,63 @@
     "hide_follows_count_description": "لا تظهر عدد المتابَعين",
     "hide_muted_threads": "اخف النقاشات المكتومة",
     "no_blocks": "لا يوجد محجوبون",
-    "show_admin_badge": "أظهر شارة \"مدير\" في ملفي التعريفي"
+    "show_admin_badge": "أظهر شارة \"مدير\" في ملفي التعريفي",
+    "conversation_display_tree": "تفرعات",
+    "notification_setting_block_from_strangers": "احجب اشعارات من لا تتابعهم",
+    "style": {
+      "switcher": {
+        "clear_all": "امسح الكل",
+        "keep_as_is": "أبقه على حاله",
+        "use_snapshot": "النسخة القديمة",
+        "use_source": "النسخة الحديثة",
+        "load_theme": "حمِّل سمة",
+        "help": {
+          "upgraded_from_v2": "PleromaFE حُدث، وعليه ربما ستجد اختلافًا في السمة."
+        },
+        "keep_color": "أبق الألوان",
+        "keep_opacity": "أبق الشفافية",
+        "keep_fonts": "أبق الخطوط",
+        "keep_shadows": "أبق الظلال"
+      },
+      "common": {
+        "color": "اللون",
+        "opacity": "الشافافية"
+      }
+    },
+    "notification_setting_privacy": "الخصوصية",
+    "notification_mutes": "لوقف استلام إشعارات من مستخدم، اكتمه.",
+    "search_user_to_mute": "جِد من تريد كتمه",
+    "subject_input_always_show": "أظهر حقل الموضوع دائمًا",
+    "subject_line_noop": "لا تنسخ",
+    "auto_update": "أظهر المنشورات الجديدة تلقائيًا",
+    "mention_link_display": "اعرض روابط الذكر",
+    "more_settings": "إعدادات إضافية",
+    "user_mutes": "مستخدمون",
+    "mention_link_show_avatar": "أظهر الصورة الرمزية للمستخدم بجانب الرابط",
+    "preview": "معاينة",
+    "show_scrollbars": "أظهر شريط التمرير للعمود الجانبي",
+    "third_column_mode": "أظهر محتوى العمود الثالث إذا توفرت المساحة",
+    "third_column_mode_none": "لا تظهر العمود الثالث",
+    "third_column_mode_notifications": "عمود الإشعارات",
+    "columns": "الأعمدة",
+    "column_sizes": "حجم الأعمدة",
+    "column_sizes_sidebar": "الشريط الجانبي",
+    "type_domains_to_mute": "جِد نطاقًا لكتمه",
+    "upload_a_photo": "ارفع صورة",
+    "virtual_scrolling": "حسن تصيير الخيط الزمني",
+    "user_popover_avatar_action_zoom": "كبر صورة الرمزية",
+    "fun": "ممتع",
+    "column_sizes_content": "المحتوى",
+    "column_sizes_notifs": "الإشعارات",
+    "search_user_to_block": "جِد من تريد حجبه",
+    "url": "رابط",
+    "subject_line_behavior": "انسخ الموضوع عند الرد",
+    "conversation_display": "اسلوب عرض المحادثة",
+    "mention_link_show_avatar_quick": "أظهر الصورة الرمزية للمستخدم عند ذكره",
+    "user_popover_avatar_action_open": "افتح الملف الشخصي",
+    "notifications": "الإشعارات",
+    "notification_setting_filters": "مرشح",
+    "notification_setting_hide_notification_contents": "اخف محتوى الإشعارات ومرسليها"
   },
   "timeline": {
     "collapse": "",
-- 
cgit v1.2.3-70-g09d2


From 5d63833c99cbfd7b2075c1cfbdc880acd119ece9 Mon Sep 17 00:00:00 2001
From: baloo toumi <abidin24@disroot.org>
Date: Tue, 30 May 2023 13:51:58 +0000
Subject: Translated using Weblate (Arabic)

Currently translated at 45.9% (484 of 1054 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ar/
---
 src/i18n/ar.json | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 62 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/i18n/ar.json b/src/i18n/ar.json
index 8fed47fc..da86b831 100644
--- a/src/i18n/ar.json
+++ b/src/i18n/ar.json
@@ -401,6 +401,59 @@
       "common": {
         "color": "اللون",
         "opacity": "الشافافية"
+      },
+      "advanced_colors": {
+        "top_bar": "شريط العلوي",
+        "icons": "أيقونات",
+        "poll": "منحنى الاستطلاع",
+        "_tab_label": "متقدم",
+        "badge_notification": "الإشعارات",
+        "selectedPost": "منشور محدد",
+        "selectedMenu": "عنصر محدد من قائمة",
+        "highlight": "عناصر بارزة",
+        "disabled": "معطل",
+        "tabs": "ألسنة",
+        "chat": {
+          "border": "حدود"
+        },
+        "alert_warning": "تحذير",
+        "alert_error": "خطأ",
+        "buttons": "أزرار",
+        "borders": "الحدود",
+        "wallpaper": "خلفية"
+      },
+      "shadows": {
+        "components": {
+          "button": "زر",
+          "input": "حقل إدخال",
+          "topBar": "شريط العلوي",
+          "avatar": "الصورة الرمزية لمستخدم (في الملف الشخصي)",
+          "avatarStatus": "الصورة الرمزية لمستخدم (في منشور)"
+        },
+        "_tab_label": "الظلال والإضاءة",
+        "shadow_id": "ظل #{value}",
+        "blur": "طمس",
+        "spread": "توزع"
+      },
+      "fonts": {
+        "size": "حجم (بالبكسل)",
+        "_tab_label": "خطوط",
+        "components": {
+          "interface": "واجهة",
+          "input": "حقول الإدخال",
+          "post": "نص المنشور"
+        },
+        "family": "اسم الخط",
+        "custom": "مخصص"
+      },
+      "preview": {
+        "header": "معاينة",
+        "content": "محتوى",
+        "header_faint": "جيد",
+        "mono": "محتوى",
+        "button": "زر",
+        "input": "وصلت للتوّ إلى لوس أنجلس.",
+        "fine_print": "طالع {0} لتعلم ما لا ينفعك!"
       }
     },
     "notification_setting_privacy": "الخصوصية",
@@ -425,7 +478,7 @@
     "upload_a_photo": "ارفع صورة",
     "virtual_scrolling": "حسن تصيير الخيط الزمني",
     "user_popover_avatar_action_zoom": "كبر صورة الرمزية",
-    "fun": "ممتع",
+    "fun": "متعة",
     "column_sizes_content": "المحتوى",
     "column_sizes_notifs": "الإشعارات",
     "search_user_to_block": "جِد من تريد حجبه",
@@ -436,7 +489,14 @@
     "user_popover_avatar_action_open": "افتح الملف الشخصي",
     "notifications": "الإشعارات",
     "notification_setting_filters": "مرشح",
-    "notification_setting_hide_notification_contents": "اخف محتوى الإشعارات ومرسليها"
+    "notification_setting_hide_notification_contents": "اخف محتوى الإشعارات ومرسليها",
+    "mention_link_display_short": "اسماء قصيرة (مثل {'@'}foo)",
+    "mention_link_display_full_for_remote": "اسماء كاملة للمستخدمين من الخوادم البعاد ({'@'}foo{'@'}example.org)",
+    "version": {
+      "title": "نسخة"
+    },
+    "commit_value": "احفظ",
+    "mention_link_display_full": "اسماء كاملة دايمًا (مثل {'@'}foo{'@'}example.org)"
   },
   "timeline": {
     "collapse": "",
-- 
cgit v1.2.3-70-g09d2


From 20621c71dc6aec8a10eb4943656122ffa6c9e9b2 Mon Sep 17 00:00:00 2001
From: baloo toumi <abidin24@disroot.org>
Date: Thu, 1 Jun 2023 18:23:22 +0000
Subject: Translated using Weblate (Arabic)

Currently translated at 46.0% (485 of 1054 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ar/
---
 src/i18n/ar.json | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src')

diff --git a/src/i18n/ar.json b/src/i18n/ar.json
index da86b831..416626ba 100644
--- a/src/i18n/ar.json
+++ b/src/i18n/ar.json
@@ -645,5 +645,10 @@
   "remote_user_resolver": {
     "searching_for": "يبحث عن",
     "error": "لم يُعثر عليه."
+  },
+  "admin_dash": {
+    "nodb": {
+      "documentation": "التوثيق"
+    }
   }
 }
-- 
cgit v1.2.3-70-g09d2


From 6ff477e124debb3d4e136df0fa9da2fc2ea8fe38 Mon Sep 17 00:00:00 2001
From: baloo toumi <abidin24@disroot.org>
Date: Sat, 3 Jun 2023 10:21:09 +0000
Subject: Translated using Weblate (Arabic)

Currently translated at 55.3% (583 of 1054 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ar/
---
 src/i18n/ar.json | 140 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 133 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/i18n/ar.json b/src/i18n/ar.json
index 416626ba..ed84da53 100644
--- a/src/i18n/ar.json
+++ b/src/i18n/ar.json
@@ -453,7 +453,9 @@
         "mono": "محتوى",
         "button": "زر",
         "input": "وصلت للتوّ إلى لوس أنجلس.",
-        "fine_print": "طالع {0} لتعلم ما لا ينفعك!"
+        "fine_print": "طالع {0} لتعلّم ما لا ينفعك!",
+        "error": "مثال خطأ",
+        "faint_link": "دليل للمساعدة"
       }
     },
     "notification_setting_privacy": "الخصوصية",
@@ -499,14 +501,18 @@
     "mention_link_display_full": "اسماء كاملة دايمًا (مثل {'@'}foo{'@'}example.org)"
   },
   "timeline": {
-    "collapse": "",
+    "collapse": "طوي",
     "conversation": "محادثة",
     "error_fetching": "خطأ أثناء جلب التحديثات",
-    "load_older": "تحميل المنشورات القديمة",
+    "load_older": "حمل الحالات القديمة",
     "no_retweet_hint": "",
-    "repeated": "",
-    "show_new": "عرض الجديد",
-    "up_to_date": "تم تحديثه"
+    "repeated": "شورِك",
+    "show_new": "اعرض الجديد",
+    "up_to_date": "محدث",
+    "no_more_statuses": "لا مزيد من الحالات",
+    "error": "خطأ أثناء جلب الخيط الزمني: {0}",
+    "reload": "أعد التحميل",
+    "no_statuses": "لا توجد حالات"
   },
   "user_card": {
     "approve": "قبول",
@@ -648,7 +654,127 @@
   },
   "admin_dash": {
     "nodb": {
-      "documentation": "التوثيق"
+      "documentation": "التوثيق",
+      "text2": "اغلب خيارات الضبط لن تتوفر."
+    },
+    "window_title": "الإدارة",
+    "wip_notice": "لوحة المدير لا زالت تجريبية ولا تزال قيد للتطوير، {adminFeLink}.",
+    "old_ui_link": "واجهة المدير القديمة هنا",
+    "commit_all": "احفظ الكل",
+    "tabs": {
+      "instance": "مثيل"
+    },
+    "instance": {
+      "instance": "معلومات المثيل",
+      "registrations": "تسجيل المستخدمين",
+      "restrict": {
+        "header": "قيّد وصول الزواروالمجهولين",
+        "timelines": "وصول الخط الزمني",
+        "profiles": "وصول الملفات الشخصية",
+        "activities": "وصول النشاطات/الحالات"
+      }
+    },
+    "limits": {
+      "posts": "حد النشر",
+      "uploads": "حد المرفقات"
+    },
+    "frontend": {
+      "repository": "رابط المستودع",
+      "versions": "النسخ المتوفرة",
+      "build_url": "رابط البناء",
+      "reinstall": "أعد التثبيت",
+      "is_default": "(افتراضي)",
+      "is_default_custom": "(افتراضي، النسخة: {version})",
+      "install": "ثبّت",
+      "install_version": "ثبت النسخة {version}",
+      "more_install_options": "مزيد من خيارات التثبيت",
+      "set_default": "عينه كافتراضي",
+      "set_default_version": "عين النسخة {version} كافتراضية",
+      "available_frontends": "متوفر للتثبيت"
+    },
+    "temp_overrides": {
+      ":pleroma": {
+        ":instance": {
+          ":public": {
+            "label": "المثيل علني",
+            "description": "تعطيله سيحصر الوصول إلى API للمستخدمين الوالجين، ولن يقدر الزوار على الوصول إلى الخط الزمني العلني والموحد."
+          },
+          ":description_limit": {
+            "description": "حد عدد المحارف لوصف المرفق"
+          },
+          ":background_image": {
+            "label": "صورة الخلفية"
+          }
+        }
+      }
     }
+  },
+  "time": {
+    "in_past": "منذ {0}",
+    "unit": {
+      "hours_short": "{0}سا",
+      "minutes": "{0} دقيقة | {0} دقائق",
+      "days_short": "{0}ي",
+      "minutes_short": "{0}د",
+      "hours": "{0} ساعة | {0} ساعات",
+      "weeks": "{0} أسبوع | {0} أسابيع",
+      "months_short": "{0}ش",
+      "seconds": "{0} ثانية | {0} ثانية",
+      "seconds_short": "{0}ثا",
+      "years": "{0} سنة | {0} سنوات",
+      "years_short": "{0}سن",
+      "days": "{0} يوم | {0} أيام",
+      "months": "{0} شهر | {0} أشهر",
+      "weeks_short": "{0}أس"
+    },
+    "in_future": "في {0}",
+    "now": "هذه اللحظة",
+    "now_short": "الآن"
+  },
+  "status": {
+    "delete_confirm": "أتريد حذف هذه الحالة؟",
+    "delete_error": "خطأ أثناء حذف الحالة: {0}",
+    "plus_more": "+{number} أخرون",
+    "many_attachments": "المنشور يحوي {number} مرفقات",
+    "repeat_confirm": "أتريد مشاركة هذه الحالة؟",
+    "edited_at": "(آخر تعديل {time})",
+    "repeat_confirm_title": "تأكيد المشاركة",
+    "repeat_confirm_accept_button": "شارك",
+    "repeat_confirm_cancel_button": "لا تشارك",
+    "edit": "حرر الحالة",
+    "pin": "ثبته على الملف الشخصي",
+    "unpin": "ألغ تثبيته من الملف الشخصي",
+    "delete_confirm_cancel_button": "أبقه",
+    "replies_list": "الردود:",
+    "status_deleted": "هذا المنشور محذوف",
+    "favorites": "المفضلة",
+    "pinned": "مثبت",
+    "hide_full_subject": "اخف كامل الموضوع",
+    "repeats": "المشاركات",
+    "delete": "اخذف الحالة",
+    "delete_confirm_title": "تأكيد الحذف",
+    "reply_to": "رد على",
+    "mentions": "الذكر",
+    "unmute_conversation": "ارفع الكتم عن المحادثة",
+    "status_unavailable": "الحالة غير متوفرة",
+    "copy_link": "انسخ رابط الحالة",
+    "show_full_subject": "أظهر الموضوع كاملا",
+    "show_content": "أظهر المحتوى",
+    "hide_content": "اخف المحتوى",
+    "you": "(أنت)",
+    "show_all_attachments": "أظهر كل المرفقات",
+    "hide_attachment": "اخف المرفق",
+    "move_down": "حرك المرفق لليمين",
+    "thread_hide": "اخف هذا النقاش",
+    "thread_muted": "النقاش مكتوم",
+    "delete_confirm_accept_button": "احذف",
+    "mute_conversation": "اكتم المحادثة",
+    "external_source": "مصدر خارجي",
+    "expand": "وسّع",
+    "collapse_attachments": "طوي المرفقات",
+    "remove_attachment": "أزل المرفق",
+    "move_up": "حرك المرفق لليسار",
+    "open_gallery": "افتح المعرض",
+    "thread_show": "أظهر هذا النقاس"
   }
 }
-- 
cgit v1.2.3-70-g09d2


From 148e8a71700c3daa0e02a28214e0e0ce93b78290 Mon Sep 17 00:00:00 2001
From: baloo toumi <abidin24@disroot.org>
Date: Tue, 6 Jun 2023 20:26:16 +0000
Subject: Translated using Weblate (Arabic)

Currently translated at 57.8% (610 of 1054 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ar/
---
 src/i18n/ar.json | 34 ++++++++++++++++++++++++++++++----
 1 file changed, 30 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/i18n/ar.json b/src/i18n/ar.json
index ed84da53..4c213715 100644
--- a/src/i18n/ar.json
+++ b/src/i18n/ar.json
@@ -517,10 +517,10 @@
   "user_card": {
     "approve": "قبول",
     "block": "حظر",
-    "blocked": "تم حظره!",
+    "blocked": "حُظر!",
     "deny": "رفض",
-    "follow": "اتبع",
-    "followees": "",
+    "follow": "تابع",
+    "followees": "متابَعون",
     "followers": "مُتابِعون",
     "following": "",
     "follows_you": "يتابعك!",
@@ -528,7 +528,33 @@
     "muted": "تم كتمه",
     "per_day": "في اليوم",
     "remote_follow": "مُتابَعة عن بُعد",
-    "statuses": "المنشورات"
+    "statuses": "المنشورات",
+    "approve_confirm_accept_button": "قبول",
+    "approve_confirm_title": "تأكيد القبول",
+    "edit_profile": "عدّل الملف الشخصي",
+    "deny_confirm": "أتريد رفض طلب المتابعة من {user} ؟",
+    "unfollow_confirm_title": "تأكيد إلغاء المتابعة",
+    "follow_progress": "الطلب جارٍ…",
+    "hidden": "مخفي",
+    "its_you": "أنت!",
+    "approve_confirm_cancel_button": "لا تقبل",
+    "approve_confirm": "أتريد قبول طلب المتابعة من {user} ؟",
+    "block_confirm_title": "تأكيد الحظر",
+    "block_confirm_accept_button": "حظر",
+    "block_confirm_cancel_button": "لا تحظر",
+    "deactivated": "عُطل",
+    "deny_confirm_title": "تأكيد الرفض",
+    "deny_confirm_accept_button": "رفض",
+    "deny_confirm_cancel_button": "لا ترفض",
+    "favorites": "المفضلة",
+    "follow_cancel": "ألغ الطلب",
+    "follow_sent": "أُرسل الطلب!",
+    "follow_unfollow": "ألغ المتابعة",
+    "unfollow_confirm": "أتريد إلغاء متابعة {user}؟",
+    "unfollow_confirm_accept_button": "ألغ المتابعة",
+    "unfollow_confirm_cancel_button": "لا تلغ المتابعة",
+    "media": "وسائط",
+    "block_confirm": "أتريد حظر {user} ؟"
   },
   "user_profile": {
     "timeline_title": "الخيط الزمني للمستخدم"
-- 
cgit v1.2.3-70-g09d2


From a7705ade8881a20be3a1d5fc4de5e65564c1f2bb Mon Sep 17 00:00:00 2001
From: baloo toumi <abidin24@disroot.org>
Date: Fri, 9 Jun 2023 12:10:55 +0000
Subject: Translated using Weblate (Arabic)

Currently translated at 58.3% (615 of 1054 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ar/
---
 src/i18n/ar.json | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/i18n/ar.json b/src/i18n/ar.json
index 4c213715..f2a62ff9 100644
--- a/src/i18n/ar.json
+++ b/src/i18n/ar.json
@@ -524,8 +524,8 @@
     "followers": "مُتابِعون",
     "following": "",
     "follows_you": "يتابعك!",
-    "mute": "كتم",
-    "muted": "تم كتمه",
+    "mute": "اكتم",
+    "muted": "مكتوم",
     "per_day": "في اليوم",
     "remote_follow": "مُتابَعة عن بُعد",
     "statuses": "المنشورات",
@@ -554,7 +554,13 @@
     "unfollow_confirm_accept_button": "ألغ المتابعة",
     "unfollow_confirm_cancel_button": "لا تلغ المتابعة",
     "media": "وسائط",
-    "block_confirm": "أتريد حظر {user} ؟"
+    "block_confirm": "أتريد حظر {user} ؟",
+    "mute_confirm_cancel_button": "لا تكتم",
+    "mute_confirm_title": "تأكيد الكتم",
+    "message": "راسل",
+    "mute_confirm": "أتريد كتم {user}؟",
+    "mute_confirm_accept_button": "اكتم",
+    "mention": "أذكر"
   },
   "user_profile": {
     "timeline_title": "الخيط الزمني للمستخدم"
-- 
cgit v1.2.3-70-g09d2


From 96ef76f1d76df7bd1e216524d5fe429830146aa6 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Sun, 18 Jun 2023 15:44:19 -0400
Subject: Make emoji picker buttons accessible

---
 src/components/emoji_picker/emoji_picker.vue | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src')

diff --git a/src/components/emoji_picker/emoji_picker.vue b/src/components/emoji_picker/emoji_picker.vue
index 6972164b..3319dace 100644
--- a/src/components/emoji_picker/emoji_picker.vue
+++ b/src/components/emoji_picker/emoji_picker.vue
@@ -22,6 +22,7 @@
               active: activeGroupView === group.id
             }"
             :title="group.text"
+            role="button"
             @click.prevent="highlight(group.id)"
           >
             <span
@@ -108,6 +109,7 @@
                     :key="group.id + emoji.displayText"
                     :title="maybeLocalizedEmojiName(emoji)"
                     class="emoji-item"
+                    role="button"
                     @click.stop.prevent="onEmoji(emoji)"
                   >
                     <span
@@ -118,6 +120,7 @@
                       v-else
                       class="emoji-picker-emoji -custom"
                       loading="lazy"
+                      :alt="maybeLocalizedEmojiName(emoji)"
                       :src="emoji.imageUrl"
                       :data-emoji-name="group.id + emoji.displayText"
                     />
-- 
cgit v1.2.3-70-g09d2


From 21093e573c90f943d7ab29542f3d57f50c4196df Mon Sep 17 00:00:00 2001
From: Kian-ting Tan <chenjt30@gmail.com>
Date: Tue, 20 Jun 2023 14:10:51 +0000
Subject: Main

---
 src/i18n/languages.js                 |    2 +-
 src/i18n/nan.json                     | 1253 +++++++++++++++++++++++++++++++++
 src/services/locale/locale.service.js |    2 +
 3 files changed, 1256 insertions(+), 1 deletion(-)
 create mode 100644 src/i18n/nan.json

(limited to 'src')

diff --git a/src/i18n/languages.js b/src/i18n/languages.js
index 250b3b1a..1d14fe9c 100644
--- a/src/i18n/languages.js
+++ b/src/i18n/languages.js
@@ -1,4 +1,3 @@
-
 const languages = [
   'ar',
   'ca',
@@ -18,6 +17,7 @@ const languages = [
   'ja',
   'ja_easy',
   'ko',
+	'nan',
   'nb',
   'nl',
   'oc',
diff --git a/src/i18n/nan.json b/src/i18n/nan.json
new file mode 100644
index 00000000..82e9f281
--- /dev/null
+++ b/src/i18n/nan.json
@@ -0,0 +1,1253 @@
+{
+  "about": {
+    "mrf": {
+		"federation": "聯邦",
+      "keyword": {
+          "keyword_policies": "關鍵字政策",
+        "ftl_removal": "Tuì「知影 ê 網路」時間線除掉。",
+        "reject": "拒絕",
+        "replace": "取代",
+        "is_replaced_by": "→"
+      },
+      "mrf_policies": "啟用 ê MRF 政策",
+      "mrf_policies_desc": "MRF 政策操作本站 ê 對外通信行為。以下ê政策啟用 ah：",
+      "simple": {
+        "simple_policies": "站臺特有 ê 政策",
+        "instance": "站",
+        "reason": "理由",
+        "not_applicable": "N/A",
+        "accept": "接受",
+        "accept_desc": "本站干焦接受下跤 ê 站 ê 短 phue：",
+        "reject": "拒絕",
+        "reject_desc": "本站 buē 接受 tuì 以下 ê 站 ê 短 phue：",
+        "quarantine": "隔離",
+        "quarantine_desc": "針對下跤 ê 站，本站干焦送出公開ê PO文：",
+        "ftl_removal": "Tuì「知影 ê 網路」時間線thâi掉",
+        "ftl_removal_desc": "本站buē 佇「知影 ê 網路」刊下跤 ê 站 ê PO文：",
+        "media_removal": "Thâi除媒體",
+        "media_removal_desc": "本站 kā 下跤 ê 站臺送 ê PO文 ê 媒體 lóng thâi 除：",
+        "media_nsfw": "媒體 lóng 標做「敏感內容」",
+        "media_nsfw_desc": "本站 kā 下跤 ê 站 ê 媒體，lóng 標做敏感內容："
+      }
+    },
+    "staff": "工作人員"
+  },
+  "announcements": {
+    "page_header": "公告",
+    "title": "公告",
+    "mark_as_read_action": "標做有讀",
+    "post_form_header": "貼公告",
+    "post_placeholder": "佇 tsia 拍你 ê 公告……",
+    "post_action": "貼",
+    "post_error": "錯誤：{error}",
+    "close_error": "關",
+    "delete_action": "Thâi",
+    "start_time_prompt": "開始時間： ",
+    "end_time_prompt": "結束時間：",
+    "all_day_prompt": "Tse 是 kui 工 ê 事件",
+    "published_time_display": "公告佇 {time}",
+    "start_time_display": "有效 tuì：{time}",
+    "end_time_display": "中止佇：{time}",
+    "edit_action": "編輯",
+    "submit_edit_action": "送出",
+    "cancel_edit_action": "取消",
+    "inactive_message": "這个公告 tsit-má 無效力。"
+  },
+  "shoutbox": {
+    "title": "留話枋"
+  },
+  "domain_mute_card": {
+    "mute": "予恬去",
+    "mute_progress": "Teh 予恬……",
+    "unmute": "予有聲",
+    "unmute_progress": "Teh 予有聲……"
+  },
+  "exporter": {
+    "export": "匯出",
+    "processing": "Teh 處理，較停仔指示你下載檔案……"
+  },
+  "features_panel": {
+    "shout": "留話枋",
+    "pleroma_chat_messages": "Pleroma 開講",
+    "gopher": "Gopher",
+    "media_proxy": "媒體代理伺侯器",
+    "scope_options": "公開範圍選項",
+    "text_limit": "字數限制",
+    "title": "有效 ê 功能",
+    "who_to_follow": "啥儂通綴",
+    "upload_limit": "檔案 sài-suh 限制"
+  },
+  "finder": {
+    "error_fetching_user": "Tshuē 用者 ê 時起錯誤",
+    "find_user": "Tshuē 用者"
+  },
+  "general": {
+      "apply": "應用",
+    "submit": "送出",
+    "more": "Koh 較 tsē",
+    "loading": "Leh 載入……",
+    "generic_error": "起錯誤 ah",
+    "generic_error_message": "起錯誤：{0}",
+    "error_retry": "請 koh 試一 kái",
+    "retry": "Koh 試",
+    "optional": "非必要",
+    "show_more": "展示較 tsē",
+    "show_less": "展示較少",
+    "never_show_again": "Mài koh 展示",
+    "dismiss": "無視",
+    "cancel": "取消",
+    "disable": "無愛用",
+    "enable": "啟用",
+    "confirm": "確認",
+    "verify": "驗證",
+    "close": "關掉",
+    "undo": "復原",
+    "yes": "是",
+    "no": "毋是",
+    "peek": "先看 māi",
+    "scroll_to_top": "捲 kàu 頂懸",
+    "role": {
+      "admin": "行政員",
+      "moderator": "管理員"
+    },
+    "unpin": "無愛 kā 釘",
+    "pin": "Kā釘起來",
+    "flash_content": "Ji̍h tsia，用 Ruffle（iáu teh 試驗，可能 buē 紡）看 Flash ê 內容。",
+    "flash_sepcurity": "注意 tse 可能有危險，因為 Flash 內容猶原是任意 ê 程式碼。",
+    "flash_fail": "載入 flash 內容失敗，詳細會當看控制臺。",
+    "scope_in_timeline": {
+      "direct": "私人 phue",
+      "private": "干焦 hōo 綴 lí ê 看",
+      "public": "公開佇公共時間線",
+      "unlisted": "無愛公開佇公共時間線"
+    }
+  },
+  "image_cropper": {
+    "crop_picture": "裁相片",
+    "save": "儲存",
+    "save_without_cropping": "無裁就儲存",
+    "cancel": "取消"
+  },
+  "importer": {
+    "submit": "送出",
+    "success": "匯入成功。",
+    "error": "佇匯入 ê 時起錯誤。"
+  },
+  "login": {
+    "login": "登入",
+    "description": "用 OAuth 登入",
+    "logout": "登出",
+    "logout_confirm_title": "登出確認",
+    "logout_confirm": "Lí　敢真正　beh　登出？",
+    "logout_confirm_accept_button": "登出",
+    "logout_confirm_cancel_button": "mài 登出",
+    "password": "密碼",
+    "placeholder": "例：lain",
+    "register": "註冊",
+    "username": "用者 ê 名",
+    "hint": "登入，參與討論",
+    "authentication_code": "認證碼",
+    "enter_recovery_code": "輸入恢復碼",
+    "enter_two_factor_code": "輸入兩階段認證碼",
+    "recovery_code": "恢復碼",
+    "heading": {
+      "totp": "兩階段認證",
+      "recovery": "兩階段恢復"
+    }
+  },
+  "media_modal": {
+    "previous": "頂一　ê",
+    "next": "後一个",
+    "counter": "{current} / {total}",
+    "hide": "關掉媒體瀏覽"
+  },
+  "nav": {
+    "about": "有關……",
+    "administration": "管理",
+    "back": "轉去",
+    "friend_requests": "跟綴請求",
+    "mentions": "The̍h起",
+    "interactions": "互動",
+    "dms": "私人 phue",
+    "public_tl": "公共時間線",
+    "timeline": "時間線",
+    "home_timeline": "厝 ê 時間線",
+    "twkn": "知影 ê 網路",
+    "bookmarks": "冊籤",
+    "user_search": "Tshuē 用者",
+    "search": "tshuē",
+    "search_close": "關掉 tshiau-tshuē liâu",
+    "who_to_follow": "Siáng 會當綴？",
+    "preferences": "個人 ê 設定",
+    "timelines": "時間流",
+    "chats": "開講",
+    "lists": "列單",
+    "edit_nav_mobile": "自訂導覽條",
+    "edit_pinned": "編輯釘起來 ê 項目",
+    "edit_finish": "編輯 suah",
+    "mobile_sidebar": "切換行動版 ê 邊 á liâu",
+    "mobile_notifications": "拍開通知",
+    "mobile_notifications": "拍開通知（有無讀ê）",
+    "mobile_notifications_close": "關掉通知",
+    "announcements": "公告"
+  },
+  "notifications": {
+    "broken_favorite": "狀態毋知影，leh tshiau-tshuē……",
+    "error": "佇取得通知 ê 時起錯誤：{0}",
+    "favorited_you": "kah 意 lí ê 狀態",
+    "followed_you": "綴 lí",
+    "follow_request": "想 beh 綴 lí",
+    "load_older": "載入 khah 早 ê 通知",
+    "notifications": "通知",
+    "read": "讀！",
+    "repeated_you": "轉送 lí ê 狀態",
+    "no_more_notifications": "無別 ê 通知",
+    "migrated_to": "移民到",
+    "reacted_with": "顯出{0} ê 反應",
+    "submitted_report": "送出檢舉",
+    "poll_ended": "投票結束"
+  },
+  "polls": {
+    "add_poll": "開投票",
+    "add_option": "加選項",
+    "option": "選項",
+    "votes": "票",
+    "people_voted_count": "{count} 位有投",
+    "votes_count": "{count} 票",
+    "vote": "投票",
+    "type": "投票 ê 形式",
+    "single_choice": "孤選",
+    "multiple_choices": "Tsē 選",
+    "expiry": "投票期限",
+    "expires_in": "投票 tī {0} 以後結束",
+    "expired": "投票佇 {0} 以前結束",
+    "not_enough_options": "投票 ê 選項傷少。"
+  },
+  "emoji": {
+    "stickers": "貼圖",
+    "emoji": "繪文字",
+    "keep_open": "Hōo 揀選仔開 leh",
+    "search_emoji": "Tshuē 繪文字",
+    "add_emoji": "插繪文字",
+    "custom": "定製 ê 繪文字",
+    "unpacked": "拍開 ê 繪文字",
+    "unicode": "Unicode 繪文字",
+    "unicode_groups": {
+      "activities": "活動",
+      "animals-and-nature": "動物 kap 自然",
+      "flags": "旗 á",
+      "food-and-drink": "食物 kap 飲料",
+      "objects": "物體",
+      "people-and-body": "Lâng kap 身軀",
+      "smileys-and-emotion": "笑面 kap 情緒",
+      "symbols": "符號",
+      "travel-and-places": "旅遊 kap 所在"
+    },
+    "load_all_hint": "載入頭前 {saneAmount} ê 繪文字，規个攏載入效能可能 ē khah 食力。",
+    "load_all": "Kā {emojiAmount} ê 繪文字攏載入",
+    "regional_indicator": "地區指引 {letter}"
+  },
+  "errors": {
+    "storage_unavailable": "Pleroma buē-tàng the̍h 著瀏覽器儲存 ê。Lí ê 登入狀態抑是局部設定 buē 儲存，mā 凡勢 tú 著意料外 ê 問題。拍開 cookie 看覓。"
+  },
+  "interactions": {
+    "favs_repeats": "轉送 kap kah 意",
+    "follows": "最近綴 lí ê",
+    "emoji_reactions": "繪文字 ê 回應",
+    "reports": "檢舉",
+    "moves": "用者 ê 移民",
+    "load_older": "載入 koh khah 早 ê 互動"
+  },
+  "post_status": {
+    "edit_status": "編輯狀態",
+    "new_status": "PO 新 ê 狀態",
+    "account_not_locked_warning": "Lín 口座毋是 {0} ê。見 nā 有 lâng 綴--lí，ē-tàng 看著 lí ê 限定跟綴者 ê PO 文。.",
+    "account_not_locked_warning_link": "鎖起來 ê 口座",
+    "attachments_sensitive": "Kā 附件標做敏感內容。",
+    "media_description": "媒體說明",
+    "content_type": {
+      "text/plain": "純 ê 文字",
+      "text/html": "HTML",
+      "text/markdown": "Markdown",
+      "text/bbcode": "BBCode"
+    },
+    "content_type_selection": "貼 ê 形式",
+    "content_warning": "主旨（毋是必要）",
+    "default": "Tú 正 kàu 高雄 ah。",
+    "direct_warning_to_all": "Tsit ê PO 文通 hōo 逐 ê 提起 ê 用者看見。",
+    "direct_warning_to_first_only": "Tsit ê PO 文，kan-ta 短信 tú 開始提起 ê 用者，tsiah 通看見。",
+    "edit_remote_warning": "別 ê 站臺可能無支援編輯，無法度收著 PO 文上新 ê 版本。",
+    "edit_unsupported_warning": "Pleroma 無支持編輯 the̍h 起 hām 投票。",
+    "posting": "PO 文",
+    "post": "PO",
+    "preview": "Sing 看覓",
+    "preview_empty": "空 ê",
+    "empty_status_error": "無法度 PO 無檔案 koh 空 ê 狀態。",
+    "media_description_error": "更新媒體失敗，請 koh 試一 kái。",
+    "scope_notice": {
+      "public": "Tsit ê PO 文通予逐 ê 儂看著。",
+      "private": "Tsit ê PO 文 kan-ta 予綴 lí ê 看著。",
+      "unlisted": "Tsit ê PO 文 buē 公開 tī 公共時間線 kap 知影 ê 網路。"
+    },
+    "scope_notice_dismiss": "關掉 tsit ê 通知",
+    "scope": {
+      "direct": "私人 phue - PO 文干焦予提起 ê 用者看著",
+      "private": "限定綴 ê 儂 - PO 文干焦予綴 lí ê 儂看著",
+      "public": "公開 - PO kàu 公開時間線",
+      "unlisted": "Mài 列出來 - Mài PO tī 公開時間線。"
+    }
+  },
+  "registration": {
+    "bio_optional": "介紹（毋是必要）",
+    "email": "Email",
+    "email_optional": "Email（毋是必要）",
+    "fullname": "顯示 ê 名",
+    "password_confirm": "確認密碼",
+    "registration": "註冊",
+    "token": "邀請碼",
+    "captcha": "驗證碼",
+    "new_captcha": "Ji̍h 圖片，the̍h 新 ê 驗證碼",
+    "username_placeholder": "e.g. lain",
+    "fullname_placeholder": "e.g. 岩倉 Lain",
+    "bio_placeholder": "e.g.\nLí 好，我是 Lain。我是日本動畫 ê 角色，tuà tī 日本 ê 郊區。Lí 凡勢 bat tī Wired 知影我。",
+    "reason": "註冊 ê 理由",
+    "reason_placeholder": "本站靠人工審核註冊。\n介紹管理者 lí beh tī tsia 註冊 ê 理由。",
+    "register": "註冊",
+    "validations": {
+      "username_required": "著愛添",
+      "fullname_required": "著愛添",
+      "email_required": "著愛添",
+      "password_required": "著愛添",
+      "password_confirmation_required": "著愛添",
+      "password_confirmation_match": "密碼著相 kâng",
+      "birthday_required": "著愛添",
+      "birthday_min_age": "Buē-tàng tī {date} 以後"
+    },
+    "email_language": "Lí想 beh 服侍器用 siánn 物語言寄批 hōo lí？",
+    "birthday": "生日",
+    "birthday_optional": "生日（毋是必要）："
+  },
+  "remote_user_resolver": {
+    "remote_user_resolver": "別站用者 ê 解析器",
+    "searching_for": "Tshuē",
+    "error": "Tshuē無"
+  },
+  "report": {
+    "reporter": "檢舉人：",
+    "reported_user": "Beh 檢舉 ê 用者：",
+    "reported_statuses": "Beh 檢舉 ê 狀態：",
+    "notes": "Notes:",
+    "state": "State:",
+    "state_open": "開 ê",
+    "state_closed": "關 ê",
+    "state_resolved": "解決了 ê"
+  },
+  "selectable_list": {
+    "select_all": "攏總揀"
+  },
+  "settings": {
+    "add_language": "加一 ê 備用 ê 語言",
+    "remove_language": "Ni 掉",
+    "primary_language": "主要語言：",
+    "fallback_language": "備用語言 {index}：",
+    "app_name": "App ê 名",
+    "expert_mode": "進階模式",
+    "save": "保存改變",
+    "security": "安全",
+    "setting_changed": "設定 kap 預先 ê 有 tsing 差",
+    "setting_server_side": "This setting is tied to your profile and affects all sessions and clients",
+    "enter_current_password_to_confirm": "Enter your current password to confirm your identity",
+    "post_look_feel": "Posts Look & Feel",
+    "mention_links": "Mention links",
+    "mfa": {
+      "otp": "OTP",
+      "setup_otp": "Setup OTP",
+      "wait_pre_setup_otp": "presetting OTP",
+      "confirm_and_enable": "Confirm & enable OTP",
+      "title": "Two-factor Authentication",
+      "generate_new_recovery_codes": "Generate new recovery codes",
+      "warning_of_generate_new_codes": "When you generate new recovery codes, your old codes won’t work anymore.",
+      "recovery_codes": "Recovery codes.",
+      "waiting_a_recovery_codes": "Receiving backup codes…",
+      "recovery_codes_warning": "Write the codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
+      "authentication_methods": "Authentication methods",
+      "scan": {
+        "title": "Scan",
+        "desc": "Using your two-factor app, scan this QR code or enter text key:",
+        "secret_code": "Key"
+      },
+      "verify": {
+        "desc": "To enable two-factor authentication, enter the code from your two-factor app:"
+      }
+    },
+    "lists_navigation": "Show lists in navigation",
+    "allow_following_move": "Allow auto-follow when following account moves",
+    "attachmentRadius": "Attachments",
+    "attachments": "Attachments",
+    "avatar": "Avatar",
+    "avatarAltRadius": "Avatars (notifications)",
+    "avatarRadius": "Avatars",
+    "background": "Background",
+    "bio": "Bio",
+    "email_language": "Language for receiving emails from the server",
+    "block_export": "Block export",
+    "block_export_button": "Export your blocks to a csv file",
+    "block_import": "Block import",
+    "block_import_error": "Error importing blocks",
+    "blocks_imported": "Blocks imported! Processing them will take a while.",
+    "mute_export": "Mute export",
+    "mute_export_button": "Export your mutes to a csv file",
+    "mute_import": "Mute import",
+    "mute_import_error": "Error importing mutes",
+    "mutes_imported": "Mutes imported! Processing them will take a while.",
+    "import_mutes_from_a_csv_file": "Import mutes from a csv file",
+    "account_backup": "Account backup",
+    "account_backup_description": "This allows you to download an archive of your account information and your posts, but they cannot yet be imported into a Pleroma account.",
+    "account_backup_table_head": "Backup",
+    "download_backup": "Download",
+    "backup_not_ready": "This backup is not ready yet.",
+    "backup_running": "This backup is in progress, processed {number} record. | This backup is in progress, processed {number} records.",
+    "backup_failed": "This backup has failed.",
+    "remove_backup": "Remove",
+    "list_backups_error": "Error fetching backup list: {error}",
+    "add_backup": "Create a new backup",
+    "added_backup": "Added a new backup.",
+    "add_backup_error": "Error adding a new backup: {error}",
+    "blocks_tab": "Blocks",
+    "bot": "This is a bot account",
+    "btnRadius": "Buttons",
+    "cBlue": "Blue (Reply, follow)",
+    "cGreen": "Green (Retweet)",
+    "cOrange": "Orange (Favorite)",
+    "cRed": "Red (Cancel)",
+    "change_email": "Change email",
+    "change_email_error": "There was an issue changing your email.",
+    "changed_email": "Email changed successfully!",
+    "change_password": "Change password",
+    "change_password_error": "There was an issue changing your password.",
+    "changed_password": "Password changed successfully!",
+    "chatMessageRadius": "Chat message",
+    "collapse_subject": "Collapse posts with subjects",
+    "composing": "Composing",
+    "confirm_new_password": "Confirm new password",
+    "current_password": "Current password",
+    "confirm_dialogs": "Ask for confirmation when",
+    "confirm_dialogs_repeat": "repeating a status",
+    "confirm_dialogs_unfollow": "unfollowing a user",
+    "confirm_dialogs_block": "blocking a user",
+    "confirm_dialogs_mute": "muting a user",
+    "confirm_dialogs_delete": "deleting a status",
+    "confirm_dialogs_logout": "logging out",
+    "confirm_dialogs_approve_follow": "approving a follower",
+    "confirm_dialogs_deny_follow": "denying a follower",
+    "confirm_dialogs_remove_follower": "removing a follower",
+    "mutes_and_blocks": "Mutes and Blocks",
+    "data_import_export_tab": "Data import / export",
+    "default_vis": "Default visibility scope",
+    "delete_account": "Delete account",
+    "delete_account_description": "Permanently delete your data and deactivate your account.",
+    "delete_account_error": "There was an issue deleting your account. If this persists please contact your instance administrator.",
+    "delete_account_instructions": "Type your password in the input below to confirm account deletion.",
+    "account_alias": "Account aliases",
+    "account_alias_table_head": "Alias",
+    "list_aliases_error": "Error fetching aliases: {error}",
+    "hide_list_aliases_error_action": "Close",
+    "remove_alias": "Remove this alias",
+    "new_alias_target": "Add a new alias (e.g. {example})",
+    "added_alias": "Alias is added.",
+    "add_alias_error": "Error adding alias: {error}",
+    "move_account": "Move account",
+    "move_account_notes": "If you want to move the account somewhere else, you must go to your target account and add an alias pointing here.",
+    "move_account_target": "Target account (e.g. {example})",
+    "moved_account": "Account is moved.",
+    "move_account_error": "Error moving account: {error}",
+    "discoverable": "Allow discovery of this account in search results and other services",
+    "domain_mutes": "Domains",
+    "avatar_size_instruction": "The recommended minimum size for avatar images is 150x150 pixels.",
+    "pad_emoji": "Pad emoji with spaces when adding from picker",
+    "autocomplete_select_first": "Automatically select the first candidate when autocomplete results are available",
+    "emoji_reactions_on_timeline": "Show emoji reactions on timeline",
+    "emoji_reactions_scale": "Reactions scale factor",
+    "export_theme": "Save preset",
+    "filtering": "Filtering",
+    "wordfilter": "Wordfilter",
+    "filtering_explanation": "All statuses containing these words will be muted, one per line",
+    "word_filter_and_more": "Word filter and more...",
+    "follow_export": "Follow export",
+    "follow_export_button": "Export your follows to a csv file",
+    "follow_import": "Follow import",
+    "follow_import_error": "Error importing followers",
+    "follows_imported": "Follows imported! Processing them will take a while.",
+    "accent": "Accent",
+    "foreground": "Foreground",
+    "general": "General",
+    "hide_attachments_in_convo": "Hide attachments in conversations",
+    "hide_attachments_in_tl": "Hide attachments in timeline",
+    "hide_media_previews": "Hide media previews",
+    "hide_muted_posts": "Hide posts of muted users",
+    "mute_bot_posts": "Mute bot posts",
+    "hide_bot_indication": "Hide bot indication in posts",
+    "hide_all_muted_posts": "Hide muted posts",
+    "max_thumbnails": "Maximum amount of thumbnails per post (empty = no limit)",
+    "hide_isp": "Hide instance-specific panel",
+    "hide_shoutbox": "Hide instance shoutbox",
+    "right_sidebar": "Reverse order of columns",
+    "navbar_column_stretch": "Stretch navbar to columns width",
+    "always_show_post_button": "Always show floating New Post button",
+    "hide_wallpaper": "Hide instance wallpaper",
+    "preload_images": "Preload images",
+    "use_one_click_nsfw": "Open NSFW attachments with just one click",
+    "hide_post_stats": "Hide post statistics (e.g. the number of favorites)",
+    "hide_user_stats": "Hide user statistics (e.g. the number of followers)",
+    "hide_filtered_statuses": "Hide all filtered posts",
+    "hide_wordfiltered_statuses": "Hide word-filtered statuses",
+    "hide_muted_threads": "Hide muted threads",
+    "import_blocks_from_a_csv_file": "Import blocks from a csv file",
+    "import_followers_from_a_csv_file": "Import follows from a csv file",
+    "import_theme": "Load preset",
+    "inputRadius": "Input fields",
+    "checkboxRadius": "Checkboxes",
+    "instance_default": "(default: {value})",
+    "instance_default_simple": "(default)",
+    "interface": "Interface",
+    "interfaceLanguage": "Interface language",
+    "invalid_theme_imported": "The selected file is not a supported Pleroma theme. No changes to your theme were made.",
+    "limited_availability": "Unavailable in your browser",
+    "links": "Links",
+    "lock_account_description": "Restrict your account to approved followers only",
+    "loop_video": "Loop videos",
+    "loop_video_silent_only": "Loop only videos without sound (i.e. Mastodon's \"gifs\")",
+    "mutes_tab": "Mutes",
+    "play_videos_in_modal": "Play videos in a popup frame",
+    "url": "URL",
+    "preview": "Preview",
+    "file_export_import": {
+      "backup_restore": "Settings backup",
+      "backup_settings": "Backup settings to file",
+      "backup_settings_theme": "Backup settings and theme to file",
+      "restore_settings": "Restore settings from file",
+      "errors": {
+        "invalid_file": "The selected file is not a supported Pleroma settings backup. No changes were made.",
+        "file_too_new": "Incompatile major version: {fileMajor}, this PleromaFE (settings ver {feMajor}) is too old to handle it",
+        "file_too_old": "Incompatile major version: {fileMajor}, file version is too old and not supported (min. set. ver. {feMajor})",
+        "file_slightly_new": "File minor version is different, some settings might not load"
+      }
+    },
+    "profile_fields": {
+      "label": "Profile metadata",
+      "add_field": "Add field",
+      "name": "Label",
+      "value": "Content"
+    },
+    "birthday": {
+      "label": "Birthday",
+      "show_birthday": "Show my birthday"
+    },
+    "account_privacy": "Privacy",
+    "use_contain_fit": "Don't crop the attachment in thumbnails",
+    "name": "Name",
+    "name_bio": "Name & bio",
+    "new_email": "New email",
+    "new_password": "New password",
+    "posts": "Posts",
+    "user_profiles": "User Profiles",
+    "notification_visibility": "Types of notifications to show",
+    "notification_visibility_follows": "Follows",
+    "notification_visibility_likes": "Favorites",
+    "notification_visibility_mentions": "Mentions",
+    "notification_visibility_repeats": "Repeats",
+    "notification_visibility_moves": "User Migrates",
+    "notification_visibility_emoji_reactions": "Reactions",
+    "notification_visibility_polls": "Ends of polls you voted in",
+    "no_rich_text_description": "Strip rich text formatting from all posts",
+    "no_blocks": "No blocks",
+    "no_mutes": "No mutes",
+    "hide_favorites_description": "Don't show list of my favorites (people still get notified)",
+    "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": "Hide sensitive/NSFW media",
+    "oauth_tokens": "OAuth tokens",
+    "token": "Token",
+    "refresh_token": "Refresh token",
+    "valid_until": "Valid until",
+    "revoke_token": "Revoke",
+    "panelRadius": "Panels",
+    "pause_on_unfocused": "Pause when tab is not focused",
+    "presets": "Presets",
+    "profile_background": "Profile background",
+    "profile_banner": "Profile banner",
+    "profile_tab": "Profile",
+    "radii_help": "Set up interface edge rounding (in pixels)",
+    "replies_in_timeline": "Replies in timeline",
+    "reply_visibility_all": "Show all replies",
+    "reply_visibility_following": "Only show replies directed at me or users I'm following",
+    "reply_visibility_self": "Only show replies directed at me",
+    "reply_visibility_following_short": "Show replies to my follows",
+    "reply_visibility_self_short": "Show replies to self only",
+    "autohide_floating_post_button": "Automatically hide New Post button (mobile)",
+    "saving_err": "Error saving settings",
+    "saving_ok": "Settings saved",
+    "search_user_to_block": "Search whom you want to block",
+    "search_user_to_mute": "Search whom you want to mute",
+    "security_tab": "Security",
+    "scope_copy": "Copy scope when replying (DMs are always copied)",
+    "minimal_scopes_mode": "Minimize post scope selection options",
+    "set_new_avatar": "Set new avatar",
+    "set_new_profile_background": "Set new profile background",
+    "set_new_profile_banner": "Set new profile banner",
+    "reset_avatar": "Reset avatar",
+    "reset_profile_background": "Reset profile background",
+    "reset_profile_banner": "Reset profile banner",
+    "reset_avatar_confirm": "Do you really want to reset the avatar?",
+    "reset_banner_confirm": "Do you really want to reset the banner?",
+    "reset_background_confirm": "Do you really want to reset the background?",
+    "settings": "Settings",
+    "subject_input_always_show": "Always show subject field",
+    "subject_line_behavior": "Copy subject when replying",
+    "subject_line_email": "Like email: \"re: subject\"",
+    "subject_line_mastodon": "Like mastodon: copy as is",
+    "subject_line_noop": "Do not copy",
+    "conversation_display": "Conversation display style",
+    "conversation_display_tree": "Tree-style",
+    "conversation_display_tree_quick": "Tree view",
+    "disable_sticky_headers": "Don't stick column headers to top of the screen",
+    "show_scrollbars": "Show side column's scrollbars",
+    "third_column_mode": "When there's enough space, show third column containing",
+    "third_column_mode_none": "Don't show third column at all",
+    "third_column_mode_notifications": "Notifications column",
+    "third_column_mode_postform": "Main post form and navigation",
+    "columns": "Columns",
+    "column_sizes": "Column sizes",
+    "column_sizes_sidebar": "Sidebar",
+    "column_sizes_content": "Content",
+    "column_sizes_notifs": "Notifications",
+    "tree_advanced": "Allow more flexible navigation in tree view",
+    "tree_fade_ancestors": "Display ancestors of the current status in faint text",
+    "conversation_display_linear": "Linear-style",
+    "conversation_display_linear_quick": "Linear view",
+    "conversation_other_replies_button": "Show the \"other replies\" button",
+    "conversation_other_replies_button_below": "Below statuses",
+    "conversation_other_replies_button_inside": "Inside statuses",
+    "max_depth_in_thread": "Maximum number of levels in thread to display by default",
+    "post_status_content_type": "Post status content type",
+    "sensitive_by_default": "Mark posts as sensitive by default",
+    "stop_gifs": "Pause animated images until you hover on them",
+    "streaming": "Automatically show new posts when scrolled to the top",
+    "auto_update": "Show new posts automatically",
+    "user_mutes": "Users",
+    "useStreamingApi": "Receive posts and notifications real-time",
+    "use_websockets": "Use websockets (Realtime updates)",
+    "text": "Text",
+    "theme": "Theme",
+    "theme_help": "Use hex color codes (#rrggbb) to customize your color theme.",
+    "theme_help_v2_1": "You can also override certain component's colors and opacity by toggling the checkbox, use \"Clear all\" button to clear all overrides.",
+    "theme_help_v2_2": "Icons underneath some entries are background/text contrast indicators, hover over for detailed info. Please keep in mind that when using transparency contrast indicators show the worst possible case.",
+    "tooltipRadius": "Tooltips/alerts",
+    "type_domains_to_mute": "Search domains to mute",
+    "upload_a_photo": "Upload a photo",
+    "user_settings": "User Settings",
+    "values": {
+      "false": "no",
+      "true": "yes"
+    },
+    "virtual_scrolling": "Optimize timeline rendering",
+    "use_at_icon": "Display {'@'} symbol as an icon instead of text",
+    "mention_link_display": "Display mention links",
+    "mention_link_display_short": "always as short names (e.g. {'@'}foo)",
+    "mention_link_display_full_for_remote": "as full names only for remote users (e.g. {'@'}foo{'@'}example.org)",
+    "mention_link_display_full": "always as full names (e.g. {'@'}foo{'@'}example.org)",
+    "mention_link_use_tooltip": "Show user card when clicking mention links",
+    "mention_link_show_avatar": "Show user avatar beside the link",
+    "mention_link_show_avatar_quick": "Show user avatar next to mentions",
+    "mention_link_fade_domain": "Fade domains (e.g. {'@'}example.org in {'@'}foo{'@'}example.org)",
+    "mention_link_bolden_you": "Highlight mention of you when you are mentioned",
+    "user_popover_avatar_action": "Popover avatar click action",
+    "user_popover_avatar_action_zoom": "Zoom the avatar",
+    "user_popover_avatar_action_close": "Close the popover",
+    "user_popover_avatar_action_open": "Open profile",
+    "user_popover_avatar_overlay": "Show user popover over user avatar",
+    "fun": "Fun",
+    "greentext": "Meme arrows",
+    "show_yous": "Show (You)s",
+    "notifications": "Notifications",
+    "notification_setting_filters": "Filters",
+    "notification_setting_block_from_strangers": "Block notifications from users who you do not follow",
+    "notification_setting_privacy": "Privacy",
+    "notification_setting_hide_notification_contents": "Hide the sender and contents of push notifications",
+    "notification_mutes": "To stop receiving notifications from a specific user, use a mute.",
+    "notification_blocks": "Blocking a user stops all notifications as well as unsubscribes them.",
+    "enable_web_push_notifications": "Enable web push notifications",
+    "more_settings": "More settings",
+    "style": {
+      "switcher": {
+        "keep_color": "Keep colors",
+        "keep_shadows": "Keep shadows",
+        "keep_opacity": "Keep opacity",
+        "keep_roundness": "Keep roundness",
+        "keep_fonts": "Keep fonts",
+        "save_load_hint": "\"Keep\" options preserve currently set options when selecting or loading themes, it also stores said options when exporting a theme. When all checkboxes unset, exporting theme will save everything.",
+        "reset": "Reset",
+        "clear_all": "Clear all",
+        "clear_opacity": "Clear opacity",
+        "load_theme": "Load theme",
+        "keep_as_is": "Keep as is",
+        "use_snapshot": "Old version",
+        "use_source": "New version",
+        "help": {
+          "upgraded_from_v2": "PleromaFE has been upgraded, theme could look a little bit different than you remember.",
+          "v2_imported": "File you imported was made for older FE. We try to maximize compatibility but there still could be inconsistencies.",
+          "future_version_imported": "File you imported was made in newer version of FE.",
+          "older_version_imported": "File you imported was made in older version of FE.",
+          "snapshot_present": "Theme snapshot is loaded, so all values are overriden. You can load theme's actual data instead.",
+          "snapshot_missing": "No theme snapshot was in the file so it could look different than originally envisioned.",
+          "fe_upgraded": "PleromaFE's theme engine upgraded after version update.",
+          "fe_downgraded": "PleromaFE's version rolled back.",
+          "migration_snapshot_ok": "Just to be safe, theme snapshot loaded. You can try loading theme data.",
+          "migration_napshot_gone": "For whatever reason snapshot was missing, some stuff could look different than you remember.",
+          "snapshot_source_mismatch": "Versions conflict: most likely FE was rolled back and updated again, if you changed theme using older version of FE you most likely want to use old version, otherwise use new version."
+        }
+      },
+      "common": {
+        "color": "色彩",
+        "opacity": "無透明度",
+        "contrast": {
+          "hint": "Contrast ratio is {ratio}, it {level} {context}",
+          "level": {
+            "aa": "meets Level AA guideline (minimal)",
+            "aaa": "meets Level AAA guideline (recommended)",
+            "bad": "doesn't meet any accessibility guidelines"
+          },
+          "context": {
+            "18pt": "for large (18pt+) text",
+            "text": "for text"
+          }
+        }
+      },
+      "common_colors": {
+        "_tab_label": "Common",
+        "main": "Common colors",
+        "foreground_hint": "See \"Advanced\" tab for more detailed control",
+        "rgbo": "Icons, accents, badges"
+      },
+      "advanced_colors": {
+        "_tab_label": "Advanced",
+        "alert": "Alert background",
+        "alert_error": "Error",
+        "alert_warning": "Warning",
+        "alert_neutral": "Neutral",
+        "post": "Posts/User bios",
+        "badge": "Badge background",
+        "popover": "Tooltips, menus, popovers",
+        "badge_notification": "Notification",
+        "panel_header": "Panel header",
+        "top_bar": "Top bar",
+        "borders": "Borders",
+        "buttons": "Buttons",
+        "inputs": "Input fields",
+        "faint_text": "Faded text",
+        "underlay": "Underlay",
+        "wallpaper": "Wallpaper",
+        "poll": "Poll graph",
+        "icons": "Icons",
+        "highlight": "Highlighted elements",
+        "pressed": "Pressed",
+        "selectedPost": "Selected post",
+        "selectedMenu": "Selected menu item",
+        "disabled": "Disabled",
+        "toggled": "Toggled",
+        "tabs": "Tabs",
+        "chat": {
+          "incoming": "Incoming",
+          "outgoing": "Outgoing",
+          "border": "Border"
+        }
+      },
+      "radii": {
+        "_tab_label": "Roundness"
+      },
+      "shadows": {
+        "_tab_label": "Shadow and lighting",
+        "component": "Component",
+        "override": "Override",
+        "shadow_id": "Shadow #{value}",
+        "blur": "Blur",
+        "spread": "Spread",
+        "inset": "Inset",
+        "hintV3": "For shadows you can also use the {0} notation to use other color slot.",
+        "filter_hint": {
+          "always_drop_shadow": "Warning, this shadow always uses {0} when browser supports it.",
+          "drop_shadow_syntax": "{0} does not support {1} parameter and {2} keyword.",
+          "avatar_inset": "Please note that combining both inset and non-inset shadows on avatars might give unexpected results with transparent avatars.",
+          "spread_zero": "Shadows with spread > 0 will appear as if it was set to zero",
+          "inset_classic": "Inset shadows will be using {0}"
+        },
+        "components": {
+          "panel": "Panel",
+          "panelHeader": "Panel header",
+          "topBar": "Top bar",
+          "avatar": "User avatar (in profile view)",
+          "avatarStatus": "User avatar (in post display)",
+          "popup": "Popups and tooltips",
+          "button": "Button",
+          "buttonHover": "Button (hover)",
+          "buttonPressed": "Button (pressed)",
+          "buttonPressedHover": "Button (pressed+hover)",
+          "input": "Input field"
+        }
+      },
+      "fonts": {
+        "_tab_label": "Fonts",
+        "help": "Select font to use for elements of UI. For \"custom\" you have to enter exact font name as it appears in system.",
+        "components": {
+          "interface": "Interface",
+          "input": "Input fields",
+          "post": "Post text",
+          "postCode": "Monospaced text in a post (rich text)"
+        },
+        "family": "Font name",
+        "size": "Size (in px)",
+        "weight": "Weight (boldness)",
+        "custom": "Custom"
+      },
+      "preview": {
+        "header": "Preview",
+        "content": "Content",
+        "error": "Example error",
+        "button": "Button",
+        "text": "A bunch of more {0} and {1}",
+        "mono": "content",
+        "input": "Just landed in L.A.",
+        "faint_link": "helpful manual",
+        "fine_print": "Read our {0} to learn nothing useful!",
+        "header_faint": "This is fine",
+        "checkbox": "I have skimmed over terms and conditions",
+        "link": "a nice lil' link"
+      }
+    },
+    "version": {
+      "title": "Version",
+      "backend_version": "Backend version",
+      "frontend_version": "Frontend version"
+    },
+    "commit_value": "Save",
+    "commit_value_tooltip": "Value is not saved, press this button to commit your changes",
+    "reset_value": "Reset",
+    "reset_value_tooltip": "Reset draft",
+    "hard_reset_value": "Hard reset",
+    "hard_reset_value_tooltip": "Remove setting from storage, forcing use of default value"
+  },
+  "admin_dash": {
+    "window_title": "Administration",
+    "wip_notice": "This admin dashboard is experimental and WIP, {adminFeLink}.",
+    "old_ui_link": "old admin UI available here",
+    "reset_all": "Reset all",
+    "commit_all": "Save all",
+    "tabs": {
+      "nodb": "No DB Config",
+      "instance": "Instance",
+      "limits": "Limits",
+      "frontends": "Front-ends"
+    },
+    "nodb": {
+      "heading": "Database config is disabled",
+      "text": "You need to change backend config files so that {property} is set to {value}, see more in {documentation}.",
+      "documentation": "documentation",
+      "text2": "Most configuration options will be unavailable."
+    },
+    "captcha": {
+      "native": "Native",
+      "kocaptcha": "KoCaptcha"
+    },
+    "instance": {
+      "instance": "Instance information",
+      "registrations": "User sign-ups",
+      "captcha_header": "CAPTCHA",
+      "kocaptcha": "KoCaptcha settings",
+      "access": "Instance access",
+      "restrict": {
+        "header": "Restrict access for anonymous visitors",
+        "description": "Detailed setting for allowing/disallowing access to certain aspects of API. By default (indeterminate state) it will disallow if instance is not public, ticked checkbox means disallow access even if instance is public, unticked means allow access even if instance is private. Please note that unexpected behavior might happen if some settings are set, i.e. if profile access is disabled posts will show without profile information.",
+        "timelines": "Timelines access",
+        "profiles": "User profiles access",
+        "activities": "Statues/activities access"
+      }
+    },
+    "limits": {
+      "arbitrary_limits": "Arbitrary limits",
+      "posts": "Post limits",
+      "uploads": "Attachments limits",
+      "users": "User profile limits",
+      "profile_fields": "Profile fields limits",
+      "user_uploads": "Profile media limits"
+    },
+    "frontend": {
+      "repository": "Repository link",
+      "versions": "Available versions",
+      "build_url": "Build URL",
+      "reinstall": "Reinstall",
+      "is_default": "(Default)",
+      "is_default_custom": "(Default, version: {version})",
+      "install": "Install",
+      "install_version": "Install version {version}",
+      "more_install_options": "More install options",
+      "more_default_options": "More default setting options",
+      "set_default": "Set default",
+      "set_default_version": "Set version {version} as default",
+      "wip_notice": "Please note that this section is a WIP and lacks certain features as backend implementation of front-end management is incomplete.",
+      "default_frontend": "Default front-end",
+      "default_frontend_tip": "Default front-end will be shown to all users. Currently there's no way to for a user to select personal front-end. If you switch away from PleromaFE you'll most likely have to use old and buggy AdminFE to do instance configuration until we replace it.",
+      "default_frontend_tip2": "WIP: Since Pleroma backend doesn't properly list all installed frontends you'll have to enter name and reference manually. List below provides shortcuts to fill the values.",
+      "available_frontends": "Available for install"
+    },
+    "temp_overrides": {
+      ":pleroma": {
+        ":instance": {
+          ":public": {
+            "label": "Instance is public",
+            "description": "Disabling this will make all API accessible only for logged-in users, this will make Public and Federated timelines inaccessible to anonymous visitors."
+          },
+          ":limit_to_local_content": {
+            "label": "Limit search to local content",
+            "description": "Disables global network search for unauthenticated (default), all users or none"
+          },
+          ":description_limit": {
+            "label": "Limit",
+            "description": "Character limit for attachment descriptions"
+          },
+          ":background_image": {
+            "label": "Background image",
+            "description": "Background image (primarily used by PleromaFE)"
+          }
+        }
+      }
+    }
+  },
+  "time": {
+    "unit": {
+      "days": "{0} day | {0} days",
+      "days_short": "{0}d",
+      "hours": "{0} hour | {0} hours",
+      "hours_short": "{0}h",
+      "minutes": "{0} minute | {0} minutes",
+      "minutes_short": "{0}min",
+      "months": "{0} month | {0} months",
+      "months_short": "{0}mo",
+      "seconds": "{0} second | {0} seconds",
+      "seconds_short": "{0}s",
+      "weeks": "{0} week | {0} weeks",
+      "weeks_short": "{0}w",
+      "years": "{0} year | {0} years",
+      "years_short": "{0}y"
+    },
+    "in_future": "in {0}",
+    "in_past": "{0} ago",
+    "now": "just now",
+    "now_short": "now"
+  },
+  "timeline": {
+    "collapse": "Collapse",
+    "conversation": "Conversation",
+    "error": "Error fetching timeline: {0}",
+    "load_older": "Load older statuses",
+    "no_retweet_hint": "Post is marked as followers-only or direct and cannot be repeated",
+    "repeated": "repeated",
+    "show_new": "Show new",
+    "reload": "Reload",
+    "up_to_date": "Up-to-date",
+    "no_more_statuses": "No more statuses",
+    "no_statuses": "No statuses",
+    "socket_reconnected": "Realtime connection established",
+    "socket_broke": "Realtime connection lost: CloseEvent code {0}",
+    "quick_view_settings": "Quick view settings",
+    "quick_filter_settings": "Quick filter settings"
+  },
+  "status": {
+    "favorites": "Favorites",
+    "repeats": "Repeats",
+    "repeat_confirm": "Do you really want to repeat this status?",
+    "repeat_confirm_title": "Repeat confirmation",
+    "repeat_confirm_accept_button": "Repeat",
+    "repeat_confirm_cancel_button": "Do not repeat",
+    "delete": "Delete status",
+    "delete_error": "Error deleting status: {0}",
+    "edit": "Edit status",
+    "edited_at": "(last edited {time})",
+    "pin": "Pin on profile",
+    "unpin": "Unpin from profile",
+    "pinned": "Pinned",
+    "bookmark": "Bookmark",
+    "unbookmark": "Unbookmark",
+    "delete_confirm": "Do you really want to delete this status?",
+    "delete_confirm_title": "Delete confirmation",
+    "delete_confirm_accept_button": "Delete",
+    "delete_confirm_cancel_button": "Keep",
+    "reply_to": "Reply to",
+    "mentions": "Mentions",
+    "replies_list": "Replies:",
+    "replies_list_with_others": "Replies (+{numReplies} other): | Replies (+{numReplies} others):",
+    "mute_conversation": "Mute conversation",
+    "unmute_conversation": "Unmute conversation",
+    "status_unavailable": "Status unavailable",
+    "copy_link": "Copy link to status",
+    "external_source": "External source",
+    "thread_muted": "Thread muted",
+    "thread_muted_and_words": ", has words:",
+    "show_full_subject": "Show full subject",
+    "hide_full_subject": "Hide full subject",
+    "show_content": "Show content",
+    "hide_content": "Hide content",
+    "status_deleted": "This post was deleted",
+    "nsfw": "NSFW",
+    "expand": "Expand",
+    "you": "(You)",
+    "plus_more": "+{number} more",
+    "many_attachments": "Post has {number} attachment(s)",
+    "collapse_attachments": "Collapse attachments",
+    "show_all_attachments": "Show all attachments",
+    "show_attachment_in_modal": "Show in media modal",
+    "show_attachment_description": "Preview description (open attachment for full description)",
+    "hide_attachment": "Hide attachment",
+    "remove_attachment": "Remove attachment",
+    "attachment_stop_flash": "Stop Flash player",
+    "move_up": "Shift attachment left",
+    "move_down": "Shift attachment right",
+    "open_gallery": "Open gallery",
+    "thread_hide": "Hide this thread",
+    "thread_show": "Show this thread",
+    "thread_show_full": "Show everything under this thread ({numStatus} status in total, max depth {depth}) | Show everything under this thread ({numStatus} statuses in total, max depth {depth})",
+    "thread_show_full_with_icon": "{icon} {text}",
+    "thread_follow": "See the remaining part of this thread ({numStatus} status in total) | See the remaining part of this thread ({numStatus} statuses in total)",
+    "thread_follow_with_icon": "{icon} {text}",
+    "ancestor_follow": "See {numReplies} other reply under this status | See {numReplies} other replies under this status",
+    "ancestor_follow_with_icon": "{icon} {text}",
+    "show_all_conversation_with_icon": "{icon} {text}",
+    "show_all_conversation": "Show full conversation ({numStatus} other status) | Show full conversation ({numStatus} other statuses)",
+    "show_only_conversation_under_this": "Only show replies to this status",
+    "status_history": "Status history",
+    "reaction_count_label": "{num} person reacted | {num} people reacted"
+  },
+  "user_card": {
+    "approve": "Approve",
+    "approve_confirm_title": "Approve confirmation",
+    "approve_confirm_accept_button": "Approve",
+    "approve_confirm_cancel_button": "Do not approve",
+    "approve_confirm": "Do you want to approve {user}'s follow request?",
+    "block": "Block",
+    "blocked": "Blocked!",
+    "block_confirm_title": "Block confirmation",
+    "block_confirm": "Do you really want to block {user}?",
+    "block_confirm_accept_button": "Block",
+    "block_confirm_cancel_button": "Do not block",
+    "deactivated": "Deactivated",
+    "deny": "Deny",
+    "deny_confirm_title": "Deny confirmation",
+    "deny_confirm_accept_button": "Deny",
+    "deny_confirm_cancel_button": "Do not deny",
+    "deny_confirm": "Do you want to deny {user}'s follow request?",
+    "edit_profile": "Edit profile",
+    "favorites": "Favorites",
+    "follow": "Follow",
+    "follow_cancel": "Cancel request",
+    "follow_sent": "Request sent!",
+    "follow_progress": "Requesting…",
+    "follow_unfollow": "Unfollow",
+    "unfollow_confirm_title": "Unfollow confirmation",
+    "unfollow_confirm": "Do you really want to unfollow {user}?",
+    "unfollow_confirm_accept_button": "Unfollow",
+    "unfollow_confirm_cancel_button": "Do not unfollow",
+    "followees": "Following",
+    "followers": "Followers",
+    "following": "Following!",
+    "follows_you": "Follows you!",
+    "hidden": "Hidden",
+    "its_you": "It's you!",
+    "media": "Media",
+    "mention": "Mention",
+    "message": "Message",
+    "mute": "Mute",
+    "muted": "Muted",
+    "mute_confirm_title": "Mute confirmation",
+    "mute_confirm": "Do you really want to mute {user}?",
+    "mute_confirm_accept_button": "Mute",
+    "mute_confirm_cancel_button": "Do not mute",
+    "mute_duration_prompt": "Mute this user for (0 for indefinite time):",
+    "per_day": "per day",
+    "remote_follow": "Remote follow",
+    "remove_follower": "Remove follower",
+    "remove_follower_confirm_title": "Remove follower confirmation",
+    "remove_follower_confirm_accept_button": "Remove",
+    "remove_follower_confirm_cancel_button": "Keep",
+    "remove_follower_confirm": "Do you really want to remove {user} from your followers?",
+    "report": "Report",
+    "statuses": "Statuses",
+    "subscribe": "Subscribe",
+    "unsubscribe": "Unsubscribe",
+    "unblock": "Unblock",
+    "unblock_progress": "Unblocking…",
+    "block_progress": "Blocking…",
+    "unmute": "Unmute",
+    "unmute_progress": "Unmuting…",
+    "mute_progress": "Muting…",
+    "hide_repeats": "Hide repeats",
+    "show_repeats": "Show repeats",
+    "bot": "Bot",
+    "birthday": "Born {birthday}",
+    "admin_menu": {
+      "moderation": "Moderation",
+      "grant_admin": "Grant Admin",
+      "revoke_admin": "Revoke Admin",
+      "grant_moderator": "Grant Moderator",
+      "revoke_moderator": "Revoke Moderator",
+      "activate_account": "Activate account",
+      "deactivate_account": "Deactivate account",
+      "delete_account": "Delete account",
+      "force_nsfw": "Mark all posts as NSFW",
+      "strip_media": "Remove media from posts",
+      "force_unlisted": "Force posts to be unlisted",
+      "sandbox": "Force posts to be followers-only",
+      "disable_remote_subscription": "Disallow following user from remote instances",
+      "disable_any_subscription": "Disallow following user at all",
+      "quarantine": "Disallow user posts from federating",
+      "delete_user": "Delete user",
+      "delete_user_data_and_deactivate_confirmation": "This will permanently delete the data from this account and deactivate it. Are you absolutely sure?"
+    },
+    "highlight": {
+      "disabled": "No highlight",
+      "solid": "Solid bg",
+      "striped": "Striped bg",
+      "side": "Side stripe"
+    },
+    "note": "Note",
+    "note_blank": "(None)",
+    "edit_note": "Edit note",
+    "edit_note_apply": "Apply",
+    "edit_note_cancel": "Cancel"
+  },
+  "user_profile": {
+    "timeline_title": "User timeline",
+    "profile_does_not_exist": "Sorry, this profile does not exist.",
+    "profile_loading_error": "Sorry, there was an error loading this profile."
+  },
+  "user_reporting": {
+    "title": "Reporting {0}",
+    "add_comment_description": "The report will be sent to your instance moderators. You can provide an explanation of why you are reporting this account below:",
+    "additional_comments": "Additional comments",
+    "forward_description": "The account is from another server. Send a copy of the report there as well?",
+    "forward_to": "Forward to {0}",
+    "submit": "Submit",
+    "generic_error": "An error occurred while processing your request."
+  },
+  "who_to_follow": {
+    "more": "More",
+    "who_to_follow": "Who to follow"
+  },
+  "tool_tip": {
+    "media_upload": "Upload media",
+    "repeat": "Repeat",
+    "reply": "Reply",
+    "favorite": "Favorite",
+    "add_reaction": "Add Reaction",
+    "user_settings": "User Settings",
+    "accept_follow_request": "Accept follow request",
+    "reject_follow_request": "Reject follow request",
+    "bookmark": "Bookmark",
+    "toggle_expand": "Expand or collapse notification to show post in full",
+    "toggle_mute": "Expand or collapse notification to reveal muted content",
+    "autocomplete_available": "{number} result is available. Use up and down keys to navigate through them. | {number} results are available. Use up and down keys to navigate through them."
+  },
+  "upload": {
+    "error": {
+      "base": "上傳 ê 時失敗。",
+      "message": "傳 buē 起去：{0}",
+      "file_too_big": "檔案 sài-suh 傷大 [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
+      "default": "Koh 試一 kái。"
+    },
+    "file_size_units": {
+      "B": "B",
+      "KiB": "KiB",
+      "MiB": "MiB",
+      "GiB": "GiB",
+      "TiB": "TiB"
+    }
+  },
+  "search": {
+    "people": "用戶",
+    "hashtags": "主題標籤",
+    "person_talking": "{count} ê leh 論",
+    "people_talking": "{count} ê leh 論",
+    "no_results": "無半 ê 結果",
+    "no_more_results": "無其他 ê 結果",
+    "load_more": "載入 koh 較 tsē 結果"
+  },
+  "password_reset": {
+    "forgot_password": "Buē 記得密碼？",
+    "password_reset": "重頭設密碼",
+    "instruction": "拍 lí ê email 地址 iah 是用者 ê 名。Guán 會送 lí 連結，重頭設定密碼。",
+    "placeholder": "Lí ê email 地址 iah 是用者 ê 名。",
+    "check_email": "檢查電子 phue 箱，看有重頭設密碼 ê 連結無。",
+    "return_home": "轉來頭頁",
+    "too_many_requests": "Lí kā 請求 ê khòo-tah 用了 ah。等一時仔，閣試一 pái。",
+    "password_reset_disabled": "密碼重頭設定無開放。請聯絡本站 ê 行政員。",
+    "password_reset_required": "Beh 登入，著重頭設 lí ê 密碼。",
+    "password_reset_required_but_mailer_is_disabled": "Lí 需要重頭設密碼，毋 koh tsia 無開放密碼 koh 再設定。請聯絡本站 ê 行政員。"
+  },
+  "chats": {
+    "you": "Lí：",
+    "message_user": "傳私人 phue：{nickname}",
+    "delete": "Thâi 掉",
+    "chats": "開講",
+    "new": "發起開講",
+    "empty_message_error": "無法度 PO 空 ê phue",
+    "more": "Koh較濟……",
+    "delete_confirm": "Lí 敢真 ê beh thâi tsit 張 phue？",
+    "error_loading_chat": "載入開講 ê 時，出箠 ah。",
+    "error_sending_message": "送 phue ê 時，出箠 ah。",
+    "empty_chat_list_placeholder": "Lí 猶無佇 tsia 開講過，來開講 lah！"
+  },
+  "lists": {
+    "lists": "列單",
+    "new": "新 ê 列單",
+    "title": "列單標題",
+    "search": "Tshuē 用者",
+    "create": "開新 ê",
+    "save": "保存改變",
+    "delete": "刣列單",
+    "following_only": "限定 lí 所關注 ê",
+    "manage_lists": "管理列單",
+    "manage_members": "管理列單成員",
+    "add_members": "Tshiau 閣較 tsē ê 用者",
+    "remove_from_list": "對列單刣掉",
+    "add_to_list": "加入去列單",
+    "is_in_list": "列單已經有 ah ",
+    "editing_list": "編輯列單 {listTitle}",
+    "creating_list": "開新 ê 列單",
+    "update_title": "保存標題",
+    "really_delete": "敢真正 beh 刣掉列單？",
+    "error": "操作列單 ê 時陣出重耽：{0}"
+  },
+  "file_type": {
+    "audio": "音訊",
+    "video": "影片",
+    "image": "影像",
+    "file": "檔案"
+  },
+  "display_date": {
+    "today": "今 á 日"
+  },
+  "update": {
+    "big_update_title": "敬請體諒",
+    "big_update_content": "因為 guán 有一站 á 無發行新版本，所以這个版本會 kap lí 以早慣 sì ê 無仝。",
+    "update_bugs": "請佇 {pleromaGitlab} 報告任何問題 kap bug，因為 Pleroma 改變真 tsē。雖罔 guán 徹底 leh 試，mā 家 kī 用開發版，伊凡勢有一寡重耽。Guán 歡迎 lín 提供關係所拄著 ê 問題 ê 意見、建議，或者是改進 Pleroma kap Pleroma-FE ê 法度。",
+    "update_bugs_gitlab": "Pleroma GitLab",
+    "update_changelog": "Nā beh 知影改變 ê 詳細，請看：{theFullChangelog}.",
+    "update_changelog_here": "Kui ê 改變日誌",
+    "art_by": "美編：{linkToArtist}"
+  },
+  "unicode_domain_indicator": {
+    "tooltip": "這 ê 域名包含毋是 ascii ê 字元。"
+  }
+}
diff --git a/src/services/locale/locale.service.js b/src/services/locale/locale.service.js
index a4af8b90..4e092a7f 100644
--- a/src/services/locale/locale.service.js
+++ b/src/services/locale/locale.service.js
@@ -3,6 +3,7 @@ import ISO6391 from 'iso-639-1'
 import _ from 'lodash'
 
 const specialLanguageCodes = {
+  nan: 'nan',
   ja_easy: 'ja',
   zh_Hant: 'zh-HANT',
   zh: 'zh-Hans'
@@ -19,6 +20,7 @@ const internalToBackendLocaleMulti = codes => {
 const getLanguageName = (code) => {
   const specialLanguageNames = {
     ja_easy: 'やさしいにほんご',
+	  nan: '臺語（閩南語）',
     zh: '简体中文',
     zh_Hant: '繁體中文'
   }
-- 
cgit v1.2.3-70-g09d2


From d722dc165e73e6124614c1b17ed7ba8c7d700354 Mon Sep 17 00:00:00 2001
From: Kian-ting Tan <chenjt30@gmail.com>
Date: Tue, 20 Jun 2023 14:52:41 +0000
Subject: unify the indention

---
 src/i18n/languages.js                 | 2 +-
 src/services/locale/locale.service.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/i18n/languages.js b/src/i18n/languages.js
index 1d14fe9c..432829f6 100644
--- a/src/i18n/languages.js
+++ b/src/i18n/languages.js
@@ -17,7 +17,7 @@ const languages = [
   'ja',
   'ja_easy',
   'ko',
-	'nan',
+  'nan',
   'nb',
   'nl',
   'oc',
diff --git a/src/services/locale/locale.service.js b/src/services/locale/locale.service.js
index 4e092a7f..9bd33f4e 100644
--- a/src/services/locale/locale.service.js
+++ b/src/services/locale/locale.service.js
@@ -20,7 +20,7 @@ const internalToBackendLocaleMulti = codes => {
 const getLanguageName = (code) => {
   const specialLanguageNames = {
     ja_easy: 'やさしいにほんご',
-	  nan: '臺語（閩南語）',
+    nan: '臺語（閩南語）',
     zh: '简体中文',
     zh_Hant: '繁體中文'
   }
-- 
cgit v1.2.3-70-g09d2


From 8897ac5c9b90cdf28e8f039092d83de58e9a883a Mon Sep 17 00:00:00 2001
From: Kian-ting Tan <chenjt30@gmail.com>
Date: Wed, 21 Jun 2023 14:20:37 +0000
Subject: Update locale.service.js

---
 src/services/locale/locale.service.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/services/locale/locale.service.js b/src/services/locale/locale.service.js
index 9bd33f4e..f6a1f708 100644
--- a/src/services/locale/locale.service.js
+++ b/src/services/locale/locale.service.js
@@ -3,7 +3,7 @@ import ISO6391 from 'iso-639-1'
 import _ from 'lodash'
 
 const specialLanguageCodes = {
-  nan: 'nan',
+  nan: 'nan-TW',
   ja_easy: 'ja',
   zh_Hant: 'zh-HANT',
   zh: 'zh-Hans'
-- 
cgit v1.2.3-70-g09d2


From cf0d8c9257fb0be69c9de0f0ed68092eb60b289a Mon Sep 17 00:00:00 2001
From: Kian-ting Tan <chenjt30@gmail.com>
Date: Wed, 21 Jun 2023 17:02:26 +0000
Subject: according to
 https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1841#note_101513
 by tusooa

---
 src/i18n/nan-TW.json                  | 1253 +++++++++++++++++++++++++++++++++
 src/i18n/nan.json                     | 1253 ---------------------------------
 src/services/locale/locale.service.js |    3 +-
 3 files changed, 1254 insertions(+), 1255 deletions(-)
 create mode 100644 src/i18n/nan-TW.json
 delete mode 100644 src/i18n/nan.json

(limited to 'src')

diff --git a/src/i18n/nan-TW.json b/src/i18n/nan-TW.json
new file mode 100644
index 00000000..82e9f281
--- /dev/null
+++ b/src/i18n/nan-TW.json
@@ -0,0 +1,1253 @@
+{
+  "about": {
+    "mrf": {
+		"federation": "聯邦",
+      "keyword": {
+          "keyword_policies": "關鍵字政策",
+        "ftl_removal": "Tuì「知影 ê 網路」時間線除掉。",
+        "reject": "拒絕",
+        "replace": "取代",
+        "is_replaced_by": "→"
+      },
+      "mrf_policies": "啟用 ê MRF 政策",
+      "mrf_policies_desc": "MRF 政策操作本站 ê 對外通信行為。以下ê政策啟用 ah：",
+      "simple": {
+        "simple_policies": "站臺特有 ê 政策",
+        "instance": "站",
+        "reason": "理由",
+        "not_applicable": "N/A",
+        "accept": "接受",
+        "accept_desc": "本站干焦接受下跤 ê 站 ê 短 phue：",
+        "reject": "拒絕",
+        "reject_desc": "本站 buē 接受 tuì 以下 ê 站 ê 短 phue：",
+        "quarantine": "隔離",
+        "quarantine_desc": "針對下跤 ê 站，本站干焦送出公開ê PO文：",
+        "ftl_removal": "Tuì「知影 ê 網路」時間線thâi掉",
+        "ftl_removal_desc": "本站buē 佇「知影 ê 網路」刊下跤 ê 站 ê PO文：",
+        "media_removal": "Thâi除媒體",
+        "media_removal_desc": "本站 kā 下跤 ê 站臺送 ê PO文 ê 媒體 lóng thâi 除：",
+        "media_nsfw": "媒體 lóng 標做「敏感內容」",
+        "media_nsfw_desc": "本站 kā 下跤 ê 站 ê 媒體，lóng 標做敏感內容："
+      }
+    },
+    "staff": "工作人員"
+  },
+  "announcements": {
+    "page_header": "公告",
+    "title": "公告",
+    "mark_as_read_action": "標做有讀",
+    "post_form_header": "貼公告",
+    "post_placeholder": "佇 tsia 拍你 ê 公告……",
+    "post_action": "貼",
+    "post_error": "錯誤：{error}",
+    "close_error": "關",
+    "delete_action": "Thâi",
+    "start_time_prompt": "開始時間： ",
+    "end_time_prompt": "結束時間：",
+    "all_day_prompt": "Tse 是 kui 工 ê 事件",
+    "published_time_display": "公告佇 {time}",
+    "start_time_display": "有效 tuì：{time}",
+    "end_time_display": "中止佇：{time}",
+    "edit_action": "編輯",
+    "submit_edit_action": "送出",
+    "cancel_edit_action": "取消",
+    "inactive_message": "這个公告 tsit-má 無效力。"
+  },
+  "shoutbox": {
+    "title": "留話枋"
+  },
+  "domain_mute_card": {
+    "mute": "予恬去",
+    "mute_progress": "Teh 予恬……",
+    "unmute": "予有聲",
+    "unmute_progress": "Teh 予有聲……"
+  },
+  "exporter": {
+    "export": "匯出",
+    "processing": "Teh 處理，較停仔指示你下載檔案……"
+  },
+  "features_panel": {
+    "shout": "留話枋",
+    "pleroma_chat_messages": "Pleroma 開講",
+    "gopher": "Gopher",
+    "media_proxy": "媒體代理伺侯器",
+    "scope_options": "公開範圍選項",
+    "text_limit": "字數限制",
+    "title": "有效 ê 功能",
+    "who_to_follow": "啥儂通綴",
+    "upload_limit": "檔案 sài-suh 限制"
+  },
+  "finder": {
+    "error_fetching_user": "Tshuē 用者 ê 時起錯誤",
+    "find_user": "Tshuē 用者"
+  },
+  "general": {
+      "apply": "應用",
+    "submit": "送出",
+    "more": "Koh 較 tsē",
+    "loading": "Leh 載入……",
+    "generic_error": "起錯誤 ah",
+    "generic_error_message": "起錯誤：{0}",
+    "error_retry": "請 koh 試一 kái",
+    "retry": "Koh 試",
+    "optional": "非必要",
+    "show_more": "展示較 tsē",
+    "show_less": "展示較少",
+    "never_show_again": "Mài koh 展示",
+    "dismiss": "無視",
+    "cancel": "取消",
+    "disable": "無愛用",
+    "enable": "啟用",
+    "confirm": "確認",
+    "verify": "驗證",
+    "close": "關掉",
+    "undo": "復原",
+    "yes": "是",
+    "no": "毋是",
+    "peek": "先看 māi",
+    "scroll_to_top": "捲 kàu 頂懸",
+    "role": {
+      "admin": "行政員",
+      "moderator": "管理員"
+    },
+    "unpin": "無愛 kā 釘",
+    "pin": "Kā釘起來",
+    "flash_content": "Ji̍h tsia，用 Ruffle（iáu teh 試驗，可能 buē 紡）看 Flash ê 內容。",
+    "flash_sepcurity": "注意 tse 可能有危險，因為 Flash 內容猶原是任意 ê 程式碼。",
+    "flash_fail": "載入 flash 內容失敗，詳細會當看控制臺。",
+    "scope_in_timeline": {
+      "direct": "私人 phue",
+      "private": "干焦 hōo 綴 lí ê 看",
+      "public": "公開佇公共時間線",
+      "unlisted": "無愛公開佇公共時間線"
+    }
+  },
+  "image_cropper": {
+    "crop_picture": "裁相片",
+    "save": "儲存",
+    "save_without_cropping": "無裁就儲存",
+    "cancel": "取消"
+  },
+  "importer": {
+    "submit": "送出",
+    "success": "匯入成功。",
+    "error": "佇匯入 ê 時起錯誤。"
+  },
+  "login": {
+    "login": "登入",
+    "description": "用 OAuth 登入",
+    "logout": "登出",
+    "logout_confirm_title": "登出確認",
+    "logout_confirm": "Lí　敢真正　beh　登出？",
+    "logout_confirm_accept_button": "登出",
+    "logout_confirm_cancel_button": "mài 登出",
+    "password": "密碼",
+    "placeholder": "例：lain",
+    "register": "註冊",
+    "username": "用者 ê 名",
+    "hint": "登入，參與討論",
+    "authentication_code": "認證碼",
+    "enter_recovery_code": "輸入恢復碼",
+    "enter_two_factor_code": "輸入兩階段認證碼",
+    "recovery_code": "恢復碼",
+    "heading": {
+      "totp": "兩階段認證",
+      "recovery": "兩階段恢復"
+    }
+  },
+  "media_modal": {
+    "previous": "頂一　ê",
+    "next": "後一个",
+    "counter": "{current} / {total}",
+    "hide": "關掉媒體瀏覽"
+  },
+  "nav": {
+    "about": "有關……",
+    "administration": "管理",
+    "back": "轉去",
+    "friend_requests": "跟綴請求",
+    "mentions": "The̍h起",
+    "interactions": "互動",
+    "dms": "私人 phue",
+    "public_tl": "公共時間線",
+    "timeline": "時間線",
+    "home_timeline": "厝 ê 時間線",
+    "twkn": "知影 ê 網路",
+    "bookmarks": "冊籤",
+    "user_search": "Tshuē 用者",
+    "search": "tshuē",
+    "search_close": "關掉 tshiau-tshuē liâu",
+    "who_to_follow": "Siáng 會當綴？",
+    "preferences": "個人 ê 設定",
+    "timelines": "時間流",
+    "chats": "開講",
+    "lists": "列單",
+    "edit_nav_mobile": "自訂導覽條",
+    "edit_pinned": "編輯釘起來 ê 項目",
+    "edit_finish": "編輯 suah",
+    "mobile_sidebar": "切換行動版 ê 邊 á liâu",
+    "mobile_notifications": "拍開通知",
+    "mobile_notifications": "拍開通知（有無讀ê）",
+    "mobile_notifications_close": "關掉通知",
+    "announcements": "公告"
+  },
+  "notifications": {
+    "broken_favorite": "狀態毋知影，leh tshiau-tshuē……",
+    "error": "佇取得通知 ê 時起錯誤：{0}",
+    "favorited_you": "kah 意 lí ê 狀態",
+    "followed_you": "綴 lí",
+    "follow_request": "想 beh 綴 lí",
+    "load_older": "載入 khah 早 ê 通知",
+    "notifications": "通知",
+    "read": "讀！",
+    "repeated_you": "轉送 lí ê 狀態",
+    "no_more_notifications": "無別 ê 通知",
+    "migrated_to": "移民到",
+    "reacted_with": "顯出{0} ê 反應",
+    "submitted_report": "送出檢舉",
+    "poll_ended": "投票結束"
+  },
+  "polls": {
+    "add_poll": "開投票",
+    "add_option": "加選項",
+    "option": "選項",
+    "votes": "票",
+    "people_voted_count": "{count} 位有投",
+    "votes_count": "{count} 票",
+    "vote": "投票",
+    "type": "投票 ê 形式",
+    "single_choice": "孤選",
+    "multiple_choices": "Tsē 選",
+    "expiry": "投票期限",
+    "expires_in": "投票 tī {0} 以後結束",
+    "expired": "投票佇 {0} 以前結束",
+    "not_enough_options": "投票 ê 選項傷少。"
+  },
+  "emoji": {
+    "stickers": "貼圖",
+    "emoji": "繪文字",
+    "keep_open": "Hōo 揀選仔開 leh",
+    "search_emoji": "Tshuē 繪文字",
+    "add_emoji": "插繪文字",
+    "custom": "定製 ê 繪文字",
+    "unpacked": "拍開 ê 繪文字",
+    "unicode": "Unicode 繪文字",
+    "unicode_groups": {
+      "activities": "活動",
+      "animals-and-nature": "動物 kap 自然",
+      "flags": "旗 á",
+      "food-and-drink": "食物 kap 飲料",
+      "objects": "物體",
+      "people-and-body": "Lâng kap 身軀",
+      "smileys-and-emotion": "笑面 kap 情緒",
+      "symbols": "符號",
+      "travel-and-places": "旅遊 kap 所在"
+    },
+    "load_all_hint": "載入頭前 {saneAmount} ê 繪文字，規个攏載入效能可能 ē khah 食力。",
+    "load_all": "Kā {emojiAmount} ê 繪文字攏載入",
+    "regional_indicator": "地區指引 {letter}"
+  },
+  "errors": {
+    "storage_unavailable": "Pleroma buē-tàng the̍h 著瀏覽器儲存 ê。Lí ê 登入狀態抑是局部設定 buē 儲存，mā 凡勢 tú 著意料外 ê 問題。拍開 cookie 看覓。"
+  },
+  "interactions": {
+    "favs_repeats": "轉送 kap kah 意",
+    "follows": "最近綴 lí ê",
+    "emoji_reactions": "繪文字 ê 回應",
+    "reports": "檢舉",
+    "moves": "用者 ê 移民",
+    "load_older": "載入 koh khah 早 ê 互動"
+  },
+  "post_status": {
+    "edit_status": "編輯狀態",
+    "new_status": "PO 新 ê 狀態",
+    "account_not_locked_warning": "Lín 口座毋是 {0} ê。見 nā 有 lâng 綴--lí，ē-tàng 看著 lí ê 限定跟綴者 ê PO 文。.",
+    "account_not_locked_warning_link": "鎖起來 ê 口座",
+    "attachments_sensitive": "Kā 附件標做敏感內容。",
+    "media_description": "媒體說明",
+    "content_type": {
+      "text/plain": "純 ê 文字",
+      "text/html": "HTML",
+      "text/markdown": "Markdown",
+      "text/bbcode": "BBCode"
+    },
+    "content_type_selection": "貼 ê 形式",
+    "content_warning": "主旨（毋是必要）",
+    "default": "Tú 正 kàu 高雄 ah。",
+    "direct_warning_to_all": "Tsit ê PO 文通 hōo 逐 ê 提起 ê 用者看見。",
+    "direct_warning_to_first_only": "Tsit ê PO 文，kan-ta 短信 tú 開始提起 ê 用者，tsiah 通看見。",
+    "edit_remote_warning": "別 ê 站臺可能無支援編輯，無法度收著 PO 文上新 ê 版本。",
+    "edit_unsupported_warning": "Pleroma 無支持編輯 the̍h 起 hām 投票。",
+    "posting": "PO 文",
+    "post": "PO",
+    "preview": "Sing 看覓",
+    "preview_empty": "空 ê",
+    "empty_status_error": "無法度 PO 無檔案 koh 空 ê 狀態。",
+    "media_description_error": "更新媒體失敗，請 koh 試一 kái。",
+    "scope_notice": {
+      "public": "Tsit ê PO 文通予逐 ê 儂看著。",
+      "private": "Tsit ê PO 文 kan-ta 予綴 lí ê 看著。",
+      "unlisted": "Tsit ê PO 文 buē 公開 tī 公共時間線 kap 知影 ê 網路。"
+    },
+    "scope_notice_dismiss": "關掉 tsit ê 通知",
+    "scope": {
+      "direct": "私人 phue - PO 文干焦予提起 ê 用者看著",
+      "private": "限定綴 ê 儂 - PO 文干焦予綴 lí ê 儂看著",
+      "public": "公開 - PO kàu 公開時間線",
+      "unlisted": "Mài 列出來 - Mài PO tī 公開時間線。"
+    }
+  },
+  "registration": {
+    "bio_optional": "介紹（毋是必要）",
+    "email": "Email",
+    "email_optional": "Email（毋是必要）",
+    "fullname": "顯示 ê 名",
+    "password_confirm": "確認密碼",
+    "registration": "註冊",
+    "token": "邀請碼",
+    "captcha": "驗證碼",
+    "new_captcha": "Ji̍h 圖片，the̍h 新 ê 驗證碼",
+    "username_placeholder": "e.g. lain",
+    "fullname_placeholder": "e.g. 岩倉 Lain",
+    "bio_placeholder": "e.g.\nLí 好，我是 Lain。我是日本動畫 ê 角色，tuà tī 日本 ê 郊區。Lí 凡勢 bat tī Wired 知影我。",
+    "reason": "註冊 ê 理由",
+    "reason_placeholder": "本站靠人工審核註冊。\n介紹管理者 lí beh tī tsia 註冊 ê 理由。",
+    "register": "註冊",
+    "validations": {
+      "username_required": "著愛添",
+      "fullname_required": "著愛添",
+      "email_required": "著愛添",
+      "password_required": "著愛添",
+      "password_confirmation_required": "著愛添",
+      "password_confirmation_match": "密碼著相 kâng",
+      "birthday_required": "著愛添",
+      "birthday_min_age": "Buē-tàng tī {date} 以後"
+    },
+    "email_language": "Lí想 beh 服侍器用 siánn 物語言寄批 hōo lí？",
+    "birthday": "生日",
+    "birthday_optional": "生日（毋是必要）："
+  },
+  "remote_user_resolver": {
+    "remote_user_resolver": "別站用者 ê 解析器",
+    "searching_for": "Tshuē",
+    "error": "Tshuē無"
+  },
+  "report": {
+    "reporter": "檢舉人：",
+    "reported_user": "Beh 檢舉 ê 用者：",
+    "reported_statuses": "Beh 檢舉 ê 狀態：",
+    "notes": "Notes:",
+    "state": "State:",
+    "state_open": "開 ê",
+    "state_closed": "關 ê",
+    "state_resolved": "解決了 ê"
+  },
+  "selectable_list": {
+    "select_all": "攏總揀"
+  },
+  "settings": {
+    "add_language": "加一 ê 備用 ê 語言",
+    "remove_language": "Ni 掉",
+    "primary_language": "主要語言：",
+    "fallback_language": "備用語言 {index}：",
+    "app_name": "App ê 名",
+    "expert_mode": "進階模式",
+    "save": "保存改變",
+    "security": "安全",
+    "setting_changed": "設定 kap 預先 ê 有 tsing 差",
+    "setting_server_side": "This setting is tied to your profile and affects all sessions and clients",
+    "enter_current_password_to_confirm": "Enter your current password to confirm your identity",
+    "post_look_feel": "Posts Look & Feel",
+    "mention_links": "Mention links",
+    "mfa": {
+      "otp": "OTP",
+      "setup_otp": "Setup OTP",
+      "wait_pre_setup_otp": "presetting OTP",
+      "confirm_and_enable": "Confirm & enable OTP",
+      "title": "Two-factor Authentication",
+      "generate_new_recovery_codes": "Generate new recovery codes",
+      "warning_of_generate_new_codes": "When you generate new recovery codes, your old codes won’t work anymore.",
+      "recovery_codes": "Recovery codes.",
+      "waiting_a_recovery_codes": "Receiving backup codes…",
+      "recovery_codes_warning": "Write the codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
+      "authentication_methods": "Authentication methods",
+      "scan": {
+        "title": "Scan",
+        "desc": "Using your two-factor app, scan this QR code or enter text key:",
+        "secret_code": "Key"
+      },
+      "verify": {
+        "desc": "To enable two-factor authentication, enter the code from your two-factor app:"
+      }
+    },
+    "lists_navigation": "Show lists in navigation",
+    "allow_following_move": "Allow auto-follow when following account moves",
+    "attachmentRadius": "Attachments",
+    "attachments": "Attachments",
+    "avatar": "Avatar",
+    "avatarAltRadius": "Avatars (notifications)",
+    "avatarRadius": "Avatars",
+    "background": "Background",
+    "bio": "Bio",
+    "email_language": "Language for receiving emails from the server",
+    "block_export": "Block export",
+    "block_export_button": "Export your blocks to a csv file",
+    "block_import": "Block import",
+    "block_import_error": "Error importing blocks",
+    "blocks_imported": "Blocks imported! Processing them will take a while.",
+    "mute_export": "Mute export",
+    "mute_export_button": "Export your mutes to a csv file",
+    "mute_import": "Mute import",
+    "mute_import_error": "Error importing mutes",
+    "mutes_imported": "Mutes imported! Processing them will take a while.",
+    "import_mutes_from_a_csv_file": "Import mutes from a csv file",
+    "account_backup": "Account backup",
+    "account_backup_description": "This allows you to download an archive of your account information and your posts, but they cannot yet be imported into a Pleroma account.",
+    "account_backup_table_head": "Backup",
+    "download_backup": "Download",
+    "backup_not_ready": "This backup is not ready yet.",
+    "backup_running": "This backup is in progress, processed {number} record. | This backup is in progress, processed {number} records.",
+    "backup_failed": "This backup has failed.",
+    "remove_backup": "Remove",
+    "list_backups_error": "Error fetching backup list: {error}",
+    "add_backup": "Create a new backup",
+    "added_backup": "Added a new backup.",
+    "add_backup_error": "Error adding a new backup: {error}",
+    "blocks_tab": "Blocks",
+    "bot": "This is a bot account",
+    "btnRadius": "Buttons",
+    "cBlue": "Blue (Reply, follow)",
+    "cGreen": "Green (Retweet)",
+    "cOrange": "Orange (Favorite)",
+    "cRed": "Red (Cancel)",
+    "change_email": "Change email",
+    "change_email_error": "There was an issue changing your email.",
+    "changed_email": "Email changed successfully!",
+    "change_password": "Change password",
+    "change_password_error": "There was an issue changing your password.",
+    "changed_password": "Password changed successfully!",
+    "chatMessageRadius": "Chat message",
+    "collapse_subject": "Collapse posts with subjects",
+    "composing": "Composing",
+    "confirm_new_password": "Confirm new password",
+    "current_password": "Current password",
+    "confirm_dialogs": "Ask for confirmation when",
+    "confirm_dialogs_repeat": "repeating a status",
+    "confirm_dialogs_unfollow": "unfollowing a user",
+    "confirm_dialogs_block": "blocking a user",
+    "confirm_dialogs_mute": "muting a user",
+    "confirm_dialogs_delete": "deleting a status",
+    "confirm_dialogs_logout": "logging out",
+    "confirm_dialogs_approve_follow": "approving a follower",
+    "confirm_dialogs_deny_follow": "denying a follower",
+    "confirm_dialogs_remove_follower": "removing a follower",
+    "mutes_and_blocks": "Mutes and Blocks",
+    "data_import_export_tab": "Data import / export",
+    "default_vis": "Default visibility scope",
+    "delete_account": "Delete account",
+    "delete_account_description": "Permanently delete your data and deactivate your account.",
+    "delete_account_error": "There was an issue deleting your account. If this persists please contact your instance administrator.",
+    "delete_account_instructions": "Type your password in the input below to confirm account deletion.",
+    "account_alias": "Account aliases",
+    "account_alias_table_head": "Alias",
+    "list_aliases_error": "Error fetching aliases: {error}",
+    "hide_list_aliases_error_action": "Close",
+    "remove_alias": "Remove this alias",
+    "new_alias_target": "Add a new alias (e.g. {example})",
+    "added_alias": "Alias is added.",
+    "add_alias_error": "Error adding alias: {error}",
+    "move_account": "Move account",
+    "move_account_notes": "If you want to move the account somewhere else, you must go to your target account and add an alias pointing here.",
+    "move_account_target": "Target account (e.g. {example})",
+    "moved_account": "Account is moved.",
+    "move_account_error": "Error moving account: {error}",
+    "discoverable": "Allow discovery of this account in search results and other services",
+    "domain_mutes": "Domains",
+    "avatar_size_instruction": "The recommended minimum size for avatar images is 150x150 pixels.",
+    "pad_emoji": "Pad emoji with spaces when adding from picker",
+    "autocomplete_select_first": "Automatically select the first candidate when autocomplete results are available",
+    "emoji_reactions_on_timeline": "Show emoji reactions on timeline",
+    "emoji_reactions_scale": "Reactions scale factor",
+    "export_theme": "Save preset",
+    "filtering": "Filtering",
+    "wordfilter": "Wordfilter",
+    "filtering_explanation": "All statuses containing these words will be muted, one per line",
+    "word_filter_and_more": "Word filter and more...",
+    "follow_export": "Follow export",
+    "follow_export_button": "Export your follows to a csv file",
+    "follow_import": "Follow import",
+    "follow_import_error": "Error importing followers",
+    "follows_imported": "Follows imported! Processing them will take a while.",
+    "accent": "Accent",
+    "foreground": "Foreground",
+    "general": "General",
+    "hide_attachments_in_convo": "Hide attachments in conversations",
+    "hide_attachments_in_tl": "Hide attachments in timeline",
+    "hide_media_previews": "Hide media previews",
+    "hide_muted_posts": "Hide posts of muted users",
+    "mute_bot_posts": "Mute bot posts",
+    "hide_bot_indication": "Hide bot indication in posts",
+    "hide_all_muted_posts": "Hide muted posts",
+    "max_thumbnails": "Maximum amount of thumbnails per post (empty = no limit)",
+    "hide_isp": "Hide instance-specific panel",
+    "hide_shoutbox": "Hide instance shoutbox",
+    "right_sidebar": "Reverse order of columns",
+    "navbar_column_stretch": "Stretch navbar to columns width",
+    "always_show_post_button": "Always show floating New Post button",
+    "hide_wallpaper": "Hide instance wallpaper",
+    "preload_images": "Preload images",
+    "use_one_click_nsfw": "Open NSFW attachments with just one click",
+    "hide_post_stats": "Hide post statistics (e.g. the number of favorites)",
+    "hide_user_stats": "Hide user statistics (e.g. the number of followers)",
+    "hide_filtered_statuses": "Hide all filtered posts",
+    "hide_wordfiltered_statuses": "Hide word-filtered statuses",
+    "hide_muted_threads": "Hide muted threads",
+    "import_blocks_from_a_csv_file": "Import blocks from a csv file",
+    "import_followers_from_a_csv_file": "Import follows from a csv file",
+    "import_theme": "Load preset",
+    "inputRadius": "Input fields",
+    "checkboxRadius": "Checkboxes",
+    "instance_default": "(default: {value})",
+    "instance_default_simple": "(default)",
+    "interface": "Interface",
+    "interfaceLanguage": "Interface language",
+    "invalid_theme_imported": "The selected file is not a supported Pleroma theme. No changes to your theme were made.",
+    "limited_availability": "Unavailable in your browser",
+    "links": "Links",
+    "lock_account_description": "Restrict your account to approved followers only",
+    "loop_video": "Loop videos",
+    "loop_video_silent_only": "Loop only videos without sound (i.e. Mastodon's \"gifs\")",
+    "mutes_tab": "Mutes",
+    "play_videos_in_modal": "Play videos in a popup frame",
+    "url": "URL",
+    "preview": "Preview",
+    "file_export_import": {
+      "backup_restore": "Settings backup",
+      "backup_settings": "Backup settings to file",
+      "backup_settings_theme": "Backup settings and theme to file",
+      "restore_settings": "Restore settings from file",
+      "errors": {
+        "invalid_file": "The selected file is not a supported Pleroma settings backup. No changes were made.",
+        "file_too_new": "Incompatile major version: {fileMajor}, this PleromaFE (settings ver {feMajor}) is too old to handle it",
+        "file_too_old": "Incompatile major version: {fileMajor}, file version is too old and not supported (min. set. ver. {feMajor})",
+        "file_slightly_new": "File minor version is different, some settings might not load"
+      }
+    },
+    "profile_fields": {
+      "label": "Profile metadata",
+      "add_field": "Add field",
+      "name": "Label",
+      "value": "Content"
+    },
+    "birthday": {
+      "label": "Birthday",
+      "show_birthday": "Show my birthday"
+    },
+    "account_privacy": "Privacy",
+    "use_contain_fit": "Don't crop the attachment in thumbnails",
+    "name": "Name",
+    "name_bio": "Name & bio",
+    "new_email": "New email",
+    "new_password": "New password",
+    "posts": "Posts",
+    "user_profiles": "User Profiles",
+    "notification_visibility": "Types of notifications to show",
+    "notification_visibility_follows": "Follows",
+    "notification_visibility_likes": "Favorites",
+    "notification_visibility_mentions": "Mentions",
+    "notification_visibility_repeats": "Repeats",
+    "notification_visibility_moves": "User Migrates",
+    "notification_visibility_emoji_reactions": "Reactions",
+    "notification_visibility_polls": "Ends of polls you voted in",
+    "no_rich_text_description": "Strip rich text formatting from all posts",
+    "no_blocks": "No blocks",
+    "no_mutes": "No mutes",
+    "hide_favorites_description": "Don't show list of my favorites (people still get notified)",
+    "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": "Hide sensitive/NSFW media",
+    "oauth_tokens": "OAuth tokens",
+    "token": "Token",
+    "refresh_token": "Refresh token",
+    "valid_until": "Valid until",
+    "revoke_token": "Revoke",
+    "panelRadius": "Panels",
+    "pause_on_unfocused": "Pause when tab is not focused",
+    "presets": "Presets",
+    "profile_background": "Profile background",
+    "profile_banner": "Profile banner",
+    "profile_tab": "Profile",
+    "radii_help": "Set up interface edge rounding (in pixels)",
+    "replies_in_timeline": "Replies in timeline",
+    "reply_visibility_all": "Show all replies",
+    "reply_visibility_following": "Only show replies directed at me or users I'm following",
+    "reply_visibility_self": "Only show replies directed at me",
+    "reply_visibility_following_short": "Show replies to my follows",
+    "reply_visibility_self_short": "Show replies to self only",
+    "autohide_floating_post_button": "Automatically hide New Post button (mobile)",
+    "saving_err": "Error saving settings",
+    "saving_ok": "Settings saved",
+    "search_user_to_block": "Search whom you want to block",
+    "search_user_to_mute": "Search whom you want to mute",
+    "security_tab": "Security",
+    "scope_copy": "Copy scope when replying (DMs are always copied)",
+    "minimal_scopes_mode": "Minimize post scope selection options",
+    "set_new_avatar": "Set new avatar",
+    "set_new_profile_background": "Set new profile background",
+    "set_new_profile_banner": "Set new profile banner",
+    "reset_avatar": "Reset avatar",
+    "reset_profile_background": "Reset profile background",
+    "reset_profile_banner": "Reset profile banner",
+    "reset_avatar_confirm": "Do you really want to reset the avatar?",
+    "reset_banner_confirm": "Do you really want to reset the banner?",
+    "reset_background_confirm": "Do you really want to reset the background?",
+    "settings": "Settings",
+    "subject_input_always_show": "Always show subject field",
+    "subject_line_behavior": "Copy subject when replying",
+    "subject_line_email": "Like email: \"re: subject\"",
+    "subject_line_mastodon": "Like mastodon: copy as is",
+    "subject_line_noop": "Do not copy",
+    "conversation_display": "Conversation display style",
+    "conversation_display_tree": "Tree-style",
+    "conversation_display_tree_quick": "Tree view",
+    "disable_sticky_headers": "Don't stick column headers to top of the screen",
+    "show_scrollbars": "Show side column's scrollbars",
+    "third_column_mode": "When there's enough space, show third column containing",
+    "third_column_mode_none": "Don't show third column at all",
+    "third_column_mode_notifications": "Notifications column",
+    "third_column_mode_postform": "Main post form and navigation",
+    "columns": "Columns",
+    "column_sizes": "Column sizes",
+    "column_sizes_sidebar": "Sidebar",
+    "column_sizes_content": "Content",
+    "column_sizes_notifs": "Notifications",
+    "tree_advanced": "Allow more flexible navigation in tree view",
+    "tree_fade_ancestors": "Display ancestors of the current status in faint text",
+    "conversation_display_linear": "Linear-style",
+    "conversation_display_linear_quick": "Linear view",
+    "conversation_other_replies_button": "Show the \"other replies\" button",
+    "conversation_other_replies_button_below": "Below statuses",
+    "conversation_other_replies_button_inside": "Inside statuses",
+    "max_depth_in_thread": "Maximum number of levels in thread to display by default",
+    "post_status_content_type": "Post status content type",
+    "sensitive_by_default": "Mark posts as sensitive by default",
+    "stop_gifs": "Pause animated images until you hover on them",
+    "streaming": "Automatically show new posts when scrolled to the top",
+    "auto_update": "Show new posts automatically",
+    "user_mutes": "Users",
+    "useStreamingApi": "Receive posts and notifications real-time",
+    "use_websockets": "Use websockets (Realtime updates)",
+    "text": "Text",
+    "theme": "Theme",
+    "theme_help": "Use hex color codes (#rrggbb) to customize your color theme.",
+    "theme_help_v2_1": "You can also override certain component's colors and opacity by toggling the checkbox, use \"Clear all\" button to clear all overrides.",
+    "theme_help_v2_2": "Icons underneath some entries are background/text contrast indicators, hover over for detailed info. Please keep in mind that when using transparency contrast indicators show the worst possible case.",
+    "tooltipRadius": "Tooltips/alerts",
+    "type_domains_to_mute": "Search domains to mute",
+    "upload_a_photo": "Upload a photo",
+    "user_settings": "User Settings",
+    "values": {
+      "false": "no",
+      "true": "yes"
+    },
+    "virtual_scrolling": "Optimize timeline rendering",
+    "use_at_icon": "Display {'@'} symbol as an icon instead of text",
+    "mention_link_display": "Display mention links",
+    "mention_link_display_short": "always as short names (e.g. {'@'}foo)",
+    "mention_link_display_full_for_remote": "as full names only for remote users (e.g. {'@'}foo{'@'}example.org)",
+    "mention_link_display_full": "always as full names (e.g. {'@'}foo{'@'}example.org)",
+    "mention_link_use_tooltip": "Show user card when clicking mention links",
+    "mention_link_show_avatar": "Show user avatar beside the link",
+    "mention_link_show_avatar_quick": "Show user avatar next to mentions",
+    "mention_link_fade_domain": "Fade domains (e.g. {'@'}example.org in {'@'}foo{'@'}example.org)",
+    "mention_link_bolden_you": "Highlight mention of you when you are mentioned",
+    "user_popover_avatar_action": "Popover avatar click action",
+    "user_popover_avatar_action_zoom": "Zoom the avatar",
+    "user_popover_avatar_action_close": "Close the popover",
+    "user_popover_avatar_action_open": "Open profile",
+    "user_popover_avatar_overlay": "Show user popover over user avatar",
+    "fun": "Fun",
+    "greentext": "Meme arrows",
+    "show_yous": "Show (You)s",
+    "notifications": "Notifications",
+    "notification_setting_filters": "Filters",
+    "notification_setting_block_from_strangers": "Block notifications from users who you do not follow",
+    "notification_setting_privacy": "Privacy",
+    "notification_setting_hide_notification_contents": "Hide the sender and contents of push notifications",
+    "notification_mutes": "To stop receiving notifications from a specific user, use a mute.",
+    "notification_blocks": "Blocking a user stops all notifications as well as unsubscribes them.",
+    "enable_web_push_notifications": "Enable web push notifications",
+    "more_settings": "More settings",
+    "style": {
+      "switcher": {
+        "keep_color": "Keep colors",
+        "keep_shadows": "Keep shadows",
+        "keep_opacity": "Keep opacity",
+        "keep_roundness": "Keep roundness",
+        "keep_fonts": "Keep fonts",
+        "save_load_hint": "\"Keep\" options preserve currently set options when selecting or loading themes, it also stores said options when exporting a theme. When all checkboxes unset, exporting theme will save everything.",
+        "reset": "Reset",
+        "clear_all": "Clear all",
+        "clear_opacity": "Clear opacity",
+        "load_theme": "Load theme",
+        "keep_as_is": "Keep as is",
+        "use_snapshot": "Old version",
+        "use_source": "New version",
+        "help": {
+          "upgraded_from_v2": "PleromaFE has been upgraded, theme could look a little bit different than you remember.",
+          "v2_imported": "File you imported was made for older FE. We try to maximize compatibility but there still could be inconsistencies.",
+          "future_version_imported": "File you imported was made in newer version of FE.",
+          "older_version_imported": "File you imported was made in older version of FE.",
+          "snapshot_present": "Theme snapshot is loaded, so all values are overriden. You can load theme's actual data instead.",
+          "snapshot_missing": "No theme snapshot was in the file so it could look different than originally envisioned.",
+          "fe_upgraded": "PleromaFE's theme engine upgraded after version update.",
+          "fe_downgraded": "PleromaFE's version rolled back.",
+          "migration_snapshot_ok": "Just to be safe, theme snapshot loaded. You can try loading theme data.",
+          "migration_napshot_gone": "For whatever reason snapshot was missing, some stuff could look different than you remember.",
+          "snapshot_source_mismatch": "Versions conflict: most likely FE was rolled back and updated again, if you changed theme using older version of FE you most likely want to use old version, otherwise use new version."
+        }
+      },
+      "common": {
+        "color": "色彩",
+        "opacity": "無透明度",
+        "contrast": {
+          "hint": "Contrast ratio is {ratio}, it {level} {context}",
+          "level": {
+            "aa": "meets Level AA guideline (minimal)",
+            "aaa": "meets Level AAA guideline (recommended)",
+            "bad": "doesn't meet any accessibility guidelines"
+          },
+          "context": {
+            "18pt": "for large (18pt+) text",
+            "text": "for text"
+          }
+        }
+      },
+      "common_colors": {
+        "_tab_label": "Common",
+        "main": "Common colors",
+        "foreground_hint": "See \"Advanced\" tab for more detailed control",
+        "rgbo": "Icons, accents, badges"
+      },
+      "advanced_colors": {
+        "_tab_label": "Advanced",
+        "alert": "Alert background",
+        "alert_error": "Error",
+        "alert_warning": "Warning",
+        "alert_neutral": "Neutral",
+        "post": "Posts/User bios",
+        "badge": "Badge background",
+        "popover": "Tooltips, menus, popovers",
+        "badge_notification": "Notification",
+        "panel_header": "Panel header",
+        "top_bar": "Top bar",
+        "borders": "Borders",
+        "buttons": "Buttons",
+        "inputs": "Input fields",
+        "faint_text": "Faded text",
+        "underlay": "Underlay",
+        "wallpaper": "Wallpaper",
+        "poll": "Poll graph",
+        "icons": "Icons",
+        "highlight": "Highlighted elements",
+        "pressed": "Pressed",
+        "selectedPost": "Selected post",
+        "selectedMenu": "Selected menu item",
+        "disabled": "Disabled",
+        "toggled": "Toggled",
+        "tabs": "Tabs",
+        "chat": {
+          "incoming": "Incoming",
+          "outgoing": "Outgoing",
+          "border": "Border"
+        }
+      },
+      "radii": {
+        "_tab_label": "Roundness"
+      },
+      "shadows": {
+        "_tab_label": "Shadow and lighting",
+        "component": "Component",
+        "override": "Override",
+        "shadow_id": "Shadow #{value}",
+        "blur": "Blur",
+        "spread": "Spread",
+        "inset": "Inset",
+        "hintV3": "For shadows you can also use the {0} notation to use other color slot.",
+        "filter_hint": {
+          "always_drop_shadow": "Warning, this shadow always uses {0} when browser supports it.",
+          "drop_shadow_syntax": "{0} does not support {1} parameter and {2} keyword.",
+          "avatar_inset": "Please note that combining both inset and non-inset shadows on avatars might give unexpected results with transparent avatars.",
+          "spread_zero": "Shadows with spread > 0 will appear as if it was set to zero",
+          "inset_classic": "Inset shadows will be using {0}"
+        },
+        "components": {
+          "panel": "Panel",
+          "panelHeader": "Panel header",
+          "topBar": "Top bar",
+          "avatar": "User avatar (in profile view)",
+          "avatarStatus": "User avatar (in post display)",
+          "popup": "Popups and tooltips",
+          "button": "Button",
+          "buttonHover": "Button (hover)",
+          "buttonPressed": "Button (pressed)",
+          "buttonPressedHover": "Button (pressed+hover)",
+          "input": "Input field"
+        }
+      },
+      "fonts": {
+        "_tab_label": "Fonts",
+        "help": "Select font to use for elements of UI. For \"custom\" you have to enter exact font name as it appears in system.",
+        "components": {
+          "interface": "Interface",
+          "input": "Input fields",
+          "post": "Post text",
+          "postCode": "Monospaced text in a post (rich text)"
+        },
+        "family": "Font name",
+        "size": "Size (in px)",
+        "weight": "Weight (boldness)",
+        "custom": "Custom"
+      },
+      "preview": {
+        "header": "Preview",
+        "content": "Content",
+        "error": "Example error",
+        "button": "Button",
+        "text": "A bunch of more {0} and {1}",
+        "mono": "content",
+        "input": "Just landed in L.A.",
+        "faint_link": "helpful manual",
+        "fine_print": "Read our {0} to learn nothing useful!",
+        "header_faint": "This is fine",
+        "checkbox": "I have skimmed over terms and conditions",
+        "link": "a nice lil' link"
+      }
+    },
+    "version": {
+      "title": "Version",
+      "backend_version": "Backend version",
+      "frontend_version": "Frontend version"
+    },
+    "commit_value": "Save",
+    "commit_value_tooltip": "Value is not saved, press this button to commit your changes",
+    "reset_value": "Reset",
+    "reset_value_tooltip": "Reset draft",
+    "hard_reset_value": "Hard reset",
+    "hard_reset_value_tooltip": "Remove setting from storage, forcing use of default value"
+  },
+  "admin_dash": {
+    "window_title": "Administration",
+    "wip_notice": "This admin dashboard is experimental and WIP, {adminFeLink}.",
+    "old_ui_link": "old admin UI available here",
+    "reset_all": "Reset all",
+    "commit_all": "Save all",
+    "tabs": {
+      "nodb": "No DB Config",
+      "instance": "Instance",
+      "limits": "Limits",
+      "frontends": "Front-ends"
+    },
+    "nodb": {
+      "heading": "Database config is disabled",
+      "text": "You need to change backend config files so that {property} is set to {value}, see more in {documentation}.",
+      "documentation": "documentation",
+      "text2": "Most configuration options will be unavailable."
+    },
+    "captcha": {
+      "native": "Native",
+      "kocaptcha": "KoCaptcha"
+    },
+    "instance": {
+      "instance": "Instance information",
+      "registrations": "User sign-ups",
+      "captcha_header": "CAPTCHA",
+      "kocaptcha": "KoCaptcha settings",
+      "access": "Instance access",
+      "restrict": {
+        "header": "Restrict access for anonymous visitors",
+        "description": "Detailed setting for allowing/disallowing access to certain aspects of API. By default (indeterminate state) it will disallow if instance is not public, ticked checkbox means disallow access even if instance is public, unticked means allow access even if instance is private. Please note that unexpected behavior might happen if some settings are set, i.e. if profile access is disabled posts will show without profile information.",
+        "timelines": "Timelines access",
+        "profiles": "User profiles access",
+        "activities": "Statues/activities access"
+      }
+    },
+    "limits": {
+      "arbitrary_limits": "Arbitrary limits",
+      "posts": "Post limits",
+      "uploads": "Attachments limits",
+      "users": "User profile limits",
+      "profile_fields": "Profile fields limits",
+      "user_uploads": "Profile media limits"
+    },
+    "frontend": {
+      "repository": "Repository link",
+      "versions": "Available versions",
+      "build_url": "Build URL",
+      "reinstall": "Reinstall",
+      "is_default": "(Default)",
+      "is_default_custom": "(Default, version: {version})",
+      "install": "Install",
+      "install_version": "Install version {version}",
+      "more_install_options": "More install options",
+      "more_default_options": "More default setting options",
+      "set_default": "Set default",
+      "set_default_version": "Set version {version} as default",
+      "wip_notice": "Please note that this section is a WIP and lacks certain features as backend implementation of front-end management is incomplete.",
+      "default_frontend": "Default front-end",
+      "default_frontend_tip": "Default front-end will be shown to all users. Currently there's no way to for a user to select personal front-end. If you switch away from PleromaFE you'll most likely have to use old and buggy AdminFE to do instance configuration until we replace it.",
+      "default_frontend_tip2": "WIP: Since Pleroma backend doesn't properly list all installed frontends you'll have to enter name and reference manually. List below provides shortcuts to fill the values.",
+      "available_frontends": "Available for install"
+    },
+    "temp_overrides": {
+      ":pleroma": {
+        ":instance": {
+          ":public": {
+            "label": "Instance is public",
+            "description": "Disabling this will make all API accessible only for logged-in users, this will make Public and Federated timelines inaccessible to anonymous visitors."
+          },
+          ":limit_to_local_content": {
+            "label": "Limit search to local content",
+            "description": "Disables global network search for unauthenticated (default), all users or none"
+          },
+          ":description_limit": {
+            "label": "Limit",
+            "description": "Character limit for attachment descriptions"
+          },
+          ":background_image": {
+            "label": "Background image",
+            "description": "Background image (primarily used by PleromaFE)"
+          }
+        }
+      }
+    }
+  },
+  "time": {
+    "unit": {
+      "days": "{0} day | {0} days",
+      "days_short": "{0}d",
+      "hours": "{0} hour | {0} hours",
+      "hours_short": "{0}h",
+      "minutes": "{0} minute | {0} minutes",
+      "minutes_short": "{0}min",
+      "months": "{0} month | {0} months",
+      "months_short": "{0}mo",
+      "seconds": "{0} second | {0} seconds",
+      "seconds_short": "{0}s",
+      "weeks": "{0} week | {0} weeks",
+      "weeks_short": "{0}w",
+      "years": "{0} year | {0} years",
+      "years_short": "{0}y"
+    },
+    "in_future": "in {0}",
+    "in_past": "{0} ago",
+    "now": "just now",
+    "now_short": "now"
+  },
+  "timeline": {
+    "collapse": "Collapse",
+    "conversation": "Conversation",
+    "error": "Error fetching timeline: {0}",
+    "load_older": "Load older statuses",
+    "no_retweet_hint": "Post is marked as followers-only or direct and cannot be repeated",
+    "repeated": "repeated",
+    "show_new": "Show new",
+    "reload": "Reload",
+    "up_to_date": "Up-to-date",
+    "no_more_statuses": "No more statuses",
+    "no_statuses": "No statuses",
+    "socket_reconnected": "Realtime connection established",
+    "socket_broke": "Realtime connection lost: CloseEvent code {0}",
+    "quick_view_settings": "Quick view settings",
+    "quick_filter_settings": "Quick filter settings"
+  },
+  "status": {
+    "favorites": "Favorites",
+    "repeats": "Repeats",
+    "repeat_confirm": "Do you really want to repeat this status?",
+    "repeat_confirm_title": "Repeat confirmation",
+    "repeat_confirm_accept_button": "Repeat",
+    "repeat_confirm_cancel_button": "Do not repeat",
+    "delete": "Delete status",
+    "delete_error": "Error deleting status: {0}",
+    "edit": "Edit status",
+    "edited_at": "(last edited {time})",
+    "pin": "Pin on profile",
+    "unpin": "Unpin from profile",
+    "pinned": "Pinned",
+    "bookmark": "Bookmark",
+    "unbookmark": "Unbookmark",
+    "delete_confirm": "Do you really want to delete this status?",
+    "delete_confirm_title": "Delete confirmation",
+    "delete_confirm_accept_button": "Delete",
+    "delete_confirm_cancel_button": "Keep",
+    "reply_to": "Reply to",
+    "mentions": "Mentions",
+    "replies_list": "Replies:",
+    "replies_list_with_others": "Replies (+{numReplies} other): | Replies (+{numReplies} others):",
+    "mute_conversation": "Mute conversation",
+    "unmute_conversation": "Unmute conversation",
+    "status_unavailable": "Status unavailable",
+    "copy_link": "Copy link to status",
+    "external_source": "External source",
+    "thread_muted": "Thread muted",
+    "thread_muted_and_words": ", has words:",
+    "show_full_subject": "Show full subject",
+    "hide_full_subject": "Hide full subject",
+    "show_content": "Show content",
+    "hide_content": "Hide content",
+    "status_deleted": "This post was deleted",
+    "nsfw": "NSFW",
+    "expand": "Expand",
+    "you": "(You)",
+    "plus_more": "+{number} more",
+    "many_attachments": "Post has {number} attachment(s)",
+    "collapse_attachments": "Collapse attachments",
+    "show_all_attachments": "Show all attachments",
+    "show_attachment_in_modal": "Show in media modal",
+    "show_attachment_description": "Preview description (open attachment for full description)",
+    "hide_attachment": "Hide attachment",
+    "remove_attachment": "Remove attachment",
+    "attachment_stop_flash": "Stop Flash player",
+    "move_up": "Shift attachment left",
+    "move_down": "Shift attachment right",
+    "open_gallery": "Open gallery",
+    "thread_hide": "Hide this thread",
+    "thread_show": "Show this thread",
+    "thread_show_full": "Show everything under this thread ({numStatus} status in total, max depth {depth}) | Show everything under this thread ({numStatus} statuses in total, max depth {depth})",
+    "thread_show_full_with_icon": "{icon} {text}",
+    "thread_follow": "See the remaining part of this thread ({numStatus} status in total) | See the remaining part of this thread ({numStatus} statuses in total)",
+    "thread_follow_with_icon": "{icon} {text}",
+    "ancestor_follow": "See {numReplies} other reply under this status | See {numReplies} other replies under this status",
+    "ancestor_follow_with_icon": "{icon} {text}",
+    "show_all_conversation_with_icon": "{icon} {text}",
+    "show_all_conversation": "Show full conversation ({numStatus} other status) | Show full conversation ({numStatus} other statuses)",
+    "show_only_conversation_under_this": "Only show replies to this status",
+    "status_history": "Status history",
+    "reaction_count_label": "{num} person reacted | {num} people reacted"
+  },
+  "user_card": {
+    "approve": "Approve",
+    "approve_confirm_title": "Approve confirmation",
+    "approve_confirm_accept_button": "Approve",
+    "approve_confirm_cancel_button": "Do not approve",
+    "approve_confirm": "Do you want to approve {user}'s follow request?",
+    "block": "Block",
+    "blocked": "Blocked!",
+    "block_confirm_title": "Block confirmation",
+    "block_confirm": "Do you really want to block {user}?",
+    "block_confirm_accept_button": "Block",
+    "block_confirm_cancel_button": "Do not block",
+    "deactivated": "Deactivated",
+    "deny": "Deny",
+    "deny_confirm_title": "Deny confirmation",
+    "deny_confirm_accept_button": "Deny",
+    "deny_confirm_cancel_button": "Do not deny",
+    "deny_confirm": "Do you want to deny {user}'s follow request?",
+    "edit_profile": "Edit profile",
+    "favorites": "Favorites",
+    "follow": "Follow",
+    "follow_cancel": "Cancel request",
+    "follow_sent": "Request sent!",
+    "follow_progress": "Requesting…",
+    "follow_unfollow": "Unfollow",
+    "unfollow_confirm_title": "Unfollow confirmation",
+    "unfollow_confirm": "Do you really want to unfollow {user}?",
+    "unfollow_confirm_accept_button": "Unfollow",
+    "unfollow_confirm_cancel_button": "Do not unfollow",
+    "followees": "Following",
+    "followers": "Followers",
+    "following": "Following!",
+    "follows_you": "Follows you!",
+    "hidden": "Hidden",
+    "its_you": "It's you!",
+    "media": "Media",
+    "mention": "Mention",
+    "message": "Message",
+    "mute": "Mute",
+    "muted": "Muted",
+    "mute_confirm_title": "Mute confirmation",
+    "mute_confirm": "Do you really want to mute {user}?",
+    "mute_confirm_accept_button": "Mute",
+    "mute_confirm_cancel_button": "Do not mute",
+    "mute_duration_prompt": "Mute this user for (0 for indefinite time):",
+    "per_day": "per day",
+    "remote_follow": "Remote follow",
+    "remove_follower": "Remove follower",
+    "remove_follower_confirm_title": "Remove follower confirmation",
+    "remove_follower_confirm_accept_button": "Remove",
+    "remove_follower_confirm_cancel_button": "Keep",
+    "remove_follower_confirm": "Do you really want to remove {user} from your followers?",
+    "report": "Report",
+    "statuses": "Statuses",
+    "subscribe": "Subscribe",
+    "unsubscribe": "Unsubscribe",
+    "unblock": "Unblock",
+    "unblock_progress": "Unblocking…",
+    "block_progress": "Blocking…",
+    "unmute": "Unmute",
+    "unmute_progress": "Unmuting…",
+    "mute_progress": "Muting…",
+    "hide_repeats": "Hide repeats",
+    "show_repeats": "Show repeats",
+    "bot": "Bot",
+    "birthday": "Born {birthday}",
+    "admin_menu": {
+      "moderation": "Moderation",
+      "grant_admin": "Grant Admin",
+      "revoke_admin": "Revoke Admin",
+      "grant_moderator": "Grant Moderator",
+      "revoke_moderator": "Revoke Moderator",
+      "activate_account": "Activate account",
+      "deactivate_account": "Deactivate account",
+      "delete_account": "Delete account",
+      "force_nsfw": "Mark all posts as NSFW",
+      "strip_media": "Remove media from posts",
+      "force_unlisted": "Force posts to be unlisted",
+      "sandbox": "Force posts to be followers-only",
+      "disable_remote_subscription": "Disallow following user from remote instances",
+      "disable_any_subscription": "Disallow following user at all",
+      "quarantine": "Disallow user posts from federating",
+      "delete_user": "Delete user",
+      "delete_user_data_and_deactivate_confirmation": "This will permanently delete the data from this account and deactivate it. Are you absolutely sure?"
+    },
+    "highlight": {
+      "disabled": "No highlight",
+      "solid": "Solid bg",
+      "striped": "Striped bg",
+      "side": "Side stripe"
+    },
+    "note": "Note",
+    "note_blank": "(None)",
+    "edit_note": "Edit note",
+    "edit_note_apply": "Apply",
+    "edit_note_cancel": "Cancel"
+  },
+  "user_profile": {
+    "timeline_title": "User timeline",
+    "profile_does_not_exist": "Sorry, this profile does not exist.",
+    "profile_loading_error": "Sorry, there was an error loading this profile."
+  },
+  "user_reporting": {
+    "title": "Reporting {0}",
+    "add_comment_description": "The report will be sent to your instance moderators. You can provide an explanation of why you are reporting this account below:",
+    "additional_comments": "Additional comments",
+    "forward_description": "The account is from another server. Send a copy of the report there as well?",
+    "forward_to": "Forward to {0}",
+    "submit": "Submit",
+    "generic_error": "An error occurred while processing your request."
+  },
+  "who_to_follow": {
+    "more": "More",
+    "who_to_follow": "Who to follow"
+  },
+  "tool_tip": {
+    "media_upload": "Upload media",
+    "repeat": "Repeat",
+    "reply": "Reply",
+    "favorite": "Favorite",
+    "add_reaction": "Add Reaction",
+    "user_settings": "User Settings",
+    "accept_follow_request": "Accept follow request",
+    "reject_follow_request": "Reject follow request",
+    "bookmark": "Bookmark",
+    "toggle_expand": "Expand or collapse notification to show post in full",
+    "toggle_mute": "Expand or collapse notification to reveal muted content",
+    "autocomplete_available": "{number} result is available. Use up and down keys to navigate through them. | {number} results are available. Use up and down keys to navigate through them."
+  },
+  "upload": {
+    "error": {
+      "base": "上傳 ê 時失敗。",
+      "message": "傳 buē 起去：{0}",
+      "file_too_big": "檔案 sài-suh 傷大 [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
+      "default": "Koh 試一 kái。"
+    },
+    "file_size_units": {
+      "B": "B",
+      "KiB": "KiB",
+      "MiB": "MiB",
+      "GiB": "GiB",
+      "TiB": "TiB"
+    }
+  },
+  "search": {
+    "people": "用戶",
+    "hashtags": "主題標籤",
+    "person_talking": "{count} ê leh 論",
+    "people_talking": "{count} ê leh 論",
+    "no_results": "無半 ê 結果",
+    "no_more_results": "無其他 ê 結果",
+    "load_more": "載入 koh 較 tsē 結果"
+  },
+  "password_reset": {
+    "forgot_password": "Buē 記得密碼？",
+    "password_reset": "重頭設密碼",
+    "instruction": "拍 lí ê email 地址 iah 是用者 ê 名。Guán 會送 lí 連結，重頭設定密碼。",
+    "placeholder": "Lí ê email 地址 iah 是用者 ê 名。",
+    "check_email": "檢查電子 phue 箱，看有重頭設密碼 ê 連結無。",
+    "return_home": "轉來頭頁",
+    "too_many_requests": "Lí kā 請求 ê khòo-tah 用了 ah。等一時仔，閣試一 pái。",
+    "password_reset_disabled": "密碼重頭設定無開放。請聯絡本站 ê 行政員。",
+    "password_reset_required": "Beh 登入，著重頭設 lí ê 密碼。",
+    "password_reset_required_but_mailer_is_disabled": "Lí 需要重頭設密碼，毋 koh tsia 無開放密碼 koh 再設定。請聯絡本站 ê 行政員。"
+  },
+  "chats": {
+    "you": "Lí：",
+    "message_user": "傳私人 phue：{nickname}",
+    "delete": "Thâi 掉",
+    "chats": "開講",
+    "new": "發起開講",
+    "empty_message_error": "無法度 PO 空 ê phue",
+    "more": "Koh較濟……",
+    "delete_confirm": "Lí 敢真 ê beh thâi tsit 張 phue？",
+    "error_loading_chat": "載入開講 ê 時，出箠 ah。",
+    "error_sending_message": "送 phue ê 時，出箠 ah。",
+    "empty_chat_list_placeholder": "Lí 猶無佇 tsia 開講過，來開講 lah！"
+  },
+  "lists": {
+    "lists": "列單",
+    "new": "新 ê 列單",
+    "title": "列單標題",
+    "search": "Tshuē 用者",
+    "create": "開新 ê",
+    "save": "保存改變",
+    "delete": "刣列單",
+    "following_only": "限定 lí 所關注 ê",
+    "manage_lists": "管理列單",
+    "manage_members": "管理列單成員",
+    "add_members": "Tshiau 閣較 tsē ê 用者",
+    "remove_from_list": "對列單刣掉",
+    "add_to_list": "加入去列單",
+    "is_in_list": "列單已經有 ah ",
+    "editing_list": "編輯列單 {listTitle}",
+    "creating_list": "開新 ê 列單",
+    "update_title": "保存標題",
+    "really_delete": "敢真正 beh 刣掉列單？",
+    "error": "操作列單 ê 時陣出重耽：{0}"
+  },
+  "file_type": {
+    "audio": "音訊",
+    "video": "影片",
+    "image": "影像",
+    "file": "檔案"
+  },
+  "display_date": {
+    "today": "今 á 日"
+  },
+  "update": {
+    "big_update_title": "敬請體諒",
+    "big_update_content": "因為 guán 有一站 á 無發行新版本，所以這个版本會 kap lí 以早慣 sì ê 無仝。",
+    "update_bugs": "請佇 {pleromaGitlab} 報告任何問題 kap bug，因為 Pleroma 改變真 tsē。雖罔 guán 徹底 leh 試，mā 家 kī 用開發版，伊凡勢有一寡重耽。Guán 歡迎 lín 提供關係所拄著 ê 問題 ê 意見、建議，或者是改進 Pleroma kap Pleroma-FE ê 法度。",
+    "update_bugs_gitlab": "Pleroma GitLab",
+    "update_changelog": "Nā beh 知影改變 ê 詳細，請看：{theFullChangelog}.",
+    "update_changelog_here": "Kui ê 改變日誌",
+    "art_by": "美編：{linkToArtist}"
+  },
+  "unicode_domain_indicator": {
+    "tooltip": "這 ê 域名包含毋是 ascii ê 字元。"
+  }
+}
diff --git a/src/i18n/nan.json b/src/i18n/nan.json
deleted file mode 100644
index 82e9f281..00000000
--- a/src/i18n/nan.json
+++ /dev/null
@@ -1,1253 +0,0 @@
-{
-  "about": {
-    "mrf": {
-		"federation": "聯邦",
-      "keyword": {
-          "keyword_policies": "關鍵字政策",
-        "ftl_removal": "Tuì「知影 ê 網路」時間線除掉。",
-        "reject": "拒絕",
-        "replace": "取代",
-        "is_replaced_by": "→"
-      },
-      "mrf_policies": "啟用 ê MRF 政策",
-      "mrf_policies_desc": "MRF 政策操作本站 ê 對外通信行為。以下ê政策啟用 ah：",
-      "simple": {
-        "simple_policies": "站臺特有 ê 政策",
-        "instance": "站",
-        "reason": "理由",
-        "not_applicable": "N/A",
-        "accept": "接受",
-        "accept_desc": "本站干焦接受下跤 ê 站 ê 短 phue：",
-        "reject": "拒絕",
-        "reject_desc": "本站 buē 接受 tuì 以下 ê 站 ê 短 phue：",
-        "quarantine": "隔離",
-        "quarantine_desc": "針對下跤 ê 站，本站干焦送出公開ê PO文：",
-        "ftl_removal": "Tuì「知影 ê 網路」時間線thâi掉",
-        "ftl_removal_desc": "本站buē 佇「知影 ê 網路」刊下跤 ê 站 ê PO文：",
-        "media_removal": "Thâi除媒體",
-        "media_removal_desc": "本站 kā 下跤 ê 站臺送 ê PO文 ê 媒體 lóng thâi 除：",
-        "media_nsfw": "媒體 lóng 標做「敏感內容」",
-        "media_nsfw_desc": "本站 kā 下跤 ê 站 ê 媒體，lóng 標做敏感內容："
-      }
-    },
-    "staff": "工作人員"
-  },
-  "announcements": {
-    "page_header": "公告",
-    "title": "公告",
-    "mark_as_read_action": "標做有讀",
-    "post_form_header": "貼公告",
-    "post_placeholder": "佇 tsia 拍你 ê 公告……",
-    "post_action": "貼",
-    "post_error": "錯誤：{error}",
-    "close_error": "關",
-    "delete_action": "Thâi",
-    "start_time_prompt": "開始時間： ",
-    "end_time_prompt": "結束時間：",
-    "all_day_prompt": "Tse 是 kui 工 ê 事件",
-    "published_time_display": "公告佇 {time}",
-    "start_time_display": "有效 tuì：{time}",
-    "end_time_display": "中止佇：{time}",
-    "edit_action": "編輯",
-    "submit_edit_action": "送出",
-    "cancel_edit_action": "取消",
-    "inactive_message": "這个公告 tsit-má 無效力。"
-  },
-  "shoutbox": {
-    "title": "留話枋"
-  },
-  "domain_mute_card": {
-    "mute": "予恬去",
-    "mute_progress": "Teh 予恬……",
-    "unmute": "予有聲",
-    "unmute_progress": "Teh 予有聲……"
-  },
-  "exporter": {
-    "export": "匯出",
-    "processing": "Teh 處理，較停仔指示你下載檔案……"
-  },
-  "features_panel": {
-    "shout": "留話枋",
-    "pleroma_chat_messages": "Pleroma 開講",
-    "gopher": "Gopher",
-    "media_proxy": "媒體代理伺侯器",
-    "scope_options": "公開範圍選項",
-    "text_limit": "字數限制",
-    "title": "有效 ê 功能",
-    "who_to_follow": "啥儂通綴",
-    "upload_limit": "檔案 sài-suh 限制"
-  },
-  "finder": {
-    "error_fetching_user": "Tshuē 用者 ê 時起錯誤",
-    "find_user": "Tshuē 用者"
-  },
-  "general": {
-      "apply": "應用",
-    "submit": "送出",
-    "more": "Koh 較 tsē",
-    "loading": "Leh 載入……",
-    "generic_error": "起錯誤 ah",
-    "generic_error_message": "起錯誤：{0}",
-    "error_retry": "請 koh 試一 kái",
-    "retry": "Koh 試",
-    "optional": "非必要",
-    "show_more": "展示較 tsē",
-    "show_less": "展示較少",
-    "never_show_again": "Mài koh 展示",
-    "dismiss": "無視",
-    "cancel": "取消",
-    "disable": "無愛用",
-    "enable": "啟用",
-    "confirm": "確認",
-    "verify": "驗證",
-    "close": "關掉",
-    "undo": "復原",
-    "yes": "是",
-    "no": "毋是",
-    "peek": "先看 māi",
-    "scroll_to_top": "捲 kàu 頂懸",
-    "role": {
-      "admin": "行政員",
-      "moderator": "管理員"
-    },
-    "unpin": "無愛 kā 釘",
-    "pin": "Kā釘起來",
-    "flash_content": "Ji̍h tsia，用 Ruffle（iáu teh 試驗，可能 buē 紡）看 Flash ê 內容。",
-    "flash_sepcurity": "注意 tse 可能有危險，因為 Flash 內容猶原是任意 ê 程式碼。",
-    "flash_fail": "載入 flash 內容失敗，詳細會當看控制臺。",
-    "scope_in_timeline": {
-      "direct": "私人 phue",
-      "private": "干焦 hōo 綴 lí ê 看",
-      "public": "公開佇公共時間線",
-      "unlisted": "無愛公開佇公共時間線"
-    }
-  },
-  "image_cropper": {
-    "crop_picture": "裁相片",
-    "save": "儲存",
-    "save_without_cropping": "無裁就儲存",
-    "cancel": "取消"
-  },
-  "importer": {
-    "submit": "送出",
-    "success": "匯入成功。",
-    "error": "佇匯入 ê 時起錯誤。"
-  },
-  "login": {
-    "login": "登入",
-    "description": "用 OAuth 登入",
-    "logout": "登出",
-    "logout_confirm_title": "登出確認",
-    "logout_confirm": "Lí　敢真正　beh　登出？",
-    "logout_confirm_accept_button": "登出",
-    "logout_confirm_cancel_button": "mài 登出",
-    "password": "密碼",
-    "placeholder": "例：lain",
-    "register": "註冊",
-    "username": "用者 ê 名",
-    "hint": "登入，參與討論",
-    "authentication_code": "認證碼",
-    "enter_recovery_code": "輸入恢復碼",
-    "enter_two_factor_code": "輸入兩階段認證碼",
-    "recovery_code": "恢復碼",
-    "heading": {
-      "totp": "兩階段認證",
-      "recovery": "兩階段恢復"
-    }
-  },
-  "media_modal": {
-    "previous": "頂一　ê",
-    "next": "後一个",
-    "counter": "{current} / {total}",
-    "hide": "關掉媒體瀏覽"
-  },
-  "nav": {
-    "about": "有關……",
-    "administration": "管理",
-    "back": "轉去",
-    "friend_requests": "跟綴請求",
-    "mentions": "The̍h起",
-    "interactions": "互動",
-    "dms": "私人 phue",
-    "public_tl": "公共時間線",
-    "timeline": "時間線",
-    "home_timeline": "厝 ê 時間線",
-    "twkn": "知影 ê 網路",
-    "bookmarks": "冊籤",
-    "user_search": "Tshuē 用者",
-    "search": "tshuē",
-    "search_close": "關掉 tshiau-tshuē liâu",
-    "who_to_follow": "Siáng 會當綴？",
-    "preferences": "個人 ê 設定",
-    "timelines": "時間流",
-    "chats": "開講",
-    "lists": "列單",
-    "edit_nav_mobile": "自訂導覽條",
-    "edit_pinned": "編輯釘起來 ê 項目",
-    "edit_finish": "編輯 suah",
-    "mobile_sidebar": "切換行動版 ê 邊 á liâu",
-    "mobile_notifications": "拍開通知",
-    "mobile_notifications": "拍開通知（有無讀ê）",
-    "mobile_notifications_close": "關掉通知",
-    "announcements": "公告"
-  },
-  "notifications": {
-    "broken_favorite": "狀態毋知影，leh tshiau-tshuē……",
-    "error": "佇取得通知 ê 時起錯誤：{0}",
-    "favorited_you": "kah 意 lí ê 狀態",
-    "followed_you": "綴 lí",
-    "follow_request": "想 beh 綴 lí",
-    "load_older": "載入 khah 早 ê 通知",
-    "notifications": "通知",
-    "read": "讀！",
-    "repeated_you": "轉送 lí ê 狀態",
-    "no_more_notifications": "無別 ê 通知",
-    "migrated_to": "移民到",
-    "reacted_with": "顯出{0} ê 反應",
-    "submitted_report": "送出檢舉",
-    "poll_ended": "投票結束"
-  },
-  "polls": {
-    "add_poll": "開投票",
-    "add_option": "加選項",
-    "option": "選項",
-    "votes": "票",
-    "people_voted_count": "{count} 位有投",
-    "votes_count": "{count} 票",
-    "vote": "投票",
-    "type": "投票 ê 形式",
-    "single_choice": "孤選",
-    "multiple_choices": "Tsē 選",
-    "expiry": "投票期限",
-    "expires_in": "投票 tī {0} 以後結束",
-    "expired": "投票佇 {0} 以前結束",
-    "not_enough_options": "投票 ê 選項傷少。"
-  },
-  "emoji": {
-    "stickers": "貼圖",
-    "emoji": "繪文字",
-    "keep_open": "Hōo 揀選仔開 leh",
-    "search_emoji": "Tshuē 繪文字",
-    "add_emoji": "插繪文字",
-    "custom": "定製 ê 繪文字",
-    "unpacked": "拍開 ê 繪文字",
-    "unicode": "Unicode 繪文字",
-    "unicode_groups": {
-      "activities": "活動",
-      "animals-and-nature": "動物 kap 自然",
-      "flags": "旗 á",
-      "food-and-drink": "食物 kap 飲料",
-      "objects": "物體",
-      "people-and-body": "Lâng kap 身軀",
-      "smileys-and-emotion": "笑面 kap 情緒",
-      "symbols": "符號",
-      "travel-and-places": "旅遊 kap 所在"
-    },
-    "load_all_hint": "載入頭前 {saneAmount} ê 繪文字，規个攏載入效能可能 ē khah 食力。",
-    "load_all": "Kā {emojiAmount} ê 繪文字攏載入",
-    "regional_indicator": "地區指引 {letter}"
-  },
-  "errors": {
-    "storage_unavailable": "Pleroma buē-tàng the̍h 著瀏覽器儲存 ê。Lí ê 登入狀態抑是局部設定 buē 儲存，mā 凡勢 tú 著意料外 ê 問題。拍開 cookie 看覓。"
-  },
-  "interactions": {
-    "favs_repeats": "轉送 kap kah 意",
-    "follows": "最近綴 lí ê",
-    "emoji_reactions": "繪文字 ê 回應",
-    "reports": "檢舉",
-    "moves": "用者 ê 移民",
-    "load_older": "載入 koh khah 早 ê 互動"
-  },
-  "post_status": {
-    "edit_status": "編輯狀態",
-    "new_status": "PO 新 ê 狀態",
-    "account_not_locked_warning": "Lín 口座毋是 {0} ê。見 nā 有 lâng 綴--lí，ē-tàng 看著 lí ê 限定跟綴者 ê PO 文。.",
-    "account_not_locked_warning_link": "鎖起來 ê 口座",
-    "attachments_sensitive": "Kā 附件標做敏感內容。",
-    "media_description": "媒體說明",
-    "content_type": {
-      "text/plain": "純 ê 文字",
-      "text/html": "HTML",
-      "text/markdown": "Markdown",
-      "text/bbcode": "BBCode"
-    },
-    "content_type_selection": "貼 ê 形式",
-    "content_warning": "主旨（毋是必要）",
-    "default": "Tú 正 kàu 高雄 ah。",
-    "direct_warning_to_all": "Tsit ê PO 文通 hōo 逐 ê 提起 ê 用者看見。",
-    "direct_warning_to_first_only": "Tsit ê PO 文，kan-ta 短信 tú 開始提起 ê 用者，tsiah 通看見。",
-    "edit_remote_warning": "別 ê 站臺可能無支援編輯，無法度收著 PO 文上新 ê 版本。",
-    "edit_unsupported_warning": "Pleroma 無支持編輯 the̍h 起 hām 投票。",
-    "posting": "PO 文",
-    "post": "PO",
-    "preview": "Sing 看覓",
-    "preview_empty": "空 ê",
-    "empty_status_error": "無法度 PO 無檔案 koh 空 ê 狀態。",
-    "media_description_error": "更新媒體失敗，請 koh 試一 kái。",
-    "scope_notice": {
-      "public": "Tsit ê PO 文通予逐 ê 儂看著。",
-      "private": "Tsit ê PO 文 kan-ta 予綴 lí ê 看著。",
-      "unlisted": "Tsit ê PO 文 buē 公開 tī 公共時間線 kap 知影 ê 網路。"
-    },
-    "scope_notice_dismiss": "關掉 tsit ê 通知",
-    "scope": {
-      "direct": "私人 phue - PO 文干焦予提起 ê 用者看著",
-      "private": "限定綴 ê 儂 - PO 文干焦予綴 lí ê 儂看著",
-      "public": "公開 - PO kàu 公開時間線",
-      "unlisted": "Mài 列出來 - Mài PO tī 公開時間線。"
-    }
-  },
-  "registration": {
-    "bio_optional": "介紹（毋是必要）",
-    "email": "Email",
-    "email_optional": "Email（毋是必要）",
-    "fullname": "顯示 ê 名",
-    "password_confirm": "確認密碼",
-    "registration": "註冊",
-    "token": "邀請碼",
-    "captcha": "驗證碼",
-    "new_captcha": "Ji̍h 圖片，the̍h 新 ê 驗證碼",
-    "username_placeholder": "e.g. lain",
-    "fullname_placeholder": "e.g. 岩倉 Lain",
-    "bio_placeholder": "e.g.\nLí 好，我是 Lain。我是日本動畫 ê 角色，tuà tī 日本 ê 郊區。Lí 凡勢 bat tī Wired 知影我。",
-    "reason": "註冊 ê 理由",
-    "reason_placeholder": "本站靠人工審核註冊。\n介紹管理者 lí beh tī tsia 註冊 ê 理由。",
-    "register": "註冊",
-    "validations": {
-      "username_required": "著愛添",
-      "fullname_required": "著愛添",
-      "email_required": "著愛添",
-      "password_required": "著愛添",
-      "password_confirmation_required": "著愛添",
-      "password_confirmation_match": "密碼著相 kâng",
-      "birthday_required": "著愛添",
-      "birthday_min_age": "Buē-tàng tī {date} 以後"
-    },
-    "email_language": "Lí想 beh 服侍器用 siánn 物語言寄批 hōo lí？",
-    "birthday": "生日",
-    "birthday_optional": "生日（毋是必要）："
-  },
-  "remote_user_resolver": {
-    "remote_user_resolver": "別站用者 ê 解析器",
-    "searching_for": "Tshuē",
-    "error": "Tshuē無"
-  },
-  "report": {
-    "reporter": "檢舉人：",
-    "reported_user": "Beh 檢舉 ê 用者：",
-    "reported_statuses": "Beh 檢舉 ê 狀態：",
-    "notes": "Notes:",
-    "state": "State:",
-    "state_open": "開 ê",
-    "state_closed": "關 ê",
-    "state_resolved": "解決了 ê"
-  },
-  "selectable_list": {
-    "select_all": "攏總揀"
-  },
-  "settings": {
-    "add_language": "加一 ê 備用 ê 語言",
-    "remove_language": "Ni 掉",
-    "primary_language": "主要語言：",
-    "fallback_language": "備用語言 {index}：",
-    "app_name": "App ê 名",
-    "expert_mode": "進階模式",
-    "save": "保存改變",
-    "security": "安全",
-    "setting_changed": "設定 kap 預先 ê 有 tsing 差",
-    "setting_server_side": "This setting is tied to your profile and affects all sessions and clients",
-    "enter_current_password_to_confirm": "Enter your current password to confirm your identity",
-    "post_look_feel": "Posts Look & Feel",
-    "mention_links": "Mention links",
-    "mfa": {
-      "otp": "OTP",
-      "setup_otp": "Setup OTP",
-      "wait_pre_setup_otp": "presetting OTP",
-      "confirm_and_enable": "Confirm & enable OTP",
-      "title": "Two-factor Authentication",
-      "generate_new_recovery_codes": "Generate new recovery codes",
-      "warning_of_generate_new_codes": "When you generate new recovery codes, your old codes won’t work anymore.",
-      "recovery_codes": "Recovery codes.",
-      "waiting_a_recovery_codes": "Receiving backup codes…",
-      "recovery_codes_warning": "Write the codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
-      "authentication_methods": "Authentication methods",
-      "scan": {
-        "title": "Scan",
-        "desc": "Using your two-factor app, scan this QR code or enter text key:",
-        "secret_code": "Key"
-      },
-      "verify": {
-        "desc": "To enable two-factor authentication, enter the code from your two-factor app:"
-      }
-    },
-    "lists_navigation": "Show lists in navigation",
-    "allow_following_move": "Allow auto-follow when following account moves",
-    "attachmentRadius": "Attachments",
-    "attachments": "Attachments",
-    "avatar": "Avatar",
-    "avatarAltRadius": "Avatars (notifications)",
-    "avatarRadius": "Avatars",
-    "background": "Background",
-    "bio": "Bio",
-    "email_language": "Language for receiving emails from the server",
-    "block_export": "Block export",
-    "block_export_button": "Export your blocks to a csv file",
-    "block_import": "Block import",
-    "block_import_error": "Error importing blocks",
-    "blocks_imported": "Blocks imported! Processing them will take a while.",
-    "mute_export": "Mute export",
-    "mute_export_button": "Export your mutes to a csv file",
-    "mute_import": "Mute import",
-    "mute_import_error": "Error importing mutes",
-    "mutes_imported": "Mutes imported! Processing them will take a while.",
-    "import_mutes_from_a_csv_file": "Import mutes from a csv file",
-    "account_backup": "Account backup",
-    "account_backup_description": "This allows you to download an archive of your account information and your posts, but they cannot yet be imported into a Pleroma account.",
-    "account_backup_table_head": "Backup",
-    "download_backup": "Download",
-    "backup_not_ready": "This backup is not ready yet.",
-    "backup_running": "This backup is in progress, processed {number} record. | This backup is in progress, processed {number} records.",
-    "backup_failed": "This backup has failed.",
-    "remove_backup": "Remove",
-    "list_backups_error": "Error fetching backup list: {error}",
-    "add_backup": "Create a new backup",
-    "added_backup": "Added a new backup.",
-    "add_backup_error": "Error adding a new backup: {error}",
-    "blocks_tab": "Blocks",
-    "bot": "This is a bot account",
-    "btnRadius": "Buttons",
-    "cBlue": "Blue (Reply, follow)",
-    "cGreen": "Green (Retweet)",
-    "cOrange": "Orange (Favorite)",
-    "cRed": "Red (Cancel)",
-    "change_email": "Change email",
-    "change_email_error": "There was an issue changing your email.",
-    "changed_email": "Email changed successfully!",
-    "change_password": "Change password",
-    "change_password_error": "There was an issue changing your password.",
-    "changed_password": "Password changed successfully!",
-    "chatMessageRadius": "Chat message",
-    "collapse_subject": "Collapse posts with subjects",
-    "composing": "Composing",
-    "confirm_new_password": "Confirm new password",
-    "current_password": "Current password",
-    "confirm_dialogs": "Ask for confirmation when",
-    "confirm_dialogs_repeat": "repeating a status",
-    "confirm_dialogs_unfollow": "unfollowing a user",
-    "confirm_dialogs_block": "blocking a user",
-    "confirm_dialogs_mute": "muting a user",
-    "confirm_dialogs_delete": "deleting a status",
-    "confirm_dialogs_logout": "logging out",
-    "confirm_dialogs_approve_follow": "approving a follower",
-    "confirm_dialogs_deny_follow": "denying a follower",
-    "confirm_dialogs_remove_follower": "removing a follower",
-    "mutes_and_blocks": "Mutes and Blocks",
-    "data_import_export_tab": "Data import / export",
-    "default_vis": "Default visibility scope",
-    "delete_account": "Delete account",
-    "delete_account_description": "Permanently delete your data and deactivate your account.",
-    "delete_account_error": "There was an issue deleting your account. If this persists please contact your instance administrator.",
-    "delete_account_instructions": "Type your password in the input below to confirm account deletion.",
-    "account_alias": "Account aliases",
-    "account_alias_table_head": "Alias",
-    "list_aliases_error": "Error fetching aliases: {error}",
-    "hide_list_aliases_error_action": "Close",
-    "remove_alias": "Remove this alias",
-    "new_alias_target": "Add a new alias (e.g. {example})",
-    "added_alias": "Alias is added.",
-    "add_alias_error": "Error adding alias: {error}",
-    "move_account": "Move account",
-    "move_account_notes": "If you want to move the account somewhere else, you must go to your target account and add an alias pointing here.",
-    "move_account_target": "Target account (e.g. {example})",
-    "moved_account": "Account is moved.",
-    "move_account_error": "Error moving account: {error}",
-    "discoverable": "Allow discovery of this account in search results and other services",
-    "domain_mutes": "Domains",
-    "avatar_size_instruction": "The recommended minimum size for avatar images is 150x150 pixels.",
-    "pad_emoji": "Pad emoji with spaces when adding from picker",
-    "autocomplete_select_first": "Automatically select the first candidate when autocomplete results are available",
-    "emoji_reactions_on_timeline": "Show emoji reactions on timeline",
-    "emoji_reactions_scale": "Reactions scale factor",
-    "export_theme": "Save preset",
-    "filtering": "Filtering",
-    "wordfilter": "Wordfilter",
-    "filtering_explanation": "All statuses containing these words will be muted, one per line",
-    "word_filter_and_more": "Word filter and more...",
-    "follow_export": "Follow export",
-    "follow_export_button": "Export your follows to a csv file",
-    "follow_import": "Follow import",
-    "follow_import_error": "Error importing followers",
-    "follows_imported": "Follows imported! Processing them will take a while.",
-    "accent": "Accent",
-    "foreground": "Foreground",
-    "general": "General",
-    "hide_attachments_in_convo": "Hide attachments in conversations",
-    "hide_attachments_in_tl": "Hide attachments in timeline",
-    "hide_media_previews": "Hide media previews",
-    "hide_muted_posts": "Hide posts of muted users",
-    "mute_bot_posts": "Mute bot posts",
-    "hide_bot_indication": "Hide bot indication in posts",
-    "hide_all_muted_posts": "Hide muted posts",
-    "max_thumbnails": "Maximum amount of thumbnails per post (empty = no limit)",
-    "hide_isp": "Hide instance-specific panel",
-    "hide_shoutbox": "Hide instance shoutbox",
-    "right_sidebar": "Reverse order of columns",
-    "navbar_column_stretch": "Stretch navbar to columns width",
-    "always_show_post_button": "Always show floating New Post button",
-    "hide_wallpaper": "Hide instance wallpaper",
-    "preload_images": "Preload images",
-    "use_one_click_nsfw": "Open NSFW attachments with just one click",
-    "hide_post_stats": "Hide post statistics (e.g. the number of favorites)",
-    "hide_user_stats": "Hide user statistics (e.g. the number of followers)",
-    "hide_filtered_statuses": "Hide all filtered posts",
-    "hide_wordfiltered_statuses": "Hide word-filtered statuses",
-    "hide_muted_threads": "Hide muted threads",
-    "import_blocks_from_a_csv_file": "Import blocks from a csv file",
-    "import_followers_from_a_csv_file": "Import follows from a csv file",
-    "import_theme": "Load preset",
-    "inputRadius": "Input fields",
-    "checkboxRadius": "Checkboxes",
-    "instance_default": "(default: {value})",
-    "instance_default_simple": "(default)",
-    "interface": "Interface",
-    "interfaceLanguage": "Interface language",
-    "invalid_theme_imported": "The selected file is not a supported Pleroma theme. No changes to your theme were made.",
-    "limited_availability": "Unavailable in your browser",
-    "links": "Links",
-    "lock_account_description": "Restrict your account to approved followers only",
-    "loop_video": "Loop videos",
-    "loop_video_silent_only": "Loop only videos without sound (i.e. Mastodon's \"gifs\")",
-    "mutes_tab": "Mutes",
-    "play_videos_in_modal": "Play videos in a popup frame",
-    "url": "URL",
-    "preview": "Preview",
-    "file_export_import": {
-      "backup_restore": "Settings backup",
-      "backup_settings": "Backup settings to file",
-      "backup_settings_theme": "Backup settings and theme to file",
-      "restore_settings": "Restore settings from file",
-      "errors": {
-        "invalid_file": "The selected file is not a supported Pleroma settings backup. No changes were made.",
-        "file_too_new": "Incompatile major version: {fileMajor}, this PleromaFE (settings ver {feMajor}) is too old to handle it",
-        "file_too_old": "Incompatile major version: {fileMajor}, file version is too old and not supported (min. set. ver. {feMajor})",
-        "file_slightly_new": "File minor version is different, some settings might not load"
-      }
-    },
-    "profile_fields": {
-      "label": "Profile metadata",
-      "add_field": "Add field",
-      "name": "Label",
-      "value": "Content"
-    },
-    "birthday": {
-      "label": "Birthday",
-      "show_birthday": "Show my birthday"
-    },
-    "account_privacy": "Privacy",
-    "use_contain_fit": "Don't crop the attachment in thumbnails",
-    "name": "Name",
-    "name_bio": "Name & bio",
-    "new_email": "New email",
-    "new_password": "New password",
-    "posts": "Posts",
-    "user_profiles": "User Profiles",
-    "notification_visibility": "Types of notifications to show",
-    "notification_visibility_follows": "Follows",
-    "notification_visibility_likes": "Favorites",
-    "notification_visibility_mentions": "Mentions",
-    "notification_visibility_repeats": "Repeats",
-    "notification_visibility_moves": "User Migrates",
-    "notification_visibility_emoji_reactions": "Reactions",
-    "notification_visibility_polls": "Ends of polls you voted in",
-    "no_rich_text_description": "Strip rich text formatting from all posts",
-    "no_blocks": "No blocks",
-    "no_mutes": "No mutes",
-    "hide_favorites_description": "Don't show list of my favorites (people still get notified)",
-    "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": "Hide sensitive/NSFW media",
-    "oauth_tokens": "OAuth tokens",
-    "token": "Token",
-    "refresh_token": "Refresh token",
-    "valid_until": "Valid until",
-    "revoke_token": "Revoke",
-    "panelRadius": "Panels",
-    "pause_on_unfocused": "Pause when tab is not focused",
-    "presets": "Presets",
-    "profile_background": "Profile background",
-    "profile_banner": "Profile banner",
-    "profile_tab": "Profile",
-    "radii_help": "Set up interface edge rounding (in pixels)",
-    "replies_in_timeline": "Replies in timeline",
-    "reply_visibility_all": "Show all replies",
-    "reply_visibility_following": "Only show replies directed at me or users I'm following",
-    "reply_visibility_self": "Only show replies directed at me",
-    "reply_visibility_following_short": "Show replies to my follows",
-    "reply_visibility_self_short": "Show replies to self only",
-    "autohide_floating_post_button": "Automatically hide New Post button (mobile)",
-    "saving_err": "Error saving settings",
-    "saving_ok": "Settings saved",
-    "search_user_to_block": "Search whom you want to block",
-    "search_user_to_mute": "Search whom you want to mute",
-    "security_tab": "Security",
-    "scope_copy": "Copy scope when replying (DMs are always copied)",
-    "minimal_scopes_mode": "Minimize post scope selection options",
-    "set_new_avatar": "Set new avatar",
-    "set_new_profile_background": "Set new profile background",
-    "set_new_profile_banner": "Set new profile banner",
-    "reset_avatar": "Reset avatar",
-    "reset_profile_background": "Reset profile background",
-    "reset_profile_banner": "Reset profile banner",
-    "reset_avatar_confirm": "Do you really want to reset the avatar?",
-    "reset_banner_confirm": "Do you really want to reset the banner?",
-    "reset_background_confirm": "Do you really want to reset the background?",
-    "settings": "Settings",
-    "subject_input_always_show": "Always show subject field",
-    "subject_line_behavior": "Copy subject when replying",
-    "subject_line_email": "Like email: \"re: subject\"",
-    "subject_line_mastodon": "Like mastodon: copy as is",
-    "subject_line_noop": "Do not copy",
-    "conversation_display": "Conversation display style",
-    "conversation_display_tree": "Tree-style",
-    "conversation_display_tree_quick": "Tree view",
-    "disable_sticky_headers": "Don't stick column headers to top of the screen",
-    "show_scrollbars": "Show side column's scrollbars",
-    "third_column_mode": "When there's enough space, show third column containing",
-    "third_column_mode_none": "Don't show third column at all",
-    "third_column_mode_notifications": "Notifications column",
-    "third_column_mode_postform": "Main post form and navigation",
-    "columns": "Columns",
-    "column_sizes": "Column sizes",
-    "column_sizes_sidebar": "Sidebar",
-    "column_sizes_content": "Content",
-    "column_sizes_notifs": "Notifications",
-    "tree_advanced": "Allow more flexible navigation in tree view",
-    "tree_fade_ancestors": "Display ancestors of the current status in faint text",
-    "conversation_display_linear": "Linear-style",
-    "conversation_display_linear_quick": "Linear view",
-    "conversation_other_replies_button": "Show the \"other replies\" button",
-    "conversation_other_replies_button_below": "Below statuses",
-    "conversation_other_replies_button_inside": "Inside statuses",
-    "max_depth_in_thread": "Maximum number of levels in thread to display by default",
-    "post_status_content_type": "Post status content type",
-    "sensitive_by_default": "Mark posts as sensitive by default",
-    "stop_gifs": "Pause animated images until you hover on them",
-    "streaming": "Automatically show new posts when scrolled to the top",
-    "auto_update": "Show new posts automatically",
-    "user_mutes": "Users",
-    "useStreamingApi": "Receive posts and notifications real-time",
-    "use_websockets": "Use websockets (Realtime updates)",
-    "text": "Text",
-    "theme": "Theme",
-    "theme_help": "Use hex color codes (#rrggbb) to customize your color theme.",
-    "theme_help_v2_1": "You can also override certain component's colors and opacity by toggling the checkbox, use \"Clear all\" button to clear all overrides.",
-    "theme_help_v2_2": "Icons underneath some entries are background/text contrast indicators, hover over for detailed info. Please keep in mind that when using transparency contrast indicators show the worst possible case.",
-    "tooltipRadius": "Tooltips/alerts",
-    "type_domains_to_mute": "Search domains to mute",
-    "upload_a_photo": "Upload a photo",
-    "user_settings": "User Settings",
-    "values": {
-      "false": "no",
-      "true": "yes"
-    },
-    "virtual_scrolling": "Optimize timeline rendering",
-    "use_at_icon": "Display {'@'} symbol as an icon instead of text",
-    "mention_link_display": "Display mention links",
-    "mention_link_display_short": "always as short names (e.g. {'@'}foo)",
-    "mention_link_display_full_for_remote": "as full names only for remote users (e.g. {'@'}foo{'@'}example.org)",
-    "mention_link_display_full": "always as full names (e.g. {'@'}foo{'@'}example.org)",
-    "mention_link_use_tooltip": "Show user card when clicking mention links",
-    "mention_link_show_avatar": "Show user avatar beside the link",
-    "mention_link_show_avatar_quick": "Show user avatar next to mentions",
-    "mention_link_fade_domain": "Fade domains (e.g. {'@'}example.org in {'@'}foo{'@'}example.org)",
-    "mention_link_bolden_you": "Highlight mention of you when you are mentioned",
-    "user_popover_avatar_action": "Popover avatar click action",
-    "user_popover_avatar_action_zoom": "Zoom the avatar",
-    "user_popover_avatar_action_close": "Close the popover",
-    "user_popover_avatar_action_open": "Open profile",
-    "user_popover_avatar_overlay": "Show user popover over user avatar",
-    "fun": "Fun",
-    "greentext": "Meme arrows",
-    "show_yous": "Show (You)s",
-    "notifications": "Notifications",
-    "notification_setting_filters": "Filters",
-    "notification_setting_block_from_strangers": "Block notifications from users who you do not follow",
-    "notification_setting_privacy": "Privacy",
-    "notification_setting_hide_notification_contents": "Hide the sender and contents of push notifications",
-    "notification_mutes": "To stop receiving notifications from a specific user, use a mute.",
-    "notification_blocks": "Blocking a user stops all notifications as well as unsubscribes them.",
-    "enable_web_push_notifications": "Enable web push notifications",
-    "more_settings": "More settings",
-    "style": {
-      "switcher": {
-        "keep_color": "Keep colors",
-        "keep_shadows": "Keep shadows",
-        "keep_opacity": "Keep opacity",
-        "keep_roundness": "Keep roundness",
-        "keep_fonts": "Keep fonts",
-        "save_load_hint": "\"Keep\" options preserve currently set options when selecting or loading themes, it also stores said options when exporting a theme. When all checkboxes unset, exporting theme will save everything.",
-        "reset": "Reset",
-        "clear_all": "Clear all",
-        "clear_opacity": "Clear opacity",
-        "load_theme": "Load theme",
-        "keep_as_is": "Keep as is",
-        "use_snapshot": "Old version",
-        "use_source": "New version",
-        "help": {
-          "upgraded_from_v2": "PleromaFE has been upgraded, theme could look a little bit different than you remember.",
-          "v2_imported": "File you imported was made for older FE. We try to maximize compatibility but there still could be inconsistencies.",
-          "future_version_imported": "File you imported was made in newer version of FE.",
-          "older_version_imported": "File you imported was made in older version of FE.",
-          "snapshot_present": "Theme snapshot is loaded, so all values are overriden. You can load theme's actual data instead.",
-          "snapshot_missing": "No theme snapshot was in the file so it could look different than originally envisioned.",
-          "fe_upgraded": "PleromaFE's theme engine upgraded after version update.",
-          "fe_downgraded": "PleromaFE's version rolled back.",
-          "migration_snapshot_ok": "Just to be safe, theme snapshot loaded. You can try loading theme data.",
-          "migration_napshot_gone": "For whatever reason snapshot was missing, some stuff could look different than you remember.",
-          "snapshot_source_mismatch": "Versions conflict: most likely FE was rolled back and updated again, if you changed theme using older version of FE you most likely want to use old version, otherwise use new version."
-        }
-      },
-      "common": {
-        "color": "色彩",
-        "opacity": "無透明度",
-        "contrast": {
-          "hint": "Contrast ratio is {ratio}, it {level} {context}",
-          "level": {
-            "aa": "meets Level AA guideline (minimal)",
-            "aaa": "meets Level AAA guideline (recommended)",
-            "bad": "doesn't meet any accessibility guidelines"
-          },
-          "context": {
-            "18pt": "for large (18pt+) text",
-            "text": "for text"
-          }
-        }
-      },
-      "common_colors": {
-        "_tab_label": "Common",
-        "main": "Common colors",
-        "foreground_hint": "See \"Advanced\" tab for more detailed control",
-        "rgbo": "Icons, accents, badges"
-      },
-      "advanced_colors": {
-        "_tab_label": "Advanced",
-        "alert": "Alert background",
-        "alert_error": "Error",
-        "alert_warning": "Warning",
-        "alert_neutral": "Neutral",
-        "post": "Posts/User bios",
-        "badge": "Badge background",
-        "popover": "Tooltips, menus, popovers",
-        "badge_notification": "Notification",
-        "panel_header": "Panel header",
-        "top_bar": "Top bar",
-        "borders": "Borders",
-        "buttons": "Buttons",
-        "inputs": "Input fields",
-        "faint_text": "Faded text",
-        "underlay": "Underlay",
-        "wallpaper": "Wallpaper",
-        "poll": "Poll graph",
-        "icons": "Icons",
-        "highlight": "Highlighted elements",
-        "pressed": "Pressed",
-        "selectedPost": "Selected post",
-        "selectedMenu": "Selected menu item",
-        "disabled": "Disabled",
-        "toggled": "Toggled",
-        "tabs": "Tabs",
-        "chat": {
-          "incoming": "Incoming",
-          "outgoing": "Outgoing",
-          "border": "Border"
-        }
-      },
-      "radii": {
-        "_tab_label": "Roundness"
-      },
-      "shadows": {
-        "_tab_label": "Shadow and lighting",
-        "component": "Component",
-        "override": "Override",
-        "shadow_id": "Shadow #{value}",
-        "blur": "Blur",
-        "spread": "Spread",
-        "inset": "Inset",
-        "hintV3": "For shadows you can also use the {0} notation to use other color slot.",
-        "filter_hint": {
-          "always_drop_shadow": "Warning, this shadow always uses {0} when browser supports it.",
-          "drop_shadow_syntax": "{0} does not support {1} parameter and {2} keyword.",
-          "avatar_inset": "Please note that combining both inset and non-inset shadows on avatars might give unexpected results with transparent avatars.",
-          "spread_zero": "Shadows with spread > 0 will appear as if it was set to zero",
-          "inset_classic": "Inset shadows will be using {0}"
-        },
-        "components": {
-          "panel": "Panel",
-          "panelHeader": "Panel header",
-          "topBar": "Top bar",
-          "avatar": "User avatar (in profile view)",
-          "avatarStatus": "User avatar (in post display)",
-          "popup": "Popups and tooltips",
-          "button": "Button",
-          "buttonHover": "Button (hover)",
-          "buttonPressed": "Button (pressed)",
-          "buttonPressedHover": "Button (pressed+hover)",
-          "input": "Input field"
-        }
-      },
-      "fonts": {
-        "_tab_label": "Fonts",
-        "help": "Select font to use for elements of UI. For \"custom\" you have to enter exact font name as it appears in system.",
-        "components": {
-          "interface": "Interface",
-          "input": "Input fields",
-          "post": "Post text",
-          "postCode": "Monospaced text in a post (rich text)"
-        },
-        "family": "Font name",
-        "size": "Size (in px)",
-        "weight": "Weight (boldness)",
-        "custom": "Custom"
-      },
-      "preview": {
-        "header": "Preview",
-        "content": "Content",
-        "error": "Example error",
-        "button": "Button",
-        "text": "A bunch of more {0} and {1}",
-        "mono": "content",
-        "input": "Just landed in L.A.",
-        "faint_link": "helpful manual",
-        "fine_print": "Read our {0} to learn nothing useful!",
-        "header_faint": "This is fine",
-        "checkbox": "I have skimmed over terms and conditions",
-        "link": "a nice lil' link"
-      }
-    },
-    "version": {
-      "title": "Version",
-      "backend_version": "Backend version",
-      "frontend_version": "Frontend version"
-    },
-    "commit_value": "Save",
-    "commit_value_tooltip": "Value is not saved, press this button to commit your changes",
-    "reset_value": "Reset",
-    "reset_value_tooltip": "Reset draft",
-    "hard_reset_value": "Hard reset",
-    "hard_reset_value_tooltip": "Remove setting from storage, forcing use of default value"
-  },
-  "admin_dash": {
-    "window_title": "Administration",
-    "wip_notice": "This admin dashboard is experimental and WIP, {adminFeLink}.",
-    "old_ui_link": "old admin UI available here",
-    "reset_all": "Reset all",
-    "commit_all": "Save all",
-    "tabs": {
-      "nodb": "No DB Config",
-      "instance": "Instance",
-      "limits": "Limits",
-      "frontends": "Front-ends"
-    },
-    "nodb": {
-      "heading": "Database config is disabled",
-      "text": "You need to change backend config files so that {property} is set to {value}, see more in {documentation}.",
-      "documentation": "documentation",
-      "text2": "Most configuration options will be unavailable."
-    },
-    "captcha": {
-      "native": "Native",
-      "kocaptcha": "KoCaptcha"
-    },
-    "instance": {
-      "instance": "Instance information",
-      "registrations": "User sign-ups",
-      "captcha_header": "CAPTCHA",
-      "kocaptcha": "KoCaptcha settings",
-      "access": "Instance access",
-      "restrict": {
-        "header": "Restrict access for anonymous visitors",
-        "description": "Detailed setting for allowing/disallowing access to certain aspects of API. By default (indeterminate state) it will disallow if instance is not public, ticked checkbox means disallow access even if instance is public, unticked means allow access even if instance is private. Please note that unexpected behavior might happen if some settings are set, i.e. if profile access is disabled posts will show without profile information.",
-        "timelines": "Timelines access",
-        "profiles": "User profiles access",
-        "activities": "Statues/activities access"
-      }
-    },
-    "limits": {
-      "arbitrary_limits": "Arbitrary limits",
-      "posts": "Post limits",
-      "uploads": "Attachments limits",
-      "users": "User profile limits",
-      "profile_fields": "Profile fields limits",
-      "user_uploads": "Profile media limits"
-    },
-    "frontend": {
-      "repository": "Repository link",
-      "versions": "Available versions",
-      "build_url": "Build URL",
-      "reinstall": "Reinstall",
-      "is_default": "(Default)",
-      "is_default_custom": "(Default, version: {version})",
-      "install": "Install",
-      "install_version": "Install version {version}",
-      "more_install_options": "More install options",
-      "more_default_options": "More default setting options",
-      "set_default": "Set default",
-      "set_default_version": "Set version {version} as default",
-      "wip_notice": "Please note that this section is a WIP and lacks certain features as backend implementation of front-end management is incomplete.",
-      "default_frontend": "Default front-end",
-      "default_frontend_tip": "Default front-end will be shown to all users. Currently there's no way to for a user to select personal front-end. If you switch away from PleromaFE you'll most likely have to use old and buggy AdminFE to do instance configuration until we replace it.",
-      "default_frontend_tip2": "WIP: Since Pleroma backend doesn't properly list all installed frontends you'll have to enter name and reference manually. List below provides shortcuts to fill the values.",
-      "available_frontends": "Available for install"
-    },
-    "temp_overrides": {
-      ":pleroma": {
-        ":instance": {
-          ":public": {
-            "label": "Instance is public",
-            "description": "Disabling this will make all API accessible only for logged-in users, this will make Public and Federated timelines inaccessible to anonymous visitors."
-          },
-          ":limit_to_local_content": {
-            "label": "Limit search to local content",
-            "description": "Disables global network search for unauthenticated (default), all users or none"
-          },
-          ":description_limit": {
-            "label": "Limit",
-            "description": "Character limit for attachment descriptions"
-          },
-          ":background_image": {
-            "label": "Background image",
-            "description": "Background image (primarily used by PleromaFE)"
-          }
-        }
-      }
-    }
-  },
-  "time": {
-    "unit": {
-      "days": "{0} day | {0} days",
-      "days_short": "{0}d",
-      "hours": "{0} hour | {0} hours",
-      "hours_short": "{0}h",
-      "minutes": "{0} minute | {0} minutes",
-      "minutes_short": "{0}min",
-      "months": "{0} month | {0} months",
-      "months_short": "{0}mo",
-      "seconds": "{0} second | {0} seconds",
-      "seconds_short": "{0}s",
-      "weeks": "{0} week | {0} weeks",
-      "weeks_short": "{0}w",
-      "years": "{0} year | {0} years",
-      "years_short": "{0}y"
-    },
-    "in_future": "in {0}",
-    "in_past": "{0} ago",
-    "now": "just now",
-    "now_short": "now"
-  },
-  "timeline": {
-    "collapse": "Collapse",
-    "conversation": "Conversation",
-    "error": "Error fetching timeline: {0}",
-    "load_older": "Load older statuses",
-    "no_retweet_hint": "Post is marked as followers-only or direct and cannot be repeated",
-    "repeated": "repeated",
-    "show_new": "Show new",
-    "reload": "Reload",
-    "up_to_date": "Up-to-date",
-    "no_more_statuses": "No more statuses",
-    "no_statuses": "No statuses",
-    "socket_reconnected": "Realtime connection established",
-    "socket_broke": "Realtime connection lost: CloseEvent code {0}",
-    "quick_view_settings": "Quick view settings",
-    "quick_filter_settings": "Quick filter settings"
-  },
-  "status": {
-    "favorites": "Favorites",
-    "repeats": "Repeats",
-    "repeat_confirm": "Do you really want to repeat this status?",
-    "repeat_confirm_title": "Repeat confirmation",
-    "repeat_confirm_accept_button": "Repeat",
-    "repeat_confirm_cancel_button": "Do not repeat",
-    "delete": "Delete status",
-    "delete_error": "Error deleting status: {0}",
-    "edit": "Edit status",
-    "edited_at": "(last edited {time})",
-    "pin": "Pin on profile",
-    "unpin": "Unpin from profile",
-    "pinned": "Pinned",
-    "bookmark": "Bookmark",
-    "unbookmark": "Unbookmark",
-    "delete_confirm": "Do you really want to delete this status?",
-    "delete_confirm_title": "Delete confirmation",
-    "delete_confirm_accept_button": "Delete",
-    "delete_confirm_cancel_button": "Keep",
-    "reply_to": "Reply to",
-    "mentions": "Mentions",
-    "replies_list": "Replies:",
-    "replies_list_with_others": "Replies (+{numReplies} other): | Replies (+{numReplies} others):",
-    "mute_conversation": "Mute conversation",
-    "unmute_conversation": "Unmute conversation",
-    "status_unavailable": "Status unavailable",
-    "copy_link": "Copy link to status",
-    "external_source": "External source",
-    "thread_muted": "Thread muted",
-    "thread_muted_and_words": ", has words:",
-    "show_full_subject": "Show full subject",
-    "hide_full_subject": "Hide full subject",
-    "show_content": "Show content",
-    "hide_content": "Hide content",
-    "status_deleted": "This post was deleted",
-    "nsfw": "NSFW",
-    "expand": "Expand",
-    "you": "(You)",
-    "plus_more": "+{number} more",
-    "many_attachments": "Post has {number} attachment(s)",
-    "collapse_attachments": "Collapse attachments",
-    "show_all_attachments": "Show all attachments",
-    "show_attachment_in_modal": "Show in media modal",
-    "show_attachment_description": "Preview description (open attachment for full description)",
-    "hide_attachment": "Hide attachment",
-    "remove_attachment": "Remove attachment",
-    "attachment_stop_flash": "Stop Flash player",
-    "move_up": "Shift attachment left",
-    "move_down": "Shift attachment right",
-    "open_gallery": "Open gallery",
-    "thread_hide": "Hide this thread",
-    "thread_show": "Show this thread",
-    "thread_show_full": "Show everything under this thread ({numStatus} status in total, max depth {depth}) | Show everything under this thread ({numStatus} statuses in total, max depth {depth})",
-    "thread_show_full_with_icon": "{icon} {text}",
-    "thread_follow": "See the remaining part of this thread ({numStatus} status in total) | See the remaining part of this thread ({numStatus} statuses in total)",
-    "thread_follow_with_icon": "{icon} {text}",
-    "ancestor_follow": "See {numReplies} other reply under this status | See {numReplies} other replies under this status",
-    "ancestor_follow_with_icon": "{icon} {text}",
-    "show_all_conversation_with_icon": "{icon} {text}",
-    "show_all_conversation": "Show full conversation ({numStatus} other status) | Show full conversation ({numStatus} other statuses)",
-    "show_only_conversation_under_this": "Only show replies to this status",
-    "status_history": "Status history",
-    "reaction_count_label": "{num} person reacted | {num} people reacted"
-  },
-  "user_card": {
-    "approve": "Approve",
-    "approve_confirm_title": "Approve confirmation",
-    "approve_confirm_accept_button": "Approve",
-    "approve_confirm_cancel_button": "Do not approve",
-    "approve_confirm": "Do you want to approve {user}'s follow request?",
-    "block": "Block",
-    "blocked": "Blocked!",
-    "block_confirm_title": "Block confirmation",
-    "block_confirm": "Do you really want to block {user}?",
-    "block_confirm_accept_button": "Block",
-    "block_confirm_cancel_button": "Do not block",
-    "deactivated": "Deactivated",
-    "deny": "Deny",
-    "deny_confirm_title": "Deny confirmation",
-    "deny_confirm_accept_button": "Deny",
-    "deny_confirm_cancel_button": "Do not deny",
-    "deny_confirm": "Do you want to deny {user}'s follow request?",
-    "edit_profile": "Edit profile",
-    "favorites": "Favorites",
-    "follow": "Follow",
-    "follow_cancel": "Cancel request",
-    "follow_sent": "Request sent!",
-    "follow_progress": "Requesting…",
-    "follow_unfollow": "Unfollow",
-    "unfollow_confirm_title": "Unfollow confirmation",
-    "unfollow_confirm": "Do you really want to unfollow {user}?",
-    "unfollow_confirm_accept_button": "Unfollow",
-    "unfollow_confirm_cancel_button": "Do not unfollow",
-    "followees": "Following",
-    "followers": "Followers",
-    "following": "Following!",
-    "follows_you": "Follows you!",
-    "hidden": "Hidden",
-    "its_you": "It's you!",
-    "media": "Media",
-    "mention": "Mention",
-    "message": "Message",
-    "mute": "Mute",
-    "muted": "Muted",
-    "mute_confirm_title": "Mute confirmation",
-    "mute_confirm": "Do you really want to mute {user}?",
-    "mute_confirm_accept_button": "Mute",
-    "mute_confirm_cancel_button": "Do not mute",
-    "mute_duration_prompt": "Mute this user for (0 for indefinite time):",
-    "per_day": "per day",
-    "remote_follow": "Remote follow",
-    "remove_follower": "Remove follower",
-    "remove_follower_confirm_title": "Remove follower confirmation",
-    "remove_follower_confirm_accept_button": "Remove",
-    "remove_follower_confirm_cancel_button": "Keep",
-    "remove_follower_confirm": "Do you really want to remove {user} from your followers?",
-    "report": "Report",
-    "statuses": "Statuses",
-    "subscribe": "Subscribe",
-    "unsubscribe": "Unsubscribe",
-    "unblock": "Unblock",
-    "unblock_progress": "Unblocking…",
-    "block_progress": "Blocking…",
-    "unmute": "Unmute",
-    "unmute_progress": "Unmuting…",
-    "mute_progress": "Muting…",
-    "hide_repeats": "Hide repeats",
-    "show_repeats": "Show repeats",
-    "bot": "Bot",
-    "birthday": "Born {birthday}",
-    "admin_menu": {
-      "moderation": "Moderation",
-      "grant_admin": "Grant Admin",
-      "revoke_admin": "Revoke Admin",
-      "grant_moderator": "Grant Moderator",
-      "revoke_moderator": "Revoke Moderator",
-      "activate_account": "Activate account",
-      "deactivate_account": "Deactivate account",
-      "delete_account": "Delete account",
-      "force_nsfw": "Mark all posts as NSFW",
-      "strip_media": "Remove media from posts",
-      "force_unlisted": "Force posts to be unlisted",
-      "sandbox": "Force posts to be followers-only",
-      "disable_remote_subscription": "Disallow following user from remote instances",
-      "disable_any_subscription": "Disallow following user at all",
-      "quarantine": "Disallow user posts from federating",
-      "delete_user": "Delete user",
-      "delete_user_data_and_deactivate_confirmation": "This will permanently delete the data from this account and deactivate it. Are you absolutely sure?"
-    },
-    "highlight": {
-      "disabled": "No highlight",
-      "solid": "Solid bg",
-      "striped": "Striped bg",
-      "side": "Side stripe"
-    },
-    "note": "Note",
-    "note_blank": "(None)",
-    "edit_note": "Edit note",
-    "edit_note_apply": "Apply",
-    "edit_note_cancel": "Cancel"
-  },
-  "user_profile": {
-    "timeline_title": "User timeline",
-    "profile_does_not_exist": "Sorry, this profile does not exist.",
-    "profile_loading_error": "Sorry, there was an error loading this profile."
-  },
-  "user_reporting": {
-    "title": "Reporting {0}",
-    "add_comment_description": "The report will be sent to your instance moderators. You can provide an explanation of why you are reporting this account below:",
-    "additional_comments": "Additional comments",
-    "forward_description": "The account is from another server. Send a copy of the report there as well?",
-    "forward_to": "Forward to {0}",
-    "submit": "Submit",
-    "generic_error": "An error occurred while processing your request."
-  },
-  "who_to_follow": {
-    "more": "More",
-    "who_to_follow": "Who to follow"
-  },
-  "tool_tip": {
-    "media_upload": "Upload media",
-    "repeat": "Repeat",
-    "reply": "Reply",
-    "favorite": "Favorite",
-    "add_reaction": "Add Reaction",
-    "user_settings": "User Settings",
-    "accept_follow_request": "Accept follow request",
-    "reject_follow_request": "Reject follow request",
-    "bookmark": "Bookmark",
-    "toggle_expand": "Expand or collapse notification to show post in full",
-    "toggle_mute": "Expand or collapse notification to reveal muted content",
-    "autocomplete_available": "{number} result is available. Use up and down keys to navigate through them. | {number} results are available. Use up and down keys to navigate through them."
-  },
-  "upload": {
-    "error": {
-      "base": "上傳 ê 時失敗。",
-      "message": "傳 buē 起去：{0}",
-      "file_too_big": "檔案 sài-suh 傷大 [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
-      "default": "Koh 試一 kái。"
-    },
-    "file_size_units": {
-      "B": "B",
-      "KiB": "KiB",
-      "MiB": "MiB",
-      "GiB": "GiB",
-      "TiB": "TiB"
-    }
-  },
-  "search": {
-    "people": "用戶",
-    "hashtags": "主題標籤",
-    "person_talking": "{count} ê leh 論",
-    "people_talking": "{count} ê leh 論",
-    "no_results": "無半 ê 結果",
-    "no_more_results": "無其他 ê 結果",
-    "load_more": "載入 koh 較 tsē 結果"
-  },
-  "password_reset": {
-    "forgot_password": "Buē 記得密碼？",
-    "password_reset": "重頭設密碼",
-    "instruction": "拍 lí ê email 地址 iah 是用者 ê 名。Guán 會送 lí 連結，重頭設定密碼。",
-    "placeholder": "Lí ê email 地址 iah 是用者 ê 名。",
-    "check_email": "檢查電子 phue 箱，看有重頭設密碼 ê 連結無。",
-    "return_home": "轉來頭頁",
-    "too_many_requests": "Lí kā 請求 ê khòo-tah 用了 ah。等一時仔，閣試一 pái。",
-    "password_reset_disabled": "密碼重頭設定無開放。請聯絡本站 ê 行政員。",
-    "password_reset_required": "Beh 登入，著重頭設 lí ê 密碼。",
-    "password_reset_required_but_mailer_is_disabled": "Lí 需要重頭設密碼，毋 koh tsia 無開放密碼 koh 再設定。請聯絡本站 ê 行政員。"
-  },
-  "chats": {
-    "you": "Lí：",
-    "message_user": "傳私人 phue：{nickname}",
-    "delete": "Thâi 掉",
-    "chats": "開講",
-    "new": "發起開講",
-    "empty_message_error": "無法度 PO 空 ê phue",
-    "more": "Koh較濟……",
-    "delete_confirm": "Lí 敢真 ê beh thâi tsit 張 phue？",
-    "error_loading_chat": "載入開講 ê 時，出箠 ah。",
-    "error_sending_message": "送 phue ê 時，出箠 ah。",
-    "empty_chat_list_placeholder": "Lí 猶無佇 tsia 開講過，來開講 lah！"
-  },
-  "lists": {
-    "lists": "列單",
-    "new": "新 ê 列單",
-    "title": "列單標題",
-    "search": "Tshuē 用者",
-    "create": "開新 ê",
-    "save": "保存改變",
-    "delete": "刣列單",
-    "following_only": "限定 lí 所關注 ê",
-    "manage_lists": "管理列單",
-    "manage_members": "管理列單成員",
-    "add_members": "Tshiau 閣較 tsē ê 用者",
-    "remove_from_list": "對列單刣掉",
-    "add_to_list": "加入去列單",
-    "is_in_list": "列單已經有 ah ",
-    "editing_list": "編輯列單 {listTitle}",
-    "creating_list": "開新 ê 列單",
-    "update_title": "保存標題",
-    "really_delete": "敢真正 beh 刣掉列單？",
-    "error": "操作列單 ê 時陣出重耽：{0}"
-  },
-  "file_type": {
-    "audio": "音訊",
-    "video": "影片",
-    "image": "影像",
-    "file": "檔案"
-  },
-  "display_date": {
-    "today": "今 á 日"
-  },
-  "update": {
-    "big_update_title": "敬請體諒",
-    "big_update_content": "因為 guán 有一站 á 無發行新版本，所以這个版本會 kap lí 以早慣 sì ê 無仝。",
-    "update_bugs": "請佇 {pleromaGitlab} 報告任何問題 kap bug，因為 Pleroma 改變真 tsē。雖罔 guán 徹底 leh 試，mā 家 kī 用開發版，伊凡勢有一寡重耽。Guán 歡迎 lín 提供關係所拄著 ê 問題 ê 意見、建議，或者是改進 Pleroma kap Pleroma-FE ê 法度。",
-    "update_bugs_gitlab": "Pleroma GitLab",
-    "update_changelog": "Nā beh 知影改變 ê 詳細，請看：{theFullChangelog}.",
-    "update_changelog_here": "Kui ê 改變日誌",
-    "art_by": "美編：{linkToArtist}"
-  },
-  "unicode_domain_indicator": {
-    "tooltip": "這 ê 域名包含毋是 ascii ê 字元。"
-  }
-}
diff --git a/src/services/locale/locale.service.js b/src/services/locale/locale.service.js
index f6a1f708..e1c84c0a 100644
--- a/src/services/locale/locale.service.js
+++ b/src/services/locale/locale.service.js
@@ -3,7 +3,6 @@ import ISO6391 from 'iso-639-1'
 import _ from 'lodash'
 
 const specialLanguageCodes = {
-  nan: 'nan-TW',
   ja_easy: 'ja',
   zh_Hant: 'zh-HANT',
   zh: 'zh-Hans'
@@ -20,7 +19,7 @@ const internalToBackendLocaleMulti = codes => {
 const getLanguageName = (code) => {
   const specialLanguageNames = {
     ja_easy: 'やさしいにほんご',
-    nan: '臺語（閩南語）',
+    nan_TW: '臺語（閩南語）',
     zh: '简体中文',
     zh_Hant: '繁體中文'
   }
-- 
cgit v1.2.3-70-g09d2


From ee01393b5fddb2dac7c305f8522f1dd4ad56e18d Mon Sep 17 00:00:00 2001
From: Kian-ting Tan <chenjt30@gmail.com>
Date: Wed, 21 Jun 2023 17:06:01 +0000
Subject: Update 2 files

- /src/i18n/languages.js
- /src/services/locale/locale.service.js
---
 src/i18n/languages.js                 | 2 +-
 src/services/locale/locale.service.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/i18n/languages.js b/src/i18n/languages.js
index 432829f6..33a98f8e 100644
--- a/src/i18n/languages.js
+++ b/src/i18n/languages.js
@@ -17,7 +17,7 @@ const languages = [
   'ja',
   'ja_easy',
   'ko',
-  'nan',
+  'nan-TW',
   'nb',
   'nl',
   'oc',
diff --git a/src/services/locale/locale.service.js b/src/services/locale/locale.service.js
index e1c84c0a..2747c178 100644
--- a/src/services/locale/locale.service.js
+++ b/src/services/locale/locale.service.js
@@ -19,7 +19,7 @@ const internalToBackendLocaleMulti = codes => {
 const getLanguageName = (code) => {
   const specialLanguageNames = {
     ja_easy: 'やさしいにほんご',
-    nan_TW: '臺語（閩南語）',
+    nan-TW: '臺語（閩南語）',
     zh: '简体中文',
     zh_Hant: '繁體中文'
   }
-- 
cgit v1.2.3-70-g09d2


From b4cf20e7bc544fae95e6f19ed3e563d43e5966f6 Mon Sep 17 00:00:00 2001
From: Kian-ting Tan <chenjt30@gmail.com>
Date: Wed, 21 Jun 2023 17:45:05 +0000
Subject: fix the error of unquoting

---
 src/services/locale/locale.service.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/services/locale/locale.service.js b/src/services/locale/locale.service.js
index 2747c178..91d78cf2 100644
--- a/src/services/locale/locale.service.js
+++ b/src/services/locale/locale.service.js
@@ -19,7 +19,7 @@ const internalToBackendLocaleMulti = codes => {
 const getLanguageName = (code) => {
   const specialLanguageNames = {
     ja_easy: 'やさしいにほんご',
-    nan-TW: '臺語（閩南語）',
+    "nan-TW": '臺語（閩南語）',
     zh: '简体中文',
     zh_Hant: '繁體中文'
   }
-- 
cgit v1.2.3-70-g09d2


From e1fff8e06465779bda3dd5041f739cfa89a2f7ea Mon Sep 17 00:00:00 2001
From: Kian-ting Tan <chenjt30@gmail.com>
Date: Wed, 21 Jun 2023 17:51:06 +0000
Subject: Update file locale.service.js

---
 src/services/locale/locale.service.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/services/locale/locale.service.js b/src/services/locale/locale.service.js
index 91d78cf2..24ed3cdb 100644
--- a/src/services/locale/locale.service.js
+++ b/src/services/locale/locale.service.js
@@ -19,7 +19,7 @@ const internalToBackendLocaleMulti = codes => {
 const getLanguageName = (code) => {
   const specialLanguageNames = {
     ja_easy: 'やさしいにほんご',
-    "nan-TW": '臺語（閩南語）',
+    'nan-TW': '臺語（閩南語）',
     zh: '简体中文',
     zh_Hant: '繁體中文'
   }
-- 
cgit v1.2.3-70-g09d2


From 7ce71d8f82fa6b645dc09f9c98fc9e00d1c9dba0 Mon Sep 17 00:00:00 2001
From: Kian-ting Tan <chenjt30@gmail.com>
Date: Thu, 22 Jun 2023 15:35:04 +0000
Subject: Update nan-TW.json

---
 src/i18n/nan-TW.json | 1703 ++++++++++++++------------------------------------
 1 file changed, 452 insertions(+), 1251 deletions(-)

(limited to 'src')

diff --git a/src/i18n/nan-TW.json b/src/i18n/nan-TW.json
index 82e9f281..68daebbb 100644
--- a/src/i18n/nan-TW.json
+++ b/src/i18n/nan-TW.json
@@ -1,1253 +1,454 @@
 {
-  "about": {
-    "mrf": {
-		"federation": "聯邦",
-      "keyword": {
-          "keyword_policies": "關鍵字政策",
-        "ftl_removal": "Tuì「知影 ê 網路」時間線除掉。",
-        "reject": "拒絕",
-        "replace": "取代",
-        "is_replaced_by": "→"
-      },
-      "mrf_policies": "啟用 ê MRF 政策",
-      "mrf_policies_desc": "MRF 政策操作本站 ê 對外通信行為。以下ê政策啟用 ah：",
-      "simple": {
-        "simple_policies": "站臺特有 ê 政策",
-        "instance": "站",
-        "reason": "理由",
-        "not_applicable": "N/A",
-        "accept": "接受",
-        "accept_desc": "本站干焦接受下跤 ê 站 ê 短 phue：",
-        "reject": "拒絕",
-        "reject_desc": "本站 buē 接受 tuì 以下 ê 站 ê 短 phue：",
-        "quarantine": "隔離",
-        "quarantine_desc": "針對下跤 ê 站，本站干焦送出公開ê PO文：",
-        "ftl_removal": "Tuì「知影 ê 網路」時間線thâi掉",
-        "ftl_removal_desc": "本站buē 佇「知影 ê 網路」刊下跤 ê 站 ê PO文：",
-        "media_removal": "Thâi除媒體",
-        "media_removal_desc": "本站 kā 下跤 ê 站臺送 ê PO文 ê 媒體 lóng thâi 除：",
-        "media_nsfw": "媒體 lóng 標做「敏感內容」",
-        "media_nsfw_desc": "本站 kā 下跤 ê 站 ê 媒體，lóng 標做敏感內容："
-      }
-    },
-    "staff": "工作人員"
-  },
-  "announcements": {
-    "page_header": "公告",
-    "title": "公告",
-    "mark_as_read_action": "標做有讀",
-    "post_form_header": "貼公告",
-    "post_placeholder": "佇 tsia 拍你 ê 公告……",
-    "post_action": "貼",
-    "post_error": "錯誤：{error}",
-    "close_error": "關",
-    "delete_action": "Thâi",
-    "start_time_prompt": "開始時間： ",
-    "end_time_prompt": "結束時間：",
-    "all_day_prompt": "Tse 是 kui 工 ê 事件",
-    "published_time_display": "公告佇 {time}",
-    "start_time_display": "有效 tuì：{time}",
-    "end_time_display": "中止佇：{time}",
-    "edit_action": "編輯",
-    "submit_edit_action": "送出",
-    "cancel_edit_action": "取消",
-    "inactive_message": "這个公告 tsit-má 無效力。"
-  },
-  "shoutbox": {
-    "title": "留話枋"
-  },
-  "domain_mute_card": {
-    "mute": "予恬去",
-    "mute_progress": "Teh 予恬……",
-    "unmute": "予有聲",
-    "unmute_progress": "Teh 予有聲……"
-  },
-  "exporter": {
-    "export": "匯出",
-    "processing": "Teh 處理，較停仔指示你下載檔案……"
-  },
-  "features_panel": {
-    "shout": "留話枋",
-    "pleroma_chat_messages": "Pleroma 開講",
-    "gopher": "Gopher",
-    "media_proxy": "媒體代理伺侯器",
-    "scope_options": "公開範圍選項",
-    "text_limit": "字數限制",
-    "title": "有效 ê 功能",
-    "who_to_follow": "啥儂通綴",
-    "upload_limit": "檔案 sài-suh 限制"
-  },
-  "finder": {
-    "error_fetching_user": "Tshuē 用者 ê 時起錯誤",
-    "find_user": "Tshuē 用者"
-  },
-  "general": {
-      "apply": "應用",
-    "submit": "送出",
-    "more": "Koh 較 tsē",
-    "loading": "Leh 載入……",
-    "generic_error": "起錯誤 ah",
-    "generic_error_message": "起錯誤：{0}",
-    "error_retry": "請 koh 試一 kái",
-    "retry": "Koh 試",
-    "optional": "非必要",
-    "show_more": "展示較 tsē",
-    "show_less": "展示較少",
-    "never_show_again": "Mài koh 展示",
-    "dismiss": "無視",
-    "cancel": "取消",
-    "disable": "無愛用",
-    "enable": "啟用",
-    "confirm": "確認",
-    "verify": "驗證",
-    "close": "關掉",
-    "undo": "復原",
-    "yes": "是",
-    "no": "毋是",
-    "peek": "先看 māi",
-    "scroll_to_top": "捲 kàu 頂懸",
-    "role": {
-      "admin": "行政員",
-      "moderator": "管理員"
-    },
-    "unpin": "無愛 kā 釘",
-    "pin": "Kā釘起來",
-    "flash_content": "Ji̍h tsia，用 Ruffle（iáu teh 試驗，可能 buē 紡）看 Flash ê 內容。",
-    "flash_sepcurity": "注意 tse 可能有危險，因為 Flash 內容猶原是任意 ê 程式碼。",
-    "flash_fail": "載入 flash 內容失敗，詳細會當看控制臺。",
-    "scope_in_timeline": {
-      "direct": "私人 phue",
-      "private": "干焦 hōo 綴 lí ê 看",
-      "public": "公開佇公共時間線",
-      "unlisted": "無愛公開佇公共時間線"
-    }
-  },
-  "image_cropper": {
-    "crop_picture": "裁相片",
-    "save": "儲存",
-    "save_without_cropping": "無裁就儲存",
-    "cancel": "取消"
-  },
-  "importer": {
-    "submit": "送出",
-    "success": "匯入成功。",
-    "error": "佇匯入 ê 時起錯誤。"
-  },
-  "login": {
-    "login": "登入",
-    "description": "用 OAuth 登入",
-    "logout": "登出",
-    "logout_confirm_title": "登出確認",
-    "logout_confirm": "Lí　敢真正　beh　登出？",
-    "logout_confirm_accept_button": "登出",
-    "logout_confirm_cancel_button": "mài 登出",
-    "password": "密碼",
-    "placeholder": "例：lain",
-    "register": "註冊",
-    "username": "用者 ê 名",
-    "hint": "登入，參與討論",
-    "authentication_code": "認證碼",
-    "enter_recovery_code": "輸入恢復碼",
-    "enter_two_factor_code": "輸入兩階段認證碼",
-    "recovery_code": "恢復碼",
-    "heading": {
-      "totp": "兩階段認證",
-      "recovery": "兩階段恢復"
-    }
-  },
-  "media_modal": {
-    "previous": "頂一　ê",
-    "next": "後一个",
-    "counter": "{current} / {total}",
-    "hide": "關掉媒體瀏覽"
-  },
-  "nav": {
-    "about": "有關……",
-    "administration": "管理",
-    "back": "轉去",
-    "friend_requests": "跟綴請求",
-    "mentions": "The̍h起",
-    "interactions": "互動",
-    "dms": "私人 phue",
-    "public_tl": "公共時間線",
-    "timeline": "時間線",
-    "home_timeline": "厝 ê 時間線",
-    "twkn": "知影 ê 網路",
-    "bookmarks": "冊籤",
-    "user_search": "Tshuē 用者",
-    "search": "tshuē",
-    "search_close": "關掉 tshiau-tshuē liâu",
-    "who_to_follow": "Siáng 會當綴？",
-    "preferences": "個人 ê 設定",
-    "timelines": "時間流",
-    "chats": "開講",
-    "lists": "列單",
-    "edit_nav_mobile": "自訂導覽條",
-    "edit_pinned": "編輯釘起來 ê 項目",
-    "edit_finish": "編輯 suah",
-    "mobile_sidebar": "切換行動版 ê 邊 á liâu",
-    "mobile_notifications": "拍開通知",
-    "mobile_notifications": "拍開通知（有無讀ê）",
-    "mobile_notifications_close": "關掉通知",
-    "announcements": "公告"
-  },
-  "notifications": {
-    "broken_favorite": "狀態毋知影，leh tshiau-tshuē……",
-    "error": "佇取得通知 ê 時起錯誤：{0}",
-    "favorited_you": "kah 意 lí ê 狀態",
-    "followed_you": "綴 lí",
-    "follow_request": "想 beh 綴 lí",
-    "load_older": "載入 khah 早 ê 通知",
-    "notifications": "通知",
-    "read": "讀！",
-    "repeated_you": "轉送 lí ê 狀態",
-    "no_more_notifications": "無別 ê 通知",
-    "migrated_to": "移民到",
-    "reacted_with": "顯出{0} ê 反應",
-    "submitted_report": "送出檢舉",
-    "poll_ended": "投票結束"
-  },
-  "polls": {
-    "add_poll": "開投票",
-    "add_option": "加選項",
-    "option": "選項",
-    "votes": "票",
-    "people_voted_count": "{count} 位有投",
-    "votes_count": "{count} 票",
-    "vote": "投票",
-    "type": "投票 ê 形式",
-    "single_choice": "孤選",
-    "multiple_choices": "Tsē 選",
-    "expiry": "投票期限",
-    "expires_in": "投票 tī {0} 以後結束",
-    "expired": "投票佇 {0} 以前結束",
-    "not_enough_options": "投票 ê 選項傷少。"
-  },
-  "emoji": {
-    "stickers": "貼圖",
-    "emoji": "繪文字",
-    "keep_open": "Hōo 揀選仔開 leh",
-    "search_emoji": "Tshuē 繪文字",
-    "add_emoji": "插繪文字",
-    "custom": "定製 ê 繪文字",
-    "unpacked": "拍開 ê 繪文字",
-    "unicode": "Unicode 繪文字",
-    "unicode_groups": {
-      "activities": "活動",
-      "animals-and-nature": "動物 kap 自然",
-      "flags": "旗 á",
-      "food-and-drink": "食物 kap 飲料",
-      "objects": "物體",
-      "people-and-body": "Lâng kap 身軀",
-      "smileys-and-emotion": "笑面 kap 情緒",
-      "symbols": "符號",
-      "travel-and-places": "旅遊 kap 所在"
-    },
-    "load_all_hint": "載入頭前 {saneAmount} ê 繪文字，規个攏載入效能可能 ē khah 食力。",
-    "load_all": "Kā {emojiAmount} ê 繪文字攏載入",
-    "regional_indicator": "地區指引 {letter}"
-  },
-  "errors": {
-    "storage_unavailable": "Pleroma buē-tàng the̍h 著瀏覽器儲存 ê。Lí ê 登入狀態抑是局部設定 buē 儲存，mā 凡勢 tú 著意料外 ê 問題。拍開 cookie 看覓。"
-  },
-  "interactions": {
-    "favs_repeats": "轉送 kap kah 意",
-    "follows": "最近綴 lí ê",
-    "emoji_reactions": "繪文字 ê 回應",
-    "reports": "檢舉",
-    "moves": "用者 ê 移民",
-    "load_older": "載入 koh khah 早 ê 互動"
-  },
-  "post_status": {
-    "edit_status": "編輯狀態",
-    "new_status": "PO 新 ê 狀態",
-    "account_not_locked_warning": "Lín 口座毋是 {0} ê。見 nā 有 lâng 綴--lí，ē-tàng 看著 lí ê 限定跟綴者 ê PO 文。.",
-    "account_not_locked_warning_link": "鎖起來 ê 口座",
-    "attachments_sensitive": "Kā 附件標做敏感內容。",
-    "media_description": "媒體說明",
-    "content_type": {
-      "text/plain": "純 ê 文字",
-      "text/html": "HTML",
-      "text/markdown": "Markdown",
-      "text/bbcode": "BBCode"
-    },
-    "content_type_selection": "貼 ê 形式",
-    "content_warning": "主旨（毋是必要）",
-    "default": "Tú 正 kàu 高雄 ah。",
-    "direct_warning_to_all": "Tsit ê PO 文通 hōo 逐 ê 提起 ê 用者看見。",
-    "direct_warning_to_first_only": "Tsit ê PO 文，kan-ta 短信 tú 開始提起 ê 用者，tsiah 通看見。",
-    "edit_remote_warning": "別 ê 站臺可能無支援編輯，無法度收著 PO 文上新 ê 版本。",
-    "edit_unsupported_warning": "Pleroma 無支持編輯 the̍h 起 hām 投票。",
-    "posting": "PO 文",
-    "post": "PO",
-    "preview": "Sing 看覓",
-    "preview_empty": "空 ê",
-    "empty_status_error": "無法度 PO 無檔案 koh 空 ê 狀態。",
-    "media_description_error": "更新媒體失敗，請 koh 試一 kái。",
-    "scope_notice": {
-      "public": "Tsit ê PO 文通予逐 ê 儂看著。",
-      "private": "Tsit ê PO 文 kan-ta 予綴 lí ê 看著。",
-      "unlisted": "Tsit ê PO 文 buē 公開 tī 公共時間線 kap 知影 ê 網路。"
-    },
-    "scope_notice_dismiss": "關掉 tsit ê 通知",
-    "scope": {
-      "direct": "私人 phue - PO 文干焦予提起 ê 用者看著",
-      "private": "限定綴 ê 儂 - PO 文干焦予綴 lí ê 儂看著",
-      "public": "公開 - PO kàu 公開時間線",
-      "unlisted": "Mài 列出來 - Mài PO tī 公開時間線。"
-    }
-  },
-  "registration": {
-    "bio_optional": "介紹（毋是必要）",
-    "email": "Email",
-    "email_optional": "Email（毋是必要）",
-    "fullname": "顯示 ê 名",
-    "password_confirm": "確認密碼",
-    "registration": "註冊",
-    "token": "邀請碼",
-    "captcha": "驗證碼",
-    "new_captcha": "Ji̍h 圖片，the̍h 新 ê 驗證碼",
-    "username_placeholder": "e.g. lain",
-    "fullname_placeholder": "e.g. 岩倉 Lain",
-    "bio_placeholder": "e.g.\nLí 好，我是 Lain。我是日本動畫 ê 角色，tuà tī 日本 ê 郊區。Lí 凡勢 bat tī Wired 知影我。",
-    "reason": "註冊 ê 理由",
-    "reason_placeholder": "本站靠人工審核註冊。\n介紹管理者 lí beh tī tsia 註冊 ê 理由。",
-    "register": "註冊",
-    "validations": {
-      "username_required": "著愛添",
-      "fullname_required": "著愛添",
-      "email_required": "著愛添",
-      "password_required": "著愛添",
-      "password_confirmation_required": "著愛添",
-      "password_confirmation_match": "密碼著相 kâng",
-      "birthday_required": "著愛添",
-      "birthday_min_age": "Buē-tàng tī {date} 以後"
-    },
-    "email_language": "Lí想 beh 服侍器用 siánn 物語言寄批 hōo lí？",
-    "birthday": "生日",
-    "birthday_optional": "生日（毋是必要）："
-  },
-  "remote_user_resolver": {
-    "remote_user_resolver": "別站用者 ê 解析器",
-    "searching_for": "Tshuē",
-    "error": "Tshuē無"
-  },
-  "report": {
-    "reporter": "檢舉人：",
-    "reported_user": "Beh 檢舉 ê 用者：",
-    "reported_statuses": "Beh 檢舉 ê 狀態：",
-    "notes": "Notes:",
-    "state": "State:",
-    "state_open": "開 ê",
-    "state_closed": "關 ê",
-    "state_resolved": "解決了 ê"
-  },
-  "selectable_list": {
-    "select_all": "攏總揀"
-  },
-  "settings": {
-    "add_language": "加一 ê 備用 ê 語言",
-    "remove_language": "Ni 掉",
-    "primary_language": "主要語言：",
-    "fallback_language": "備用語言 {index}：",
-    "app_name": "App ê 名",
-    "expert_mode": "進階模式",
-    "save": "保存改變",
-    "security": "安全",
-    "setting_changed": "設定 kap 預先 ê 有 tsing 差",
-    "setting_server_side": "This setting is tied to your profile and affects all sessions and clients",
-    "enter_current_password_to_confirm": "Enter your current password to confirm your identity",
-    "post_look_feel": "Posts Look & Feel",
-    "mention_links": "Mention links",
-    "mfa": {
-      "otp": "OTP",
-      "setup_otp": "Setup OTP",
-      "wait_pre_setup_otp": "presetting OTP",
-      "confirm_and_enable": "Confirm & enable OTP",
-      "title": "Two-factor Authentication",
-      "generate_new_recovery_codes": "Generate new recovery codes",
-      "warning_of_generate_new_codes": "When you generate new recovery codes, your old codes won’t work anymore.",
-      "recovery_codes": "Recovery codes.",
-      "waiting_a_recovery_codes": "Receiving backup codes…",
-      "recovery_codes_warning": "Write the codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
-      "authentication_methods": "Authentication methods",
-      "scan": {
-        "title": "Scan",
-        "desc": "Using your two-factor app, scan this QR code or enter text key:",
-        "secret_code": "Key"
-      },
-      "verify": {
-        "desc": "To enable two-factor authentication, enter the code from your two-factor app:"
-      }
-    },
-    "lists_navigation": "Show lists in navigation",
-    "allow_following_move": "Allow auto-follow when following account moves",
-    "attachmentRadius": "Attachments",
-    "attachments": "Attachments",
-    "avatar": "Avatar",
-    "avatarAltRadius": "Avatars (notifications)",
-    "avatarRadius": "Avatars",
-    "background": "Background",
-    "bio": "Bio",
-    "email_language": "Language for receiving emails from the server",
-    "block_export": "Block export",
-    "block_export_button": "Export your blocks to a csv file",
-    "block_import": "Block import",
-    "block_import_error": "Error importing blocks",
-    "blocks_imported": "Blocks imported! Processing them will take a while.",
-    "mute_export": "Mute export",
-    "mute_export_button": "Export your mutes to a csv file",
-    "mute_import": "Mute import",
-    "mute_import_error": "Error importing mutes",
-    "mutes_imported": "Mutes imported! Processing them will take a while.",
-    "import_mutes_from_a_csv_file": "Import mutes from a csv file",
-    "account_backup": "Account backup",
-    "account_backup_description": "This allows you to download an archive of your account information and your posts, but they cannot yet be imported into a Pleroma account.",
-    "account_backup_table_head": "Backup",
-    "download_backup": "Download",
-    "backup_not_ready": "This backup is not ready yet.",
-    "backup_running": "This backup is in progress, processed {number} record. | This backup is in progress, processed {number} records.",
-    "backup_failed": "This backup has failed.",
-    "remove_backup": "Remove",
-    "list_backups_error": "Error fetching backup list: {error}",
-    "add_backup": "Create a new backup",
-    "added_backup": "Added a new backup.",
-    "add_backup_error": "Error adding a new backup: {error}",
-    "blocks_tab": "Blocks",
-    "bot": "This is a bot account",
-    "btnRadius": "Buttons",
-    "cBlue": "Blue (Reply, follow)",
-    "cGreen": "Green (Retweet)",
-    "cOrange": "Orange (Favorite)",
-    "cRed": "Red (Cancel)",
-    "change_email": "Change email",
-    "change_email_error": "There was an issue changing your email.",
-    "changed_email": "Email changed successfully!",
-    "change_password": "Change password",
-    "change_password_error": "There was an issue changing your password.",
-    "changed_password": "Password changed successfully!",
-    "chatMessageRadius": "Chat message",
-    "collapse_subject": "Collapse posts with subjects",
-    "composing": "Composing",
-    "confirm_new_password": "Confirm new password",
-    "current_password": "Current password",
-    "confirm_dialogs": "Ask for confirmation when",
-    "confirm_dialogs_repeat": "repeating a status",
-    "confirm_dialogs_unfollow": "unfollowing a user",
-    "confirm_dialogs_block": "blocking a user",
-    "confirm_dialogs_mute": "muting a user",
-    "confirm_dialogs_delete": "deleting a status",
-    "confirm_dialogs_logout": "logging out",
-    "confirm_dialogs_approve_follow": "approving a follower",
-    "confirm_dialogs_deny_follow": "denying a follower",
-    "confirm_dialogs_remove_follower": "removing a follower",
-    "mutes_and_blocks": "Mutes and Blocks",
-    "data_import_export_tab": "Data import / export",
-    "default_vis": "Default visibility scope",
-    "delete_account": "Delete account",
-    "delete_account_description": "Permanently delete your data and deactivate your account.",
-    "delete_account_error": "There was an issue deleting your account. If this persists please contact your instance administrator.",
-    "delete_account_instructions": "Type your password in the input below to confirm account deletion.",
-    "account_alias": "Account aliases",
-    "account_alias_table_head": "Alias",
-    "list_aliases_error": "Error fetching aliases: {error}",
-    "hide_list_aliases_error_action": "Close",
-    "remove_alias": "Remove this alias",
-    "new_alias_target": "Add a new alias (e.g. {example})",
-    "added_alias": "Alias is added.",
-    "add_alias_error": "Error adding alias: {error}",
-    "move_account": "Move account",
-    "move_account_notes": "If you want to move the account somewhere else, you must go to your target account and add an alias pointing here.",
-    "move_account_target": "Target account (e.g. {example})",
-    "moved_account": "Account is moved.",
-    "move_account_error": "Error moving account: {error}",
-    "discoverable": "Allow discovery of this account in search results and other services",
-    "domain_mutes": "Domains",
-    "avatar_size_instruction": "The recommended minimum size for avatar images is 150x150 pixels.",
-    "pad_emoji": "Pad emoji with spaces when adding from picker",
-    "autocomplete_select_first": "Automatically select the first candidate when autocomplete results are available",
-    "emoji_reactions_on_timeline": "Show emoji reactions on timeline",
-    "emoji_reactions_scale": "Reactions scale factor",
-    "export_theme": "Save preset",
-    "filtering": "Filtering",
-    "wordfilter": "Wordfilter",
-    "filtering_explanation": "All statuses containing these words will be muted, one per line",
-    "word_filter_and_more": "Word filter and more...",
-    "follow_export": "Follow export",
-    "follow_export_button": "Export your follows to a csv file",
-    "follow_import": "Follow import",
-    "follow_import_error": "Error importing followers",
-    "follows_imported": "Follows imported! Processing them will take a while.",
-    "accent": "Accent",
-    "foreground": "Foreground",
-    "general": "General",
-    "hide_attachments_in_convo": "Hide attachments in conversations",
-    "hide_attachments_in_tl": "Hide attachments in timeline",
-    "hide_media_previews": "Hide media previews",
-    "hide_muted_posts": "Hide posts of muted users",
-    "mute_bot_posts": "Mute bot posts",
-    "hide_bot_indication": "Hide bot indication in posts",
-    "hide_all_muted_posts": "Hide muted posts",
-    "max_thumbnails": "Maximum amount of thumbnails per post (empty = no limit)",
-    "hide_isp": "Hide instance-specific panel",
-    "hide_shoutbox": "Hide instance shoutbox",
-    "right_sidebar": "Reverse order of columns",
-    "navbar_column_stretch": "Stretch navbar to columns width",
-    "always_show_post_button": "Always show floating New Post button",
-    "hide_wallpaper": "Hide instance wallpaper",
-    "preload_images": "Preload images",
-    "use_one_click_nsfw": "Open NSFW attachments with just one click",
-    "hide_post_stats": "Hide post statistics (e.g. the number of favorites)",
-    "hide_user_stats": "Hide user statistics (e.g. the number of followers)",
-    "hide_filtered_statuses": "Hide all filtered posts",
-    "hide_wordfiltered_statuses": "Hide word-filtered statuses",
-    "hide_muted_threads": "Hide muted threads",
-    "import_blocks_from_a_csv_file": "Import blocks from a csv file",
-    "import_followers_from_a_csv_file": "Import follows from a csv file",
-    "import_theme": "Load preset",
-    "inputRadius": "Input fields",
-    "checkboxRadius": "Checkboxes",
-    "instance_default": "(default: {value})",
-    "instance_default_simple": "(default)",
-    "interface": "Interface",
-    "interfaceLanguage": "Interface language",
-    "invalid_theme_imported": "The selected file is not a supported Pleroma theme. No changes to your theme were made.",
-    "limited_availability": "Unavailable in your browser",
-    "links": "Links",
-    "lock_account_description": "Restrict your account to approved followers only",
-    "loop_video": "Loop videos",
-    "loop_video_silent_only": "Loop only videos without sound (i.e. Mastodon's \"gifs\")",
-    "mutes_tab": "Mutes",
-    "play_videos_in_modal": "Play videos in a popup frame",
-    "url": "URL",
-    "preview": "Preview",
-    "file_export_import": {
-      "backup_restore": "Settings backup",
-      "backup_settings": "Backup settings to file",
-      "backup_settings_theme": "Backup settings and theme to file",
-      "restore_settings": "Restore settings from file",
-      "errors": {
-        "invalid_file": "The selected file is not a supported Pleroma settings backup. No changes were made.",
-        "file_too_new": "Incompatile major version: {fileMajor}, this PleromaFE (settings ver {feMajor}) is too old to handle it",
-        "file_too_old": "Incompatile major version: {fileMajor}, file version is too old and not supported (min. set. ver. {feMajor})",
-        "file_slightly_new": "File minor version is different, some settings might not load"
-      }
-    },
-    "profile_fields": {
-      "label": "Profile metadata",
-      "add_field": "Add field",
-      "name": "Label",
-      "value": "Content"
-    },
-    "birthday": {
-      "label": "Birthday",
-      "show_birthday": "Show my birthday"
-    },
-    "account_privacy": "Privacy",
-    "use_contain_fit": "Don't crop the attachment in thumbnails",
-    "name": "Name",
-    "name_bio": "Name & bio",
-    "new_email": "New email",
-    "new_password": "New password",
-    "posts": "Posts",
-    "user_profiles": "User Profiles",
-    "notification_visibility": "Types of notifications to show",
-    "notification_visibility_follows": "Follows",
-    "notification_visibility_likes": "Favorites",
-    "notification_visibility_mentions": "Mentions",
-    "notification_visibility_repeats": "Repeats",
-    "notification_visibility_moves": "User Migrates",
-    "notification_visibility_emoji_reactions": "Reactions",
-    "notification_visibility_polls": "Ends of polls you voted in",
-    "no_rich_text_description": "Strip rich text formatting from all posts",
-    "no_blocks": "No blocks",
-    "no_mutes": "No mutes",
-    "hide_favorites_description": "Don't show list of my favorites (people still get notified)",
-    "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": "Hide sensitive/NSFW media",
-    "oauth_tokens": "OAuth tokens",
-    "token": "Token",
-    "refresh_token": "Refresh token",
-    "valid_until": "Valid until",
-    "revoke_token": "Revoke",
-    "panelRadius": "Panels",
-    "pause_on_unfocused": "Pause when tab is not focused",
-    "presets": "Presets",
-    "profile_background": "Profile background",
-    "profile_banner": "Profile banner",
-    "profile_tab": "Profile",
-    "radii_help": "Set up interface edge rounding (in pixels)",
-    "replies_in_timeline": "Replies in timeline",
-    "reply_visibility_all": "Show all replies",
-    "reply_visibility_following": "Only show replies directed at me or users I'm following",
-    "reply_visibility_self": "Only show replies directed at me",
-    "reply_visibility_following_short": "Show replies to my follows",
-    "reply_visibility_self_short": "Show replies to self only",
-    "autohide_floating_post_button": "Automatically hide New Post button (mobile)",
-    "saving_err": "Error saving settings",
-    "saving_ok": "Settings saved",
-    "search_user_to_block": "Search whom you want to block",
-    "search_user_to_mute": "Search whom you want to mute",
-    "security_tab": "Security",
-    "scope_copy": "Copy scope when replying (DMs are always copied)",
-    "minimal_scopes_mode": "Minimize post scope selection options",
-    "set_new_avatar": "Set new avatar",
-    "set_new_profile_background": "Set new profile background",
-    "set_new_profile_banner": "Set new profile banner",
-    "reset_avatar": "Reset avatar",
-    "reset_profile_background": "Reset profile background",
-    "reset_profile_banner": "Reset profile banner",
-    "reset_avatar_confirm": "Do you really want to reset the avatar?",
-    "reset_banner_confirm": "Do you really want to reset the banner?",
-    "reset_background_confirm": "Do you really want to reset the background?",
-    "settings": "Settings",
-    "subject_input_always_show": "Always show subject field",
-    "subject_line_behavior": "Copy subject when replying",
-    "subject_line_email": "Like email: \"re: subject\"",
-    "subject_line_mastodon": "Like mastodon: copy as is",
-    "subject_line_noop": "Do not copy",
-    "conversation_display": "Conversation display style",
-    "conversation_display_tree": "Tree-style",
-    "conversation_display_tree_quick": "Tree view",
-    "disable_sticky_headers": "Don't stick column headers to top of the screen",
-    "show_scrollbars": "Show side column's scrollbars",
-    "third_column_mode": "When there's enough space, show third column containing",
-    "third_column_mode_none": "Don't show third column at all",
-    "third_column_mode_notifications": "Notifications column",
-    "third_column_mode_postform": "Main post form and navigation",
-    "columns": "Columns",
-    "column_sizes": "Column sizes",
-    "column_sizes_sidebar": "Sidebar",
-    "column_sizes_content": "Content",
-    "column_sizes_notifs": "Notifications",
-    "tree_advanced": "Allow more flexible navigation in tree view",
-    "tree_fade_ancestors": "Display ancestors of the current status in faint text",
-    "conversation_display_linear": "Linear-style",
-    "conversation_display_linear_quick": "Linear view",
-    "conversation_other_replies_button": "Show the \"other replies\" button",
-    "conversation_other_replies_button_below": "Below statuses",
-    "conversation_other_replies_button_inside": "Inside statuses",
-    "max_depth_in_thread": "Maximum number of levels in thread to display by default",
-    "post_status_content_type": "Post status content type",
-    "sensitive_by_default": "Mark posts as sensitive by default",
-    "stop_gifs": "Pause animated images until you hover on them",
-    "streaming": "Automatically show new posts when scrolled to the top",
-    "auto_update": "Show new posts automatically",
-    "user_mutes": "Users",
-    "useStreamingApi": "Receive posts and notifications real-time",
-    "use_websockets": "Use websockets (Realtime updates)",
-    "text": "Text",
-    "theme": "Theme",
-    "theme_help": "Use hex color codes (#rrggbb) to customize your color theme.",
-    "theme_help_v2_1": "You can also override certain component's colors and opacity by toggling the checkbox, use \"Clear all\" button to clear all overrides.",
-    "theme_help_v2_2": "Icons underneath some entries are background/text contrast indicators, hover over for detailed info. Please keep in mind that when using transparency contrast indicators show the worst possible case.",
-    "tooltipRadius": "Tooltips/alerts",
-    "type_domains_to_mute": "Search domains to mute",
-    "upload_a_photo": "Upload a photo",
-    "user_settings": "User Settings",
-    "values": {
-      "false": "no",
-      "true": "yes"
-    },
-    "virtual_scrolling": "Optimize timeline rendering",
-    "use_at_icon": "Display {'@'} symbol as an icon instead of text",
-    "mention_link_display": "Display mention links",
-    "mention_link_display_short": "always as short names (e.g. {'@'}foo)",
-    "mention_link_display_full_for_remote": "as full names only for remote users (e.g. {'@'}foo{'@'}example.org)",
-    "mention_link_display_full": "always as full names (e.g. {'@'}foo{'@'}example.org)",
-    "mention_link_use_tooltip": "Show user card when clicking mention links",
-    "mention_link_show_avatar": "Show user avatar beside the link",
-    "mention_link_show_avatar_quick": "Show user avatar next to mentions",
-    "mention_link_fade_domain": "Fade domains (e.g. {'@'}example.org in {'@'}foo{'@'}example.org)",
-    "mention_link_bolden_you": "Highlight mention of you when you are mentioned",
-    "user_popover_avatar_action": "Popover avatar click action",
-    "user_popover_avatar_action_zoom": "Zoom the avatar",
-    "user_popover_avatar_action_close": "Close the popover",
-    "user_popover_avatar_action_open": "Open profile",
-    "user_popover_avatar_overlay": "Show user popover over user avatar",
-    "fun": "Fun",
-    "greentext": "Meme arrows",
-    "show_yous": "Show (You)s",
-    "notifications": "Notifications",
-    "notification_setting_filters": "Filters",
-    "notification_setting_block_from_strangers": "Block notifications from users who you do not follow",
-    "notification_setting_privacy": "Privacy",
-    "notification_setting_hide_notification_contents": "Hide the sender and contents of push notifications",
-    "notification_mutes": "To stop receiving notifications from a specific user, use a mute.",
-    "notification_blocks": "Blocking a user stops all notifications as well as unsubscribes them.",
-    "enable_web_push_notifications": "Enable web push notifications",
-    "more_settings": "More settings",
-    "style": {
-      "switcher": {
-        "keep_color": "Keep colors",
-        "keep_shadows": "Keep shadows",
-        "keep_opacity": "Keep opacity",
-        "keep_roundness": "Keep roundness",
-        "keep_fonts": "Keep fonts",
-        "save_load_hint": "\"Keep\" options preserve currently set options when selecting or loading themes, it also stores said options when exporting a theme. When all checkboxes unset, exporting theme will save everything.",
-        "reset": "Reset",
-        "clear_all": "Clear all",
-        "clear_opacity": "Clear opacity",
-        "load_theme": "Load theme",
-        "keep_as_is": "Keep as is",
-        "use_snapshot": "Old version",
-        "use_source": "New version",
-        "help": {
-          "upgraded_from_v2": "PleromaFE has been upgraded, theme could look a little bit different than you remember.",
-          "v2_imported": "File you imported was made for older FE. We try to maximize compatibility but there still could be inconsistencies.",
-          "future_version_imported": "File you imported was made in newer version of FE.",
-          "older_version_imported": "File you imported was made in older version of FE.",
-          "snapshot_present": "Theme snapshot is loaded, so all values are overriden. You can load theme's actual data instead.",
-          "snapshot_missing": "No theme snapshot was in the file so it could look different than originally envisioned.",
-          "fe_upgraded": "PleromaFE's theme engine upgraded after version update.",
-          "fe_downgraded": "PleromaFE's version rolled back.",
-          "migration_snapshot_ok": "Just to be safe, theme snapshot loaded. You can try loading theme data.",
-          "migration_napshot_gone": "For whatever reason snapshot was missing, some stuff could look different than you remember.",
-          "snapshot_source_mismatch": "Versions conflict: most likely FE was rolled back and updated again, if you changed theme using older version of FE you most likely want to use old version, otherwise use new version."
-        }
-      },
-      "common": {
-        "color": "色彩",
-        "opacity": "無透明度",
-        "contrast": {
-          "hint": "Contrast ratio is {ratio}, it {level} {context}",
-          "level": {
-            "aa": "meets Level AA guideline (minimal)",
-            "aaa": "meets Level AAA guideline (recommended)",
-            "bad": "doesn't meet any accessibility guidelines"
-          },
-          "context": {
-            "18pt": "for large (18pt+) text",
-            "text": "for text"
-          }
-        }
-      },
-      "common_colors": {
-        "_tab_label": "Common",
-        "main": "Common colors",
-        "foreground_hint": "See \"Advanced\" tab for more detailed control",
-        "rgbo": "Icons, accents, badges"
-      },
-      "advanced_colors": {
-        "_tab_label": "Advanced",
-        "alert": "Alert background",
-        "alert_error": "Error",
-        "alert_warning": "Warning",
-        "alert_neutral": "Neutral",
-        "post": "Posts/User bios",
-        "badge": "Badge background",
-        "popover": "Tooltips, menus, popovers",
-        "badge_notification": "Notification",
-        "panel_header": "Panel header",
-        "top_bar": "Top bar",
-        "borders": "Borders",
-        "buttons": "Buttons",
-        "inputs": "Input fields",
-        "faint_text": "Faded text",
-        "underlay": "Underlay",
-        "wallpaper": "Wallpaper",
-        "poll": "Poll graph",
-        "icons": "Icons",
-        "highlight": "Highlighted elements",
-        "pressed": "Pressed",
-        "selectedPost": "Selected post",
-        "selectedMenu": "Selected menu item",
-        "disabled": "Disabled",
-        "toggled": "Toggled",
-        "tabs": "Tabs",
-        "chat": {
-          "incoming": "Incoming",
-          "outgoing": "Outgoing",
-          "border": "Border"
-        }
-      },
-      "radii": {
-        "_tab_label": "Roundness"
-      },
-      "shadows": {
-        "_tab_label": "Shadow and lighting",
-        "component": "Component",
-        "override": "Override",
-        "shadow_id": "Shadow #{value}",
-        "blur": "Blur",
-        "spread": "Spread",
-        "inset": "Inset",
-        "hintV3": "For shadows you can also use the {0} notation to use other color slot.",
-        "filter_hint": {
-          "always_drop_shadow": "Warning, this shadow always uses {0} when browser supports it.",
-          "drop_shadow_syntax": "{0} does not support {1} parameter and {2} keyword.",
-          "avatar_inset": "Please note that combining both inset and non-inset shadows on avatars might give unexpected results with transparent avatars.",
-          "spread_zero": "Shadows with spread > 0 will appear as if it was set to zero",
-          "inset_classic": "Inset shadows will be using {0}"
-        },
-        "components": {
-          "panel": "Panel",
-          "panelHeader": "Panel header",
-          "topBar": "Top bar",
-          "avatar": "User avatar (in profile view)",
-          "avatarStatus": "User avatar (in post display)",
-          "popup": "Popups and tooltips",
-          "button": "Button",
-          "buttonHover": "Button (hover)",
-          "buttonPressed": "Button (pressed)",
-          "buttonPressedHover": "Button (pressed+hover)",
-          "input": "Input field"
-        }
-      },
-      "fonts": {
-        "_tab_label": "Fonts",
-        "help": "Select font to use for elements of UI. For \"custom\" you have to enter exact font name as it appears in system.",
-        "components": {
-          "interface": "Interface",
-          "input": "Input fields",
-          "post": "Post text",
-          "postCode": "Monospaced text in a post (rich text)"
-        },
-        "family": "Font name",
-        "size": "Size (in px)",
-        "weight": "Weight (boldness)",
-        "custom": "Custom"
-      },
-      "preview": {
-        "header": "Preview",
-        "content": "Content",
-        "error": "Example error",
-        "button": "Button",
-        "text": "A bunch of more {0} and {1}",
-        "mono": "content",
-        "input": "Just landed in L.A.",
-        "faint_link": "helpful manual",
-        "fine_print": "Read our {0} to learn nothing useful!",
-        "header_faint": "This is fine",
-        "checkbox": "I have skimmed over terms and conditions",
-        "link": "a nice lil' link"
-      }
-    },
-    "version": {
-      "title": "Version",
-      "backend_version": "Backend version",
-      "frontend_version": "Frontend version"
-    },
-    "commit_value": "Save",
-    "commit_value_tooltip": "Value is not saved, press this button to commit your changes",
-    "reset_value": "Reset",
-    "reset_value_tooltip": "Reset draft",
-    "hard_reset_value": "Hard reset",
-    "hard_reset_value_tooltip": "Remove setting from storage, forcing use of default value"
-  },
-  "admin_dash": {
-    "window_title": "Administration",
-    "wip_notice": "This admin dashboard is experimental and WIP, {adminFeLink}.",
-    "old_ui_link": "old admin UI available here",
-    "reset_all": "Reset all",
-    "commit_all": "Save all",
-    "tabs": {
-      "nodb": "No DB Config",
-      "instance": "Instance",
-      "limits": "Limits",
-      "frontends": "Front-ends"
-    },
-    "nodb": {
-      "heading": "Database config is disabled",
-      "text": "You need to change backend config files so that {property} is set to {value}, see more in {documentation}.",
-      "documentation": "documentation",
-      "text2": "Most configuration options will be unavailable."
-    },
-    "captcha": {
-      "native": "Native",
-      "kocaptcha": "KoCaptcha"
-    },
-    "instance": {
-      "instance": "Instance information",
-      "registrations": "User sign-ups",
-      "captcha_header": "CAPTCHA",
-      "kocaptcha": "KoCaptcha settings",
-      "access": "Instance access",
-      "restrict": {
-        "header": "Restrict access for anonymous visitors",
-        "description": "Detailed setting for allowing/disallowing access to certain aspects of API. By default (indeterminate state) it will disallow if instance is not public, ticked checkbox means disallow access even if instance is public, unticked means allow access even if instance is private. Please note that unexpected behavior might happen if some settings are set, i.e. if profile access is disabled posts will show without profile information.",
-        "timelines": "Timelines access",
-        "profiles": "User profiles access",
-        "activities": "Statues/activities access"
-      }
-    },
-    "limits": {
-      "arbitrary_limits": "Arbitrary limits",
-      "posts": "Post limits",
-      "uploads": "Attachments limits",
-      "users": "User profile limits",
-      "profile_fields": "Profile fields limits",
-      "user_uploads": "Profile media limits"
-    },
-    "frontend": {
-      "repository": "Repository link",
-      "versions": "Available versions",
-      "build_url": "Build URL",
-      "reinstall": "Reinstall",
-      "is_default": "(Default)",
-      "is_default_custom": "(Default, version: {version})",
-      "install": "Install",
-      "install_version": "Install version {version}",
-      "more_install_options": "More install options",
-      "more_default_options": "More default setting options",
-      "set_default": "Set default",
-      "set_default_version": "Set version {version} as default",
-      "wip_notice": "Please note that this section is a WIP and lacks certain features as backend implementation of front-end management is incomplete.",
-      "default_frontend": "Default front-end",
-      "default_frontend_tip": "Default front-end will be shown to all users. Currently there's no way to for a user to select personal front-end. If you switch away from PleromaFE you'll most likely have to use old and buggy AdminFE to do instance configuration until we replace it.",
-      "default_frontend_tip2": "WIP: Since Pleroma backend doesn't properly list all installed frontends you'll have to enter name and reference manually. List below provides shortcuts to fill the values.",
-      "available_frontends": "Available for install"
-    },
-    "temp_overrides": {
-      ":pleroma": {
-        ":instance": {
-          ":public": {
-            "label": "Instance is public",
-            "description": "Disabling this will make all API accessible only for logged-in users, this will make Public and Federated timelines inaccessible to anonymous visitors."
-          },
-          ":limit_to_local_content": {
-            "label": "Limit search to local content",
-            "description": "Disables global network search for unauthenticated (default), all users or none"
-          },
-          ":description_limit": {
-            "label": "Limit",
-            "description": "Character limit for attachment descriptions"
-          },
-          ":background_image": {
-            "label": "Background image",
-            "description": "Background image (primarily used by PleromaFE)"
-          }
-        }
-      }
-    }
-  },
-  "time": {
-    "unit": {
-      "days": "{0} day | {0} days",
-      "days_short": "{0}d",
-      "hours": "{0} hour | {0} hours",
-      "hours_short": "{0}h",
-      "minutes": "{0} minute | {0} minutes",
-      "minutes_short": "{0}min",
-      "months": "{0} month | {0} months",
-      "months_short": "{0}mo",
-      "seconds": "{0} second | {0} seconds",
-      "seconds_short": "{0}s",
-      "weeks": "{0} week | {0} weeks",
-      "weeks_short": "{0}w",
-      "years": "{0} year | {0} years",
-      "years_short": "{0}y"
-    },
-    "in_future": "in {0}",
-    "in_past": "{0} ago",
-    "now": "just now",
-    "now_short": "now"
-  },
-  "timeline": {
-    "collapse": "Collapse",
-    "conversation": "Conversation",
-    "error": "Error fetching timeline: {0}",
-    "load_older": "Load older statuses",
-    "no_retweet_hint": "Post is marked as followers-only or direct and cannot be repeated",
-    "repeated": "repeated",
-    "show_new": "Show new",
-    "reload": "Reload",
-    "up_to_date": "Up-to-date",
-    "no_more_statuses": "No more statuses",
-    "no_statuses": "No statuses",
-    "socket_reconnected": "Realtime connection established",
-    "socket_broke": "Realtime connection lost: CloseEvent code {0}",
-    "quick_view_settings": "Quick view settings",
-    "quick_filter_settings": "Quick filter settings"
-  },
-  "status": {
-    "favorites": "Favorites",
-    "repeats": "Repeats",
-    "repeat_confirm": "Do you really want to repeat this status?",
-    "repeat_confirm_title": "Repeat confirmation",
-    "repeat_confirm_accept_button": "Repeat",
-    "repeat_confirm_cancel_button": "Do not repeat",
-    "delete": "Delete status",
-    "delete_error": "Error deleting status: {0}",
-    "edit": "Edit status",
-    "edited_at": "(last edited {time})",
-    "pin": "Pin on profile",
-    "unpin": "Unpin from profile",
-    "pinned": "Pinned",
-    "bookmark": "Bookmark",
-    "unbookmark": "Unbookmark",
-    "delete_confirm": "Do you really want to delete this status?",
-    "delete_confirm_title": "Delete confirmation",
-    "delete_confirm_accept_button": "Delete",
-    "delete_confirm_cancel_button": "Keep",
-    "reply_to": "Reply to",
-    "mentions": "Mentions",
-    "replies_list": "Replies:",
-    "replies_list_with_others": "Replies (+{numReplies} other): | Replies (+{numReplies} others):",
-    "mute_conversation": "Mute conversation",
-    "unmute_conversation": "Unmute conversation",
-    "status_unavailable": "Status unavailable",
-    "copy_link": "Copy link to status",
-    "external_source": "External source",
-    "thread_muted": "Thread muted",
-    "thread_muted_and_words": ", has words:",
-    "show_full_subject": "Show full subject",
-    "hide_full_subject": "Hide full subject",
-    "show_content": "Show content",
-    "hide_content": "Hide content",
-    "status_deleted": "This post was deleted",
-    "nsfw": "NSFW",
-    "expand": "Expand",
-    "you": "(You)",
-    "plus_more": "+{number} more",
-    "many_attachments": "Post has {number} attachment(s)",
-    "collapse_attachments": "Collapse attachments",
-    "show_all_attachments": "Show all attachments",
-    "show_attachment_in_modal": "Show in media modal",
-    "show_attachment_description": "Preview description (open attachment for full description)",
-    "hide_attachment": "Hide attachment",
-    "remove_attachment": "Remove attachment",
-    "attachment_stop_flash": "Stop Flash player",
-    "move_up": "Shift attachment left",
-    "move_down": "Shift attachment right",
-    "open_gallery": "Open gallery",
-    "thread_hide": "Hide this thread",
-    "thread_show": "Show this thread",
-    "thread_show_full": "Show everything under this thread ({numStatus} status in total, max depth {depth}) | Show everything under this thread ({numStatus} statuses in total, max depth {depth})",
-    "thread_show_full_with_icon": "{icon} {text}",
-    "thread_follow": "See the remaining part of this thread ({numStatus} status in total) | See the remaining part of this thread ({numStatus} statuses in total)",
-    "thread_follow_with_icon": "{icon} {text}",
-    "ancestor_follow": "See {numReplies} other reply under this status | See {numReplies} other replies under this status",
-    "ancestor_follow_with_icon": "{icon} {text}",
-    "show_all_conversation_with_icon": "{icon} {text}",
-    "show_all_conversation": "Show full conversation ({numStatus} other status) | Show full conversation ({numStatus} other statuses)",
-    "show_only_conversation_under_this": "Only show replies to this status",
-    "status_history": "Status history",
-    "reaction_count_label": "{num} person reacted | {num} people reacted"
-  },
-  "user_card": {
-    "approve": "Approve",
-    "approve_confirm_title": "Approve confirmation",
-    "approve_confirm_accept_button": "Approve",
-    "approve_confirm_cancel_button": "Do not approve",
-    "approve_confirm": "Do you want to approve {user}'s follow request?",
-    "block": "Block",
-    "blocked": "Blocked!",
-    "block_confirm_title": "Block confirmation",
-    "block_confirm": "Do you really want to block {user}?",
-    "block_confirm_accept_button": "Block",
-    "block_confirm_cancel_button": "Do not block",
-    "deactivated": "Deactivated",
-    "deny": "Deny",
-    "deny_confirm_title": "Deny confirmation",
-    "deny_confirm_accept_button": "Deny",
-    "deny_confirm_cancel_button": "Do not deny",
-    "deny_confirm": "Do you want to deny {user}'s follow request?",
-    "edit_profile": "Edit profile",
-    "favorites": "Favorites",
-    "follow": "Follow",
-    "follow_cancel": "Cancel request",
-    "follow_sent": "Request sent!",
-    "follow_progress": "Requesting…",
-    "follow_unfollow": "Unfollow",
-    "unfollow_confirm_title": "Unfollow confirmation",
-    "unfollow_confirm": "Do you really want to unfollow {user}?",
-    "unfollow_confirm_accept_button": "Unfollow",
-    "unfollow_confirm_cancel_button": "Do not unfollow",
-    "followees": "Following",
-    "followers": "Followers",
-    "following": "Following!",
-    "follows_you": "Follows you!",
-    "hidden": "Hidden",
-    "its_you": "It's you!",
-    "media": "Media",
-    "mention": "Mention",
-    "message": "Message",
-    "mute": "Mute",
-    "muted": "Muted",
-    "mute_confirm_title": "Mute confirmation",
-    "mute_confirm": "Do you really want to mute {user}?",
-    "mute_confirm_accept_button": "Mute",
-    "mute_confirm_cancel_button": "Do not mute",
-    "mute_duration_prompt": "Mute this user for (0 for indefinite time):",
-    "per_day": "per day",
-    "remote_follow": "Remote follow",
-    "remove_follower": "Remove follower",
-    "remove_follower_confirm_title": "Remove follower confirmation",
-    "remove_follower_confirm_accept_button": "Remove",
-    "remove_follower_confirm_cancel_button": "Keep",
-    "remove_follower_confirm": "Do you really want to remove {user} from your followers?",
-    "report": "Report",
-    "statuses": "Statuses",
-    "subscribe": "Subscribe",
-    "unsubscribe": "Unsubscribe",
-    "unblock": "Unblock",
-    "unblock_progress": "Unblocking…",
-    "block_progress": "Blocking…",
-    "unmute": "Unmute",
-    "unmute_progress": "Unmuting…",
-    "mute_progress": "Muting…",
-    "hide_repeats": "Hide repeats",
-    "show_repeats": "Show repeats",
-    "bot": "Bot",
-    "birthday": "Born {birthday}",
-    "admin_menu": {
-      "moderation": "Moderation",
-      "grant_admin": "Grant Admin",
-      "revoke_admin": "Revoke Admin",
-      "grant_moderator": "Grant Moderator",
-      "revoke_moderator": "Revoke Moderator",
-      "activate_account": "Activate account",
-      "deactivate_account": "Deactivate account",
-      "delete_account": "Delete account",
-      "force_nsfw": "Mark all posts as NSFW",
-      "strip_media": "Remove media from posts",
-      "force_unlisted": "Force posts to be unlisted",
-      "sandbox": "Force posts to be followers-only",
-      "disable_remote_subscription": "Disallow following user from remote instances",
-      "disable_any_subscription": "Disallow following user at all",
-      "quarantine": "Disallow user posts from federating",
-      "delete_user": "Delete user",
-      "delete_user_data_and_deactivate_confirmation": "This will permanently delete the data from this account and deactivate it. Are you absolutely sure?"
-    },
-    "highlight": {
-      "disabled": "No highlight",
-      "solid": "Solid bg",
-      "striped": "Striped bg",
-      "side": "Side stripe"
-    },
-    "note": "Note",
-    "note_blank": "(None)",
-    "edit_note": "Edit note",
-    "edit_note_apply": "Apply",
-    "edit_note_cancel": "Cancel"
-  },
-  "user_profile": {
-    "timeline_title": "User timeline",
-    "profile_does_not_exist": "Sorry, this profile does not exist.",
-    "profile_loading_error": "Sorry, there was an error loading this profile."
-  },
-  "user_reporting": {
-    "title": "Reporting {0}",
-    "add_comment_description": "The report will be sent to your instance moderators. You can provide an explanation of why you are reporting this account below:",
-    "additional_comments": "Additional comments",
-    "forward_description": "The account is from another server. Send a copy of the report there as well?",
-    "forward_to": "Forward to {0}",
-    "submit": "Submit",
-    "generic_error": "An error occurred while processing your request."
-  },
-  "who_to_follow": {
-    "more": "More",
-    "who_to_follow": "Who to follow"
-  },
-  "tool_tip": {
-    "media_upload": "Upload media",
-    "repeat": "Repeat",
-    "reply": "Reply",
-    "favorite": "Favorite",
-    "add_reaction": "Add Reaction",
-    "user_settings": "User Settings",
-    "accept_follow_request": "Accept follow request",
-    "reject_follow_request": "Reject follow request",
-    "bookmark": "Bookmark",
-    "toggle_expand": "Expand or collapse notification to show post in full",
-    "toggle_mute": "Expand or collapse notification to reveal muted content",
-    "autocomplete_available": "{number} result is available. Use up and down keys to navigate through them. | {number} results are available. Use up and down keys to navigate through them."
-  },
-  "upload": {
-    "error": {
-      "base": "上傳 ê 時失敗。",
-      "message": "傳 buē 起去：{0}",
-      "file_too_big": "檔案 sài-suh 傷大 [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
-      "default": "Koh 試一 kái。"
-    },
-    "file_size_units": {
-      "B": "B",
-      "KiB": "KiB",
-      "MiB": "MiB",
-      "GiB": "GiB",
-      "TiB": "TiB"
-    }
-  },
-  "search": {
-    "people": "用戶",
-    "hashtags": "主題標籤",
-    "person_talking": "{count} ê leh 論",
-    "people_talking": "{count} ê leh 論",
-    "no_results": "無半 ê 結果",
-    "no_more_results": "無其他 ê 結果",
-    "load_more": "載入 koh 較 tsē 結果"
-  },
-  "password_reset": {
-    "forgot_password": "Buē 記得密碼？",
-    "password_reset": "重頭設密碼",
-    "instruction": "拍 lí ê email 地址 iah 是用者 ê 名。Guán 會送 lí 連結，重頭設定密碼。",
-    "placeholder": "Lí ê email 地址 iah 是用者 ê 名。",
-    "check_email": "檢查電子 phue 箱，看有重頭設密碼 ê 連結無。",
-    "return_home": "轉來頭頁",
-    "too_many_requests": "Lí kā 請求 ê khòo-tah 用了 ah。等一時仔，閣試一 pái。",
-    "password_reset_disabled": "密碼重頭設定無開放。請聯絡本站 ê 行政員。",
-    "password_reset_required": "Beh 登入，著重頭設 lí ê 密碼。",
-    "password_reset_required_but_mailer_is_disabled": "Lí 需要重頭設密碼，毋 koh tsia 無開放密碼 koh 再設定。請聯絡本站 ê 行政員。"
-  },
-  "chats": {
-    "you": "Lí：",
-    "message_user": "傳私人 phue：{nickname}",
-    "delete": "Thâi 掉",
-    "chats": "開講",
-    "new": "發起開講",
-    "empty_message_error": "無法度 PO 空 ê phue",
-    "more": "Koh較濟……",
-    "delete_confirm": "Lí 敢真 ê beh thâi tsit 張 phue？",
-    "error_loading_chat": "載入開講 ê 時，出箠 ah。",
-    "error_sending_message": "送 phue ê 時，出箠 ah。",
-    "empty_chat_list_placeholder": "Lí 猶無佇 tsia 開講過，來開講 lah！"
-  },
-  "lists": {
-    "lists": "列單",
-    "new": "新 ê 列單",
-    "title": "列單標題",
-    "search": "Tshuē 用者",
-    "create": "開新 ê",
-    "save": "保存改變",
-    "delete": "刣列單",
-    "following_only": "限定 lí 所關注 ê",
-    "manage_lists": "管理列單",
-    "manage_members": "管理列單成員",
-    "add_members": "Tshiau 閣較 tsē ê 用者",
-    "remove_from_list": "對列單刣掉",
-    "add_to_list": "加入去列單",
-    "is_in_list": "列單已經有 ah ",
-    "editing_list": "編輯列單 {listTitle}",
-    "creating_list": "開新 ê 列單",
-    "update_title": "保存標題",
-    "really_delete": "敢真正 beh 刣掉列單？",
-    "error": "操作列單 ê 時陣出重耽：{0}"
-  },
-  "file_type": {
-    "audio": "音訊",
-    "video": "影片",
-    "image": "影像",
-    "file": "檔案"
-  },
-  "display_date": {
-    "today": "今 á 日"
-  },
-  "update": {
-    "big_update_title": "敬請體諒",
-    "big_update_content": "因為 guán 有一站 á 無發行新版本，所以這个版本會 kap lí 以早慣 sì ê 無仝。",
-    "update_bugs": "請佇 {pleromaGitlab} 報告任何問題 kap bug，因為 Pleroma 改變真 tsē。雖罔 guán 徹底 leh 試，mā 家 kī 用開發版，伊凡勢有一寡重耽。Guán 歡迎 lín 提供關係所拄著 ê 問題 ê 意見、建議，或者是改進 Pleroma kap Pleroma-FE ê 法度。",
-    "update_bugs_gitlab": "Pleroma GitLab",
-    "update_changelog": "Nā beh 知影改變 ê 詳細，請看：{theFullChangelog}.",
-    "update_changelog_here": "Kui ê 改變日誌",
-    "art_by": "美編：{linkToArtist}"
-  },
-  "unicode_domain_indicator": {
-    "tooltip": "這 ê 域名包含毋是 ascii ê 字元。"
-  }
+	"about": {
+		"mrf": {
+			"federation": "聯邦",
+			"keyword": {
+				"keyword_policies": "關鍵字政策",
+				"ftl_removal": "Tuì「知影 ê 網路」時間線除掉。",
+				"reject": "拒絕",
+				"replace": "取代"
+
+			},
+			"mrf_policies": "啟用 ê MRF 政策",
+			"mrf_policies_desc": "MRF 政策操作本站 ê 對外通信行為。以下ê政策啟用 ah：",
+			"simple": {
+				"simple_policies": "站臺特有 ê 政策",
+				"instance": "站",
+				"reason": "理由",
+
+				"accept": "接受",
+				"accept_desc": "本站干焦接受下跤 ê 站 ê 短 phue：",
+				"reject": "拒絕",
+				"reject_desc": "本站 buē 接受 tuì 以下 ê 站 ê 短 phue：",
+				"quarantine": "隔離",
+				"quarantine_desc": "針對下跤 ê 站，本站干焦送出公開ê PO文：",
+				"ftl_removal": "Tuì「知影 ê 網路」時間線thâi掉",
+				"ftl_removal_desc": "本站buē 佇「知影 ê 網路」刊下跤 ê 站 ê PO文：",
+				"media_removal": "Thâi除媒體",
+				"media_removal_desc": "本站 kā 下跤 ê 站臺送 ê PO文 ê 媒體 lóng thâi 除：",
+				"media_nsfw": "媒體 lóng 標做「敏感內容」",
+				"media_nsfw_desc": "本站 kā 下跤 ê 站 ê 媒體，lóng 標做敏感內容："
+			}
+		},
+		"staff": "工作人員"
+	},
+	"announcements": {
+		"page_header": "公告",
+		"title": "公告",
+		"mark_as_read_action": "標做有讀",
+		"post_form_header": "貼公告",
+		"post_placeholder": "佇 tsia 拍你 ê 公告……",
+		"post_action": "貼",
+		"post_error": "錯誤：{error}",
+		"close_error": "關",
+
+		"start_time_prompt": "開始時間： ",
+		"end_time_prompt": "結束時間：",
+		"all_day_prompt": "Tse 是 kui 工 ê 事件",
+		"published_time_display": "公告佇 {time}",
+		"start_time_display": "有效 tuì：{time}",
+		"end_time_display": "中止佇：{time}",
+		"edit_action": "編輯",
+		"submit_edit_action": "送出",
+		"cancel_edit_action": "取消",
+		"inactive_message": "這个公告 tsit-má 無效力。"
+	},
+	"shoutbox": {
+		"title": "留話枋"
+	},
+	"domain_mute_card": {
+		"mute": "予恬去",
+		"mute_progress": "Teh 予恬……",
+		"unmute": "予有聲",
+		"unmute_progress": "Teh 予有聲……"
+	},
+	"exporter": {
+		"export": "匯出",
+		"processing": "Teh 處理，較停仔指示你下載檔案……"
+	},
+	"features_panel": {
+		"shout": "留話枋",
+		"pleroma_chat_messages": "Pleroma 開講",
+
+		"media_proxy": "媒體代理伺侯器",
+		"scope_options": "公開範圍選項",
+		"text_limit": "字數限制",
+		"title": "有效 ê 功能",
+		"who_to_follow": "啥儂通綴",
+		"upload_limit": "檔案 sài-suh 限制"
+	},
+	"finder": {
+		"error_fetching_user": "Tshuē 用者 ê 時起錯誤",
+		"find_user": "Tshuē 用者"
+	},
+	"general": {
+		"apply": "應用",
+		"submit": "送出",
+		"more": "Koh 較 tsē",
+		"loading": "Leh 載入……",
+		"generic_error": "起錯誤 ah",
+		"generic_error_message": "起錯誤：{0}",
+		"error_retry": "請 koh 試一 kái",
+		"retry": "Koh 試",
+		"optional": "非必要",
+		"show_more": "展示較 tsē",
+		"show_less": "展示較少",
+		"never_show_again": "Mài koh 展示",
+		"dismiss": "無視",
+		"cancel": "取消",
+		"disable": "無愛用",
+		"enable": "啟用",
+		"confirm": "確認",
+		"verify": "驗證",
+		"close": "關掉",
+		"undo": "復原",
+		"yes": "是",
+		"no": "毋是",
+		"peek": "先看 māi",
+		"scroll_to_top": "捲 kàu 頂懸",
+		"role": {
+			"admin": "行政員",
+			"moderator": "管理員"
+		},
+		"unpin": "無愛 kā 釘",
+		"pin": "Kā釘起來",
+		"flash_content": "Ji̍h tsia，用 Ruffle（iáu teh 試驗，可能 buē 紡）看 Flash ê 內容。",
+		"flash_sepcurity": "注意 tse 可能有危險，因為 Flash 內容猶原是任意 ê 程式碼。",
+		"flash_fail": "載入 flash 內容失敗，詳細會當看控制臺。",
+		"scope_in_timeline": {
+			"direct": "私人 phue",
+			"private": "干焦 hōo 綴 lí ê 看",
+			"public": "公開佇公共時間線",
+			"unlisted": "無愛公開佇公共時間線"
+		}
+	},
+	"image_cropper": {
+		"crop_picture": "裁相片",
+		"save": "儲存",
+		"save_without_cropping": "無裁就儲存",
+		"cancel": "取消"
+	},
+	"importer": {
+		"submit": "送出",
+		"success": "匯入成功。",
+		"error": "佇匯入 ê 時起錯誤。"
+	},
+	"login": {
+		"login": "登入",
+		"description": "用 OAuth 登入",
+		"logout": "登出",
+		"logout_confirm_title": "登出確認",
+		"logout_confirm": "Lí　敢真正　beh　登出？",
+		"logout_confirm_accept_button": "登出",
+		"logout_confirm_cancel_button": "mài 登出",
+		"password": "密碼",
+		"placeholder": "例：lain",
+		"register": "註冊",
+		"username": "用者 ê 名",
+		"hint": "登入，參與討論",
+		"authentication_code": "認證碼",
+		"enter_recovery_code": "輸入恢復碼",
+		"enter_two_factor_code": "輸入兩階段認證碼",
+		"recovery_code": "恢復碼",
+		"heading": {
+			"totp": "兩階段認證",
+			"recovery": "兩階段恢復"
+		}
+	},
+	"media_modal": {
+		"previous": "頂一　ê",
+		"next": "後一个",
+		"counter": "{current} / {total}",
+		"hide": "關掉媒體瀏覽"
+	},
+	"nav": {
+		"about": "有關……",
+		"administration": "管理",
+		"back": "轉去",
+		"friend_requests": "跟綴請求",
+		"mentions": "The̍h起",
+		"interactions": "互動",
+		"dms": "私人 phue",
+		"public_tl": "公共時間線",
+		"timeline": "時間線",
+		"home_timeline": "厝 ê 時間線",
+		"twkn": "知影 ê 網路",
+		"bookmarks": "冊籤",
+		"user_search": "Tshuē 用者",
+
+		"search_close": "關掉 tshiau-tshuē liâu",
+		"who_to_follow": "Siáng 會當綴？",
+		"preferences": "個人 ê 設定",
+		"timelines": "時間流",
+		"chats": "開講",
+		"lists": "列單",
+		"edit_nav_mobile": "自訂導覽條",
+		"edit_pinned": "編輯釘起來 ê 項目",
+		"edit_finish": "編輯 suah",
+		"mobile_sidebar": "切換行動版 ê 邊 á liâu",
+		"mobile_notifications": "拍開通知（有無讀ê）",
+		"mobile_notifications_close": "關掉通知",
+		"announcements": "公告"
+	},
+	"notifications": {
+		"broken_favorite": "狀態毋知影，leh tshiau-tshuē……",
+		"error": "佇取得通知 ê 時起錯誤：{0}",
+		"favorited_you": "kah 意 lí ê 狀態",
+		"followed_you": "綴 lí",
+		"follow_request": "想 beh 綴 lí",
+		"load_older": "載入 khah 早 ê 通知",
+		"notifications": "通知",
+		"read": "讀！",
+		"repeated_you": "轉送 lí ê 狀態",
+		"no_more_notifications": "無別 ê 通知",
+		"migrated_to": "移民到",
+		"reacted_with": "顯出{0} ê 反應",
+		"submitted_report": "送出檢舉",
+		"poll_ended": "投票結束"
+	},
+	"polls": {
+		"add_poll": "開投票",
+		"add_option": "加選項",
+		"option": "選項",
+		"votes": "票",
+		"people_voted_count": "{count} 位有投",
+		"votes_count": "{count} 票",
+		"vote": "投票",
+		"type": "投票 ê 形式",
+		"single_choice": "孤選",
+		"multiple_choices": "Tsē 選",
+		"expiry": "投票期限",
+		"expires_in": "投票 tī {0} 以後結束",
+		"expired": "投票佇 {0} 以前結束",
+		"not_enough_options": "投票 ê 選項傷少。"
+	},
+	"emoji": {
+		"stickers": "貼圖",
+		"emoji": "繪文字",
+		"keep_open": "Hōo 揀選仔開 leh",
+		"search_emoji": "Tshuē 繪文字",
+		"add_emoji": "插繪文字",
+		"custom": "定製 ê 繪文字",
+		"unpacked": "拍開 ê 繪文字",
+		"unicode": "Unicode 繪文字",
+		"unicode_groups": {
+			"activities": "活動",
+			"animals-and-nature": "動物 kap 自然",
+			"flags": "旗 á",
+			"food-and-drink": "食物 kap 飲料",
+			"objects": "物體",
+			"people-and-body": "Lâng kap 身軀",
+			"smileys-and-emotion": "笑面 kap 情緒",
+			"symbols": "符號",
+			"travel-and-places": "旅遊 kap 所在"
+		},
+		"load_all_hint": "載入頭前 {saneAmount} ê 繪文字，規个攏載入效能可能 ē khah 食力。",
+		"load_all": "Kā {emojiAmount} ê 繪文字攏載入",
+		"regional_indicator": "地區指引 {letter}"
+	},
+	"errors": {
+		"storage_unavailable": "Pleroma buē-tàng the̍h 著瀏覽器儲存 ê。Lí ê 登入狀態抑是局部設定 buē 儲存，mā 凡勢 tú 著意料外 ê 問題。拍開 cookie 看覓。"
+	},
+	"interactions": {
+		"favs_repeats": "轉送 kap kah 意",
+		"follows": "最近綴 lí ê",
+		"emoji_reactions": "繪文字 ê 回應",
+		"reports": "檢舉",
+		"moves": "用者 ê 移民",
+		"load_older": "載入 koh khah 早 ê 互動"
+	},
+	"post_status": {
+		"edit_status": "編輯狀態",
+		"new_status": "PO 新 ê 狀態",
+		"account_not_locked_warning": "Lín 口座毋是 {0} ê。見 nā 有 lâng 綴--lí，ē-tàng 看著 lí ê 限定跟綴者 ê PO 文。.",
+		"account_not_locked_warning_link": "鎖起來 ê 口座",
+		"attachments_sensitive": "Kā 附件標做敏感內容。",
+		"media_description": "媒體說明",
+		"content_type": {
+			"text/plain": "純 ê 文字"
+
+		},
+		"content_type_selection": "貼 ê 形式",
+		"content_warning": "主旨（毋是必要）",
+		"default": "Tú 正 kàu 高雄 ah。",
+		"direct_warning_to_all": "Tsit ê PO 文通 hōo 逐 ê 提起 ê 用者看見。",
+		"direct_warning_to_first_only": "Tsit ê PO 文，kan-ta 短信 tú 開始提起 ê 用者，tsiah 通看見。",
+		"edit_remote_warning": "別 ê 站臺可能無支援編輯，無法度收著 PO 文上新 ê 版本。",
+		"edit_unsupported_warning": "Pleroma 無支持編輯 the̍h 起 hām 投票。",
+		"posting": "PO 文",
+
+		"preview": "Sing 看覓",
+		"preview_empty": "空 ê",
+		"empty_status_error": "無法度 PO 無檔案 koh 空 ê 狀態。",
+		"media_description_error": "更新媒體失敗，請 koh 試一 kái。",
+		"scope_notice": {
+			"public": "Tsit ê PO 文通予逐 ê 儂看著。",
+			"private": "Tsit ê PO 文 kan-ta 予綴 lí ê 看著。",
+			"unlisted": "Tsit ê PO 文 buē 公開 tī 公共時間線 kap 知影 ê 網路。"
+		},
+		"scope_notice_dismiss": "關掉 tsit ê 通知",
+		"scope": {
+			"direct": "私人 phue - PO 文干焦予提起 ê 用者看著",
+			"private": "限定綴 ê 儂 - PO 文干焦予綴 lí ê 儂看著",
+			"public": "公開 - PO kàu 公開時間線",
+			"unlisted": "Mài 列出來 - Mài PO tī 公開時間線。"
+		}
+	},
+	"registration": {
+		"bio_optional": "介紹（毋是必要）",
+
+		"email_optional": "Email（毋是必要）",
+		"fullname": "顯示 ê 名",
+		"password_confirm": "確認密碼",
+		"registration": "註冊",
+		"token": "邀請碼",
+		"captcha": "驗證碼",
+		"new_captcha": "Ji̍h 圖片，the̍h 新 ê 驗證碼",
+
+		"fullname_placeholder": "e.g. 岩倉 Lain",
+		"bio_placeholder": "e.g.\nLí 好，我是 Lain。我是日本動畫 ê 角色，tuà tī 日本 ê 郊區。Lí 凡勢 bat tī Wired 知影我。",
+		"reason": "註冊 ê 理由",
+		"reason_placeholder": "本站靠人工審核註冊。\n介紹管理者 lí beh tī tsia 註冊 ê 理由。",
+		"register": "註冊",
+		"validations": {
+			"username_required": "著愛添",
+			"fullname_required": "著愛添",
+			"email_required": "著愛添",
+			"password_required": "著愛添",
+			"password_confirmation_required": "著愛添",
+			"password_confirmation_match": "密碼著相 kâng",
+			"birthday_required": "著愛添",
+			"birthday_min_age": "Buē-tàng tī {date} 以後"
+		},
+		"email_language": "Lí想 beh 服侍器用 siánn 物語言寄批 hōo lí？",
+		"birthday": "生日",
+		"birthday_optional": "生日（毋是必要）："
+	},
+	"remote_user_resolver": {
+		"remote_user_resolver": "別站用者 ê 解析器",
+
+		"error": "Tshuē無"
+	},
+	"report": {
+		"reporter": "檢舉人：",
+		"reported_user": "Beh 檢舉 ê 用者：",
+		"reported_statuses": "Beh 檢舉 ê 狀態：",
+
+		"state_open": "開 ê",
+		"state_closed": "關 ê",
+		"state_resolved": "解決了 ê"
+	},
+	"selectable_list": {
+		"select_all": "攏總揀"
+	},
+	"settings": {
+		"add_language": "加一 ê 備用 ê 語言",
+		"remove_language": "Ni 掉",
+		"primary_language": "主要語言：",
+		"fallback_language": "備用語言 {index}：",
+		"app_name": "App ê 名",
+		"expert_mode": "進階模式",
+		"save": "保存改變",
+		"security": "安全",
+		"setting_changed": "設定 kap 預先 ê 有 tsing 差",
+
+		"style": {
+
+			"common": {
+				"color": "色彩",
+				"opacity": "無透明度",
+				"contrast": {
+					"hint": "Contrast ratio is {ratio}, it {level} {context}"
+				}
+			}
+
+		},
+
+
+		"upload": {
+			"error": {
+				"base": "上傳 ê 時失敗。",
+				"message": "傳 buē 起去：{0}",
+				"file_too_big": "檔案 sài-suh 傷大 [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
+				"default": "Koh 試一 kái。"
+			},
+			"file_size_units": {}
+		},
+		"search": {
+			"people": "用戶",
+			"hashtags": "主題標籤",
+			"person_talking": "{count} ê leh 論",
+			"people_talking": "{count} ê leh 論",
+			"no_results": "無半 ê 結果",
+			"no_more_results": "無其他 ê 結果",
+			"load_more": "載入 koh 較 tsē 結果"
+		},
+		"password_reset": {
+			"forgot_password": "Buē 記得密碼？",
+			"password_reset": "重頭設密碼",
+			"instruction": "拍 lí ê email 地址 iah 是用者 ê 名。Guán 會送 lí 連結，重頭設定密碼。",
+			"placeholder": "Lí ê email 地址 iah 是用者 ê 名。",
+			"check_email": "檢查電子 phue 箱，看有重頭設密碼 ê 連結無。",
+			"return_home": "轉來頭頁",
+			"too_many_requests": "Lí kā 請求 ê khòo-tah 用了 ah。等一時仔，閣試一 pái。",
+			"password_reset_disabled": "密碼重頭設定無開放。請聯絡本站 ê 行政員。",
+			"password_reset_required": "Beh 登入，著重頭設 lí ê 密碼。",
+			"password_reset_required_but_mailer_is_disabled": "Lí 需要重頭設密碼，毋 koh tsia 無開放密碼 koh 再設定。請聯絡本站 ê 行政員。"
+		},
+		"chats": {
+
+			"message_user": "傳私人 phue：{nickname}",
+			"delete": "Thâi 掉",
+			"chats": "開講",
+			"new": "發起開講",
+			"empty_message_error": "無法度 PO 空 ê phue",
+			"more": "Koh較濟……",
+			"delete_confirm": "Lí 敢真 ê beh thâi tsit 張 phue？",
+			"error_loading_chat": "載入開講 ê 時，出箠 ah。",
+			"error_sending_message": "送 phue ê 時，出箠 ah。",
+			"empty_chat_list_placeholder": "Lí 猶無佇 tsia 開講過，來開講 lah！"
+		},
+		"lists": {
+			"lists": "列單",
+			"new": "新 ê 列單",
+			"title": "列單標題",
+			"search": "Tshuē 用者",
+			"create": "開新 ê",
+			"save": "保存改變",
+			"delete": "刣列單",
+			"following_only": "限定 lí 所關注 ê",
+			"manage_lists": "管理列單",
+			"manage_members": "管理列單成員",
+			"add_members": "Tshiau 閣較 tsē ê 用者",
+			"remove_from_list": "對列單刣掉",
+			"add_to_list": "加入去列單",
+			"is_in_list": "列單已經有 ah ",
+			"editing_list": "編輯列單 {listTitle}",
+			"creating_list": "開新 ê 列單",
+			"update_title": "保存標題",
+			"really_delete": "敢真正 beh 刣掉列單？",
+			"error": "操作列單 ê 時陣出重耽：{0}"
+		},
+		"file_type": {
+			"audio": "音訊",
+			"video": "影片",
+			"image": "影像",
+			"file": "檔案"
+		},
+		"display_date": {
+			"today": "今 á 日"
+		},
+		"update": {
+			"big_update_title": "敬請體諒",
+			"big_update_content": "因為 guán 有一站 á 無發行新版本，所以這个版本會 kap lí 以早慣 sì ê 無仝。",
+			"update_bugs": "請佇 {pleromaGitlab} 報告任何問題 kap bug，因為 Pleroma 改變真 tsē。雖罔 guán 徹底 leh 試，mā 家 kī 用開發版，伊凡勢有一寡重耽。Guán 歡迎 lín 提供關係所拄著 ê 問題 ê 意見、建議，或者是改進 Pleroma kap Pleroma-FE ê 法度。",
+
+			"update_changelog": "Nā beh 知影改變 ê 詳細，請看：{theFullChangelog}.",
+			"update_changelog_here": "Kui ê 改變日誌",
+			"art_by": "美編：{linkToArtist}"
+		},
+		"unicode_domain_indicator": {
+			"tooltip": "這 ê 域名包含毋是 ascii ê 字元。"
+		}
+	}
 }
-- 
cgit v1.2.3-70-g09d2


From 8cc6b213fb3581caa77637a45ee60ee20268218a Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Thu, 29 Jun 2023 10:27:02 -0400
Subject: Fix react button misalignment on safari ios

---
 changelog.d/react-button-safari.fix                | 1 +
 src/components/emoji_reactions/emoji_reactions.vue | 2 ++
 2 files changed, 3 insertions(+)
 create mode 100644 changelog.d/react-button-safari.fix

(limited to 'src')

diff --git a/changelog.d/react-button-safari.fix b/changelog.d/react-button-safari.fix
new file mode 100644
index 00000000..9846d50d
--- /dev/null
+++ b/changelog.d/react-button-safari.fix
@@ -0,0 +1 @@
+Fix react button misalignment on safari ios
diff --git a/src/components/emoji_reactions/emoji_reactions.vue b/src/components/emoji_reactions/emoji_reactions.vue
index 92fc58ca..c11b338e 100644
--- a/src/components/emoji_reactions/emoji_reactions.vue
+++ b/src/components/emoji_reactions/emoji_reactions.vue
@@ -93,6 +93,7 @@
 
       .emoji-reaction-count-button {
         background-color: var(--btn);
+        margin: 0;
         height: 100%;
         border-top-left-radius: 0;
         border-bottom-left-radius: 0;
@@ -120,6 +121,7 @@
     box-sizing: border-box;
     border-top-right-radius: 0;
     border-bottom-right-radius: 0;
+    margin: 0;
 
     .reaction-emoji {
       width: var(--emoji-size);
-- 
cgit v1.2.3-70-g09d2


From 09402e2537e0c43c52bd8345301885647e841ed1 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Thu, 29 Jun 2023 11:31:07 -0400
Subject: Fix scrolling emoji selector in modal in safari ios

---
 changelog.d/scroll-emoji-selector-safari.fix | 1 +
 src/components/emoji_picker/emoji_picker.js  | 4 ++++
 src/components/emoji_picker/emoji_picker.vue | 2 ++
 3 files changed, 7 insertions(+)
 create mode 100644 changelog.d/scroll-emoji-selector-safari.fix

(limited to 'src')

diff --git a/changelog.d/scroll-emoji-selector-safari.fix b/changelog.d/scroll-emoji-selector-safari.fix
new file mode 100644
index 00000000..3f5dda7d
--- /dev/null
+++ b/changelog.d/scroll-emoji-selector-safari.fix
@@ -0,0 +1 @@
+Fix scrolling emoji selector in modal in safari ios
diff --git a/src/components/emoji_picker/emoji_picker.js b/src/components/emoji_picker/emoji_picker.js
index 349b043d..30c01aa5 100644
--- a/src/components/emoji_picker/emoji_picker.js
+++ b/src/components/emoji_picker/emoji_picker.js
@@ -105,6 +105,7 @@ const EmojiPicker = {
       default: false
     }
   },
+  inject: ['popoversZLayer'],
   data () {
     return {
       keyword: '',
@@ -350,6 +351,9 @@ const EmojiPicker = {
 
         return emoji.displayText
       }
+    },
+    isInModal () {
+      return this.popoversZLayer === 'modals'
     }
   }
 }
diff --git a/src/components/emoji_picker/emoji_picker.vue b/src/components/emoji_picker/emoji_picker.vue
index 6972164b..3e77d523 100644
--- a/src/components/emoji_picker/emoji_picker.vue
+++ b/src/components/emoji_picker/emoji_picker.vue
@@ -12,6 +12,7 @@
         <span
           ref="header"
           class="emoji-tabs"
+          v-body-scroll-lock="isInModal"
         >
           <span
             v-for="group in filteredEmojiGroups"
@@ -78,6 +79,7 @@
           <DynamicScroller
             ref="emoji-groups"
             class="emoji-groups"
+            v-body-scroll-lock="isInModal"
             :class="groupsScrolledClass"
             :min-item-size="minItemSize"
             :items="emojiItems"
-- 
cgit v1.2.3-70-g09d2


From bf5bd4235d9de636566ba804580136cfd58980a0 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Thu, 29 Jun 2023 11:40:33 -0400
Subject: Comment the v-body-scroll-lock usage in code

---
 src/components/emoji_picker/emoji_picker.vue | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src')

diff --git a/src/components/emoji_picker/emoji_picker.vue b/src/components/emoji_picker/emoji_picker.vue
index 3e77d523..aacd7a22 100644
--- a/src/components/emoji_picker/emoji_picker.vue
+++ b/src/components/emoji_picker/emoji_picker.vue
@@ -12,6 +12,11 @@
         <span
           ref="header"
           class="emoji-tabs"
+          <!--
+            Body scroll lock needs to be on every scrollable element on safari iOS.
+            Here we tell it to enable scrolling for this element.
+            See https://github.com/willmcpo/body-scroll-lock#vanilla-js
+          -->
           v-body-scroll-lock="isInModal"
         >
           <span
@@ -79,6 +84,7 @@
           <DynamicScroller
             ref="emoji-groups"
             class="emoji-groups"
+            <!-- Enables scrolling for this element on safari iOS. See comments for header. -->
             v-body-scroll-lock="isInModal"
             :class="groupsScrolledClass"
             :min-item-size="minItemSize"
-- 
cgit v1.2.3-70-g09d2


From 9fa0c05b35d175a8186899ec46933bf437a2444c Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Thu, 29 Jun 2023 11:43:49 -0400
Subject: Fix lint

---
 src/components/emoji_picker/emoji_picker.vue | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/components/emoji_picker/emoji_picker.vue b/src/components/emoji_picker/emoji_picker.vue
index aacd7a22..227d7718 100644
--- a/src/components/emoji_picker/emoji_picker.vue
+++ b/src/components/emoji_picker/emoji_picker.vue
@@ -9,15 +9,15 @@
   >
     <template #content>
       <div class="heading">
+        <!--
+          Body scroll lock needs to be on every scrollable element on safari iOS.
+          Here we tell it to enable scrolling for this element.
+          See https://github.com/willmcpo/body-scroll-lock#vanilla-js
+        -->
         <span
           ref="header"
-          class="emoji-tabs"
-          <!--
-            Body scroll lock needs to be on every scrollable element on safari iOS.
-            Here we tell it to enable scrolling for this element.
-            See https://github.com/willmcpo/body-scroll-lock#vanilla-js
-          -->
           v-body-scroll-lock="isInModal"
+          class="emoji-tabs"
         >
           <span
             v-for="group in filteredEmojiGroups"
@@ -81,11 +81,11 @@
               @input="$event.target.composing = false"
             >
           </div>
+          <!-- Enables scrolling for this element on safari iOS. See comments for header. -->
           <DynamicScroller
             ref="emoji-groups"
-            class="emoji-groups"
-            <!-- Enables scrolling for this element on safari iOS. See comments for header. -->
             v-body-scroll-lock="isInModal"
+            class="emoji-groups"
             :class="groupsScrolledClass"
             :min-item-size="minItemSize"
             :items="emojiItems"
-- 
cgit v1.2.3-70-g09d2


From e57a186b23d164b01ae8aedc5b351dfe212436d1 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Sat, 24 Jun 2023 03:17:35 +0000
Subject: Translated using Weblate (Chinese (Simplified))

Currently translated at 93.3% (984 of 1054 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hans/
---
 src/i18n/zh.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/i18n/zh.json b/src/i18n/zh.json
index 8ea4c1e0..e91e576c 100644
--- a/src/i18n/zh.json
+++ b/src/i18n/zh.json
@@ -1063,7 +1063,7 @@
       "smileys-and-emotion": "表情与情感"
     },
     "regional_indicator": "地区指示符 {letter}",
-    "unpacked": "拆分的表情符号"
+    "unpacked": "未分组的表情符号"
   },
   "about": {
     "mrf": {
-- 
cgit v1.2.3-70-g09d2


From 91bddb72185495cb37712988d24c1030807e0786 Mon Sep 17 00:00:00 2001
From: Kian-ting Tan <chenjt30@gmail.com>
Date: Fri, 23 Jun 2023 01:43:34 +0000
Subject: Translated using Weblate (Chinese (Min Nan) (nan_TW))

Currently translated at 33.0% (348 of 1054 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/nan_TW/
---
 src/i18n/nan-TW.json | 965 +++++++++++++++++++++++++++------------------------
 1 file changed, 513 insertions(+), 452 deletions(-)

(limited to 'src')

diff --git a/src/i18n/nan-TW.json b/src/i18n/nan-TW.json
index 68daebbb..b09509c4 100644
--- a/src/i18n/nan-TW.json
+++ b/src/i18n/nan-TW.json
@@ -1,454 +1,515 @@
 {
-	"about": {
-		"mrf": {
-			"federation": "聯邦",
-			"keyword": {
-				"keyword_policies": "關鍵字政策",
-				"ftl_removal": "Tuì「知影 ê 網路」時間線除掉。",
-				"reject": "拒絕",
-				"replace": "取代"
-
-			},
-			"mrf_policies": "啟用 ê MRF 政策",
-			"mrf_policies_desc": "MRF 政策操作本站 ê 對外通信行為。以下ê政策啟用 ah：",
-			"simple": {
-				"simple_policies": "站臺特有 ê 政策",
-				"instance": "站",
-				"reason": "理由",
-
-				"accept": "接受",
-				"accept_desc": "本站干焦接受下跤 ê 站 ê 短 phue：",
-				"reject": "拒絕",
-				"reject_desc": "本站 buē 接受 tuì 以下 ê 站 ê 短 phue：",
-				"quarantine": "隔離",
-				"quarantine_desc": "針對下跤 ê 站，本站干焦送出公開ê PO文：",
-				"ftl_removal": "Tuì「知影 ê 網路」時間線thâi掉",
-				"ftl_removal_desc": "本站buē 佇「知影 ê 網路」刊下跤 ê 站 ê PO文：",
-				"media_removal": "Thâi除媒體",
-				"media_removal_desc": "本站 kā 下跤 ê 站臺送 ê PO文 ê 媒體 lóng thâi 除：",
-				"media_nsfw": "媒體 lóng 標做「敏感內容」",
-				"media_nsfw_desc": "本站 kā 下跤 ê 站 ê 媒體，lóng 標做敏感內容："
-			}
-		},
-		"staff": "工作人員"
-	},
-	"announcements": {
-		"page_header": "公告",
-		"title": "公告",
-		"mark_as_read_action": "標做有讀",
-		"post_form_header": "貼公告",
-		"post_placeholder": "佇 tsia 拍你 ê 公告……",
-		"post_action": "貼",
-		"post_error": "錯誤：{error}",
-		"close_error": "關",
-
-		"start_time_prompt": "開始時間： ",
-		"end_time_prompt": "結束時間：",
-		"all_day_prompt": "Tse 是 kui 工 ê 事件",
-		"published_time_display": "公告佇 {time}",
-		"start_time_display": "有效 tuì：{time}",
-		"end_time_display": "中止佇：{time}",
-		"edit_action": "編輯",
-		"submit_edit_action": "送出",
-		"cancel_edit_action": "取消",
-		"inactive_message": "這个公告 tsit-má 無效力。"
-	},
-	"shoutbox": {
-		"title": "留話枋"
-	},
-	"domain_mute_card": {
-		"mute": "予恬去",
-		"mute_progress": "Teh 予恬……",
-		"unmute": "予有聲",
-		"unmute_progress": "Teh 予有聲……"
-	},
-	"exporter": {
-		"export": "匯出",
-		"processing": "Teh 處理，較停仔指示你下載檔案……"
-	},
-	"features_panel": {
-		"shout": "留話枋",
-		"pleroma_chat_messages": "Pleroma 開講",
-
-		"media_proxy": "媒體代理伺侯器",
-		"scope_options": "公開範圍選項",
-		"text_limit": "字數限制",
-		"title": "有效 ê 功能",
-		"who_to_follow": "啥儂通綴",
-		"upload_limit": "檔案 sài-suh 限制"
-	},
-	"finder": {
-		"error_fetching_user": "Tshuē 用者 ê 時起錯誤",
-		"find_user": "Tshuē 用者"
-	},
-	"general": {
-		"apply": "應用",
-		"submit": "送出",
-		"more": "Koh 較 tsē",
-		"loading": "Leh 載入……",
-		"generic_error": "起錯誤 ah",
-		"generic_error_message": "起錯誤：{0}",
-		"error_retry": "請 koh 試一 kái",
-		"retry": "Koh 試",
-		"optional": "非必要",
-		"show_more": "展示較 tsē",
-		"show_less": "展示較少",
-		"never_show_again": "Mài koh 展示",
-		"dismiss": "無視",
-		"cancel": "取消",
-		"disable": "無愛用",
-		"enable": "啟用",
-		"confirm": "確認",
-		"verify": "驗證",
-		"close": "關掉",
-		"undo": "復原",
-		"yes": "是",
-		"no": "毋是",
-		"peek": "先看 māi",
-		"scroll_to_top": "捲 kàu 頂懸",
-		"role": {
-			"admin": "行政員",
-			"moderator": "管理員"
-		},
-		"unpin": "無愛 kā 釘",
-		"pin": "Kā釘起來",
-		"flash_content": "Ji̍h tsia，用 Ruffle（iáu teh 試驗，可能 buē 紡）看 Flash ê 內容。",
-		"flash_sepcurity": "注意 tse 可能有危險，因為 Flash 內容猶原是任意 ê 程式碼。",
-		"flash_fail": "載入 flash 內容失敗，詳細會當看控制臺。",
-		"scope_in_timeline": {
-			"direct": "私人 phue",
-			"private": "干焦 hōo 綴 lí ê 看",
-			"public": "公開佇公共時間線",
-			"unlisted": "無愛公開佇公共時間線"
-		}
-	},
-	"image_cropper": {
-		"crop_picture": "裁相片",
-		"save": "儲存",
-		"save_without_cropping": "無裁就儲存",
-		"cancel": "取消"
-	},
-	"importer": {
-		"submit": "送出",
-		"success": "匯入成功。",
-		"error": "佇匯入 ê 時起錯誤。"
-	},
-	"login": {
-		"login": "登入",
-		"description": "用 OAuth 登入",
-		"logout": "登出",
-		"logout_confirm_title": "登出確認",
-		"logout_confirm": "Lí　敢真正　beh　登出？",
-		"logout_confirm_accept_button": "登出",
-		"logout_confirm_cancel_button": "mài 登出",
-		"password": "密碼",
-		"placeholder": "例：lain",
-		"register": "註冊",
-		"username": "用者 ê 名",
-		"hint": "登入，參與討論",
-		"authentication_code": "認證碼",
-		"enter_recovery_code": "輸入恢復碼",
-		"enter_two_factor_code": "輸入兩階段認證碼",
-		"recovery_code": "恢復碼",
-		"heading": {
-			"totp": "兩階段認證",
-			"recovery": "兩階段恢復"
-		}
-	},
-	"media_modal": {
-		"previous": "頂一　ê",
-		"next": "後一个",
-		"counter": "{current} / {total}",
-		"hide": "關掉媒體瀏覽"
-	},
-	"nav": {
-		"about": "有關……",
-		"administration": "管理",
-		"back": "轉去",
-		"friend_requests": "跟綴請求",
-		"mentions": "The̍h起",
-		"interactions": "互動",
-		"dms": "私人 phue",
-		"public_tl": "公共時間線",
-		"timeline": "時間線",
-		"home_timeline": "厝 ê 時間線",
-		"twkn": "知影 ê 網路",
-		"bookmarks": "冊籤",
-		"user_search": "Tshuē 用者",
-
-		"search_close": "關掉 tshiau-tshuē liâu",
-		"who_to_follow": "Siáng 會當綴？",
-		"preferences": "個人 ê 設定",
-		"timelines": "時間流",
-		"chats": "開講",
-		"lists": "列單",
-		"edit_nav_mobile": "自訂導覽條",
-		"edit_pinned": "編輯釘起來 ê 項目",
-		"edit_finish": "編輯 suah",
-		"mobile_sidebar": "切換行動版 ê 邊 á liâu",
-		"mobile_notifications": "拍開通知（有無讀ê）",
-		"mobile_notifications_close": "關掉通知",
-		"announcements": "公告"
-	},
-	"notifications": {
-		"broken_favorite": "狀態毋知影，leh tshiau-tshuē……",
-		"error": "佇取得通知 ê 時起錯誤：{0}",
-		"favorited_you": "kah 意 lí ê 狀態",
-		"followed_you": "綴 lí",
-		"follow_request": "想 beh 綴 lí",
-		"load_older": "載入 khah 早 ê 通知",
-		"notifications": "通知",
-		"read": "讀！",
-		"repeated_you": "轉送 lí ê 狀態",
-		"no_more_notifications": "無別 ê 通知",
-		"migrated_to": "移民到",
-		"reacted_with": "顯出{0} ê 反應",
-		"submitted_report": "送出檢舉",
-		"poll_ended": "投票結束"
-	},
-	"polls": {
-		"add_poll": "開投票",
-		"add_option": "加選項",
-		"option": "選項",
-		"votes": "票",
-		"people_voted_count": "{count} 位有投",
-		"votes_count": "{count} 票",
-		"vote": "投票",
-		"type": "投票 ê 形式",
-		"single_choice": "孤選",
-		"multiple_choices": "Tsē 選",
-		"expiry": "投票期限",
-		"expires_in": "投票 tī {0} 以後結束",
-		"expired": "投票佇 {0} 以前結束",
-		"not_enough_options": "投票 ê 選項傷少。"
-	},
-	"emoji": {
-		"stickers": "貼圖",
-		"emoji": "繪文字",
-		"keep_open": "Hōo 揀選仔開 leh",
-		"search_emoji": "Tshuē 繪文字",
-		"add_emoji": "插繪文字",
-		"custom": "定製 ê 繪文字",
-		"unpacked": "拍開 ê 繪文字",
-		"unicode": "Unicode 繪文字",
-		"unicode_groups": {
-			"activities": "活動",
-			"animals-and-nature": "動物 kap 自然",
-			"flags": "旗 á",
-			"food-and-drink": "食物 kap 飲料",
-			"objects": "物體",
-			"people-and-body": "Lâng kap 身軀",
-			"smileys-and-emotion": "笑面 kap 情緒",
-			"symbols": "符號",
-			"travel-and-places": "旅遊 kap 所在"
-		},
-		"load_all_hint": "載入頭前 {saneAmount} ê 繪文字，規个攏載入效能可能 ē khah 食力。",
-		"load_all": "Kā {emojiAmount} ê 繪文字攏載入",
-		"regional_indicator": "地區指引 {letter}"
-	},
-	"errors": {
-		"storage_unavailable": "Pleroma buē-tàng the̍h 著瀏覽器儲存 ê。Lí ê 登入狀態抑是局部設定 buē 儲存，mā 凡勢 tú 著意料外 ê 問題。拍開 cookie 看覓。"
-	},
-	"interactions": {
-		"favs_repeats": "轉送 kap kah 意",
-		"follows": "最近綴 lí ê",
-		"emoji_reactions": "繪文字 ê 回應",
-		"reports": "檢舉",
-		"moves": "用者 ê 移民",
-		"load_older": "載入 koh khah 早 ê 互動"
-	},
-	"post_status": {
-		"edit_status": "編輯狀態",
-		"new_status": "PO 新 ê 狀態",
-		"account_not_locked_warning": "Lín 口座毋是 {0} ê。見 nā 有 lâng 綴--lí，ē-tàng 看著 lí ê 限定跟綴者 ê PO 文。.",
-		"account_not_locked_warning_link": "鎖起來 ê 口座",
-		"attachments_sensitive": "Kā 附件標做敏感內容。",
-		"media_description": "媒體說明",
-		"content_type": {
-			"text/plain": "純 ê 文字"
-
-		},
-		"content_type_selection": "貼 ê 形式",
-		"content_warning": "主旨（毋是必要）",
-		"default": "Tú 正 kàu 高雄 ah。",
-		"direct_warning_to_all": "Tsit ê PO 文通 hōo 逐 ê 提起 ê 用者看見。",
-		"direct_warning_to_first_only": "Tsit ê PO 文，kan-ta 短信 tú 開始提起 ê 用者，tsiah 通看見。",
-		"edit_remote_warning": "別 ê 站臺可能無支援編輯，無法度收著 PO 文上新 ê 版本。",
-		"edit_unsupported_warning": "Pleroma 無支持編輯 the̍h 起 hām 投票。",
-		"posting": "PO 文",
-
-		"preview": "Sing 看覓",
-		"preview_empty": "空 ê",
-		"empty_status_error": "無法度 PO 無檔案 koh 空 ê 狀態。",
-		"media_description_error": "更新媒體失敗，請 koh 試一 kái。",
-		"scope_notice": {
-			"public": "Tsit ê PO 文通予逐 ê 儂看著。",
-			"private": "Tsit ê PO 文 kan-ta 予綴 lí ê 看著。",
-			"unlisted": "Tsit ê PO 文 buē 公開 tī 公共時間線 kap 知影 ê 網路。"
-		},
-		"scope_notice_dismiss": "關掉 tsit ê 通知",
-		"scope": {
-			"direct": "私人 phue - PO 文干焦予提起 ê 用者看著",
-			"private": "限定綴 ê 儂 - PO 文干焦予綴 lí ê 儂看著",
-			"public": "公開 - PO kàu 公開時間線",
-			"unlisted": "Mài 列出來 - Mài PO tī 公開時間線。"
-		}
-	},
-	"registration": {
-		"bio_optional": "介紹（毋是必要）",
-
-		"email_optional": "Email（毋是必要）",
-		"fullname": "顯示 ê 名",
-		"password_confirm": "確認密碼",
-		"registration": "註冊",
-		"token": "邀請碼",
-		"captcha": "驗證碼",
-		"new_captcha": "Ji̍h 圖片，the̍h 新 ê 驗證碼",
-
-		"fullname_placeholder": "e.g. 岩倉 Lain",
-		"bio_placeholder": "e.g.\nLí 好，我是 Lain。我是日本動畫 ê 角色，tuà tī 日本 ê 郊區。Lí 凡勢 bat tī Wired 知影我。",
-		"reason": "註冊 ê 理由",
-		"reason_placeholder": "本站靠人工審核註冊。\n介紹管理者 lí beh tī tsia 註冊 ê 理由。",
-		"register": "註冊",
-		"validations": {
-			"username_required": "著愛添",
-			"fullname_required": "著愛添",
-			"email_required": "著愛添",
-			"password_required": "著愛添",
-			"password_confirmation_required": "著愛添",
-			"password_confirmation_match": "密碼著相 kâng",
-			"birthday_required": "著愛添",
-			"birthday_min_age": "Buē-tàng tī {date} 以後"
-		},
-		"email_language": "Lí想 beh 服侍器用 siánn 物語言寄批 hōo lí？",
-		"birthday": "生日",
-		"birthday_optional": "生日（毋是必要）："
-	},
-	"remote_user_resolver": {
-		"remote_user_resolver": "別站用者 ê 解析器",
-
-		"error": "Tshuē無"
-	},
-	"report": {
-		"reporter": "檢舉人：",
-		"reported_user": "Beh 檢舉 ê 用者：",
-		"reported_statuses": "Beh 檢舉 ê 狀態：",
-
-		"state_open": "開 ê",
-		"state_closed": "關 ê",
-		"state_resolved": "解決了 ê"
-	},
-	"selectable_list": {
-		"select_all": "攏總揀"
-	},
-	"settings": {
-		"add_language": "加一 ê 備用 ê 語言",
-		"remove_language": "Ni 掉",
-		"primary_language": "主要語言：",
-		"fallback_language": "備用語言 {index}：",
-		"app_name": "App ê 名",
-		"expert_mode": "進階模式",
-		"save": "保存改變",
-		"security": "安全",
-		"setting_changed": "設定 kap 預先 ê 有 tsing 差",
-
-		"style": {
-
-			"common": {
-				"color": "色彩",
-				"opacity": "無透明度",
-				"contrast": {
-					"hint": "Contrast ratio is {ratio}, it {level} {context}"
-				}
-			}
-
-		},
-
-
-		"upload": {
-			"error": {
-				"base": "上傳 ê 時失敗。",
-				"message": "傳 buē 起去：{0}",
-				"file_too_big": "檔案 sài-suh 傷大 [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
-				"default": "Koh 試一 kái。"
-			},
-			"file_size_units": {}
-		},
-		"search": {
-			"people": "用戶",
-			"hashtags": "主題標籤",
-			"person_talking": "{count} ê leh 論",
-			"people_talking": "{count} ê leh 論",
-			"no_results": "無半 ê 結果",
-			"no_more_results": "無其他 ê 結果",
-			"load_more": "載入 koh 較 tsē 結果"
-		},
-		"password_reset": {
-			"forgot_password": "Buē 記得密碼？",
-			"password_reset": "重頭設密碼",
-			"instruction": "拍 lí ê email 地址 iah 是用者 ê 名。Guán 會送 lí 連結，重頭設定密碼。",
-			"placeholder": "Lí ê email 地址 iah 是用者 ê 名。",
-			"check_email": "檢查電子 phue 箱，看有重頭設密碼 ê 連結無。",
-			"return_home": "轉來頭頁",
-			"too_many_requests": "Lí kā 請求 ê khòo-tah 用了 ah。等一時仔，閣試一 pái。",
-			"password_reset_disabled": "密碼重頭設定無開放。請聯絡本站 ê 行政員。",
-			"password_reset_required": "Beh 登入，著重頭設 lí ê 密碼。",
-			"password_reset_required_but_mailer_is_disabled": "Lí 需要重頭設密碼，毋 koh tsia 無開放密碼 koh 再設定。請聯絡本站 ê 行政員。"
-		},
-		"chats": {
-
-			"message_user": "傳私人 phue：{nickname}",
-			"delete": "Thâi 掉",
-			"chats": "開講",
-			"new": "發起開講",
-			"empty_message_error": "無法度 PO 空 ê phue",
-			"more": "Koh較濟……",
-			"delete_confirm": "Lí 敢真 ê beh thâi tsit 張 phue？",
-			"error_loading_chat": "載入開講 ê 時，出箠 ah。",
-			"error_sending_message": "送 phue ê 時，出箠 ah。",
-			"empty_chat_list_placeholder": "Lí 猶無佇 tsia 開講過，來開講 lah！"
-		},
-		"lists": {
-			"lists": "列單",
-			"new": "新 ê 列單",
-			"title": "列單標題",
-			"search": "Tshuē 用者",
-			"create": "開新 ê",
-			"save": "保存改變",
-			"delete": "刣列單",
-			"following_only": "限定 lí 所關注 ê",
-			"manage_lists": "管理列單",
-			"manage_members": "管理列單成員",
-			"add_members": "Tshiau 閣較 tsē ê 用者",
-			"remove_from_list": "對列單刣掉",
-			"add_to_list": "加入去列單",
-			"is_in_list": "列單已經有 ah ",
-			"editing_list": "編輯列單 {listTitle}",
-			"creating_list": "開新 ê 列單",
-			"update_title": "保存標題",
-			"really_delete": "敢真正 beh 刣掉列單？",
-			"error": "操作列單 ê 時陣出重耽：{0}"
-		},
-		"file_type": {
-			"audio": "音訊",
-			"video": "影片",
-			"image": "影像",
-			"file": "檔案"
-		},
-		"display_date": {
-			"today": "今 á 日"
-		},
-		"update": {
-			"big_update_title": "敬請體諒",
-			"big_update_content": "因為 guán 有一站 á 無發行新版本，所以這个版本會 kap lí 以早慣 sì ê 無仝。",
-			"update_bugs": "請佇 {pleromaGitlab} 報告任何問題 kap bug，因為 Pleroma 改變真 tsē。雖罔 guán 徹底 leh 試，mā 家 kī 用開發版，伊凡勢有一寡重耽。Guán 歡迎 lín 提供關係所拄著 ê 問題 ê 意見、建議，或者是改進 Pleroma kap Pleroma-FE ê 法度。",
-
-			"update_changelog": "Nā beh 知影改變 ê 詳細，請看：{theFullChangelog}.",
-			"update_changelog_here": "Kui ê 改變日誌",
-			"art_by": "美編：{linkToArtist}"
-		},
-		"unicode_domain_indicator": {
-			"tooltip": "這 ê 域名包含毋是 ascii ê 字元。"
-		}
-	}
+  "about": {
+    "mrf": {
+      "federation": "聯邦",
+      "keyword": {
+        "keyword_policies": "關鍵字政策",
+        "ftl_removal": "Tuì「知影 ê 網路」時間線除掉",
+        "reject": "拒絕",
+        "replace": "取代",
+        "is_replaced_by": "→"
+      },
+      "mrf_policies": "啟用 ê MRF 政策",
+      "mrf_policies_desc": "MRF 政策操作本站 ê 對外通信行為。以下ê政策啟用 ah：",
+      "simple": {
+        "simple_policies": "站臺特有 ê 政策",
+        "instance": "站",
+        "reason": "理由",
+        "accept": "接受",
+        "accept_desc": "本站干焦接受下跤 ê 站 ê 短 phue：",
+        "reject": "拒絕",
+        "reject_desc": "本站 buē 接受 tuì 以下 ê 站 ê 短 phue：",
+        "quarantine": "隔離",
+        "quarantine_desc": "針對下跤 ê 站，本站干焦送出公開ê PO文：",
+        "ftl_removal": "Tuì「知影 ê 網路」時間線thâi掉",
+        "ftl_removal_desc": "本站buē 佇「知影 ê 網路」刊下跤 ê 站 ê PO文：",
+        "media_removal": "Thâi除媒體",
+        "media_removal_desc": "本站 kā 下跤 ê 站臺送 ê PO文 ê 媒體 lóng thâi 除：",
+        "media_nsfw": "媒體 lóng 標做「敏感內容」",
+        "media_nsfw_desc": "本站 kā 下跤 ê 站 ê 媒體，lóng 標做敏感內容：",
+        "not_applicable": "N/A"
+      }
+    },
+    "staff": "工作人員"
+  },
+  "announcements": {
+    "page_header": "公告",
+    "title": "公告",
+    "mark_as_read_action": "標做讀過",
+    "post_form_header": "貼公告",
+    "post_placeholder": "佇 tsia 拍你 ê 公告……",
+    "post_action": "貼",
+    "post_error": "錯誤：{error}",
+    "close_error": "關",
+    "start_time_prompt": "開始時間： ",
+    "end_time_prompt": "結束時間： ",
+    "all_day_prompt": "Tse 是 kui 工 ê 事件",
+    "published_time_display": "公告佇 {time}",
+    "start_time_display": "有效 tuì：{time}",
+    "end_time_display": "中止佇：{time}",
+    "edit_action": "編輯",
+    "submit_edit_action": "送出",
+    "cancel_edit_action": "取消",
+    "inactive_message": "這个公告 tsit-má 無效力",
+    "delete_action": "Thâi掉"
+  },
+  "shoutbox": {
+    "title": "留話枋"
+  },
+  "domain_mute_card": {
+    "mute": "消音",
+    "mute_progress": "Teh 消音……",
+    "unmute": "予有聲",
+    "unmute_progress": "Teh 予有聲……"
+  },
+  "exporter": {
+    "export": "匯出",
+    "processing": "Teh 處理，較停仔指示你下載檔案"
+  },
+  "features_panel": {
+    "shout": "留話枋",
+    "pleroma_chat_messages": "Pleroma 開講",
+    "media_proxy": "媒體代理伺侯器",
+    "scope_options": "公開範圍選項",
+    "text_limit": "字數限制",
+    "title": "有效 ê 功能",
+    "who_to_follow": "啥儂通綴",
+    "upload_limit": "檔案 sài-suh 限制",
+    "gopher": "Gopher"
+  },
+  "finder": {
+    "error_fetching_user": "Tshuē 用者 ê 時起錯誤",
+    "find_user": "Tshuē 用者"
+  },
+  "general": {
+    "apply": "應用",
+    "submit": "送出",
+    "more": "Koh 較 tsē",
+    "loading": "Leh 載入……",
+    "generic_error": "起錯誤 ah",
+    "generic_error_message": "起錯誤：{0}",
+    "error_retry": "請 koh 試一 kái",
+    "retry": "Koh 試",
+    "optional": "非必要",
+    "show_more": "展示較 tsē",
+    "show_less": "展示較少",
+    "never_show_again": "Mài koh 展示",
+    "dismiss": "無視",
+    "cancel": "取消",
+    "disable": "無愛用",
+    "enable": "啟用",
+    "confirm": "確認",
+    "verify": "驗證",
+    "close": "關掉",
+    "undo": "復原",
+    "yes": "是",
+    "no": "毋是",
+    "peek": "先看 māi",
+    "scroll_to_top": "捲 kàu 頂懸",
+    "role": {
+      "admin": "行政員",
+      "moderator": "管理員"
+    },
+    "unpin": "無愛 kā 釘",
+    "pin": "Kā釘起來",
+    "flash_content": "Ji̍h tsia，用 Ruffle（iáu teh 試驗，可能 buē 紡）看 Flash ê 內容。",
+    "flash_sepcurity": "注意 tse 可能有危險，因為 Flash 內容猶原是任意 ê 程式碼。",
+    "flash_fail": "載入 flash 內容失敗，詳細會當看控制臺。",
+    "scope_in_timeline": {
+      "direct": "私人 phue",
+      "private": "干焦 hōo 綴 lí ê 看",
+      "public": "公開佇公共時間線",
+      "unlisted": "無愛公開佇公共時間線"
+    },
+    "flash_security": "Flash內容通藏任何ê指令，所以可能有危險。"
+  },
+  "image_cropper": {
+    "crop_picture": "裁相片",
+    "save": "儲存",
+    "save_without_cropping": "無裁就儲存",
+    "cancel": "取消"
+  },
+  "importer": {
+    "submit": "送出",
+    "success": "匯入成功。",
+    "error": "佇匯入 ê 時起錯誤。"
+  },
+  "login": {
+    "login": "登入",
+    "description": "用 OAuth 登入",
+    "logout": "登出",
+    "logout_confirm_title": "登出確認",
+    "logout_confirm": "Lí　敢真正　beh　登出？",
+    "logout_confirm_accept_button": "登出",
+    "logout_confirm_cancel_button": "mài 登出",
+    "password": "密碼",
+    "placeholder": "例：lain",
+    "register": "註冊",
+    "username": "用者 ê 名",
+    "hint": "登入，參與討論",
+    "authentication_code": "認證碼",
+    "enter_recovery_code": "輸入恢復碼",
+    "enter_two_factor_code": "輸入兩階段認證碼",
+    "recovery_code": "恢復碼",
+    "heading": {
+      "totp": "兩階段認證",
+      "recovery": "兩階段恢復"
+    }
+  },
+  "media_modal": {
+    "previous": "頂一　ê",
+    "next": "後一个",
+    "counter": "{current} / {total}",
+    "hide": "關掉媒體瀏覽"
+  },
+  "nav": {
+    "about": "有關本站",
+    "administration": "管理",
+    "back": "轉去",
+    "friend_requests": "跟綴請求",
+    "mentions": "The̍h起",
+    "interactions": "互動",
+    "dms": "私人 phue",
+    "public_tl": "公共時間線",
+    "timeline": "時間線",
+    "home_timeline": "厝 ê 時間線",
+    "twkn": "知影 ê 網路",
+    "bookmarks": "冊籤",
+    "user_search": "Tshuē 用者",
+    "search_close": "關掉 tshiau-tshuē liâu",
+    "who_to_follow": "Siáng 會當綴",
+    "preferences": "個人 ê 設定",
+    "timelines": "時間流",
+    "chats": "開講",
+    "lists": "列單",
+    "edit_nav_mobile": "自訂導覽條",
+    "edit_pinned": "編輯釘起來 ê 項目",
+    "edit_finish": "編輯 suah",
+    "mobile_sidebar": "切換行動版 ê 邊 á liâu",
+    "mobile_notifications": "拍開通知（有無讀ê）",
+    "mobile_notifications_close": "關掉通知",
+    "announcements": "公告",
+    "search": "Tshuē"
+  },
+  "notifications": {
+    "broken_favorite": "狀態毋知影，leh tshiau-tshuē……",
+    "error": "佇取得通知 ê 時起錯誤：{0}",
+    "favorited_you": "kah 意 lí ê 狀態",
+    "followed_you": "綴 lí",
+    "follow_request": "想 beh 綴 lí",
+    "load_older": "載入 khah 早 ê 通知",
+    "notifications": "通知",
+    "read": "讀！",
+    "repeated_you": "轉送 lí ê 狀態",
+    "no_more_notifications": "無別 ê 通知",
+    "migrated_to": "移民到",
+    "reacted_with": "顯出{0} ê 反應",
+    "submitted_report": "送出檢舉",
+    "poll_ended": "投票結束"
+  },
+  "polls": {
+    "add_poll": "開投票",
+    "add_option": "加選項",
+    "option": "選項",
+    "votes": "票",
+    "people_voted_count": "{count} 位有投",
+    "votes_count": "{count} 票",
+    "vote": "投票",
+    "type": "投票 ê 形式",
+    "single_choice": "孤選",
+    "multiple_choices": "Tsē 選",
+    "expiry": "投票期限",
+    "expires_in": "投票 tī {0} 以後結束",
+    "expired": "投票佇 {0} 以前結束",
+    "not_enough_options": "投票 ê 選項傷少"
+  },
+  "emoji": {
+    "stickers": "貼圖",
+    "emoji": "繪文字",
+    "keep_open": "Hōo 揀選仔開 leh",
+    "search_emoji": "Tshuē 繪文字",
+    "add_emoji": "插繪文字",
+    "custom": "定製 ê 繪文字",
+    "unpacked": "拍開 ê 繪文字",
+    "unicode": "Unicode 繪文字",
+    "unicode_groups": {
+      "activities": "活動",
+      "animals-and-nature": "動物 kap 自然",
+      "flags": "旗 á",
+      "food-and-drink": "食物 kap 飲料",
+      "objects": "物體",
+      "people-and-body": "Lâng kap 身軀",
+      "smileys-and-emotion": "笑面 kap 情緒",
+      "symbols": "符號",
+      "travel-and-places": "旅遊 kap 所在"
+    },
+    "load_all_hint": "載入頭前 {saneAmount} ê 繪文字，規个攏載入效能可能 ē khah 食力。",
+    "load_all": "Kā {emojiAmount} ê 繪文字攏載入",
+    "regional_indicator": "地區指引 {letter}"
+  },
+  "errors": {
+    "storage_unavailable": "Pleroma buē-tàng the̍h 著瀏覽器儲存 ê。Lí ê 登入狀態抑是局部設定 buē 儲存，mā 凡勢 tú 著意料外 ê 問題。拍開 cookie 看覓。"
+  },
+  "interactions": {
+    "favs_repeats": "轉送 kap kah 意",
+    "follows": "最近綴 lí ê",
+    "emoji_reactions": "繪文字 ê 回應",
+    "reports": "檢舉",
+    "moves": "用者 ê 移民",
+    "load_older": "載入 koh khah 早 ê 互動"
+  },
+  "post_status": {
+    "edit_status": "編輯狀態",
+    "new_status": "PO 新 ê 狀態",
+    "account_not_locked_warning": "Lín 口座毋是 {0} ê。見 nā 有 lâng 綴--lí，ē-tàng 看著 lí ê 限定跟綴者 ê PO 文。.",
+    "account_not_locked_warning_link": "鎖起來 ê 口座",
+    "attachments_sensitive": "Kā 附件標做敏感內容",
+    "media_description": "媒體說明",
+    "content_type": {
+      "text/plain": "純 ê 文字",
+      "text/html": "HTML",
+      "text/markdown": "Markdown",
+      "text/bbcode": "BBCode"
+    },
+    "content_type_selection": "貼 ê 形式",
+    "content_warning": "主旨（毋是必要）",
+    "default": "Tú 正 kàu 高雄 ah。",
+    "direct_warning_to_all": "Tsit ê PO 文通 hōo 逐 ê 提起 ê 用者看見。",
+    "direct_warning_to_first_only": "Tsit ê PO 文，kan-ta 短信 tú 開始提起 ê 用者，tsiah 通看見。",
+    "edit_remote_warning": "別 ê 站臺可能無支援編輯，無法度收著 PO 文上新 ê 版本。",
+    "edit_unsupported_warning": "Pleroma 無支持編輯 the̍h 起 hām 投票。",
+    "posting": "PO 文",
+    "preview": "Sing 看覓",
+    "preview_empty": "空 ê",
+    "empty_status_error": "無法度 PO 無檔案 koh 空 ê 狀態",
+    "media_description_error": "更新媒體失敗，請 koh 試一 kái",
+    "scope_notice": {
+      "public": "Tsit ê PO 文通予逐 ê 儂看著",
+      "private": "Tsit ê PO 文 kan-ta 予綴 lí ê 看著",
+      "unlisted": "Tsit ê PO 文 buē 公開 tī 公共時間線 kap 知影 ê 網路"
+    },
+    "scope_notice_dismiss": "關掉 tsit ê 通知",
+    "scope": {
+      "direct": "私人 phue - PO 文干焦予提起 ê 用者看著",
+      "private": "限定綴 ê 儂 - PO 文干焦予綴 lí ê 儂看著",
+      "public": "公開 - PO kàu 公開時間線",
+      "unlisted": "Mài 列出來 - Mài PO tī 公開時間線"
+    },
+    "post": "PO 上去"
+  },
+  "registration": {
+    "bio_optional": "介紹（毋是必要）",
+    "email_optional": "Email（毋是必要）",
+    "fullname": "顯示 ê 名",
+    "password_confirm": "確認密碼",
+    "registration": "註冊",
+    "token": "邀請碼",
+    "captcha": "驗證碼",
+    "new_captcha": "Ji̍h 圖片，the̍h 新 ê 驗證碼",
+    "fullname_placeholder": "e.g. 岩倉 Lain",
+    "bio_placeholder": "e.g.\nLí 好，我是 Lain。\n我是日本動畫 ê 角色，tuà tī 日本 ê 郊區。Lí 凡勢 bat tī Wired 知影我。",
+    "reason": "註冊 ê 理由",
+    "reason_placeholder": "本站靠人工審核註冊。\n介紹管理者 lí beh tī tsia 註冊 ê 理由。",
+    "register": "註冊",
+    "validations": {
+      "username_required": "著愛添",
+      "fullname_required": "著愛添",
+      "email_required": "著愛添",
+      "password_required": "著愛添",
+      "password_confirmation_required": "著愛添",
+      "password_confirmation_match": "密碼著相 kâng",
+      "birthday_required": "著愛添",
+      "birthday_min_age": "Buē-tàng tī {date} 以後"
+    },
+    "email_language": "Lí想 beh 服侍器用 siánn 物語言寄批 hōo lí？",
+    "birthday": "生日：",
+    "birthday_optional": "生日（毋是必要）：",
+    "email": "電子 phue 箱",
+    "username_placeholder": "比如：lain"
+  },
+  "remote_user_resolver": {
+    "remote_user_resolver": "別站用者 ê 解析器",
+    "error": "Tshuē無。",
+    "searching_for": "Tshuē："
+  },
+  "report": {
+    "reporter": "檢舉人：",
+    "reported_user": "Beh 檢舉 ê 用者：",
+    "reported_statuses": "Beh 檢舉 ê 狀態：",
+    "state_open": "開 ê",
+    "state_closed": "關 ê",
+    "state_resolved": "解決了 ê",
+    "notes": "註：",
+    "state": "狀態："
+  },
+  "selectable_list": {
+    "select_all": "攏總揀"
+  },
+  "settings": {
+    "add_language": "加一 ê 備用 ê 語言",
+    "remove_language": "Ni 掉",
+    "primary_language": "主要語言：",
+    "fallback_language": "備用語言 {index}：",
+    "app_name": "App ê 名",
+    "expert_mode": "進階模式",
+    "save": "保存改變",
+    "security": "安全",
+    "setting_changed": "設定 kap 預先 ê 有 tsing 差",
+    "style": {
+      "common": {
+        "color": "色彩",
+        "opacity": "無透明度",
+        "contrast": {
+          "hint": "色彩ê對比率：{ratio}。{level}、 {context}"
+        }
+      }
+    },
+    "upload": {
+      "error": {
+        "base": "上傳 ê 時失敗。",
+        "message": "傳 buē 起去：{0}",
+        "file_too_big": "檔案 sài-suh 傷大 [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
+        "default": "Koh 試一 kái。"
+      }
+    },
+    "search": {
+      "people": "用戶",
+      "hashtags": "主題標籤",
+      "person_talking": "{count} ê leh 論",
+      "people_talking": "{count} ê leh 論",
+      "no_results": "無半 ê 結果",
+      "no_more_results": "無其他 ê 結果",
+      "load_more": "載入 koh 較 tsē 結果"
+    },
+    "password_reset": {
+      "forgot_password": "Buē 記得密碼？",
+      "password_reset": "重頭設密碼",
+      "instruction": "拍 lí ê email 地址 iah 是用者 ê 名。Guán 會送 lí 連結，重頭設定密碼。",
+      "placeholder": "Lí ê email 地址 iah 是用者 ê 名。",
+      "check_email": "檢查電子 phue 箱，看有重頭設密碼 ê 連結無。",
+      "return_home": "轉來頭頁",
+      "too_many_requests": "Lí kā 請求 ê khòo-tah 用了 ah。等一時仔，閣試一 pái。",
+      "password_reset_disabled": "密碼重頭設定無開放。請聯絡本站 ê 行政員。",
+      "password_reset_required": "Beh 登入，著重頭設 lí ê 密碼。",
+      "password_reset_required_but_mailer_is_disabled": "Lí 需要重頭設密碼，毋 koh tsia 無開放密碼 koh 再設定。請聯絡本站 ê 行政員。"
+    },
+    "chats": {
+      "message_user": "傳私人 phue：{nickname}",
+      "delete": "Thâi 掉",
+      "chats": "開講",
+      "new": "發起開講",
+      "empty_message_error": "無法度 PO 空 ê phue",
+      "more": "Koh較濟……",
+      "delete_confirm": "Lí 敢真 ê beh thâi tsit 張 phue？",
+      "error_loading_chat": "載入開講 ê 時，出箠 ah。",
+      "error_sending_message": "送 phue ê 時，出箠 ah。",
+      "empty_chat_list_placeholder": "Lí 猶無佇 tsia 開講過，來開講 lah！"
+    },
+    "lists": {
+      "lists": "列單",
+      "new": "新 ê 列單",
+      "title": "列單標題",
+      "search": "Tshuē 用者",
+      "create": "開新 ê",
+      "save": "保存改變",
+      "delete": "刣列單",
+      "following_only": "限定 lí 所關注 ê",
+      "manage_lists": "管理列單",
+      "manage_members": "管理列單成員",
+      "add_members": "Tshiau 閣較 tsē ê 用者",
+      "remove_from_list": "對列單刣掉",
+      "add_to_list": "加入去列單",
+      "is_in_list": "列單已經有 ah ",
+      "editing_list": "編輯列單 {listTitle}",
+      "creating_list": "開新 ê 列單",
+      "update_title": "保存標題",
+      "really_delete": "敢真正 beh 刣掉列單？",
+      "error": "操作列單 ê 時陣出重耽：{0}"
+    },
+    "file_type": {
+      "audio": "音訊",
+      "video": "影片",
+      "image": "影像",
+      "file": "檔案"
+    },
+    "display_date": {
+      "today": "今 á 日"
+    },
+    "update": {
+      "big_update_title": "敬請體諒",
+      "big_update_content": "因為 guán 有一站 á 無發行新版本，所以這个版本會 kap lí 以早慣 sì ê 無仝。",
+      "update_bugs": "請佇 {pleromaGitlab} 報告任何問題 kap bug，因為 Pleroma 改變真 tsē。雖罔 guán 徹底 leh 試，mā 家 kī 用開發版，伊凡勢有一寡重耽。Guán 歡迎 lín 提供關係所拄著 ê 問題 ê 意見、建議，或者是改進 Pleroma kap Pleroma-FE ê 法度。",
+      "update_changelog": "Nā beh 知影改變 ê 詳細，請看：{theFullChangelog}.",
+      "update_changelog_here": "Kui ê 改變日誌",
+      "art_by": "美編：{linkToArtist}"
+    },
+    "unicode_domain_indicator": {
+      "tooltip": "這 ê 域名包含毋是 ascii ê 字元。"
+    },
+    "setting_server_side": "Tsit-ê設定縛佇lí ê個人資料，mā 影響逐ê連線階段kap用者端",
+    "post_look_feel": "PO 文ê外貌kap感受",
+    "mention_links": "提起 ê 連結",
+    "mfa": {
+      "otp": "OTP",
+      "setup_otp": "設 OTP",
+      "wait_pre_setup_otp": "kā OTP 預設",
+      "title": "兩階段認證",
+      "generate_new_recovery_codes": "產生新ê恢復碼",
+      "warning_of_generate_new_codes": "產生新 ê 恢復碼ê時，舊 ê tio̍h 變無效。",
+      "recovery_codes": "恢復碼。",
+      "waiting_a_recovery_codes": "當leh收備份碼……",
+      "authentication_methods": "認證方法",
+      "scan": {
+        "title": "掃一 ē",
+        "secret_code": "鎖匙",
+        "desc": "The̍h lí个兩階段app，掃 tsit ê QR code，抑是拍文字鎖匙："
+      },
+      "verify": {
+        "desc": "Nā beh開兩階段認證，請拍兩階段認證app內底ê碼："
+      },
+      "confirm_and_enable": "確定，拍開 OTP",
+      "recovery_codes_warning": "著 kā tsiah ê 號碼抄落來，抑是儲存佇安全ê所在，因為號碼 buē koh 再出現。若是 lí 袂當用 lí 个兩階段認證app，而且恢復碼拍 ka-la̍uh，lí就永永buē當登入lí个口座。"
+    },
+    "lists_navigation": "佇導覽中顯示列單",
+    "allow_following_move": "若是綴ê口座徙位ê時，允准自動綴新ê",
+    "attachmentRadius": "附件",
+    "avatar": "標頭",
+    "avatarAltRadius": "標仔（通知）",
+    "avatarRadius": "標頭",
+    "background": "背景",
+    "bio": "紹介",
+    "block_export": "輸出封鎖名單",
+    "block_export_button": "封鎖名單輸出kàu csv檔",
+    "block_import_error": "佇輸入封鎖名單ê時出tshê",
+    "block_import": "輸入封鎖名單",
+    "mute_export": "輸出消音名單",
+    "mute_export_button": "輸出消音名單kàu csv檔",
+    "mute_import": "輸入消音名單",
+    "blocks_imported": "成功輸入封鎖名單！較停仔tsiah ē處理suah。",
+    "mutes_imported": "成功輸入消音名單！較停仔tsiah ē處理suah。",
+    "import_mutes_from_a_csv_file": "輸入封鎖名單ê csv檔",
+    "account_backup": "備份口座",
+    "mutes_and_blocks": "消音kap封鎖",
+    "delete_account": "Thâi口座",
+    "delete_account_error": "佇刣掉lí ê 口座ê時出問題。若是問題一直佇leh，請聯絡 lín 站臺 ê 行政員。",
+    "account_alias": "口座 ê 別名",
+    "account_alias_table_head": "別名",
+    "list_aliases_error": "佇the̍h別名ê時出tshê：{error}",
+    "hide_list_aliases_error_action": "關掉",
+    "remove_alias": "Thâi 掉tsit ê別名",
+    "new_alias_target": "加新ê別名（比如： {example})）",
+    "added_alias": "別名加入去ah。",
+    "add_alias_error": "佇加別名ê時出tshê：{error}",
+    "move_account": "徙口座",
+    "move_account_target": "目標口座（比如：{example}）",
+    "moved_account": "口座徙過去ah。",
+    "move_account_error": "佇徙口座ê時出tshê：{error}",
+    "attachments": "附件",
+    "email_language": "服侍器送ê email 所用 ê 語言",
+    "enter_current_password_to_confirm": "輸入lí tsit-má ê 密碼，確認lí ê身份",
+    "mute_import_error": "佇輸入消音名單ê時出tshê",
+    "delete_account_description": "Ē 永永刣掉lí个資料，hōo lí 个口座bē當用。",
+    "delete_account_instructions": "佇佇下跤拍lí个密碼，確認 kā 口座 thâi掉。",
+    "move_account_notes": "若是欲徙tsit ê口座，著去lí ê目標口座hia，加一ê指tsia ê別名。"
+  }
 }
-- 
cgit v1.2.3-70-g09d2


From 927729f128436a2e82f85d961c8a72ef8d16f739 Mon Sep 17 00:00:00 2001
From: Kian-ting Tan <chenjt30@gmail.com>
Date: Mon, 26 Jun 2023 08:56:47 +0000
Subject: Translated using Weblate (Chinese (Min Nan) (nan_TW))

Currently translated at 42.5% (448 of 1054 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/nan_TW/
---
 src/i18n/nan-TW.json | 108 +++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 104 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/i18n/nan-TW.json b/src/i18n/nan-TW.json
index b09509c4..c7d06bc4 100644
--- a/src/i18n/nan-TW.json
+++ b/src/i18n/nan-TW.json
@@ -114,7 +114,7 @@
     "pin": "Kā釘起來",
     "flash_content": "Ji̍h tsia，用 Ruffle（iáu teh 試驗，可能 buē 紡）看 Flash ê 內容。",
     "flash_sepcurity": "注意 tse 可能有危險，因為 Flash 內容猶原是任意 ê 程式碼。",
-    "flash_fail": "載入 flash 內容失敗，詳細會當看控制臺。",
+    "flash_fail": "載入 flash 內容失敗，詳細ē當看控制臺。",
     "scope_in_timeline": {
       "direct": "私人 phue",
       "private": "干焦 hōo 綴 lí ê 看",
@@ -177,7 +177,7 @@
     "bookmarks": "冊籤",
     "user_search": "Tshuē 用者",
     "search_close": "關掉 tshiau-tshuē liâu",
-    "who_to_follow": "Siáng 會當綴",
+    "who_to_follow": "Siáng ē當綴",
     "preferences": "個人 ê 設定",
     "timelines": "時間流",
     "chats": "開講",
@@ -474,7 +474,7 @@
     "allow_following_move": "若是綴ê口座徙位ê時，允准自動綴新ê",
     "attachmentRadius": "附件",
     "avatar": "標頭",
-    "avatarAltRadius": "標仔（通知）",
+    "avatarAltRadius": "標頭（通知）",
     "avatarRadius": "標頭",
     "background": "背景",
     "bio": "紹介",
@@ -510,6 +510,106 @@
     "mute_import_error": "佇輸入消音名單ê時出tshê",
     "delete_account_description": "Ē 永永刣掉lí个資料，hōo lí 个口座bē當用。",
     "delete_account_instructions": "佇佇下跤拍lí个密碼，確認 kā 口座 thâi掉。",
-    "move_account_notes": "若是欲徙tsit ê口座，著去lí ê目標口座hia，加一ê指tsia ê別名。"
+    "move_account_notes": "若是欲徙tsit ê口座，著去lí ê目標口座hia，加一ê指tsia ê別名。",
+    "account_backup_table_head": "備份",
+    "download_backup": "下載",
+    "backup_not_ready": "備份猶 buē tshuân 予好勢。",
+    "backup_running": "備份leh處理，其中 {number} 筆記錄處理 suah--ah。",
+    "backup_failed": "備份失敗。",
+    "remove_backup": "Thâi 掉",
+    "list_backups_error": "佇 the̍h 備份列單ê時出tshê： {error}",
+    "add_backup": "開新ê備份",
+    "added_backup": "新ê備份開好 ah。",
+    "add_backup_error": "佇開新ê備份ê時出tshê：{error}",
+    "blocks_tab": "封鎖",
+    "bot": "Tse 是機器 lâng ê 口座",
+    "btnRadius": "鈕仔",
+    "cBlue": "藍色（回應，跟綴）",
+    "cGreen": "綠色（轉送）",
+    "cOrange": "柑仔色（kah 意）",
+    "cRed": "紅色（取消）",
+    "change_email": "換電子 phue 箱",
+    "changed_email": "電子 phue 箱變換成功！",
+    "change_password": "改密碼",
+    "change_password_error": "佇改密碼ê時出問題。",
+    "changed_password": "改密碼成功！",
+    "chatMessageRadius": "開講ê訊息",
+    "composing": "編寫ê設定",
+    "confirm_new_password": "確認新ê密碼",
+    "current_password": "Tann ê 密碼",
+    "confirm_dialogs": "問確認佇",
+    "confirm_dialogs_repeat": "轉送狀態",
+    "confirm_dialogs_unfollow": "無愛綴用者",
+    "confirm_dialogs_block": "封鎖用者",
+    "confirm_dialogs_mute": "kā用者消音",
+    "confirm_dialogs_delete": "thâi掉狀態",
+    "confirm_dialogs_logout": "登出",
+    "confirm_dialogs_approve_follow": "允准跟綴",
+    "confirm_dialogs_deny_follow": "無允准跟綴",
+    "confirm_dialogs_remove_follower": "徙走綴 lí ê",
+    "data_import_export_tab": "資料輸入／出",
+    "default_vis": "預設ê公開範圍",
+    "discoverable": "允准用tshiau-tshuē kap 其他ê服務tshuē著 tsit ê口座",
+    "domain_mutes": "域名",
+    "avatar_size_instruction": "建議ê標頭影像sài-suh 是150x150畫素。",
+    "pad_emoji": "Tuì 揀選器揀繪文字以後，佇繪文字雙 pîng 邊加空白",
+    "emoji_reactions_on_timeline": "佇時間線頂，顯示繪文字ê反應",
+    "emoji_reactions_scale": "反應ê規模係數",
+    "export_theme": "保存主題",
+    "filtering": "過濾",
+    "wordfilter": "詞語過濾器",
+    "word_filter_and_more": "詞語過濾器 kap 其他……",
+    "follow_export": "輸出 lí 所綴ê",
+    "follow_export_button": "輸出lí所綴ê kàu csv 檔",
+    "follow_import": "輸入lí所綴ê",
+    "follow_import_error": "佇輸入跟綴 ê 資料 ê 時出tshê",
+    "accent": "強調",
+    "foreground": "前景",
+    "general": "一般",
+    "hide_attachments_in_convo": "佇對話ê時，khàm附件",
+    "hide_attachments_in_tl": "Khàm掉時間線內ê附件",
+    "hide_media_previews": "Khàm掉媒體ê預展",
+    "hide_muted_posts": "Khàm掉消音ê用者ê PO文",
+    "hide_bot_indication": "Khàm 掉PO文內底ê機器lâng ê指示",
+    "hide_all_muted_posts": "Khàm掉消音êPO文",
+    "max_thumbnails": "PO文ê縮小圖ê khòo-tah（無寫=無限制）",
+    "hide_isp": "Khàm 站臺特有ê面 pang",
+    "right_sidebar": "Kā 邊á liâu徙kah正手pîng",
+    "navbar_column_stretch": "伸導覽liâu，kah 欄平闊",
+    "always_show_post_button": "一直顯示「新ê PO文」ê鈕仔",
+    "hide_wallpaper": "Khàm站臺ê壁紙",
+    "use_one_click_nsfw": "Tshi̍h 一ê就會當拍開敏感內容",
+    "hide_post_stats": "Khàm PO文ê統計數據（比如：kah 意ê額數）",
+    "hide_filtered_statuses": "Khàm 逐ê過濾掉êPO文",
+    "hide_wordfiltered_statuses": "Khàm詞語過濾掉ê狀態",
+    "hide_muted_threads": "Khàm消音ê討論線",
+    "import_blocks_from_a_csv_file": "Tuì csv 檔輸入封鎖名單",
+    "import_followers_from_a_csv_file": "Uì csv 檔輸入跟綴ê資料",
+    "import_theme": "載入主題",
+    "inputRadius": "輸入ê格仔",
+    "checkboxRadius": "選擇框仔",
+    "instance_default": "（預設：{value}）",
+    "instance_default_simple": "（預設）",
+    "interface": "界面",
+    "column_sizes_sidebar": "邊 á liâu",
+    "auto_update": "自動顯示新ê PO文",
+    "user_mutes": "用者",
+    "useStreamingApi": "連鞭收著PO文kap通知",
+    "use_websockets": "用websockets（實ê時間ê更新）",
+    "text": "文字",
+    "theme": "主題",
+    "theme_help": "用16進位ê碼(#rrggbb)來訂做家己ê色彩主題。",
+    "change_email_error": "佇換電子phue箱ê時出問題。",
+    "collapse_subject": "Kā 有主旨ê PO 文 khàm 起來",
+    "autocomplete_select_first": "若是有自動完成ê結果，自動揀頭一ê侯選ê",
+    "filtering_explanation": "見若有下跤ê詞語ê狀態，會hőng消音。一tsuā寫一ê",
+    "follows_imported": "Lí所綴ê輸入去ah！較停仔tsiah ē處理suah。",
+    "mute_bot_posts": "Kā 機器lâng ê PO文消音",
+    "hide_shoutbox": "Khàm 站臺ê留話pang",
+    "account_backup_description": "Tse 予 lí ē當 kā lín 口座 ê 資訊 kap PO 文載落來，毋過 in 猶無法度輸入kàu Pleroma口座 ê 內底。",
+    "theme_help_v2_1": "拍開選擇框á就 ē 當改掉一寡組件ê色彩kap無透明度。Ji̍h「清掉所有ê」，ē 恢復原來ê款。",
+    "preload_images": "Kā 圖片先載入",
+    "hide_user_stats": "Khàm 掉用者ê統計數據（比如：綴ê lâng額）",
+    "interfaceLanguage": "界面ê語言"
   }
 }
-- 
cgit v1.2.3-70-g09d2


From 75fcf486dc86d537b41b18cdc7873753502c3021 Mon Sep 17 00:00:00 2001
From: Kian-ting Tan <chenjt30@gmail.com>
Date: Tue, 27 Jun 2023 14:05:06 +0000
Subject: Translated using Weblate (Chinese (Min Nan) (nan_TW))

Currently translated at 43.4% (458 of 1054 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/nan_TW/
---
 src/i18n/nan-TW.json | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/i18n/nan-TW.json b/src/i18n/nan-TW.json
index c7d06bc4..84dceccc 100644
--- a/src/i18n/nan-TW.json
+++ b/src/i18n/nan-TW.json
@@ -610,6 +610,16 @@
     "theme_help_v2_1": "拍開選擇框á就 ē 當改掉一寡組件ê色彩kap無透明度。Ji̍h「清掉所有ê」，ē 恢復原來ê款。",
     "preload_images": "Kā 圖片先載入",
     "hide_user_stats": "Khàm 掉用者ê統計數據（比如：綴ê lâng額）",
-    "interfaceLanguage": "界面ê語言"
+    "interfaceLanguage": "界面ê語言",
+    "invalid_theme_imported": "Lí 所揀ê主題檔案，Pleroma 無支援，所以主題無改。",
+    "limited_availability": "你ê瀏覽器內底buē當用",
+    "links": "連結",
+    "lock_account_description": "Kan-ta lí 同意，別儂tsiah通綴lí",
+    "loop_video": "循環播出ê影片",
+    "loop_video_silent_only": "Kan-ta無聲ê影片tsiah通循環播出（比如：Mastodon ê \"gif\"）",
+    "mutes_tab": "消音",
+    "play_videos_in_modal": "佇跳出來ê框仔播出影片",
+    "url": "URL",
+    "preview": "預展"
   }
 }
-- 
cgit v1.2.3-70-g09d2


From e47328f1702b2b6e3605936c4b61ba24eec02d28 Mon Sep 17 00:00:00 2001
From: Kian-ting Tan <chenjt30@gmail.com>
Date: Thu, 29 Jun 2023 10:18:02 +0000
Subject: Translated using Weblate (Chinese (Min Nan) (nan_TW))

Currently translated at 45.4% (479 of 1054 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/nan_TW/
---
 src/i18n/nan-TW.json | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/i18n/nan-TW.json b/src/i18n/nan-TW.json
index 84dceccc..5031a31a 100644
--- a/src/i18n/nan-TW.json
+++ b/src/i18n/nan-TW.json
@@ -620,6 +620,35 @@
     "mutes_tab": "消音",
     "play_videos_in_modal": "佇跳出來ê框仔播出影片",
     "url": "URL",
-    "preview": "預展"
+    "preview": "預展",
+    "file_export_import": {
+      "backup_restore": "備份設定",
+      "backup_settings": "Kā 設定備份kàu檔案",
+      "backup_settings_theme": "Kā設定kap主題備份kàu檔案",
+      "restore_settings": "對檔案回復設定",
+      "errors": {
+        "file_too_old": "無接受ê主要版本：{fileMajor}，檔案ê版本siūnn舊，buē當處理（{feMajor} 版以後ê tsiah支援）",
+        "file_slightly_new": "檔案ê次版本無仝，一寡設定可能buē當載入去",
+        "invalid_file": "選擇ê檔案毋是Pleroma支援ê設定備份，設定無振動。",
+        "file_too_new": "無接受ê主要版本：{fileMajor}，本 PleromaFE（設定版本 {feMajor}）siūnn舊，buē當處理"
+      }
+    },
+    "profile_fields": {
+      "label": "個人資料ê meta資料",
+      "add_field": "加格仔",
+      "name": "標簽",
+      "value": "內容"
+    },
+    "birthday": {
+      "label": "生日",
+      "show_birthday": "顯示我ê生日"
+    },
+    "account_privacy": "隱私",
+    "use_contain_fit": "Mài裁附件ê縮小圖",
+    "name_bio": "名kah介紹",
+    "new_password": "新ê密碼",
+    "posts": "PO文",
+    "name": "名",
+    "new_email": "新ê電子phue箱"
   }
 }
-- 
cgit v1.2.3-70-g09d2


From d6734a1942a13476d84eb365d8c3d7b827a150a6 Mon Sep 17 00:00:00 2001
From: baloo toumi <abidin24@disroot.org>
Date: Sun, 2 Jul 2023 19:02:38 +0000
Subject: Translated using Weblate (Arabic)

Currently translated at 61.8% (652 of 1054 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ar/
---
 src/i18n/ar.json | 66 +++++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 49 insertions(+), 17 deletions(-)

(limited to 'src')

diff --git a/src/i18n/ar.json b/src/i18n/ar.json
index f2a62ff9..47ac42b1 100644
--- a/src/i18n/ar.json
+++ b/src/i18n/ar.json
@@ -43,7 +43,9 @@
     "loading": "يحمل…",
     "generic_error": "حدث خطأ",
     "scope_in_timeline": {
-      "private": "المتابِعون فقط"
+      "private": "المتابِعون فقط",
+      "public": "علني",
+      "unlisted": "غير مدرج"
     },
     "scroll_to_top": "مرر لأعلى",
     "pin": "ثبت العنصر"
@@ -65,8 +67,10 @@
     "enter_two_factor_code": "أدخل رمز الاستيثاق بعاملين",
     "recovery_code": "رمز الاستعادة",
     "heading": {
-      "totp": "الاستيثاق بعاملين"
-    }
+      "totp": "الاستيثاق بعاملين",
+      "recovery": "الاستيثاق بعاملين"
+    },
+    "description": "لج باستخدام OAuth"
   },
   "nav": {
     "chat": "الدردشة المحلية",
@@ -91,7 +95,9 @@
     "dms": "رسالة شخصية",
     "edit_finish": "تم التحرير",
     "timelines": "الخيوط الزمنية",
-    "mobile_notifications": "افتح الإشعارات (تتواجد اشعارات غير مقروءة)"
+    "mobile_notifications": "افتح الإشعارات (تتواجد اشعارات غير مقروءة)",
+    "about": "حول",
+    "user_search": "بحث عن مستخدم"
   },
   "notifications": {
     "broken_favorite": "منشور مجهول، جارٍ البحث عنه…",
@@ -106,10 +112,11 @@
     "poll_ended": "انتهى الاستطلاع",
     "no_more_notifications": "لا مزيد من الإشعارات",
     "reacted_with": "تفاعل بـ{0}",
-    "submitted_report": "أرسل بلاغًا"
+    "submitted_report": "أرسل بلاغًا",
+    "migrated_to": "انتقلَ إلى"
   },
   "post_status": {
-    "account_not_locked_warning": "",
+    "account_not_locked_warning": "حسابك ليس {0}. يمكن للجميع مشاهدة مشاركاتك المحصورة على المتابِعين.",
     "account_not_locked_warning_link": "مقفل",
     "attachments_sensitive": "اعتبر المرفقات كلها كمحتوى حساس",
     "content_type": {
@@ -122,8 +129,8 @@
     "direct_warning": "",
     "posting": "النشر",
     "scope": {
-      "direct": "",
-      "private": "",
+      "direct": "مباشر - شارك مع المستخدمين المذكورين فقط",
+      "private": "للمتابِعين فقط - شارك حصرًا مع المتابِعين",
       "public": "علني - يُنشر على الخيوط الزمنية العمومية",
       "unlisted": "غير مُدرَج - لا يُنشَر على الخيوط الزمنية العمومية"
     },
@@ -134,11 +141,17 @@
     "preview_empty": "فارغ",
     "scope_notice": {
       "public": "سيكون هذا المنشور مرئيًا للجميع",
-      "private": "سيكون هذا المنشور مرئيا لمتابِعيك فقط"
+      "private": "سيكون هذا المنشور مرئيا لمتابِعيك فقط",
+      "unlisted": "لن تظهر هته المشاركة في الخط الزمني العلني والشبكات العلنية"
     },
     "direct_warning_to_first_only": "سيكون عذا المنشور مرئيًا للمستخدمين المذكورين في أول الرسالة.",
     "edit_unsupported_warning": "بليروما لا يدعم تعديل الذكر والاستطلاع.",
-    "empty_status_error": "يتعذر نشر منشور فارغ دون ملفات"
+    "empty_status_error": "يتعذر نشر منشور فارغ دون ملفات",
+    "edit_status": "حرر الحالة",
+    "new_status": "انشر حالة جديدة",
+    "content_type_selection": "نسق المشاركة",
+    "scope_notice_dismiss": "أغلق هذا التنبيه",
+    "media_description_error": "فشل تحديث الوسائط، حاول مجددًا"
   },
   "registration": {
     "bio": "السيرة الذاتية",
@@ -203,7 +216,7 @@
     "follow_export_processing": "التصدير جارٍ، سوف يُطلَب منك تنزيل ملفك بعد حين",
     "follow_import": "استيراد الاشتراكات",
     "follow_import_error": "خطأ أثناء استيراد المتابِعين",
-    "follows_imported": "",
+    "follows_imported": "أُستورد المتابِعون! معالجتهم ستستغرق بعض الوقت.",
     "foreground": "الأمامية",
     "general": "الإعدادات العامة",
     "hide_attachments_in_convo": "اخف المرفقات من المحادثات",
@@ -498,7 +511,18 @@
       "title": "نسخة"
     },
     "commit_value": "احفظ",
-    "mention_link_display_full": "اسماء كاملة دايمًا (مثل {'@'}foo{'@'}example.org)"
+    "mention_link_display_full": "اسماء كاملة دايمًا (مثل {'@'}foo{'@'}example.org)",
+    "mute_bot_posts": "اكتم مشاركات الحسابات الآلية",
+    "mention_links": "روابط الذِكر",
+    "email_language": "لغة رسائل البريد الإلكتروني المرسلة إلي من الخادم",
+    "bot": "هذا الحساب آلي",
+    "discoverable": "اسمح بالعثور على هذا الحساب من خلال البحث وخِدمات أخرى",
+    "right_sidebar": "عكس ترتيب الأعمدة",
+    "setting_changed": "الإعدادات مغيّرة",
+    "setting_server_side": "هذا الإعداد مرتبط بحسابك وسيأثر على كل الجلسات والعملاء",
+    "allow_following_move": "اسمح بالمتابعة التلقائية عند انتقال حساب متابَع",
+    "chatMessageRadius": "رسائل",
+    "domain_mutes": "نطاقات"
   },
   "timeline": {
     "collapse": "طوي",
@@ -622,7 +646,9 @@
     "expired": "انتهى الاستطلاع منذ {0}",
     "add_poll": "أضف استطلاعًا",
     "add_option": "أضف خيارًا",
-    "option": "خيار"
+    "option": "خيار",
+    "people_voted_count": "{count} شخص صوّت| {count} شخص صوّت",
+    "votes_count": "{count} صوت | {count} صوت"
   },
   "emoji": {
     "stickers": "ملصقات",
@@ -633,10 +659,13 @@
       "food-and-drink": "أطعمة ومشروبات",
       "symbols": "رموز",
       "activities": "نشاطات",
-      "flags": "أعلام"
+      "flags": "أعلام",
+      "smileys-and-emotion": "ابتسامات وانفعالات",
+      "travel-and-places": "سفر وأماكن"
     },
     "add_emoji": "أدخل إيموجي",
-    "custom": "إيموجي مخصص"
+    "custom": "إيموجي مخصص",
+    "keep_open": "أبق المنتقي مفتوحًا"
   },
   "interactions": {
     "emoji_reactions": "تفاعلات بالإيموجي",
@@ -658,7 +687,9 @@
   },
   "image_cropper": {
     "save": "احفظ",
-    "cancel": "ألغ"
+    "cancel": "ألغ",
+    "crop_picture": "اقتصاص الصورة",
+    "save_without_cropping": "احفظ دون اقتصاص"
   },
   "importer": {
     "submit": "أرسل",
@@ -678,7 +709,8 @@
   "media_modal": {
     "previous": "السابق",
     "next": "التالي",
-    "hide": "أغلق عارض الوسائط"
+    "hide": "أغلق عارض الوسائط",
+    "counter": "{current}\\{total}"
   },
   "remote_user_resolver": {
     "searching_for": "يبحث عن",
-- 
cgit v1.2.3-70-g09d2


From 273aeea05e89abe77f1e096578a774c289bba078 Mon Sep 17 00:00:00 2001
From: Poesty Li <poesty7450@gmail.com>
Date: Sun, 2 Jul 2023 04:36:32 +0000
Subject: Translated using Weblate (Chinese (Simplified))

Currently translated at 99.8% (1052 of 1054 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hans/
---
 src/i18n/zh.json | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 100 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/i18n/zh.json b/src/i18n/zh.json
index e91e576c..69266caa 100644
--- a/src/i18n/zh.json
+++ b/src/i18n/zh.json
@@ -699,7 +699,7 @@
     "hide_muted_threads": "不显示已隐藏的同主题帖子",
     "notification_visibility_polls": "你所投的投票的结束于",
     "tree_advanced": "允许在树状视图中进行更灵活的导航",
-    "tree_fade_ancestors": "以模糊的文字显示当前状态的原型",
+    "tree_fade_ancestors": "以模糊的文字显示当前状态的上级",
     "conversation_display_linear": "线性样式",
     "mention_link_fade_domain": "淡化域名（例如：{'@'}example.org 中的 {'@'}foo{'@'}example.org）",
     "mention_link_bolden_you": "当你被提及时突出显示提及你",
@@ -738,7 +738,16 @@
     "mention_link_show_avatar": "在链接旁边显示用户头像",
     "mention_link_show_avatar_quick": "在提及内容旁边显示用户头像",
     "user_popover_avatar_action_open": "打开个人资料",
-    "autocomplete_select_first": "当有自动完成的结果时，自动选择第一个候选项"
+    "autocomplete_select_first": "当有自动完成的结果时，自动选择第一个候选项",
+    "url": "URL",
+    "preview": "预览",
+    "commit_value": "保存",
+    "commit_value_tooltip": "当前值未保存，请按此按钮以提交你的修改",
+    "reset_value": "重置",
+    "reset_value_tooltip": "重置草稿",
+    "hard_reset_value": "硬重置",
+    "hard_reset_value_tooltip": "从存储中移除设置，强制使用默认值",
+    "emoji_reactions_scale": "表情回应比例系数"
   },
   "time": {
     "day": "{0} 天",
@@ -869,7 +878,9 @@
     "delete_confirm_accept_button": "删除",
     "delete_confirm_cancel_button": "保留",
     "show_attachment_in_modal": "在媒体模式中显示",
-    "status_history": "状态历史"
+    "status_history": "状态历史",
+    "delete_error": "删除状态时出错：{0}",
+    "reaction_count_label": "{num} 人作出了表情回应"
   },
   "user_card": {
     "approve": "核准",
@@ -1195,5 +1206,91 @@
     "lists": "列表",
     "new": "新的列表",
     "title": "列表标题"
+  },
+  "admin_dash": {
+    "window_title": "管理员",
+    "old_ui_link": "旧的管理界面在此处",
+    "reset_all": "重置全部",
+    "commit_all": "保存全部",
+    "tabs": {
+      "nodb": "无数据库配置",
+      "instance": "实例",
+      "limits": "限制",
+      "frontends": "前端"
+    },
+    "nodb": {
+      "heading": "数据库配置已禁用",
+      "documentation": "文档",
+      "text2": "大多数配置选项将不可用。",
+      "text": "你需要修改后端配置文件，以便将 {property} 设置为 {value}，更多内容请参见 {documentation}。"
+    },
+    "captcha": {
+      "native": "本地",
+      "kocaptcha": "KoCaptcha"
+    },
+    "instance": {
+      "instance": "实例信息",
+      "registrations": "用户注册",
+      "captcha_header": "验证码",
+      "kocaptcha": "KoCaptcha 设置",
+      "access": "实例访问",
+      "restrict": {
+        "header": "限制匿名访客的访问",
+        "timelines": "时间线访问",
+        "profiles": "用户个人资料访问",
+        "activities": "状态/活动访问",
+        "description": "允许/不允许访问特定 API 的详细设置。默认情况下（不确定状态），如果实例不是公开的，它将拒绝访问；勾选复选框意味着即使实例是公开的，也拒绝访问；不勾选意味着即使实例是私有的，也允许访问。请注意，如果某些设置被设定，可能会发生意想不到的行为，例如，如果个人资料访问被禁用，显示的帖文将不包含个人资料信息。"
+      }
+    },
+    "limits": {
+      "arbitrary_limits": "任意限制",
+      "posts": "帖文限制",
+      "uploads": "附件限制",
+      "users": "用户个人资料限制",
+      "profile_fields": "个人资料字段限制",
+      "user_uploads": "个人资料媒体限制"
+    },
+    "frontend": {
+      "repository": "存储库链接",
+      "versions": "可用版本",
+      "build_url": "构建产物 URL",
+      "reinstall": "重新安装",
+      "is_default": "（默认）",
+      "is_default_custom": "（默认，版本：{version}）",
+      "install": "安装",
+      "install_version": "安装版本 {version}",
+      "more_install_options": "更多安装选项",
+      "more_default_options": "更多默认设置选项",
+      "set_default": "设为默认",
+      "set_default_version": "将版本 {version} 设为默认",
+      "wip_notice": "请注意，此部分是一个WIP，缺乏某些功能，因为前端管理的后台实现并不完整。",
+      "default_frontend": "默认前端",
+      "default_frontend_tip": "默认的前端将显示给所有用户。目前还没有办法让用户选择个人的前端。如果你不使用 PleromaFE，你很可能不得不使用旧的和有问题的 AdminFE 来进行实例配置，直到我们替换它。",
+      "default_frontend_tip2": "WIP: 由于 Pleroma 后端没有正确列出所有已安装的前端，你必须手动输入名称和引用。下面的列表提供了填写这些值的快捷方式。",
+      "available_frontends": "可供安装"
+    },
+    "temp_overrides": {
+      ":pleroma": {
+        ":instance": {
+          ":public": {
+            "label": "实例是公开的",
+            "description": "禁用此功能将使所有的 API 只能被已登录用户访问，这将使公共和联邦时间线无法被匿名访客访问。"
+          },
+          ":limit_to_local_content": {
+            "label": "将搜索限于本地内容",
+            "description": "禁用未认证用户（默认）、所有用户或无人的全局网络搜索"
+          },
+          ":description_limit": {
+            "label": "限制",
+            "description": "附件描述的字数限制"
+          },
+          ":background_image": {
+            "label": "背景图片",
+            "description": "背景图片（主要使用于 PleromaFE）"
+          }
+        }
+      }
+    },
+    "wip_notice": "此管理仪表板是实验性和 WIP 的，{adminFeLink}。"
   }
 }
-- 
cgit v1.2.3-70-g09d2


From 6e93fbb96a8acac4ace4e67c4fa9987f3327a223 Mon Sep 17 00:00:00 2001
From: Kian-ting Tan <chenjt30@gmail.com>
Date: Sat, 1 Jul 2023 12:57:25 +0000
Subject: Translated using Weblate (Chinese (Min Nan) (nan_TW))

Currently translated at 52.1% (550 of 1054 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/nan_TW/
---
 src/i18n/nan-TW.json | 85 +++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 81 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/i18n/nan-TW.json b/src/i18n/nan-TW.json
index 5031a31a..9fe98b37 100644
--- a/src/i18n/nan-TW.json
+++ b/src/i18n/nan-TW.json
@@ -163,7 +163,7 @@
     "hide": "關掉媒體瀏覽"
   },
   "nav": {
-    "about": "有關本站",
+    "about": "關係本站",
     "administration": "管理",
     "back": "轉去",
     "friend_requests": "跟綴請求",
@@ -172,14 +172,14 @@
     "dms": "私人 phue",
     "public_tl": "公共時間線",
     "timeline": "時間線",
-    "home_timeline": "厝 ê 時間線",
+    "home_timeline": "Tshù ê 時間線",
     "twkn": "知影 ê 網路",
     "bookmarks": "冊籤",
     "user_search": "Tshuē 用者",
     "search_close": "關掉 tshiau-tshuē liâu",
     "who_to_follow": "Siáng ē當綴",
     "preferences": "個人 ê 設定",
-    "timelines": "時間流",
+    "timelines": "時間線",
     "chats": "開講",
     "lists": "列單",
     "edit_nav_mobile": "自訂導覽條",
@@ -649,6 +649,83 @@
     "new_password": "新ê密碼",
     "posts": "PO文",
     "name": "名",
-    "new_email": "新ê電子phue箱"
+    "new_email": "新ê電子phue箱",
+    "notification_visibility_likes": "收藏",
+    "hide_favorites_description": "Mài 顯示阮收藏ê列單（別儂uân-á ē收著通知）",
+    "user_profiles": "用者ê資料",
+    "notification_visibility": "Beh顯示啥款ê通知",
+    "notification_visibility_follows": "綴ê儂",
+    "notification_visibility_mentions": "提起",
+    "notification_visibility_repeats": "轉送",
+    "notification_visibility_moves": "用者suá位",
+    "notification_visibility_emoji_reactions": "回應",
+    "notification_visibility_polls": "Lí參與ê選舉辦suah佇",
+    "no_rich_text_description": "Po文mài用RTF格式",
+    "no_blocks": "無封鎖",
+    "no_mutes": "無消音",
+    "hide_follows_description": "Mài顯示我綴ê儂",
+    "hide_followers_description": "Mài顯示綴我ê儂",
+    "hide_follows_count_description": "Mài顯示我跟綴ê儂額",
+    "hide_followers_count_description": "Mài顯示綴我ê儂額",
+    "show_moderator_badge": "佇我ê個人資料顯示「管理員」證章",
+    "nsfw_clickthrough": "Khàm掉敏感ê媒體內容",
+    "oauth_tokens": "OAuth token",
+    "refresh_token": "對頭the̍h token",
+    "valid_until": "到期佇",
+    "revoke_token": "撤回",
+    "panelRadius": "面pang",
+    "presets": "代先ê設定",
+    "profile_background": "個人資料ê背景",
+    "profile_banner": "個人資料ê條á",
+    "profile_tab": "個人資料",
+    "radii_help": "設定界面邊á ê khà-buh (curve) ê 半徑（單位：畫素）",
+    "replies_in_timeline": "佇時間線內底ê回應",
+    "reply_visibility_all": "顯示所有ê回應",
+    "reply_visibility_following": "Kan-ta顯示 @ 我抑是我綴ê儂ê回應",
+    "reply_visibility_self": "Kan-ta顯示@我ê回應",
+    "reply_visibility_following_short": "顯示予我所綴ê儂ê回應",
+    "reply_visibility_self_short": "Kan-ta顯示予我ka-kī ê回應",
+    "autohide_floating_post_button": "自動khàm掉「新êPO文」ê鈕仔（行動版）",
+    "saving_err": "佇保存設定ê時出tshê",
+    "saving_ok": "設定保存好ah",
+    "search_user_to_block": "Tshuē lí beh封鎖ê",
+    "search_user_to_mute": "Tshuē lí beh 消音ê",
+    "security_tab": "安全",
+    "scope_copy": "回應ê時ē khóo-pih ê範圍（私人phue 定著ē hőng khóo-pih）",
+    "minimal_scopes_mode": "Kā PO文ê公開範圍ê選項，kiu kah上細",
+    "set_new_avatar": "設定新ê標頭",
+    "set_new_profile_background": "設定新ê個人資料ê背景",
+    "set_new_profile_banner": "設定新ê個人資料ê條á",
+    "reset_avatar": "Tuì頭設定標頭",
+    "reset_profile_background": "Tuì頭設個人資料ê背景",
+    "reset_profile_banner": "Tuì頭設個人資料ê條á",
+    "reset_avatar_confirm": "Lí敢確實beh tuì頭設定標頭？",
+    "reset_banner_confirm": "Lí敢確實beh tuì頭設定條á？",
+    "reset_background_confirm": "Lí敢確實beh tuì頭設定背景？",
+    "settings": "設定",
+    "subject_input_always_show": "一直顯示主旨ê格á",
+    "subject_line_behavior": "回應ê時，khóo-pih主旨",
+    "subject_line_email": "電子phue風格：「re: 主旨」",
+    "subject_line_mastodon": "Mastodon風格：主旨無變",
+    "subject_line_noop": "Mài khóo-pih",
+    "conversation_display": "顯示對話ê風格",
+    "conversation_display_tree": "樹á ê形",
+    "disable_sticky_headers": "Mài 予欄位ê頭牢佇螢幕頂懸",
+    "show_scrollbars": "展示邊á liâu ê giú-á",
+    "third_column_mode": "空間夠額ê時，展示第三ê欄位",
+    "third_column_mode_none": "不管時mài顯示第三ê欄位",
+    "third_column_mode_notifications": "通知ê欄位",
+    "third_column_mode_postform": "主要êPO文表kah導覽",
+    "show_admin_badge": "佇我ê個人資料顯示「行政員」證章",
+    "pause_on_unfocused": "若是 Pleroma ê分頁無點開，tiō 暫停更新"
+  },
+  "status": {
+    "favorites": "收藏"
+  },
+  "user_card": {
+    "favorites": "收藏"
+  },
+  "tool_tip": {
+    "favorite": "收藏"
   }
 }
-- 
cgit v1.2.3-70-g09d2


From 8173a460305fa356093086f5bf9979c7cf7860de Mon Sep 17 00:00:00 2001
From: baloo toumi <abidin24@disroot.org>
Date: Wed, 5 Jul 2023 11:53:28 +0000
Subject: Translated using Weblate (Arabic)

Currently translated at 63.7% (672 of 1054 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ar/
---
 src/i18n/ar.json | 38 ++++++++++++++++++++++++++------------
 1 file changed, 26 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/i18n/ar.json b/src/i18n/ar.json
index 47ac42b1..658838b7 100644
--- a/src/i18n/ar.json
+++ b/src/i18n/ar.json
@@ -249,7 +249,7 @@
     "refresh_token": "رمز التحديث",
     "valid_until": "صالح حتى",
     "revoke_token": "سحب",
-    "panelRadius": "",
+    "panelRadius": "لوحات",
     "pause_on_unfocused": "",
     "presets": "النماذج",
     "profile_background": "خلفية الملف التعريفي",
@@ -258,8 +258,8 @@
     "radii_help": "",
     "replies_in_timeline": "المشاركات في الخيط الزمني",
     "reply_visibility_all": "أظهر كل المشاركات",
-    "reply_visibility_following": "",
-    "reply_visibility_self": "",
+    "reply_visibility_following": "أظهر الردود الموجهة إلي أو لمتابَعي فقط",
+    "reply_visibility_self": "أظهر الردود الموجهة إلي فقط",
     "saving_err": "خطأ أثناء حفظ الإعدادات",
     "saving_ok": "حُفظت الإعدادات",
     "security_tab": "الأمان",
@@ -267,10 +267,10 @@
     "set_new_profile_background": "اختيار خلفية جديدة للملف الشخصي",
     "set_new_profile_banner": "اختيار رأسية جديدة للصفحة الشخصية",
     "settings": "الإعدادات",
-    "stop_gifs": "",
-    "streaming": "",
-    "text": "النص",
-    "theme": "المظهر",
+    "stop_gifs": "إيقاف الصور المتحركة مالم يُمرر فوقها",
+    "streaming": "إظهار المنشورات الجديدة عند التمرير لأعلى",
+    "text": "نص",
+    "theme": "السمة",
     "theme_help": "",
     "tooltipRadius": "",
     "user_settings": "إعدادات المستخدم",
@@ -374,10 +374,12 @@
     },
     "profile_fields": {
       "add_field": "أضف حقل",
-      "value": "محتوى"
+      "value": "محتوى",
+      "label": "البيانات الوصفية للملف الشخصي",
+      "name": "لصيقة"
     },
     "posts": "منشورات",
-    "user_profiles": "ملفات تعريفية للمستخدمين",
+    "user_profiles": "ملفات المستخدمين الشخصية",
     "notification_visibility_emoji_reactions": "تفاعلات",
     "notification_visibility_polls": "انتهاء استطلاعات اشتركت بها",
     "file_export_import": {
@@ -409,7 +411,8 @@
         "keep_color": "أبق الألوان",
         "keep_opacity": "أبق الشفافية",
         "keep_fonts": "أبق الخطوط",
-        "keep_shadows": "أبق الظلال"
+        "keep_shadows": "أبق الظلال",
+        "clear_opacity": "امسح الشفافية"
       },
       "common": {
         "color": "اللون",
@@ -522,7 +525,18 @@
     "setting_server_side": "هذا الإعداد مرتبط بحسابك وسيأثر على كل الجلسات والعملاء",
     "allow_following_move": "اسمح بالمتابعة التلقائية عند انتقال حساب متابَع",
     "chatMessageRadius": "رسائل",
-    "domain_mutes": "نطاقات"
+    "domain_mutes": "نطاقات",
+    "new_email": "البريد إلكتروني الجديد",
+    "notification_visibility_moves": "هجرة مستخدم",
+    "subject_line_mastodon": "مثل ماستودون: انسخ الأصلي",
+    "hide_follows_description": "لا تظهر متابَعي",
+    "conversation_other_replies_button_inside": "داخل الحالات",
+    "autohide_floating_post_button": "اخفاء زر النشر تلقائيا (هاتف)",
+    "conversation_other_replies_button_below": "تحت الحالات",
+    "reply_visibility_following_short": "أظهر الردود الموجهة إلى متابَعي",
+    "conversation_display_linear": "خطي",
+    "conversation_other_replies_button": "أظهر زر \"ردود أخرى\"",
+    "hide_followers_description": "لا تظهر متابِعي"
   },
   "timeline": {
     "collapse": "طوي",
@@ -546,7 +560,7 @@
     "follow": "تابع",
     "followees": "متابَعون",
     "followers": "مُتابِعون",
-    "following": "",
+    "following": "متابَع!",
     "follows_you": "يتابعك!",
     "mute": "اكتم",
     "muted": "مكتوم",
-- 
cgit v1.2.3-70-g09d2


From a417867ec78f8175ae53a246e198c966e7b78f82 Mon Sep 17 00:00:00 2001
From: "@t12" <alt3753.7@gmail.com>
Date: Tue, 4 Jul 2023 17:33:28 +0000
Subject: Translated using Weblate (Indonesian)

Currently translated at 49.4% (521 of 1054 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/id/
---
 src/i18n/id.json | 94 ++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 82 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/i18n/id.json b/src/i18n/id.json
index 73cc2a71..1b5fee5a 100644
--- a/src/i18n/id.json
+++ b/src/i18n/id.json
@@ -214,7 +214,8 @@
     "domain_mutes": "Domain",
     "composing": "Menulis",
     "no_blocks": "Tidak ada yang diblokir",
-    "no_mutes": "Tidak ada yang dibisukan"
+    "no_mutes": "Tidak ada yang dibisukan",
+    "remove_language": "Hapus"
   },
   "about": {
     "mrf": {
@@ -230,7 +231,9 @@
         "accept_desc": "Instansi ini hanya menerima pesan dari instansi-instansi berikut:",
         "accept": "Terima",
         "media_removal": "Penghapusan Media",
-        "media_removal_desc": "Instansi ini menghapus media dari postingan yang berasal dari instansi-instansi berikut:"
+        "media_removal_desc": "Instansi ini menghapus media dari postingan yang berasal dari instansi-instansi berikut:",
+        "instance": "Instance",
+        "reason": "Alasan"
       },
       "federation": "Federasi",
       "mrf_policies": "Kebijakan MRF yang diaktifkan"
@@ -437,7 +440,10 @@
       "password_required": "tidak boleh kosong",
       "email_required": "tidak boleh kosong",
       "fullname_required": "tidak boleh kosong",
-      "username_required": "tidak boleh kosong"
+      "username_required": "tidak boleh kosong",
+      "password_confirmation_match": "wajib sama dengan sandi",
+      "birthday_required": "tidak boleh kosong",
+      "birthday_min_age": "wajib sama dengan atau sebelum {date}"
     },
     "register": "Daftar",
     "fullname_placeholder": "contoh. Lain Iwakura",
@@ -450,7 +456,12 @@
     "bio": "Bio",
     "reason_placeholder": "Instansi ini menerima pendaftaran secara manual.\nBeritahu administrasinya mengapa Anda ingin mendaftar.",
     "reason": "Alasan mendaftar",
-    "registration": "Pendaftaran"
+    "registration": "Pendaftaran",
+    "email_language": "Dalam bahasa apa kamu ingin menerima surel dari server ini?",
+    "email_optional": "Surel (opsional)",
+    "birthday": "Ulang tahun:",
+    "birthday_optional": "Ulang tahun (opsional):",
+    "bio_optional": "Bio (opsional)"
   },
   "post_status": {
     "preview_empty": "Kosong",
@@ -482,7 +493,8 @@
     "empty_status_error": "Tidak dapat memposting status kosong tanpa berkas",
     "account_not_locked_warning_link": "terkunci",
     "account_not_locked_warning": "Akun Anda tidak {0}. Siapapun dapat mengikuti Anda untuk melihat postingan hanya-pengikut Anda.",
-    "new_status": "Posting status baru"
+    "new_status": "Posting status baru",
+    "edit_status": "Sunting status"
   },
   "general": {
     "apply": "Terapkan",
@@ -508,7 +520,15 @@
     "generic_error": "Terjadi kesalahan",
     "loading": "Memuat…",
     "more": "Lebih banyak",
-    "submit": "Kirim"
+    "submit": "Kirim",
+    "yes": "Ya",
+    "no": "Tidak",
+    "scope_in_timeline": {
+      "direct": "Langsung",
+      "private": "Hanya pengikut",
+      "public": "Publik"
+    },
+    "generic_error_message": "Terjadi kesalahan: {0}"
   },
   "remote_user_resolver": {
     "error": "Tidak ditemukan."
@@ -522,7 +542,18 @@
     "emoji": "Emoji",
     "stickers": "Stiker",
     "keep_open": "Tetap buka pemilih",
-    "custom": "Emoji kustom"
+    "custom": "Emoji kustom",
+    "unicode_groups": {
+      "activities": "Aktivitas",
+      "animals-and-nature": "Hewan & Alam",
+      "flags": "Bendera",
+      "food-and-drink": "Makanan & Minuman",
+      "objects": "Objek",
+      "people-and-body": "Orang & Tubuh",
+      "smileys-and-emotion": "Emosi",
+      "symbols": "Simbol",
+      "travel-and-places": "Perjalanan & Tempat-tempat"
+    }
   },
   "polls": {
     "expired": "Japat berakhir {0} yang lalu",
@@ -553,11 +584,17 @@
     "timelines": "Linimasa",
     "chats": "Obrolan",
     "dms": "Pesan langsung",
-    "friend_requests": "Ingin mengikuti"
+    "friend_requests": "Ingin mengikuti",
+    "twkn": "Jaringan Dikenal",
+    "mobile_notifications_close": "Tutup notifikasi",
+    "announcements": "Pengumuman",
+    "mobile_notifications": "Buka notifikasi (ada yang belum dibaca)"
   },
   "media_modal": {
     "next": "Selanjutnya",
-    "previous": "Sebelum"
+    "previous": "Sebelum",
+    "counter": "{current} / {total}",
+    "hide": "Tutup penampil media"
   },
   "login": {
     "recovery_code": "Kode pemulihan",
@@ -574,7 +611,10 @@
     "heading": {
       "totp": "Otentikasi dua-faktor"
     },
-    "enter_two_factor_code": "Masukkan kode dua-faktor"
+    "enter_two_factor_code": "Masukkan kode dua-faktor",
+    "logout_confirm": "Apa kamu yakin ingin keluar?",
+    "logout_confirm_accept_button": "Keluar",
+    "logout_confirm_cancel_button": "Jangan keluar"
   },
   "importer": {
     "error": "Terjadi kesalahan ketika mnengimpor berkas ini.",
@@ -597,7 +637,8 @@
     "gopher": "Gopher",
     "pleroma_chat_messages": "Pleroma Obrolan",
     "chat": "Obrolan",
-    "upload_limit": "Batas unggahan"
+    "upload_limit": "Batas unggahan",
+    "media_proxy": "Proxy media"
   },
   "exporter": {
     "processing": "Memproses, Anda akan segera diminta untuk mengunduh berkas Anda",
@@ -619,12 +660,41 @@
     "moves": "Pengguna yang bermigrasi",
     "follows": "Pengikut baru",
     "favs_repeats": "Ulangan dan favorit",
-    "load_older": "Muat interaksi yang lebih tua"
+    "load_older": "Muat interaksi yang lebih tua",
+    "emoji_reactions": "Reaksi Emoji",
+    "reports": "Laporan"
   },
   "errors": {
     "storage_unavailable": "Pleroma tidak dapat mengakses penyimpanan browser. Login Anda atau pengaturan lokal Anda tidak akan tersimpan dan masalah yang tidak terduga dapat terjadi. Coba mengaktifkan kuki."
   },
   "shoutbox": {
     "title": "Kotak Suara"
+  },
+  "report": {
+    "state_closed": "Ditutup",
+    "reporter": "Pelapor:",
+    "reported_statuses": "Status yang dilaporkan:",
+    "reported_user": "Pengguna yang dilaporkan:",
+    "notes": "Catatan:",
+    "state": "Status:",
+    "state_open": "Terbuka",
+    "state_resolved": "Selesai"
+  },
+  "announcements": {
+    "end_time_prompt": "Waktu berakhir: ",
+    "published_time_display": "Diterbitkan pada {time}",
+    "page_header": "Pengumuman",
+    "title": "Pengumuman",
+    "mark_as_read_action": "Tandai telah dibaca",
+    "post_placeholder": "Ketik isi pengumumanmu di sini...",
+    "close_error": "Tutup",
+    "delete_action": "Hapus",
+    "start_time_prompt": "Waktu mulai: ",
+    "post_error": "Kesalahan: {error}",
+    "start_time_display": "Dimulai pada {time}",
+    "end_time_display": "Berakhir pada {time}",
+    "edit_action": "Sunting",
+    "submit_edit_action": "Kirim",
+    "cancel_edit_action": "Batal"
   }
 }
-- 
cgit v1.2.3-70-g09d2


From fc2aca4ddcce24703e0a389a012a2c50f0b375a5 Mon Sep 17 00:00:00 2001
From: baloo toumi <abidin24@disroot.org>
Date: Thu, 6 Jul 2023 18:03:03 +0000
Subject: Translated using Weblate (Arabic)

Currently translated at 65.5% (691 of 1054 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ar/
---
 src/i18n/ar.json | 34 +++++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/i18n/ar.json b/src/i18n/ar.json
index 658838b7..bb2cbfa7 100644
--- a/src/i18n/ar.json
+++ b/src/i18n/ar.json
@@ -430,13 +430,17 @@
         "disabled": "معطل",
         "tabs": "ألسنة",
         "chat": {
-          "border": "حدود"
+          "border": "حدود",
+          "incoming": "وارد",
+          "outgoing": "صادر"
         },
         "alert_warning": "تحذير",
         "alert_error": "خطأ",
         "buttons": "أزرار",
         "borders": "الحدود",
-        "wallpaper": "خلفية"
+        "wallpaper": "خلفية",
+        "pressed": "مضغوط",
+        "inputs": "حقول إدخال"
       },
       "shadows": {
         "components": {
@@ -472,6 +476,9 @@
         "fine_print": "طالع {0} لتعلّم ما لا ينفعك!",
         "error": "مثال خطأ",
         "faint_link": "دليل للمساعدة"
+      },
+      "radii": {
+        "_tab_label": "الانحناء"
       }
     },
     "notification_setting_privacy": "الخصوصية",
@@ -598,7 +605,8 @@
     "message": "راسل",
     "mute_confirm": "أتريد كتم {user}؟",
     "mute_confirm_accept_button": "اكتم",
-    "mention": "أذكر"
+    "mention": "أذكر",
+    "mute_duration_prompt": "اكتم هذا الشخص لـ (ضع 0 لكتمه دائمًا):"
   },
   "user_profile": {
     "timeline_title": "الخيط الزمني للمستخدم"
@@ -754,7 +762,9 @@
     },
     "limits": {
       "posts": "حد النشر",
-      "uploads": "حد المرفقات"
+      "uploads": "حد المرفقات",
+      "profile_fields": "حد حقول الملف الشخصي",
+      "user_uploads": "حد وسائط الملف الشخصي"
     },
     "frontend": {
       "repository": "رابط المستودع",
@@ -782,6 +792,9 @@
           },
           ":background_image": {
             "label": "صورة الخلفية"
+          },
+          ":limit_to_local_content": {
+            "label": "اقتصار البحث على المحتوى المحلي"
           }
         }
       }
@@ -853,6 +866,17 @@
     "remove_attachment": "أزل المرفق",
     "move_up": "حرك المرفق لليسار",
     "open_gallery": "افتح المعرض",
-    "thread_show": "أظهر هذا النقاس"
+    "thread_show": "أظهر هذا النقاس",
+    "nsfw": "محتوى حساس NSFW",
+    "status_history": "تأريخ الحالة",
+    "thread_show_full_with_icon": "{icon} {text}",
+    "thread_follow_with_icon": "{icon} {text}",
+    "show_all_conversation_with_icon": "{icon} {text}",
+    "ancestor_follow_with_icon": "{icon} {text}",
+    "show_only_conversation_under_this": "أظهر الردود على هذه الحالة فقط",
+    "reaction_count_label": "تفاعل {num} شخص | تفاعل {num} أشخاص",
+    "replies_list_with_others": "رد (+ {numReplies} آخر): | رد (+ {numReplies} آخرون):",
+    "show_attachment_in_modal": "أظهر الوسائط في منبثقات",
+    "show_attachment_description": "معاينة الوصف ( افتح المرفق لقراءة الوصف الكامل)"
   }
 }
-- 
cgit v1.2.3-70-g09d2


From 6413aef1b4ae89f83042ad89f0bb6190feedc939 Mon Sep 17 00:00:00 2001
From: baloo toumi <abidin24@disroot.org>
Date: Sun, 9 Jul 2023 18:01:12 +0000
Subject: Translated using Weblate (Arabic)

Currently translated at 75.5% (796 of 1054 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ar/
---
 src/i18n/ar.json | 187 +++++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 161 insertions(+), 26 deletions(-)

(limited to 'src')

diff --git a/src/i18n/ar.json b/src/i18n/ar.json
index bb2cbfa7..de037ce5 100644
--- a/src/i18n/ar.json
+++ b/src/i18n/ar.json
@@ -299,7 +299,7 @@
       }
     },
     "block_import": "استيراد المحجوبين",
-    "import_mutes_from_a_csv_file": "استورد قائمة المكتومين من ملف csv",
+    "import_mutes_from_a_csv_file": "استورد قائمة الخُرس من ملف csv",
     "account_backup": "نسخ احتياطي للحساب",
     "download_backup": "نزّل",
     "account_backup_table_head": "نسخ احتياطي",
@@ -310,7 +310,7 @@
     "added_backup": "أُضيفت نسخة احتياطية جديدة.",
     "blocks_tab": "المحجوبون",
     "confirm_dialogs_block": "حجب مستخدم",
-    "confirm_dialogs_mute": "كتم مستخدم",
+    "confirm_dialogs_mute": "إخراس مستخدم",
     "confirm_dialogs_delete": "حذف حالة",
     "confirm_dialogs_logout": "خروج",
     "confirm_dialogs_approve_follow": "قبول متابِع",
@@ -321,18 +321,18 @@
     "add_alias_error": "حدث خطأ أثناء إضافة الكنية: {error}",
     "confirm_dialogs": "أطلب تأكيدًا عند",
     "confirm_dialogs_repeat": "مشاركة حالة",
-    "mutes_and_blocks": "المكتومون والمحجوبون",
+    "mutes_and_blocks": "الخُرس والمحجوبون",
     "move_account_target": "الحساب المستهدف (مثل {example})",
     "wordfilter": "ترشيح الكلمات",
     "always_show_post_button": "أظهر الزر العائم لإنشاء منشور جديد دائمًا",
     "hide_wallpaper": "اخف خلفية المثيل",
     "save": "احفظ التعديلات",
     "lists_navigation": "أظهر القوائم في شريط التنقل",
-    "mute_export_button": "صدّر قائمة المكتومين إلى ملف csv",
+    "mute_export_button": "صدّر قائمة الخرس إلى ملف csv",
     "blocks_imported": "اُستورد المحجوبون! معالجة القائمة ستستغرق وقتًا.",
-    "mute_export": "تصدير المكتومين",
-    "mute_import": "استيراد المكتومين",
-    "mute_import_error": "خطأ أثناء استيراد المكتومين",
+    "mute_export": "تصدير الخُرس",
+    "mute_import": "استيراد الخُرس",
+    "mute_import_error": "خطأ أثناء استيراد الخُرس",
     "change_email_error": "حدثت خلل أثناء تغيير بريدك الإلكتروني.",
     "change_email": "غيّر البريد الإلكتروني",
     "changed_email": "نجح تغيير البريد الإلكتروني!",
@@ -341,14 +341,14 @@
     "move_account": "أنقل الحساب",
     "moved_account": "نُقل الحساب.",
     "hide_media_previews": "اخف معاينات الوسائط",
-    "hide_muted_posts": "اخف منشورات المستخدمين المكتومين",
+    "hide_muted_posts": "اخف منشورات المستخدمين الخُرس",
     "confirm_dialogs_unfollow": "الغاء متابعة مستخدم",
     "confirm_dialogs_remove_follower": "إزالة متابع",
     "new_alias_target": "أضف كنية جديدة (مثل {example})",
     "added_alias": "أُضيفت الكنية.",
     "move_account_error": "خطأ أثناء نقل الحساب: {error}",
     "emoji_reactions_on_timeline": "أظهر التفاعلات في الخط الزمني",
-    "mutes_imported": "اُستورد المكتومون! معالجة القئمة ستستغرق وقتًا.",
+    "mutes_imported": "اُستورد الخُرس! معالجة القائمة ستستغرق وقتًا.",
     "remove_language": "أزل",
     "primary_language": "اللغة الرئيسية:",
     "expert_mode": "أظهر الإعدادات المتقدمة",
@@ -388,8 +388,8 @@
       "backup_settings_theme": "احفظ النسخ الاحتياطي للإعدادات والسمة في ملف",
       "backup_settings": "احفظ النسخ الاحتياطي للإعدادات في ملف"
     },
-    "mutes_tab": "مكتومون",
-    "no_mutes": "لا يوجد مكتومون",
+    "mutes_tab": "خُرس",
+    "no_mutes": "لا يوجد خُرس",
     "hide_followers_count_description": "لا تظهر عدد المتابِعين",
     "show_moderator_badge": "أظهر شارة \"مشرف\" في ملفي التعريفي",
     "hide_follows_count_description": "لا تظهر عدد المتابَعين",
@@ -482,8 +482,8 @@
       }
     },
     "notification_setting_privacy": "الخصوصية",
-    "notification_mutes": "لوقف استلام إشعارات من مستخدم، اكتمه.",
-    "search_user_to_mute": "جِد من تريد كتمه",
+    "notification_mutes": "لوقف استلام إشعارات من مستخدم، أخرسه.",
+    "search_user_to_mute": "جِد من تريد إخراسه",
     "subject_input_always_show": "أظهر حقل الموضوع دائمًا",
     "subject_line_noop": "لا تنسخ",
     "auto_update": "أظهر المنشورات الجديدة تلقائيًا",
@@ -569,8 +569,8 @@
     "followers": "مُتابِعون",
     "following": "متابَع!",
     "follows_you": "يتابعك!",
-    "mute": "اكتم",
-    "muted": "مكتوم",
+    "mute": "أخرِس",
+    "muted": "أخرَس",
     "per_day": "في اليوم",
     "remote_follow": "مُتابَعة عن بُعد",
     "statuses": "المنشورات",
@@ -600,16 +600,54 @@
     "unfollow_confirm_cancel_button": "لا تلغ المتابعة",
     "media": "وسائط",
     "block_confirm": "أتريد حظر {user} ؟",
-    "mute_confirm_cancel_button": "لا تكتم",
-    "mute_confirm_title": "تأكيد الكتم",
+    "mute_confirm_cancel_button": "لا تخرِس",
+    "mute_confirm_title": "تأكيد الإخراس",
     "message": "راسل",
-    "mute_confirm": "أتريد كتم {user}؟",
-    "mute_confirm_accept_button": "اكتم",
+    "mute_confirm": "أتريد إخراس {user}؟",
+    "mute_confirm_accept_button": "أخرِس",
     "mention": "أذكر",
-    "mute_duration_prompt": "اكتم هذا الشخص لـ (ضع 0 لكتمه دائمًا):"
+    "mute_duration_prompt": "أخرِس هذا الشخص لـ (ضع 0 لكتمه دائمًا):",
+    "admin_menu": {
+      "moderation": "الإشراف",
+      "grant_admin": "امنحه الإدارة",
+      "revoke_admin": "اخلعه من الإدارة",
+      "delete_user": "احذف مستخدم",
+      "deactivate_account": "عطِّل الحساب",
+      "grant_moderator": "امنحه الإشراف",
+      "revoke_moderator": "اخلعه من الإشراف",
+      "activate_account": "فعُّل الحساب",
+      "delete_account": "احذف الحساب",
+      "strip_media": "أزل الوسائط من المشاركات",
+      "delete_user_data_and_deactivate_confirmation": "هذا الإجراء سيحذف بيانات الحساب وسيعطله، هل أنت متيقن؟"
+    },
+    "note": "ملاحظة",
+    "note_blank": "(لاشيء)",
+    "edit_note": "حرر الملاحظة",
+    "edit_note_apply": "طبِّق",
+    "edit_note_cancel": "ألغِ",
+    "report": "بلّغ",
+    "subscribe": "اشترك",
+    "unsubscribe": "ألغِ الاشتراك",
+    "unblock_progress": "يرفع الحجب…",
+    "block_progress": "يحجب…",
+    "unblock": "ارفع الحجب",
+    "remove_follower": "أزل متابِع",
+    "remove_follower_confirm_title": "تأكيد إزالة متابِع",
+    "remove_follower_confirm_accept_button": "أزِل",
+    "remove_follower_confirm_cancel_button": "أبق",
+    "hide_repeats": "اخف المشاركات",
+    "show_repeats": "أظهر المشاركات",
+    "bot": "آلي",
+    "unmute": "ارفع عنه الخرَس",
+    "unmute_progress": "يرفع الخرَس…",
+    "mute_progress": "يُخرِس…",
+    "remove_follower_confirm": "متيقن من إزالة {user} من متابِعيك؟",
+    "birthday": "وُلد في {birthday}"
   },
   "user_profile": {
-    "timeline_title": "الخيط الزمني للمستخدم"
+    "timeline_title": "الخيط الزمني للمستخدم",
+    "profile_loading_error": "عذرًا، حدث خطأ أثناء تحميل هذا الملف الشخصي.",
+    "profile_does_not_exist": "عذرًا، هذا الملف الشخصي ليس موجودًا."
   },
   "who_to_follow": {
     "more": "المزيد",
@@ -629,7 +667,8 @@
         "instance": "مثيل",
         "reason": "السبب",
         "accept": "قبول",
-        "reject": "رفض"
+        "reject": "رفض",
+        "ftl_removal": "أُزيل من الخط الزمني «الشبكات المعروفة»"
       },
       "federation": "الاتحاد",
       "mrf_policies": "تفعيل سياسات إعادة كتابة المنشور",
@@ -719,10 +758,10 @@
     "error": "حدث خطأ أثناء الاستيراد."
   },
   "domain_mute_card": {
-    "mute": "اكتم",
-    "mute_progress": "يكتم…",
-    "unmute": "ارفع الكتم",
-    "unmute_progress": "يرفع الكتم…"
+    "mute": "أخرِس",
+    "mute_progress": "يُخرس…",
+    "unmute": "ارفع عنه الخرس",
+    "unmute_progress": "يرفع الخرس…"
   },
   "exporter": {
     "export": "صدر",
@@ -878,5 +917,101 @@
     "replies_list_with_others": "رد (+ {numReplies} آخر): | رد (+ {numReplies} آخرون):",
     "show_attachment_in_modal": "أظهر الوسائط في منبثقات",
     "show_attachment_description": "معاينة الوصف ( افتح المرفق لقراءة الوصف الكامل)"
+  },
+  "lists": {
+    "creating_list": "إنشاء قائمة جديدة",
+    "update_title": "احفظ العنوان",
+    "add_members": "ابحث عن مزيد من المستخدمين",
+    "really_delete": "أمتيقن من حذف القائمة؟",
+    "lists": "قوائم",
+    "new": "قائمة جديدة",
+    "title": "عنوان القائمة",
+    "search": "ابحث عن مستخدم",
+    "remove_from_list": "أزل من القائمة",
+    "add_to_list": "أضف للقائمة",
+    "editing_list": "تحرير القائمة {listTitle}",
+    "create": "أنشئ",
+    "save": "احفظ التعديلات",
+    "delete": "احذف القائمة",
+    "manage_lists": "أدِر القوائم",
+    "manage_members": "أدِر أعضاء القائمة",
+    "is_in_list": "موجود في القائمة سلفًا"
+  },
+  "file_type": {
+    "audio": "صوت",
+    "image": "صورة",
+    "file": "ملف",
+    "video": "فيديو"
+  },
+  "user_reporting": {
+    "add_comment_description": "سيرسل البلاغ إلى مشرف المثيل، يمكنك شرح سبب البلاغ أدناه:",
+    "title": "بلاغ عن {0}",
+    "additional_comments": "تعليقات إضافية",
+    "forward_description": "هذا المستخدم من خادم آخر. هل تريد إرسال نسخة منه إلى مشرفه؟",
+    "forward_to": "وجّهه إلى {0}",
+    "submit": "أرسل",
+    "generic_error": "حدث خطأ أثناء معالجة طلبك."
+  },
+  "tool_tip": {
+    "media_upload": "ارفع وسائط",
+    "favorite": "فضّل",
+    "add_reaction": "أضف تفاعل",
+    "user_settings": "إعدادات المستخدم",
+    "accept_follow_request": "اقبل طلب المتابعة",
+    "reject_follow_request": "ارفض طلب المتابعة",
+    "repeat": "شارك",
+    "reply": "ردّ"
+  },
+  "upload": {
+    "error": {
+      "base": "فشل الرفع.",
+      "message": "فشل الرفع: {0}",
+      "default": "حاو لاحقًا",
+      "file_too_big": "حجم الملف كبير [{filesize}{filesizeunit}\\{allowedsize}{allowedsizeunit}]"
+    },
+    "file_size_units": {
+      "B": "بايت",
+      "MiB": "مب",
+      "TiB": "تب",
+      "GiB": "غب",
+      "KiB": "كب"
+    }
+  },
+  "search": {
+    "person_talking": "{count} شخص يتكلم",
+    "people_talking": "{count} شخص يتكلم",
+    "no_results": "لا نتائج",
+    "no_more_results": "لا مزيد من النتائج",
+    "people": "أشخاص",
+    "hashtags": "وسوم",
+    "load_more": "حمّل مزيدًا من النتائج"
+  },
+  "password_reset": {
+    "forgot_password": "أنسيت كلمة السر؟",
+    "placeholder": "البريد الإلكتروني أو اسم المستخدم",
+    "return_home": "عُد للصفحة الرئيسية",
+    "too_many_requests": "وصلت سقف المحاولات، حاول لاحقًا."
+  },
+  "chats": {
+    "chats": "محادثات",
+    "delete_confirm": "أتريد حذف هذه الرسالة؟",
+    "you": "أنت:",
+    "message_user": "راسل {nickname}",
+    "delete": "احذف",
+    "new": "محادثة جديدة",
+    "empty_message_error": "يستحيل إرسال رسالة فارغة",
+    "more": "مزيد",
+    "empty_chat_list_placeholder": "ليس لديك محادثات. ابدأ واحدة جديدة!"
+  },
+  "display_date": {
+    "today": "اليوم"
+  },
+  "update": {
+    "big_update_content": "نظرًا لطول المدة التي استغرقها تطوير هذا الاصدار فسترى اختلافات كبيرة عن ما اعتدت عليه.",
+    "update_bugs": "نظرًا لهذا لكبر هذا التحديث فقد نكون قد سهينى عن بعض الاخطاء لذا يرجى التبليغ عن أي علّة أو مشكلة. نحن نرحب بقتراحاتك وتعليقاتكم لتحسين بليروما وواجهها الأمامية وطرح المشاكل المتعلقة بهما.",
+    "update_changelog": "لمزيد من المعلومات، راجع {theFullChangelog}.",
+    "update_changelog_here": "سجل التغييرات الكامل",
+    "art_by": "رَسمُ {linkToArtist}",
+    "big_update_title": "رجاءً تعاون معنا"
   }
 }
-- 
cgit v1.2.3-70-g09d2


From 837dd81d21a28dfc24a76434f0f3bded1a5f179b Mon Sep 17 00:00:00 2001
From: Kian-ting Tan <chenjt30@gmail.com>
Date: Sat, 8 Jul 2023 06:58:50 +0000
Subject: Translated using Weblate (Chinese (Traditional))

Currently translated at 68.0% (717 of 1054 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/zh_Hant/
---
 src/i18n/zh_Hant.json | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/i18n/zh_Hant.json b/src/i18n/zh_Hant.json
index 96c75215..2baed898 100644
--- a/src/i18n/zh_Hant.json
+++ b/src/i18n/zh_Hant.json
@@ -546,7 +546,7 @@
       "backend_version": "後端版本",
       "frontend_version": "前端版本"
     },
-    "virtual_scrolling": "優化時間線渲染",
+    "virtual_scrolling": "最佳化時間軸算繪",
     "import_mutes_from_a_csv_file": "從CSV文件導入靜音",
     "mutes_imported": "靜音導入了！處理它們將需要一段時間。",
     "mute_import": "靜音導入",
@@ -576,7 +576,10 @@
     },
     "sensitive_by_default": "默認標記發文為敏感內容",
     "right_sidebar": "在右側顯示側邊欄",
-    "hide_shoutbox": "隱藏實例留言框"
+    "hide_shoutbox": "隱藏實例留言框",
+    "mention_link_display_short": "總是使用短名（如： {'@'}foo）",
+    "mention_link_display": "顯式提及連結",
+    "use_at_icon": "將{'@'}改用圖標顯示，不用文字"
   },
   "chats": {
     "more": "更多",
-- 
cgit v1.2.3-70-g09d2


From d234000fdf26b9abd69bb7f36509620d062279cf Mon Sep 17 00:00:00 2001
From: Kian-ting Tan <chenjt30@gmail.com>
Date: Mon, 10 Jul 2023 12:16:06 +0000
Subject: Translated using Weblate (Chinese (Min Nan) (nan_TW))

Currently translated at 54.8% (578 of 1054 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/nan_TW/
---
 src/i18n/nan-TW.json | 34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/i18n/nan-TW.json b/src/i18n/nan-TW.json
index 9fe98b37..7ce159a9 100644
--- a/src/i18n/nan-TW.json
+++ b/src/i18n/nan-TW.json
@@ -199,7 +199,7 @@
     "follow_request": "想 beh 綴 lí",
     "load_older": "載入 khah 早 ê 通知",
     "notifications": "通知",
-    "read": "讀！",
+    "read": "有讀ah！",
     "repeated_you": "轉送 lí ê 狀態",
     "no_more_notifications": "無別 ê 通知",
     "migrated_to": "移民到",
@@ -717,7 +717,37 @@
     "third_column_mode_notifications": "通知ê欄位",
     "third_column_mode_postform": "主要êPO文表kah導覽",
     "show_admin_badge": "佇我ê個人資料顯示「行政員」證章",
-    "pause_on_unfocused": "若是 Pleroma ê分頁無點開，tiō 暫停更新"
+    "pause_on_unfocused": "若是 Pleroma ê分頁無點開，tiō 暫停更新",
+    "conversation_display_tree_quick": "樹á形ê展示",
+    "columns": "欄位",
+    "column_sizes": "欄位sài-suh",
+    "column_sizes_content": "內容",
+    "column_sizes_notifs": "通知",
+    "tree_advanced": "允准用較活動ê方式導覽佇樹á形ê展示",
+    "tree_fade_ancestors": "用較淺ê色水顯示目前狀態ê前文",
+    "conversation_display_linear": "線á形ê風格",
+    "conversation_display_linear_quick": "線á形ê展示",
+    "conversation_other_replies_button": "顯示「其他ê回應」鈕仔",
+    "conversation_other_replies_button_below": "佇狀態下kha",
+    "conversation_other_replies_button_inside": "佇狀態內底",
+    "max_depth_in_thread": "預設ê討論線顯示層數ê上限",
+    "post_status_content_type": "Po文狀態ê內容類型",
+    "sensitive_by_default": "預設內，kā po文標做敏感內容",
+    "stop_gifs": "Kā滑鼠ê指標khǹg佇面頂ê時，動畫圖片tsiah振動",
+    "streaming": "Giú kàu頂懸ê時，自動展示新ê po文",
+    "theme_help_v2_2": "一寡圖片下kha ê標á，是背景／圖片ê對比指示，滑鼠指標khǹg佇面頂ê時，ē當看詳細。請記lit，若是用透明ê，對比指示顯示上bái ê情況。",
+    "tooltipRadius": "提醒",
+    "type_domains_to_mute": "揣beh愛消音ê域名",
+    "upload_a_photo": "Kā相片傳上去",
+    "user_settings": "用者ê設定",
+    "values": {
+      "false": "無",
+      "true": "是"
+    },
+    "mention_link_display_short": "一直顯示短ê名（比如： {'@'}foo）",
+    "mention_link_display_full": "一直用全名顯示（比如：{'@'}foo{'@'}example.org）",
+    "virtual_scrolling": "Kā時間線ê算畫最佳化",
+    "mention_link_display_full_for_remote": "Kan-ta kā其他域名ê用者，用全名顯示（比如：{'@'}foo{'@'}example.org）"
   },
   "status": {
     "favorites": "收藏"
-- 
cgit v1.2.3-70-g09d2


From 1c2048749480800e2d44b3876378beee421a79ba Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Wed, 12 Jul 2023 20:45:44 -0400
Subject: Implement showing quotes

---
 src/components/status/status.js                             | 3 +++
 src/components/status/status.scss                           | 6 ++++++
 src/components/status/status.vue                            | 9 +++++++++
 src/modules/statuses.js                                     | 4 ++++
 src/services/entity_normalizer/entity_normalizer.service.js | 4 ++++
 5 files changed, 26 insertions(+)

(limited to 'src')

diff --git a/src/components/status/status.js b/src/components/status/status.js
index 9a9bca7a..c10c6cf5 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -401,6 +401,9 @@ const Status = {
     },
     editingAvailable () {
       return this.$store.state.instance.editingAvailable
+    },
+    quotedStatus () {
+      return this.status.quote_id ? this.$store.state.statuses.allStatusesObject[this.status.quote_id] : undefined
     }
   },
   methods: {
diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index 44812867..4dfd1f87 100644
--- a/src/components/status/status.scss
+++ b/src/components/status/status.scss
@@ -422,4 +422,10 @@
       }
     }
   }
+
+  .quoted-status {
+    margin-top: 0.5em;
+    border: 1px solid var(--border, $fallback--border);
+    border-radius: var(--attachmentRadius, $fallback--attachmentRadius);
+  }
 }
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 35b15362..58fc0eca 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -364,6 +364,15 @@
             @parseReady="setHeadTailLinks"
           />
 
+          <article
+            v-if="quotedStatus"
+            class="quoted-status"
+          >
+            <Status
+              :statusoid="quotedStatus"
+            />
+          </article>
+
           <div
             v-if="inConversation && !isPreview && replies && replies.length"
             class="replies"
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index ed21a730..186bba3c 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -229,6 +229,10 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
       timelineObject.newStatusCount += 1
     }
 
+    if (status.quote) {
+      addStatus(status.quote, /* showImmediately = */ false, /* addToTimeline = */ false)
+    }
+
     return status
   }
 
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index adefc5a5..fb9ee80a 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -325,6 +325,10 @@ export const parseStatus = (data) => {
       output.thread_muted = pleroma.thread_muted
       output.emoji_reactions = pleroma.emoji_reactions
       output.parent_visible = pleroma.parent_visible === undefined ? true : pleroma.parent_visible
+      output.quote = pleroma.quote ? parseStatus(pleroma.quote) : undefined
+      output.quote_id = output.quote ? output.quote.id : undefined
+      output.quote_url = pleroma.quote_url
+      output.quote_visible = pleroma.quote_visible
     } else {
       output.text = data.content
       output.summary = data.spoiler_text
-- 
cgit v1.2.3-70-g09d2


From 4bdc4bc5a9d729c4080aa757ba9ff3445dd172e4 Mon Sep 17 00:00:00 2001
From: baloo toumi <abidin24@disroot.org>
Date: Wed, 12 Jul 2023 07:14:49 +0000
Subject: Translated using Weblate (Arabic)

Currently translated at 75.5% (796 of 1054 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ar/
---
 src/i18n/ar.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/i18n/ar.json b/src/i18n/ar.json
index de037ce5..0fd79af0 100644
--- a/src/i18n/ar.json
+++ b/src/i18n/ar.json
@@ -884,7 +884,7 @@
     "delete": "اخذف الحالة",
     "delete_confirm_title": "تأكيد الحذف",
     "reply_to": "رد على",
-    "mentions": "الذكر",
+    "mentions": "ذكرَ",
     "unmute_conversation": "ارفع الكتم عن المحادثة",
     "status_unavailable": "الحالة غير متوفرة",
     "copy_link": "انسخ رابط الحالة",
-- 
cgit v1.2.3-70-g09d2


From 1ec9487714e9335cbc617bfdb23820969651d674 Mon Sep 17 00:00:00 2001
From: Kian-ting Tan <chenjt30@gmail.com>
Date: Thu, 13 Jul 2023 10:06:44 +0000
Subject: Translated using Weblate (Chinese (Min Nan) (nan_TW))

Currently translated at 55.8% (589 of 1054 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/nan_TW/
---
 src/i18n/nan-TW.json | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/i18n/nan-TW.json b/src/i18n/nan-TW.json
index 7ce159a9..4f7d38e3 100644
--- a/src/i18n/nan-TW.json
+++ b/src/i18n/nan-TW.json
@@ -747,7 +747,18 @@
     "mention_link_display_short": "一直顯示短ê名（比如： {'@'}foo）",
     "mention_link_display_full": "一直用全名顯示（比如：{'@'}foo{'@'}example.org）",
     "virtual_scrolling": "Kā時間線ê算畫最佳化",
-    "mention_link_display_full_for_remote": "Kan-ta kā其他域名ê用者，用全名顯示（比如：{'@'}foo{'@'}example.org）"
+    "mention_link_display_full_for_remote": "Kan-ta kā其他域名ê用者，用全名顯示（比如：{'@'}foo{'@'}example.org）",
+    "token": "Token",
+    "use_at_icon": "用標á顯示 {'@'} 符號，mài用文字",
+    "mention_link_display": "顯示提起ê連結",
+    "mention_link_use_tooltip": "佇tshi̍h提起ê連結ê時，顯示用者ê卡片",
+    "mention_link_show_avatar": "佇連結邊á顯示用者ê標頭",
+    "mention_link_show_avatar_quick": "佇提起ê隔壁，顯示用者ê標頭",
+    "mention_link_fade_domain": "用較淺ê色水顯示域名（比如：{'@'}foo{'@'}example.org ê {'@'}example.org）",
+    "mention_link_bolden_you": "佇lí hőng提起ê時，強調對lí ê提起文字",
+    "user_popover_avatar_action": "Tshi̍h跳出來ê標頭ê動作",
+    "user_popover_avatar_action_zoom": "放大／縮小標頭",
+    "user_popover_avatar_action_close": "關掉跳出來ê"
   },
   "status": {
     "favorites": "收藏"
-- 
cgit v1.2.3-70-g09d2


From 80ceff95e94e42f751570683eac0977e2dc31198 Mon Sep 17 00:00:00 2001
From: Kian-ting Tan <chenjt30@gmail.com>
Date: Sun, 16 Jul 2023 09:07:11 +0000
Subject: Translated using Weblate (Chinese (Min Nan) (nan_TW))

Currently translated at 56.9% (600 of 1054 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/nan_TW/
---
 src/i18n/nan-TW.json | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/i18n/nan-TW.json b/src/i18n/nan-TW.json
index 4f7d38e3..963ec06a 100644
--- a/src/i18n/nan-TW.json
+++ b/src/i18n/nan-TW.json
@@ -758,7 +758,18 @@
     "mention_link_bolden_you": "佇lí hőng提起ê時，強調對lí ê提起文字",
     "user_popover_avatar_action": "Tshi̍h跳出來ê標頭ê動作",
     "user_popover_avatar_action_zoom": "放大／縮小標頭",
-    "user_popover_avatar_action_close": "關掉跳出來ê"
+    "user_popover_avatar_action_close": "關掉跳出來ê框á",
+    "user_popover_avatar_action_open": "拍開個人資料",
+    "user_popover_avatar_overlay": "佇用者ê跳出來ê框仔面頂，顯示用者ê標頭",
+    "fun": "趣味ê",
+    "greentext": "Meme ê箭頭",
+    "show_yous": "顯示（Lí）",
+    "notifications": "通知",
+    "notification_setting_filters": "過濾ê",
+    "notification_setting_block_from_strangers": "關lí bô綴ê lâng 送ê通知",
+    "notification_setting_privacy": "隱私",
+    "notification_setting_hide_notification_contents": "Kā sak通知ê lâng kap伊ê內容khàm掉",
+    "notification_mutes": "若tsún無愛收tuì指定用者來ê通知，著用消音。"
   },
   "status": {
     "favorites": "收藏"
-- 
cgit v1.2.3-70-g09d2


From d72486f3e4f2af9db95535f3f93e6257c675e155 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Wed, 12 Jul 2023 21:34:19 -0400
Subject: Implement sending quote posts

---
 .../post_status_form/post_status_form.js           | 31 ++++++++++++--
 .../post_status_form/post_status_form.vue          | 50 ++++++++++++++++++++++
 src/i18n/en.json                                   |  2 +
 src/services/api/api.service.js                    |  4 ++
 .../status_poster/status_poster.service.js         |  2 +
 5 files changed, 85 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index b75fee69..73176132 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -156,7 +156,8 @@ const PostStatusForm = {
         poll: this.statusPoll || {},
         mediaDescriptions: this.statusMediaDescriptions || {},
         visibility: this.statusScope || scope,
-        contentType: statusContentType
+        contentType: statusContentType,
+        quoting: false
       }
     }
 
@@ -265,6 +266,24 @@ const PostStatusForm = {
     isEdit () {
       return typeof this.statusId !== 'undefined' && this.statusId.trim() !== ''
     },
+    quotable () {
+      if (!this.replyTo) {
+        return false
+      }
+
+      const repliedStatus = this.$store.state.statuses.allStatusesObject[this.replyTo]
+      if (!repliedStatus) {
+        return false
+      }
+
+      if (repliedStatus.visibility === 'public' ||
+          repliedStatus.visibility === 'unlisted' ||
+          repliedStatus.visibility === 'local') {
+        return true
+      } else if (repliedStatus.visibility === 'private') {
+        return repliedStatus.account.id === this.$store.state.users.currentUser.id
+      }
+    },
     ...mapGetters(['mergedConfig']),
     ...mapState({
       mobileLayout: state => state.interface.mobileLayout
@@ -292,7 +311,8 @@ const PostStatusForm = {
         visibility: newStatus.visibility,
         contentType: newStatus.contentType,
         poll: {},
-        mediaDescriptions: {}
+        mediaDescriptions: {},
+        quoting: false
       }
       this.pollFormVisible = false
       this.$refs.mediaUpload && this.$refs.mediaUpload.clearFile()
@@ -340,6 +360,8 @@ const PostStatusForm = {
         return
       }
 
+      const replyOrQuoteAttr = newStatus.quoting ? 'quoteId' : 'inReplyToStatusId'
+
       const postingOptions = {
         status: newStatus.status,
         spoilerText: newStatus.spoilerText || null,
@@ -347,7 +369,7 @@ const PostStatusForm = {
         sensitive: newStatus.nsfw,
         media: newStatus.files,
         store: this.$store,
-        inReplyToStatusId: this.replyTo,
+        [replyOrQuoteAttr]: this.replyTo,
         contentType: newStatus.contentType,
         poll,
         idempotencyKey: this.idempotencyKey
@@ -373,6 +395,7 @@ const PostStatusForm = {
       }
       const newStatus = this.newStatus
       this.previewLoading = true
+      const replyOrQuoteAttr = newStatus.quoting ? 'quoteId' : 'inReplyToStatusId'
       statusPoster.postStatus({
         status: newStatus.status,
         spoilerText: newStatus.spoilerText || null,
@@ -380,7 +403,7 @@ const PostStatusForm = {
         sensitive: newStatus.nsfw,
         media: [],
         store: this.$store,
-        inReplyToStatusId: this.replyTo,
+        [replyOrQuoteAttr]: this.replyTo,
         contentType: newStatus.contentType,
         poll: {},
         preview: true
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 86c1f907..e06b88b2 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -126,6 +126,42 @@
             class="preview-status"
           />
         </div>
+        <div
+          v-if="quotable"
+          role="radiogroup"
+          class="reply-or-quote-selector"
+        >
+          <div
+            class="reply-or-quote-option"
+            tabindex="0"
+            role="radio"
+            :aria-checked="!newStatus.quoting"
+            @click="newStatus.quoting = false"
+          >
+            <input
+              type="radio"
+              :checked="!newStatus.quoting"
+            >
+            <label class="reply-or-quote-option-text">
+              {{ $t('post_status.reply_option') }}
+            </label>
+          </div>
+          <div
+            class="reply-or-quote-option"
+            tabindex="0"
+            role="radio"
+            :aria-checked="newStatus.quoting"
+            @click="newStatus.quoting = true"
+          >
+            <input
+              type="radio"
+              :checked="newStatus.quoting"
+            >
+            <label class="reply-or-quote-option-text">
+              {{ $t('post_status.quote_option') }}
+            </label>
+          </div>
+        </div>
         <EmojiInput
           v-if="!disableSubject && (newStatus.spoilerText || alwaysShowSubject)"
           v-model="newStatus.spoilerText"
@@ -420,6 +456,20 @@
     margin: 0;
   }
 
+  .reply-or-quote-selector {
+    display: flex;
+    flex-direction: column;
+
+    .reply-or-quote-option {
+      display: flex;
+      align-items: center;
+
+      .reply-or-quote-option-text::before {
+        vertical-align: middle;
+      }
+    }
+  }
+
   .text-format {
     .only-format {
       color: $fallback--faint;
diff --git a/src/i18n/en.json b/src/i18n/en.json
index a7ab451f..4bfad3f9 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -261,6 +261,8 @@
   "post_status": {
     "edit_status": "Edit status",
     "new_status": "Post new status",
+    "reply_option": "Reply to this status",
+    "quote_option": "Quote this status",
     "account_not_locked_warning": "Your account is not {0}. Anyone can follow you to view your follower-only posts.",
     "account_not_locked_warning_link": "locked",
     "attachments_sensitive": "Mark attachments as sensitive",
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index ac715678..c6bca10b 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -827,6 +827,7 @@ const postStatus = ({
   poll,
   mediaIds = [],
   inReplyToStatusId,
+  quoteId,
   contentType,
   preview,
   idempotencyKey
@@ -859,6 +860,9 @@ const postStatus = ({
   if (inReplyToStatusId) {
     form.append('in_reply_to_id', inReplyToStatusId)
   }
+  if (quoteId) {
+    form.append('quote_id', quoteId)
+  }
   if (preview) {
     form.append('preview', 'true')
   }
diff --git a/src/services/status_poster/status_poster.service.js b/src/services/status_poster/status_poster.service.js
index 1eb10bb6..aaef5a7a 100644
--- a/src/services/status_poster/status_poster.service.js
+++ b/src/services/status_poster/status_poster.service.js
@@ -10,6 +10,7 @@ const postStatus = ({
   poll,
   media = [],
   inReplyToStatusId = undefined,
+  quoteId = undefined,
   contentType = 'text/plain',
   preview = false,
   idempotencyKey = ''
@@ -24,6 +25,7 @@ const postStatus = ({
     sensitive,
     mediaIds,
     inReplyToStatusId,
+    quoteId,
     contentType,
     poll,
     preview,
-- 
cgit v1.2.3-70-g09d2


From d22079cf7392a1ef184d7c03ff7cb680e3e1c99c Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Thu, 13 Jul 2023 00:37:57 -0400
Subject: Handle recursive quotes

---
 .../post_status_form/post_status_form.js           |  2 +-
 src/components/status/status.js                    | 25 ++++++++++++++++-
 src/components/status/status.scss                  | 12 ++++++++
 src/components/status/status.vue                   | 32 +++++++++++++++++++++-
 src/i18n/en.json                                   |  5 +++-
 .../entity_normalizer/entity_normalizer.service.js |  2 +-
 6 files changed, 73 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 73176132..17350998 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -281,7 +281,7 @@ const PostStatusForm = {
           repliedStatus.visibility === 'local') {
         return true
       } else if (repliedStatus.visibility === 'private') {
-        return repliedStatus.account.id === this.$store.state.users.currentUser.id
+        return repliedStatus.user.id === this.$store.state.users.currentUser.id
       }
     },
     ...mapGetters(['mergedConfig']),
diff --git a/src/components/status/status.js b/src/components/status/status.js
index c10c6cf5..e722a635 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -133,6 +133,7 @@ const Status = {
     'showPinned',
     'inProfile',
     'profileUserId',
+    'inQuote',
 
     'simpleTree',
     'controlledThreadDisplayStatus',
@@ -159,7 +160,8 @@ const Status = {
       uncontrolledMediaPlaying: [],
       suspendable: true,
       error: null,
-      headTailLinks: null
+      headTailLinks: null,
+      displayQuote: !this.inQuote
     }
   },
   computed: {
@@ -402,8 +404,17 @@ const Status = {
     editingAvailable () {
       return this.$store.state.instance.editingAvailable
     },
+    hasVisibleQuote () {
+      return this.status.quote_url && this.status.quote_visible
+    },
+    hasInvisibleQuote () {
+      return this.status.quote_url && !this.status.quote_visible
+    },
     quotedStatus () {
       return this.status.quote_id ? this.$store.state.statuses.allStatusesObject[this.status.quote_id] : undefined
+    },
+    shouldDisplayQuote () {
+      return this.quotedStatus && this.displayQuote
     }
   },
   methods: {
@@ -472,6 +483,18 @@ const Status = {
           window.scrollBy(0, rect.bottom - window.innerHeight + 50)
         }
       }
+    },
+    toggleDisplayQuote () {
+      if (this.shouldDisplayQuote) {
+        this.displayQuote = false
+      } else if (!this.quotedStatus) {
+        this.$store.dispatch('fetchStatus', this.status.quote_id)
+          .then(() => {
+            this.displayQuote = true
+          })
+      } else {
+        this.displayQuote = true
+      }
     }
   },
   watch: {
diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index 4dfd1f87..760c6ac1 100644
--- a/src/components/status/status.scss
+++ b/src/components/status/status.scss
@@ -427,5 +427,17 @@
     margin-top: 0.5em;
     border: 1px solid var(--border, $fallback--border);
     border-radius: var(--attachmentRadius, $fallback--attachmentRadius);
+
+    &.-unavailable-prompt {
+      padding: 0.5em;
+    }
+  }
+
+  .display-quoted-status-button {
+    margin: 0.5em;
+
+    &-icon {
+      color: inherit;
+    }
   }
 }
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 58fc0eca..c49a9e7b 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -365,13 +365,43 @@
           />
 
           <article
-            v-if="quotedStatus"
+            v-if="hasVisibleQuote"
             class="quoted-status"
           >
+            <button
+              class="button-unstyled -link display-quoted-status-button"
+              :aria-expanded="shouldDisplayQuote"
+              @click="toggleDisplayQuote"
+            >
+              {{ shouldDisplayQuote ? $t('status.hide_quote') : $t('status.display_quote') }}
+              <FAIcon
+                class="display-quoted-status-button-icon"
+                :icon="shouldDisplayQuote ? 'chevron-up' : 'chevron-down'"
+              />
+            </button>
             <Status
+              v-if="shouldDisplayQuote"
               :statusoid="quotedStatus"
+              :in-quote="true"
             />
           </article>
+          <p
+            v-else-if="hasInvisibleQuote"
+            class="quoted-status -unavailable-prompt"
+          >
+            <i18n-t keypath="status.invisible_quote">
+              <template #link>
+                <bdi>
+                  <a
+                    :href="status.quote_url"
+                    target="_blank"
+                  >
+                    {{ status.quote_url }}
+                  </a>
+                </bdi>
+              </template>
+            </i18n-t>
+          </p>
 
           <div
             v-if="inConversation && !isPreview && replies && replies.length"
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 4bfad3f9..2358a4ce 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -1030,7 +1030,10 @@
     "show_all_conversation": "Show full conversation ({numStatus} other status) | Show full conversation ({numStatus} other statuses)",
     "show_only_conversation_under_this": "Only show replies to this status",
     "status_history": "Status history",
-    "reaction_count_label": "{num} person reacted | {num} people reacted"
+    "reaction_count_label": "{num} person reacted | {num} people reacted",
+    "hide_quote": "Hide the quoted status",
+    "display_quote": "Display the quoted status",
+    "invisible_quote": "Quoted status unavailable: {link}"
   },
   "user_card": {
     "approve": "Approve",
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index fb9ee80a..610ba1ab 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -326,7 +326,7 @@ export const parseStatus = (data) => {
       output.emoji_reactions = pleroma.emoji_reactions
       output.parent_visible = pleroma.parent_visible === undefined ? true : pleroma.parent_visible
       output.quote = pleroma.quote ? parseStatus(pleroma.quote) : undefined
-      output.quote_id = output.quote ? output.quote.id : undefined
+      output.quote_id = pleroma.quote_id ? pleroma.quote_id : (output.quote ? output.quote.id : undefined)
       output.quote_url = pleroma.quote_url
       output.quote_visible = pleroma.quote_visible
     } else {
-- 
cgit v1.2.3-70-g09d2


From 63f56cfb274165e157378888f5d448bfb194a52f Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Thu, 13 Jul 2023 00:43:55 -0400
Subject: Add aria-labels for reply/quote selector

---
 src/components/post_status_form/post_status_form.js  |  1 +
 src/components/post_status_form/post_status_form.vue | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 17350998..65066d54 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -162,6 +162,7 @@ const PostStatusForm = {
     }
 
     return {
+      randomSeed: `${Math.random()}`.replace('.', '-'),
       dropFiles: [],
       uploadingFiles: false,
       error: null,
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index e06b88b2..0d793885 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -135,6 +135,7 @@
             class="reply-or-quote-option"
             tabindex="0"
             role="radio"
+            :aria-labelledby="`reply-or-quote-option-${randomSeed}-reply`"
             :aria-checked="!newStatus.quoting"
             @click="newStatus.quoting = false"
           >
@@ -143,13 +144,16 @@
               :checked="!newStatus.quoting"
             >
             <label class="reply-or-quote-option-text">
-              {{ $t('post_status.reply_option') }}
+              <span :id="`reply-or-quote-option-${randomSeed}-reply`">
+                {{ $t('post_status.reply_option') }}
+              </span>
             </label>
           </div>
           <div
             class="reply-or-quote-option"
             tabindex="0"
             role="radio"
+            :aria-labelledby="`reply-or-quote-option-${randomSeed}-quote`"
             :aria-checked="newStatus.quoting"
             @click="newStatus.quoting = true"
           >
@@ -158,7 +162,9 @@
               :checked="newStatus.quoting"
             >
             <label class="reply-or-quote-option-text">
-              {{ $t('post_status.quote_option') }}
+              <span :id="`reply-or-quote-option-${randomSeed}-quote`">
+                {{ $t('post_status.quote_option') }}
+              </span>
             </label>
           </div>
         </div>
-- 
cgit v1.2.3-70-g09d2


From 441eea36837a132b841d6c7423e146990b48ab16 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Mon, 17 Jul 2023 17:28:36 -0400
Subject: Do not show quote options for servers without quote support

---
 src/boot/after_store.js                             | 1 +
 src/components/post_status_form/post_status_form.js | 4 ++++
 src/modules/instance.js                             | 1 +
 3 files changed, 6 insertions(+)

(limited to 'src')

diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index 9c1f007b..395d4834 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -259,6 +259,7 @@ const getNodeInfo = async ({ store }) => {
       store.dispatch('setInstanceOption', { name: 'editingAvailable', value: features.includes('editing') })
       store.dispatch('setInstanceOption', { name: 'pollLimits', value: metadata.pollLimits })
       store.dispatch('setInstanceOption', { name: 'mailerEnabled', value: metadata.mailerEnabled })
+      store.dispatch('setInstanceOption', { name: 'quotingAvailable', value: features.includes('quote_posting') })
 
       const uploadLimits = metadata.uploadLimits
       store.dispatch('setInstanceOption', { name: 'uploadlimit', value: parseInt(uploadLimits.general) })
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 65066d54..97d3cb22 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -268,6 +268,10 @@ const PostStatusForm = {
       return typeof this.statusId !== 'undefined' && this.statusId.trim() !== ''
     },
     quotable () {
+      if (!this.$store.state.instance.quotingAvailable) {
+        return false
+      }
+
       if (!this.replyTo) {
         return false
       }
diff --git a/src/modules/instance.js b/src/modules/instance.js
index bb0292da..1ee64552 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -128,6 +128,7 @@ const defaultState = {
   mediaProxyAvailable: false,
   suggestionsEnabled: false,
   suggestionsWeb: '',
+  quotingAvailable: false,
 
   // Html stuff
   instanceSpecificPanelContent: '',
-- 
cgit v1.2.3-70-g09d2


From a314ad7ccca05c91d4a717d956c207a0b0c47005 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Mon, 17 Jul 2023 17:29:18 -0400
Subject: Add fallback return false for quotable judgements

---
 src/components/post_status_form/post_status_form.js | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 97d3cb22..ba49961d 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -288,6 +288,8 @@ const PostStatusForm = {
       } else if (repliedStatus.visibility === 'private') {
         return repliedStatus.user.id === this.$store.state.users.currentUser.id
       }
+
+      return false
     },
     ...mapGetters(['mergedConfig']),
     ...mapState({
-- 
cgit v1.2.3-70-g09d2


From 7aac8cd2eebae0b3cf00ae5d2c61188d1a920d48 Mon Sep 17 00:00:00 2001
From: Kian-ting Tan <chenjt30@gmail.com>
Date: Mon, 17 Jul 2023 13:16:49 +0000
Subject: Translated using Weblate (Chinese (Min Nan) (nan_TW))

Currently translated at 58.7% (619 of 1054 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/nan_TW/
---
 src/i18n/nan-TW.json | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/i18n/nan-TW.json b/src/i18n/nan-TW.json
index 963ec06a..491018ad 100644
--- a/src/i18n/nan-TW.json
+++ b/src/i18n/nan-TW.json
@@ -362,6 +362,26 @@
         "contrast": {
           "hint": "色彩ê對比率：{ratio}。{level}、 {context}"
         }
+      },
+      "switcher": {
+        "keep_shadows": "保持陰影",
+        "keep_color": "保持色彩",
+        "keep_opacity": "保持無透明度",
+        "keep_roundness": "保留邊á角ê khà-buh",
+        "keep_fonts": "保持字型",
+        "reset": "重頭設定",
+        "clear_all": "攏清掉",
+        "clear_opacity": "清掉無透明度",
+        "load_theme": "載入主題",
+        "keep_as_is": "Mài振動",
+        "use_snapshot": "舊ê版本",
+        "use_source": "新ê版本",
+        "help": {
+          "upgraded_from_v2": "PleromaFE升級ah，主題huân-sè kap lí知影ê無kâng。",
+          "v2_imported": "Lí輸入ê檔案是舊版本ê前端用ê。Guán盡量予版本相通，毋過可能有所在buē-tàng。",
+          "older_version_imported": "Lí輸入ê檔案是予舊ê前端用ê。",
+          "future_version_imported": "Lí輸入ê檔案是新ê前端所用ê。"
+        }
       }
     },
     "upload": {
@@ -681,8 +701,8 @@
     "radii_help": "設定界面邊á ê khà-buh (curve) ê 半徑（單位：畫素）",
     "replies_in_timeline": "佇時間線內底ê回應",
     "reply_visibility_all": "顯示所有ê回應",
-    "reply_visibility_following": "Kan-ta顯示 @ 我抑是我綴ê儂ê回應",
-    "reply_visibility_self": "Kan-ta顯示@我ê回應",
+    "reply_visibility_following": "Kan-ta顯示送予我抑是我綴ê儂ê回應",
+    "reply_visibility_self": "Kan-ta顯示送予我ê回應",
     "reply_visibility_following_short": "顯示予我所綴ê儂ê回應",
     "reply_visibility_self_short": "Kan-ta顯示予我ka-kī ê回應",
     "autohide_floating_post_button": "自動khàm掉「新êPO文」ê鈕仔（行動版）",
@@ -769,7 +789,10 @@
     "notification_setting_block_from_strangers": "關lí bô綴ê lâng 送ê通知",
     "notification_setting_privacy": "隱私",
     "notification_setting_hide_notification_contents": "Kā sak通知ê lâng kap伊ê內容khàm掉",
-    "notification_mutes": "若tsún無愛收tuì指定用者來ê通知，著用消音。"
+    "notification_mutes": "若tsún無愛收tuì指定用者來ê通知，著用消音。",
+    "notification_blocks": "封鎖用者ē停止所有i hia來ê通知，mā取消訂伊。",
+    "enable_web_push_notifications": "拍開網頁sak通知ê功能",
+    "more_settings": "Koh較tsē ê設定"
   },
   "status": {
     "favorites": "收藏"
-- 
cgit v1.2.3-70-g09d2


From 35d3b8f27dace6efd5aab8915b2025d16bb7e7e7 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Tue, 18 Jul 2023 19:06:00 -0400
Subject: Fix pinned statuses gone when reloading user timeline

---
 changelog.d/reload-user-pinned.fix  | 1 +
 src/components/timeline/timeline.js | 3 +++
 2 files changed, 4 insertions(+)
 create mode 100644 changelog.d/reload-user-pinned.fix

(limited to 'src')

diff --git a/changelog.d/reload-user-pinned.fix b/changelog.d/reload-user-pinned.fix
new file mode 100644
index 00000000..db241c20
--- /dev/null
+++ b/changelog.d/reload-user-pinned.fix
@@ -0,0 +1 @@
+Fix pinned statuses gone when reloading user timeline
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index b7414610..1050b87a 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -160,6 +160,9 @@ const Timeline = {
       if (this.timeline.flushMarker !== 0) {
         this.$store.commit('clearTimeline', { timeline: this.timelineName, excludeUserId: true })
         this.$store.commit('queueFlush', { timeline: this.timelineName, id: 0 })
+        if (this.timelineName === 'user') {
+          this.$store.dispatch('fetchPinnedStatuses', this.userId)
+        }
         this.fetchOlderStatuses()
       } else {
         this.blockClicksTemporarily()
-- 
cgit v1.2.3-70-g09d2


From 1b081a927288ff2f43025d688e2fa15cf6ce6be1 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Wed, 19 Jul 2023 17:00:46 -0400
Subject: Make reply-or-quote selection display as horizontal button group

---
 .../post_status_form/post_status_form.vue          | 50 ++++++----------------
 1 file changed, 14 insertions(+), 36 deletions(-)

(limited to 'src')

diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 0d793885..9b108a5a 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -129,44 +129,32 @@
         <div
           v-if="quotable"
           role="radiogroup"
-          class="reply-or-quote-selector"
+          class="btn-group reply-or-quote-selector"
         >
-          <div
-            class="reply-or-quote-option"
+          <button
+            :id="`reply-or-quote-option-${randomSeed}-reply`"
+            class="btn button-default reply-or-quote-option"
+            :class="{ toggled: !newStatus.quoting }"
             tabindex="0"
             role="radio"
             :aria-labelledby="`reply-or-quote-option-${randomSeed}-reply`"
             :aria-checked="!newStatus.quoting"
             @click="newStatus.quoting = false"
           >
-            <input
-              type="radio"
-              :checked="!newStatus.quoting"
-            >
-            <label class="reply-or-quote-option-text">
-              <span :id="`reply-or-quote-option-${randomSeed}-reply`">
-                {{ $t('post_status.reply_option') }}
-              </span>
-            </label>
-          </div>
-          <div
-            class="reply-or-quote-option"
+            {{ $t('post_status.reply_option') }}
+          </button>
+          <button
+            :id="`reply-or-quote-option-${randomSeed}-quote`"
+            class="btn button-default reply-or-quote-option"
+            :class="{ toggled: newStatus.quoting }"
             tabindex="0"
             role="radio"
             :aria-labelledby="`reply-or-quote-option-${randomSeed}-quote`"
             :aria-checked="newStatus.quoting"
             @click="newStatus.quoting = true"
           >
-            <input
-              type="radio"
-              :checked="newStatus.quoting"
-            >
-            <label class="reply-or-quote-option-text">
-              <span :id="`reply-or-quote-option-${randomSeed}-quote`">
-                {{ $t('post_status.quote_option') }}
-              </span>
-            </label>
-          </div>
+            {{ $t('post_status.quote_option') }}
+          </button>
         </div>
         <EmojiInput
           v-if="!disableSubject && (newStatus.spoilerText || alwaysShowSubject)"
@@ -463,17 +451,7 @@
   }
 
   .reply-or-quote-selector {
-    display: flex;
-    flex-direction: column;
-
-    .reply-or-quote-option {
-      display: flex;
-      align-items: center;
-
-      .reply-or-quote-option-text::before {
-        vertical-align: middle;
-      }
-    }
+    margin-bottom: 0.5em;
   }
 
   .text-format {
-- 
cgit v1.2.3-70-g09d2


From 0b0b1dabdfa2051d0b1d1ad846892da4801ca588 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Fri, 21 Jul 2023 13:54:10 -0400
Subject: Fix parsing non-ascii tags

---
 changelog.d/nonascii-tags.fix                    | 1 +
 src/services/matcher/matcher.service.js          | 7 +++++--
 test/unit/specs/services/matcher/matcher.spec.js | 6 ++++++
 3 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 changelog.d/nonascii-tags.fix

(limited to 'src')

diff --git a/changelog.d/nonascii-tags.fix b/changelog.d/nonascii-tags.fix
new file mode 100644
index 00000000..e4c6dc82
--- /dev/null
+++ b/changelog.d/nonascii-tags.fix
@@ -0,0 +1 @@
+Fix parsing non-ascii tags
diff --git a/src/services/matcher/matcher.service.js b/src/services/matcher/matcher.service.js
index b6c4e909..54f02d31 100644
--- a/src/services/matcher/matcher.service.js
+++ b/src/services/matcher/matcher.service.js
@@ -14,8 +14,11 @@ export const mentionMatchesUrl = (attention, url) => {
  * @param {string} url
  */
 export const extractTagFromUrl = (url) => {
-  const regex = /tag[s]*\/(\w+)$/g
-  const result = regex.exec(url)
+  const decoded = decodeURI(url)
+  // https://git.pleroma.social/pleroma/elixir-libraries/linkify/-/blob/master/lib/linkify/parser.ex
+  // https://www.pcre.org/original/doc/html/pcrepattern.html
+  const regex = /tag[s]*\/([\p{L}\p{N}_]*[\p{Alphabetic}_·\u{200c}][\p{L}\p{N}_·\p{M}\u{200c}]*)$/ug
+  const result = regex.exec(decoded)
   if (!result) {
     return false
   }
diff --git a/test/unit/specs/services/matcher/matcher.spec.js b/test/unit/specs/services/matcher/matcher.spec.js
index 7a2494f0..c6e9719d 100644
--- a/test/unit/specs/services/matcher/matcher.spec.js
+++ b/test/unit/specs/services/matcher/matcher.spec.js
@@ -78,5 +78,11 @@ describe('MatcherService', () => {
 
       expect(MatcherService.extractTagFromUrl(url)).to.eql(false)
     })
+
+    it('should return tag name from non-ascii tags', () => {
+      const url = encodeURI('https://website.com/tag/喵喵喵')
+
+      expect(MatcherService.extractTagFromUrl(url)).to.eql('喵喵喵')
+    })
   })
 })
-- 
cgit v1.2.3-70-g09d2


From 56a74aa3926fb8bfd7241936bef0a13902fb886e Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Mon, 24 Jul 2023 18:28:02 -0400
Subject: Make MentionsLine aware of line breaking by non-br elements

---
 changelog.d/mentionsline-shouldbreak.fix     |  1 +
 src/components/rich_content/rich_content.jsx | 54 ++++++++++++++++++----------
 2 files changed, 37 insertions(+), 18 deletions(-)
 create mode 100644 changelog.d/mentionsline-shouldbreak.fix

(limited to 'src')

diff --git a/changelog.d/mentionsline-shouldbreak.fix b/changelog.d/mentionsline-shouldbreak.fix
new file mode 100644
index 00000000..33ee8d2c
--- /dev/null
+++ b/changelog.d/mentionsline-shouldbreak.fix
@@ -0,0 +1 @@
+Make MentionsLine aware of line breaking by non-br elements
diff --git a/src/components/rich_content/rich_content.jsx b/src/components/rich_content/rich_content.jsx
index b16ab242..ff14a58a 100644
--- a/src/components/rich_content/rich_content.jsx
+++ b/src/components/rich_content/rich_content.jsx
@@ -8,6 +8,27 @@ import HashtagLink from 'src/components/hashtag_link/hashtag_link.vue'
 
 import './rich_content.scss'
 
+const MAYBE_LINE_BREAKING_ELEMENTS = [
+  'blockquote',
+  'br',
+  'hr',
+  'ul',
+  'ol',
+  'li',
+  'p',
+  'table',
+  'tbody',
+  'td',
+  'th',
+  'thead',
+  'tr',
+  'h1',
+  'h2',
+  'h3',
+  'h4',
+  'h5'
+]
+
 /**
  * RichContent, The Über-powered component for rendering Post HTML.
  *
@@ -166,25 +187,22 @@ export default {
               !(children && typeof children[0] === 'string' && children[0].match(/^\s/))
                 ? lastSpacing
                 : ''
-        switch (Tag) {
-          case 'br':
+        if (MAYBE_LINE_BREAKING_ELEMENTS.includes(Tag)) {
+          // all the elements that can cause a line change
+          currentMentions = null
+        } else if (Tag === 'img') { // replace images with StillImage
+          return ['', [mentionsLinePadding, renderImage(opener)], '']
+        } else if (Tag === 'a' && this.handleLinks) { // replace mentions with MentionLink
+          if (fullAttrs.class && fullAttrs.class.includes('mention')) {
+            // Handling mentions here
+            return renderMention(attrs, children)
+          } else {
             currentMentions = null
-            break
-          case 'img': // replace images with StillImage
-            return ['', [mentionsLinePadding, renderImage(opener)], '']
-          case 'a': // replace mentions with MentionLink
-            if (!this.handleLinks) break
-            if (fullAttrs.class && fullAttrs.class.includes('mention')) {
-              // Handling mentions here
-              return renderMention(attrs, children)
-            } else {
-              currentMentions = null
-              break
-            }
-          case 'span':
-            if (this.handleLinks && fullAttrs.class && fullAttrs.class.includes('h-card')) {
-              return ['', children.map(processItem), '']
-            }
+          }
+        } else if (Tag === 'span') {
+          if (this.handleLinks && fullAttrs.class && fullAttrs.class.includes('h-card')) {
+            return ['', children.map(processItem), '']
+          }
         }
 
         if (children !== undefined) {
-- 
cgit v1.2.3-70-g09d2


From 0dc2afb8261fc474bd46bcb1b57ab845fc1baf32 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Mon, 24 Jul 2023 19:13:37 -0400
Subject: Fix a bug where mentioning a user twice will not fill the mention
 into the textarea

---
 changelog.d/mention-twice.fix                          | 1 +
 src/components/post_status_modal/post_status_modal.js  | 4 ++++
 src/components/post_status_modal/post_status_modal.vue | 2 +-
 src/modules/postStatus.js                              | 6 ++++++
 4 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/mention-twice.fix

(limited to 'src')

diff --git a/changelog.d/mention-twice.fix b/changelog.d/mention-twice.fix
new file mode 100644
index 00000000..0e4b71df
--- /dev/null
+++ b/changelog.d/mention-twice.fix
@@ -0,0 +1 @@
+Fix a bug where mentioning a user twice will not fill the mention into the textarea
diff --git a/src/components/post_status_modal/post_status_modal.js b/src/components/post_status_modal/post_status_modal.js
index b44354db..8970dd9b 100644
--- a/src/components/post_status_modal/post_status_modal.js
+++ b/src/components/post_status_modal/post_status_modal.js
@@ -44,6 +44,10 @@ const PostStatusModal = {
   methods: {
     closeModal () {
       this.$store.dispatch('closePostStatusModal')
+    },
+    resetAndClose () {
+      this.$store.dispatch('resetPostStatusModal')
+      this.$store.dispatch('closePostStatusModal')
     }
   }
 }
diff --git a/src/components/post_status_modal/post_status_modal.vue b/src/components/post_status_modal/post_status_modal.vue
index dbcd321e..bc2cad4a 100644
--- a/src/components/post_status_modal/post_status_modal.vue
+++ b/src/components/post_status_modal/post_status_modal.vue
@@ -12,7 +12,7 @@
       <PostStatusForm
         class="panel-body"
         v-bind="params"
-        @posted="closeModal"
+        @posted="resetAndClose"
       />
     </div>
   </Modal>
diff --git a/src/modules/postStatus.js b/src/modules/postStatus.js
index 638c1fb2..d3bea137 100644
--- a/src/modules/postStatus.js
+++ b/src/modules/postStatus.js
@@ -10,6 +10,9 @@ const postStatus = {
     },
     closePostStatusModal (state) {
       state.modalActivated = false
+    },
+    resetPostStatusModal (state) {
+      state.params = null
     }
   },
   actions: {
@@ -18,6 +21,9 @@ const postStatus = {
     },
     closePostStatusModal ({ commit }) {
       commit('closePostStatusModal')
+    },
+    resetPostStatusModal ({ commit }) {
+      commit('resetPostStatusModal')
     }
   }
 }
-- 
cgit v1.2.3-70-g09d2


From 9baffbfbdeaaf52be95112c519e31ef5f2408180 Mon Sep 17 00:00:00 2001
From: Alexander Tumin <iamtakingiteasy@eientei.org>
Date: Wed, 31 May 2023 00:25:10 +0300
Subject: Fix HTML attribute parsing, discard attributes not strating with a
 letter

---
 changelog.d/html-attribute-parsing.fix         | 1 +
 src/services/html_converter/utility.service.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/html-attribute-parsing.fix

(limited to 'src')

diff --git a/changelog.d/html-attribute-parsing.fix b/changelog.d/html-attribute-parsing.fix
new file mode 100644
index 00000000..0952f773
--- /dev/null
+++ b/changelog.d/html-attribute-parsing.fix
@@ -0,0 +1 @@
+Fix HTML attribute parsing, discard attributes not strating with a letter
diff --git a/src/services/html_converter/utility.service.js b/src/services/html_converter/utility.service.js
index a1301353..f8e62dfe 100644
--- a/src/services/html_converter/utility.service.js
+++ b/src/services/html_converter/utility.service.js
@@ -22,7 +22,7 @@ export const getAttrs = (tag, filter) => {
     .replace(new RegExp('^' + getTagName(tag)), '')
     .replace(/\/?$/, '')
     .trim()
-  const attrs = Array.from(innertag.matchAll(/([a-z0-9-]+)(?:=("[^"]+?"|'[^']+?'))?/gi))
+  const attrs = Array.from(innertag.matchAll(/([a-z]+[a-z0-9-]*)(?:=("[^"]+?"|'[^']+?'))?/gi))
     .map(([trash, key, value]) => [key, value])
     .map(([k, v]) => {
       if (!v) return [k, true]
-- 
cgit v1.2.3-70-g09d2


From ac78f801943f22c27cc6e7e9eac7ececb9fa2a5a Mon Sep 17 00:00:00 2001
From: Alexander Tumin <iamtakingiteasy@eientei.org>
Date: Mon, 14 Aug 2023 16:21:43 +0300
Subject: Fix OAuth2 token lingering after revocation

---
 changelog.d/oauth2-token-linger.fix | 1 +
 src/modules/users.js                | 6 ++++++
 2 files changed, 7 insertions(+)
 create mode 100644 changelog.d/oauth2-token-linger.fix

(limited to 'src')

diff --git a/changelog.d/oauth2-token-linger.fix b/changelog.d/oauth2-token-linger.fix
new file mode 100644
index 00000000..da4e4631
--- /dev/null
+++ b/changelog.d/oauth2-token-linger.fix
@@ -0,0 +1 @@
+Fix OAuth2 token lingering after revocation
diff --git a/src/modules/users.js b/src/modules/users.js
index e976d875..50b4cb84 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -651,6 +651,12 @@ const users = {
               const response = data.error
               // Authentication failed
               commit('endLogin')
+
+              // remove authentication token on client/authentication errors
+              if ([400, 401, 403, 422].includes(response.status)) {
+                commit('clearToken')
+              }
+
               if (response.status === 401) {
                 reject(new Error('Wrong username or password'))
               } else {
-- 
cgit v1.2.3-70-g09d2


From ece79f84a8118750117d446f299b25ff79d9f8c1 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 11 Oct 2023 22:43:51 +0300
Subject: don't display link preview card if it's the same as quoted status

---
 src/components/status_content/status_content.js  | 4 ++++
 src/components/status_content/status_content.vue | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/components/status_content/status_content.js b/src/components/status_content/status_content.js
index 89f0aa51..c01b80af 100644
--- a/src/components/status_content/status_content.js
+++ b/src/components/status_content/status_content.js
@@ -73,6 +73,10 @@ const StatusContent = {
   },
   computed: {
     ...controlledOrUncontrolledGetters(['showingTall', 'expandingSubject', 'showingLongSubject']),
+    statusCard () {
+      if (!this.status.card) return null
+      return this.status.card.url === this.status.quote_url ? null : status.card
+    },
     hideAttachments () {
       return (this.mergedConfig.hideAttachments && !this.inConversation) ||
         (this.mergedConfig.hideAttachmentsInConv && this.inConversation)
diff --git a/src/components/status_content/status_content.vue b/src/components/status_content/status_content.vue
index c0e5c0b9..e977d489 100644
--- a/src/components/status_content/status_content.vue
+++ b/src/components/status_content/status_content.vue
@@ -43,7 +43,7 @@
       />
 
       <div
-        v-if="status.card && !noHeading && !compact"
+        v-if="statusCard && !noHeading && !compact"
         class="link-preview media-body"
       >
         <link-preview
-- 
cgit v1.2.3-70-g09d2


From 8f87a1506964e1b6dafc662f896e4332cd50eee9 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Fri, 13 Oct 2023 12:37:50 +0300
Subject: oops

---
 changelog.d/quote-hide-oops.fix                 | 1 +
 src/components/status_content/status_content.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/quote-hide-oops.fix

(limited to 'src')

diff --git a/changelog.d/quote-hide-oops.fix b/changelog.d/quote-hide-oops.fix
new file mode 100644
index 00000000..d93c0d29
--- /dev/null
+++ b/changelog.d/quote-hide-oops.fix
@@ -0,0 +1 @@
+fix typo in code that prevented cards from showing at all
diff --git a/src/components/status_content/status_content.js b/src/components/status_content/status_content.js
index c01b80af..8d8a91dc 100644
--- a/src/components/status_content/status_content.js
+++ b/src/components/status_content/status_content.js
@@ -75,7 +75,7 @@ const StatusContent = {
     ...controlledOrUncontrolledGetters(['showingTall', 'expandingSubject', 'showingLongSubject']),
     statusCard () {
       if (!this.status.card) return null
-      return this.status.card.url === this.status.quote_url ? null : status.card
+      return this.status.card.url === this.status.quote_url ? null : this.status.card
     },
     hideAttachments () {
       return (this.mergedConfig.hideAttachments && !this.inConversation) ||
-- 
cgit v1.2.3-70-g09d2


From c622b77dddc314434cbec9b03785ff82d04d1b52 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Fri, 27 Oct 2023 02:44:22 +0300
Subject: fix reports now showing reason

---
 src/components/report/report.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/components/report/report.js b/src/components/report/report.js
index 76055764..5685aa25 100644
--- a/src/components/report/report.js
+++ b/src/components/report/report.js
@@ -1,6 +1,7 @@
 import Select from '../select/select.vue'
 import StatusContent from '../status_content/status_content.vue'
 import Timeago from '../timeago/timeago.vue'
+import RichContent from 'src/components/rich_content/rich_content.jsx'
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
 
 const Report = {
@@ -10,10 +11,12 @@ const Report = {
   components: {
     Select,
     StatusContent,
-    Timeago
+    Timeago,
+    RichContent
   },
   computed: {
     report () {
+      console.log(this.$store.state.reports.reports[this.reportId] || {})
       return this.$store.state.reports.reports[this.reportId] || {}
     },
     state: {
-- 
cgit v1.2.3-70-g09d2