Skip to content

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

Enhance announcement handling by adding support for announcement messages

daniel31x13ab19df767ceb
diff --git a/apps/web/components/Announcement.tsx b/apps/web/components/Announcement.tsx
index 6c9e42ae..b7b9e843 100644
--- a/apps/web/components/Announcement.tsx
+++ b/apps/web/components/Announcement.tsx
@@ -9,24 +9,39 @@ type Props = {
export default function Announcement({ toggleAnnouncementBar }: Props) {
const announcementId = localStorage.getItem("announcementId");
+ const announcementMessage = localStorage.getItem("announcementMessage");
return (
<div className="fixed mx-auto bottom-20 sm:bottom-10 w-full pointer-events-none p-5 z-30">
<div className="mx-auto pointer-events-auto p-2 flex justify-between gap-2 items-center border border-primary shadow-xl rounded-xl bg-base-300 backdrop-blur-sm bg-opacity-80 max-w-md">
<i className="bi-stars text-xl text-yellow-600 dark:text-yellow-500"></i>
<p className="w-4/5 text-center text-sm sm:text-base">
- <Trans
- i18nKey="new_version_announcement"
- values={{ version: announcementId }}
- components={[
- <Link
- href={`https://linkwarden.app/blog/releases/${announcementId}`}
- target="_blank"
- className="underline decoration-dotted underline-offset-4 hover:text-primary duration-100"
- key={0}
- />,
- ]}
- />
+ {announcementId ? (
+ <Trans
+ i18nKey="new_version_announcement"
+ values={{ version: announcementId }}
+ components={[
+ <Link
+ href={`https://linkwarden.app/blog/releases/${announcementId}`}
+ target="_blank"
+ className="underline decoration-dotted underline-offset-4 hover:text-primary duration-100"
+ key={0}
+ />,
+ ]}
+ />
+ ) : announcementMessage ? (
+ <Trans
+ i18nKey={announcementMessage}
+ components={[
+ <Link
+ href={`https://linkwarden.app/blog`}
+ target="_blank"
+ className="underline decoration-dotted underline-offset-4 hover:text-primary duration-100"
+ key={0}
+ />,
+ ]}
+ />
+ ) : undefined}
</p>
<Button variant="ghost" size="icon" onClick={toggleAnnouncementBar}>
<i className="bi-x text-xl"></i>
diff --git a/apps/web/lib/client/getLatestVersion.ts b/apps/web/lib/client/getLatestVersion.ts
index 001a28d0..3397f774 100644
--- a/apps/web/lib/client/getLatestVersion.ts
+++ b/apps/web/lib/client/getLatestVersion.ts
@@ -1,5 +1,6 @@
export default async function getLatestVersion(setShowAnnouncement: Function) {
const announcementId = localStorage.getItem("announcementId");
+ const announcementMessage = localStorage.getItem("announcementMessage");
const response = await fetch(
`https://linkwarden.app/blog/latest-announcement.json`
@@ -8,9 +9,16 @@ export default async function getLatestVersion(setShowAnnouncement: Function) {
const data = await response.json();
const latestAnnouncement = data.id;
+ const latestMessage = data.message;
- if (announcementId !== latestAnnouncement) {
+ if (
+ announcementId !== latestAnnouncement ||
+ announcementMessage !== latestMessage
+ ) {
setShowAnnouncement(true);
- localStorage.setItem("announcementId", latestAnnouncement);
+ if (latestAnnouncement)
+ localStorage.setItem("announcementId", latestAnnouncement);
+ if (latestMessage)
+ localStorage.setItem("announcementMessage", latestMessage);
}
}