⚡️⚡️⚡️ Self-hosted collaborative bookmark manager to collect, read, annotate, and fully preserve what matters, all in one place.
TypeScript bookmarkbookmark-managercollaborationnextjsreact-nativeread-it-laterself-hostedtypescript
cleaner code + add "aiTagged" field
daniel31x1340f4a5acd922
diff --git a/components/LinkDetails.tsx b/components/LinkDetails.tsxindex 5fb7a6ca..44950892 100644--- a/components/LinkDetails.tsx+++ b/components/LinkDetails.tsx@@ -4,13 +4,7 @@ import {ArchivedFormat,} from "@/types/global";import Link from "next/link";-import {- pdfAvailable,- readabilityAvailable,- monolithAvailable,- screenshotAvailable,- previewAvailable,-} from "@/lib/shared/getArchiveValidity";+import { formatAvailable } from "@/lib/shared/getArchiveValidity";import PreservedFormatRow from "@/components/PreserverdFormatRow";import getPublicUserData from "@/lib/client/getPublicUserData";import { useTranslation } from "next-i18next";@@ -118,10 +112,10 @@ export default function LinkDetails({const atLeastOneFormatAvailable = () => {return (- screenshotAvailable(link) ||- pdfAvailable(link) ||- readabilityAvailable(link) ||- monolithAvailable(link)+ formatAvailable(link, "image") ||+ formatAvailable(link, "pdf") ||+ formatAvailable(link, "readable") ||+ formatAvailable(link, "monolith"));};@@ -217,7 +211,7 @@ export default function LinkDetails({: "-mx-4 -mt-4")}>- {previewAvailable(link) ? (+ {formatAvailable(link, "preview") ? (<Imagesrc={`/api/v1/archives/${link.id}?format=${ArchivedFormat.jpeg}&preview=true&updatedAt=${link.updatedAt}`}width={1280}@@ -537,7 +531,7 @@ export default function LinkDetails({</div><div className={`flex flex-col rounded-md p-3 bg-base-200`}>- {monolithAvailable(link) ? (+ {formatAvailable(link, "monolith") ? (<><PreservedFormatRowname={t("webpage")}@@ -550,7 +544,7 @@ export default function LinkDetails({</>) : undefined}- {screenshotAvailable(link) ? (+ {formatAvailable(link, "image") ? (<><PreservedFormatRowname={t("screenshot")}@@ -567,7 +561,7 @@ export default function LinkDetails({</>) : undefined}- {pdfAvailable(link) ? (+ {formatAvailable(link, "pdf") ? (<><PreservedFormatRowname={t("pdf")}@@ -580,7 +574,7 @@ export default function LinkDetails({</>) : undefined}- {readabilityAvailable(link) ? (+ {formatAvailable(link, "readable") ? (<><PreservedFormatRowname={t("readable")}diff --git a/components/LinkViews/LinkComponents/LinkCard.tsx b/components/LinkViews/LinkComponents/LinkCard.tsxindex 43331b1a..d598ca84 100644--- a/components/LinkViews/LinkComponents/LinkCard.tsx+++ b/components/LinkViews/LinkComponents/LinkCard.tsx@@ -10,7 +10,7 @@ import LinkActions from "@/components/LinkViews/LinkComponents/LinkActions";import LinkDate from "@/components/LinkViews/LinkComponents/LinkDate";import LinkCollection from "@/components/LinkViews/LinkComponents/LinkCollection";import Image from "next/image";-import { previewAvailable } from "@/lib/shared/getArchiveValidity";+import { formatAvailable } from "@/lib/shared/getArchiveValidity";import LinkIcon from "./LinkIcon";import useOnScreen from "@/hooks/useOnScreen";import { generateLinkHref } from "@/lib/client/generateLinkHref";@@ -171,7 +171,7 @@ export default function LinkCard({ link, columns, editMode }: Props) {<divclassName={`relative rounded-t-2xl ${imageHeightClass} overflow-hidden`}>- {previewAvailable(link) ? (+ {formatAvailable(link, "preview") ? (<Imagesrc={`/api/v1/archives/${link.id}?format=${ArchivedFormat.jpeg}&preview=true&updatedAt=${link.updatedAt}`}width={1280}diff --git a/components/LinkViews/LinkComponents/LinkMasonry.tsx b/components/LinkViews/LinkComponents/LinkMasonry.tsxindex 71d3a2fb..19030238 100644--- a/components/LinkViews/LinkComponents/LinkMasonry.tsx+++ b/components/LinkViews/LinkComponents/LinkMasonry.tsx@@ -10,7 +10,7 @@ import LinkActions from "@/components/LinkViews/LinkComponents/LinkActions";import LinkDate from "@/components/LinkViews/LinkComponents/LinkDate";import LinkCollection from "@/components/LinkViews/LinkComponents/LinkCollection";import Image from "next/image";-import { previewAvailable } from "@/lib/shared/getArchiveValidity";+import { formatAvailable } from "@/lib/shared/getArchiveValidity";import Link from "next/link";import LinkIcon from "./LinkIcon";import useOnScreen from "@/hooks/useOnScreen";@@ -161,10 +161,10 @@ export default function LinkMasonry({ link, editMode, columns }: Props) {!editMode && window.open(generateLinkHref(link, user), "_blank")}>- {show.image && previewAvailable(link) && (+ {show.image && formatAvailable(link, "preview") && (<div><div className="relative rounded-t-2xl overflow-hidden">- {previewAvailable(link) ? (+ {formatAvailable(link, "preview") ? (<Imagesrc={`/api/v1/archives/${link.id}?format=${ArchivedFormat.jpeg}&preview=true&updatedAt=${link.updatedAt}`}width={1280}diff --git a/components/ReadableView.tsx b/components/ReadableView.tsxindex 6a4e3429..1bc35769 100644--- a/components/ReadableView.tsx+++ b/components/ReadableView.tsx@@ -1,5 +1,5 @@import unescapeString from "@/lib/client/unescapeString";-import { readabilityAvailable } from "@/lib/shared/getArchiveValidity";+import { formatAvailable } from "@/lib/shared/getArchiveValidity";import isValidUrl from "@/lib/shared/isValidUrl";import {ArchivedFormat,@@ -48,7 +48,7 @@ export default function ReadableView({ link }: Props) {useEffect(() => {const fetchLinkContent = async () => {- if (router.query.id && readabilityAvailable(link)) {+ if (router.query.id && formatAvailable(link, "readable")) {const response = await fetch(`/api/v1/archives/${link?.id}?format=${ArchivedFormat.readability}`);diff --git a/lib/api/autoTagLink.ts b/lib/api/autoTagLink.tsnew file mode 100644index 00000000..23ca1fb7--- /dev/null+++ b/lib/api/autoTagLink.ts@@ -0,0 +1,35 @@+import { AiTaggingMethod, Collection, Link, Tag, User } from "@prisma/client";+import axios from "axios";+import { generateTagsPrompt } from "./prompts";++export default async function autoTagLink(+ user: User,+ link: Link & {+ collection: Collection;+ tags: Tag[];+ },+ fallbackText: string+) {+ console.log("Auto tagging link: ", link.url);++ let prompt;++ const textContent = link.textContent || fallbackText || "";++ if (!textContent)+ return console.log("No text content to auto tag for link: ", link.url);++ if (user.aiTaggingMethod === AiTaggingMethod.GENERATE) {+ prompt = generateTagsPrompt();+ } else {+ }++ // use axios to make a request to OLLAMA API+ const response = await axios.post("http://localhost:11434/api/generate", {+ model: "phi3.5",+ prompt: prompt,+ stream: false,+ });++ console.log("Response from OLLAMA API: ", response.data);+}diff --git a/lib/client/generateLinkHref.ts b/lib/client/generateLinkHref.tsindex 721c6710..a7ffd690 100644--- a/lib/client/generateLinkHref.ts+++ b/lib/client/generateLinkHref.ts@@ -4,12 +4,7 @@ import {LinkIncludingShortenedCollectionAndTags,} from "@/types/global";import { LinksRouteTo } from "@prisma/client";-import {- pdfAvailable,- readabilityAvailable,- screenshotAvailable,- monolithAvailable,-} from "../shared/getArchiveValidity";+import { formatAvailable } from "../shared/getArchiveValidity";export const generateLinkHref = (link: LinkIncludingShortenedCollectionAndTags,@@ -20,27 +15,27 @@ export const generateLinkHref = (if (account.linksRouteTo === LinksRouteTo.ORIGINAL && link.type === "url") {return link.url || "";} else if (account.linksRouteTo === LinksRouteTo.PDF || link.type === "pdf") {- if (!pdfAvailable(link)) return link.url || "";+ if (!formatAvailable(link, "pdf")) return link.url || "";return `/preserved/${link?.id}?format=${ArchivedFormat.pdf}`;} else if (account.linksRouteTo === LinksRouteTo.READABLE &&link.type === "url") {- if (!readabilityAvailable(link)) return link.url || "";+ if (!formatAvailable(link, "readable")) return link.url || "";return `/preserved/${link?.id}?format=${ArchivedFormat.readability}`;} else if (account.linksRouteTo === LinksRouteTo.SCREENSHOT ||link.type === "image") {- if (!screenshotAvailable(link)) return link.url || "";+ if (!formatAvailable(link, "image")) return link.url || "";return `/preserved/${link?.id}?format=${link?.image?.endsWith("png") ? ArchivedFormat.png : ArchivedFormat.jpeg}`;} else if (account.linksRouteTo === LinksRouteTo.MONOLITH) {- if (!monolithAvailable(link)) return link.url || "";+ if (!formatAvailable(link, "monolith")) return link.url || "";return `/preserved/${link?.id}?format=${ArchivedFormat.monolith}`;} else {diff --git a/lib/shared/getArchiveValidity.ts b/lib/shared/getArchiveValidity.tsindex fc553f83..8e55db84 100644--- a/lib/shared/getArchiveValidity.ts+++ b/lib/shared/getArchiveValidity.ts@@ -1,51 +1,33 @@import { LinkIncludingShortenedCollectionAndTags } from "@/types/global";+import { Link } from "@prisma/client";-export function screenshotAvailable(- link: LinkIncludingShortenedCollectionAndTags+export function formatAvailable(+ link: Link | LinkIncludingShortenedCollectionAndTags,+ format: "image" | "pdf" | "readable" | "monolith" | "preview") {return (link &&- link.image &&- link.image !== "pending" &&- link.image !== "unavailable"+ link[format] &&+ link[format] !== "pending" &&+ link[format] !== "unavailable");}-export function pdfAvailable(link: LinkIncludingShortenedCollectionAndTags) {- return (- link && link.pdf && link.pdf !== "pending" && link.pdf !== "unavailable"- );-}--export function readabilityAvailable(- link: LinkIncludingShortenedCollectionAndTags-) {- return (- link &&- link.readable &&- link.readable !== "pending" &&- link.readable !== "unavailable"- );-}--export function monolithAvailable(- link: LinkIncludingShortenedCollectionAndTags-) {- return (- link &&- link.monolith &&- link.monolith !== "pending" &&- link.monolith !== "unavailable"- );-}--export function previewAvailable(- link: LinkIncludingShortenedCollectionAndTags-) {- return (- link &&- link.preview &&- link.preview !== "pending" &&- link.preview !== "unavailable"- );+export function formatStatus(+ link: Link | LinkIncludingShortenedCollectionAndTags,+ format: "image" | "pdf" | "readable" | "monolith" | "preview"+): "pending" | "processed" | "error" {+ // Before getting passed to the archive handler...+ if (!link[format]) {+ return "pending";+ } else if (+ link[format].startsWith("unavailable") ||+ link[format].startsWith("archive")+ ) {+ return "processed";+ } else if (link[format].startsWith("pending")) {+ return "pending";+ } else {+ return "error";+ }}diff --git a/prisma/migrations/20241209173822_add_field/migration.sql b/prisma/migrations/20241209173822_add_field/migration.sqlnew file mode 100644index 00000000..cdb83252--- /dev/null+++ b/prisma/migrations/20241209173822_add_field/migration.sql@@ -0,0 +1,2 @@+-- AlterTable+ALTER TABLE "Link" ADD COLUMN "aiTagged" BOOLEAN NOT NULL DEFAULT false;diff --git a/prisma/schema.prisma b/prisma/schema.prismaindex e07cd464..d0272244 100644--- a/prisma/schema.prisma+++ b/prisma/schema.prisma@@ -162,6 +162,7 @@ model Link {pdf String?readable String?monolith String?+ aiTagged Boolean @default(false)lastPreserved DateTime?importDate DateTime?createdAt DateTime @default(now())diff --git a/scripts/worker.ts b/scripts/worker.tsindex 8629bd67..f5142393 100644--- a/scripts/worker.ts+++ b/scripts/worker.ts@@ -55,9 +55,7 @@ async function processBatch() {},},},- tags: {- none: {},- },+ aiTagged: false,},],},@@ -113,9 +111,7 @@ async function processBatch() {},},},- tags: {- none: {},- },+ aiTagged: false,},],},