@jant/core 0.6.12 → 0.6.13

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;

package/src/styles/ui.css

@@ -7008,6 +7008,14 @@
     max-width: 100%;
   }
 
+  .compose-attachment:has(.compose-attachment-preview-fallback) {
+    width: 112px;
+  }
+
+  .compose-attachment:only-child:has(.compose-attachment-preview-fallback) {
+    width: min(100%, 160px);
+  }
+
   .compose-attachment-thumb {
     position: relative;
     border-radius: var(--media-radius, 0.5rem);
@@ -7015,6 +7023,13 @@
     background-color: var(--site-nav-hover-bg);
   }
 
+  .compose-attachment:has(.compose-attachment-preview-fallback)
+    .compose-attachment-thumb,
+  .compose-attachment:has(.compose-attachment-preview-fallback)
+    .compose-attachment-sortable {
+    width: 100%;
+  }
+
   .compose-attachment-sortable {
     display: block;
     cursor: grab;
@@ -7065,8 +7080,11 @@
     display: flex;
     align-items: center;
     justify-content: center;
-    width: 120px;
-    aspect-ratio: 1 / 1;
+    flex-direction: column;
+    gap: 6px;
+    width: 100%;
+    aspect-ratio: 4 / 3;
+    padding: 10px;
     border: 1px solid color-mix(in srgb, var(--site-divider) 88%, transparent);
     border-radius: var(--media-radius, 0.5rem);
     background: linear-gradient(
@@ -7078,9 +7096,24 @@
   }
 
   .compose-attachment-preview-fallback svg {
+    width: 24px;
+    height: 24px;
     opacity: 0.82;
   }
 
+  .compose-attachment-preview-fallback-label {
+    max-width: 100%;
+    overflow: hidden;
+    color: var(--site-text-secondary);
+    font-family: var(--font-ui);
+    font-size: var(--type-2xs);
+    font-weight: var(--fw-medium);
+    line-height: 1.2;
+    text-align: center;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
   /* Single image: constrain to container width. min-width keeps the preview
      wide enough for the remove button; a very long image overflows it and is
      cropped from the top (object-fit: cover) instead of shrinking to a sliver. */
@@ -7093,8 +7126,7 @@
   }
 
   .compose-attachment:only-child .compose-attachment-preview-fallback {
-    width: min(100%, 320px);
-    max-width: 100%;
+    width: 100%;
     aspect-ratio: 4 / 3;
   }
 
@@ -7107,8 +7139,13 @@
   }
 
   .compose-attachment:not(:only-child) .compose-attachment-preview-fallback {
-    width: 150px;
-    aspect-ratio: 3 / 4;
+    width: 100%;
+    aspect-ratio: 4 / 3;
+  }
+
+  .compose-attachment:only-child .compose-attachment-preview-fallback svg {
+    width: 28px;
+    height: 28px;
   }
 
   .compose-attachment-overlay {
@@ -7197,6 +7234,14 @@
       box-shadow 0.18s ease;
   }
 
+  .compose-attachment:has(.compose-attachment-preview-fallback)
+    .compose-attachment-remove {
+    top: 5px;
+    right: 5px;
+    width: 24px;
+    height: 24px;
+  }
+
   .compose-attachment-remove:hover {
     transform: translateY(-0.5px);
     background-color: color-mix(in srgb, black 58%, transparent);
@@ -7222,6 +7267,13 @@
     pointer-events: none;
   }
 
+  .compose-attachment:has(.compose-attachment-preview-fallback)
+    .compose-attachment-remove
+    svg {
+    width: 12px;
+    height: 12px;
+  }
+
   .compose-attachment-alt {
     border: none;
     background: transparent;
@@ -7556,6 +7608,12 @@
     max-width: none;
   }
 
+  .compose-reply-compose-layout
+    .compose-editor-row
+    .compose-attachment:has(.compose-attachment-preview-fallback) {
+    width: var(--compose-reply-attachment-width);
+  }
+
   .compose-reply-compose-layout
     .compose-editor-row
     .compose-attachment:only-child
@@ -7584,6 +7642,14 @@
     aspect-ratio: auto;
   }
 
+  .compose-reply-compose-layout
+    .compose-editor-row
+    .compose-attachment-preview-fallback
+    svg {
+    width: 28px;
+    height: 28px;
+  }
+
   .compose-reply-compose-layout
     .compose-editor-row
     .compose-attachment-file-card,
@@ -9094,6 +9160,134 @@
     display: block;
   }
 
+  .tiptap-image-figure[data-load-state="missing"] img {
+    display: none;
+  }
+
+  .tiptap-image-missing {
+    display: none;
+    align-items: center;
+    justify-content: center;
+    gap: 14px;
+    min-height: clamp(132px, 26vw, 220px);
+    padding: 18px;
+    border-radius: 4px;
+    background: linear-gradient(
+      135deg,
+      color-mix(in srgb, var(--site-elevated-bg) 88%, var(--site-accent)),
+      var(--site-elevated-bg)
+    );
+    color: var(--site-text-secondary);
+    text-align: left;
+  }
+
+  .tiptap-image-figure[data-load-state="missing"] .tiptap-image-missing {
+    display: flex;
+  }
+
+  .tiptap-image-missing:focus-visible {
+    outline: 2px solid var(--ring);
+    outline-offset: 3px;
+  }
+
+  .tiptap-image-missing-icon {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    width: 38px;
+    height: 38px;
+    border-radius: 999px;
+    border: 1px solid var(--site-divider);
+    background: var(--compose-paper-bg);
+    color: var(--site-text-secondary);
+    flex-shrink: 0;
+  }
+
+  .tiptap-image-missing-copy {
+    display: grid;
+    gap: 3px;
+    min-width: 0;
+    flex: 1 1 auto;
+  }
+
+  .tiptap-image-missing-copy strong {
+    color: var(--site-text-primary);
+    font-family: var(--font-ui);
+    font-size: var(--type-sm);
+    line-height: 1.2;
+  }
+
+  .tiptap-image-missing-source {
+    max-width: 100%;
+    overflow: hidden;
+    color: var(--site-text-secondary);
+    font-family: var(--font-mono);
+    font-size: var(--type-2xs);
+    line-height: 1.35;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+  .tiptap-image-missing-actions {
+    display: flex;
+    align-items: center;
+    gap: 6px;
+    flex-wrap: wrap;
+    justify-content: flex-end;
+    flex: 0 0 auto;
+  }
+
+  .tiptap-image-missing-actions button {
+    border: 1px solid var(--site-divider);
+    border-radius: 5px;
+    padding: 5px 8px;
+    background: var(--compose-paper-bg);
+    color: var(--site-text-primary);
+    font-family: var(--font-ui);
+    font-size: var(--type-2xs);
+    line-height: 1.2;
+    cursor: pointer;
+    transition:
+      border-color 0.16s ease,
+      color 0.16s ease,
+      background-color 0.16s ease;
+  }
+
+  .tiptap-image-missing-actions button:hover {
+    border-color: color-mix(
+      in srgb,
+      var(--site-accent) 45%,
+      var(--site-divider)
+    );
+    color: var(--site-accent);
+  }
+
+  .tiptap-image-missing-actions button:focus-visible {
+    outline: 2px solid var(--ring);
+    outline-offset: 2px;
+  }
+
+  .tiptap-image-missing-actions button:disabled {
+    cursor: not-allowed;
+    opacity: 0.45;
+  }
+
+  .tiptap-image-missing-delete {
+    color: var(--destructive);
+  }
+
+  @media (max-width: 640px) {
+    .tiptap-image-missing {
+      align-items: stretch;
+      flex-direction: column;
+    }
+
+    .tiptap-image-missing-actions,
+    .tiptap-image-missing-actions button {
+      width: 100%;
+    }
+  }
+
   /* Layout variants — in compact dialog, wide/full just fill the container */
   .tiptap-image-figure[data-layout="wide"],
   .tiptap-image-figure[data-layout="full"] {

package/src/types/bindings.ts

@@ -36,7 +36,6 @@ export interface Bindings {
   SITE_DESCRIPTION?: EnvBindingValue;
   SITE_LANGUAGE?: EnvBindingValue;
   DASHBOARD_LANGUAGE?: EnvBindingValue;
-  HOME_DEFAULT_VIEW?: EnvBindingValue;
   MAIN_RSS_FEED?: EnvBindingValue;
   TIME_ZONE?: EnvBindingValue;
   SITE_FOOTER?: EnvBindingValue;

package/src/types/config.ts

@@ -4,6 +4,8 @@
  * Single Source of Truth for all configuration fields.
  */
 
+import type { FeedKind } from "./constants.js";
+
 /**
  * Configuration Registry - Single Source of Truth
  *
@@ -53,11 +55,6 @@ export const CONFIG_FIELDS = {
     envOnly: false,
     envKeys: ["CJK_SERIF_FONT"],
   },
-  HOME_DEFAULT_VIEW: {
-    defaultValue: "latest",
-    envOnly: false,
-    envKeys: ["HOME_DEFAULT_VIEW"],
-  },
   MAIN_RSS_FEED: {
     defaultValue: "featured",
     envOnly: false,
@@ -470,8 +467,7 @@ export interface AppConfig {
   dashboardLanguage: string;
   /** CJK serif font locale: "off", "zh-Hans", "zh-Hant", "ja", or "ko" */
   cjkSerifFont: string;
-  homeDefaultView: string;
-  mainRssFeed: string;
+  mainRssFeed: FeedKind;
   /** Canonical IANA timezone identifier used for date/time display. */
   timeZone: string;
   siteFooter: string;

package/src/ui/compose/ComposeDialog.tsx

@@ -59,6 +59,34 @@ export const ComposeForm: FC<ComposeFormProps> = ({
           "@context: Toast when several pasted remote images couldn't be rehosted; {count} is the number of images",
       }),
     ),
+    brokenImageUnavailable: i18n._(
+      msg({
+        message: "Image unavailable",
+        comment:
+          "@context: Inline editor placeholder title shown when an image cannot load",
+      }),
+    ),
+    brokenImageDelete: i18n._(
+      msg({
+        message: "Delete image",
+        comment:
+          "@context: Inline editor button label for removing a broken image",
+      }),
+    ),
+    brokenImageReplace: i18n._(
+      msg({
+        message: "Replace image",
+        comment:
+          "@context: Inline editor button label for replacing a broken image",
+      }),
+    ),
+    brokenImageOpen: i18n._(
+      msg({
+        message: "Open image URL",
+        comment:
+          "@context: Inline editor button label for opening the original URL of a broken image",
+      }),
+    ),
     note: i18n._(
       msg({
         message: "Note",

package/src/ui/dash/appearance/NavigationContent.tsx

@@ -268,7 +268,7 @@ export function NavigationContent({
     systemLinksDescription: i18n._(
       msg({
         message:
-          "Toggle built-in navigation items. Their order controls what shows in the header and which feed the homepage opens first.",
+          "Show or hide built-in destinations in the header and More menu.",
         comment: "@context: Description for built-in nav toggles",
       }),
     ),