Merge branch 'main' into userquin/feat-remember-last-position

CONTRIBUTING.md

@@ -34,7 +34,7 @@ In order to run Elk with PWA enabled, run `pnpm run dev:pwa` in Elk's root folde
 You should test the Elk PWA application on private browsing mode on any Chromium based browser: will not work on Firefox and Safari.
 
 If not using private browsing mode, you will need to uninstall the PWA application from your browser once you finish testing:
-- Open `Dev Tools` (`Option + ⌘ + J` on MacOS, `Shift + CTRL + J` on Windows/Linux)
+- Open `Dev Tools` (`Option + ⌘ + J` on macOS, `Shift + CTRL + J` on Windows/Linux)
 - Go to `Application > Storage`, you should check following checkboxes:
     - Application: [x] Unregister service worker
     - Storage: [x] IndexedDB and [x] Local and session storage

components/account/AccountFollowButton.vue

@@ -60,18 +60,14 @@ useCommand({
 })
 
 const buttonStyle = $computed(() => {
-  // Skeleton while loading, avoid primary color flash
+  if (relationship?.blocking)
-  if (!relationship)
-    return 'text-inverted'
-
-  if (relationship.blocking)
     return 'text-inverted bg-red border-red'
 
-  if (relationship.muting)
+  if (relationship?.muting)
     return 'text-base bg-code border-base'
 
   // If following, use a label style with a strong border for Mutuals
-  if (relationship.following)
+  if (relationship?.following)
     return `text-base ${relationship.followedBy ? 'border-strong' : 'border-base'}`
 
   // If not following, use a button style
@@ -99,7 +95,7 @@ const buttonStyle = $computed(() => {
       <span hidden group-hover="inline">{{ $t('account.unmute') }}</span>
     </template>
     <template v-else-if="relationship?.following">
-      <span group-hover="hidden">{{ relationship?.followedBy ? $t('account.mutuals') : $t('account.following') }}</span>
+      <span group-hover="hidden">{{ relationship.followedBy ? $t('account.mutuals') : $t('account.following') }}</span>
       <span hidden group-hover="inline">{{ $t('account.unfollow') }}</span>
     </template>
     <template v-else-if="relationship?.requested">

components/account/AccountPostsFollowers.vue

@@ -18,6 +18,7 @@ const followersCountSR = $computed(() => forSR(props.account.followersCount))
   <div flex gap-5>
     <NuxtLink
       :to="getAccountRoute(account)"
+      replace
       text-secondary
       exact-active-class="text-primary"
       :class="statusesCountSR ? 'flex gap-x-1' : null"
@@ -34,6 +35,7 @@ const followersCountSR = $computed(() => forSR(props.account.followersCount))
     </NuxtLink>
     <NuxtLink
       :to="getAccountFollowingRoute(account)"
+      replace
       text-secondary exact-active-class="text-primary"
       :class="followingCountSR ? 'flex gap-x-1' : null"
     >
@@ -49,6 +51,7 @@ const followersCountSR = $computed(() => forSR(props.account.followersCount))
     </NuxtLink>
     <NuxtLink
       :to="getAccountFollowersRoute(account)"
+      replace
       text-secondary exact-active-class="text-primary"
       :class="followersCountSR ? 'flex gap-x-1' : null"
     >

components/command/CommandPanel.vue

@@ -221,7 +221,7 @@ const onKeyDown = (e: KeyboardEvent) => {
       </template>
       <div v-else p5 text-center text-secondary italic>
         {{
-          input.length
+          input.trim().length
             ? $t('common.not_found')
             : $t('search.search_desc')
         }}

components/notification/NotificationEnablePushNotification.client.vue

@@ -1,4 +1,6 @@
 <script setup lang="ts">
+import { useMediaQuery } from '@vueuse/core'
+
 defineProps<{
   closeableHeader?: boolean
   busy?: boolean
@@ -11,6 +13,8 @@ defineSlots<{
   error: {}
 }>()
 
+const xl = useMediaQuery('(min-width: 1280px)')
+
 const isLegacyAccount = computed(() => !currentUser.value?.vapidKey)
 </script>
 
@@ -38,8 +42,19 @@ const isLegacyAccount = computed(() => !currentUser.value?.vapidKey)
         <span aria-hidden="true" i-ri:close-line />
       </button>
     </header>
-    <p>
+    <template v-if="closeableHeader">
-      {{ $t(`settings.notifications.push_notifications.warning.enable_description${closeableHeader ? '' : '_settings'}`) }}
+      <p xl:hidden>
+        {{ $t('settings.notifications.push_notifications.warning.enable_description') }}
+      </p>
+      <p xl:hidden>
+        {{ $t('settings.notifications.push_notifications.warning.enable_description_mobile') }}
+      </p>
+      <p :class="xl ? null : 'hidden'">
+        {{ $t('settings.notifications.push_notifications.warning.enable_description_desktop') }}
+      </p>
+    </template>
+    <p v-else>
+      {{ $t('settings.notifications.push_notifications.warning.enable_description_settings') }}
     </p>
     <p v-if="isLegacyAccount">
       {{ $t('settings.notifications.push_notifications.warning.re_auth') }}
@@ -52,7 +67,7 @@ const isLegacyAccount = computed(() => !currentUser.value?.vapidKey)
       @click="$emit('subscribe')"
     >
       <span aria-hidden="true" :class="busy && animate ? 'i-ri:loader-2-fill animate-spin' : 'i-ri:check-line'" />
-      {{ $t('settings.notifications.push_notifications.warning.enable_desktop') }}
+      <span>{{ $t('settings.notifications.push_notifications.warning.enable_desktop') }}</span>
     </button>
     <slot name="error" />
   </div>

components/search/SearchWidget.vue

@@ -77,16 +77,21 @@ const activate = () => {
     <!-- Results -->
     <div left-0 top-12 absolute w-full z10 group-focus-within="pointer-events-auto visible" invisible pointer-events-none>
       <div w-full bg-base border="~ base" rounded-3 max-h-100 overflow-auto py2>
-        <span v-if="query.length === 0" block text-center text-sm text-secondary>
+        <span v-if="query.trim().length === 0" block text-center text-sm text-secondary>
           {{ t('search.search_desc') }}
         </span>
-        <template v-if="!loading">
+        <template v-else-if="!loading">
-          <SearchResult
+          <template v-if="results.length > 0">
-            v-for="(result, i) in results" :key="result.id"
+            <SearchResult
-            :active="index === parseInt(i.toString())"
+              v-for="(result, i) in results" :key="result.id"
-            :result="result"
+              :active="index === parseInt(i.toString())"
-            :tabindex="focused ? 0 : -1"
+              :result="result"
-          />
+              :tabindex="focused ? 0 : -1"
+            />
+          </template>
+          <span v-else block text-center text-sm text-secondary>
+            {{ t('search.search_empty') }}
+          </span>
         </template>
         <div v-else>
           <SearchResultSkeleton />

composables/masto/search.ts

@@ -28,6 +28,8 @@ export function useSearch(query: MaybeComputedRef<string>, options: UseSearchOpt
   const hashtags = ref<HashTagSearchResult[]>([])
   const statuses = ref<StatusSearchResult[]>([])
 
+  const q = $computed(() => resolveUnref(query).trim())
+
   let paginator: Paginator<mastodon.v2.Search, mastodon.v2.SearchParams> | undefined
 
   const appendResults = (results: mastodon.v2.Search, empty = false) => {
@@ -56,12 +58,12 @@ export function useSearch(query: MaybeComputedRef<string>, options: UseSearchOpt
     }))]
   }
 
-  watch(() => unref(query), () => {
+  watch(() => resolveUnref(query), () => {
-    loading.value = !!(unref(query) && isMastoInitialised.value)
+    loading.value = !!(q && isMastoInitialised.value)
   })
 
-  debouncedWatch(() => unref(query), async () => {
+  debouncedWatch(() => resolveUnref(query), async () => {
-    if (!unref(query) || !isMastoInitialised.value)
+    if (!q || !isMastoInitialised.value)
       return
 
     loading.value = true
@@ -71,7 +73,7 @@ export function useSearch(query: MaybeComputedRef<string>, options: UseSearchOpt
      * but that doesn't seem to be the case. So instead we just create a new paginator with the new params.
      */
     paginator = masto.v2.search({
-      q: resolveUnref(query),
+      q,
       ...resolveUnref(options),
       resolve: !!currentUser.value,
     })
@@ -85,7 +87,7 @@ export function useSearch(query: MaybeComputedRef<string>, options: UseSearchOpt
   }, { debounce: 300 })
 
   const next = async () => {
-    if (!unref(query) || !isMastoInitialised.value || !paginator)
+    if (!q || !isMastoInitialised.value || !paginator)
       return
 
     loading.value = true

composables/tiptap.ts

@@ -58,7 +58,7 @@ export function useTiptap(options: UseTiptapOptions) {
           suggestion: HashtagSuggestion,
         }),
       Placeholder.configure({
-        placeholder: placeholder.value,
+        placeholder: () => placeholder.value!,
       }),
       CodeBlockShiki,
       Extension.create({
@@ -106,6 +106,9 @@ export function useTiptap(options: UseTiptapOptions) {
       return
     editor.value?.commands.setContent(value || '', false)
   })
+  watch(placeholder, () => {
+    editor.value?.view.dispatch(editor.value?.state.tr)
+  })
 
   return {
     editor,

elk.svg

@@ -1,8 +1 @@
-<svg width="180" height="180" viewBox="0 0 250 250" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg xmlns="http://www.w3.org/2000/svg" width="180" height="180" fill="none" viewBox="0 0 250 250"><path fill="#EA9E44" d="M131.676 48.248c-8.828 1.025-13.52-1.333-16.345 7.073 0 0 9.484 14.3 34.759 13.942-1.413 5.843-.757 10.148-.757 15.325 0 17.222-13.621 32.24-43.638 32.24-15.236 0-33.75 2.768-47.876 10.508-10.04 5.484-17.894 13.429-21.37 24.449l3.94 5.587 7.542.102v31.625l-9.202 14.506 2.644 42.03H50.1l.757-33.829c4.339-2.563 14.277-9.226 22.752-19.477 11.503-13.788 20.331-33.829 9.939-58.637l7.769-3.332c8.526 20.349 5.55 37.981-1.917 52.179 14.277-.462 26.536-1.384 36.928-3.127l-2.371-28.857 8.375-.718 7.971 95.798h8.677l1.463-62.379c6.912-2.973 22.652-13.89 30.017-51.82.908-4.613 1.413-8.508 1.665-11.84 1.16-8.457 1.816-17.991 2.018-28.857l-12.36-3.947h37.988l3.683-8.457c-3.582.154-7.87-1.742-7.87-1.742l.857-4.101h7.971l-43.134-22.707c-4.792 1.846-9.837 4.255-13.369 7.176-2.825-2.05-12.612-8.457-26.233-8.713Z"/><path fill="#A75C26" d="M165.174 185.512c4.54-4.921 9.787-11.841 14.681-21.118.151 3.844.403 6.151.605 7.33l22.349 19.169-16.85 33.214-7.567-3.588 10.543-24.346-23.761-10.661ZM84.052 191.15a387.352 387.352 0 0 0 18.212-.718c-7.315 10.918-16.194 18.76-19.876 21.835v33.317H73.76l-4.39-38.442c5.247-4.408 10.292-10.098 14.681-15.992ZM58.424 6.244l8.123-2.307c3.935 14.25 8.828 22.04 14.983 25.987 5.55 3.367 13.066 3.46 21.037 3.024-2.321-.769-4.49-1.845-6.508-3.332-4.49-3.331-8.324-8.867-11.2-18.913l8.072-2.41c2.17 7.587 4.692 11.943 8.072 14.455 3.38 2.46 7.467 3.075 12.31 3.588 9.08 1.025 20.431 1.435 34.608 8.098 1.917.718 3.884 1.64 5.801 2.666a16.807 16.807 0 0 0-.857-1.59c-2.422-3.843-7.164-7.893-15.942-11.173l2.825-7.996c14.277 5.228 19.927 12.66 22.197 18.555 2.624 6.714 1.009 11.968 1.009 11.968-2.018.666-4.036 1.589-6.356 2.306-4.389-3.024-8.526-5.305-12.461-7.099-14.529-5.484-28.756-1.742-41.368-.563-9.485.871-18.162.461-25.679-4.357-7.416-4.716-13.924-13.737-18.666-30.907Z"/><path fill="#A75C26" d="M113.918 19.98c-1.665-3.793-2.674-8.457-2.22-14.198l8.375.615c-.505 6.971 1.917 11.687 4.641 14.762-3.531-.615-6.911-.687-10.796-1.179ZM166.889 19.109l5.499-6.407c14.277 12.609 5.398 30.65 5.398 30.65l-7.819-.87c-.252-4.121-.757-11.78-4.389-16.095 2.371 1.215 4.389 2.553 6.609 4.562 0-3.742-1.161-8.15-5.298-11.84Z"/></svg>
-<path d="M131.676 48.2479C122.848 49.273 118.156 46.9152 115.331 55.3212C115.331 55.3212 124.815 69.6216 150.09 69.2628C148.677 75.106 149.333 79.4115 149.333 84.5884C149.333 101.81 135.712 116.828 105.695 116.828C90.4593 116.828 71.9446 119.596 57.8189 127.336C47.7796 132.82 39.9247 140.765 36.4488 151.785L40.3888 157.372L47.931 157.474V189.099L38.7291 203.605L41.3726 245.635H50.1003L50.857 211.806C55.1956 209.243 65.134 202.58 73.6094 192.329C85.1118 178.541 93.9403 158.5 83.5478 133.692L91.317 130.36C99.8428 150.709 96.8663 168.341 89.3999 182.539C103.677 182.077 115.936 181.155 126.328 179.412L123.957 150.555L132.332 149.837L140.303 245.635H148.98L150.443 183.256C157.355 180.283 173.095 169.366 180.46 131.436C181.368 126.823 181.873 122.928 182.125 119.596C183.285 111.139 183.941 101.605 184.143 90.7391L171.783 86.7924H209.771L213.454 78.3352C209.872 78.4889 205.584 76.5925 205.584 76.5925L206.441 72.492H214.412L171.278 49.7855C166.486 51.6308 161.441 54.0398 157.909 56.9614C155.084 54.9112 145.297 48.5041 131.676 48.2479Z" fill="#EA9E44"/>
-<path d="M165.174 185.512C169.714 180.591 174.961 173.671 179.855 164.394C180.006 168.238 180.258 170.545 180.46 171.724L202.809 190.893L185.959 224.107L178.392 220.519L188.935 196.173L165.174 185.512Z" fill="#A75C26"/>
-<path d="M84.0523 191.15C90.5098 191.047 96.5636 190.791 102.264 190.432C94.9493 201.35 86.0703 209.192 82.3875 212.267V245.584H73.7608L69.3717 207.142C74.6184 202.734 79.6633 197.044 84.0523 191.15Z" fill="#A75C26"/>
-<path d="M58.4243 6.24353L66.5466 3.93701C70.4816 18.1862 75.3751 25.9771 81.5299 29.9238C87.0793 33.2913 94.5962 33.3836 102.567 32.9479C100.246 32.1791 98.0771 31.1027 96.0592 29.6163C91.5692 26.2846 87.7351 20.749 84.8595 10.7028L92.9313 8.29378C95.1006 15.8797 97.6231 20.2364 101.003 22.748C104.383 25.2083 108.47 25.8233 113.313 26.3359C122.393 27.361 133.744 27.7711 147.921 34.4344C149.838 35.1519 151.805 36.0746 153.722 37.0997L153.722 37.0996C153.47 36.587 153.218 36.0745 152.865 35.5107C150.443 31.6665 145.701 27.6173 136.923 24.3369L139.748 16.341C154.025 21.5691 159.675 29.0012 161.945 34.8957C164.569 41.6102 162.954 46.8639 162.954 46.8639C160.936 47.5303 158.918 48.4529 156.598 49.1705C152.209 46.1464 148.072 43.8655 144.137 42.0715C129.608 36.5871 115.381 40.3288 102.769 41.5077C93.2845 42.379 84.6073 41.969 77.0904 37.1509C69.6744 32.4354 63.1665 23.4143 58.4243 6.24353Z" fill="#A75C26"/>
-<path d="M113.918 19.9802C112.253 16.1872 111.244 11.5229 111.698 5.78223L120.073 6.3973C119.568 13.3681 121.99 18.0837 124.714 21.159C121.183 20.544 117.803 20.4722 113.918 19.9802Z" fill="#A75C26"/>
-<path d="M166.889 19.1088L172.388 12.7018C186.665 25.3108 177.786 43.3529 177.786 43.3529L169.967 42.4816C169.715 38.3606 169.21 30.7029 165.578 26.3872C167.949 27.6019 169.967 28.9397 172.187 30.9489C172.187 27.2073 171.026 22.7992 166.889 19.1088Z" fill="#A75C26"/>
-</svg>

locales/de-DE.json

@@ -148,7 +148,8 @@
     "replying": "Antworten"
   },
   "search": {
-    "search_desc": "Suche nach Accounts & Hashtags"
+    "search_desc": "Suche nach Accounts & Hashtags",
+    "search_empty": "Nichts für diese Suchbegriffe gefunden"
   },
   "settings": {
     "about": {

locales/en-GB.json

@@ -183,7 +183,8 @@
     "update_available_short": "Update Elk"
   },
   "search": {
-    "search_desc": "Search for people & hashtags"
+    "search_desc": "Search for people & hashtags",
+    "search_empty": "Could not find anything for these search terms"
   },
   "settings": {
     "about": {
@@ -244,6 +245,8 @@
         "warning": {
           "enable_close": "Close",
           "enable_description": "To receive notifications when Elk is not open, enable push notifications. You can control precisely what types of interactions generate push notifications via the \"@:settings.notifications.show_btn{'\"'} button above once enabled.",
+          "enable_description_desktop": "To receive notifications when Elk is not open, enable push notifications. You can control precisely what types of interactions generate push notifications in the navigation menu under \"Settings > Notifications > Push notifications settings\" once enabled.",
+          "enable_description_mobile": "You can also access the settings using the navigation menu under \"Settings > Notifications > Push notification settings\".",
           "enable_description_settings": "To receive notifications when Elk is not open, enable push notifications. You will be able to control precisely what types of interactions generate push notifications on this same screen once you enable them.",
           "enable_desktop": "Enable push notifications",
           "enable_title": "Never miss anything",

locales/en-US.json

@@ -230,7 +230,8 @@
     }
   },
   "search": {
-    "search_desc": "Search for people & hashtags"
+    "search_desc": "Search for people & hashtags",
+    "search_empty": "Could not find anything for these search terms"
   },
   "settings": {
     "about": {
@@ -296,12 +297,15 @@
           "request_error": "An error occurred while requesting the subscription, try again and if the error persists, please report the issue to the Elk repository.",
           "title": "Could not subscribe to push notifications"
         },
+        "title": "Push notifications settings",
         "undo_settings": "Undo changes",
         "unsubscribe": "Disable push notifications",
         "unsupported": "Your browser does not support push notifications.",
         "warning": {
           "enable_close": "Close",
           "enable_description": "To receive notifications when Elk is not open, enable push notifications. You can control precisely what types of interactions generate push notifications via the \"@:settings.notifications.show_btn{'\"'} button above once enabled.",
+          "enable_description_desktop": "To receive notifications when Elk is not open, enable push notifications. You can control precisely what types of interactions generate push notifications in \"Settings > Notifications > Push notifications settings\" once enabled.",
+          "enable_description_mobile": "You can also access the settings using the navigation menu \"Settings > Notifications > Push notification settings\".",
           "enable_description_settings": "To receive notifications when Elk is not open, enable push notifications. You will be able to control precisely what types of interactions generate push notifications on this same screen once you enable them.",
           "enable_desktop": "Enable push notifications",
           "enable_title": "Never miss anything",
@@ -368,6 +372,7 @@
     "someone": "someone",
     "spoiler_show_less": "Show less",
     "spoiler_show_more": "Show more",
+    "thread": "Thread",
     "try_original_site": "Try original site"
   },
   "status_history": {

locales/es-ES.json

@@ -42,6 +42,7 @@
     "bookmark": "Añadir marcador",
     "bookmarked": "Guardado como marcador",
     "boost": "Retootear",
+    "boost_count": "{0}",
     "boosted": "Retooteado",
     "clear_upload_failed": "Limpiar errores de subida de archivos",
     "close": "Cerrar",
@@ -50,14 +51,17 @@
     "edit": "Editar",
     "enter_app": "Entrar",
     "favourite": "Favorito",
+    "favourite_count": "{0}",
     "favourited": "Marcado como favorito",
     "more": "Más",
     "next": "Siguiente",
     "prev": "Anterior",
     "publish": "Publicar",
     "reply": "Responder",
+    "reply_count": "{0}",
+    "reset": "Reiniciar",
     "save": "Guardar",
-    "save_changes": "Guardar",
+    "save_changes": "Guardar cambios",
     "sign_in": "Iniciar sesión",
     "switch_account": "Cambiar cuenta",
     "vote": "Votar"
@@ -79,9 +83,14 @@
     "switch_account": "Cambiar a {0}",
     "switch_account_desc": "Cambiar a otra cuenta",
     "toggle_dark_mode": "Cambiar a modo oscuro",
-    "toggle_zen_mode": "Cambiar a modo Zen"
+    "toggle_zen_mode": "Cambiar a modo zen"
   },
   "common": {
+    "confirm_dialog": {
+      "cancel": "No",
+      "confirm": "Si",
+      "title": "¿Estás seguro?"
+    },
     "end_of_list": "Fin",
     "error": "ERROR",
     "in": "en",
@@ -97,9 +106,9 @@
   },
   "error": {
     "account_not_found": "No se encontró la cuenta {0}",
-    "explore-list-empty": "Nada es tendencia en este momento. ¡Vuelva más tarde!",
+    "explore-list-empty": "No hay tendencias en este momento. ¡Vuelve más tarde!",
-    "file_size_cannot_exceed_n_mb": "El tamaño del fichero no puede exceder los {0}MB",
+    "file_size_cannot_exceed_n_mb": "El tamaño del archivo no puede exceder los {0}MB",
-    "sign_in_error": "No se ha podido conectar con el servidor.",
+    "sign_in_error": "No se pudo conectar con el servidor.",
     "status_not_found": "Estado no encontrado",
     "unsupported_file_format": "Tipo de archivo no soportado"
   },
@@ -123,14 +132,22 @@
     "copy_link_to_post": "Copiar enlace",
     "delete": "Borrar",
     "delete_and_redraft": "Borrar y volver a borrador",
-    "direct_message_account": "Mensaje Directo a {0}",
+    "delete_confirm": {
+      "cancel": "Cancelar",
+      "confirm": "Borrar",
+      "title": "¿Estás seguro que deseas eliminar esta publicación?"
+    },
+    "direct_message_account": "Mensaje directo a {0}",
     "edit": "Editar",
+    "hide_reblogs": "Ocultar retoots de {0}",
     "mention_account": "Mencionar a {0}",
     "mute_account": "Silenciar a {0}",
     "mute_conversation": "Silenciar publicación",
     "open_in_original_site": "Abrir página original",
     "pin_on_profile": "Fijar en tu perfil",
     "share_post": "Compartir esta publicación",
+    "show_favourited_and_boosted_by": "Mostrar quien marcó como favorito y quien retooteó",
+    "show_reblogs": "Mostrar retoots de {0}",
     "show_untranslated": "Mostrar original",
     "toggle_theme": {
       "dark": "Cambiar a modo oscuro",
@@ -144,6 +161,9 @@
     "unpin_on_profile": "Desfijar del perfil"
   },
   "nav": {
+    "back": "Regresar",
+    "blocked_domains": "Dominios bloqueados",
+    "blocked_users": "Usuarios bloqueados",
     "bookmarks": "Marcadores",
     "built_at": "Compilado {0}",
     "conversations": "Conversaciones",
@@ -152,6 +172,7 @@
     "federated": "Federados",
     "home": "Inicio",
     "local": "Local",
+    "muted_users": "Usuarios silenciados",
     "notifications": "Notificaciones",
     "profile": "Perfil",
     "search": "Buscar",
@@ -184,27 +205,50 @@
     "dismiss": "Descartar",
     "title": "Nueva versión de Elk disponible",
     "update": "Actualizar",
-    "update_available_short": "Actualiza Elk"
+    "update_available_short": "Actualiza Elk",
+    "webmanifest": {
+      "canary": {
+        "description": "Un cliente web ágil para Mastodon (canary)",
+        "name": "Elk (canary)",
+        "short_name": "Elk (canary)"
+      },
+      "dev": {
+        "description": "Un cliente web ágil para Mastodon (desarrollo)",
+        "name": "Elk (desarrollo)",
+        "short_name": "Elk (desarrollo)"
+      },
+      "preview": {
+        "description": "Un cliente web ágil para Mastodon (vista previa)",
+        "name": "Elk (vista previa)",
+        "short_name": "Elk (vista previa)"
+      },
+      "release": {
+        "description": "Un cliente web ágil para Mastodon",
+        "name": "Elk",
+        "short_name": "Elk"
+      }
+    }
   },
   "search": {
-    "search_desc": "Buscar personas y etiquetas"
+    "search_desc": "Buscar personas y etiquetas",
+    "search_empty": "No se pudo encontrar nada para estos términos de búsqueda"
   },
   "settings": {
     "about": {
       "label": "Acerca de"
     },
     "account_settings": {
-      "description": "Edita tus ajustes de la cuenta en la interfaz de Mastodon",
+      "description": "Edita los ajustes de tu cuenta en la interfaz de Mastodon",
-      "label": "Ajustes de la cuenta"
+      "label": "Ajustes de cuenta"
     },
     "feature_flags": {
       "github_cards": "Tarjetas GitHub",
-      "title": "Características experimentales",
+      "title": "Funcionalidades experimentales",
       "user_picker": "Selector de usuarios",
       "virtual_scroll": "Desplazamiento virtual"
     },
     "interface": {
-      "color_mode": "Modos de color",
+      "color_mode": "Modo Color",
       "dark_mode": "Modo Oscuro",
       "default": " (por defecto)",
       "font_size": "Tamaño de Letra",
@@ -219,13 +263,13 @@
       }
     },
     "language": {
-      "display_language": "Idioma de la pantalla",
+      "display_language": "Idioma de pantalla",
       "label": "Idioma"
     },
     "notifications": {
       "label": "Notificaciones",
       "notifications": {
-        "label": "Ajustes de las notificaciones"
+        "label": "Ajustes de notificaciones"
       },
       "push_notifications": {
         "alerts": {
@@ -236,9 +280,9 @@
           "reblog": "Retooteo de tus publicaciones",
           "title": "¿Qué notificaciones recibir?"
         },
-        "description": "Reciba notificaciones incluso cuando no esté utilizando Elk.",
+        "description": "Reciba notificaciones incluso cuando no estés utilizando Elk.",
-        "instructions": "¡No olvide guardar los cambios utilizando el botón @:settings.notifications.push_notifications.save_settings{'!'}",
+        "instructions": "¡No olvides guardar los cambios utilizando el botón @:settings.notifications.push_notifications.save_settings{'!'}",
-        "label": "Ajustes de las notificaciones push",
+        "label": "Ajustes de notificaciones push",
         "policy": {
           "all": "De cualquier persona",
           "followed": "De personas que sigo",
@@ -249,8 +293,8 @@
         "save_settings": "Guardar cambios",
         "subscription_error": {
           "clear_error": "Limpiar error",
-          "permission_denied": "Permiso denegado: habilite las notificaciones en su navegador.",
+          "permission_denied": "Permiso denegado: habilita las notificaciones en tu navegador.",
-          "request_error": "Se produjo un error al solicitar la suscripción, inténtalo de nuevo y si el error persiste, notifique la incidencia en el repositorio de Elk.",
+          "request_error": "Se produjo un error al solicitar la suscripción, inténtalo de nuevo y si el error persiste, notifica la incidencia en el repositorio de Elk.",
           "title": "No se pudo suscribir a las notificaciones push"
         },
         "title": "Ajustes de notificaciones push",
@@ -259,14 +303,16 @@
         "unsupported": "Tu navegador no soporta notificaciones push.",
         "warning": {
           "enable_close": "Cerrar",
-          "enable_description": "Para recibir notificaciones cuando Elk no esté abierto, habilite las notificaciones push. Puedes controlar con precisión qué tipos de interacciones generan notificaciones push a través del botón \"@:settings.notifications.show_btn{'\"'} de arriba una vez que estén habilitadas.",
+          "enable_description": "Para recibir notificaciones cuando Elk no esté abierto, habilita las notificaciones push. Puedes controlar con precisión qué tipos de interacciones generan notificaciones push a través del botón \"@:settings.notifications.show_btn{'\"'} de arriba una vez que estén habilitadas.",
-          "enable_description_settings": "Para recibir notificaciones cuando Elk no esté abierto, habilite las notificaciones push. Podrás controlar con precisión qué tipos de interacciones generan notificaciones push en esta misma pantalla una vez las habilite.",
+          "enable_description_desktop": "Para recibir notificaciones cuando Elk no esté abierto, habilite las notificaciones push. Puedes controlar con precisión qué tipos de interacciones generan notificaciones push en el menú de navegación en \"Ajustes > Notificaciones > Ajustes de notificaciones push\" una vez que estén habilitadas.",
+          "enable_description_mobile": "También podrá acceder a la configuración utilizando el menú de navegación en \"Ajustes > Notificaciones > Ajutes de notificaciones push\".",
+          "enable_description_settings": "Para recibir notificaciones cuando Elk no esté abierto, habilita las notificaciones push. Podrás controlar con precisión qué tipos de interacciones generan notificaciones push en esta misma pantalla una vez las habilites.",
           "enable_desktop": "Habilitar notificaciones push",
           "enable_title": "Nunca te pierdas nada",
-          "re_auth": "Parace que su servidor no soporta notificaciones push. Pruebe a cerrar la sesión y volver a iniciarla, si este mensaje sigue apareciendo contacte con el administrador de su servidor."
+          "re_auth": "Parece que tu servidor no soporta notificaciones push. Prueba a cerrar la sesión y volver a iniciarla, si este mensaje sigue apareciendo contacta con el administrador de tu servidor."
         }
       },
-      "show_btn": "Ir a ajustes de las notificaciones"
+      "show_btn": "Ir a ajustes de notificaciones"
     },
     "notifications_settings": "Notificaciones",
     "preferences": {
@@ -278,12 +324,12 @@
         "description": "Editar avatar, nombre de usuario, perfil, etc.",
         "display_name": "Nombre a mostrar",
         "label": "Apariencia",
-        "profile_metadata": "Metadatos del perfil",
+        "profile_metadata": "Metadatos de perfil",
-        "profile_metadata_desc": "Puede mostrar hasta 4 elementos en forma de tabla en su perfil",
+        "profile_metadata_desc": "Puede mostrar hasta 4 elementos en forma de tabla en tu perfil",
         "title": "Editar perfil"
       },
       "featured_tags": {
-        "description": "Las personas pueden navegar por sus publicaciones públicas con estos hashtags.",
+        "description": "Las personas pueden navegar por tus publicaciones públicas con estas hashtags.",
         "label": "Hashtags destacados"
       },
       "label": "Perfil"
@@ -305,7 +351,9 @@
     "uploading": "Subiendo..."
   },
   "status": {
-    "edited": "Modificado {0}",
+    "boosted_by": "Retooteado por",
+    "edited": "Editado {0}",
+    "favourited_by": "Marcado como favorito por",
     "filter_hidden_phrase": "Filtrado por",
     "filter_removed_phrase": "Eliminado por filtrado",
     "filter_show_anyway": "Mostrar de todas formas",
@@ -320,6 +368,7 @@
     },
     "reblogged": "{0} retooteó",
     "replying_to": "Respondiendo a {0}",
+    "show_full_thread": "Mostrar hilo completo",
     "someone": "alguien",
     "spoiler_show_less": "Mostrar menos",
     "spoiler_show_more": "Mostrar más",
@@ -332,7 +381,7 @@
   },
   "tab": {
     "for_you": "Para ti",
-    "hashtags": "Etiquetas",
+    "hashtags": "Hashtags",
     "media": "Multimedia",
     "news": "Noticias",
     "notifications_all": "Todas",
@@ -388,6 +437,7 @@
   "tooltip": {
     "add_content_warning": "Añadir advertencia de contenido",
     "add_media": "Añadir imágenes, video o audio",
+    "add_publishable_content": "Agregar contenido a publicar",
     "change_content_visibility": "Cambiar visibilidad de contenido",
     "change_language": "Cambiar idioma",
     "emoji": "Emoji",

locales/fr-FR.json

@@ -209,7 +209,8 @@
     }
   },
   "search": {
-    "search_desc": "Recherche de personnes & hashtags"
+    "search_desc": "Recherche de personnes & hashtags",
+    "search_empty": "Aucun résultat avec ces mots-clefs"
   },
   "settings": {
     "about": {

locales/nl-NL.json

@@ -187,7 +187,8 @@
     "update_available_short": "Update Elk"
   },
   "search": {
-    "search_desc": "Zoek naar mensen & hashtags"
+    "search_desc": "Zoek naar mensen & hashtags",
+    "search_empty": "Deze zoektermen leveren geen resultaat op"
   },
   "settings": {
     "about": {

locales/uk-UA.json

@@ -205,7 +205,8 @@
     "update_available_short": "Оновити Elk"
   },
   "search": {
-    "search_desc": "Пошук користувачів та хештеґів"
+    "search_desc": "Пошук користувачів та хештеґів",
+    "search_empty": "Не вдалося знайти нічого, що відповідає цим пошуковим термінам"
   },
   "settings": {
     "about": {

locales/zh-CN.json

@@ -203,7 +203,8 @@
     }
   },
   "search": {
-    "search_desc": "搜索用户或话题标签"
+    "search_desc": "搜索用户或话题标签",
+    "search_empty": "无法找到符合这些搜索词的任何内容"
   },
   "settings": {
     "about": {

locales/zh-TW.json

@@ -178,7 +178,8 @@
     "update_available_short": "更新鹿鳴"
   },
   "search": {
-    "search_desc": "搜索用戶或話題標籤"
+    "search_desc": "搜索用戶或話題標籤",
+    "search_empty": "無法找到符合搜尋條件之結果"
   },
   "settings": {
     "about": {

pages/settings/notifications/index.vue

@@ -7,7 +7,7 @@ const { t } = useI18n()
 const pwaEnabled = useRuntimeConfig().public.pwaEnabled
 
 useHeadFixed({
-  title: () => `${t('settings.notifications.notifications.label')} | ${t('nav.settings')}`,
+  title: () => `${t('settings.notifications.label')} | ${t('nav.settings')}`,
 })
 </script>
 
@@ -15,7 +15,7 @@ useHeadFixed({
   <MainContent back-on-small-screen>
     <template #title>
       <div text-lg font-bold flex items-center gap-2 @click="$scrollToTop">
-        <span>{{ $t('settings.notifications.notifications.label') }}</span>
+        <span>{{ $t('settings.notifications.label') }}</span>
       </div>
     </template>
 

public-dev/logo.svg

@@ -1,11 +1 @@
-<svg width="250" height="250" viewBox="0 0 250 250" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg xmlns="http://www.w3.org/2000/svg" width="250" height="250" fill="none"><mask id="a" width="240" height="234" x="4" y="1" maskUnits="userSpaceOnUse" style="mask-type:alpha"><path fill="#D9D9D9" d="M244 123c0 64.617-38.383 112-103 112-64.617 0-103-30.883-103-95.5C38 111.194-8.729 36.236 8 16 29.46-9.959 88.689 6 125 6c64.617 0 119 52.383 119 117Z"/></mask><g mask="url(#a)"><path fill="#91BA4D" d="M116.94 88.1c-13.344 1.552-20.436-2.019-24.706 10.71 0 0 14.336 21.655 52.54 21.112-2.135 8.848-1.144 15.368-1.144 23.207 0 26.079-20.589 48.821-65.961 48.821-23.03 0-51.015 4.191-72.367 15.911-15.175 8.305-27.048 20.336-32.302 37.023l5.956 8.461 11.4.155v47.889l-13.91 21.966L-19.556 387h13.192l1.144-51.227c6.558-3.881 21.58-13.971 34.391-29.494 17.386-20.879 30.731-51.227 15.022-88.793l11.744-5.045c12.887 30.813 8.388 57.514-2.898 79.013 21.58-.698 40.11-2.095 55.819-4.734l-3.584-43.698 12.659-1.087L129.98 387h13.116l2.212-94.459c10.447-4.502 34.239-21.034 45.372-78.47 1.372-6.986 2.135-12.885 2.516-17.93 1.754-12.806 2.745-27.243 3.051-43.698l-18.683-5.976h57.42l5.567-12.807c-5.414.233-11.896-2.639-11.896-2.639l1.297-6.209H242l-65.199-34.384c-7.244 2.794-14.87 6.442-20.208 10.866-4.27-3.105-19.063-12.807-39.653-13.195Z"/><path fill="#20461A" d="M6.217 24.493 18.494 21c5.948 21.577 13.345 33.375 22.648 39.352 8.388 5.099 19.75 5.239 31.799 4.579-3.508-1.164-6.787-2.794-9.837-5.045-6.787-5.045-12.582-13.428-16.929-28.64l12.201-3.649c3.279 11.488 7.092 18.085 12.201 21.888 5.11 3.726 11.286 4.657 18.606 5.433 13.726 1.553 30.884 2.174 52.312 12.264 2.898 1.086 5.872 2.483 8.769 4.036-.381-.776-.762-1.553-1.296-2.406-3.66-5.822-10.828-11.953-24.097-16.92l4.27-12.109c21.581 7.917 30.121 19.171 33.553 28.097 3.965 10.168 1.525 18.124 1.525 18.124-3.05 1.009-6.1 2.406-9.608 3.492-6.634-4.579-12.887-8.033-18.835-10.75-21.962-8.304-43.466-2.638-62.53-.853-14.336 1.32-27.452.698-38.814-6.598-11.21-7.14-21.047-20.8-28.215-46.802Z"/><path fill="#20461A" d="M90.098 45.294c-2.516-5.744-4.041-12.807-3.355-21.5l12.659.932c-.763 10.555 2.897 17.696 7.015 22.353-5.338-.931-10.447-1.04-16.319-1.785ZM170.167 43.974l8.312-9.702c21.58 19.094 8.159 46.415 8.159 46.415l-11.819-1.32c-.382-6.24-1.144-17.836-6.635-24.371 3.584 1.84 6.635 3.865 9.99 6.908 0-5.666-1.754-12.341-8.007-17.93Z"/></g></svg>
-<mask id="mask0_107_22" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="4" y="1" width="240" height="234">
-<path d="M244 123C244 187.617 205.617 235 141 235C76.3827 235 38 204.117 38 139.5C38 111.194 -8.72891 36.2357 8.00002 16C29.4601 -9.9586 88.6887 5.99994 125 5.99994C189.617 5.99994 244 58.3827 244 123Z" fill="#D9D9D9"/>
-</mask>
-<g mask="url(#mask0_107_22)">
-<path d="M116.94 88.0994C103.596 89.6517 96.5039 86.0813 92.2336 98.8104C92.2336 98.8104 106.57 120.465 144.774 119.922C142.639 128.77 143.63 135.29 143.63 143.129C143.63 169.208 123.041 191.95 77.6687 191.95C54.6395 191.95 26.6536 196.141 5.30196 207.861C-9.87294 216.166 -21.746 228.197 -27 244.884L-21.0444 253.345L-9.64418 253.5V301.389L-23.5532 323.355L-19.5574 387H-6.36518L-5.22134 335.773C1.33666 331.892 16.3591 321.802 29.17 306.279C46.5564 285.4 59.9011 255.052 44.1924 217.486L55.9358 212.441C68.823 243.254 64.324 269.955 53.0381 291.454C74.6185 290.756 93.1486 289.359 108.857 286.72L105.273 243.022L117.932 241.935L129.98 387H143.096L145.308 292.541C155.755 288.039 179.547 271.507 190.68 214.071C192.052 207.085 192.815 201.186 193.196 196.141C194.95 183.335 195.941 168.898 196.247 152.443L177.564 146.467H234.984L240.551 133.66C235.137 133.893 228.655 131.021 228.655 131.021L229.952 124.812H242L176.801 90.4279C169.557 93.222 161.931 96.87 156.593 101.294C152.323 98.1895 137.53 88.4874 116.94 88.0994Z" fill="#91BA4D"/>
-<path d="M6.21704 24.4927L18.4942 21C24.4422 42.5773 31.839 54.375 41.1422 60.3515C49.5303 65.4509 60.8925 65.5906 72.9409 64.9309C69.4331 63.7666 66.1541 62.1367 63.1039 59.8858C56.3171 54.8407 50.5217 46.4582 46.1751 31.2454L58.376 27.5974C61.655 39.0846 65.4678 45.682 70.577 49.4852C75.6861 53.2108 81.8628 54.1422 89.1834 54.9184C102.909 56.4707 120.067 57.0916 141.495 67.1817C144.393 68.2684 147.367 69.6655 150.264 71.2178C149.883 70.4416 149.502 69.6655 148.968 68.8117C145.308 62.9904 138.14 56.8588 124.871 51.8913L129.141 39.7832C150.722 47.7 159.262 58.9544 162.694 67.8803C166.659 78.048 164.219 86.0037 164.219 86.0037C161.169 87.0127 158.119 88.4098 154.611 89.4964C147.977 84.9171 141.724 81.4631 135.776 78.7466C113.814 70.4416 92.3099 76.1076 73.2459 77.8928C58.9098 79.2123 45.7938 78.5913 34.4317 71.2954C23.2221 64.1547 13.3851 50.4942 6.21704 24.4927Z" fill="#20461A"/>
-<path d="M90.0984 45.2939C87.582 39.5503 86.0569 32.4872 86.7432 23.7942L99.4016 24.7256C98.6391 35.2814 102.299 42.4221 106.417 47.0791C101.079 46.1477 95.9701 46.039 90.0984 45.2939Z" fill="#20461A"/>
-<path d="M170.167 43.9744L178.479 34.2724C200.059 53.366 186.638 80.687 186.638 80.687L174.819 79.3675C174.437 73.1271 173.675 61.5313 168.184 54.996C171.768 56.8355 174.819 58.8613 178.174 61.9038C178.174 56.2378 176.42 49.5628 170.167 43.9744Z" fill="#20461A"/>
-</g>
-</svg>

public-staging/logo.svg

@@ -1,11 +1 @@
-<svg width="250" height="250" viewBox="0 0 250 250" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg xmlns="http://www.w3.org/2000/svg" width="250" height="250" fill="none"><mask id="a" width="240" height="234" x="4" y="1" maskUnits="userSpaceOnUse" style="mask-type:alpha"><path fill="#D9D9D9" d="M244 123c0 64.617-38.383 112-103 112-64.617 0-103-30.883-103-95.5C38 111.194-8.729 36.236 8 16 29.46-9.959 88.689 6 125 6c64.617 0 119 52.383 119 117Z"/></mask><g mask="url(#a)"><path fill="#5AB1CC" d="M116.94 88.1c-13.344 1.552-20.436-2.019-24.706 10.71 0 0 14.336 21.655 52.54 21.112-2.135 8.848-1.144 15.368-1.144 23.207 0 26.079-20.589 48.821-65.961 48.821-23.03 0-51.015 4.191-72.367 15.911-15.175 8.305-27.048 20.336-32.302 37.023l5.956 8.461 11.4.155v47.889l-13.91 21.966L-19.556 387h13.192l1.144-51.227c6.558-3.881 21.58-13.971 34.391-29.494 17.386-20.879 30.731-51.227 15.022-88.793l11.744-5.045c12.887 30.813 8.388 57.514-2.898 79.013 21.58-.698 40.11-2.095 55.819-4.734l-3.584-43.698 12.659-1.087L129.98 387h13.116l2.212-94.459c10.447-4.502 34.239-21.034 45.372-78.47 1.372-6.986 2.135-12.885 2.516-17.93 1.754-12.806 2.745-27.243 3.051-43.698l-18.683-5.976h57.42l5.567-12.807c-5.414.233-11.896-2.639-11.896-2.639l1.297-6.209H242l-65.199-34.384c-7.244 2.794-14.87 6.442-20.208 10.866-4.27-3.105-19.063-12.807-39.653-13.195Z"/><path fill="#1E4E5E" d="M6.217 24.493 18.494 21c5.948 21.577 13.345 33.375 22.648 39.352 8.388 5.099 19.75 5.239 31.799 4.579-3.508-1.164-6.787-2.794-9.837-5.045-6.787-5.045-12.582-13.428-16.929-28.64l12.201-3.649c3.279 11.488 7.092 18.085 12.201 21.888 5.11 3.726 11.286 4.657 18.606 5.433 13.726 1.553 30.884 2.174 52.312 12.264 2.898 1.086 5.872 2.483 8.769 4.036-.381-.776-.762-1.553-1.296-2.406-3.66-5.822-10.828-11.953-24.097-16.92l4.27-12.109c21.581 7.917 30.121 19.171 33.553 28.097 3.965 10.168 1.525 18.124 1.525 18.124-3.05 1.009-6.1 2.406-9.608 3.492-6.634-4.579-12.887-8.033-18.835-10.75-21.962-8.304-43.466-2.638-62.53-.853-14.336 1.32-27.452.698-38.814-6.598-11.21-7.14-21.047-20.8-28.215-46.802Z"/><path fill="#1E4E5E" d="M90.098 45.294c-2.516-5.744-4.041-12.807-3.355-21.5l12.659.932c-.763 10.555 2.897 17.696 7.015 22.353-5.338-.931-10.447-1.04-16.319-1.785ZM170.167 43.974l8.312-9.702c21.58 19.094 8.159 46.415 8.159 46.415l-11.819-1.32c-.382-6.24-1.144-17.836-6.635-24.371 3.584 1.84 6.635 3.865 9.99 6.908 0-5.666-1.754-12.341-8.007-17.93Z"/></g></svg>
-    <mask id="mask0_13_22" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="4" y="1" width="240" height="234">
-        <path d="M244 123C244 187.617 205.617 235 141 235C76.3827 235 38 204.117 38 139.5C38 111.194 -8.72891 36.2356 8.00002 16C29.4601 -9.9586 88.6887 5.99994 125 5.99994C189.617 5.99994 244 58.3827 244 123Z" fill="#D9D9D9"/>
-    </mask>
-    <g mask="url(#mask0_13_22)">
-        <path d="M116.94 88.0994C103.596 89.6517 96.5039 86.0813 92.2336 98.8104C92.2336 98.8104 106.57 120.465 144.774 119.922C142.639 128.77 143.63 135.29 143.63 143.129C143.63 169.208 123.041 191.95 77.6687 191.95C54.6395 191.95 26.6536 196.141 5.30196 207.861C-9.87294 216.166 -21.746 228.197 -27 244.884L-21.0444 253.345L-9.64418 253.5V301.389L-23.5532 323.355L-19.5574 387H-6.36518L-5.22134 335.773C1.33666 331.892 16.3591 321.802 29.17 306.279C46.5564 285.4 59.9011 255.052 44.1924 217.486L55.9358 212.441C68.823 243.254 64.324 269.955 53.0381 291.454C74.6185 290.756 93.1486 289.359 108.857 286.72L105.273 243.022L117.932 241.935L129.98 387H143.096L145.308 292.541C155.755 288.039 179.547 271.507 190.68 214.071C192.052 207.085 192.815 201.186 193.196 196.141C194.95 183.335 195.941 168.898 196.247 152.443L177.564 146.467H234.984L240.551 133.66C235.137 133.893 228.655 131.021 228.655 131.021L229.952 124.812H242L176.801 90.4279C169.557 93.222 161.931 96.87 156.593 101.294C152.323 98.1895 137.53 88.4874 116.94 88.0994Z" fill="#5AB1CC"/>
-        <path d="M6.21704 24.4927L18.4942 21C24.4422 42.5773 31.839 54.375 41.1422 60.3515C49.5303 65.4509 60.8925 65.5906 72.9409 64.9309C69.4331 63.7666 66.1541 62.1367 63.1039 59.8858C56.3171 54.8407 50.5217 46.4582 46.1751 31.2454L58.376 27.5974C61.655 39.0846 65.4678 45.682 70.577 49.4852C75.6861 53.2108 81.8628 54.1422 89.1834 54.9184C102.909 56.4707 120.067 57.0916 141.495 67.1817C144.393 68.2684 147.367 69.6655 150.264 71.2178C149.883 70.4416 149.502 69.6655 148.968 68.8117C145.308 62.9904 138.14 56.8588 124.871 51.8913L129.141 39.7832C150.722 47.7 159.262 58.9544 162.694 67.8803C166.659 78.048 164.219 86.0037 164.219 86.0037C161.169 87.0127 158.119 88.4098 154.611 89.4964C147.977 84.9171 141.724 81.4631 135.776 78.7466C113.814 70.4416 92.3099 76.1076 73.2459 77.8928C58.9098 79.2123 45.7938 78.5913 34.4317 71.2954C23.2221 64.1547 13.3851 50.4942 6.21704 24.4927Z" fill="#1E4E5E"/>
-        <path d="M90.0984 45.2939C87.582 39.5503 86.0569 32.4872 86.7432 23.7942L99.4016 24.7256C98.6391 35.2814 102.299 42.4221 106.417 47.0791C101.079 46.1477 95.9701 46.039 90.0984 45.2939Z" fill="#1E4E5E"/>
-        <path d="M170.167 43.9744L178.479 34.2724C200.059 53.366 186.638 80.687 186.638 80.687L174.819 79.3675C174.437 73.1271 173.675 61.5313 168.184 54.996C171.768 56.8355 174.819 58.8613 178.174 61.9038C178.174 56.2378 176.42 49.5628 170.167 43.9744Z" fill="#1E4E5E"/>
-    </g>
-</svg>

public/logo.svg

@@ -1,11 +1 @@
-<svg width="250" height="250" viewBox="0 0 250 250" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg xmlns="http://www.w3.org/2000/svg" width="250" height="250" fill="none"><mask id="a" width="240" height="234" x="4" y="1" maskUnits="userSpaceOnUse" style="mask-type:alpha"><path fill="#D9D9D9" d="M244 123c0 64.617-38.383 112-103 112-64.617 0-103-30.883-103-95.5C38 111.194-8.729 36.236 8 16 29.46-9.959 88.689 6 125 6c64.617 0 119 52.383 119 117Z"/></mask><g mask="url(#a)"><path fill="#EA9E44" d="M116.94 88.1c-13.344 1.552-20.436-2.019-24.706 10.71 0 0 14.336 21.655 52.54 21.112-2.135 8.848-1.144 15.368-1.144 23.207 0 26.079-20.589 48.821-65.961 48.821-23.03 0-51.015 4.191-72.367 15.911-15.175 8.305-27.048 20.336-32.302 37.023l5.956 8.461 11.4.155v47.889l-13.91 21.966L-19.556 387h13.192l1.144-51.227c6.558-3.881 21.58-13.971 34.391-29.494 17.386-20.879 30.731-51.227 15.022-88.793l11.744-5.045c12.887 30.814 8.388 57.514-2.898 79.013 21.58-.698 40.11-2.095 55.819-4.734l-3.584-43.698 12.659-1.087L129.98 387h13.116l2.212-94.459c10.447-4.502 34.239-21.034 45.372-78.47 1.372-6.986 2.135-12.885 2.516-17.93 1.754-12.806 2.745-27.243 3.051-43.698l-18.683-5.976h57.42l5.567-12.807c-5.414.233-11.896-2.639-11.896-2.639l1.297-6.209H242l-65.199-34.384c-7.244 2.794-14.87 6.442-20.208 10.866-4.27-3.105-19.063-12.807-39.653-13.195Z"/><path fill="#C16929" d="M6.217 24.493 18.494 21c5.948 21.577 13.345 33.375 22.648 39.352 8.388 5.099 19.75 5.239 31.799 4.579-3.508-1.164-6.787-2.794-9.837-5.045-6.787-5.045-12.582-13.428-16.929-28.64l12.201-3.649c3.279 11.488 7.092 18.085 12.201 21.888 5.11 3.726 11.286 4.657 18.606 5.433 13.726 1.553 30.884 2.174 52.312 12.264 2.898 1.086 5.872 2.483 8.769 4.036-.381-.776-.762-1.553-1.296-2.406-3.66-5.822-10.828-11.953-24.097-16.92l4.27-12.109c21.581 7.917 30.121 19.171 33.553 28.097 3.965 10.168 1.525 18.124 1.525 18.124-3.05 1.009-6.1 2.406-9.608 3.492-6.634-4.579-12.887-8.033-18.835-10.75-21.962-8.304-43.466-2.638-62.53-.853-14.336 1.32-27.452.698-38.814-6.598-11.21-7.14-21.047-20.8-28.215-46.802Z"/><path fill="#C16929" d="M90.098 45.294c-2.516-5.744-4.041-12.807-3.355-21.5l12.659.932c-.763 10.555 2.897 17.696 7.015 22.353-5.338-.931-10.447-1.04-16.319-1.785ZM170.167 43.974l8.312-9.702c21.58 19.094 8.159 46.415 8.159 46.415l-11.819-1.32c-.382-6.24-1.144-17.836-6.635-24.371 3.584 1.84 6.635 3.865 9.99 6.908 0-5.666-1.754-12.341-8.007-17.93Z"/></g></svg>
-    <mask id="mask0_6_40" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="4" y="1" width="240" height="234">
-        <path d="M244 123C244 187.617 205.617 235 141 235C76.3827 235 38 204.117 38 139.5C38 111.194 -8.72891 36.2356 8.00002 16C29.4601 -9.95861 88.6887 5.99994 125 5.99994C189.617 5.99994 244 58.3827 244 123Z" fill="#D9D9D9"/>
-    </mask>
-    <g mask="url(#mask0_6_40)">
-        <path d="M116.94 88.0994C103.596 89.6517 96.5039 86.0813 92.2336 98.8104C92.2336 98.8104 106.57 120.465 144.774 119.922C142.639 128.77 143.63 135.29 143.63 143.129C143.63 169.208 123.041 191.95 77.6687 191.95C54.6395 191.95 26.6536 196.141 5.30196 207.861C-9.87294 216.166 -21.746 228.197 -27 244.884L-21.0444 253.345L-9.64418 253.5V301.389L-23.5532 323.355L-19.5574 387H-6.36518L-5.22134 335.773C1.33666 331.892 16.3591 321.802 29.17 306.279C46.5564 285.4 59.9011 255.052 44.1924 217.486L55.9358 212.441C68.823 243.255 64.324 269.955 53.0381 291.454C74.6185 290.756 93.1486 289.359 108.857 286.72L105.273 243.022L117.932 241.935L129.98 387H143.096L145.308 292.541C155.755 288.039 179.547 271.507 190.68 214.071C192.052 207.085 192.815 201.186 193.196 196.141C194.95 183.335 195.941 168.898 196.247 152.443L177.564 146.467H234.984L240.551 133.66C235.137 133.893 228.655 131.021 228.655 131.021L229.952 124.812H242L176.801 90.4279C169.557 93.222 161.931 96.87 156.593 101.294C152.323 98.1895 137.53 88.4874 116.94 88.0994Z" fill="#EA9E44"/>
-        <path d="M6.21704 24.4927L18.4942 21C24.4422 42.5773 31.839 54.375 41.1422 60.3515C49.5303 65.4509 60.8925 65.5906 72.9409 64.9309C69.4331 63.7666 66.1541 62.1367 63.1039 59.8858C56.3171 54.8407 50.5217 46.4582 46.1751 31.2454L58.376 27.5974C61.655 39.0846 65.4678 45.682 70.577 49.4852C75.6861 53.2108 81.8628 54.1422 89.1834 54.9184C102.909 56.4707 120.067 57.0916 141.495 67.1817C144.393 68.2684 147.367 69.6655 150.264 71.2178C149.883 70.4416 149.502 69.6655 148.968 68.8117C145.308 62.9904 138.14 56.8588 124.871 51.8913L129.141 39.7832C150.722 47.7 159.262 58.9544 162.694 67.8803C166.659 78.048 164.219 86.0037 164.219 86.0037C161.169 87.0127 158.119 88.4098 154.611 89.4964C147.977 84.9171 141.724 81.4631 135.776 78.7466C113.814 70.4416 92.3099 76.1076 73.2459 77.8928C58.9098 79.2123 45.7938 78.5913 34.4317 71.2954C23.2221 64.1547 13.3851 50.4942 6.21704 24.4927Z" fill="#C16929"/>
-        <path d="M90.0984 45.2939C87.582 39.5503 86.0569 32.4872 86.7432 23.7942L99.4016 24.7256C98.6391 35.2814 102.299 42.4221 106.417 47.0791C101.079 46.1477 95.9701 46.039 90.0984 45.2939Z" fill="#C16929"/>
-        <path d="M170.167 43.9744L178.479 34.2724C200.059 53.366 186.638 80.687 186.638 80.687L174.819 79.3675C174.437 73.1271 173.675 61.5313 168.184 54.996C171.768 56.8355 174.819 58.8613 178.174 61.9038C178.174 56.2378 176.42 49.5628 170.167 43.9744Z" fill="#C16929"/>
-    </g>
-</svg>

server/api/[server]/oauth.ts

@@ -33,6 +33,7 @@ export default defineEventHandler(async (event) => {
       code,
       scope: 'read write follow push',
     },
+    retry: 3,
   })
 
   const url = `/signin/callback?${stringifyQuery({ server, token: result.access_token, vapid_key: app.vapid_key })}`