Merge branch 'master' into preview

Author: miantiao-me

app/assets/css/tailwind.css

@@ -115,6 +115,8 @@
 @layer base {
   * {
     @apply border-border outline-ring/50;
+    scrollbar-width: thin;
+    scrollbar-color: var(--border) transparent;
   }
   body {
     @apply bg-background text-foreground;
@@ -132,4 +134,15 @@
   label {
     @apply cursor-pointer;
   }
+
+  ::-webkit-scrollbar {
+    width: 5px;
+  }
+  ::-webkit-scrollbar-track {
+    background: transparent;
+  }
+  ::-webkit-scrollbar-thumb {
+    background: var(--border);
+    border-radius: 5px;
+  }
 }

layers/dashboard/app/components/dashboard/links/editor/ImageUploader.vue

@@ -47,7 +47,9 @@ async function handleFile(file: File) {
   }
   catch (error) {
     console.error(error)
-    toast.error(t('links.form.image_upload_failed'))
+    toast.error(t('links.form.image_upload_failed'), {
+      description: error instanceof Error ? error.message : String(error),
+    })
   }
   finally {
     uploading.value = false

package.json

@@ -1,7 +1,7 @@
 {
   "name": "sink",
   "type": "module",
-  "version": "0.2.9",
+  "version": "0.2.10",
   "private": true,
   "packageManager": "pnpm@10.28.2",
   "engines": {

server/api/backup.post.ts

@@ -8,12 +8,7 @@ defineRouteMeta({
 export default eventHandler(async (event) => {
   const env = event.context.cloudflare.env
 
-  if (!env.R2) {
-    throw createError({
-      status: 500,
-      message: 'R2 binding not configured',
-    })
-  }
+  requireR2Bucket(env)
 
   await backupKVToR2(env, true)
 

server/api/upload/image.post.ts

@@ -25,8 +25,7 @@ defineRouteMeta({
 })
 
 export default eventHandler(async (event) => {
-  const { cloudflare } = event.context
-  const { R2 } = cloudflare.env
+  const R2 = requireR2Bucket(event.context.cloudflare.env)
 
   const formData = await readFormData(event)
   const file = formData.get('file') as File | null

server/routes/_assets/[...key].get.ts

@@ -3,8 +3,7 @@ import { LinkSchema } from '#shared/schemas/link'
 const slugValidator = LinkSchema.shape.slug
 
 export default eventHandler(async (event) => {
-  const { cloudflare } = event.context
-  const { R2 } = cloudflare.env
+  const R2 = requireR2Bucket(event.context.cloudflare.env)
   const key = getRouterParam(event, 'key')
 
   if (!key) {

server/utils/r2.ts

@@ -0,0 +1,10 @@
+export function requireR2Bucket(env: Cloudflare.Env): R2Bucket {
+  if (!env.R2) {
+    throw createError({
+      statusCode: 503,
+      statusMessage: 'R2 binding not configured',
+    })
+  }
+
+  return env.R2
+}