@jant/core 0.3.46 → 0.3.47

package/src/services/post.ts

@@ -99,7 +99,6 @@ export interface PostFilters {
   excludeLatestHidden?: boolean;
   /** Exclude private posts from results */
   excludePrivate?: boolean;
-  includeDeleted?: boolean;
   threadId?: string;
   /** Unix timestamp (inclusive) — only posts published at or after this time */
   publishedAfter?: number;
@@ -572,13 +571,7 @@ export function createPostService(
         ),
       })
       .from(posts)
-      .where(
-        and(
-          eq(posts.siteId, siteId),
-          eq(posts.threadId, rootId),
-          isNull(posts.deletedAt),
-        ),
-      );
+      .where(and(eq(posts.siteId, siteId), eq(posts.threadId, rootId)));
 
     const latestPublishedAt = rootRows[0]?.latestPublishedAt ?? null;
     const root = await db
@@ -761,9 +754,6 @@ export function createPostService(
     if (filters.excludeReplies) {
       conditions.push(isNull(posts.replyToId));
     }
-    if (!filters.includeDeleted) {
-      conditions.push(isNull(posts.deletedAt));
-    }
     if (filters.publishedAfter !== undefined) {
       conditions.push(sql`${posts.publishedAt} >= ${filters.publishedAfter}`);
     }
@@ -820,13 +810,7 @@ export function createPostService(
     const rows = await db
       .select({ id: posts.id })
       .from(posts)
-      .where(
-        and(
-          eq(posts.siteId, siteId),
-          eq(posts.threadId, threadId),
-          isNull(posts.deletedAt),
-        ),
-      )
+      .where(and(eq(posts.siteId, siteId), eq(posts.threadId, threadId)))
       .orderBy(desc(posts.createdAt), desc(posts.id))
       .limit(1);
 
@@ -997,7 +981,6 @@ export function createPostService(
       previewProvider: row.previewProvider,
       replyToId: row.replyToId,
       threadId: row.threadId,
-      deletedAt: row.deletedAt,
       publishedAt: row.publishedAt,
       lastActivityAt: row.lastActivityAt ?? row.publishedAt ?? row.updatedAt,
       createdAt: row.createdAt,
@@ -1054,7 +1037,6 @@ export function createPostService(
             eq(posts.siteId, siteId),
             inArray(posts.id, chunk),
             eq(posts.status, "published"),
-            isNull(posts.deletedAt),
           ),
         ),
     );
@@ -1090,7 +1072,7 @@ export function createPostService(
   }
 
   function buildThreadRootPageConditions(options?: ThreadRootPageOptions) {
-    const conditions = [isNull(posts.deletedAt)];
+    const conditions: SQL[] = [];
     const status = options?.status;
 
     if (status) {
@@ -1230,13 +1212,7 @@ export function createPostService(
       const result = await db
         .select()
         .from(posts)
-        .where(
-          and(
-            eq(posts.siteId, siteId),
-            eq(posts.id, id),
-            isNull(posts.deletedAt),
-          ),
-        )
+        .where(and(eq(posts.siteId, siteId), eq(posts.id, id)))
         .limit(1);
       return hydratePost(result[0]);
     },
@@ -2442,17 +2418,35 @@ export function createPostService(
         }
       }
 
-      const timestamp = now();
-
       if (isRoot) {
-        await db
-          .update(posts)
-          .set({ deletedAt: timestamp, updatedAt: timestamp })
-          .where(and(eq(posts.siteId, siteId), eq(posts.threadId, id)));
+        // Delete the entire thread atomically. SQLite/D1's self-referential
+        // FK on thread_id triggers a violation when the root is removed (its
+        // own thread_id points to itself), so wrap the cascade in a
+        // transaction with PRAGMA defer_foreign_keys to push the FK check to
+        // commit time, by which point every referencing row is gone too.
+        if (databaseDialect === "pg") {
+          await db.transaction(async (tx) => {
+            await tx
+              .delete(posts)
+              .where(and(eq(posts.siteId, siteId), eq(posts.threadId, id)));
+          });
+        } else {
+          await db.batch([
+            db.run(sql`PRAGMA defer_foreign_keys = ON`),
+            db
+              .delete(posts)
+              .where(and(eq(posts.siteId, siteId), eq(posts.threadId, id))),
+          ]);
+        }
       } else {
+        // Re-parent any direct children of this reply onto its own parent so
+        // the thread chain stays connected after the reply is removed.
         await db
           .update(posts)
-          .set({ deletedAt: timestamp, updatedAt: timestamp })
+          .set({ replyToId: existing.replyToId })
+          .where(and(eq(posts.siteId, siteId), eq(posts.replyToId, id)));
+        await db
+          .delete(posts)
           .where(and(eq(posts.siteId, siteId), eq(posts.id, id)));
         await recalculateThreadLastActivity(existing.threadId);
       }
@@ -2461,33 +2455,14 @@ export function createPostService(
     },
 
     async deleteThreadDraft(id, deps) {
-      const deleted = await this.delete(id, deps);
-      if (!deleted) return false;
-
-      // Release path_registry entries for all posts in the thread so slugs
-      // can be reused by the replacement thread.
-      const threadRows = await db
-        .select({ id: posts.id })
-        .from(posts)
-        .where(and(eq(posts.siteId, siteId), eq(posts.threadId, id)));
-      for (const row of threadRows) {
-        await resolvedPaths.deleteByPostId(row.id);
-      }
-
-      return true;
+      return this.delete(id, deps);
     },
 
     async getThread(rootId) {
       const rows = await db
         .select()
         .from(posts)
-        .where(
-          and(
-            eq(posts.siteId, siteId),
-            eq(posts.threadId, rootId),
-            isNull(posts.deletedAt),
-          ),
-        )
+        .where(and(eq(posts.siteId, siteId), eq(posts.threadId, rootId)))
         .orderBy(posts.createdAt);
 
       return hydratePosts(rows);
@@ -2575,7 +2550,6 @@ export function createPostService(
             inArray(posts.threadId, postIds),
             eq(posts.status, "published"),
             isNotNull(posts.replyToId),
-            isNull(posts.deletedAt),
           ),
         )
         .groupBy(posts.threadId);
@@ -2607,7 +2581,6 @@ export function createPostService(
             inArray(posts.threadId, rootIds),
             eq(posts.status, "published"),
             isNotNull(posts.replyToId),
-            isNull(posts.deletedAt),
           ),
         )
         .as("ranked_replies");
@@ -2671,7 +2644,6 @@ export function createPostService(
             inArray(posts.threadId, rootIds),
             eq(posts.status, "published"),
             isNotNull(posts.replyToId),
-            isNull(posts.deletedAt),
           ),
         )
         .as("ranked_replies");
@@ -2994,7 +2966,6 @@ export function createPostService(
             eq(posts.siteId, siteId),
             inArray(posts.threadId, unique),
             eq(posts.status, "published"),
-            isNull(posts.deletedAt),
           ),
         )
         .orderBy(posts.threadId, posts.createdAt, posts.id);
@@ -3043,7 +3014,6 @@ export function createPostService(
               buildCollectionMembershipCondition(collectionIds),
               inArray(posts.threadId, chunk),
               eq(posts.status, "published"),
-              isNull(posts.deletedAt),
             ),
           )
           .groupBy(posts.threadId, posts.id)
@@ -3078,7 +3048,6 @@ export function createPostService(
             eq(posts.siteId, siteId),
             inArray(posts.threadId, unique),
             eq(posts.status, "published"),
-            isNull(posts.deletedAt),
           ),
         )
         .orderBy(posts.threadId, desc(posts.createdAt), desc(posts.id));
@@ -3115,10 +3084,7 @@ export function createPostService(
       const limit = Math.min(Math.max(Math.trunc(requested), 1), 500);
       const cursor = options.cursor;
 
-      const whereConditions = [
-        eq(posts.siteId, siteId),
-        isNull(posts.deletedAt),
-      ];
+      const whereConditions = [eq(posts.siteId, siteId)];
       if (cursor) whereConditions.push(gt(posts.id, cursor));
 
       // Fetch one extra row to detect end-of-data without a separate COUNT.

package/src/services/search.ts

@@ -53,7 +53,6 @@ interface RawSearchRow {
   collection_id: string | null;
   reply_to_id: string | null;
   thread_id: string;
-  deleted_at: number | null;
   published_at: number | null;
   last_activity_at: number | null;
   created_at: number;
@@ -87,7 +86,6 @@ function mapRow(row: RawSearchRow): SearchResult {
       previewProvider: null,
       replyToId: row.reply_to_id,
       threadId: row.thread_id,
-      deletedAt: row.deleted_at,
       publishedAt: row.published_at,
       lastActivityAt:
         row.last_activity_at ?? row.published_at ?? row.updated_at,
@@ -189,7 +187,6 @@ export function createSearchService(
          AND path_registry.kind = 'slug'
         WHERE post_fts MATCH ?
           AND post.site_id = ?
-          AND post.deleted_at IS NULL
           AND post.status IN (${statusPlaceholders})
           ${formatFilter}
         ORDER BY post_fts.rank
@@ -264,7 +261,6 @@ export function createSearchService(
        AND path_registry.kind = 'slug'
       WHERE post.search_document @@ search_query.tsq
         AND post.site_id = ?
-        AND post.deleted_at IS NULL
         AND post.status IN (${statusPlaceholders})
         ${formatFilter}
       ORDER BY rank DESC, post.published_at DESC NULLS LAST, post.id DESC
@@ -311,7 +307,6 @@ export function createSearchService(
          AND path_registry.kind = 'slug'
         WHERE post.search_text ILIKE ?
           AND post.site_id = ?
-          AND post.deleted_at IS NULL
           AND post.status IN (${statusPlaceholders})
           ${formatFilter}
         ORDER BY rank DESC, post.published_at DESC NULLS LAST, post.id DESC
@@ -359,7 +354,6 @@ export function createSearchService(
         post.url ${likeOperator} ?
       )
       AND post.site_id = ?
-      AND post.deleted_at IS NULL
       AND post.status IN (${statusPlaceholders})
       ${formatFilter}
       ${likeOrderBy}

package/src/services/settings.ts

@@ -17,7 +17,11 @@ import {
   ONBOARDING_STATUS,
   type SettingsKey,
 } from "../lib/constants.js";
-import { baseLocale, isLocale } from "../i18n/locales.js";
+import {
+  baseLocale,
+  isValidContentLanguage,
+  normalizeContentLanguage,
+} from "../i18n/locales.js";
 import { isCjkSerifFont } from "../i18n/detect.js";
 import type { StorageDriver } from "../lib/storage.js";
 import type { MediaService } from "./media.js";
@@ -132,7 +136,10 @@ export interface SettingsService {
    *
    * @param storage - Optional storage driver for deleting the apple-touch-icon file
    */
-  removeAvatar(storage?: StorageDriver | null): Promise<void>;
+  removeAvatar(
+    storage?: StorageDriver | null,
+    deps?: { media?: MediaService; storageProvider?: string },
+  ): Promise<void>;
 }
 
 export function createSettingsService(
@@ -284,10 +291,15 @@ export function createSettingsService(
 
     async updateLocaleSettings(data, opts) {
       const trimmedLanguage = data.siteLanguage.trim() || baseLocale;
-      if (!isLocale(trimmedLanguage)) {
-        throw new ValidationError("Choose a supported language.");
+      if (!isValidContentLanguage(trimmedLanguage)) {
+        throw new ValidationError(
+          "Enter a valid BCP 47 language tag (e.g. en, zh-Hans, fi, ja, fr-CA).",
+        );
       }
-      await this.set("SITE_LANGUAGE", trimmedLanguage);
+      await this.set(
+        "SITE_LANGUAGE",
+        normalizeContentLanguage(trimmedLanguage),
+      );
 
       // CJK serif font setting
       const cjkFont = data.cjkSerifFont?.trim() ?? "";
@@ -419,11 +431,30 @@ export function createSettingsService(
           "favicon",
           "apple-touch-icon.png",
         );
+
+        // The storage key is fixed across uploads, so an existing media
+        // row would violate the (provider, storage_key) unique index.
+        const existing = await deps.media.getByStorageKey(
+          appleTouchKey,
+          deps.storageProvider,
+        );
+        if (existing) {
+          await deps.media.delete(existing.id);
+        }
+
         await deps.storage.put(
           appleTouchKey,
           new Uint8Array(data.appleTouchIcon),
           { contentType: "image/png" },
         );
+        await deps.media.create({
+          filename: "apple-touch-icon.png",
+          originalName: "apple-touch-icon.png",
+          mimeType: "image/png",
+          size: data.appleTouchIcon.byteLength,
+          storageKey: appleTouchKey,
+          provider: deps.storageProvider,
+        });
         await this.set("SITE_FAVICON_APPLE_TOUCH", appleTouchKey);
       }
 
@@ -438,12 +469,22 @@ export function createSettingsService(
       await this.set("SITE_FAVICON_VERSION", version);
     },
 
-    async removeAvatar(storage) {
+    async removeAvatar(storage, deps) {
       const appleTouchKey = await this.get("SITE_FAVICON_APPLE_TOUCH");
       if (storage && appleTouchKey) {
         await storage.delete(appleTouchKey);
       }
 
+      if (deps?.media && deps.storageProvider && appleTouchKey) {
+        const existing = await deps.media.getByStorageKey(
+          appleTouchKey,
+          deps.storageProvider,
+        );
+        if (existing) {
+          await deps.media.delete(existing.id);
+        }
+      }
+
       await this.remove("SITE_AVATAR");
       await this.remove("SITE_FAVICON_ICO");
       await this.remove("SITE_FAVICON_APPLE_TOUCH");

package/src/services/site-admin.ts

@@ -29,7 +29,11 @@ import {
 } from "../ui/font-themes.js";
 import type { Site, SiteDomain } from "../types.js";
 import { createCollectionService } from "./collection.js";
-import { createExportService } from "./export.js";
+// Note: `./export.js` is loaded lazily inside `exportManagedSite` because it
+// pulls in Vite-specific `?raw` asset imports (CSS/HTML/JS templates) at
+// module-load time. Importing it eagerly here would force every consumer of
+// `services/index.ts` — including Node-only dev scripts run under tsx — to
+// resolve those Vite-only imports just to construct the services bundle.
 import { createMediaService } from "./media.js";
 import { createNavItemService } from "./navigation.js";
 import { createPathService } from "./path.js";
@@ -675,6 +679,7 @@ export function createSiteAdminService(
       );
       const navItemList = await navItems.list();
       const appleTouchKey = allSettings[SETTINGS_KEYS.SITE_FAVICON_APPLE_TOUCH];
+      const { createExportService } = await import("./export.js");
       const exportService = createExportService(
         {
           collections,

package/src/styles/ui.css

@@ -2285,17 +2285,6 @@
     text-decoration: underline;
   }
 
-  .post-header-actions {
-    display: flex;
-    align-items: center;
-    flex-shrink: 0;
-    margin-left: auto;
-  }
-
-  .post-header-menu-trigger {
-    margin-right: -0.1rem;
-  }
-
   /*
    * Detail pages get a denser reading ladder than the surrounding UI chrome.
    * This keeps long-form text feeling grounded without making global UI copy
@@ -2349,18 +2338,6 @@
     color: var(--site-reading-body);
   }
 
-  [data-page="post"] .post-header-actions .post-menu-trigger {
-    color: var(--site-reading-meta);
-  }
-
-  [data-page="post"] .post-header-actions .post-menu-trigger:hover,
-  [data-page="post"] .post-header-actions .post-menu-trigger:focus-visible,
-  [data-page="post"]
-    .post-header-actions
-    .post-menu-trigger[aria-expanded="true"] {
-    color: var(--site-reading-body);
-  }
-
   [data-page="post"] .feed-quote {
     border-left-color: color-mix(
       in srgb,
@@ -4415,6 +4392,7 @@
   .compose-dialog jant-compose-dialog {
     display: block;
     position: relative;
+    border-radius: inherit;
   }
 
   .compose-dialog:has(.compose-dialog-inner-suspended) {
@@ -4523,6 +4501,8 @@
     min-height: 3.6rem;
     padding: 12px 14px;
     background-color: var(--compose-paper-bg);
+    border-top-left-radius: inherit;
+    border-top-right-radius: inherit;
     position: relative;
     z-index: 4;
   }
@@ -5378,6 +5358,13 @@
     position: relative;
     z-index: 3;
     background-color: var(--compose-paper-bg);
+    border-bottom-left-radius: inherit;
+    border-bottom-right-radius: inherit;
+  }
+
+  .compose-action-row:has(+ .compose-quick-actions-row) {
+    border-bottom-left-radius: 0;
+    border-bottom-right-radius: 0;
   }
 
   .compose-action-row-overlay-open {
@@ -5801,6 +5788,8 @@
     justify-content: flex-end;
     padding: 2px 12px 12px;
     background-color: var(--compose-paper-bg);
+    border-bottom-left-radius: inherit;
+    border-bottom-right-radius: inherit;
   }
 
   .compose-action-row:has(+ .compose-quick-actions-row) {

package/src/types/entities.ts

@@ -66,7 +66,6 @@ export interface Post {
   previewProvider: string | null;
   replyToId: string | null;
   threadId: string;
-  deletedAt: number | null;
   publishedAt: number | null;
   lastActivityAt: number;
   createdAt: number;

package/src/ui/color-themes.ts

@@ -37,7 +37,7 @@ interface ThemeModeColors {
   searchMarkBg?: string;
   /** Search highlight text color */
   searchMarkColor?: string;
-  /** Admin dashboard background */
+  /** Settings page background */
   dashBg?: string;
   /** Detail-page title color for long-form reading */
   readingTitle?: string;

package/src/ui/dash/settings/GeneralContent.tsx

@@ -102,14 +102,28 @@ export function GeneralContent({
     siteLanguage: i18n._(
       msg({
         message: "Language",
-        comment: "@context: Settings form field for site/dashboard language",
+        comment: "@context: Settings form field for site/admin language",
       }),
     ),
     siteLanguageHelp: i18n._(
       msg({
         message:
-          "Controls the language of the dashboard and settings. Public pages stay in English.",
-        comment: "@context: Help text under the site language select",
+          "Sets the content language announced to readers (HTML lang, RSS) and the dashboard language. Any BCP 47 tag is accepted; tags without a dashboard translation fall back to English.",
+        comment: "@context: Help text under the site language input",
+      }),
+    ),
+    siteLanguageSearchPlaceholder: i18n._(
+      msg({
+        message: "Search…",
+        comment:
+          "@context: Placeholder inside the language combobox search field",
+      }),
+    ),
+    siteLanguageNoMatches: i18n._(
+      msg({
+        message: "No matches.",
+        comment:
+          "@context: Empty state shown when the language search filters out every entry",
       }),
     ),
     cjkFont: i18n._(
@@ -294,21 +308,6 @@ export function GeneralContent({
     timezones.map((tz) => ({ value: tz.value, label: tz.label })),
   ).replace(/</g, "\\u003c");
 
-  // Language options — `value` must stay in sync with `src/i18n/locales.ts`.
-  // Labels are native names (untranslated) so they stay recognizable to any
-  // reader regardless of the currently active dashboard locale.
-  const languagesJson = JSON.stringify([
-    { value: "en", label: "English" },
-    {
-      value: "zh-Hans",
-      label: "\u7B80\u4F53\u4E2D\u6587 (Simplified Chinese)",
-    },
-    {
-      value: "zh-Hant",
-      label: "\u7E41\u9AD4\u4E2D\u6587 (Traditional Chinese)",
-    },
-  ]).replace(/</g, "\\u003c");
-
   const cjkFontsJson = JSON.stringify([
     { value: "off", label: "None" },
     {
@@ -342,7 +341,6 @@ export function GeneralContent({
           labels={labels}
           timezones={timezonesJson}
           cjk-fonts={cjkFontsJson}
-          languages={languagesJson}
           sitename-fallback={siteNameFallback}
           sitedescription-fallback={siteDescriptionFallback}
           main-feed-url={mainFeedUrl}

package/src/ui/dash/settings/SettingsRootContent.tsx

@@ -114,6 +114,23 @@ export function SettingsRootContent({
             }),
           )}
         />
+        <SettingsDirectoryLink
+          href={toPublicPath("/settings/github-sync", sitePathPrefix)}
+          icon={ICONS.gitBranch}
+          tone="subtle"
+          name={i18n._(
+            msg({
+              message: "GitHub Sync",
+              comment: "@context: Settings item — GitHub sync settings",
+            }),
+          )}
+          description={i18n._(
+            msg({
+              message: "Back up and sync content with a GitHub repository",
+              comment: "@context: Settings item description for GitHub sync",
+            }),
+          )}
+        />
       </SettingsDirectorySection>
 
       <SettingsDirectorySection
@@ -208,34 +225,6 @@ export function SettingsRootContent({
         />
       </SettingsDirectorySection>
 
-      <SettingsDirectorySection
-        title={i18n._(
-          msg({
-            message: "Integrations",
-            comment:
-              "@context: Settings group label for third-party integrations",
-          }),
-        )}
-      >
-        <SettingsDirectoryLink
-          href={toPublicPath("/settings/github-sync", sitePathPrefix)}
-          icon={ICONS.gitBranch}
-          tone="subtle"
-          name={i18n._(
-            msg({
-              message: "GitHub Sync",
-              comment: "@context: Settings item — GitHub sync settings",
-            }),
-          )}
-          description={i18n._(
-            msg({
-              message: "Back up and sync content with a GitHub repository",
-              comment: "@context: Settings item description for GitHub sync",
-            }),
-          )}
-        />
-      </SettingsDirectorySection>
-
       <SettingsDirectorySection
         title={i18n._(
           msg({

package/src/ui/feed/NoteCard.tsx

@@ -9,11 +9,7 @@ import type { FC } from "hono/jsx";
 import type { TimelineCardProps } from "../../types.js";
 import { MediaGallery } from "../shared/MediaGallery.js";
 import { StarRating } from "../shared/StarRating.js";
-import {
-  PostFooter,
-  PostMenuTriggerButton,
-  PostPublishedLink,
-} from "../shared/PostFooter.js";
+import { PostFooter, PostPublishedLink } from "../shared/PostFooter.js";
 import { PostStatusBadges } from "./PostStatusBadges.js";
 
 function stripContinueAnchor(html?: string): string | undefined {
@@ -44,7 +40,6 @@ export const NoteCard: FC<TimelineCardProps> = ({
   const hasVisibleRating =
     !!post.rating && post.rating > 0 && !display?.hideRating;
   const showHeaderRating = isDetail && isArticle && hasVisibleRating;
-  const showHeaderActions = !display?.footer?.hideActions;
   const footerDisplay =
     isDetail && isArticle && display?.footer?.hideTimestamp === undefined
       ? { ...display?.footer, hideTimestamp: true }
@@ -77,11 +72,6 @@ export const NoteCard: FC<TimelineCardProps> = ({
                 post={post}
                 className="u-url post-header-meta-link"
               />
-              {showHeaderActions && (
-                <div class="post-header-actions">
-                  <PostMenuTriggerButton className="post-menu-trigger post-header-menu-trigger" />
-                </div>
-              )}
             </div>
             {showHeaderRating && <StarRating rating={post.rating} />}
           </div>

package/src/ui/feed/__tests__/timeline-cards.test.ts

@@ -260,7 +260,7 @@ describe("timeline cards", () => {
     expect(detailHtml).toContain('class="u-url post-header-meta-link"');
     expect(detailHtml.match(/class="dt-published"/g)).toHaveLength(1);
     expect(detailHtml).toContain("data-reply-trigger");
-    expect(detailHtml.match(/data-post-menu-trigger/g)).toHaveLength(2);
+    expect(detailHtml.match(/data-post-menu-trigger/g)).toHaveLength(1);
     expect(detailHtml.indexOf('class="post-header-meta-row"')).toBeLessThan(
       detailHtml.indexOf("data-post-body"),
     );

package/src/ui/pages/PostPage.tsx

@@ -49,6 +49,8 @@ export const PostPage: FC<PostPageProps> = ({ post, threadPosts }) => {
       ) : (
         <TimelineItemFromPost post={post} mode="detail" />
       )}
+      {/* Public integration slot — code injection (giscus, Webmentions, etc.) appends here. */}
+      <div data-post-end />
     </div>
   );
 };