@takosjp/yurucommu-core 3.0.2 → 3.0.3

package/migrations/README.md

@@ -83,17 +83,6 @@ file name (not the numeric version) in `yurucommu_migrations`.
    credentials come from the same reviewed Provider Connection used by the
    OpenTofu run.
 
-   In the fallback path where the Worker script is not managed by OpenTofu,
-   `takosumi_release.post_apply` runs `bun run takosumi:release` as an opaque
-   operator release command. It reads non-secret outputs from `TAKOSUMI_OUTPUTS_JSON`,
-   writes a temporary Wrangler config, runs `bun install --frozen-lockfile`,
-   runs `bun run build:takos-worker`, applies D1 migrations through
-   `wrangler d1 execute` without explicit SQL transaction wrappers, and deploys
-   with `wrangler deploy`.
-   Provider credentials and app-specific secrets come from the selected
-   operator release activator boundary through
-   `TAKOSUMI_RELEASE_COMMAND_ENV_ALLOWLIST`.
-
    Common operator env names:
 
    ```bash

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takosjp/yurucommu-core",
-  "version": "3.0.2",
+  "version": "3.0.3",
   "license": "AGPL-3.0-only",
   "type": "module",
   "workspaces": [

package/packages/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takosjp/yurucommu-api",
-  "version": "3.0.1",
+  "version": "3.0.3",
   "description": "Typed client SDK and public API contract for yurucommu-server clients.",
   "license": "AGPL-3.0-only",
   "type": "module",

package/packages/api/src/lib/api/stories.ts

@@ -1,4 +1,9 @@
-import type { ActorStories, Story, StoryOverlay } from "../../types/index.ts";
+import type {
+  ActorStories,
+  Story,
+  StoryOverlay,
+  StoryViewersResponse,
+} from "../../types/index.ts";
 import { normalizeActorStories, normalizeStory } from "./normalize.ts";
 import { apiDelete, apiFetch, apiPost, assertOk } from "./fetch.ts";
 
@@ -78,3 +83,13 @@ export async function shareStory(
   await assertOk(res, "Failed to share story");
   return (await res.json()) as { shared: boolean; share_count: number };
 }
+
+// Author-only "seen by" list for a story. GETs the same id-encoded path the
+// sibling like/share routes use.
+export async function getStoryViewers(
+  apId: string,
+): Promise<StoryViewersResponse> {
+  const res = await apiFetch(`/api/stories/${encodeURIComponent(apId)}/views`);
+  await assertOk(res, "Failed to fetch story viewers");
+  return (await res.json()) as StoryViewersResponse;
+}

package/packages/api/src/types/index.ts

@@ -150,7 +150,6 @@ export interface StoryOverlay {
   // Question-specific
   name?: string; // Question text
   oneOf?: Array<{ type: string; name: string }>; // Options
-  closed?: string; // Close time
   // Link-specific
   href?: string;
   // Generic
@@ -184,6 +183,18 @@ export interface ActorStories {
   has_unviewed: boolean;
 }
 
+// A single viewer in a story's "seen by" list (author-only).
+export interface StoryViewer {
+  actor: PostAuthor;
+  viewed_at: string;
+}
+
+// Response of GET /api/stories/:id/views (author-only "seen by").
+export interface StoryViewersResponse {
+  view_count: number;
+  viewers: StoryViewer[];
+}
+
 // Short-lived actor status note. This is the Instagram-Notes-style current
 // status surface, not the ActivityPub `Note` object used for normal posts.
 export interface ActorNote {

package/src/backend/routes/stories/interactions.ts

@@ -1,5 +1,5 @@
 import { Hono } from "hono";
-import { and, eq, gt, sql } from "drizzle-orm";
+import { and, count, desc, eq, gt, sql } from "drizzle-orm";
 import type { Env, Variables } from "../../types.ts";
 import {
   activities,
@@ -18,12 +18,14 @@ import {
   safeJsonParse,
 } from "../../federation-helpers.ts";
 import {
+  buildAuthor,
   canViewerReadStory,
   findStory,
   getVoteCounts,
   resolveStoryApId,
   sumVotes,
 } from "./query-helpers.ts";
+import { loadActorInfoMap } from "../actors-helpers.ts";
 import { enqueueDeliveryToActor } from "../../lib/delivery/queue.ts";
 import { actorIsBlockedBy } from "../../lib/post-visibility.ts";
 import { rateLimit, RateLimitConfigs } from "../../middleware/rate-limit.ts";
@@ -573,4 +575,66 @@ stories.get("/:id/votes", async (c) => {
   return c.json({ votes, total: sumVotes(votes), user_vote });
 });
 
+// Cap the returned viewer list most-recent-first. `view_count` stays the true
+// total (the author sees the real number even when the list is truncated).
+const STORY_VIEWERS_LIMIT = 200;
+
+// Get the "seen by" viewer list for a story (author-only).
+stories.get("/:id/views", async (c) => {
+  const db = c.get("db");
+  const actor = c.get("actor");
+  const baseUrl = c.env.APP_URL;
+  // Resolve the id the same way every sibling /:id/* route does.
+  const apId = resolveStoryApId(c.req.param("id"), baseUrl);
+
+  const story = await findStory(db, apId);
+  if (!story) return c.json({ error: "Story not found" }, 404);
+
+  // Author-only: only the story author may see WHO viewed. Anyone else
+  // (including anonymous) gets 404 so the viewer list isn't disclosed and the
+  // endpoint isn't a story-existence oracle for non-authors.
+  if (!actor || actor.ap_id !== story.attributedTo) {
+    return c.json({ error: "Story not found" }, 404);
+  }
+  // Mirror the /:id/votes expiry gate: don't serve the list for an expired
+  // story before the reaper runs.
+  if (story.endTime && story.endTime < new Date().toISOString()) {
+    return c.json({ error: "Story has expired" }, 410);
+  }
+
+  // True total (uncapped) — stays accurate even when the list below is capped.
+  const totalRow = await db
+    .select({ value: count() })
+    .from(storyViews)
+    .where(eq(storyViews.storyApId, apId))
+    .get();
+  const view_count = totalRow?.value ?? 0;
+
+  // Most-recent-first page of viewers, capped.
+  const rows = await db
+    .select({
+      actorApId: storyViews.actorApId,
+      viewedAt: storyViews.viewedAt,
+    })
+    .from(storyViews)
+    .where(eq(storyViews.storyApId, apId))
+    .orderBy(desc(storyViews.viewedAt))
+    .limit(STORY_VIEWERS_LIMIT);
+
+  // Hydrate ap_id → PostAuthor via the same batch loader the follower/story
+  // lists use (local `actors` + `actor_cache`, local wins). A remote viewer
+  // absent from both degrades to a best-effort author in `buildAuthor`.
+  const infoMap = await loadActorInfoMap(
+    db,
+    rows.map((r) => r.actorApId),
+    "author",
+  );
+  const viewers = rows.map((r) => ({
+    actor: buildAuthor(r.actorApId, infoMap.get(r.actorApId)),
+    viewed_at: r.viewedAt,
+  }));
+
+  return c.json({ view_count, viewers });
+});
+
 export default stories;

package/src/backend/routes/stories/query-helpers.ts

@@ -11,7 +11,11 @@ import {
   storyVotes,
 } from "../../../db/index.ts";
 import type { IObjectStorage } from "../../runtime/types.ts";
-import { objectApId, safeJsonParse } from "../../federation-helpers.ts";
+import {
+  formatUsername,
+  objectApId,
+  safeJsonParse,
+} from "../../federation-helpers.ts";
 import {
   deleteObjectCascade,
   purgeMediaBlobs,
@@ -271,6 +275,49 @@ export async function fetchActorCache(
   );
 }
 
+// ---------------------------------------------------------------------------
+// Author projection
+// ---------------------------------------------------------------------------
+
+/**
+ * Public author projection for a story author / viewer (the `PostAuthor` shape
+ * used across the feed / story surfaces). Shared by the story feed and the
+ * viewer ("seen by") list so both hydrate an ap_id → author identically.
+ */
+export type StoryAuthor = {
+  ap_id: string;
+  username: string;
+  preferred_username: string | null;
+  name: string | null;
+  icon_url: string | null;
+};
+
+/**
+ * Build a StoryAuthor from available data sources. A remote actor with no local
+ * `actors` / `actor_cache` row (`data` undefined) degrades gracefully to a
+ * best-effort `username` derived from the ap_id plus null fields, so a viewer is
+ * never dropped just because its profile isn't cached locally.
+ */
+export function buildAuthor(
+  apId: string,
+  data:
+    | {
+        preferredUsername?: string | null;
+        name?: string | null;
+        iconUrl?: string | null;
+      }
+    | null
+    | undefined,
+): StoryAuthor {
+  return {
+    ap_id: apId,
+    username: formatUsername(apId),
+    preferred_username: data?.preferredUsername || null,
+    name: data?.name || null,
+    icon_url: data?.iconUrl || null,
+  };
+}
+
 // ---------------------------------------------------------------------------
 // Story data cleanup & transformation
 // ---------------------------------------------------------------------------

package/src/backend/routes/stories/routes.ts

@@ -21,7 +21,6 @@ import type { IObjectStorage } from "../../runtime/types.ts";
 import {
   activityApId,
   actorApId,
-  formatUsername,
   generateId,
   objectApId,
 } from "../../federation-helpers.ts";
@@ -31,10 +30,12 @@ import { maybeReapDrainedTombstones } from "../actors.ts";
 import { checkCommunityPostPermission } from "../posts/post-helpers.ts";
 import { rateLimit, RateLimitConfigs } from "../../middleware/rate-limit.ts";
 import {
+  buildAuthor,
   cleanupExpiredStories,
   fetchActorCache,
   fetchBatchVotes,
   fetchBlockedAndMutedIds,
+  type StoryAuthor,
   sumVotes,
   transformStoryData,
   validateOverlays,
@@ -101,14 +102,6 @@ stories.post("/delete", storyWriteLimiter);
 
 type VoteResults = Record<number, number>;
 
-type StoryAuthor = {
-  ap_id: string;
-  username: string;
-  preferred_username: string | null;
-  name: string | null;
-  icon_url: string | null;
-};
-
 type StoryResponse = {
   ap_id: string;
   author: StoryAuthor;
@@ -160,27 +153,6 @@ const MAX_STORY_CAPTION_LENGTH = 500;
 // feed page; a busy instance simply shows the 90 most recent.
 const MAX_STORY_FEED_ITEMS = 90;
 
-/** Build a StoryAuthor from available data sources. */
-function buildAuthor(
-  apId: string,
-  data:
-    | {
-        preferredUsername?: string | null;
-        name?: string | null;
-        iconUrl?: string | null;
-      }
-    | null
-    | undefined,
-): StoryAuthor {
-  return {
-    ap_id: apId,
-    username: formatUsername(apId),
-    preferred_username: data?.preferredUsername || null,
-    name: data?.name || null,
-    icon_url: data?.iconUrl || null,
-  };
-}
-
 /** Build a StoryResponse from a story object row and pre-fetched data. */
 function buildStoryResponse(
   s: {