@jant/core 0.6.12 → 0.6.14

package/src/services/post.ts

@@ -119,6 +119,8 @@ export interface PostFilters {
   hasReplies?: boolean;
   /** Explicit result sort order */
   sortOrder?: SortOrder;
+  /** Ignore global pinned ordering when sorting subscription/feed results. */
+  ignorePinnedSort?: boolean;
   limit?: number;
   cursor?: string;
   offset?: number; // offset for page-based pagination
@@ -137,6 +139,11 @@ interface ThreadRootPageOptions {
   offset?: number;
 }
 
+interface CollectionFeedEntryOptions extends ThreadRootPageOptions {
+  /** Ignore per-collection pinned ordering when sorting collection feeds. */
+  ignoreCollectionPinnedSort?: boolean;
+}
+
 interface CollectionThreadRootPageOptions extends ThreadRootPageOptions {
   sortOrder?: CollectionSortOrder;
 }
@@ -314,12 +321,12 @@ export interface PostService {
   /** List collection feed entries ordered by latest added-at timestamp */
   listCollectionFeedEntries(
     collectionId: string,
-    options?: ThreadRootPageOptions,
+    options?: CollectionFeedEntryOptions,
   ): Promise<CollectionFeedEntry[]>;
   /** List collection feed entries for a union of collections */
   listCollectionFeedEntriesForCollections(
     collectionIds: string[],
-    options?: ThreadRootPageOptions,
+    options?: CollectionFeedEntryOptions,
   ): Promise<CollectionFeedEntry[]>;
   /** Fetch all published, non-deleted posts for each requested thread root */
   getPublishedThreads(rootIds: string[]): Promise<Map<string, Post[]>>;
@@ -902,76 +909,90 @@ export function createPostService(
     const cursorSortTimestamp = getCursorSortTimestamp(cursorPost);
     const cursorRatingPresence = cursorPost.rating === null ? 0 : 1;
     const cursorRating = cursorPost.rating ?? -1;
+    const withPinnedSortKey = (
+      keys: [CursorSortKey, ...CursorSortKey[]],
+    ): [CursorSortKey, ...CursorSortKey[]] =>
+      filters.ignorePinnedSort
+        ? keys
+        : [
+            { direction: "desc", expr: pinnedSortExpr, value: cursorPinnedAt },
+            ...keys,
+          ];
 
     if (filters.featured || filters.sortOrder === undefined) {
       if (filters.featured) {
-        return buildLexicographicCursorCondition([
-          { direction: "desc", expr: pinnedSortExpr, value: cursorPinnedAt },
+        return buildLexicographicCursorCondition(
+          withPinnedSortKey([
+            {
+              direction: "desc",
+              expr: featuredSortExpr,
+              value: cursorFeaturedAt,
+            },
+            { direction: "desc", expr: posts.id, value: cursorPost.id },
+          ]),
+        );
+      }
+
+      return buildLexicographicCursorCondition(
+        withPinnedSortKey([
           {
             direction: "desc",
-            expr: featuredSortExpr,
-            value: cursorFeaturedAt,
+            expr: sortTimestampSortExpr,
+            value: cursorSortTimestamp,
           },
           { direction: "desc", expr: posts.id, value: cursorPost.id },
-        ]);
-      }
-
-      return buildLexicographicCursorCondition([
-        { direction: "desc", expr: pinnedSortExpr, value: cursorPinnedAt },
-        {
-          direction: "desc",
-          expr: sortTimestampSortExpr,
-          value: cursorSortTimestamp,
-        },
-        { direction: "desc", expr: posts.id, value: cursorPost.id },
-      ]);
+        ]),
+      );
     }
 
     if (filters.sortOrder === "oldest") {
-      return buildLexicographicCursorCondition([
-        { direction: "desc", expr: pinnedSortExpr, value: cursorPinnedAt },
-        {
-          direction: "asc",
-          expr: sortTimestampSortExpr,
-          value: cursorSortTimestamp,
-        },
-        { direction: "asc", expr: posts.id, value: cursorPost.id },
-      ]);
+      return buildLexicographicCursorCondition(
+        withPinnedSortKey([
+          {
+            direction: "asc",
+            expr: sortTimestampSortExpr,
+            value: cursorSortTimestamp,
+          },
+          { direction: "asc", expr: posts.id, value: cursorPost.id },
+        ]),
+      );
     }
 
     if (filters.sortOrder === "rating_desc") {
-      return buildLexicographicCursorCondition([
-        { direction: "desc", expr: pinnedSortExpr, value: cursorPinnedAt },
+      return buildLexicographicCursorCondition(
+        withPinnedSortKey([
+          {
+            direction: "desc",
+            expr: ratingPresenceExpr,
+            value: cursorRatingPresence,
+          },
+          { direction: "desc", expr: ratingSortExpr, value: cursorRating },
+          {
+            direction: "desc",
+            expr: sortTimestampSortExpr,
+            value: cursorSortTimestamp,
+          },
+          { direction: "desc", expr: posts.id, value: cursorPost.id },
+        ]),
+      );
+    }
+
+    return buildLexicographicCursorCondition(
+      withPinnedSortKey([
         {
           direction: "desc",
           expr: ratingPresenceExpr,
           value: cursorRatingPresence,
         },
-        { direction: "desc", expr: ratingSortExpr, value: cursorRating },
+        { direction: "asc", expr: ratingSortExpr, value: cursorRating },
         {
           direction: "desc",
           expr: sortTimestampSortExpr,
           value: cursorSortTimestamp,
         },
         { direction: "desc", expr: posts.id, value: cursorPost.id },
-      ]);
-    }
-
-    return buildLexicographicCursorCondition([
-      { direction: "desc", expr: pinnedSortExpr, value: cursorPinnedAt },
-      {
-        direction: "desc",
-        expr: ratingPresenceExpr,
-        value: cursorRatingPresence,
-      },
-      { direction: "asc", expr: ratingSortExpr, value: cursorRating },
-      {
-        direction: "desc",
-        expr: sortTimestampSortExpr,
-        value: cursorSortTimestamp,
-      },
-      { direction: "desc", expr: posts.id, value: cursorPost.id },
-    ]);
+      ]),
+    );
   }
 
   function toPost(
@@ -1328,6 +1349,9 @@ export function createPostService(
       const pinnedSortExpr = sql<number>`coalesce(${posts.pinnedAt}, -1)`;
       const featuredSortExpr = sql<number>`coalesce(${posts.featuredAt}, -1)`;
       const sortTimestampSortExpr = sql<number>`coalesce(${sortTimestamp}, -1)`;
+      const pinnedOrder = filters.ignorePinnedSort
+        ? []
+        : [desc(pinnedSortExpr)];
 
       const baseQuery = db
         .select()
@@ -1338,7 +1362,7 @@ export function createPostService(
       let query =
         filters.featured || filters.sortOrder === undefined
           ? baseQuery.orderBy(
-              desc(pinnedSortExpr),
+              ...pinnedOrder,
               filters.featured
                 ? desc(featuredSortExpr)
                 : desc(sortTimestampSortExpr),
@@ -1346,20 +1370,20 @@ export function createPostService(
             )
           : filters.sortOrder === "oldest"
             ? baseQuery.orderBy(
-                desc(pinnedSortExpr),
+                ...pinnedOrder,
                 asc(sortTimestampSortExpr),
                 asc(posts.id),
               )
             : filters.sortOrder === "rating_desc"
               ? baseQuery.orderBy(
-                  desc(pinnedSortExpr),
+                  ...pinnedOrder,
                   desc(ratingPresence),
                   desc(posts.rating),
                   desc(sortTimestampSortExpr),
                   desc(posts.id),
                 )
               : baseQuery.orderBy(
-                  desc(pinnedSortExpr),
+                  ...pinnedOrder,
                   desc(ratingPresence),
                   asc(posts.rating),
                   desc(sortTimestampSortExpr),
@@ -2950,6 +2974,9 @@ export function createPostService(
         sql<number>`MAX(coalesce(${postCollections.pinnedAt}, -1))`.as(
           "collection_pinned_at",
         );
+      const pinnedOrder = options.ignoreCollectionPinnedSort
+        ? []
+        : [desc(collectionPinnedAt)];
 
       let query = db
         .select({
@@ -2968,11 +2995,7 @@ export function createPostService(
         )
         .where(and(...conditions))
         .groupBy(posts.threadId)
-        .orderBy(
-          desc(collectionPinnedAt),
-          desc(threadActivityAt),
-          desc(posts.threadId),
-        );
+        .orderBy(...pinnedOrder, desc(threadActivityAt), desc(posts.threadId));
 
       if (options.limit !== undefined) {
         query = query.limit(options.limit) as typeof query;

package/src/services/settings.ts

@@ -46,7 +46,6 @@ export interface GeneralSettingsData {
   dashboardLanguage?: string;
   cjkSerifFont: string;
   showJantBrandingOnHome: boolean;
-  homeDefaultView?: FeedKind;
   mainRssFeed?: FeedKind;
   timeZone: string;
 }
@@ -404,15 +403,6 @@ export function createSettingsService(
         oldCjkSerifFont: opts.oldCjkSerifFont,
       });
 
-      // Homepage default view: only update if provided (may be managed separately)
-      if (data.homeDefaultView !== undefined) {
-        if (data.homeDefaultView === "featured") {
-          await this.set("HOME_DEFAULT_VIEW", data.homeDefaultView);
-        } else {
-          await this.remove("HOME_DEFAULT_VIEW");
-        }
-      }
-
       await this.updateFeedSettings({ mainRssFeed: data.mainRssFeed });
 
       return {

package/src/services/site-admin.ts

@@ -15,7 +15,6 @@ import { SETTINGS_KEYS } from "../lib/constants.js";
 import { ConflictError, NotFoundError } from "../lib/errors.js";
 import { createEntityId } from "../lib/ids.js";
 import { getConfiguredSingleSiteUrl } from "../lib/env.js";
-import { getHomeDefaultViewFromNavItems } from "../lib/navigation.js";
 import { resolveConfig } from "../lib/resolve-config.js";
 import { buildThemeStyle } from "../lib/theme.js";
 import { now } from "../lib/time.js";
@@ -793,7 +792,6 @@ export function createSiteAdminService(
           siteDescription: appConfig.siteDescription,
           siteLanguage: appConfig.siteLanguage,
           showJantBrandingOnHome: appConfig.showJantBrandingOnHome,
-          homeDefaultView: getHomeDefaultViewFromNavItems(navItemList),
           mainRssFeed: appConfig.mainRssFeed,
           siteFooter: appConfig.siteFooter,
           showHeaderAvatar: appConfig.showHeaderAvatar,

package/src/services/upload-session.ts

@@ -52,10 +52,6 @@ const RELAY_MULTIPART_THRESHOLD = 95 * 1024 * 1024;
 const RELAY_MULTIPART_PART_SIZE = 50 * 1024 * 1024;
 const IMMUTABLE_CACHE_CONTROL = "public, max-age=31536000, immutable";
 const DEFAULT_EXPIRED_UPLOAD_CLEANUP_LIMIT = 20;
-// Grace window before a finalized-but-unattached media row (uploaded during
-// compose, `postId IS NULL`) is reaped. Generous enough that an in-progress
-// compose/edit is never affected; based on `createdAt`, no heartbeat needed.
-const ORPHAN_MEDIA_GRACE_SECONDS = 7 * 24 * 60 * 60;
 type CleanupableUploadSessionState = "pending" | "uploaded" | "failed";
 const CLEANUPABLE_UPLOAD_SESSION_STATES = [
   "pending",
@@ -766,19 +762,6 @@ export function createUploadSessionService(
         deletedSessions += 1;
       }
 
-      // Reap finalized media that was uploaded during compose but never
-      // attached to a post (`postId IS NULL`) past the grace window. This now
-      // soft-deletes via the media service: the DB row is removed and the
-      // storage object is enqueued for deferred deletion. Bounded by the same
-      // per-run `limit`; any backlog drains over subsequent runs.
-      const orphanIds = await media.listOrphanedMediaIds({
-        before: now() - ORPHAN_MEDIA_GRACE_SECONDS,
-        limit,
-      });
-      if (orphanIds.length > 0) {
-        await media.deleteByIds(orphanIds, deps.storage);
-      }
-
       // Physically delete storage objects whose recycle window has elapsed.
       // Skips any object a live media row still references (re-uploads).
       const purgedStorageObjects = await media.purgeDueStorageObjects(
@@ -789,7 +772,10 @@ export function createUploadSessionService(
       return {
         abortedMultipartUploads,
         deletedSessions,
-        deletedOrphanMedia: orphanIds.length,
+        // Retained for response compatibility. Finalized media may be referenced
+        // from post bodies without a `media.post_id`, so upload cleanup must not
+        // infer liveness from attachment state.
+        deletedOrphanMedia: 0,
         purgedStorageObjects,
       };
     },

package/src/styles/tokens.css

@@ -114,9 +114,9 @@
   --type-body-leading: 1.7;
   --type-display-leading: 1.15;
   --type-heading-leading: 1.15;
-  --type-heading-weight: var(--fw-regular);
+  --type-heading-weight: var(--fw-medium);
   --type-heading-tracking: 0;
-  --type-display-weight: var(--fw-regular);
+  --type-display-weight: var(--fw-medium);
   --type-display-tracking: 0;
   --type-label-weight: var(--fw-medium);
   --type-label-tracking: 0.08em;