From 39f9e7b6ad336fd8848e03a539e57f7b0a48fbaa Mon Sep 17 00:00:00 2001
From: Jonas Kruckenberg <iterpre@protonmail.com>
Date: Fri, 13 Jan 2023 09:46:07 +0100
Subject: [PATCH 1/9] chore: reduce bundle size for Tauri target (#1053)

* feat(tauri): improve app size

* reorder modules so tauri can disable pwa

* don't strip the logo
---
 modules/tauri/index.ts | 15 +++++++++++++++
 nuxt.config.ts         |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/modules/tauri/index.ts b/modules/tauri/index.ts
index a0f52fec..eb00a5b8 100644
--- a/modules/tauri/index.ts
+++ b/modules/tauri/index.ts
@@ -1,3 +1,4 @@
+import { rm } from 'fs/promises'
 import { addImports, addPlugin, createResolver, defineNuxtModule, useNuxt } from '@nuxt/kit'
 
 export default defineNuxtModule({
@@ -14,6 +15,9 @@ export default defineNuxtModule({
     if (nuxt.options.dev)
       nuxt.options.ssr = false
 
+    nuxt.options.pwa.disable = true
+    nuxt.options.sourcemap.client = false
+
     nuxt.options.alias = {
       ...nuxt.options.alias,
       'unstorage/drivers/fs': 'unenv/runtime/mock/proxy',
@@ -36,5 +40,16 @@ export default defineNuxtModule({
 
     addPlugin(resolve('./runtime/logging.client'))
     addPlugin(resolve('./runtime/nitro.client'))
+
+    // cleanup files copied from the public folder that we don't need
+    nuxt.hook('close', async () => {
+      await rm('.output/public/_redirects')
+      await rm('.output/public/apple-touch-icon.png')
+      await rm('.output/public/elk-og.png')
+      await rm('.output/public/favicon.ico')
+      await rm('.output/public/pwa-192x192.png')
+      await rm('.output/public/pwa-512x512.png')
+      await rm('.output/public/robots.txt')
+    })
   },
 })
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 525ea5dd..1664bf5e 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -28,8 +28,8 @@ export default defineNuxtConfig({
     '~/modules/purge-comments',
     '~/modules/setup-components',
     '~/modules/build-env',
-    '~/modules/pwa/index', // change to '@vite-pwa/nuxt' once released and remove pwa module
     '~/modules/tauri/index',
+    '~/modules/pwa/index', // change to '@vite-pwa/nuxt' once released and remove pwa module
   ],
   experimental: {
     payloadExtraction: false,

From f78a7cd98d860218c38b84a3ef4f32baeb9f978b Mon Sep 17 00:00:00 2001
From: patak <matias.capeletto@gmail.com>
Date: Fri, 13 Jan 2023 10:03:05 +0100
Subject: [PATCH 2/9] feat: link to github releases from version number in app

---
 components/nav/NavFooter.vue | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/components/nav/NavFooter.vue b/components/nav/NavFooter.vue
index ed8fb042..223a71aa 100644
--- a/components/nav/NavFooter.vue
+++ b/components/nav/NavFooter.vue
@@ -47,8 +47,15 @@ function toggleDark() {
         {{ $t('nav.built_at', [$d(buildTimeDate, 'shortDate')]) }}
       </span>
       &middot;
-      <!-- TODO click version to show changelog -->
-      <span v-if="buildInfo.env === 'release'">v{{ buildInfo.version }}</span>
+      <NuxtLink
+        v-if="buildInfo.env === 'release'"
+        external
+        :href="`https://github.com/elk-zone/elk/releases/tag/v${buildInfo.version}`"
+        target="_blank"
+        font-mono
+      >
+        v{{ buildInfo.version }}
+      </NuxtLink>
       <span v-else>{{ buildInfo.env }}</span>
       <template v-if="buildInfo.commit && buildInfo.branch !== 'release'">
         &middot;

From 3367ba6e302f80294fa48c1e4c4135cd7c4ed471 Mon Sep 17 00:00:00 2001
From: patak <matias.capeletto@gmail.com>
Date: Fri, 13 Jan 2023 10:07:10 +0100
Subject: [PATCH 3/9] fix: revert #1026

This reverts commit 6cb3183c2e5e0828f6f54b9c6dcbf5e52cb2ac07.
---
 components/common/CommonBlurhash.vue | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/components/common/CommonBlurhash.vue b/components/common/CommonBlurhash.vue
index c645b6d3..89624d49 100644
--- a/components/common/CommonBlurhash.vue
+++ b/components/common/CommonBlurhash.vue
@@ -38,19 +38,6 @@ onMounted(() => {
 </script>
 
 <template>
-  <Transition>
-    <img v-if="isLoaded || !placeholderSrc" v-bind="$attrs" :src="src" :srcset="srcset" absolute>
-    <img v-else v-bind="$attrs" :src="placeholderSrc" absolute>
-  </Transition>
-  <img v-bind="$attrs" :src="placeholderSrc" z-0 aria-hidden>
+  <img v-if="isLoaded || !placeholderSrc" v-bind="$attrs" :src="src" :srcset="srcset">
+  <img v-else v-bind="$attrs" :src="placeholderSrc">
 </template>
-
-<style>
-.v-enter-active {
-  transition: opacity 0.3s ease;
-}
-
-.v-enter-from {
-  opacity: 0;
-}
-</style>

From 5c9a21eb9a159c001eb789fb4a64b0dfc2b7cc27 Mon Sep 17 00:00:00 2001
From: Michel EDIGHOFFER <edimitchel@gmail.com>
Date: Fri, 13 Jan 2023 10:23:51 +0100
Subject: [PATCH 4/9] fix: show placeholder on not loaded avatar to void
 showing alt text (#1054)

---
 components/account/AccountAvatar.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/account/AccountAvatar.vue b/components/account/AccountAvatar.vue
index 4a4c50aa..31d39e6c 100644
--- a/components/account/AccountAvatar.vue
+++ b/components/account/AccountAvatar.vue
@@ -15,7 +15,7 @@ const error = $ref(false)
     :key="account.avatar"
     width="400"
     height="400"
-    :src="error ? 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7' : account.avatar"
+    :src="(error || !loaded) ? 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7' : account.avatar"
     :alt="$t('account.avatar_description', [account.username])"
     loading="lazy"
     :class="(loaded ? 'bg-base' : 'bg-gray:10') + (square ? ' ' : ' rounded-full')"

From b51fa37b3406246c415b633840e9d04c26bca752 Mon Sep 17 00:00:00 2001
From: KaKi87 <KaKi87@pm.me>
Date: Fri, 13 Jan 2023 11:24:25 +0100
Subject: [PATCH 5/9] feat(i18n): Update French translations (#1051)

---
 locales/ar-EG.json |  1 -
 locales/de-DE.json |  1 -
 locales/en-US.json |  1 -
 locales/es-ES.json |  1 -
 locales/fr-FR.json | 18 +++++++++++-------
 locales/nl-NL.json |  1 -
 locales/uk-UA.json |  1 -
 locales/zh-CN.json |  1 -
 8 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/locales/ar-EG.json b/locales/ar-EG.json
index 60f7beca..0e28c2af 100644
--- a/locales/ar-EG.json
+++ b/locales/ar-EG.json
@@ -123,7 +123,6 @@
     "title": "Elk في عرض مسبق"
   },
   "language": {
-    "none": "لا شيء",
     "search": "بحث"
   },
   "menu": {
diff --git a/locales/de-DE.json b/locales/de-DE.json
index 6e1c26f6..300c4cae 100644
--- a/locales/de-DE.json
+++ b/locales/de-DE.json
@@ -84,7 +84,6 @@
     "title": "Elk ist in der Alpha!"
   },
   "language": {
-    "none": "Keine",
     "search": "Suche"
   },
   "menu": {
diff --git a/locales/en-US.json b/locales/en-US.json
index 942f46dd..0f157f4b 100644
--- a/locales/en-US.json
+++ b/locales/en-US.json
@@ -123,7 +123,6 @@
     "title": "Elk is in Preview!"
   },
   "language": {
-    "none": "None",
     "search": "Search"
   },
   "menu": {
diff --git a/locales/es-ES.json b/locales/es-ES.json
index be26211a..480df8e7 100644
--- a/locales/es-ES.json
+++ b/locales/es-ES.json
@@ -123,7 +123,6 @@
     "title": "¡Elk está en Vista Previa!"
   },
   "language": {
-    "none": "Ninguno",
     "search": "Buscar"
   },
   "menu": {
diff --git a/locales/fr-FR.json b/locales/fr-FR.json
index 3177aa25..dfdcb639 100644
--- a/locales/fr-FR.json
+++ b/locales/fr-FR.json
@@ -161,7 +161,7 @@
     "blocked_domains": "Domaines bloqués",
     "blocked_users": "Utilisateur·ice·s bloqué·e·s",
     "bookmarks": "Marque-pages",
-    "built_at": "Dernier build {0}",
+    "built_at": "Dernière compilation {0}",
     "conversations": "Conversations",
     "explore": "Explorer",
     "favourites": "Appréciés",
@@ -232,7 +232,13 @@
   "settings": {
     "about": {
       "label": "À propos",
-      "meet_the_team": "Rencontrez l'équipe"
+      "meet_the_team": "Rencontrez l'équipe",
+      "sponsor_action": "Soutenez-nous",
+      "sponsor_action_desc": "Pour financer l'équipe développant Elk",
+      "sponsors": "Donateur·ice·s",
+      "sponsors_body_1": "Elk existe grâce au généreux soutien de :",
+      "sponsors_body_2": "Et toutes les personnes et sociétés soutenant l'équipe Elk et ses membres.",
+      "sponsors_body_3": "Si vous appréciez l'application, envisagez de nous soutenir :"
     },
     "account_settings": {
       "description": "Modifiez les paramètres de votre compte dans l'interface de Mastodon",
@@ -257,7 +263,8 @@
         "sm": "Petite",
         "xl": "Très grande",
         "xs": "Très petite"
-      }
+      },
+      "system_mode": "Système"
     },
     "language": {
       "display_language": "Langue d'affichage",
@@ -266,10 +273,7 @@
     "notifications": {
       "label": "Notifications",
       "notifications": {
-        "label": "Paramètres des notifications",
-        "notifications": {
-          "label": "sqds"
-        }
+        "label": "Paramètres des notifications"
       },
       "push_notifications": {
         "alerts": {
diff --git a/locales/nl-NL.json b/locales/nl-NL.json
index a2ec9c36..245d9bca 100644
--- a/locales/nl-NL.json
+++ b/locales/nl-NL.json
@@ -114,7 +114,6 @@
     "title": "Elk is in Preview!"
   },
   "language": {
-    "none": "Niets",
     "search": "Opzoeken"
   },
   "menu": {
diff --git a/locales/uk-UA.json b/locales/uk-UA.json
index b642ba5d..a558ea44 100644
--- a/locales/uk-UA.json
+++ b/locales/uk-UA.json
@@ -123,7 +123,6 @@
     "title": "Elk у попередньому перегляді!"
   },
   "language": {
-    "none": "Жодного",
     "search": "Пошук"
   },
   "menu": {
diff --git a/locales/zh-CN.json b/locales/zh-CN.json
index da255f02..43f02ac7 100644
--- a/locales/zh-CN.json
+++ b/locales/zh-CN.json
@@ -120,7 +120,6 @@
     "title": "预览鹿鸣！"
   },
   "language": {
-    "none": "无",
     "search": "搜索"
   },
   "menu": {

From 0b120e8b429ed4b67e654659a8efe7479058c5b6 Mon Sep 17 00:00:00 2001
From: Tom Sherman <the.tomsherman@gmail.com>
Date: Fri, 13 Jan 2023 10:31:16 +0000
Subject: [PATCH 6/9] fix: handle undefined `._` property on
 `useUserLocalStorage` (#1060)

Fixes https://github.com/elk-zone/elk/issues/1056
---
 composables/users.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composables/users.ts b/composables/users.ts
index 6bad13b8..9eebfc58 100644
--- a/composables/users.ts
+++ b/composables/users.ts
@@ -292,7 +292,7 @@ export function clearUserLocalStorage(account?: mastodon.v1.Account) {
 
   const id = `${account.acct}@${currentInstance.value?.uri || currentServer.value}`
   // @ts-expect-error bind value to the function
-  ;(useUserLocalStorage._ as Map<string, Ref<Record<string, any>>>).forEach((storage) => {
+  ;(useUserLocalStorage._ as Map<string, Ref<Record<string, any>>> | undefined)?.forEach((storage) => {
     if (storage.value[id])
       delete storage.value[id]
   })

From f16465258de5c6ded78960d09ca9724e0f850092 Mon Sep 17 00:00:00 2001
From: sechi <sechichen@gmail.com>
Date: Fri, 13 Jan 2023 18:32:47 +0800
Subject: [PATCH 7/9] fix(i18n): update zh-CN built_at translation for
 rationality (#1057)

---
 locales/zh-CN.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locales/zh-CN.json b/locales/zh-CN.json
index 43f02ac7..1c99d9d1 100644
--- a/locales/zh-CN.json
+++ b/locales/zh-CN.json
@@ -161,7 +161,7 @@
     "blocked_domains": "已拉黑的域名",
     "blocked_users": "已拉黑的用户",
     "bookmarks": "书签",
-    "built_at": "于 {0}构建",
+    "built_at": "构建于 {0}",
     "conversations": "私信",
     "explore": "探索",
     "favourites": "喜欢",

From a733fbba08e149ee9be9d321a0b3ad91d6689966 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90=20Kevin=20Deng?=
 <sxzz@sxzz.moe>
Date: Fri, 13 Jan 2023 19:54:59 +0800
Subject: [PATCH 8/9] ci: add permissions for workflows

---
 .github/workflows/ci.yml      | 2 ++
 .github/workflows/release.yml | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a554d46f..3ed97488 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,5 +1,7 @@
 name: ci
 
+permissions: {}
+
 on:
   push:
     branches:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e302c364..be309421 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,5 +1,8 @@
 name: Release
 
+permissions:
+  contents: write
+
 on:
   push:
     tags:

From 1d151c53c49f105f338f495e444d23bf4f82ed14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joaqu=C3=ADn=20S=C3=A1nchez?= <userquin@gmail.com>
Date: Fri, 13 Jan 2023 13:54:30 +0100
Subject: [PATCH 9/9] fix: multiple push notifications susbscriptions on
 multiple account servers (#1069)

---
 .../notification/NotificationPreferences.client.vue   | 11 +++++++++--
 .../push-notifications/createPushSubscription.ts      | 11 +++++++++--
 composables/push-notifications/types.ts               |  9 +++++++++
 locales/en-GB.json                                    |  3 ++-
 locales/en-US.json                                    |  3 ++-
 locales/es-ES.json                                    |  3 ++-
 6 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/components/notification/NotificationPreferences.client.vue b/components/notification/NotificationPreferences.client.vue
index 8710c8d4..0cda3c27 100644
--- a/components/notification/NotificationPreferences.client.vue
+++ b/components/notification/NotificationPreferences.client.vue
@@ -1,4 +1,6 @@
 <script setup lang="ts">
+import { PushSubscriptionError } from '~/composables/push-notifications/types'
+
 defineProps<{ show?: boolean }>()
 
 const {
@@ -76,8 +78,13 @@ const doSubscribe = async () => {
     }
   }
   catch (err) {
-    console.error(err)
-    subscribeError = t('settings.notifications.push_notifications.subscription_error.request_error')
+    if (err instanceof PushSubscriptionError) {
+      subscribeError = t(`settings.notifications.push_notifications.subscription_error.${err.code}`)
+    }
+    else {
+      console.error(err)
+      subscribeError = t('settings.notifications.push_notifications.subscription_error.request_error')
+    }
     showSubscribeError = true
   }
   finally {
diff --git a/composables/push-notifications/createPushSubscription.ts b/composables/push-notifications/createPushSubscription.ts
index e175e968..92bc880b 100644
--- a/composables/push-notifications/createPushSubscription.ts
+++ b/composables/push-notifications/createPushSubscription.ts
@@ -4,6 +4,7 @@ import type {
   PushManagerSubscriptionInfo,
   RequiredUserLogin,
 } from '~/composables/push-notifications/types'
+import { PushSubscriptionError } from '~/composables/push-notifications/types'
 
 export const createPushSubscription = async (
   user: RequiredUserLogin,
@@ -41,8 +42,11 @@ export const createPushSubscription = async (
       )
     })
     .catch((error) => {
-      if (error.code === 20 && error.name === 'AbortError')
-        console.warn('Your browser supports Web Push Notifications, but does not seem to implement the VAPID protocol.')
+      let useError: PushSubscriptionError | Error = error
+      if (error.code === 11 && error.name === 'InvalidStateError')
+        useError = new PushSubscriptionError('too_many_registrations', 'Too many registrations')
+      else if (error.code === 20 && error.name === 'AbortError')
+        console.error('Your browser supports Web Push Notifications, but does not seem to implement the VAPID protocol.')
       else if (error.code === 5 && error.name === 'InvalidCharacterError')
         console.error('The VAPID public key seems to be invalid:', vapidKey)
 
@@ -54,6 +58,9 @@ export const createPushSubscription = async (
           console.error(e)
           return Promise.resolve(undefined)
         })
+        .finally(() => {
+          return Promise.reject(useError)
+        })
     })
 }
 
diff --git a/composables/push-notifications/types.ts b/composables/push-notifications/types.ts
index a286a18f..c5da0540 100644
--- a/composables/push-notifications/types.ts
+++ b/composables/push-notifications/types.ts
@@ -24,3 +24,12 @@ export interface CustomEmojisInfo {
   lastUpdate: number
   emojis: mastodon.v1.CustomEmoji[]
 }
+
+export type PushSubscriptionErrorCode = 'too_many_registrations'
+export class PushSubscriptionError extends Error {
+  code: PushSubscriptionErrorCode
+  constructor(code: PushSubscriptionErrorCode, message?: string) {
+    super(message)
+    this.code = code
+  }
+}
diff --git a/locales/en-GB.json b/locales/en-GB.json
index 5ee578fd..a4bc3fbc 100644
--- a/locales/en-GB.json
+++ b/locales/en-GB.json
@@ -238,7 +238,8 @@
           "clear_error": "Clear error",
           "permission_denied": "Permission denied: enable notifications in your browser.",
           "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": "Could not subscribe to push notifications",
+          "too_many_registrations": "Due to browser limitations, Elk cannot use the push notifications service for multiple accounts on different servers. You should unsubscribe from push notifications on another accounts and try again."
         },
         "undo_settings": "Undo changes",
         "unsubscribe": "Disable push notifications",
diff --git a/locales/en-US.json b/locales/en-US.json
index 0f157f4b..9350bb95 100644
--- a/locales/en-US.json
+++ b/locales/en-US.json
@@ -302,7 +302,8 @@
           "clear_error": "Clear error",
           "permission_denied": "Permission denied: enable notifications in your browser.",
           "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": "Could not subscribe to push notifications",
+          "too_many_registrations": "Due to browser limitations, Elk cannot use the push notifications service for multiple accounts on different servers. You should unsubscribe from push notifications on another accounts and try again."
         },
         "title": "Push notifications settings",
         "undo_settings": "Undo changes",
diff --git a/locales/es-ES.json b/locales/es-ES.json
index 480df8e7..46d9a4fb 100644
--- a/locales/es-ES.json
+++ b/locales/es-ES.json
@@ -294,7 +294,8 @@
           "clear_error": "Limpiar error",
           "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, notifica la incidencia en el repositorio de Elk.",
-          "title": "No se pudo suscribir a las notificaciones push"
+          "title": "No se pudo suscribir a las notificaciones push",
+          "too_many_registrations": "Debido a las limitaciones del navegador, Elk no puede habilitar las notificaciones push para múltiples cuentas en diferentes servidores. Deberá cancelar las subscripciones a notificaciones push en las otras cuentas e intentarlo de nuevo."
         },
         "title": "Ajustes de notificaciones push",
         "undo_settings": "Deshacer cambios",