3 files changed, 13 insertions, 79 deletions
diff --git a/packages/trpc/lib/storageQuota.ts b/packages/trpc/lib/storageQuota.ts
deleted file mode 100644
index 49b96af8..00000000
--- a/packages/trpc/lib/storageQuota.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import { eq, sum } from "drizzle-orm";
-
-import type { DB, KarakeepDBTransaction } from "@karakeep/db";
-import { assets, users } from "@karakeep/db/schema";
-import { QuotaApproved } from "@karakeep/shared/storageQuota";
-
-export class StorageQuotaError extends Error {
-  constructor(
-    public readonly currentUsage: number,
-    public readonly quota: number,
-    public readonly requestedSize: number,
-  ) {
-    super(
-      `Storage quota exceeded. Current usage: ${Math.round(currentUsage / 1024 / 1024)}MB, Quota: ${Math.round(quota / 1024 / 1024)}MB, Requested: ${Math.round(requestedSize / 1024 / 1024)}MB`,
-    );
-    this.name = "StorageQuotaError";
-  }
-}
-
-export async function checkStorageQuota(
-  db: DB | KarakeepDBTransaction,
-  userId: string,
-  requestedSize: number,
-): Promise<QuotaApproved> {
-  const user = await db.query.users.findFirst({
-    where: eq(users.id, userId),
-    columns: {
-      storageQuota: true,
-    },
-  });
-
-  if (user?.storageQuota === null || user?.storageQuota === undefined) {
-    // No quota limit - approve the request
-    return QuotaApproved._create(userId, requestedSize);
-  }
-
-  const currentUsage = await getCurrentStorageUsage(db, userId);
-
-  if (currentUsage + requestedSize > user.storageQuota) {
-    throw new StorageQuotaError(currentUsage, user.storageQuota, requestedSize);
-  }
-
-  // Quota check passed - return approval token
-  return QuotaApproved._create(userId, requestedSize);
-}
-
-export async function getCurrentStorageUsage(
-  db: DB | KarakeepDBTransaction,
-  userId: string,
-): Promise<number> {
-  const currentUsageResult = await db
-    .select({ totalSize: sum(assets.size) })
-    .from(assets)
-    .where(eq(assets.userId, userId));
-
-  return Number(currentUsageResult[0]?.totalSize ?? 0);
-}
diff --git a/packages/trpc/package.json b/packages/trpc/package.json
index 31cb3d9a..c4e16675 100644
--- a/packages/trpc/package.json
+++ b/packages/trpc/package.json
@@ -14,8 +14,8 @@
   },
   "dependencies": {
     "@karakeep/db": "workspace:*",
-    "@karakeep/plugins-search-meilisearch": "workspace:*",
     "@karakeep/shared": "workspace:*",
+    "@karakeep/shared-server": "workspace:*",
     "@trpc/server": "^11.4.3",
     "bcryptjs": "^2.4.3",
     "deep-equal": "^2.2.3",
diff --git a/packages/trpc/routers/bookmarks.ts b/packages/trpc/routers/bookmarks.ts
index 298f0961..db9d33fc 100644
--- a/packages/trpc/routers/bookmarks.ts
+++ b/packages/trpc/routers/bookmarks.ts
@@ -1,5 +1,5 @@
 import { experimental_trpcMiddleware, TRPCError } from "@trpc/server";
-import { and, count, eq, gt, inArray, lt, or } from "drizzle-orm";
+import { and, eq, gt, inArray, lt, or } from "drizzle-orm";
 import { EnqueueOptions } from "liteque";
 import invariant from "tiny-invariant";
 import { z } from "zod";
@@ -20,8 +20,8 @@ import {
   bookmarkTexts,
   customPrompts,
   tagsOnBookmarks,
-  users,
 } from "@karakeep/db/schema";
+import { QuotaService } from "@karakeep/shared-server";
 import {
   deleteAsset,
   SUPPORTED_BOOKMARK_ASSET_TYPES,
@@ -273,26 +273,17 @@ export const bookmarksAppRouter = router({
       }
 
       // Check user quota
-      const user = await ctx.db.query.users.findFirst({
-        where: eq(users.id, ctx.user.id),
-        columns: {
-          bookmarkQuota: true,
-        },
-      });
-
-      if (user?.bookmarkQuota !== null && user?.bookmarkQuota !== undefined) {
-        const currentBookmarkCount = await ctx.db
-          .select({ count: count() })
-          .from(bookmarks)
-          .where(eq(bookmarks.userId, ctx.user.id));
-
-        if (currentBookmarkCount[0].count >= user.bookmarkQuota) {
-          throw new TRPCError({
-            code: "FORBIDDEN",
-            message: `Bookmark quota exceeded. You can only have ${user.bookmarkQuota} bookmarks.`,
-          });
-        }
+      const quotaResult = await QuotaService.canCreateBookmark(
+        ctx.db,
+        ctx.user.id,
+      );
+      if (!quotaResult.result) {
+        throw new TRPCError({
+          code: "FORBIDDEN",
+          message: quotaResult.error,
+        });
       }
+
       const bookmark = await ctx.db.transaction(async (tx) => {
         const bookmark = (
           await tx