@jant/core 0.6.12 → 0.6.14

package/src/routes/api/internal/sites.ts

@@ -163,11 +163,11 @@ internalSitesRoutes.get(
   },
 );
 
-// Clean up a single managed site's expired upload sessions and orphaned media
-// (uploaded during compose but never published). Invoked per-site by the
-// hosted control plane's scheduled maintenance. Self-hosted operators use the
-// host-scoped `POST /api/internal/uploads/cleanup` route / `jant uploads
-// cleanup` CLI instead.
+// Clean up a single managed site's expired upload sessions and due trash
+// objects. Invoked per-site by the hosted control plane's scheduled
+// maintenance. Self-hosted operators use the host-scoped
+// `POST /api/internal/uploads/cleanup` route / `jant uploads cleanup` CLI
+// instead.
 internalSitesRoutes.post(
   "/:siteId/uploads/cleanup",
   requireInternalAdminApi(),

package/src/routes/api/nav-items.ts

@@ -3,6 +3,7 @@
  */
 
 import { Hono } from "hono";
+import type { Context } from "hono";
 import { z } from "zod";
 import type { Bindings } from "../../types.js";
 import type { AppVariables } from "../../types/app-context.js";
@@ -16,16 +17,36 @@ import {
 import { assertFound, parseIdParam, NotFoundError } from "../../lib/errors.js";
 import { ID_PREFIX } from "../../lib/ids.js";
 import { getCollectionPagePath } from "../../lib/collection-paths.js";
+import { renderSiteHeaderHtml } from "../../lib/site-header-fragment.js";
 
 type Env = { Bindings: Bindings; Variables: AppVariables };
 
 export const navItemsApiRoutes = new Hono<Env>();
 
+const INCLUDE_SITE_HEADER_RESPONSE = "include";
+const SITE_HEADER_RESPONSE_HEADER = "x-jant-site-header";
+
 const MoveSchema = z.object({
   after: NavItemIdSchema.nullable().optional(),
   before: NavItemIdSchema.nullable().optional(),
 });
 
+async function withSiteHeaderHtml<T extends object>(
+  c: Context<Env>,
+  body: T,
+): Promise<T | (T & { headerHtml: string })> {
+  if (
+    c.req.header(SITE_HEADER_RESPONSE_HEADER) !== INCLUDE_SITE_HEADER_RESPONSE
+  ) {
+    return body;
+  }
+
+  return {
+    ...body,
+    headerHtml: await renderSiteHeaderHtml(c),
+  };
+}
+
 // List nav items
 navItemsApiRoutes.get("/", async (c) => {
   const items = await c.var.services.navItems.list();
@@ -46,7 +67,7 @@ navItemsApiRoutes.put("/:id/move", requireAuthApi(), async (c) => {
     "Nav item",
   );
 
-  return c.json(item);
+  return c.json(await withSiteHeaderHtml(c, item));
 });
 
 // Create nav item (requires auth)
@@ -82,7 +103,7 @@ navItemsApiRoutes.post("/", requireAuthApi(), async (c) => {
     });
   }
 
-  return c.json(item, 201);
+  return c.json(await withSiteHeaderHtml(c, item), 201);
 });
 
 // Update nav item (requires auth)
@@ -95,7 +116,7 @@ navItemsApiRoutes.put("/:id", requireAuthApi(), async (c) => {
     "Nav item",
   );
 
-  return c.json(item);
+  return c.json(await withSiteHeaderHtml(c, item));
 });
 
 // Delete nav item (requires auth)
@@ -105,5 +126,5 @@ navItemsApiRoutes.delete("/:id", requireAuthApi(), async (c) => {
   const success = await c.var.services.navItems.delete(id);
   if (!success) throw new NotFoundError("Nav item");
 
-  return c.json({ success: true });
+  return c.json(await withSiteHeaderHtml(c, { success: true }));
 });

package/src/routes/dash/settings.tsx

@@ -189,7 +189,10 @@ function breadcrumbLabel(
       );
     case "account":
       return i18n._(
-        msg({ message: "Account", comment: "@context: Breadcrumb label" }),
+        msg({
+          message: "Account & Data",
+          comment: "@context: Breadcrumb label",
+        }),
       );
     case "sessions":
       return i18n._(
@@ -783,7 +786,10 @@ settingsRoutes.get("/navigation", async (c) => {
   const [navItems, directoryData, suggestedLinks] = await Promise.all([
     c.var.services.navItems.list(),
     c.var.services.collections.listDirectoryData(),
-    c.var.services.navItems.listSuggestedLinks(),
+    c.var.services.navItems.listSuggestedLinks({
+      siteOrigin: c.var.appConfig.siteOrigin,
+      sitePathPrefix: c.var.appConfig.sitePathPrefix,
+    }),
   ]);
   const navData = await getNavigationData(c);
 

package/src/routes/feed/__tests__/feed.test.ts

@@ -121,6 +121,48 @@ describe("Atom Feed Routes", () => {
       expect(xml).not.toContain("Hidden Post");
     });
 
+    it("ignores pinned ordering when the main feed is latest", async () => {
+      const { app, services } = createFeedTestApp({
+        RSS_FEED_LIMIT: "2",
+      });
+
+      await services.settings.set("MAIN_RSS_FEED", "latest");
+
+      await services.posts.create({
+        format: "note",
+        title: "Older pinned",
+        bodyMarkdown: "Pinned but old",
+        status: "published",
+        pinned: true,
+        publishedAt: 1000,
+      });
+      await services.posts.create({
+        format: "note",
+        title: "Newer unpinned",
+        bodyMarkdown: "Newer",
+        status: "published",
+        publishedAt: 2000,
+      });
+      await services.posts.create({
+        format: "note",
+        title: "Newest unpinned",
+        bodyMarkdown: "Newest",
+        status: "published",
+        publishedAt: 3000,
+      });
+
+      const res = await app.request("/feed");
+      expect(res.status).toBe(200);
+
+      const xml = await res.text();
+      expect(xml).toContain("Newest unpinned");
+      expect(xml).toContain("Newer unpinned");
+      expect(xml).not.toContain("Older pinned");
+      expect(xml.indexOf("Newest unpinned")).toBeLessThan(
+        xml.indexOf("Newer unpinned"),
+      );
+    });
+
     it("returns Atom content type", async () => {
       const { app } = createFeedTestApp();
 

package/src/routes/feed/__tests__/sitemap.test.ts

@@ -345,19 +345,8 @@ describe("Sitemap Routes", () => {
       expect(xml).toContain(`${TEST_SITE_ORIGIN}/archive`);
     });
 
-    it("includes /latest when the homepage default is 'featured'", async () => {
-      const { app, services } = createSitemapTestApp();
-      await services.settings.set("HOME_DEFAULT_VIEW", "featured");
-
-      const xml = await (await app.request("/sitemap-pages.xml")).text();
-      expect(xml).toContain(`${TEST_SITE_ORIGIN}/latest`);
-      expect(xml).not.toContain(`${TEST_SITE_ORIGIN}/featured`);
-    });
-
-    it("includes /featured when the homepage default is 'latest'", async () => {
-      const { app, services } = createSitemapTestApp();
-      await services.settings.set("HOME_DEFAULT_VIEW", "latest");
-
+    it("includes /featured as the secondary aggregate page", async () => {
+      const { app } = createSitemapTestApp();
       const xml = await (await app.request("/sitemap-pages.xml")).text();
       expect(xml).toContain(`${TEST_SITE_ORIGIN}/featured`);
       expect(xml).not.toContain(`${TEST_SITE_ORIGIN}/latest`);

package/src/routes/feed/feed.ts

@@ -126,6 +126,7 @@ async function buildLatestFeedData(
     excludeLatestHidden: true,
     excludePrivate: true,
     format,
+    ignorePinnedSort: true,
     limit: feedLimit,
   });
 

package/src/routes/feed/sitemap.ts

@@ -185,7 +185,7 @@ sitemapRoutes.get("/sitemap-collections.xml", async (c) => {
 
 sitemapRoutes.get("/sitemap-pages.xml", async (c) => {
   const { appConfig } = c.var;
-  const { siteUrl, sitePathPrefix, homeDefaultView } = appConfig;
+  const { siteUrl, sitePathPrefix } = appConfig;
 
   const urls: SitemapUrlEntry[] = [
     {
@@ -200,12 +200,8 @@ sitemapRoutes.get("/sitemap-pages.xml", async (c) => {
     },
   ];
 
-  // Whichever of /latest and /featured is NOT the homepage default is a
-  // standalone URL worth indexing; the other 302-redirects to `/`.
-  const secondaryAggregate =
-    homeDefaultView === "featured" ? "/latest" : "/featured";
   urls.push({
-    loc: absoluteUrl(secondaryAggregate, siteUrl, sitePathPrefix),
+    loc: absoluteUrl("/featured", siteUrl, sitePathPrefix),
     priority: "0.6",
     changefreq: "daily",
   });

package/src/routes/pages/archive.tsx

@@ -630,6 +630,7 @@ async function buildArchiveFeedData(
     hasMedia: params.hasMedia,
     hasTitle: params.hasTitle,
     hasReplies: params.hasReplies,
+    ignorePinnedSort: true,
     ...(params.validYear
       ? {
           publishedAfter: Date.UTC(params.validYear, 0, 1) / 1000,

package/src/routes/pages/collection.tsx

@@ -263,6 +263,7 @@ export async function renderCollectionFeed(
       {
         status: "published",
         excludePrivate: true,
+        ignoreCollectionPinnedSort: true,
         limit: feedLimit,
       },
     );

package/src/routes/pages/featured.tsx

@@ -27,10 +27,6 @@ featuredRoutes.get("/", async (c) => {
   const navData = await getNavigationData(c);
   const i18n = getI18n(c);
 
-  // When homepage already shows featured, redirect to avoid duplicate content
-  if (navData.homeDefaultView === "featured") {
-    return c.redirect(toPublicPath("/", navData.sitePathPrefix), 302);
-  }
   const page = parsePageNumber(c.req.query("page"));
   const featuredTitle = i18n._(
     msg({

package/src/routes/pages/home.tsx

@@ -3,31 +3,21 @@
  *
  * Timeline feed with per-type card components and thread previews.
  * Uses page-based pagination.
- *
- * The homepage shows whichever built-in feed comes first between
- * Latest and Featured in navigation. The explicit feed routes still work.
  */
 
 import { Hono } from "hono";
 import { msg } from "@lingui/core/macro";
 import type { Bindings } from "../../types.js";
 import type { AppVariables } from "../../types/app-context.js";
-import {
-  getHomeDefaultViewFromNavItems,
-  getNavigationData,
-} from "../../lib/navigation.js";
+import { getNavigationData } from "../../lib/navigation.js";
 import { getI18n } from "../../i18n/index.js";
 import { formatPageLabel, parsePageNumber } from "../../lib/pagination.js";
 import { buildPageTitle } from "../../lib/page-title.js";
 import { renderPublicPage } from "../../lib/render.js";
-import {
-  assembleFeaturedTimeline,
-  assembleTimeline,
-} from "../../lib/timeline.js";
+import { assembleTimeline } from "../../lib/timeline.js";
 import { toAbsoluteSiteUrl, toPublicPath } from "../../lib/url.js";
 import { buildWebSiteJsonLd } from "../../lib/structured-data.js";
 import { HomePage } from "../../ui/pages/HomePage.js";
-import { FeaturedPage } from "../../ui/pages/FeaturedPage.js";
 
 type Env = { Bindings: Bindings; Variables: AppVariables };
 
@@ -39,19 +29,10 @@ homeRoutes.get("/", async (c) => {
   const paginatedPageTitle = formatPageLabel(page);
   const isAuthenticated = c.var.isAuthenticated;
 
-  // Fetch nav items once — we need `homeDefaultView` to decide which timeline
-  // to assemble, but `getNavigationData` also consumes them. Passing them
-  // through avoids a duplicate DB query and unlocks the Promise.all below.
-  const navItems = await c.var.services.navItems.list();
-  const homeDefaultView = getHomeDefaultViewFromNavItems(navItems);
-
-  const timelinePromise =
-    homeDefaultView === "featured"
-      ? assembleFeaturedTimeline(c, { page, isAuthenticated })
-      : assembleTimeline(c, { page, isAuthenticated });
+  const timelinePromise = assembleTimeline(c, { page, isAuthenticated });
 
   const [navData, timeline] = await Promise.all([
-    getNavigationData(c, { preloadedItems: navItems }),
+    getNavigationData(c),
     timelinePromise,
   ]);
 
@@ -74,34 +55,6 @@ homeRoutes.get("/", async (c) => {
         })
       : undefined;
 
-  if (homeDefaultView === "featured") {
-    const featuredTitle = i18n._(
-      msg({
-        message: "Featured",
-        comment: "@context: Browser page title for the featured feed",
-      }),
-    );
-
-    return renderPublicPage(c, {
-      title:
-        page > 1
-          ? buildPageTitle(featuredTitle, paginatedPageTitle, navData.siteName)
-          : navData.siteName,
-      jsonLd: websiteJsonLd,
-      navData,
-      showHomeBranding:
-        c.var.appConfig.showJantBrandingOnHome && currentPage === 1,
-      content: (
-        <FeaturedPage
-          items={items}
-          currentPage={currentPage}
-          totalPages={totalPages}
-          baseUrl={toPublicPath("/", navData.sitePathPrefix)}
-        />
-      ),
-    });
-  }
-
   const latestTitle = i18n._(
     msg({
       message: "Latest",

package/src/routes/pages/latest.tsx

@@ -1,71 +1,22 @@
 /**
  * Latest Page Route
  *
- * Explicit /latest URL that always shows the latest posts timeline.
- * When Latest is the homepage default, this redirects to / to avoid
- * duplicate content. When Featured comes first, this serves as the
- * explicit latest view.
+ * The homepage is the canonical latest timeline, so /latest redirects to /.
  */
 
 import { Hono } from "hono";
-import { msg } from "@lingui/core/macro";
 import type { Bindings } from "../../types.js";
 import type { AppVariables } from "../../types/app-context.js";
-import { getI18n } from "../../i18n/index.js";
-import { getNavigationData } from "../../lib/navigation.js";
-import { formatPageLabel, parsePageNumber } from "../../lib/pagination.js";
-import { buildPageTitle } from "../../lib/page-title.js";
-import { renderPublicPage } from "../../lib/render.js";
-import { assembleTimeline } from "../../lib/timeline.js";
 import { toPublicPath } from "../../lib/url.js";
 import { defaultFeedRenderer } from "../../lib/feed.js";
 import { buildFeedData, parseFormatQuery, renderFeed } from "../feed/feed.js";
-import { HomePage } from "../../ui/pages/HomePage.js";
 
 type Env = { Bindings: Bindings; Variables: AppVariables };
 
 export const latestRoutes = new Hono<Env>();
 
 latestRoutes.get("/", async (c) => {
-  const navData = await getNavigationData(c);
-  const i18n = getI18n(c);
-
-  // When homepage already shows latest, redirect to avoid duplicate content
-  if (navData.homeDefaultView !== "featured") {
-    return c.redirect(toPublicPath("/", navData.sitePathPrefix), 302);
-  }
-
-  const page = parsePageNumber(c.req.query("page"));
-  const latestTitle = i18n._(
-    msg({
-      message: "Latest",
-      comment: "@context: Browser page title for the latest feed",
-    }),
-  );
-  const paginatedPageTitle = formatPageLabel(page);
-
-  const { items, currentPage, totalPages } = await assembleTimeline(c, {
-    page,
-    isAuthenticated: navData.isAuthenticated,
-  });
-
-  return renderPublicPage(c, {
-    title:
-      page > 1
-        ? buildPageTitle(latestTitle, paginatedPageTitle, navData.siteName)
-        : buildPageTitle(latestTitle, navData.siteName),
-    navData,
-    content: (
-      <HomePage
-        items={items}
-        baseUrl={toPublicPath("/latest", navData.sitePathPrefix)}
-        currentPage={currentPage}
-        totalPages={totalPages}
-        isAuthenticated={navData.isAuthenticated}
-        signinUrl={`${toPublicPath("/signin", navData.sitePathPrefix)}?redirect=${encodeURIComponent(toPublicPath("/latest", navData.sitePathPrefix))}`}
-      />
-    ),
-  });
+  return c.redirect(toPublicPath("/", c.var.appConfig.sitePathPrefix), 302);
 });
 
 // Atom — /latest/feed (canonical latest feed; accepts ?format=note|link|quote)

package/src/services/__tests__/github-app-installations.test.ts

@@ -14,7 +14,9 @@ import {
 const SECOND_SITE_ID = "sit_second00000000000000000000000";
 const SECOND_SITE_KEY = "second";
 
-function insertSecondSite(sqlite: ReturnType<typeof createTestDatabase>["sqlite"]) {
+function insertSecondSite(
+  sqlite: ReturnType<typeof createTestDatabase>["sqlite"],
+) {
   const timestamp = Math.floor(Date.now() / 1000);
   sqlite
     .prepare(
@@ -48,9 +50,9 @@ describe("GitHubAppInstallationsService", () => {
   });
 
   it("returns empty list for an unknown site", async () => {
-    expect(await service.listInstallationsForSite(DEFAULT_TEST_SITE_ID)).toEqual(
-      [],
-    );
+    expect(
+      await service.listInstallationsForSite(DEFAULT_TEST_SITE_ID),
+    ).toEqual([]);
   });
 
   it("returns empty list of sites for an unknown installation", async () => {
@@ -78,9 +80,8 @@ describe("GitHubAppInstallationsService", () => {
       DEFAULT_TEST_SITE_ID,
       makeAccount({ login: "old-name" }),
     );
-    const initial = await service.listInstallationsForSite(
-      DEFAULT_TEST_SITE_ID,
-    );
+    const initial =
+      await service.listInstallationsForSite(DEFAULT_TEST_SITE_ID);
     const addedAt = initial[0]!.addedAt;
 
     await service.upsertInstallation(
@@ -88,9 +89,8 @@ describe("GitHubAppInstallationsService", () => {
       DEFAULT_TEST_SITE_ID,
       makeAccount({ login: "renamed-org", avatarUrl: "https://x.png" }),
     );
-    const updated = await service.listInstallationsForSite(
-      DEFAULT_TEST_SITE_ID,
-    );
+    const updated =
+      await service.listInstallationsForSite(DEFAULT_TEST_SITE_ID);
     expect(updated).toHaveLength(1);
     expect(updated[0]!.addedAt).toBe(addedAt);
     expect(updated[0]!.account.login).toBe("renamed-org");

package/src/services/__tests__/navigation.test.ts

@@ -446,6 +446,47 @@ describe("NavItemService", () => {
       expect(suggestions).toEqual([]);
     });
 
+    it("hides suggestions already represented by a same-site absolute URL", async () => {
+      insertTestPost(sqlite, {
+        id: TEST_POST_ID,
+        slug: "about",
+        title: "About",
+      });
+
+      await navItemService.create({
+        type: "link",
+        label: "About",
+        url: "https://preview-test.owenyoung.com/about",
+      });
+
+      const suggestions = await navItemService.listSuggestedLinks({
+        siteOrigin: "https://preview-test.owenyoung.com",
+      });
+
+      expect(suggestions).toEqual([]);
+    });
+
+    it("hides suggestions already represented by a public path prefix", async () => {
+      insertTestPost(sqlite, {
+        id: TEST_POST_ID,
+        slug: "about",
+        title: "About",
+      });
+
+      await navItemService.create({
+        type: "link",
+        label: "About",
+        url: "https://example.com/blog/about",
+      });
+
+      const suggestions = await navItemService.listSuggestedLinks({
+        siteOrigin: "https://example.com",
+        sitePathPrefix: "/blog",
+      });
+
+      expect(suggestions).toEqual([]);
+    });
+
     it("does not suggest draft or private posts", async () => {
       insertTestPost(sqlite, {
         id: TEST_POST_ID,

package/src/services/__tests__/post-timeline.test.ts

@@ -591,6 +591,62 @@ describe("PostService - Timeline features", () => {
       expect(entries[1]?.collectedAt).toBe(100);
     });
 
+    it("can ignore collection pins for subscription feed ordering", async () => {
+      const collection = await collectionService.create({
+        slug: "rss",
+        title: "RSS",
+      });
+      const olderRoot = await postService.create({
+        format: "note",
+        bodyMarkdown: "Older pinned root",
+        publishedAt: 1000,
+      });
+      const newerRoot = await postService.create({
+        format: "note",
+        bodyMarkdown: "Newer unpinned root",
+        publishedAt: 2000,
+      });
+
+      await db.insert(postCollections).values([
+        {
+          siteId: DEFAULT_TEST_SITE_ID,
+          postId: olderRoot.id,
+          collectionId: collection.id,
+          createdAt: 100,
+          pinnedAt: 5000,
+        },
+        {
+          siteId: DEFAULT_TEST_SITE_ID,
+          postId: newerRoot.id,
+          collectionId: collection.id,
+          createdAt: 200,
+        },
+      ]);
+
+      const pageEntries = await postService.listCollectionFeedEntries(
+        collection.id,
+        {
+          status: "published",
+        },
+      );
+      const feedEntries = await postService.listCollectionFeedEntries(
+        collection.id,
+        {
+          status: "published",
+          ignoreCollectionPinnedSort: true,
+        },
+      );
+
+      expect(pageEntries.map((entry) => entry.post.id)).toEqual([
+        olderRoot.id,
+        newerRoot.id,
+      ]);
+      expect(feedEntries.map((entry) => entry.post.id)).toEqual([
+        newerRoot.id,
+        olderRoot.id,
+      ]);
+    });
+
     it("dedupes shared threads across multiple collections", async () => {
       const smart = await collectionService.create({
         slug: "smart",

package/src/services/__tests__/post.test.ts

@@ -786,6 +786,39 @@ describe("PostService", () => {
       ]);
     });
 
+    it("can ignore pinned sort for subscription feed queries", async () => {
+      await postService.create({
+        format: "note",
+        bodyMarkdown: "older pinned",
+        pinned: true,
+        status: "published",
+        publishedAt: 1000,
+      });
+      await postService.create({
+        format: "note",
+        bodyMarkdown: "newer unpinned",
+        status: "published",
+        publishedAt: 2000,
+      });
+      await postService.create({
+        format: "note",
+        bodyMarkdown: "newest unpinned",
+        status: "published",
+        publishedAt: 3000,
+      });
+
+      const results = await postService.list({
+        status: "published",
+        ignorePinnedSort: true,
+        limit: 2,
+      });
+
+      expect(results.map((p) => p.bodyText)).toEqual([
+        "newest unpinned",
+        "newer unpinned",
+      ]);
+    });
+
     it("excludes deleted posts", async () => {
       const post = await postService.create({
         format: "note",

package/src/services/__tests__/settings.test.ts

@@ -164,7 +164,6 @@ describe("SettingsService", () => {
       siteLanguage: "en",
       cjkSerifFont: "off",
       showJantBrandingOnHome: false,
-      homeDefaultView: "latest",
       mainRssFeed: "featured",
       timeZone: "UTC",
     };
@@ -198,25 +197,6 @@ describe("SettingsService", () => {
       expect(await settingsService.get("SITE_NAME")).toBe("Trimmed");
     });
 
-    it("removes HOME_DEFAULT_VIEW when set to default", async () => {
-      await settingsService.set("HOME_DEFAULT_VIEW", "featured");
-      await settingsService.updateGeneral(
-        { ...defaults, homeDefaultView: "latest" },
-        { oldLanguage: "en", fallbackSiteName: "Jant" },
-      );
-
-      expect(await settingsService.get("HOME_DEFAULT_VIEW")).toBeNull();
-    });
-
-    it("stores HOME_DEFAULT_VIEW when set to featured", async () => {
-      await settingsService.updateGeneral(
-        { ...defaults, homeDefaultView: "featured" },
-        { oldLanguage: "en", fallbackSiteName: "Jant" },
-      );
-
-      expect(await settingsService.get("HOME_DEFAULT_VIEW")).toBe("featured");
-    });
-
     it("removes MAIN_RSS_FEED when set to default (featured)", async () => {
       await settingsService.set("MAIN_RSS_FEED", "latest");
       await settingsService.updateGeneral(
@@ -514,6 +494,11 @@ describe("SettingsService", () => {
 
       await settingsService.updateSearchSettings(true, { demoMode: false });
       expect(await settingsService.get("NOINDEX")).toBeNull();
+
+      await settingsService.updateHomeBranding(false);
+      expect(
+        await settingsService.get("SHOW_JANT_BRANDING_ON_HOME"),
+      ).toBeNull();
     });
   });
 });