Merge branch 'elk-zone:main' into main

components/notification/NotificationPaginator.vue

@@ -15,6 +15,8 @@ const groupCapacity = Number.MAX_VALUE // No limit
 
 const includeNotificationTypes: mastodon.v1.NotificationType[] = ['update', 'mention', 'poll', 'status']
 
+let id = 0
+
 function includeNotificationsForStatusCard({ type, status }: mastodon.v1.Notification) {
   // Exclude update, mention, pool and status notifications without the status entry:
   // no makes sense to include them
@@ -44,7 +46,6 @@ function hasHeader(account: mastodon.v1.Account) {
 function groupItems(items: mastodon.v1.Notification[]): NotificationSlot[] {
   const results: NotificationSlot[] = []
 
-  let id = 0
   let currentGroupId = ''
   let currentGroup: mastodon.v1.Notification[] = []
   const processGroup = () => {

components/status/StatusPreviewCardMoreFromAuthor.vue

@@ -0,0 +1,19 @@
+<script setup lang="ts">
+import type { mastodon } from 'masto'
+
+defineProps<{
+  account: mastodon.v1.Account
+}>()
+</script>
+
+<template>
+  <div
+    max-h-2xl
+    flex gap-2
+    my-auto
+    bg-gray-300
+  >
+    <span z-0>More from</span>
+    <AccountInlineInfo :account="account" hover:bg-gray-300 />
+  </div>
+</template>

components/status/StatusPreviewCardNormal.vue

@@ -104,6 +104,11 @@ function loadAttachment() {
       <div :class="cardTypeIconMap[card.type]" w="30%" h="30%" text-secondary />
     </div>
     <StatusPreviewCardInfo :p="isSquare ? 'x-4' : '4'" :root="root" :card="card" :provider="providerName" />
+    <StatusPreviewCardMoreFromAuthor
+      v-if="card?.authors?.[0].account"
+      :account="card.authors[0].account"
+      p-4 py-2
+    />
   </NuxtLink>
 </template>
 

docs/app.config.ts

@@ -4,7 +4,7 @@ export default defineAppConfig({
     description: 'A nimble Mastodon web client.',
     image: 'https://docs.elk.zone/elk-screenshot.png',
     socials: {
-      twitter: 'elk_zone',
+      // twitter: 'elk_zone',
       github: 'elk-zone/elk',
       mastodon: {
         label: 'Mastodon',

docs/nuxt.config.ts

@@ -1,8 +1,11 @@
 export default defineNuxtConfig({
   extends: '@nuxt-themes/docus',
+
   vite: {
     optimizeDeps: {
       include: ['scule'],
     },
   },
+
+  compatibilityDate: '2024-11-07',
 })

docs/package.json

@@ -12,7 +12,7 @@
     "theme-colors": "^0.1.0"
   },
   "devDependencies": {
-    "@nuxt-themes/docus": "^1.15.0",
-    "nuxt": "^3.13.2"
+    "@nuxt-themes/docus": "^1.15.1",
+    "nuxt": "^3.14.159"
   }
 }

locales/eu-ES.json

@@ -535,8 +535,8 @@
     },
     "notifications_settings": "Jakinarazpenak",
     "preferences": {
-      "embedded_media": "Kapsulatutako multimedia erreproduzigailua",
-      "embedded_media_description": "Kapsulatutako erreproduzigailu bat erakusten du partekatutako multimedia jarioen estekak zabaltzean, ez aurrebista txartel arrunta.",
+      "embedded_media": "Txertatutako multimedia erreproduzigailua",
+      "embedded_media_description": "Txertatutako erreproduzigailu bat erakusten du partekatutako multimedia jarioen estekak zabaltzean, aurrebista txartel arruntaren ordez.",
       "enable_autoplay": "Gaitu erreproduzitze automatikoa",
       "enable_data_saving": "Gaitu datu-aurrezlea",
       "enable_data_saving_description": "Aurreztu datuak eranskinen kargatze-automatikoa galarazten.",
@@ -713,6 +713,7 @@
     "year_past": "duela 0 urte|aurreko urtean|duela {n} urte"
   },
   "timeline": {
+    "no_posts": "Ez dago bidalketarik!",
     "show_new_items": "Erakutsi {v} elementu berri|Erakutsi elementu berri {v}|Erakutsi {v} elementu berri",
     "view_older_posts": "Oso litekeena da beste instantziatako bidalketa zaharragoak ikusgai ez egotea."
   },

locales/hu-HU.json

@@ -713,6 +713,7 @@
     "year_past": "0 évvel ezelőtt|múlt évben|{n} évvel ezelőtt"
   },
   "timeline": {
+    "no_posts": "Itt nincsenek bejegyzések.",
     "show_new_items": "{v} új elem megjelenítése|{v} új elem megjelenítése|{v} új elem megjelenítése",
     "view_older_posts": "Előfordulhat, hogy más instancekről származó régebbi bejegyzések nem jelennek meg."
   },

locales/it-IT.json

@@ -648,8 +648,8 @@
     "try_original_site": "Prova sito originale"
   },
   "status_history": {
-    "created": "creato {0}",
-    "edited": "modificato {0}"
+    "created": "ha creato {0}",
+    "edited": "ha modificato {0}"
   },
   "tab": {
     "accounts": "Account",
@@ -713,6 +713,7 @@
     "year_past": "0 anni fa|1 anno fa|{n} anni fa"
   },
   "timeline": {
+    "no_posts": "Nessun post qui!",
     "show_new_items": "Mostra {v} nuovi elementi|Mostra {v} nuovo elemento|Mostra {v} nuovi elementi",
     "view_older_posts": "Non è possibile mostrare post passati di altre istanze"
   },

locales/pt.json

@@ -713,6 +713,7 @@
     "year_past": "0 anos atrás|ano passado|{n} anos atrás"
   },
   "timeline": {
+    "no_posts": "Sem publicações aqui!",
     "show_new_items": "Mostrar {v} novos itens|Mostrar {v} novo item|Mostrar {v} novos itens",
     "view_older_posts": "Publicações antigas de outras instâncias podem não ser apresentadas."
   },

locales/vi-VN.json

@@ -713,6 +713,7 @@
     "year_past": "0 năm trước|năm trước|{n} năm trước"
   },
   "timeline": {
+    "no_posts": "Chưa có tút!",
     "show_new_items": "Hiện {v} mục mới|Hiện {v} mục mới|Hiện {v} mục mới",
     "view_older_posts": "Các tút cũ ở máy chủ khác có thể không hiển thị đầy đủ."
   },

package.json

@@ -2,7 +2,7 @@
   "name": "@elk-zone/elk",
   "type": "module",
   "version": "0.15.1",
-  "packageManager": "pnpm@9.12.2",
+  "packageManager": "pnpm@9.13.2",
   "license": "MIT",
   "homepage": "https://elk.zone/",
   "main": "./nuxt.config.ts",
@@ -56,7 +56,7 @@
     "@tiptap/starter-kit": "2.2.4",
     "@tiptap/suggestion": "2.2.4",
     "@tiptap/vue-3": "2.2.4",
-    "@unocss/nuxt": "^0.63.0",
+    "@unocss/nuxt": "^0.63.6",
     "@upstash/redis": "^1.27.1",
     "@vercel/kv": "^2.0.0",
     "@vue-macros/nuxt": "^1.11.12",
@@ -83,15 +83,15 @@
     "iso-639-1": "^3.0.0",
     "js-yaml": "^4.1.0",
     "lru-cache": "^11.0.0",
-    "masto": "^6.7.5",
+    "masto": "^6.10.1",
     "node-emoji": "^2.1.3",
     "nuxt-security": "^1.4.3",
     "page-lifecycle": "^0.1.2",
     "pinia": "^2.2.2",
     "postcss-nested": "^6.0.1",
     "prosemirror-highlight": "^0.9.0",
     "rollup-plugin-node-polyfills": "^0.2.1",
-    "shiki": "^1.0.0",
+    "shiki": "^1.22.2",
     "simple-git": "^3.19.1",
     "slimeform": "^0.9.1",
     "stale-dep": "^0.7.0",
@@ -113,33 +113,33 @@
     "ws": "^8.15.1"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^3.7.3",
+    "@antfu/eslint-config": "^3.9.1",
     "@antfu/ni": "^0.23.0",
     "@types/chroma-js": "^2.4.4",
     "@types/file-saver": "^2.0.7",
     "@types/fnando__sparkline": "^0.3.7",
     "@types/fs-extra": "^11.0.4",
     "@types/js-yaml": "^4.0.9",
     "@types/wicg-file-system-access": "^2023.10.5",
-    "@types/ws": "^8.5.12",
-    "@unlazy/nuxt": "^0.11.3",
-    "@unocss/eslint-config": "^0.63.4",
+    "@types/ws": "^8.5.13",
+    "@unlazy/nuxt": "^0.12.0",
+    "@unocss/eslint-config": "^0.64.1",
     "@vue/test-utils": "2.4.6",
-    "bumpp": "^9.7.1",
+    "bumpp": "^9.8.1",
     "consola": "^3.2.3",
-    "eslint": "^9.12.0",
+    "eslint": "^9.15.0",
     "eslint-plugin-format": "^0.1.2",
     "flat": "^6.0.1",
     "fs-extra": "^11.2.0",
     "lint-staged": "^15.2.10",
-    "nuxt": "^3.13.2",
+    "nuxt": "^3.14.159",
     "prettier": "^3.3.3",
     "sharp": "^0.33.5",
     "sharp-ico": "^0.1.5",
     "simple-git-hooks": "^2.11.1",
-    "tsx": "^4.19.1",
+    "tsx": "^4.19.2",
     "typescript": "^5.4.4",
-    "vitest": "2.1.3",
+    "vitest": "2.1.4",
     "vue-tsc": "^2.1.6"
   },
   "pnpm": {
@@ -152,9 +152,9 @@
     }
   },
   "resolutions": {
-    "nuxt-component-meta": "0.8.2",
-    "unstorage": "^1.12.0",
-    "vitest": "2.1.3",
+    "nuxt-component-meta": "0.9.0",
+    "unstorage": "^1.13.1",
+    "vitest": "2.1.4",
     "vue": "^3.5.4"
   },
   "simple-git-hooks": {

pages/notifications.vue

@@ -47,6 +47,8 @@ const filterIconMap: Record<mastodon.v1.NotificationType, string> = {
   'update': 'i-ri:edit-2-line',
   'admin.sign_up': 'i-ri:user-add-line',
   'admin.report': 'i-ri:flag-line',
+  'severed_relationships': 'i-ri:user-unfollow-line',
+  'moderation_warning': 'i-ri:error-warning-line',
 }
 
 const filterText = computed(() => `${t('tab.notifications_more_tooltip')}${filter.value ? `: ${t(`tab.notifications_${filter.value}`)}` : ''}`)