2 files changed, 42 insertions, 15 deletions
diff --git a/packages/trpc/routers/bookmarks.ts b/packages/trpc/routers/bookmarks.ts
index 389f026c..05ffa240 100644
--- a/packages/trpc/routers/bookmarks.ts
+++ b/packages/trpc/routers/bookmarks.ts
@@ -281,6 +281,7 @@ export const bookmarksAppRouter = router({
       const enqueueOpts: EnqueueOptions = {
         // The lower the priority number, the sooner the job will be processed
         priority: input.crawlPriority === "low" ? 50 : 0,
+        groupId: ctx.user.id,
       };
 
       switch (bookmark.content.type) {
@@ -487,8 +488,12 @@ export const bookmarksAppRouter = router({
         );
       }
       // Trigger re-indexing and webhooks
-      await triggerSearchReindex(input.bookmarkId);
-      await triggerWebhook(input.bookmarkId, "edited");
+      await triggerSearchReindex(input.bookmarkId, {
+        groupId: ctx.user.id,
+      });
+      await triggerWebhook(input.bookmarkId, "edited", ctx.user.id, {
+        groupId: ctx.user.id,
+      });
 
       return updatedBookmark;
     }),
@@ -527,8 +532,12 @@ export const bookmarksAppRouter = router({
             ),
           );
       });
-      await triggerSearchReindex(input.bookmarkId);
-      await triggerWebhook(input.bookmarkId, "edited");
+      await triggerSearchReindex(input.bookmarkId, {
+        groupId: ctx.user.id,
+      });
+      await triggerWebhook(input.bookmarkId, "edited", ctx.user.id, {
+        groupId: ctx.user.id,
+      });
     }),
 
   deleteBookmark: authedProcedure
@@ -561,10 +570,15 @@ export const bookmarksAppRouter = router({
           crawlStatusCode: null,
         })
         .where(eq(bookmarkLinks.id, input.bookmarkId));
-      await LinkCrawlerQueue.enqueue({
-        bookmarkId: input.bookmarkId,
-        archiveFullPage: input.archiveFullPage,
-      });
+      await LinkCrawlerQueue.enqueue(
+        {
+          bookmarkId: input.bookmarkId,
+          archiveFullPage: input.archiveFullPage,
+        },
+        {
+          groupId: ctx.user.id,
+        },
+      );
     }),
   getBookmark: authedProcedure
     .input(
@@ -818,8 +832,12 @@ export const bookmarksAppRouter = router({
             tagId: t,
           })),
         ]);
-        await triggerSearchReindex(input.bookmarkId);
-        await triggerWebhook(input.bookmarkId, "edited");
+        await triggerSearchReindex(input.bookmarkId, {
+          groupId: ctx.user.id,
+        });
+        await triggerWebhook(input.bookmarkId, "edited", ctx.user.id, {
+          groupId: ctx.user.id,
+        });
         return {
           bookmarkId: input.bookmarkId,
           attached: allIds,
@@ -959,8 +977,12 @@ Author: ${bookmark.author ?? ""}
           summary: summary.response,
         })
         .where(eq(bookmarks.id, input.bookmarkId));
-      await triggerSearchReindex(input.bookmarkId);
-      await triggerWebhook(input.bookmarkId, "edited");
+      await triggerSearchReindex(input.bookmarkId, {
+        groupId: ctx.user.id,
+      });
+      await triggerWebhook(input.bookmarkId, "edited", ctx.user.id, {
+        groupId: ctx.user.id,
+      });
 
       return {
         bookmarkId: input.bookmarkId,
diff --git a/packages/trpc/routers/feeds.ts b/packages/trpc/routers/feeds.ts
index 57c88084..8591c98c 100644
--- a/packages/trpc/routers/feeds.ts
+++ b/packages/trpc/routers/feeds.ts
@@ -57,8 +57,13 @@ export const feedsAppRouter = router({
     .input(z.object({ feedId: z.string() }))
     .mutation(async ({ input, ctx }) => {
       await Feed.fromId(ctx, input.feedId);
-      await FeedQueue.enqueue({
-        feedId: input.feedId,
-      });
+      await FeedQueue.enqueue(
+        {
+          feedId: input.feedId,
+        },
+        {
+          groupId: ctx.user.id,
+        },
+      );
     }),
 });