Fix frontend git url

Merge branch 'develop' of https://akkoma.dev/AkkomaGang/akkoma-fe into develop
Hack to fix streaming notification order
2024-08-03 21:33:40 -05:00 · 2024-08-03 18:43:26 -05:00 · 2024-02-11 23:18:23 -06:00 · 2024-02-11 22:17:58 -06:00 · 2024-02-10 16:55:05 -06:00 · 2024-01-21 00:00:41 -06:00
43 changed files with 527 additions and 997 deletions
--- a/.node-version
+++ b/.node-version
@ -0,0 +1 @@
+7.2.1
--- a/README.md
+++ b/README.md
@ -20,8 +20,6 @@ To use Akkoma-FE in Akkoma, use the [frontend](https://docs.akkoma.dev/stable/ad

 ## Build Setup

-Make sure you have [Node.js](https://nodejs.org/) installed. You can check `/.woodpecker.yml` for which node version the Akkoma CI currently uses.
-
 ``` bash
 # install dependencies
 corepack enable
--- a/package.json
+++ b/package.json
@ -41,9 +41,9 @@
    "qrcode": "^1.5.3",
    "querystring-es3": "^0.2.1",
    "url": "^0.11.3",
-    "vue": "^3.4.38",
-    "vue-i18n": "^9.14.0",
-    "vue-router": "^4.4.3",
+    "vue": "^3.2.31",
+    "vue-i18n": "^9.2.2",
+    "vue-router": "^4.3.2",
    "vue-template-compiler": "^2.7.16",
    "vuex": "^4.1.0"
  },
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@ -67,14 +67,26 @@ const resolveLanguage = (instanceLanguages) => {

 const getInstanceConfig = async ({ store }) => {
  try {
-    const res = await preloadFetch('/api/v1/instance')
+    const res = await preloadFetch('/api/v2/instance')
    if (res.ok) {
      const data = await res.json()
-      const textlimit = data.max_toot_chars
-      const vapidPublicKey = data.pleroma.vapid_public_key
+      const textlimit = data.configuration.statuses.max_characters
+      const vapidPublicKey = data.configuration.vapid.public_key

      store.dispatch('setInstanceOption', { name: 'textlimit', value: textlimit })
-      store.dispatch('setInstanceOption', { name: 'accountApprovalRequired', value: data.approval_required })
+      const uploadLimits = {
+        general: data.configuration.media_attachments.video_size_limit,
+        avatar: "2097152",
+        background: "2097152",
+        banner: "2097152"
+      }
+      store.dispatch('setInstanceOption', { name: 'uploadlimit', value: parseInt(uploadLimits.general) })
+      store.dispatch('setInstanceOption', { name: 'avatarlimit', value: parseInt(uploadLimits.avatar) })
+      store.dispatch('setInstanceOption', { name: 'backgroundlimit', value: parseInt(uploadLimits.background) })
+      store.dispatch('setInstanceOption', { name: 'bannerlimit', value: parseInt(uploadLimits.banner) })
+
+      store.dispatch('setInstanceOption', { name: 'postFormats', value: data.configuration.statuses.supported_mime_types })
+      store.dispatch('setInstanceOption', { name: 'accountApprovalRequired', value: data.registrations.approval_required })
      // don't override cookie if set
      if (!Cookies.get('userLanguage')) {
        store.dispatch('setOption', { name: 'interfaceLanguage', value: resolveLanguage(data.languages) })
@ -83,6 +95,8 @@ const getInstanceConfig = async ({ store }) => {
      if (vapidPublicKey) {
        store.dispatch('setInstanceOption', { name: 'vapidPublicKey', value: vapidPublicKey })
      }
+
+      resolveStaffAccounts({ store, accounts: [data.contact.account.id] })
    } else {
      throw (res)
    }
@ -183,12 +197,6 @@ const setSettings = async ({ apiConfig, staticConfig, store }) => {
  copyInstanceOption('renderMisskeyMarkdown')
  copyInstanceOption('sidebarRight')

-  if (config.backendCommitUrl)
-    copyInstanceOption('backendCommitUrl')
-
-  if (config.frontendCommitUrl)
-    copyInstanceOption('frontendCommitUrl')
-
  return store.dispatch('setTheme', config['theme'])
 }

@ -275,42 +283,33 @@ const getNodeInfo = async ({ store }) => {
    if (res.ok) {
      const data = await res.json()
      const metadata = data.metadata
-      const features = metadata.features
      store.dispatch('setInstanceOption', { name: 'name', value: metadata.nodeName })
-      store.dispatch('setInstanceOption', { name: 'registrationOpen', value: data.openRegistrations })
-      store.dispatch('setInstanceOption', { name: 'mediaProxyAvailable', value: features.includes('media_proxy') })
-      store.dispatch('setInstanceOption', { name: 'safeDM', value: features.includes('safe_dm_mentions') })
-      store.dispatch('setInstanceOption', { name: 'pollsAvailable', value: features.includes('polls') })
-      store.dispatch('setInstanceOption', { name: 'editingAvailable', value: features.includes('editing') })
+      store.dispatch('setInstanceOption', { name: 'registrationOpen', value: false }) // registration should be done through the default interface
+      store.dispatch('setInstanceOption', { name: 'mediaProxyAvailable', value: false })
+      store.dispatch('setInstanceOption', { name: 'safeDM', value: false })
+      store.dispatch('setInstanceOption', { name: 'pollsAvailable', value: true })
+      store.dispatch('setInstanceOption', { name: 'editingAvailable', value: true })
      store.dispatch('setInstanceOption', { name: 'pollLimits', value: metadata.pollLimits })
      store.dispatch('setInstanceOption', { name: 'mailerEnabled', value: metadata.mailerEnabled })
-      store.dispatch('setInstanceOption', { name: 'translationEnabled', value: features.includes('akkoma:machine_translation') })
+      store.dispatch('setInstanceOption', { name: 'translationEnabled', value: false }) // idk

-      const uploadLimits = metadata.uploadLimits
-      store.dispatch('setInstanceOption', { name: 'uploadlimit', value: parseInt(uploadLimits.general) })
-      store.dispatch('setInstanceOption', { name: 'avatarlimit', value: parseInt(uploadLimits.avatar) })
-      store.dispatch('setInstanceOption', { name: 'backgroundlimit', value: parseInt(uploadLimits.background) })
-      store.dispatch('setInstanceOption', { name: 'bannerlimit', value: parseInt(uploadLimits.banner) })
-      store.dispatch('setInstanceOption', { name: 'fieldsLimits', value: metadata.fieldsLimits })
+      store.dispatch('setInstanceOption', { name: 'fieldsLimits', value: 6 }) // todo: expose this on the backend

-      store.dispatch('setInstanceOption', { name: 'restrictedNicknames', value: metadata.restrictedNicknames })
-      store.dispatch('setInstanceOption', { name: 'postFormats', value: metadata.postFormats })
+      store.dispatch('setInstanceOption', { name: 'restrictedNicknames', value: [] })

-      const suggestions = metadata.suggestions
-      store.dispatch('setInstanceOption', { name: 'suggestionsEnabled', value: suggestions.enabled })
-      store.dispatch('setInstanceOption', { name: 'suggestionsWeb', value: suggestions.web })
+      store.dispatch('setInstanceOption', { name: 'suggestionsEnabled', value: true })
+      store.dispatch('setInstanceOption', { name: 'suggestionsWeb', value: true })

      const software = data.software
      store.dispatch('setInstanceOption', { name: 'backendVersion', value: software.version })
      store.dispatch('setInstanceOption', { name: 'pleromaBackend', value: software.name === 'pleroma' })

-      const priv = metadata.private
-      store.dispatch('setInstanceOption', { name: 'private', value: priv })
+      store.dispatch('setInstanceOption', { name: 'private', value: false })

      const frontendVersion = window.___pleromafe_commit_hash
      store.dispatch('setInstanceOption', { name: 'frontendVersion', value: frontendVersion })

-      const federation = metadata.federation
+      const federation = {}

      store.dispatch('setInstanceOption', {
        name: 'tagPolicyAvailable',
@ -320,7 +319,7 @@ const getNodeInfo = async ({ store }) => {
      })

      store.dispatch('setInstanceOption', { name: 'federationPolicy', value: federation })
-      store.dispatch('setInstanceOption', { name: 'localBubbleInstances', value: metadata.localBubbleInstances })
+      store.dispatch('setInstanceOption', { name: 'localBubbleInstances', value: [] })
      store.dispatch('setInstanceOption', {
        name: 'federating',
        value: typeof federation.enabled === 'undefined'
@ -328,14 +327,11 @@ const getNodeInfo = async ({ store }) => {
          : federation.enabled
      })

-      store.dispatch('setInstanceOption', { name: 'publicTimelineVisibility', value: metadata.publicTimelineVisibility })
-      store.dispatch('setInstanceOption', { name: 'federatedTimelineAvailable', value: metadata.federatedTimelineAvailable })
+      store.dispatch('setInstanceOption', { name: 'publicTimelineVisibility', value: { bubble: false, local: true, federated: true } })
+      store.dispatch('setInstanceOption', { name: 'federatedTimelineAvailable', value: true })

      const accountActivationRequired = metadata.accountActivationRequired
-      store.dispatch('setInstanceOption', { name: 'accountActivationRequired', value: accountActivationRequired })
-
-      const accounts = metadata.staffAccounts
-      resolveStaffAccounts({ store, accounts })
+      store.dispatch('setInstanceOption', { name: 'accountActivationRequired', value: true })
    } else {
      throw (res)
    }
@ -373,7 +369,7 @@ const afterStoreSetup = async ({ store, i18n }) => {

  FaviconService.initFaviconService()

-  const overrides = window.___pleromafe_dev_overrides || {}
+  const overrides = window.___pleromafe_dev_overrides || { target: 'https://wetdry.world/' }
  const server = (typeof overrides.target !== 'undefined') ? overrides.target : window.location.origin
  store.dispatch('setInstanceOption', { name: 'server', value: server })

--- a/src/components/announcement/announcement.vue
+++ b/src/components/announcement/announcement.vue
@ -44,20 +44,6 @@
        >
          {{ $t('announcements.mark_as_read_action') }}
        </button>
-        <button
-          v-if="currentUser && currentUser.role === 'admin'"
-          class="btn button-default"
-          @click="enterEditMode"
-        >
-          {{ $t('announcements.edit_action') }}
-        </button>
-        <button
-          v-if="currentUser && currentUser.role === 'admin'"
-          class="btn button-default"
-          @click="deleteAnnouncement"
-        >
-          {{ $t('announcements.delete_action') }}
-        </button>
      </div>
      <div
        v-else
--- a/src/components/announcements_page/announcements_page.vue
+++ b/src/components/announcements_page/announcements_page.vue
@ -6,46 +6,6 @@
      </div>
    </div>
    <div class="panel-body">
-      <section
-        v-if="currentUser && currentUser.role === 'admin'"
-      >
-        <div class="post-form">
-          <div class="heading">
-            <h4>{{ $t('announcements.post_form_header') }}</h4>
-          </div>
-          <div class="body">
-            <announcement-editor
-              :announcement="newAnnouncement"
-              :disabled="posting"
-            />
-          </div>
-          <div class="footer">
-            <button
-              class="btn button-default post-button"
-              :disabled="posting"
-              @click.prevent="postAnnouncement"
-            >
-              {{ $t('announcements.post_action') }}
-            </button>
-            <div
-              v-if="error"
-              class="alert error"
-            >
-              {{ $t('announcements.post_error', { error }) }}
-              <button
-                class="button-unstyled"
-                @click="clearError"
-              >
-                <FAIcon
-                  class="fa-scale-110 fa-old-padding"
-                  icon="times"
-                  :title="$t('announcements.close_error')"
-                />
-              </button>
-            </div>
-          </div>
-        </div>
-      </section>
      <section
        v-for="announcement in announcements"
        :key="announcement.id"
--- a/src/components/desktop_nav/desktop_nav.vue
+++ b/src/components/desktop_nav/desktop_nav.vue
@ -167,7 +167,7 @@
        </button>
        <a
          v-if="currentUser && currentUser.role === 'admin'"
-          href="/pleroma/admin/#/login-pleroma"
+          :href="'https://' + $store.getters.instanceDomain + '/admin/dashboard'"
          class="nav-icon"
          target="_blank"
          @click.stop
--- a/src/components/follow_request_card/follow_request_card.js
+++ b/src/components/follow_request_card/follow_request_card.js
@ -46,7 +46,7 @@ const FollowRequestCard = {
      this.$store.dispatch('decrementFollowRequestsCount')

      const notifId = this.findFollowRequestNotificationId()
-      this.$store.dispatch('markSingleNotificationAsSeen', { id: notifId })
+      //this.$store.dispatch('markSingleNotificationAsSeen', { id: notifId })
      this.$store.dispatch('updateNotification', {
        id: notifId,
        updater: notification => {
--- a/src/components/mfa_form/totp_form.vue
+++ b/src/components/mfa_form/totp_form.vue
@ -18,7 +18,6 @@
          <input
            id="code"
            v-model="code"
-            autocomplete="one-time-code"
            class="form-control"
          >
        </div>
--- a/src/components/notification/notification.js
+++ b/src/components/notification/notification.js
@ -89,7 +89,7 @@ const Notification = {
    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 })
+      //this.$store.dispatch('markSingleNotificationAsSeen', { id: this.notification.id })
      this.$store.dispatch('updateNotification', {
        id: this.notification.id,
        updater: notification => {
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@ -329,7 +329,6 @@ const PostStatusForm = {
  watch: {
    'newStatus': {
      deep: true,
-      flush: 'sync',
      handler () {
        this.statusChanged()
      }
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@ -73,50 +73,6 @@
          <p>{{ $t('post_status.edit_remote_warning') }}</p>
          <p>{{ $t('post_status.edit_unsupported_warning') }}</p>
        </div>
-        <div
-          v-if="!disablePreview"
-          class="preview-heading faint"
-        >
-          <a
-            class="preview-toggle faint"
-            @click.stop.prevent="togglePreview"
-          >
-            {{ $t('post_status.preview') }}
-            <FAIcon :icon="showPreview ? 'chevron-left' : 'chevron-right'" />
-          </a>
-          <div
-            v-show="previewLoading"
-            class="preview-spinner"
-          >
-            <FAIcon
-              class="fa-old-padding"
-              spin
-              icon="circle-notch"
-            />
-          </div>
-        </div>
-        <div
-          v-if="showPreview"
-          class="preview-container"
-        >
-          <div
-            v-if="!preview"
-            class="preview-status"
-          >
-            {{ $t('general.loading') }}
-          </div>
-          <div
-            v-else-if="preview.error"
-            class="preview-status preview-error"
-          >
-            {{ preview.error }}
-          </div>
-          <StatusContent
-            v-else
-            :status="preview"
-            class="preview-status"
-          />
-        </div>
        <EmojiInput
          v-if="subjectVisible"
          ref="subject-emoji-input"
--- a/src/components/settings_modal/settings_modal.js
+++ b/src/components/settings_modal/settings_modal.js
@ -69,7 +69,7 @@ const SettingsModal = {
      this.$store.dispatch('closeSettingsModal')
    },
    logout () {
-      this.$router.replace(this.$store.state.instance.redirectRootNoLogin || '/main/all')
+      this.$router.replace('/main/public')
      this.$store.dispatch('closeSettingsModal')
      this.$store.dispatch('logout')
    },
--- a/src/components/settings_modal/tabs/general_tab.js
+++ b/src/components/settings_modal/tabs/general_tab.js
@ -104,7 +104,6 @@ const GeneralTab = {
      get: function () { return this.$store.getters.mergedConfig.profile },
      set: function (val) {
        this.$store.dispatch('setOption', { name: 'profile', value: val })
-        this.$store.dispatch('getSettingsProfile')
      }
    },
    settingsVersion () {
@ -144,12 +143,10 @@ const GeneralTab = {
    },
    loadSettingsProfile (name) {
      this.$store.commit('setOption', { name: 'profile', value: name })
-      this.$store.dispatch('getSettingsProfile', true)
    },
    createSettingsProfile () {
      this.$store.dispatch('setOption', { name: 'profile', value: this.newProfileName })
      this.$store.dispatch('setOption', { name: 'profileVersion', value: 1 })
-      this.$store.dispatch('syncSettings')
      this.newProfileName = ''
    },
    forceSync () {
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@ -159,16 +159,6 @@
            {{ $t('settings.show_page_backgrounds') }}
          </BooleanSetting>
        </li>
-        <li>
-          <BooleanSetting path="centerAlignBio">
-            {{ $t('settings.center_align_bio') }}
-          </BooleanSetting>
-        </li>
-        <li>
-          <BooleanSetting path="compactUserInfo">
-            {{ $t('settings.compact_user_info') }}
-          </BooleanSetting>
-        </li>
        <li>
          <BooleanSetting path="stopGifs">
            {{ $t('settings.stop_gifs') }}
--- a/src/components/settings_modal/tabs/version_tab.js
+++ b/src/components/settings_modal/tabs/version_tab.js
@ -1,25 +1,22 @@
 import { extractCommit } from 'src/services/version/version.service'

-function joinURL(base, subpath) {
-  return URL.parse(subpath, base)?.href || "invalid base URL"
-}
+const pleromaFeCommitUrl = 'https://akkoma.dev/esm/akkoma-fe/commit/'
+const pleromaBeCommitUrl = 'https://akkoma.dev/AkkomaGang/akkoma/commit/'

 const VersionTab = {
  data () {
    const instance = this.$store.state.instance
    return {
-      backendCommitUrl: instance.backendCommitUrl,
      backendVersion: instance.backendVersion,
-      frontendCommitUrl: instance.frontendCommitUrl,
      frontendVersion: instance.frontendVersion
    }
  },
  computed: {
    frontendVersionLink () {
-      return joinURL(this.frontendCommitUrl, this.frontendVersion)
+      return pleromaFeCommitUrl + this.frontendVersion
    },
    backendVersionLink () {
-      return joinURL(this.backendCommitUrl, extractCommit(this.backendVersion))
+      return 'https://github.com/TheEssem/mastodon'
    }
  }
 }
--- a/src/components/side_drawer/side_drawer.vue
+++ b/src/components/side_drawer/side_drawer.vue
@ -163,7 +163,7 @@
          @click="toggleDrawer"
        >
          <a
-            href="/pleroma/admin/#/login-pleroma"
+            :href="'https://' + $store.getters.instanceDomain + '/admin/dashboard'"
            target="_blank"
          >
            <FAIcon
--- a/src/components/status_body/status_body.js
+++ b/src/components/status_body/status_body.js
@ -41,8 +41,7 @@ const StatusContent = {
      postLength: this.status.text.length,
      parseReadyDone: false,
      renderMisskeyMarkdown,
-      translateFrom: null,
-      translating: false
+      translateFrom: null
    }
  },
  computed: {
@ -136,10 +135,7 @@ const StatusContent = {
    },
    translateStatus () {
      const translateTo = this.$store.getters.mergedConfig.translationLanguage || this.$store.state.instance.interfaceLanguage
-      this.translating = true
-      this.$store.dispatch(
-        'translateStatus', { id: this.status.id, language: translateTo, from: this.translateFrom }
-      ).finally(() => { this.translating = false })
+      this.$store.dispatch('translateStatus', { id: this.status.id, language: translateTo, from: this.translateFrom })
    }
  }
 }
--- a/src/components/status_body/status_body.vue
+++ b/src/components/status_body/status_body.vue
@ -91,7 +91,6 @@
              {{ ' ' }}
              <button
                class="btn button-default"
-                :disabled="translating"
                @click="translateStatus"
              >
                {{ $t('status.translate') }}
--- a/src/components/user_card/user_card.js
+++ b/src/components/user_card/user_card.js
@ -117,11 +117,6 @@ export default {
    shouldConfirmMute () {
      return this.mergedConfig.modalOnMute
    },
-    compactUserInfo () {
-      return this.$store.getters.mergedConfig.compactUserInfo
-        && (this.$store.state.interface.layoutType !== 'mobile')
-        && this.switcher
-    },
    ...mapGetters(['mergedConfig'])
  },
  components: {
--- a/src/components/user_card/user_card.scss
+++ b/src/components/user_card/user_card.scss
@ -21,13 +21,6 @@
    position: relative;
  }

-  .user-buttons {
-    grid-area: edit;
-    display: flex;
-    padding: .5em 0 .5em 0;
-    justify-self: end;
-  }
-
  .panel-body {
    word-wrap: break-word;
    border-bottom-right-radius: inherit;
@ -60,6 +53,7 @@
  }

  &-bio {
+    text-align: center;
    display: block;
    line-height: 1.3;
    padding: 1em;
@ -106,14 +100,15 @@
  padding: 0 26px;

  .container {
+    min-width: 0;
    padding: 16px 0 6px;
-    display: grid;
-    grid-template-areas:
-      "pfp name edit"
-      "pfp summary summary"
-      "stats stats stats";
-    grid-template-columns: auto 1fr auto;
-    align-items: start;
+    display: flex;
+    align-items: flex-start;
+    max-height: 56px;
+
+    > * {
+      min-width: 0;
+    }

    .Avatar {
      --_avatarShadowBox: var(--avatarShadow);
@ -128,7 +123,6 @@
  }

  &-avatar-link {
-    grid-area: pfp;
    position: relative;
    cursor: pointer;

@ -159,8 +153,8 @@

  .external-link-button, .edit-profile-button {
    cursor: pointer;
-    width: 2.3em;
-    text-align: right;
+    width: 2.5em;
+    text-align: center;
    margin: -0.5em 0;
    padding: 0.5em 0;

@ -171,16 +165,12 @@
  }

  .user-summary {
-    grid-area: summary;
-    display: grid;
-    grid-template-areas:
-      "name name name name name"
-      "hand role lock avg _";
-    grid-template-columns:
-       auto auto auto auto 1fr;
-    justify-items: start;
+    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;
@ -188,80 +178,54 @@

    --emoji-size: 1.7em;

-    .user-locked {
-      margin-left: 0.5em;
-      grid-area: lock;
-    }
-
-    .user-screen-name {
-      min-width: 1px;
-      max-width: 100%;
-      text-overflow: ellipsis;
-      overflow: hidden;
-      color: $fallback--lightText;
-      color: var(--lightText, $fallback--lightText);
-      grid-area: hand;
-    }
-
-    .dailyAvg {
-      min-width: 1px;
-      margin-left: 1em;
-      font-size: 0.7em;
-      color: $fallback--text;
-      color: var(--text, $fallback--text);
-      grid-area: avg;
-    }
-
-    .user-roles {
+    .top-line,
+    .bottom-line {
      display: flex;
-      grid-area: role;
-
-      .user-role {
-        color: $fallback--text;
-        color: var(--alertNeutralText, $fallback--text);
-        background-color: $fallback--fg;
-        background-color: var(--alertNeutral, $fallback--fg);
-      }
-    }
-  }
-
-  .user-counts {
-    grid-area: stats;
-    display: flex;
-    line-height:16px;
-    padding-top: 0.5em;
-    text-align: center;
-    justify-content: space-around;
-    color: $fallback--lightText;
-    color: var(--lightText, $fallback--lightText);
-    align-self: center;
-
-    .user-count {
-      padding: .5em 0 .5em 0;
-      margin: 0 .5em;
-
-      h5 {
-        font-size:1em;
-        font-weight: bolder;
-        margin: 0 0 0.25em;
-      }
-      a {
-        text-decoration: none;
-      }
    }
  }

  .user-name {
-    text-align: start;
    text-overflow: ellipsis;
    overflow: hidden;
-    margin-left: 0.6em;
+    flex: 1 1 auto;
+    margin-right: 1em;
    font-size: 1.1em;
-    grid-area: name;
-    align-self: center;
-    white-space: nowrap;
-    max-width: 100%;
-    z-index: 1; // so shadow from user avatar doesn't overlap it
+  }
+
+  .bottom-line {
+    font-weight: light;
+    font-size: 1.1em;
+    align-items: baseline;
+
+    .lock-icon {
+      margin-left: 0.5em;
+    }
+
+    .user-screen-name {
+      min-width: 1px;
+      flex: 0 1 auto;
+      text-overflow: ellipsis;
+      overflow: hidden;
+      color: $fallback--lightText;
+      color: var(--lightText, $fallback--lightText);
+    }
+
+    .dailyAvg {
+      min-width: 1px;
+      flex: 0 0 auto;
+      margin-left: 1em;
+      font-size: 0.7em;
+      color: $fallback--text;
+      color: var(--text, $fallback--text);
+    }
+
+    .user-role {
+      flex: none;
+      color: $fallback--text;
+      color: var(--alertNeutralText, $fallback--text);
+      background-color: $fallback--fg;
+      background-color: var(--alertNeutral, $fallback--fg);
+    }
  }

  .user-meta {
@ -326,21 +290,34 @@
      margin: 0;
    }
  }
-
-  &.-compact {
-    .container {
-      grid-template-areas:
-        "pfp name stats edit"
-        "pfp summary stats edit";
-      grid-template-columns: auto auto 1fr auto;
-    }
-    .user-counts {
-      padding-top: 0;
-      justify-content: space-evenly;
-    }
-  }
 }

 .sidebar .edit-profile-button {
  display: none;
 }
+
+.user-counts {
+  display: flex;
+  line-height:16px;
+  padding: .5em 1.5em 0em 1.5em;
+  text-align: center;
+  justify-content: space-between;
+  color: $fallback--lightText;
+  color: var(--lightText, $fallback--lightText);
+  flex-wrap: wrap;
+}
+
+.user-count {
+  flex: 1 0 auto;
+  padding: .5em 0 .5em 0;
+  margin: 0 .5em;
+
+  h5 {
+    font-size:1em;
+    font-weight: bolder;
+    margin: 0 0 0.25em;
+  }
+  a {
+    text-decoration: none;
+  }
+}
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@ -9,10 +9,7 @@
      class="background-image"
    />
    <div class="panel-heading -flexible-height">
-      <div
-        class="user-info"
-        :class="{ '-compact': this.compactUserInfo }"
-      >
+      <div class="user-info">
        <div class="container">
          <a
            v-if="allowZoomingAvatar"
@ -32,7 +29,6 @@
          </a>
          <router-link
            v-else
-            class="user-info-avatar-link"
            :to="userProfileLink(user)"
          >
            <UserAvatar
@ -40,80 +36,15 @@
              :user="user"
            />
          </router-link>
-          <RichContent
-            :title="user.name"
-            class="user-name"
-            :html="user.name"
-            :emoji="user.emoji"
-          />
          <div class="user-summary">
-            <router-link
-              class="user-screen-name"
-              :title="user.screen_name_ui"
-              :to="userProfileLink(user)"
-            >
-              @{{ user.screen_name_ui }}
-            </router-link>
-            <span class="user-roles" v-if="!hideBio && (user.deactivated || !!visibleRole || user.bot)">
-              <span
-                v-if="user.deactivated"
-                class="alert user-role"
-              >
-                {{ $t('user_card.deactivated') }}
-              </span>
-              <span
-                v-if="!!visibleRole"
-                class="alert user-role"
-              >
-                {{ $t(`general.role.${visibleRole}`) }}
-              </span>
-              <span
-                v-if="user.bot"
-                class="alert user-role"
-              >
-                {{ $t('user_card.bot') }}
-              </span>
-            </span>
-            <span class="user-locked" v-if="user.locked">
-              <FAIcon
-                class="lock-icon"
-                icon="lock"
-                size="sm"
+            <div class="top-line">
+              <RichContent
+                :title="user.name"
+                class="user-name"
+                :html="user.name"
+                :emoji="user.emoji"
              />
-            </span>
-            <span
-              v-if="!mergedConfig.hideUserStats && !hideBio"
-              class="dailyAvg"
-            >{{ dailyAvg }} {{ $t('user_card.per_day') }}</span>
-          </div>
-          <div
-            v-if="!mergedConfig.hideUserStats && switcher"
-            class="user-counts"
-          >
-            <div
-              class="user-count"
-              @click.prevent="setProfileView('statuses')"
-            >
-              <h5>{{ $t('user_card.statuses') }}</h5>
-              <span>{{ user.statuses_count }} <br></span>
-            </div>
-            <div
-              class="user-count"
-              @click.prevent="setProfileView('friends')"
-            >
-              <h5>{{ $t('user_card.followees') }}</h5>
-              <span>{{ hideFollowsCount ? $t('user_card.hidden') : user.friends_count }}</span>
-            </div>
-            <div
-              class="user-count"
-              @click.prevent="setProfileView('followers')"
-            >
-              <h5>{{ $t('user_card.followers') }}</h5>
-              <span>{{ hideFollowersCount ? $t('user_card.hidden') : user.followers_count }}</span>
-            </div>
-          </div>
-          <div class="user-buttons">
-            <button
+              <button
                v-if="!isOtherUser && user.is_local"
                class="button-unstyled edit-profile-button"
                @click.stop="openProfileTab"
@ -152,6 +83,47 @@
                :user="user"
                :relationship="relationship"
              />
+            </div>
+            <div class="bottom-line">
+              <router-link
+                class="user-screen-name"
+                :title="user.screen_name_ui"
+                :to="userProfileLink(user)"
+              >
+                @{{ user.screen_name_ui }}
+              </router-link>
+              <template v-if="!hideBio">
+                <span
+                  v-if="user.deactivated"
+                  class="alert user-role"
+                >
+                  {{ $t('user_card.deactivated') }}
+                </span>
+                <span
+                  v-if="!!visibleRole"
+                  class="alert user-role"
+                >
+                  {{ $t(`general.role.${visibleRole}`) }}
+                </span>
+                <span
+                  v-if="user.bot"
+                  class="alert user-role"
+                >
+                  {{ $t('user_card.bot') }}
+                </span>
+              </template>
+              <span v-if="user.locked">
+                <FAIcon
+                  class="lock-icon"
+                  icon="lock"
+                  size="sm"
+                />
+              </span>
+              <span
+                v-if="!mergedConfig.hideUserStats && !hideBio"
+                class="dailyAvg"
+              >{{ dailyAvg }} {{ $t('user_card.per_day') }}</span>
+            </div>
          </div>
        </div>
        <div class="user-meta">
@ -297,13 +269,38 @@
      v-if="!hideBio"
      class="panel-body"
    >
+      <div
+        v-if="!mergedConfig.hideUserStats && switcher"
+        class="user-counts"
+      >
+        <div
+          class="user-count"
+          @click.prevent="setProfileView('statuses')"
+        >
+          <h5>{{ $t('user_card.statuses') }}</h5>
+          <span>{{ user.statuses_count }} <br></span>
+        </div>
+        <div
+          class="user-count"
+          @click.prevent="setProfileView('friends')"
+        >
+          <h5>{{ $t('user_card.followees') }}</h5>
+          <span>{{ hideFollowsCount ? $t('user_card.hidden') : user.friends_count }}</span>
+        </div>
+        <div
+          class="user-count"
+          @click.prevent="setProfileView('followers')"
+        >
+          <h5>{{ $t('user_card.followers') }}</h5>
+          <span>{{ hideFollowersCount ? $t('user_card.hidden') : user.followers_count }}</span>
+        </div>
+      </div>
      <RichContent
        v-if="!hideBio"
        class="user-card-bio"
        :html="user.description_html"
        :emoji="user.emoji"
        :handle-links="true"
-        :style='{"text-align": this.$store.getters.mergedConfig.centerAlignBio ? "center" : "start"}'
      />
    </div>
    <teleport to="#modal">
--- a/src/components/who_to_follow/who_to_follow.js
+++ b/src/components/who_to_follow/who_to_follow.js
@ -16,7 +16,7 @@ const WhoToFollow = {
  methods: {
    showWhoToFollow (reply) {
      reply.forEach((i, index) => {
-        this.$store.state.api.backendInteractor.fetchUser({ id: i.acct })
+        this.$store.state.api.backendInteractor.fetchUser({ id: i.id })
          .then((externalUser) => {
            if (!externalUser.error) {
              this.$store.commit('addNewUsers', [externalUser])
--- a/src/components/who_to_follow_panel/who_to_follow_panel.js
+++ b/src/components/who_to_follow_panel/who_to_follow_panel.js
@ -9,11 +9,12 @@ function showWhoToFollow (panel, reply) {
    let user = shuffled[index]
    let img = user.avatar || this.$store.state.instance.defaultAvatar
    let name = user.acct
+    let id = user.id

    toFollow.img = img
    toFollow.name = name

-    panel.$store.state.api.backendInteractor.fetchUser({ id: name })
+    panel.$store.state.api.backendInteractor.fetchUser({ id })
      .then((externalUser) => {
        if (!externalUser.error) {
          panel.$store.commit('addNewUsers', [externalUser])
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@ -482,7 +482,6 @@
        "blocks_tab": "Blocks",
        "bot": "Dies ist ein Bot Account",
        "btnRadius": "Knöpfe",
-        "center_align_bio": "Zentrale Textausrichtung in der Bio",
        "cBlue": "Blau (Antworten, folgt dir)",
        "cGreen": "Grün (Retweet)",
        "cOrange": "Orange (Favorisieren)",
@ -497,7 +496,6 @@
        "checkboxRadius": "Auswahlfelder",
        "collapse_subject": "Beiträge mit Inhaltswarnungen einklappen",
        "columns": "Spalten",
-        "compact_user_info": "Kompakte Benutzerinfos wenn genug Platz",
        "composing": "Verfassen",
        "confirm_dialogs": "Bestätigung erforderlich für:",
        "confirm_dialogs_approve_follow": "Annehmen einer Followanfrage",
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@ -488,7 +488,6 @@
        "blocks_tab": "Blocks",
        "bot": "This is a bot account",
        "btnRadius": "Buttons",
-        "center_align_bio": "Center text in user bio",
        "cBlue": "Blue (Reply, follow)",
        "cGreen": "Green (Retweet)",
        "cOrange": "Orange (Favorite)",
@ -503,7 +502,6 @@
        "checkboxRadius": "Checkboxes",
        "collapse_subject": "Collapse posts with content warnings",
        "columns": "Columns",
-        "compact_user_info": "Compact user info when enough space",
        "composing": "Composing",
        "confirm_dialogs": "Require confirmation for:",
        "confirm_dialogs_approve_follow": "Accepting a follow request",
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@ -503,13 +503,7 @@
        "columns": "Colonne",
        "composing": "Composizione",
        "confirm_new_password": "Conferma la nuova password",
-        "conversation_display": "Stile di visualizzazione delle conversazioni",
-        "conversation_display_linear": "Stile lineare",
-        "conversation_display_tree": "Stile ad albero",
-        "conversation_other_replies_button": "Mostra il bottone \"altre risposte\"",
-        "conversation_other_replies_button_below": "Sotto i post",
        "current_avatar": "La tua icona attuale",
-        "current_mascot": "La tua mascotte attuale",
        "current_password": "La tua password attuale",
        "data_import_export_tab": "Importa o esporta dati",
        "default_vis": "Visibilità predefinita dei messaggi",
@ -517,15 +511,11 @@
        "delete_account_description": "Elimina definitivamente i tuoi dati e disattiva il tuo profilo.",
        "delete_account_error": "C'è stato un problema durante l'eliminazione del tuo profilo. Se il problema persiste contatta l'amministratore della tua stanza.",
        "delete_account_instructions": "Digita la tua password nel campo sottostante per eliminare il tuo profilo.",
-        "disable_sticky_headers": "Non fissare i titoli delle colonne in cima allo schermo",
        "discoverable": "Permetti la scoperta di questo profilo a servizi di ricerca ed altro",
        "domain_mutes": "Domini",
-        "download_backup": "Scarica",
-        "email_language": "Lingua delle email ricevute dal server",
        "emoji_reactions_on_timeline": "Mostra reazioni nelle sequenze",
        "enable_web_push_notifications": "Abilita notifiche web push",
        "enter_current_password_to_confirm": "Inserisci la tua password per identificarti",
-        "expert_mode": "Mostra avanzate",
        "export_theme": "Salva impostazioni",
        "file_export_import": {
            "backup_restore": "Archiviazione impostazioni",
@ -553,23 +543,18 @@
        "hide_all_muted_posts": "Nascondi messaggi silenziati",
        "hide_attachments_in_convo": "Nascondi gli allegati presenti nelle conversazioni",
        "hide_attachments_in_tl": "Nascondi gli allegati presenti nelle sequenze",
-        "hide_bot_indication": "Nascondi indicatore bot nei post",
-        "hide_favorites_description": "Non mostrare la lista dei miei preferiti (gli utenti verranno comunque notificati)",
        "hide_filtered_statuses": "Nascondi messaggi filtrati",
        "hide_followers_count_description": "Non mostrare quanti seguaci ho",
        "hide_followers_description": "Non mostrare i miei seguaci",
        "hide_follows_count_description": "Non mostrare quanti utenti seguo",
        "hide_follows_description": "Non mostrare chi seguo",
        "hide_isp": "Nascondi pannello della stanza",
-        "hide_list_aliases_error_action": "Chiudi",
        "hide_media_previews": "Nascondi anteprime",
        "hide_muted_posts": "Nascondi messaggi degli utenti silenziati",
-        "hide_muted_threads": "Nascondi conversazioni silenziate",
        "hide_post_stats": "Nascondi statistiche dei messaggi (es. il numero di preferenze)",
        "hide_shoutbox": "Nascondi muro dei graffiti",
        "hide_user_stats": "Nascondi statistiche dell'utente (es. il numero di seguaci)",
        "hide_wallpaper": "Nascondi sfondo della stanza",
-        "hide_wordfiltered_statuses": "Nascondi post filtrati per parola",
        "import_blocks_from_a_csv_file": "Importa blocchi da un file CSV",
        "import_followers_from_a_csv_file": "Importa una lista di chi segui da un file CSV",
        "import_mutes_from_a_csv_file": "Importa silenziati da un file CSV",
@ -582,14 +567,10 @@
        "invalid_theme_imported": "Il file selezionato non è un tema supportato da Pleroma. Il tuo tema non è stato modificato.",
        "limited_availability": "Non disponibile nel tuo browser",
        "links": "Collegamenti",
-        "list_aliases_error": "Errore nel recupero degli alias: {error}",
-        "list_backups_error": "Errore nel recupero della lista dei backup: {error}",
        "lock_account_description": "Vaglia manualmente i nuovi seguaci",
        "loop_video": "Riproduci video in ciclo continuo",
        "loop_video_silent_only": "Riproduci solo video muti in ciclo continuo (es. le \"gif\" di Mastodon)",
-        "mascot": "Mascotte di MastodonFE",
        "max_thumbnails": "Numero massimo di anteprime per messaggio",
-        "mention_links": "Collegamenti delle menzioni",
        "mfa": {
            "authentication_methods": "Metodi di accesso",
            "confirm_and_enable": "Conferma ed abilita OTP",
@ -613,12 +594,6 @@
        },
        "minimal_scopes_mode": "Riduci opzioni di visibilità",
        "more_settings": "Altre impostazioni",
-        "move_account": "Sposta account",
-        "move_account_error": "Errore nello spostamento dell'account: {error}",
-        "move_account_notes": "Se vuoi spostare questo account da qualche altra parte, devi andare all'account di destinazione e aggiungere un alias che punta qui.",
-        "move_account_target": "Account di destinazione (es. {example})",
-        "moved_account": "Account spostato.",
-        "mute_bot_posts": "Silenzia post dei bot",
        "mute_export": "Esporta silenziati",
        "mute_export_button": "Esporta i silenziati in un file CSV",
        "mute_import": "Carica silenziati",
@ -628,7 +603,6 @@
        "mutes_tab": "Silenziati",
        "name": "Nome",
        "name_bio": "Nome ed introduzione",
-        "new_alias_target": "Aggiungi nuovo alias (es. {example})",
        "new_email": "Nuova email",
        "new_password": "Nuova password",
        "no_blocks": "Nessun utente bloccato",
@ -646,7 +620,6 @@
        "notification_visibility_likes": "Preferiti",
        "notification_visibility_mentions": "Menzioni",
        "notification_visibility_moves": "Migrazioni utenti",
-        "notification_visibility_polls": "Termine dei poll in cui hai votato",
        "notification_visibility_repeats": "Condivisioni",
        "notifications": "Notifiche",
        "nsfw_clickthrough": "Fai click per visualizzare gli allegati offuscati",
@ -655,9 +628,7 @@
        "panelRadius": "Pannelli",
        "pause_on_unfocused": "Interrompi l'aggiornamento continuo mentre la scheda è in secondo piano",
        "play_videos_in_modal": "Riproduci video in un riquadro a sbalzo",
-        "post_look_feel": "Aspetto dei post",
        "post_status_content_type": "Tipo di contenuto dei messaggi",
-        "posts": "Post",
        "preload_images": "Precarica immagini",
        "presets": "Valori predefiniti",
        "profile_background": "Sfondo del tuo profilo",
@ -671,8 +642,6 @@
        "profile_tab": "Profilo",
        "radii_help": "Imposta il raggio degli angoli (in pixel)",
        "refresh_token": "Aggiorna token",
-        "remove_alias": "Rimuovi questo alias",
-        "remove_backup": "Elimina",
        "replies_in_timeline": "Risposte nelle sequenze",
        "reply_visibility_all": "Mostra tutte le risposte",
        "reply_visibility_following": "Mostra solo le risposte rivolte a me o agli utenti che seguo",
@ -697,15 +666,12 @@
        "security_tab": "Sicurezza",
        "sensitive_by_default": "Tutti i miei messaggi sono scabrosi",
        "set_new_avatar": "Scegli una nuova icona",
-        "set_new_mascot": "Imposta nuova mascotte",
        "set_new_profile_background": "Scegli un nuovo sfondo",
        "set_new_profile_banner": "Scegli un nuovo gonfalone",
        "setting_changed": "Valore personalizzato",
-        "setting_server_side": "Questa impostazione è legata al tuo profilo e ha effetto su tutte le sessioni e tutti i client",
        "settings": "Impostazioni",
        "show_admin_badge": "Mostra l'insegna di amministratore sul mio profilo",
        "show_moderator_badge": "Mostra l'insegna di moderatore sul mio profilo",
-        "show_scrollbars": "Mostra le barre di scorrimento delle colonne laterali",
        "stop_gifs": "Riproduci GIF al passaggio del cursore",
        "streaming": "Mostra automaticamente i nuovi messaggi quando sei in cima alla pagina",
        "style": {
@ -814,80 +780,66 @@
                },
                "filter_hint": {
                    "always_drop_shadow": "Attenzione: quest'ombra usa sempre {0} se il tuo browser lo supporta.",
-                    "avatar_inset": "Tieni presente che combinare ombre (sia incavate che non) sulle icone utente potrebbe dare risultati strani con avatar trasparenti.",
-                    "drop_shadow_syntax": "{0} non supporta il parametro {1} con la keyword {2}.",
-                    "inset_classic": "Le ombre incavate usano {0}",
-                    "spread_zero": "Le ombre con espansione maggiore di zero appariranno come se l'espansione fosse zero"
+                    "avatar_inset": "Tieni presente che combinare ombre (sia incluse che non) sulle icone utente potrebbe dare risultati strani con quelle trasparenti.",
+                    "drop_shadow_syntax": "{0} non supporta il parametro {1} né la keyword {2}.",
+                    "inset_classic": "Le ombre incluse usano {0}",
+                    "spread_zero": "Lo spandimento maggiore di zero si azzera sulle ombre"
                },
-                "hintV3": "Per le ombre puoi anche usare la sintassi {0} per usare l'altro slot colore.",
-                "inset": "Incavatura",
-                "override": "Sovrascrivi",
-                "shadow_id": "Ombra #{value}",
-                "spread": "Espansione"
+                "hintV3": "Per le ombre puoi anche usare la sintassi {0} per sfruttare il secondo colore.",
+                "inset": "Includi",
+                "override": "Sostituisci",
+                "shadow_id": "Ombra numero {value}",
+                "spread": "Spandi"
            },
            "switcher": {
                "clear_all": "Azzera tutto",
-                "clear_opacity": "Azzera opacità",
+                "clear_opacity": "Rimuovi opacità",
                "help": {
-                    "fe_downgraded": "La versione di PleromaFE è riportata ad una versione precedente.",
-                    "fe_upgraded": "Il motore dei temi di PleromaFE è stato aggiornato insieme all'interfaccia.",
-                    "future_version_imported": "Il tema importato è stato creato per una versione più nuova del frontend.",
-                    "migration_napshot_gone": "Per qualche motivo non è stata trovata l'anteprima del tema, non tutto potrebbe essere come ricordi.",
-                    "migration_snapshot_ok": "Per sicurezza, è stata caricata l'anteprima del tema. Puoi provare a caricarne i contenuti.",
-                    "older_version_imported": "Il file importato è stato creato per una versione precedente del frontend.",
-                    "snapshot_missing": "Il file non è provvisto di anteprima, quindi potrebbe essere diverso da come appare.",
+                    "fe_downgraded": "L'interfaccia è stata portata ad una versione precedente.",
+                    "fe_upgraded": "Lo schema dei temi è stato aggiornato insieme all'interfaccia.",
+                    "future_version_imported": "Il tema importato è stato creato per una versione più recente dell'interfaccia.",
+                    "migration_napshot_gone": "Anteprima del tema non trovata, non tutto potrebbe essere come ricordi.",
+                    "migration_snapshot_ok": "Ho caricato l'anteprima del tema. Puoi provare a caricarne i contenuti.",
+                    "older_version_imported": "Il tema importato è stato creato per una versione precedente dell'interfaccia.",
+                    "snapshot_missing": "Il tema non è provvisto di anteprima, quindi potrebbe essere diverso da come appare.",
                    "snapshot_present": "Tutti i valori sono sostituiti dall'anteprima del tema. Puoi invece caricare i suoi contenuti.",
-                    "snapshot_source_mismatch": "Conflitto di versione: probabilmente il frontend è stato deaggiornato e poi aggiornato di nuovo. Se hai modificato il tema con una vecchia versione usa il tema precedente, altrimenti usa quello nuovo.",
-                    "upgraded_from_v2": "PleromaFE è stato aggiornato, il tema potrebbe essere un pochino diverso da come lo ricordi.",
-                    "v2_imported": "Il file importato è stato creato per un vecchio frontend. Cerchiamo di massimizzare la compatibilità, ma potrebbero esserci inconsistenze."
+                    "snapshot_source_mismatch": "Conflitto di versione: probabilmente l'interfaccia è stata portata indietro e poi aggiornata di nuovo. Se hai modificato il tema con una vecchia versione usa il tema precedente, altrimenti puoi usare il nuovo.",
+                    "upgraded_from_v2": "L'interfaccia è stata aggiornata, il tema potrebbe essere diverso da come lo ricordi.",
+                    "v2_imported": "Il tema importato è stato creato per una vecchia interfaccia. Non tutto potrebbe essere come inteso."
                },
-                "keep_as_is": "Mantieni com'è",
+                "keep_as_is": "Mantieni tal quale",
                "keep_color": "Mantieni colori",
                "keep_fonts": "Mantieni font",
                "keep_opacity": "Mantieni opacità",
                "keep_roundness": "Mantieni vertici",
                "keep_shadows": "Mantieni ombre",
                "load_theme": "Carica tema",
-                "reset": "Azzera",
+                "reset": "Reimposta",
                "save_load_hint": "Le opzioni \"mantieni\" conservano le impostazioni correnti quando selezioni o carichi un tema, e le salvano quando ne esporti uno. Quando nessuna casella è selezionata, tutte le impostazioni correnti saranno salvate nel tema.",
                "use_snapshot": "Versione precedente",
                "use_source": "Nuova versione"
            }
        },
-        "subject_input_always_show": "Mostra sempre il campo avvertenza sul contenuto",
-        "subject_line_behavior": "Copia avvertenza sul contenuto quando rispondi",
-        "subject_line_email": "Come nelle email: \"re: avvertenza\"",
-        "subject_line_mastodon": "Come su Mastodon: copia com'è",
+        "subject_input_always_show": "Mostra sempre il campo Oggetto",
+        "subject_line_behavior": "Copia oggetto quando rispondi",
+        "subject_line_email": "Come nelle email: \"re: oggetto\"",
+        "subject_line_mastodon": "Come in Mastodon: copia tal quale",
        "subject_line_noop": "Non copiare",
        "text": "Testo",
        "theme": "Tema",
-        "theme_help": "Usa colori esadecimali (#rrvvbb) per personalizzare il tuo tema colori.",
-        "theme_help_v2_1": "Puoi anche sovrascrivere colore ed opacità di alcuni elementi spuntando la casella. Usa il pulsante \"Azzera\" per azzerare tutte le sovrascritture.",
-        "theme_help_v2_2": "Le icone vicino alcuni elementi sono indicatori del contrasto fra testo e sfondo, passaci sopra col puntatore per ulteriori informazioni. Se usano la trasparenza, questi indicatori mostrano come sarebbero nel peggior caso possibile.",
-        "third_column_mode": "Quando c'è abbastanza spazio, mostra una terza colonna contenente",
-        "third_column_mode_none": "Non mostrare proprio la terza colonna",
-        "third_column_mode_notifications": "Colonna notifiche",
-        "third_column_mode_postform": "Modulo post principale e navigazione",
+        "theme_help": "Usa colori esadecimali (#rrggbb) per personalizzare il tuo schema di colori.",
+        "theme_help_v2_1": "Puoi anche forzare colore ed opacità di alcuni elementi selezionando la casella. Usa il pulsante \"Azzera\" per azzerare tutte le forzature.",
+        "theme_help_v2_2": "Le icone vicino alcuni elementi sono indicatori del contrasto fra testo e sfondo, passaci sopra col puntatore per ulteriori informazioni. Se usani trasparenze, questi indicatori mostrano il peggior caso possibile.",
        "token": "Token",
-        "tooltipRadius": "Suggerimenti/allerte",
-        "translation_language": "Lingua finale di traduzione automatica",
-        "tree_advanced": "Mostra bottoni aggiuntivi per aprire e chiudere catene di risposte nelle conversazioni",
-        "tree_fade_ancestors": "Mostra antenati del post corrente in testo semitrasparente",
+        "tooltipRadius": "Suggerimenti/avvisi",
        "type_domains_to_mute": "Cerca domini da silenziare",
-        "upload_a_photo": "Carica una foto",
+        "upload_a_photo": "Carica un'immagine",
        "useStreamingApi": "Ricevi messaggi e notifiche in tempo reale",
-        "useStreamingApiWarning": "",
-        "use_blurhash": "Usa blurhash per anteprime NSFW",
+        "useStreamingApiWarning": "(Sconsigliato, sperimentale, può saltare messaggi)",
        "use_contain_fit": "Non ritagliare le anteprime degli allegati",
-        "use_one_click_nsfw": "Apri allegati NSFW con un solo click",
-        "user_accepts_direct_messages_from": "Accetta post «diretti» da",
-        "user_accepts_direct_messages_from_everybody": "Tutti",
-        "user_accepts_direct_messages_from_nobody": "Nessuno",
-        "user_accepts_direct_messages_from_people_i_follow": "Persone che seguo",
+        "use_one_click_nsfw": "Apri media offuscati con un solo click",
        "user_mutes": "Utenti",
-        "user_profile_default_tab": "Scheda predefinita sul profilo degli utenti",
-        "user_profiles": "Profili utente",
-        "user_settings": "Impostazioni utente",
+        "user_settings": "Impostazioni Utente",
        "valid_until": "Valido fino a",
        "values": {
            "false": "no",
@ -895,141 +847,86 @@
        },
        "version": {
            "backend_version": "Versione backend",
-            "frontend_version": "Versione frontend",
+            "frontend_version": "Versione interfaccia",
            "title": "Versione"
        },
-        "virtual_scrolling": "Velocizza rendering sequenze",
-        "word_filter": "Filtro per parola",
-        "wordfilter": "Filtro per parola"
-    },
-    "settings_profile": {
-        "creating": "Creazione del nuovo profilo di impostazioni \"{profile}\"…",
-        "synchronization_error": "Non è stato possibile sincronizzare le impostazioni: {err}",
-        "synchronized": "Impostazioni sincronizzate!",
-        "synchronizing": "Sincronizzazione del profilo di impostazioni \"{profile}\"…"
+        "virtual_scrolling": "Velocizza l'elaborazione delle sequenze",
+        "word_filter": "Parole filtrate"
    },
    "status": {
-        "ancestor_follow": "Vedi {numReplies} altra risposta sotto questo post | Vedi {numReplies} altre risposte sotto questo post",
-        "ancestor_follow_with_icon": "{icon} {text}",
-        "attachment_stop_flash": "Ferma Flash player",
        "bookmark": "Aggiungi segnalibro",
-        "collapse_attachments": "Riduci allegati",
-        "copy_link": "Copia collegamento al post",
-        "delete": "Elimina post",
-        "delete_confirm": "Vuoi davvero eliminare questo post?",
-        "delete_confirm_accept_button": "Sì, eliminalo",
-        "delete_confirm_cancel_button": "No, tienilo",
-        "delete_confirm_title": "Conferma eliminazione",
-        "edit": "Modifica",
-        "edit_history": "Cronologia modifiche",
-        "edit_history_modal_title": "Modificato {historyCount} volta | Modificato {historyCount} volte",
-        "edited_at": "Modificato {time}",
+        "copy_link": "Copia collegamento",
+        "delete": "Elimina messaggio",
+        "delete_confirm": "Vuoi veramente eliminare questo messaggio?",
        "expand": "Espandi",
-        "external_source": "Fonte originale",
+        "external_source": "Vai all'origine",
        "favorites": "Preferiti",
-        "hide_attachment": "Nascondi allegato",
-        "hide_content": "Nascondi contenuto",
-        "hide_full_subject": "Nascondi avvertenza sul contenuto intera",
-        "many_attachments": "Il post ha {number} allegato | Il post ha {number} allegati",
+        "hide_content": "Nascondi contenuti",
+        "hide_full_subject": "Nascondi oggetto intero",
        "mentions": "Menzioni",
-        "move_down": "Muovi allegato a destra",
-        "move_up": "Muovi allegato a sinistra",
        "mute_conversation": "Silenzia conversazione",
-        "nsfw": "NSFW",
-        "open_gallery": "Apri galleria",
-        "override_translation_source_language": "Sovrascrivi lingua di origine",
-        "pin": "Fissa in cima al profilo",
-        "pinned": "Fissato",
+        "nsfw": "DISDICEVOLE",
+        "pin": "Intesta al profilo",
+        "pinned": "Intestato",
        "plus_more": "+{number} altri",
-        "redraft": "Elimina e correggi",
-        "redraft_confirm": "Vuoi davvero eliminare e correggere questo post? Le interazioni al post originale non saranno mantenute.",
-        "redraft_confirm_accept_button": "Sì, elimina e correggi",
-        "redraft_confirm_cancel_button": "No, tieni l'originale",
-        "redraft_confirm_title": "Conferma elimina e correggi",
-        "remove_attachment": "Rimuovi allegato",
-        "repeat_confirm": "Vuoi davvero condividere questo post?",
-        "repeat_confirm_accept_button": "Sì, condividilo",
-        "repeat_confirm_cancel_button": "No, non condividere",
-        "repeat_confirm_title": "Conferma condivisione",
-        "repeats": "Condivisioni",
+        "repeats": "Condivisi",
        "replies_list": "Risposte:",
-        "replies_list_with_others": "Mostra {numReplies} altra risposta | Mostra {numReplies} altre risposte",
        "reply_to": "In risposta a",
-        "show_all_attachments": "Mostra tutti gli allegati",
-        "show_all_conversation": "Mostra conversazione intera ({numStatus} altro post) | Mostra conversazione intera ({numStatus} altri post)",
-        "show_all_conversation_with_icon": "{icon} {text}",
-        "show_attachment_description": "Anteprima descrizione (apri l'allegato per la descrizione intera)",
-        "show_attachment_in_modal": "Mostra allegato in una finestra",
-        "show_content": "Mostra contenuto",
-        "show_full_subject": "Mostra tutta l'avvertenza sul contenuto",
-        "show_only_conversation_under_this": "Mostra solo le risposte a questo post",
-        "status_deleted": "Questo post è stato eliminato",
-        "status_unavailable": "Post non disponibile",
-        "thread_follow": "Visualizza {numStatus} altra risposta | Visualizza {numStatus} altre risposte",
-        "thread_follow_with_icon": "{icon} {text}",
-        "thread_hide": "Nascondi questa conversazione",
-        "thread_muted": "Conversazione silenziata",
+        "show_content": "Mostra contenuti",
+        "show_full_subject": "Mostra oggetto intero",
+        "status_deleted": "Questo messagio è stato cancellato",
+        "status_unavailable": "Messaggio non disponibile",
+        "thread_muted": "Discussione silenziata",
        "thread_muted_and_words": ", contiene:",
-        "thread_show": "Mostra questa conversazione",
-        "thread_show_full": "Mostra {numStatus} risposta | Mostra tutte e {numStatus} le risposte",
-        "thread_show_full_with_icon": "{icon} {text}",
-        "translate": "Traduci",
-        "translated_from": "Tradotto da {language}",
        "unbookmark": "Rimuovi segnalibro",
-        "unmute_conversation": "Desilenzia conversazione",
-        "unpin": "Rimuovi dalla cima del profilo",
+        "unmute_conversation": "Riabilita conversazione",
+        "unpin": "De-intesta",
        "you": "(Tu)"
    },
    "time": {
        "in_future": "fra {0}",
        "in_past": "{0} fa",
-        "now": "proprio adesso",
-        "now_short": "ora",
+        "now": "adesso",
+        "now_short": "adesso",
        "unit": {
-            "days": "{0} giorno | {0} giorni",
+            "days": "{0} giorni",
            "days_short": "{0} g",
-            "hours": "{0} ora | {0} ore",
-            "hours_short": "{0} ora | {0} ore",
-            "minutes": "{0} minuto | {0} minuti",
+            "hours": "{0} ore",
+            "hours_short": "{0} h",
+            "minutes": "{0} minuti",
            "minutes_short": "{0} min",
-            "months": "{0} mese | {0} mesi",
-            "months_short": "{0} mese | {0} mesi",
-            "seconds": "{0} secondo | {0} secondi",
+            "months": "{0} mesi",
+            "months_short": "{0} mes",
+            "seconds": "{0} secondi",
            "seconds_short": "{0} sec",
-            "weeks": "{0} settimana | {0} settimane",
-            "weeks_short": "{0} sett",
-            "years": "{0} anno | {0} anni",
+            "weeks": "{0} settimane",
+            "weeks_short": "{0} stm",
+            "years": "{0} anni",
            "years_short": "{0} a"
        }
    },
    "timeline": {
-        "collapse": "Riduci",
+        "collapse": "Ripiega",
        "conversation": "Conversazione",
        "error": "Errore nel caricare la sequenza: {0}",
-        "follow_tag": "Segui hashtag",
-        "load_older": "Carica post precedenti",
-        "no_more_statuses": "Non ci sono altri post",
-        "no_retweet_hint": "Il messaggio è «solo per follower» o «diretto», quindi non può essere condiviso",
-        "no_statuses": "Nessun post",
+        "load_older": "Carica messaggi precedenti",
+        "no_more_statuses": "Fine dei messaggi",
+        "no_retweet_hint": "Il messaggio è diretto o solo per seguaci e non può essere condiviso",
+        "no_statuses": "Nessun messaggio",
        "reload": "Ricarica",
        "repeated": "ha condiviso",
        "show_new": "Mostra nuovi",
-        "socket_broke": "Connessione tempo reale interrotta: CloseEvent codice {0}",
+        "socket_broke": "Connessione tempo reale interrotta: codice {0}",
        "socket_reconnected": "Connesso in tempo reale",
-        "unfollow_tag": "Smetti di seguire hashtag",
        "up_to_date": "Aggiornato"
    },
-    "toast": {
-        "no_translation_target_set": "Nessuna lingua finale di traduzione impostata: la traduzione potrebbe fallire. Imposta una lingua finale di traduzione nelle tue impostazioni."
-    },
    "tool_tip": {
-        "accept_follow_request": "Accetta richiesta di follow",
-        "add_reaction": "Aggiungi reazione",
+        "accept_follow_request": "Accetta seguace",
+        "add_reaction": "Reagisci",
        "bookmark": "Aggiungi segnalibro",
-        "favorite": "Rendi preferito",
-        "media_upload": "Carica media",
-        "quote": "Cita",
-        "reject_follow_request": "Rifiuta richiesta di follow",
+        "favorite": "Gradisci",
+        "media_upload": "Carica allegati",
+        "reject_follow_request": "Rifiuta seguace",
        "repeat": "Condividi",
        "reply": "Rispondi",
        "user_settings": "Impostazioni utente"
@ -1037,7 +934,7 @@
    "upload": {
        "error": {
            "base": "Caricamento fallito.",
-            "default": "Riprova più tardi",
+            "default": "Riprova in seguito",
            "file_too_big": "File troppo pesante [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
            "message": "Caricamento fallito: {0}"
        },
@ -1051,115 +948,79 @@
    },
    "user_card": {
        "admin_menu": {
-            "activate_account": "Riattiva account",
-            "deactivate_account": "Disattiva account",
-            "delete_account": "Elimina account",
+            "activate_account": "Attiva profilo",
+            "deactivate_account": "Disattiva profilo",
+            "delete_account": "Elimina profilo",
            "delete_user": "Elimina utente",
-            "delete_user_data_and_deactivate_confirmation": "Questo eliminerà permanentemente i dati dall'account e lo disattiverà. Sei sicuro al 100%?",
-            "disable_any_subscription": "Proibisci a tutti di seguire l'utente",
-            "disable_remote_subscription": "Proibisci ad istanze remote di seguire l'utente",
-            "force_nsfw": "Marca tutti i post come NSFW",
-            "force_unlisted": "Rendi tutti i post «non in elenco»",
-            "grant_admin": "Rendi amministratore",
-            "grant_moderator": "Rendi moderatore",
+            "disable_any_subscription": "Rendi utente non seguibile",
+            "disable_remote_subscription": "Blocca i tentativi di seguirlo da altre stanze",
+            "force_nsfw": "Oscura tutti i messaggi",
+            "force_unlisted": "Nascondi tutti i messaggi",
+            "grant_admin": "Crea Amministratore",
+            "grant_moderator": "Crea Moderatore",
            "moderation": "Moderazione",
-            "quarantine": "Impedisci la federazione dei post degli utenti",
-            "revoke_admin": "Rimuovi da amministratore",
-            "revoke_moderator": "Rimuovi da moderatore",
-            "sandbox": "Rendi tutti i messaggi \"solo per follower\"",
-            "strip_media": "Rimuovi media dai messaggi"
+            "quarantine": "I messaggi non arriveranno alle altre stanze",
+            "revoke_admin": "Divesti Amministratore",
+            "revoke_moderator": "Divesti Moderatore",
+            "sandbox": "Rendi tutti i messaggi solo per seguaci",
+            "strip_media": "Rimuovi ogni allegato ai messaggi"
        },
-        "approve": "Accetta",
-        "approve_confirm": "Sei sicuro di voler permettere a questo utente di seguirti?",
-        "approve_confirm_accept_button": "Sì, accetta",
-        "approve_confirm_cancel_button": "No, annulla",
-        "approve_confirm_title": "Accetta richiesta di follow",
+        "approve": "Approva",
        "block": "Blocca",
-        "block_confirm": "Sei sicuro di voler bloccare {user}?",
-        "block_confirm_accept_button": "Sì, blocca",
-        "block_confirm_cancel_button": "No, non bloccare",
-        "block_confirm_title": "Blocca utente",
        "block_progress": "Blocco…",
        "blocked": "Bloccato!",
-        "blocks_you": "Ti blocca!",
        "bot": "Bot",
-        "deactivated": "Disattivato",
-        "deny": "Rifiuta",
-        "deny_confirm": "Sei sicuro di voler rifiutare la richiesta di follow di questo utente?",
-        "deny_confirm_accept_button": "Sì, rifiuta",
-        "deny_confirm_cancel_button": "No, annulla",
-        "deny_confirm_title": "Rifiuta richiesta di follow",
-        "domain_muted": "Sblocca dominio",
+        "deny": "Nega",
        "edit_profile": "Modifica profilo",
        "favorites": "Preferiti",
        "follow": "Segui",
-        "follow_cancel": "Annulla richiesta",
        "follow_progress": "Richiedo…",
        "follow_sent": "Richiesta inviata!",
-        "follow_tag": "Segui l'hashtag",
-        "follow_unfollow": "Smetti di seguire",
-        "followed_tags": "Hashtag seguiti",
-        "followed_users": "Utenti seguiti",
-        "followees": "Seguiti",
-        "followers": "Follower",
-        "following": "Seguito!",
+        "follow_unfollow": "Disconosci",
+        "followees": "Segue",
+        "followers": "Seguaci",
+        "following": "Seguìto!",
        "follows_you": "Ti segue!",
        "hidden": "Nascosto",
        "hide_repeats": "Nascondi condivisioni",
        "highlight": {
-            "disabled": "Nessuno sfondo",
-            "side": "Striscia laterale",
-            "solid": "Sfondo monocolore",
-            "striped": "Sfondo a righe"
+            "disabled": "Nessun risalto",
+            "side": "Nastro a lato",
+            "solid": "Un colore",
+            "striped": "A righe"
        },
        "its_you": "Sei tu!",
        "media": "Media",
        "mention": "Menziona",
        "message": "Contatta",
        "mute": "Silenzia",
-        "mute_confirm": "Sei sicuro di voler silenziare {user}?",
-        "mute_confirm_accept_button": "Sì, silenzia",
-        "mute_confirm_cancel_button": "No, non silenziare",
-        "mute_confirm_title": "Silenzia utente",
-        "mute_domain": "Blocca dominio",
-        "mute_progress": "Silenziando…",
+        "mute_progress": "Silenzio…",
        "muted": "Silenziato",
-        "not_following_any_hashtags": "Non stai seguendo nessun hashtag",
-        "note": "Nota privata",
        "per_day": "al giorno",
        "remote_follow": "Segui da remoto",
-        "remove_follower": "Rimuovi follower",
-        "replies": "Con risposte",
        "report": "Segnala",
-        "requested_by": "Ha chiesto di seguirti",
        "show_repeats": "Mostra condivisioni",
-        "statuses": "Post",
-        "subscribe": "Iscriviti",
+        "statuses": "Messaggi",
+        "subscribe": "Abbònati",
        "unblock": "Sblocca",
        "unblock_progress": "Sblocco…",
-        "unfollow_confirm": "Sei sicuro di voler smettere di seguire {user}?",
-        "unfollow_confirm_accept_button": "Sì, smetti di seguire",
-        "unfollow_confirm_cancel_button": "No, non smettere di seguire",
-        "unfollow_confirm_title": "Smetti di seguire l'utente",
-        "unfollow_tag": "Smetti di seguire l'hashtag",
-        "unmute": "Desilenzia",
-        "unmute_progress": "Desilenziamento…",
-        "unsubscribe": "Disiscriviti"
+        "unmute": "Riabilita",
+        "unmute_progress": "Riabilito…",
+        "unsubscribe": "Disdici"
    },
    "user_profile": {
-        "field_validated": "Collegamento verificato",
        "profile_does_not_exist": "Spiacente, questo profilo non esiste.",
        "profile_loading_error": "Spiacente, c'è stato un errore nel caricamento del profilo.",
        "timeline_title": "Sequenza dell'utente"
    },
    "user_reporting": {
-        "add_comment_description": "La segnalazione sarà inviata ai moderatori della tua istanza. Puoi fornire una motivazione per cui stai segnalando questo account qui sotto:",
-        "additional_comments": "Commenti aggiuntivi",
-        "forward_description": "Il profilo appartiene ad un altro server. Inviare la segnalazione anche a quello?",
+        "add_comment_description": "La segnalazione sarà inviata ai moderatori della tua stanza. Puoi motivarla qui sotto:",
+        "additional_comments": "Osservazioni accessorie",
+        "forward_description": "Il profilo appartiene ad un'altra stanza. Inviare la segnalazione anche a quella?",
        "forward_to": "Inoltra a {0}",
        "generic_error": "C'è stato un errore nell'elaborazione della tua richiesta.",
        "submit": "Invia",
-        "title": "Segnala {0}"
+        "title": "Segnalo {0}"
    },
    "who_to_follow": {
        "more": "Altro",
--- a/src/i18n/lt.json
+++ b/src/i18n/lt.json
@ -1,124 +0,0 @@
-{
-    "about": {
-        "bubble_instances": "Vietiniai burbulo serveriai",
-        "bubble_instances_description": "Administratorių parinkti serveriai, kurie atstovauja šios serverio vietinę teritoriją",
-        "mrf": {
-            "federation": "Federacija",
-            "keyword": {
-                "ftl_removal": "Pašalinimas iš „Viso žinomo tinklo“ laiko skalės",
-                "is_replaced_by": "→",
-                "keyword_policies": "Raktažodžių politika",
-                "reject": "Atmesti",
-                "replace": "Pakeisti"
-            },
-            "mrf_policies": "Įjungta MRF politika",
-            "mrf_policies_desc": "MRF politika valdo serverio federacijos elgseną.  Įjungtos toliau nurodytos politikos:",
-            "simple": {
-                "accept": "Priimti",
-                "accept_desc": "Šis serveris priima žinutes tik iš toliau nurodytų serverių:",
-                "ftl_removal": "Pašalinimas iš „Žinomo tinklo“ laiko skalės",
-                "ftl_removal_desc": "Šis serveris pašalina šiuos serverius iš „Žinomo tinklo“ laiko skalės:",
-                "instance": "Serveris",
-                "media_nsfw": "Medija priverstinai nustatyta kaip jautri",
-                "media_nsfw_desc": "Šis serveris priverčia nustatyti mediją kaip jautrią toliau nurodytų serverių įrašuose:",
-                "media_removal": "Medijos pašalinimas",
-                "media_removal_desc": "Šis serveris pašalina mediją iš toliau nurodytų serverių įrašų:",
-                "not_applicable": "Nėra",
-                "quarantine": "Karantinas",
-                "quarantine_desc": "Šis serveris nesiųs įrašų į toliau nurodytus serverius:",
-                "reason": "Priežastis",
-                "reject": "Atmesti",
-                "reject_desc": "Šis serveris nepriims žinučių iš toliau nurodytų serverių:",
-                "simple_policies": "Konkretaus serverio politika"
-            }
-        },
-        "staff": "Personalas"
-    },
-    "announcements": {
-        "all_day_prompt": "Tai – visos dienos renginys",
-        "cancel_edit_action": "Atsisakyti",
-        "close_error": "Užverti",
-        "delete_action": "Ištrinti",
-        "edit_action": "Redaguoti",
-        "end_time_display": "Pasibaigia {time}",
-        "end_time_prompt": "Pabaigos laikas: ",
-        "inactive_message": "Šis skelbimas neaktyvus",
-        "mark_as_read_action": "Žymėti kaip skaitytą",
-        "page_header": "Skelbimai",
-        "post_action": "Siųsti",
-        "post_error": "Klaida: {error}",
-        "post_form_header": "Skelbti skelbimą"
-    },
-    "chats": {
-        "chats": "Pokalbiai",
-        "delete": "Ištrinti",
-        "more": "Daugiau",
-        "new": "Naujas pokalbis",
-        "you": "Jūs:"
-    },
-    "display_date": {
-        "today": "Šiandien"
-    },
-    "domain_mute_card": {
-        "mute": "Nutildyti",
-        "mute_progress": "Nutildoma…",
-        "unmute": "Atšaukti nutildymą",
-        "unmute_progress": "Atšaukiamas nutildymas…"
-    },
-    "emoji": {
-        "add_emoji": "Įterpti jaustuką",
-        "custom": "Pasirinktinis jaustukas",
-        "emoji": "Jaustukas",
-        "stickers": "Lipdukai",
-        "unicode": "Unikodo jaustukas"
-    },
-    "exporter": {
-        "export": "Eksportuoti"
-    },
-    "file_type": {
-        "audio": "Garso įrašas",
-        "file": "Failas",
-        "image": "Vaizdas",
-        "video": "Vaizdo įrašas"
-    },
-    "general": {
-        "more": "Daugiau",
-        "scope_in_timeline": {
-            "direct": "Tiesioginis",
-            "local": "Vietinis – šį įrašą gali matyti tik jūsų serveris",
-            "private": "Tik sekėjams",
-            "public": "Vieša",
-            "unlisted": "Neįtrauktas į sąrašą"
-        },
-        "show_less": "Rodyti mažiau",
-        "show_more": "Rodyti daugiau",
-        "submit": "Pateikti",
-        "verify": "Patvirtinti"
-    },
-    "image_cropper": {
-        "cancel": "Atšaukti"
-    },
-    "importer": {
-        "submit": "Pateikti"
-    },
-    "user_card": {
-        "follow_tag": "Sekti saitažodį",
-        "not_following_any_hashtags": "Nesekate jokių saitažodžių.",
-        "unfollow_confirm_accept_button": "Taip, nebesekti",
-        "unfollow_confirm_cancel_button": "Ne, nenaikinti sekimą",
-        "unfollow_confirm_title": "Nebesekti naudotoją",
-        "unfollow_tag": "Nebesekti saitažodį"
-    },
-    "user_reporting": {
-        "additional_comments": "Papildomi komentarai",
-        "forward_description": "Paskyra yra iš kito serverio. Siųsti ataskaitos kopiją ir ten?",
-        "forward_to": "Persiųsti į {0}",
-        "generic_error": "Įvyko klaida apdorojant jūsų užklausą.",
-        "submit": "Pateikti",
-        "title": "Pranešama apie {0}"
-    },
-    "who_to_follow": {
-        "more": "Daugiau",
-        "who_to_follow": "Ką sekti"
-    }
-}
--- a/src/i18n/pl.json
+++ b/src/i18n/pl.json
@ -599,7 +599,7 @@
        "links": "Łącza",
        "list_aliases_error": "Błąd pobierania aliasów: {error}",
        "list_backups_error": "Błąd pobierania listy kopii zapasowych: {error}",
-        "lock_account_description": "Wymagaj potwierdzenia nowych śledzących",
+        "lock_account_description": "Spraw, by konto mogli wyświetlać tylko zatwierdzeni obserwujący",
        "loop_video": "Zapętlaj filmy",
        "loop_video_silent_only": "Zapętlaj tylko filmy bez dźwięku (np. mastodonowe „gify”)",
        "mascot": "Maskotka Mastodon FE",
@ -679,7 +679,6 @@
        "pad_emoji": "Dodaj odstęp z obu stron emoji podczas dodawania selektorem",
        "panelRadius": "Panele",
        "pause_on_unfocused": "Wstrzymuj strumieniowanie kiedy karta nie jest aktywna",
-        "permit_followback_description": "Automatycznie potwierdź śledzenie przez użytkowników którch już śledzisz",
        "play_videos_in_modal": "Odtwarzaj filmy bezpośrednio w przeglądarce mediów",
        "post_look_feel": "Wygląd wpisów",
        "post_status_content_type": "Domyślny typ zawartości wpisów",
@ -1149,7 +1148,7 @@
        "followed_users": "Śledzeni użytkownicy",
        "followees": "Obserwowani",
        "followers": "Obserwujący",
-        "following": "Obserwujesz!",
+        "following": "Obserwowany!",
        "follows_you": "Obserwuje cię!",
        "hidden": "Ukryte",
        "hide_repeats": "Ukryj powtórzenia",
--- a/src/modules/announcements.js
+++ b/src/modules/announcements.js
@ -48,7 +48,6 @@ const announcements = {
          return store.rootState.api.backendInteractor.fetchAnnouncements()
        }

-        const all = await store.rootState.api.backendInteractor.adminFetchAnnouncements()
        const visible = await store.rootState.api.backendInteractor.fetchAnnouncements()
        const visibleObject = visible.reduce((a, c) => {
          a[c.id] = c
@ -56,7 +55,7 @@ const announcements = {
        }, {})
        const getWithinVisible = announcement => visibleObject[announcement.id]

-        all.forEach(announcement => {
+        visible.forEach(announcement => {
          const visibleAnnouncement = getWithinVisible(announcement)
          if (!visibleAnnouncement) {
            announcement.inactive = true
@ -65,7 +64,7 @@ const announcements = {
          }
        })

-        return all
+        return visible
      }

      return getAnnouncements()
--- a/src/modules/config.js
+++ b/src/modules/config.js
@ -22,7 +22,7 @@ export const multiChoiceProperties = [

 export const defaultState = {
  profile: 'default',
-  profileVersion: 0, // internal fe copy of server-side version
+  profileVersion: 0,
  expertLevel: 0, // used to track which settings to show and hide
  colors: {},
  theme: undefined,
@ -56,8 +56,6 @@ export const defaultState = {
  autohideFloatingPostButton: false,
  pauseOnUnfocused: true,
  displayPageBackgrounds: true,
-  centerAlignBio: false,
-  compactUserInfo: true,
  stopGifs: undefined,
  replyVisibility: 'all',
  thirdColumnMode: 'notifications',
@ -77,7 +75,7 @@ export const defaultState = {
  highlight: {},
  interfaceLanguage: browserLocale,
  hideScopeNotice: false,
-  useStreamingApi: false,
+  useStreamingApi: true,
  sidebarRight: undefined, // instance default
  subjectLineBehavior: undefined, // instance default
  alwaysShowSubjectInput: undefined, // instance default
@ -129,21 +127,6 @@ export const instanceDefaultProperties = Object.entries(defaultState)
  .filter(([key, value]) => value === undefined)
  .map(([key, value]) => key)

-function updateLocalSettings(store, settingEntries, version = null) {
-  if (version == null)
-    version = store.state.profileVersion
-
-  settingEntries.forEach(([name, value]) => {
-    if (store.state[name] !== value) {
-      store.dispatch('setOption', { name, value })
-    }
-  })
-
-  // Set this at the end to override any potentially stored profileVersion
-  store.commit('setOption', { name: 'profileVersion', value: version })
-}
-
-
 const config = {
  state: { ...defaultState },
  getters: {
@ -215,26 +198,25 @@ const config = {
        store.dispatch('listSettingsProfiles')
      })
    },
-    loadSettings (store, data) {
+    loadSettings ({ dispatch }, data) {
      const knownKeys = new Set(Object.keys(defaultState))
+      const presentKeys = new Set(Object.keys(data))
+      const intersection = new Set()
+      for (let elem of presentKeys) {
+        if (knownKeys.has(elem)) {
+          intersection.add(elem)
+        }
+      }

-      // Limit to supported properties
-      const newSettingEntries =
-         Object.entries(data)
-        .filter(([key, value]) => knownKeys.has(key))
-
-      // disregard stored profileVersion; sync afterwards increases previous version
-      updateLocalSettings(store, newSettingEntries, null)
-      store.dispatch('syncSettings')
+      intersection.forEach(
+        name => dispatch('setOption', { name, value: data[name] })
+      )
    },
    setHighlight ({ commit, dispatch }, { user, color, type }) {
      commit('setHighlight', { user, color, type })
    },
    setOption ({ commit, dispatch }, { name, value, manual }) {
      commit('setOption', { name, value })
-      if (manual === true) {
-        dispatch('syncSettings')
-      }
      switch (name) {
        case 'theme':
          setPreset(value)
@ -259,7 +241,12 @@ const config = {
        .then(({ settings, version }) => {
          console.log('found settings version', version)
          if (forceUpdate || (version > store.state.profileVersion)) {
-            updateLocalSettings(store, Object.entries(settings), version)
+            store.commit('setOption', { name: 'profileVersion', value: version })
+            Object.entries(settings).forEach(([name, value]) => {
+              if (store.state[name] !== value) {
+                store.dispatch('setOption', { name, value })
+              }
+            })
          } else {
            console.log('settings are up to date')
          }
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@ -35,7 +35,7 @@ const defaultState = {
  hideWordFilteredPosts: false,
  hidePostStats: false,
  hideBotIndication: false,
-  hideSiteFavicon: false,
+  hideSiteFavicon: true,
  hideSiteName: false,
  hideUserStats: false,
  muteBotStatuses: false,
@ -73,8 +73,6 @@ const defaultState = {
  conversationOtherRepliesButton: 'below',
  conversationTreeFadeAncestors: false,
  maxDepthInThread: 6,
-  backendCommitUrl: 'https://akkoma.dev/AkkomaGang/akkoma/commit/',
-  frontendCommitUrl: 'https://akkoma.dev/AkkomaGang/pleroma-fe/commit/',

  // Nasty stuff
  customEmoji: [],
@ -179,22 +177,19 @@ const instance = {

    async getCustomEmoji ({ commit, state }) {
      try {
-        const res = await window.fetch('/api/v1/pleroma/emoji')
+        const res = await window.fetch('/api/v1/custom_emojis')
        if (res.ok) {
          const result = await res.json()
-          const values = Array.isArray(result) ? Object.assign({}, ...result) : result
-          const emoji = Object.entries(values).map(([key, value]) => {
-            const imageUrl = value.image_url
-            return {
-              displayText: key,
-              imageUrl: imageUrl ? state.server + imageUrl : value,
-              tags: imageUrl ? value.tags.sort((a, b) => a > b ? 1 : 0) : ['utf'],
-              replacement: `:${key}: `
-            }
-            // Technically could use tags but those are kinda useless right now,
-            // should have been "pack" field, that would be more useful
-          }).sort((a, b) => a.displayText.toLowerCase() > b.displayText.toLowerCase() ? 1 : -1)
-          commit('setInstanceOption', { name: 'customEmoji', value: emoji })
+          const emoji = []
+          for (const emojiobj of result) {
+            emoji.push({
+              displayText: emojiobj.shortcode,
+              imageUrl: emojiobj.url,
+              tags: emojiobj.category ? [`pack:${emojiobj.category.toLowerCase()}`] : ['pack:custom'],
+              replacement: `:${emojiobj.shortcode}: `
+            })
+          }
+          commit('setInstanceOption', { name: 'customEmoji', value: emoji.sort((a, b) => a.displayText.toLowerCase() > b.displayText.toLowerCase() ? 1 : -1) })
        } else {
          throw (res)
        }
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@ -349,6 +349,7 @@ const addNewNotifications = (state, { dispatch, notifications, older, visibleNot
    // Only add a new notification if we don't have one for the same action
    if (!state.notifications.idStore.hasOwnProperty(notification.id)) {
      updateNotificationsMinMaxId(state, notification)
+      notification.seen = false

      state.notifications.data.push(notification)
      state.notifications.idStore[notification.id] = notification
@ -544,7 +545,7 @@ export const mutations = {
      count: reaction.count + 1,
      me: true,
      accounts: [
-        ...reaction.accounts,
+        //...reaction.accounts,
        currentUser
      ]
    }
@ -704,11 +705,11 @@ const statuses = {
    },
    markSingleNotificationAsSeen ({ rootState, commit }, { id }) {
      commit('markSingleNotificationAsSeen', { id })
-      apiService.markNotificationsAsSeen({
+      /*apiService.markNotificationsAsSeen({
        single: true,
        id,
        credentials: rootState.users.currentUser.credentials
-      })
+      })*/
    },
    dismissNotificationLocal ({ rootState, commit }, { id }) {
      commit('dismissNotification', { id })
@ -734,7 +735,7 @@ const statuses = {
      if (!currentUser) return

      commit('addOwnReaction', { id, emoji, currentUser })
-      rootState.api.backendInteractor.reactWithEmoji({ id, emoji }).then(
+      rootState.api.backendInteractor.reactWithEmoji({ id, emoji: emoji.replaceAll(':', '') }).then(
        ok => {
          dispatch('fetchEmojiReactionsBy', id)
        }
@ -745,16 +746,16 @@ const statuses = {
      if (!currentUser) return

      commit('removeOwnReaction', { id, emoji, currentUser })
-      rootState.api.backendInteractor.unreactWithEmoji({ id, emoji }).then(
+      rootState.api.backendInteractor.unreactWithEmoji({ id, emoji: emoji.replaceAll(':', '') }).then(
        ok => {
          dispatch('fetchEmojiReactionsBy', id)
        }
      )
    },
    fetchEmojiReactionsBy ({ rootState, commit }, id) {
-      rootState.api.backendInteractor.fetchEmojiReactions({ id }).then(
-        emojiReactions => {
-          commit('addEmojiReactionsBy', { id, emojiReactions, currentUser: rootState.users.currentUser })
+      rootState.api.backendInteractor.fetchStatus({ id }).then(
+        status => {
+          commit('addEmojiReactionsBy', { id, emojiReactions: status.emoji_reactions, currentUser: rootState.users.currentUser })
        }
      )
    },
--- a/src/modules/users.js
+++ b/src/modules/users.js
@ -679,9 +679,6 @@ const users = {
              store.dispatch('setLayoutWidth', windowWidth())
              store.dispatch('setLayoutHeight', windowHeight())
              store.dispatch('getSupportedTranslationlanguages')
-              store.dispatch('getSettingsProfile')
-              store.dispatch('listSettingsProfiles')
-              store.dispatch('startFetchingConfig')
              store.dispatch('startFetchingAnnouncements')
              if (user.role === 'admin' || user.role === 'moderator') {
                store.dispatch('startFetchingReports')
--- a/src/panel.scss
+++ b/src/panel.scss
@ -18,6 +18,7 @@
    bottom: 0;
    left: 0;
    right: 0;
+    z-index: 5;
    box-shadow: 1px 1px 4px rgba(0, 0, 0, 0.6);
    box-shadow: var(--panelShadow);
    pointer-events: none;
@ -59,6 +60,7 @@
  padding: 0.6em;
  height: var(--__panel-heading-height);
  line-height: var(--__panel-heading-height-inner);
+  z-index: 4;

  &.-flexible-height {
    --__panel-heading-height: auto;
@ -129,7 +131,6 @@
  color: var(--panelText);
  background-color: $fallback--bg;
  background-color: var(--bg, $fallback--bg);
-  z-index: 4;

  &::after {
    background-color: $fallback--fg;
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@ -20,7 +20,7 @@ const ADMIN_USERS_URL = '/api/v1/pleroma/admin/users'
 const SUGGESTIONS_URL = '/api/v1/suggestions'
 const NOTIFICATION_SETTINGS_URL = '/api/pleroma/notification_settings'
 const NOTIFICATION_READ_URL = '/api/v1/pleroma/notifications/read'
-const ADMIN_REPORTS_URL = '/api/v1/pleroma/admin/reports'
+const ADMIN_REPORTS_URL = '/api/v1/admin/reports'
 const ADMIN_REPORT_NOTES_URL = id => `/api/v1/pleroma/admin/reports/${id}/notes`
 const ADMIN_REPORT_NOTE_URL = (report, note) => `/api/v1/pleroma/admin/reports/${report}/notes/${note}`

@ -99,9 +99,9 @@ const MASTODON_STREAMING = '/api/v1/streaming'
 const MASTODON_KNOWN_DOMAIN_LIST_URL = '/api/v1/instance/peers'
 const MASTODON_ANNOUNCEMENTS_URL = '/api/v1/announcements'
 const MASTODON_ANNOUNCEMENTS_DISMISS_URL = id => `/api/v1/announcements/${id}/dismiss`
-const PLEROMA_EMOJI_REACTIONS_URL = id => `/api/v1/pleroma/statuses/${id}/reactions`
-const PLEROMA_EMOJI_REACT_URL = (id, emoji) => `/api/v1/pleroma/statuses/${id}/reactions/${emoji}`
-const PLEROMA_EMOJI_UNREACT_URL = (id, emoji) => `/api/v1/pleroma/statuses/${id}/reactions/${emoji}`
+const PLEROMA_EMOJI_REACTIONS_URL = id => `/api/v1/statuses/${id}/reactions`
+const PLEROMA_EMOJI_REACT_URL = (id, emoji) => `/api/v1/statuses/${id}/react/${emoji}`
+const PLEROMA_EMOJI_UNREACT_URL = (id, emoji) => `/api/v1/statuses/${id}/unreact/${emoji}`
 const PLEROMA_BACKUP_URL = '/api/v1/pleroma/backups'
 const PLEROMA_ANNOUNCEMENTS_URL = '/api/v1/pleroma/admin/announcements'
 const PLEROMA_POST_ANNOUNCEMENT_URL = '/api/v1/pleroma/admin/announcements'
@ -113,6 +113,7 @@ const MASTODON_TAG_URL = (name) => `/api/v1/tags/${name}`
 const MASTODON_FOLLOW_TAG_URL = (name) => `/api/v1/tags/${name}/follow`
 const MASTODON_UNFOLLOW_TAG_URL = (name) => `/api/v1/tags/${name}/unfollow`
 const MASTODON_FOLLOWED_TAGS_URL = '/api/v1/followed_tags'
+const MASTODON_MARKERS_URL = '/api/v1/markers'

 const oldfetch = window.fetch

@ -647,7 +648,7 @@ const getReports = ({ state, limit, page, pageSize, credentials }) => {
  url = url + (args ? '?' + args : '')
  return fetch(url, { headers: authHeaders(credentials) })
    .then((data) => data.json())
-    .then((data) => data?.reports?.map(parseReport) ?? [])
+    .then((data) => data?.map(parseReport) ?? [])
 }

 const updateReportStates = ({ credentials, reports }) => {
@ -715,6 +716,16 @@ const fetchTimeline = ({
  const isNotifications = timeline === 'notifications'
  const params = []

+  let markers = {}
+  let markerPromise = Promise.resolve()
+  if (isNotifications) {
+    markerPromise = fetch(`${MASTODON_MARKERS_URL}?timeline=notifications`, { headers: authHeaders(credentials) })
+      .then((data) => data.json())
+      .then((data) => {
+        markers = data.notifications
+      })
+  }
+
  let url = timelineUrls[timeline]

  if (timeline === 'user' || timeline === 'media' || timeline === 'replies') {
@ -781,6 +792,7 @@ const fetchTimeline = ({
        throw new Error(data.error)
      }
      if (!data.errors) {
+        if (isNotifications) data.map((val) => val.last_read = markers.last_read_id)
        return { data: data.map(isNotifications ? parseNotification : parseStatus), pagination }
      } else {
        data.status = status
@ -1277,13 +1289,15 @@ const suggestions = ({ credentials }) => {
 const markNotificationsAsSeen = ({ id, credentials, single = false }) => {
  const body = new FormData()

-  if (single) {
+  /*if (single) {
    body.append('id', id)
  } else {
    body.append('max_id', id)
-  }
+  }*/

-  return fetch(NOTIFICATION_READ_URL, {
+  body.append('notifications[last_read_id]', id)
+
+  return fetch(MASTODON_MARKERS_URL, {
    body,
    headers: authHeaders(credentials),
    method: 'POST'
@ -1341,7 +1355,7 @@ const fetchEmojiReactions = ({ id, credentials }) => {
 const reactWithEmoji = ({ id, emoji, credentials }) => {
  return promisedRequest({
    url: PLEROMA_EMOJI_REACT_URL(id, encodeURIComponent(emoji)),
-    method: 'PUT',
+    method: 'POST',
    credentials
  }).then(parseStatus)
 }
@ -1349,7 +1363,7 @@ const reactWithEmoji = ({ id, emoji, credentials }) => {
 const unreactWithEmoji = ({ id, emoji, credentials }) => {
  return promisedRequest({
    url: PLEROMA_EMOJI_UNREACT_URL(id, encodeURIComponent(emoji)),
-    method: 'DELETE',
+    method: 'POST',
    credentials
  }).then(parseStatus)
 }
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@ -127,6 +127,34 @@ export const parseUser = (data) => {
      } else {
        output.role = 'member'
      }
+    } else {
+      output.relationship = {
+        muting: [],
+        blocking: [],
+        followed_by: [],
+        following: []
+      }
+
+      output.rights = {
+        moderator: false,
+        admin: false
+      }
+
+      // todo: find a better way to map masto roles to akkoma roles
+      const roles = data.roles
+      if (roles) {
+        if (!roles[0]) {
+          output.role = 'member'
+        } else if (roles[0].id === "1") {
+          output.role = 'moderator'
+          output.rights.moderator = true
+        } else if (roles[0].id === "2" || roles[0].id === "3") {
+          output.role = 'admin'
+          output.rights.admin = true
+        } else {
+          output.role = 'member'
+        }
+      }
    }

    if (data.source) {
@ -298,6 +326,10 @@ export const parseStatus = (data) => {
    } else {
      output.text = data.content
      output.summary = data.spoiler_text
+      output.emoji_reactions = data.reactions
+      output.statusnet_conversation_id = data.conversation_id
+      // todo: properly check if post is visible
+      output.parent_visible = true
    }

    if (data.akkoma) {
@ -406,14 +438,16 @@ export const parseStatus = (data) => {
 export const parseNotification = (data) => {
  const mastoDict = {
    'favourite': 'like',
-    'reblog': 'repeat'
+    'reblog': 'repeat',
+    'reaction': 'pleroma:emoji_reaction'
  }
  const masto = !data.hasOwnProperty('ntype')
  const output = {}

  if (masto) {
    output.type = mastoDict[data.type] || data.type
-    output.seen = data.pleroma.is_seen
+    // todo: figure out how to tell if a notification has been seen or not
+    output.seen = data.last_read && data.id <= data.last_read
    if (data.status) {
      output.status = isStatusNotification(output.type) ? parseStatus(data.status) : null
      output.action = output.status // TODO: Refactor, this is unneeded
@ -444,15 +478,12 @@ export const parseNotification = (data) => {
 export const parseReport = (data) => {
  const report = {}

-  report.account = parseUser(data.account)
-  report.actor = parseUser(data.actor)
+  report.account = parseUser(data.target_account.account)
+  report.actor = parseUser(data.account.account)
  report.statuses = data.statuses.map(parseStatus)
-  report.notes = data.notes.map(note => {
-    note.user = parseUser(note.user)
-    return note
-  })
-  report.state = data.state
-  report.content = data.content
+  report.notes = []
+  report.state = data.action_taken ? "closed" : "open"
+  report.content = data.comment
  report.created_at = data.created_at
  report.id = data.id

--- a/src/services/new_api/oauth.js
+++ b/src/services/new_api/oauth.js
@ -10,9 +10,9 @@ export const getOrCreateApp = ({ clientId, clientSecret, instance, commit }) =>
  const url = `${instance}/api/v1/apps`
  const form = new window.FormData()

-  form.append('client_name', `PleromaFE_${window.___pleromafe_commit_hash}_${(new Date()).toISOString()}`)
+  form.append('client_name', "AkkomaFE")
  form.append('redirect_uris', REDIRECT_URI)
-  form.append('scopes', 'read write follow push admin')
+  form.append('scopes', 'read write follow push admin:read admin:write')

  return window.fetch(url, {
    method: 'POST',
@ -28,7 +28,7 @@ const login = ({ instance, clientId }) => {
    response_type: 'code',
    client_id: clientId,
    redirect_uri: REDIRECT_URI,
-    scope: 'read write follow push admin'
+    scope: 'read write follow push admin:read admin:write'
  }

  const dataString = reduce(data, (acc, v, k) => {
--- a/static/config.json
+++ b/static/config.json
@ -1,6 +1,6 @@
 {
  "alwaysShowSubjectInput": true,
-  "background": "/static/aurora_borealis.jpg",
+  "background": "/static/wdwskyboxbanner.png",
  "collapseMessageWithSubject": false,
  "greentext": false,
  "hideFilteredStatuses": false,
@ -8,15 +8,15 @@
  "hidePostStats": false,
  "hideSitename": false,
  "hideUserStats": false,
-  "loginMethod": "password",
-  "logo": "/static/logo.svg",
+  "loginMethod": "token",
+  "logo": "/static/logo.png",
  "logoMargin": ".1em",
-  "logoMask": true,
+  "logoMask": false,
  "logoLeft": false,
  "nsfwCensorImage": "",
  "postContentType": "text/plain",
  "redirectRootLogin": "/main/friends",
-  "redirectRootNoLogin": "/main/all",
+  "redirectRootNoLogin": "/main/public",
  "showFeaturesPanel": true,
  "showInstanceSpecificPanel": false,
  "sidebarRight": false,
--- a/static/logo.png
+++ b/static/logo.png
--- a/static/terms-of-service.html
+++ b/static/terms-of-service.html
@ -1,5 +1,3 @@
-<h4>Terms of Service</h4>
+<p>This is Akkoma-FE modified to work on top of Mastodon/Chuckya. Note that while most of it should work fine, there are still a few differences between Akkoma and Mastodon that may cause things to break.<p>

-<p>This is a placeholder, overwrite this by putting a file at <pre>$STATIC_DIR/static/terms-of-service.html</pre><p>
-
-<p>See the <a href="https://docs.akkoma.dev/main/backend/configuration/static_dir/">Static Directory</a> docs for more info.</p>
+<p>Source code: <a href="https://akkoma.dev/esm/akkoma-fe">https://akkoma.dev/esm/akkoma-fe</a></p>
--- a/static/wdwskyboxbanner.png
+++ b/static/wdwskyboxbanner.png
--- a/yarn.lock
+++ b/yarn.lock
@ -249,21 +249,11 @@
  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.6.tgz#28583c28b15f2a3339cfafafeaad42f9a0e828df"
  integrity sha512-WdJjwMEkmBicq5T9fm/cHND3+UlFa2Yj8ALLgmoSQAJZysYbBjw+azChSGPN4DSPLXOcooGRvDwZWMcF/mLO2Q==

-"@babel/helper-string-parser@^7.24.8":
-  version "7.24.8"
-  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz#5b3329c9a58803d5df425e5785865881a81ca48d"
-  integrity sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==
-
 "@babel/helper-validator-identifier@^7.24.6":
  version "7.24.6"
  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.6.tgz#08bb6612b11bdec78f3feed3db196da682454a5e"
  integrity sha512-4yA7s865JHaqUdRbnaxarZREuPTHrjpDT+pXoAZ1yhyo6uFnIEpS8VMu16siFOHDpZNKYv5BObhsB//ycbICyw==

-"@babel/helper-validator-identifier@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz#75b889cfaf9e35c2aaf42cf0d72c8e91719251db"
-  integrity sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==
-
 "@babel/helper-validator-option@^7.24.6":
  version "7.24.6"
  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.24.6.tgz#59d8e81c40b7d9109ab7e74457393442177f460a"
@ -301,13 +291,6 @@
  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.24.6.tgz#5e030f440c3c6c78d195528c3b688b101a365328"
  integrity sha512-eNZXdfU35nJC2h24RznROuOpO94h6x8sg9ju0tT9biNtLZ2vuP8SduLqqV+/8+cebSLV9SJEAN5Z3zQbJG/M+Q==

-"@babel/parser@^7.24.7":
-  version "7.25.3"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.25.3.tgz#91fb126768d944966263f0657ab222a642b82065"
-  integrity sha512-iLTJKDbJ4hMvFPgQwwsVoxtHyWpKKPBrxkANrSYewDPaPpT5py5yeVkgPIJ7XYXhndxJpaA3PyALSXQ7u8e/Dw==
-  dependencies:
-    "@babel/types" "^7.25.2"
-
 "@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.24.6":
  version "7.24.6"
  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.24.6.tgz#283a74ef365b1e954cda6b2724c678a978215e88"
@ -1038,15 +1021,6 @@
    "@babel/helper-validator-identifier" "^7.24.6"
    to-fast-properties "^2.0.0"

-"@babel/types@^7.25.2":
-  version "7.25.2"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.25.2.tgz#55fb231f7dc958cd69ea141a4c2997e819646125"
-  integrity sha512-YTnYtra7W9e6/oAZEHj0bJehPRUlLH9/fbpT5LfB0NhQXyALCRkRs3zH9v07IYhkgpqX6Z78FnuccZr/l4Fs4Q==
-  dependencies:
-    "@babel/helper-string-parser" "^7.24.8"
-    "@babel/helper-validator-identifier" "^7.24.7"
-    to-fast-properties "^2.0.0"
-
 "@chenfengyuan/vue-qrcode@^2.0.0":
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/@chenfengyuan/vue-qrcode/-/vue-qrcode-2.0.0.tgz#8cd01f6fc528d471680ebe812ec47c830aea7e63"
@ -1167,20 +1141,20 @@
    source-map "0.6.1"
    yaml-eslint-parser "^0.3.2"

-"@intlify/core-base@9.14.0":
-  version "9.14.0"
-  resolved "https://registry.yarnpkg.com/@intlify/core-base/-/core-base-9.14.0.tgz#63ce687a6560c0af6a16cb567d9d8a1ea1a5a65e"
-  integrity sha512-zJn0imh9HIsZZUtt9v8T16PeVstPv6bP2YzlrYJwoF8F30gs4brZBwW2KK6EI5WYKFi3NeqX6+UU4gniz5TkGg==
+"@intlify/core-base@9.13.1":
+  version "9.13.1"
+  resolved "https://registry.yarnpkg.com/@intlify/core-base/-/core-base-9.13.1.tgz#bd1f38e665095993ef9b67aeeb794f3cabcb515d"
+  integrity sha512-+bcQRkJO9pcX8d0gel9ZNfrzU22sZFSA0WVhfXrf5jdJOS24a+Bp8pozuS9sBI9Hk/tGz83pgKfmqcn/Ci7/8w==
  dependencies:
-    "@intlify/message-compiler" "9.14.0"
-    "@intlify/shared" "9.14.0"
+    "@intlify/message-compiler" "9.13.1"
+    "@intlify/shared" "9.13.1"

-"@intlify/message-compiler@9.14.0":
-  version "9.14.0"
-  resolved "https://registry.yarnpkg.com/@intlify/message-compiler/-/message-compiler-9.14.0.tgz#e767141dd12862b3c1bf02ab5fc4852792812381"
-  integrity sha512-sXNsoMI0YsipSXW8SR75drmVK56tnJHoYbPXUv2Cf9lz6FzvwsosFm6JtC1oQZI/kU+n7qx0qRrEWkeYFTgETA==
+"@intlify/message-compiler@9.13.1":
+  version "9.13.1"
+  resolved "https://registry.yarnpkg.com/@intlify/message-compiler/-/message-compiler-9.13.1.tgz#ff8129badf77db3fb648b8d3cceee87c8033ed0a"
+  integrity sha512-SKsVa4ajYGBVm7sHMXd5qX70O2XXjm55zdZB3VeMFCvQyvLew/dLvq3MqnaIsTMF1VkkOb9Ttr6tHcMlyPDL9w==
  dependencies:
-    "@intlify/shared" "9.14.0"
+    "@intlify/shared" "9.13.1"
    source-map-js "^1.0.2"

 "@intlify/message-compiler@next":
@ -1196,12 +1170,7 @@
  resolved "https://registry.yarnpkg.com/@intlify/shared/-/shared-10.0.0-beta.1.tgz#7a72310c8fb81ee9d4ec0a534fd7782139b67c3a"
  integrity sha512-61MnYhgqS/TyAto9CXOltHlhK2WflLBcKpIkRhZCUL2IkiVvh7qKevsqZ3RYZylyC3q19ajLW6mB+iJtnbAOpg==

-"@intlify/shared@9.14.0":
-  version "9.14.0"
-  resolved "https://registry.yarnpkg.com/@intlify/shared/-/shared-9.14.0.tgz#e8fb3693ad4171442cbe6cb8922a9b5a22ffb4ef"
-  integrity sha512-r+N8KRQL7LgN1TMTs1A2svfuAU0J94Wu9wWdJVJqYsoMMLIeJxrPjazihfHpmJqfgZq0ah3Y9Q4pgWV2O90Fyg==
-
-"@intlify/shared@^9.2.2":
+"@intlify/shared@9.13.1", "@intlify/shared@^9.2.2":
  version "9.13.1"
  resolved "https://registry.yarnpkg.com/@intlify/shared/-/shared-9.13.1.tgz#202741d11ece1a9c7480bfd3f27afcf9cb8f72e4"
  integrity sha512-u3b6BKGhE6j/JeRU6C/RL2FgyJfy6LakbtfeVF8fJXURpZZTzfh3e05J0bu0XPw447Q6/WUp3C4ajv4TMS4YsQ==
@ -1700,17 +1669,6 @@
    estree-walker "^2.0.2"
    source-map-js "^1.2.0"

-"@vue/compiler-core@3.4.38":
-  version "3.4.38"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.4.38.tgz#326dfe3c92fa2b0f1dc9b39a948a231980253496"
-  integrity sha512-8IQOTCWnLFqfHzOGm9+P8OPSEDukgg3Huc92qSG49if/xI2SAwLHQO2qaPQbjCWPBcQoO1WYfXfTACUrWV3c5A==
-  dependencies:
-    "@babel/parser" "^7.24.7"
-    "@vue/shared" "3.4.38"
-    entities "^4.5.0"
-    estree-walker "^2.0.2"
-    source-map-js "^1.2.0"
-
 "@vue/compiler-dom@3.4.27":
  version "3.4.27"
  resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.4.27.tgz#d51d35f40d00ce235d7afc6ad8b09dfd92b1cc1c"
@ -1719,30 +1677,7 @@
    "@vue/compiler-core" "3.4.27"
    "@vue/shared" "3.4.27"

-"@vue/compiler-dom@3.4.38":
-  version "3.4.38"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.4.38.tgz#90348fac1130e0bbd408b650635cb626b3b9df06"
-  integrity sha512-Osc/c7ABsHXTsETLgykcOwIxFktHfGSUDkb05V61rocEfsFDcjDLH/IHJSNJP+/Sv9KeN2Lx1V6McZzlSb9EhQ==
-  dependencies:
-    "@vue/compiler-core" "3.4.38"
-    "@vue/shared" "3.4.38"
-
-"@vue/compiler-sfc@3.4.38":
-  version "3.4.38"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.4.38.tgz#954c3f6777bbbcca28771ba59b795f12f76ef188"
-  integrity sha512-s5QfZ+9PzPh3T5H4hsQDJtI8x7zdJaew/dCGgqZ2630XdzaZ3AD8xGZfBqpT8oaD/p2eedd+pL8tD5vvt5ZYJQ==
-  dependencies:
-    "@babel/parser" "^7.24.7"
-    "@vue/compiler-core" "3.4.38"
-    "@vue/compiler-dom" "3.4.38"
-    "@vue/compiler-ssr" "3.4.38"
-    "@vue/shared" "3.4.38"
-    estree-walker "^2.0.2"
-    magic-string "^0.30.10"
-    postcss "^8.4.40"
-    source-map-js "^1.2.0"
-
-"@vue/compiler-sfc@^3.1.0", "@vue/compiler-sfc@^3.4.15":
+"@vue/compiler-sfc@3.4.27", "@vue/compiler-sfc@^3.1.0", "@vue/compiler-sfc@^3.4.15":
  version "3.4.27"
  resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.4.27.tgz#399cac1b75c6737bf5440dc9cf3c385bb2959701"
  integrity sha512-nDwntUEADssW8e0rrmE0+OrONwmRlegDA1pD6QhVeXxjIytV03yDqTey9SBDiALsvAd5U4ZrEKbMyVXhX6mCGA==
@ -1765,67 +1700,48 @@
    "@vue/compiler-dom" "3.4.27"
    "@vue/shared" "3.4.27"

-"@vue/compiler-ssr@3.4.38":
-  version "3.4.38"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.4.38.tgz#9ded18f6d9c8b2440039a58492cfff36fa1a7774"
-  integrity sha512-YXznKFQ8dxYpAz9zLuVvfcXhc31FSPFDcqr0kyujbOwNhlmaNvL2QfIy+RZeJgSn5Fk54CWoEUeW+NVBAogGaw==
-  dependencies:
-    "@vue/compiler-dom" "3.4.38"
-    "@vue/shared" "3.4.38"
-
-"@vue/devtools-api@^6.0.0-beta.11", "@vue/devtools-api@^6.5.0":
+"@vue/devtools-api@^6.0.0-beta.11", "@vue/devtools-api@^6.5.0", "@vue/devtools-api@^6.5.1":
  version "6.6.1"
  resolved "https://registry.yarnpkg.com/@vue/devtools-api/-/devtools-api-6.6.1.tgz#7c14346383751d9f6ad4bea0963245b30220ef83"
  integrity sha512-LgPscpE3Vs0x96PzSSB4IGVSZXZBZHpfxs+ZA1d+VEPwHdOXowy/Y2CsvCAIFrf+ssVU1pD1jidj505EpUnfbA==

-"@vue/devtools-api@^6.6.3":
-  version "6.6.3"
-  resolved "https://registry.yarnpkg.com/@vue/devtools-api/-/devtools-api-6.6.3.tgz#b23a588154cba8986bba82b6e1d0248bde3fd1a0"
-  integrity sha512-0MiMsFma/HqA6g3KLKn+AGpL1kgKhFWszC9U29NfpWK5LE7bjeXxySWJrOJ77hBz+TBrBQ7o4QJqbPbqbs8rJw==
-
-"@vue/reactivity@3.4.38":
-  version "3.4.38"
-  resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.4.38.tgz#ec2d549f4b831cd03d0baabf7d77e840b8536000"
-  integrity sha512-4vl4wMMVniLsSYYeldAKzbk72+D3hUnkw9z8lDeJacTxAkXeDAP1uE9xr2+aKIN0ipOL8EG2GPouVTH6yF7Gnw==
+"@vue/reactivity@3.4.27":
+  version "3.4.27"
+  resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.4.27.tgz#6ece72331bf719953f5eaa95ec60b2b8d49e3791"
+  integrity sha512-kK0g4NknW6JX2yySLpsm2jlunZJl2/RJGZ0H9ddHdfBVHcNzxmQ0sS0b09ipmBoQpY8JM2KmUw+a6sO8Zo+zIA==
  dependencies:
-    "@vue/shared" "3.4.38"
+    "@vue/shared" "3.4.27"

-"@vue/runtime-core@3.4.38":
-  version "3.4.38"
-  resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.4.38.tgz#bead9085e9a1c5a446e27d74ffb450f9261cf097"
-  integrity sha512-21z3wA99EABtuf+O3IhdxP0iHgkBs1vuoCAsCKLVJPEjpVqvblwBnTj42vzHRlWDCyxu9ptDm7sI2ZMcWrQqlA==
+"@vue/runtime-core@3.4.27":
+  version "3.4.27"
+  resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.4.27.tgz#1b6e1d71e4604ba7442dd25ed22e4a1fc6adbbda"
+  integrity sha512-7aYA9GEbOOdviqVvcuweTLe5Za4qBZkUY7SvET6vE8kyypxVgaT1ixHLg4urtOlrApdgcdgHoTZCUuTGap/5WA==
  dependencies:
-    "@vue/reactivity" "3.4.38"
-    "@vue/shared" "3.4.38"
+    "@vue/reactivity" "3.4.27"
+    "@vue/shared" "3.4.27"

-"@vue/runtime-dom@3.4.38":
-  version "3.4.38"
-  resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.4.38.tgz#52678ba0b85f94400a0a9c8dd23ddef4dd65657d"
-  integrity sha512-afZzmUreU7vKwKsV17H1NDThEEmdYI+GCAK/KY1U957Ig2NATPVjCROv61R19fjZNzMmiU03n79OMnXyJVN0UA==
+"@vue/runtime-dom@3.4.27":
+  version "3.4.27"
+  resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.4.27.tgz#fe8d1ce9bbe8921d5dd0ad5c10df0e04ef7a5ee7"
+  integrity sha512-ScOmP70/3NPM+TW9hvVAz6VWWtZJqkbdf7w6ySsws+EsqtHvkhxaWLecrTorFxsawelM5Ys9FnDEMt6BPBDS0Q==
  dependencies:
-    "@vue/reactivity" "3.4.38"
-    "@vue/runtime-core" "3.4.38"
-    "@vue/shared" "3.4.38"
+    "@vue/runtime-core" "3.4.27"
+    "@vue/shared" "3.4.27"
    csstype "^3.1.3"

-"@vue/server-renderer@3.4.38":
-  version "3.4.38"
-  resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.4.38.tgz#457401ef2b0f969156702061e56915acecc9fe2c"
-  integrity sha512-NggOTr82FbPEkkUvBm4fTGcwUY8UuTsnWC/L2YZBmvaQ4C4Jl/Ao4HHTB+l7WnFCt5M/dN3l0XLuyjzswGYVCA==
+"@vue/server-renderer@3.4.27":
+  version "3.4.27"
+  resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.4.27.tgz#3306176f37e648ba665f97dda3ce705687be63d2"
+  integrity sha512-dlAMEuvmeA3rJsOMJ2J1kXU7o7pOxgsNHVr9K8hB3ImIkSuBrIdy0vF66h8gf8Tuinf1TK3mPAz2+2sqyf3KzA==
  dependencies:
-    "@vue/compiler-ssr" "3.4.38"
-    "@vue/shared" "3.4.38"
+    "@vue/compiler-ssr" "3.4.27"
+    "@vue/shared" "3.4.27"

 "@vue/shared@3.4.27":
  version "3.4.27"
  resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.4.27.tgz#f05e3cd107d157354bb4ae7a7b5fc9cf73c63b50"
  integrity sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA==

-"@vue/shared@3.4.38":
-  version "3.4.38"
-  resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.4.38.tgz#552a6770098bfd556fa3e2c686c9d3b4f4cd94c2"
-  integrity sha512-q0xCiLkuWWQLzVrecPb0RMsNWyxICOjPrcrwxTUEHb1fsnvni4dcuyG7RT/Ie7VPTvnjzIaWzRMUBsrqNj/hhw==
-
 "@vue/test-utils@^2.0.2":
  version "2.4.6"
  resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-2.4.6.tgz#7d534e70c4319d2a587d6a3b45a39e9695ade03c"
@ -6590,15 +6506,6 @@ postcss@^8.2.14, postcss@^8.4.0, postcss@^8.4.19, postcss@^8.4.33, postcss@^8.4.
    picocolors "^1.0.0"
    source-map-js "^1.2.0"

-postcss@^8.4.40:
-  version "8.4.41"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.41.tgz#d6104d3ba272d882fe18fc07d15dc2da62fa2681"
-  integrity sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==
-  dependencies:
-    nanoid "^3.3.7"
-    picocolors "^1.0.1"
-    source-map-js "^1.2.0"
-
 prelude-ls@^1.2.1:
  version "1.2.1"
  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
@ -7390,7 +7297,16 @@ streamroller@^3.1.5:
    debug "^4.3.4"
    fs-extra "^8.1.0"

-"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
  version "4.2.3"
  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@ -7477,7 +7393,14 @@ stringify-object@^3.3.0:
    is-obj "^1.0.1"
    is-regexp "^1.0.0"

-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1:
  version "6.0.1"
  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@ -8128,13 +8051,13 @@ vue-eslint-parser@^9.4.2:
    lodash "^4.17.21"
    semver "^7.3.6"

-vue-i18n@^9.14.0:
-  version "9.14.0"
-  resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-9.14.0.tgz#d6f1b3d95bfc4f40e630ff9456c78ab5becfd933"
-  integrity sha512-LxmpRuCt2rI8gqU+kxeflRZMQn4D5+4M3oP3PWZdowW/ePJraHqhF7p4CuaME52mUxdw3Mmy2yAUKgfZYgCRjA==
+vue-i18n@^9.2.2:
+  version "9.13.1"
+  resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-9.13.1.tgz#a292c8021b7be604ebfca5609ae1f8fafe5c36d7"
+  integrity sha512-mh0GIxx0wPtPlcB1q4k277y0iKgo25xmDPWioVVYanjPufDBpvu5ySTjP5wOrSvlYQ2m1xI+CFhGdauv/61uQg==
  dependencies:
-    "@intlify/core-base" "9.14.0"
-    "@intlify/shared" "9.14.0"
+    "@intlify/core-base" "9.13.1"
+    "@intlify/shared" "9.13.1"
    "@vue/devtools-api" "^6.5.0"

 vue-loader@^17.4.2:
@ -8146,12 +8069,12 @@ vue-loader@^17.4.2:
    hash-sum "^2.0.0"
    watchpack "^2.4.0"

-vue-router@^4.4.3:
-  version "4.4.3"
-  resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-4.4.3.tgz#58a39dc804632bfb6d26f052aa8f6718bd130299"
-  integrity sha512-sv6wmNKx2j3aqJQDMxLFzs/u/mjA9Z5LCgy6BE0f7yFWMjrPLnS/sPNn8ARY/FXw6byV18EFutn5lTO6+UsV5A==
+vue-router@^4.3.2:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-4.3.2.tgz#08096c7765dacc6832f58e35f7a081a8b34116a7"
+  integrity sha512-hKQJ1vDAZ5LVkKEnHhmm1f9pMiWIBNGF5AwU67PdH7TyXCj/a4hTccuUuYCAMgJK6rO/NVYtQIEN3yL8CECa7Q==
  dependencies:
-    "@vue/devtools-api" "^6.6.3"
+    "@vue/devtools-api" "^6.5.1"

 vue-style-loader@^4.1.3:
  version "4.1.3"
@ -8169,16 +8092,16 @@ vue-template-compiler@^2.7.16:
    de-indent "^1.0.2"
    he "^1.2.0"

-vue@^3.4.38:
-  version "3.4.38"
-  resolved "https://registry.yarnpkg.com/vue/-/vue-3.4.38.tgz#0ccbb64ed03ef3c4ab73e540793290b18e7c4236"
-  integrity sha512-f0ZgN+mZ5KFgVv9wz0f4OgVKukoXtS3nwET4c2vLBGQR50aI8G0cqbFtLlX9Yiyg3LFGBitruPHt2PxwTduJEw==
+vue@^3.2.31:
+  version "3.4.27"
+  resolved "https://registry.yarnpkg.com/vue/-/vue-3.4.27.tgz#40b7d929d3e53f427f7f5945386234d2854cc2a1"
+  integrity sha512-8s/56uK6r01r1icG/aEOHqyMVxd1bkYcSe9j8HcKtr/xTOFWvnzIVTehNW+5Yt89f+DLBe4A569pnZLS5HzAMA==
  dependencies:
-    "@vue/compiler-dom" "3.4.38"
-    "@vue/compiler-sfc" "3.4.38"
-    "@vue/runtime-dom" "3.4.38"
-    "@vue/server-renderer" "3.4.38"
-    "@vue/shared" "3.4.38"
+    "@vue/compiler-dom" "3.4.27"
+    "@vue/compiler-sfc" "3.4.27"
+    "@vue/runtime-dom" "3.4.27"
+    "@vue/server-renderer" "3.4.27"
+    "@vue/shared" "3.4.27"

 vuex@^4.1.0:
  version "4.1.0"
@ -8577,8 +8500,7 @@ workerpool@6.2.1:
  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.1.tgz#46fc150c17d826b86a008e5a4508656777e9c343"
  integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==

-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
-  name wrap-ansi-cjs
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
  version "7.0.0"
  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@ -8596,6 +8518,15 @@ wrap-ansi@^6.2.0:
    string-width "^4.1.0"
    strip-ansi "^6.0.0"

+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrap-ansi@^8.1.0:
  version "8.1.0"
  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
Author	SHA1	Message	Date
Essem	87e70d1e23	Fix frontend git url	2024-08-03 21:33:40 -05:00
Essem	25c8db8b85	Merge branch 'develop' of https://akkoma.dev/AkkomaGang/akkoma-fe into develop	2024-08-03 18:43:26 -05:00
Essem	da8063b54b	Hack to fix streaming notification order	2024-02-11 23:18:23 -06:00
Essem	672f50eec1	screw it, just hardcode the target	2024-02-11 22:17:58 -06:00
Essem	0aa5ac09a2	Make notifications work Unsure if marking single notifications as seen is possible with masto	2024-02-10 16:55:05 -06:00
Essem	430a9f789a	Link to Mastodon admin dashboard instead of AdminFE	2024-01-21 00:00:41 -06:00
Essem	17fd7e288b	Remove post previews The way they work is incompatible with the Mastodon API.	2024-01-21 00:00:21 -06:00
Essem	1605035bb3	Attempt to block settings sync	2024-01-06 21:36:10 -06:00
Essem	35c4cad520	Use streaming API by default	2024-01-06 21:07:26 -06:00
Essem	a3ae2aad5b	Fix emoji reactions	2024-01-06 21:07:15 -06:00
Essem	92eb414907	Convert conversation_id to statusnet_conversation_id	2024-01-06 19:51:40 -06:00
Essem	dcda90373f	Make it work with wdw	2024-01-06 17:03:12 -06:00