Merge branch 'main' into userquin/feat-prevent-file-upload

components/status/StatusActions.vue

@@ -55,7 +55,7 @@ function reply() {
 
     <div flex-1>
       <StatusActionButton
-        :content="$t('action.boost')"
+        :content="$t(status.reblogged ? 'action.boosted' : 'action.boost')"
         :text="!getPreferences(userSettings, 'hideBoostCount') && status.reblogsCount ? status.reblogsCount : ''"
         color="text-green" hover="text-green" elk-group-hover="bg-green/10"
         icon="i-ri:repeat-line"
@@ -77,7 +77,7 @@ function reply() {
 
     <div flex-1>
       <StatusActionButton
-        :content="$t('action.favourite')"
+        :content="$t(status.favourited ? 'action.favourited' : 'action.favourite')"
         :text="!getPreferences(userSettings, 'hideFavoriteCount') && status.favouritesCount ? status.favouritesCount : ''"
         :color="useStarFavoriteIcon ? 'text-yellow' : 'text-rose'"
         :hover="useStarFavoriteIcon ? 'text-yellow' : 'text-rose'"
@@ -100,7 +100,7 @@ function reply() {
 
     <div flex-none>
       <StatusActionButton
-        :content="$t('action.bookmark')"
+        :content="$t(status.bookmarked ? 'action.bookmarked' : 'action.bookmark')"
         :color="useStarFavoriteIcon ? 'text-rose' : 'text-yellow'"
         :hover="useStarFavoriteIcon ? 'text-rose' : 'text-yellow'"
         :elk-group-hover="useStarFavoriteIcon ? 'bg-rose/10' : 'bg-yellow/10' "

composables/paginator.ts

@@ -34,10 +34,10 @@ export function usePaginator<T, P, U = T>(
       return
 
     for await (const entry of stream) {
-      if (entry.event === 'update') {
+      if (entry.event === 'update' || entry.event === 'notification') {
         const status = entry.payload
 
-        if ('uri' in entry)
+        if ('uri' in status)
           cacheStatus(status, undefined, true)
 
         const index = prevItems.value.findIndex((i: any) => i.id === status.id)

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@elk-zone/elk",
   "type": "module",
-  "version": "0.13.0",
+  "version": "0.13.1",
   "packageManager": "pnpm@8.15.5",
   "license": "MIT",
   "homepage": "https://elk.zone/",
@@ -82,7 +82,7 @@
     "iso-639-1": "^3.0.0",
     "js-yaml": "^4.1.0",
     "lru-cache": "^10.0.0",
-    "masto": "^6.5.2",
+    "masto": "^6.7.0",
     "node-emoji": "^2.1.3",
     "nuxt-security": "^0.13.1",
     "page-lifecycle": "^0.1.2",
@@ -112,18 +112,18 @@
     "ws": "^8.15.1"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^2.8.3",
+    "@antfu/eslint-config": "^2.9.0",
     "@antfu/ni": "^0.21.12",
     "@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/prettier": "^2.7.3",
-    "@types/wicg-file-system-access": "^2020.9.8",
+    "@types/prettier": "^3.0.0",
+    "@types/wicg-file-system-access": "^2023.10.5",
     "@types/ws": "^8.5.10",
-    "@unlazy/nuxt": "^0.11.1",
-    "@unocss/eslint-config": "^0.58.5",
+    "@unlazy/nuxt": "^0.11.2",
+    "@unocss/eslint-config": "^0.58.6",
     "@vue/test-utils": "2.4.5",
     "bumpp": "^9.4.0",
     "consola": "^3.2.3",
@@ -131,12 +131,12 @@
     "eslint-plugin-format": "^0.1.0",
     "flat": "^6.0.1",
     "fs-extra": "^11.2.0",
-    "lint-staged": "^14.0.1",
+    "lint-staged": "^15.2.2",
     "nuxt": "^3.11.1",
     "prettier": "^3.2.5",
-    "sharp": "^0.33.2",
+    "sharp": "^0.33.3",
     "sharp-ico": "^0.1.5",
-    "simple-git-hooks": "^2.10.0",
+    "simple-git-hooks": "^2.11.1",
     "tsx": "^4.7.1",
     "typescript": "^5.4.2",
     "vitest": "1.4.0",