4 files changed, 27 insertions, 1 deletions
diff --git a/packages/shared-react/utils/assetUtils.ts b/packages/shared-react/utils/assetUtils.ts
new file mode 100644
index 00000000..119451d9
--- /dev/null
+++ b/packages/shared-react/utils/assetUtils.ts
@@ -0,0 +1,3 @@
+export function getAssetUrl(assetId: string) {
+  return `/api/assets/${assetId}`;
+}
diff --git a/apps/web/lib/bookmarkUtils.tsx b/packages/shared-react/utils/bookmarkUtils.ts
index 475ba383..da199a40 100644
--- a/apps/web/lib/bookmarkUtils.tsx
+++ b/packages/shared-react/utils/bookmarkUtils.ts
@@ -1,7 +1,24 @@
-import type { ZBookmark } from "@hoarder/shared/types/bookmarks";
+import type {
+  ZBookmark,
+  ZBookmarkedLink,
+} from "@hoarder/shared/types/bookmarks";
+
+import { getAssetUrl } from "./assetUtils";
 
 const MAX_LOADING_MSEC = 30 * 1000;
 
+export function getBookmarkLinkImageUrl(bookmark: ZBookmarkedLink) {
+  if (bookmark.imageAssetId) {
+    return { url: getAssetUrl(bookmark.imageAssetId), localAsset: true };
+  }
+  if (bookmark.screenshotAssetId) {
+    return { url: getAssetUrl(bookmark.screenshotAssetId), localAsset: true };
+  }
+  return bookmark.imageUrl
+    ? { url: bookmark.imageUrl, localAsset: false }
+    : null;
+}
+
 export function isBookmarkStillCrawling(bookmark: ZBookmark) {
   return (
     bookmark.content.type == "link" &&
diff --git a/packages/shared/assetdb.ts b/packages/shared/assetdb.ts
index 90fc7182..1033c594 100644
--- a/packages/shared/assetdb.ts
+++ b/packages/shared/assetdb.ts
@@ -15,6 +15,10 @@ export const zAssetMetadataSchema = z.object({
   fileName: z.string().nullish(),
 });
 
+export function newAssetId() {
+  return crypto.randomUUID();
+}
+
 export async function saveAsset({
   userId,
   assetId,
diff --git a/packages/shared/types/bookmarks.ts b/packages/shared/types/bookmarks.ts
index 2cf8152b..f58473b4 100644
--- a/packages/shared/types/bookmarks.ts
+++ b/packages/shared/types/bookmarks.ts
@@ -10,6 +10,8 @@ export const zBookmarkedLinkSchema = z.object({
   title: z.string().nullish(),
   description: z.string().nullish(),
   imageUrl: z.string().url().nullish(),
+  imageAssetId: z.string().nullish(),
+  screenshotAssetId: z.string().nullish(),
   favicon: z.string().url().nullish(),
   htmlContent: z.string().nullish(),
   crawledAt: z.date().nullish(),