Skip to content

⚡️⚡️⚡️ Self-hosted collaborative bookmark manager to collect, read, annotate, and fully preserve what matters, all in one place.

Add user option to archive as readable

Isaacd71216a908a6
diff --git a/lib/api/archiveHandler.ts b/lib/api/archiveHandler.ts
index 16416747..a6801cb0 100644
--- a/lib/api/archiveHandler.ts
+++ b/lib/api/archiveHandler.ts
@@ -92,7 +92,7 @@ export default async function archiveHandler(link: LinksAndCollectionAndOwner) {
if (!link.preview) await handleArchivePreview(link, page);
// Readability
- if (!link.readable) await handleReadability(content, link);
+ if (user.archiveAsReadable && !link.readable) await handleReadability(content, link);
// Auto-tagging
if (
@@ -137,7 +137,7 @@ export default async function archiveHandler(link: LinksAndCollectionAndOwner) {
preview: !finalLink.preview ? "unavailable" : undefined,
aiTagged:
user.aiTaggingMethod !== AiTaggingMethod.DISABLED &&
- !finalLink.aiTagged
+ !finalLink.aiTagged
? true
: undefined,
},
diff --git a/lib/api/controllers/users/userId/updateUserById.ts b/lib/api/controllers/users/userId/updateUserById.ts
index 7f1e0892..06184e20 100644
--- a/lib/api/controllers/users/userId/updateUserById.ts
+++ b/lib/api/controllers/users/userId/updateUserById.ts
@@ -19,9 +19,8 @@ export default async function updateUserById(
if (!dataValidation.success) {
return {
- response: `Error: ${
- dataValidation.error.issues[0].message
- } [${dataValidation.error.issues[0].path.join(", ")}]`,
+ response: `Error: ${dataValidation.error.issues[0].message
+ } [${dataValidation.error.issues[0].path.join(", ")}]`,
status: 400,
};
}
@@ -33,18 +32,18 @@ export default async function updateUserById(
id: { not: userId },
OR: emailEnabled
? [
- {
- username: data.username.toLowerCase(),
- },
- {
- email: data.email?.toLowerCase(),
- },
- ]
+ {
+ username: data.username.toLowerCase(),
+ },
+ {
+ email: data.email?.toLowerCase(),
+ },
+ ]
: [
- {
- username: data.username.toLowerCase(),
- },
- ],
+ {
+ username: data.username.toLowerCase(),
+ },
+ ],
},
});
@@ -207,6 +206,7 @@ export default async function updateUserById(
archiveAsScreenshot: data.archiveAsScreenshot,
archiveAsMonolith: data.archiveAsMonolith,
archiveAsPDF: data.archiveAsPDF,
+ archiveAsReadable: data.archiveAsReadable,
archiveAsWaybackMachine: data.archiveAsWaybackMachine,
linksRouteTo: data.linksRouteTo,
dashboardPinnedLinks: data.dashboardPinnedLinks,
diff --git a/lib/shared/schemaValidation.ts b/lib/shared/schemaValidation.ts
index 5d85087d..e608264e 100644
--- a/lib/shared/schemaValidation.ts
+++ b/lib/shared/schemaValidation.ts
@@ -41,12 +41,12 @@ export const PostUserSchema = () => {
username: emailEnabled
? z.string().optional()
: z
- .string()
- .trim()
- .toLowerCase()
- .min(3)
- .max(50)
- .regex(/^[a-z0-9_-]{3,50}$/),
+ .string()
+ .trim()
+ .toLowerCase()
+ .min(3)
+ .max(50)
+ .regex(/^[a-z0-9_-]{3,50}$/),
invite: z.boolean().optional(),
});
};
@@ -72,8 +72,9 @@ export const UpdateUserSchema = () => {
newPassword: z.string().min(8).max(2048).optional(),
oldPassword: z.string().min(8).max(2048).optional(),
archiveAsScreenshot: z.boolean().optional(),
- archiveAsPDF: z.boolean().optional(),
archiveAsMonolith: z.boolean().optional(),
+ archiveAsPDF: z.boolean().optional(),
+ archiveAsReadable: z.boolean().optional(),
archiveAsWaybackMachine: z.boolean().optional(),
dashboardPinnedLinks: z.boolean().optional(),
dashboardRecentLinks: z.boolean().optional(),
diff --git a/pages/settings/preference.tsx b/pages/settings/preference.tsx
index 7fd4208b..73a387e3 100644
--- a/pages/settings/preference.tsx
+++ b/pages/settings/preference.tsx
@@ -11,7 +11,7 @@ import { useUpdateUser, useUser } from "@/hooks/store/user";
import TagSelection from "@/components/InputSelect/TagSelection";
import { useConfig } from "@/hooks/store/config";
-export default function Appearance() {
+export default function Preference() {
const { t } = useTranslation();
const { settings, updateSettings } = useLocalSettingsStore();
const [submitLoader, setSubmitLoader] = useState(false);
@@ -25,20 +25,21 @@ export default function Appearance() {
const [archiveAsScreenshot, setArchiveAsScreenshot] = useState<boolean>(
account.archiveAsScreenshot || false
);
- const [archiveAsPDF, setArchiveAsPDF] = useState<boolean>(
- account.archiveAsPDF || false
- );
const [archiveAsMonolith, setArchiveAsMonolith] = useState<boolean>(
account.archiveAsMonolith || false
);
+ const [archiveAsPDF, setArchiveAsPDF] = useState<boolean>(
+ account.archiveAsPDF || false
+ );
+ const [archiveAsReadable, setArchiveAsReadable] = useState<boolean>(false);
+ const [archiveAsWaybackMachine, setArchiveAsWaybackMachine] =
+ useState<boolean>(account.archiveAsWaybackMachine || false);
const [dashboardPinnedLinks, setDashboardPinnedLinks] = useState<boolean>(
account.dashboardPinnedLinks || false
);
const [dashboardRecentLinks, setDashboardRecentLinks] = useState<boolean>(
account.dashboardRecentLinks || false
);
- const [archiveAsWaybackMachine, setArchiveAsWaybackMachine] =
- useState<boolean>(account.archiveAsWaybackMachine || false);
const [linksRouteTo, setLinksRouteTo] = useState(account.linksRouteTo);
const [aiTaggingMethod, setAiTaggingMethod] = useState<AiTaggingMethod>(
account.aiTaggingMethod
@@ -53,6 +54,7 @@ export default function Appearance() {
archiveAsScreenshot,
archiveAsMonolith,
archiveAsPDF,
+ archiveAsReadable,
archiveAsWaybackMachine,
linksRouteTo,
preventDuplicateLinks,
@@ -66,6 +68,7 @@ export default function Appearance() {
archiveAsScreenshot,
archiveAsMonolith,
archiveAsPDF,
+ archiveAsReadable,
archiveAsWaybackMachine,
linksRouteTo,
preventDuplicateLinks,
@@ -84,6 +87,7 @@ export default function Appearance() {
setArchiveAsScreenshot(account.archiveAsScreenshot);
setArchiveAsMonolith(account.archiveAsMonolith);
setArchiveAsPDF(account.archiveAsPDF);
+ setArchiveAsReadable(account.archiveAsReadable);
setArchiveAsWaybackMachine(account.archiveAsWaybackMachine);
setLinksRouteTo(account.linksRouteTo);
setPreventDuplicateLinks(account.preventDuplicateLinks);
@@ -143,11 +147,10 @@ export default function Appearance() {
].map(({ theme, icon, bgColor, textColor, activeColor }) => (
<div
key={theme}
- className={`w-full text-center outline-solid outline-neutral-content outline h-20 duration-100 rounded-xl flex items-center justify-center cursor-pointer select-none ${bgColor} ${
- localStorage.getItem("theme") === theme
- ? `outline-primary ${activeColor}`
- : textColor
- }`}
+ className={`w-full text-center outline-solid outline-neutral-content outline h-20 duration-100 rounded-xl flex items-center justify-center cursor-pointer select-none ${bgColor} ${localStorage.getItem("theme") === theme
+ ? `outline-primary ${activeColor}`
+ : textColor
+ }`}
onClick={() => updateSettings({ theme })}
>
<i className={`${icon} text-3xl`}></i>
@@ -314,6 +317,13 @@ export default function Appearance() {
state={archiveAsPDF}
onClick={() => setArchiveAsPDF(!archiveAsPDF)}
/>
+
+ <Checkbox
+ label={t("readable")}
+ state={archiveAsReadable}
+ onClick={() => setArchiveAsReadable(!archiveAsReadable)}
+ />
+
<Checkbox
label={t("archive_org_snapshot")}
state={archiveAsWaybackMachine}
@@ -453,4 +463,4 @@ export default function Appearance() {
);
}
-export { getServerSideProps };
+export { getServerSideProps };
\ No newline at end of file
diff --git a/prisma/migrations/20250201232357_add_archive_as_readable_option_for_user/migration.sql b/prisma/migrations/20250201232357_add_archive_as_readable_option_for_user/migration.sql
new file mode 100644
index 00000000..3d1380cb
--- /dev/null
+++ b/prisma/migrations/20250201232357_add_archive_as_readable_option_for_user/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "User" ADD COLUMN "archiveAsReadable" BOOLEAN NOT NULL DEFAULT true;
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 3754eb8f..551de66f 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -57,6 +57,7 @@ model User {
archiveAsScreenshot Boolean @default(true)
archiveAsMonolith Boolean @default(true)
archiveAsPDF Boolean @default(true)
+ archiveAsReadable Boolean @default(true)
archiveAsWaybackMachine Boolean @default(false)
isPrivate Boolean @default(false)
referredBy String?