update wishes

Author: meleksomai

apps/web/actions/wishes.test.ts

@@ -1,5 +1,9 @@
 import { beforeEach, describe, expect, it, vi } from "vitest";
 
+vi.hoisted(() => {
+  process.env.NTFY_WISHES_ID = "baby-wishes";
+});
+
 vi.mock("@workspace/flags", () => ({
   enableShareWishes: vi.fn(),
 }));
@@ -13,13 +17,19 @@ vi.mock("@workspace/database", () => ({
   },
 }));
 
+vi.mock("@workspace/ntfy", () => ({
+  publish: vi.fn(),
+}));
+
 import { db } from "@workspace/database";
 import { enableShareWishes } from "@workspace/flags";
+import { publish } from "@workspace/ntfy";
 import { getPublicWishes, submitWish } from "./wishes";
 
 const mockSubmit = vi.mocked(db.wishes.submit);
 const mockReadPublic = vi.mocked(db.wishes.readPublic);
 const mockEnableShareWishes = vi.mocked(enableShareWishes);
+const mockPublish = vi.mocked(publish);
 
 function createFormData(data: {
   name?: string;
@@ -39,6 +49,7 @@ describe("wishes actions", () => {
   beforeEach(() => {
     vi.clearAllMocks();
     mockEnableShareWishes.mockResolvedValue(true);
+    mockPublish.mockResolvedValue(new Response());
   });
 
   describe("submitWish", () => {
@@ -60,6 +71,12 @@ describe("wishes actions", () => {
         message: "Congratulations!",
         isPublic: true,
       });
+      expect(mockPublish).toHaveBeenCalledWith({
+        topic: "baby-wishes",
+        title: "New wish from John Doe (john@example.com)",
+        message: "Congratulations!",
+        tags: ["baby", "heart"],
+      });
     });
 
     it("submits a private wish when isPublic is not checked", async () => {
@@ -93,6 +110,7 @@ describe("wishes actions", () => {
       ).rejects.toThrow("Missing required fields");
 
       expect(mockSubmit).not.toHaveBeenCalled();
+      expect(mockPublish).not.toHaveBeenCalled();
     });
 
     it("throws error when email is missing", async () => {
@@ -106,6 +124,7 @@ describe("wishes actions", () => {
       ).rejects.toThrow("Missing required fields");
 
       expect(mockSubmit).not.toHaveBeenCalled();
+      expect(mockPublish).not.toHaveBeenCalled();
     });
 
     it("throws error when message is missing", async () => {
@@ -119,6 +138,7 @@ describe("wishes actions", () => {
       ).rejects.toThrow("Missing required fields");
 
       expect(mockSubmit).not.toHaveBeenCalled();
+      expect(mockPublish).not.toHaveBeenCalled();
     });
 
     it("propagates database errors", async () => {
@@ -148,6 +168,7 @@ describe("wishes actions", () => {
       );
 
       expect(mockSubmit).not.toHaveBeenCalled();
+      expect(mockPublish).not.toHaveBeenCalled();
     });
   });
 

apps/web/actions/wishes.ts

@@ -3,6 +3,9 @@
 import type { PublicWish } from "@workspace/database";
 import { db } from "@workspace/database";
 import { enableShareWishes } from "@workspace/flags";
+import { publish } from "@workspace/ntfy";
+
+const NTFY_TOPIC = process.env.NTFY_WISHES_ID;
 
 export async function submitWish(formData: FormData): Promise<void> {
   const isShareWishesEnabled = await enableShareWishes();
@@ -23,6 +26,15 @@ export async function submitWish(formData: FormData): Promise<void> {
     message,
     isPublic,
   });
+
+  if (NTFY_TOPIC) {
+    await publish({
+      topic: NTFY_TOPIC,
+      title: `New wish from ${name} (${email})`,
+      message,
+      tags: ["baby", "heart"],
+    });
+  }
 }
 
 export async function getPublicWishes(): Promise<PublicWish[]> {

apps/web/app/(news)/baby/_components/born-view.tsx

@@ -55,7 +55,6 @@ export function BornView() {
 
       <ExpandableImage
         alt="Baby Sarah Janet Somai shortly after birth"
-        className="rounded-lg"
         src="https://7civhc6kzuyy90te.public.blob.vercel-storage.com/baby/baby_mon-DRtNwVBsw2DW1rciuXGI4goGpcfHp1"
       />
     </div>

apps/web/app/(news)/baby/_components/signbook.tsx

@@ -86,26 +86,6 @@ export function SignBook() {
                   rows={3}
                 />
               </div>
-
-              <div className="space-y-1">
-                <div className="flex items-center gap-2">
-                  <input
-                    className="size-4 accent-primary"
-                    id="isPublic"
-                    name="isPublic"
-                    type="checkbox"
-                  />
-                  <Label
-                    className="text-muted-foreground text-xs"
-                    htmlFor="isPublic"
-                  >
-                    Share publicly on the page
-                  </Label>
-                </div>
-                <p className="pl-6 text-muted-foreground/70 text-xs">
-                  Public messages are reviewed before being displayed
-                </p>
-              </div>
             </div>
 
             <AlertDialogFooter className="mt-6">

apps/web/package.json

@@ -20,6 +20,7 @@
     "@vercel/speed-insights": "1.3.1",
     "@vercel/toolbar": "0.1.41",
     "@workspace/database": "workspace:*",
+    "@workspace/ntfy": "workspace:*",
     "@workspace/emailing": "workspace:*",
     "@workspace/flags": "workspace:*",
     "@workspace/ui": "workspace:*",

packages/ntfy/index.test.ts

@@ -0,0 +1,79 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { publish } from "./index";
+
+const mockFetch = vi.fn();
+
+beforeEach(() => {
+  vi.stubGlobal("fetch", mockFetch);
+  mockFetch.mockResolvedValue(new Response());
+});
+
+afterEach(() => {
+  vi.restoreAllMocks();
+});
+
+describe("publish", () => {
+  it("sends a POST request to the default ntfy URL", async () => {
+    await publish({ topic: "test", message: "hello" });
+
+    expect(mockFetch).toHaveBeenCalledWith("https://ntfy.sh", {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({
+        topic: "test",
+        title: undefined,
+        message: "hello",
+        priority: undefined,
+        tags: undefined,
+      }),
+    });
+  });
+
+  it("sends to a custom base URL when provided", async () => {
+    await publish(
+      { topic: "test", message: "hello" },
+      { baseUrl: "https://ntfy.example.com" }
+    );
+
+    expect(mockFetch).toHaveBeenCalledWith(
+      "https://ntfy.example.com",
+      expect.objectContaining({ method: "POST" })
+    );
+  });
+
+  it("includes all optional fields in the request body", async () => {
+    await publish({
+      topic: "alerts",
+      title: "Alert",
+      message: "Something happened",
+      priority: 5,
+      tags: ["warning", "skull"],
+    });
+
+    const body = JSON.parse(mockFetch.mock.calls[0][1].body as string);
+    expect(body).toEqual({
+      topic: "alerts",
+      title: "Alert",
+      message: "Something happened",
+      priority: 5,
+      tags: ["warning", "skull"],
+    });
+  });
+
+  it("returns the fetch Response", async () => {
+    const expected = new Response("ok", { status: 200 });
+    mockFetch.mockResolvedValue(expected);
+
+    const result = await publish({ topic: "test", message: "hi" });
+
+    expect(result).toBe(expected);
+  });
+
+  it("propagates fetch errors", async () => {
+    mockFetch.mockRejectedValue(new Error("Network error"));
+
+    await expect(publish({ topic: "test", message: "hi" })).rejects.toThrow(
+      "Network error"
+    );
+  });
+});

packages/ntfy/index.ts

@@ -0,0 +1,32 @@
+const DEFAULT_BASE_URL = "https://ntfy.sh";
+
+export interface NtfyMessage {
+  topic: string;
+  title?: string;
+  message: string;
+  priority?: 1 | 2 | 3 | 4 | 5;
+  tags?: string[];
+}
+
+export interface NtfyOptions {
+  baseUrl?: string;
+}
+
+export function publish(
+  msg: NtfyMessage,
+  options?: NtfyOptions
+): Promise<Response> {
+  const baseUrl = options?.baseUrl ?? DEFAULT_BASE_URL;
+
+  return fetch(baseUrl, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({
+      topic: msg.topic,
+      title: msg.title,
+      message: msg.message,
+      priority: msg.priority,
+      tags: msg.tags,
+    }),
+  });
+}

packages/ntfy/package.json

@@ -0,0 +1,19 @@
+{
+  "name": "@workspace/ntfy",
+  "version": "0.0.0",
+  "private": true,
+  "exports": {
+    ".": "./index.ts"
+  },
+  "scripts": {
+    "clean": "git clean -xdf .cache .turbo dist node_modules",
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "typecheck": "tsc --noEmit --emitDeclarationOnly false"
+  },
+  "devDependencies": {
+    "@workspace/typescript-config": "workspace:*",
+    "typescript": "5.9.3",
+    "vitest": "3.2.4"
+  }
+}

packages/ntfy/tsconfig.json

@@ -0,0 +1,8 @@
+{
+  "extends": "@workspace/typescript-config/base.json",
+  "compilerOptions": {
+    "baseUrl": "."
+  },
+  "include": ["**/*.ts"],
+  "exclude": ["node_modules"]
+}

packages/ntfy/vitest.config.ts

@@ -0,0 +1,8 @@
+import { defineConfig } from "vitest/config";
+
+export default defineConfig({
+  test: {
+    environment: "node",
+    include: ["**/*.test.ts"],
+  },
+});