2cb32cd2d3
Implements the activity-sport-type change (specs/activity-sport-type): - db: nullable `sport_type` column on journal.activities + SportType / SPORT_TYPES (text().$type<> convention). - api: optional sportType on the activity read + create schemas (mirrored SPORT_TYPES; @trails-cool/api stays zod-only). - write: ActivityInput + createActivity persist it; mapSportType() normalizes provider strings (Komoot bulk import passes tour.sport; Garmin unset); threaded through the unified importActivity. - read/display: sportType added to the detail/feed/profile loaders and the v1 REST endpoints; shared SportBadge (glyph + i18n label) on detail, feed, and profile; sport-aware feed verb; create-form <select>. - i18n: journal.activities.sport.* (labels + verbs) in en + de. - federation: `sport` PropertyValue on the Note when set. Tests: mapSportType unit table; federation asserts the sport attachment is present when set and omitted when unset. typecheck + lint + unit all green. E2E (create→badge) still to add. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
42 lines
1.4 KiB
TypeScript
42 lines
1.4 KiB
TypeScript
// Server-only loader for /feed. See `home.server.ts`.
|
|
|
|
import { redirect } from "react-router";
|
|
import { getSessionUser } from "~/lib/auth/session.server";
|
|
import { listSocialFeed, listRecentPublicActivities } from "~/lib/activities.server";
|
|
|
|
type View = "followed" | "public";
|
|
|
|
export async function loadFeed(request: Request) {
|
|
const user = await getSessionUser(request);
|
|
if (!user) throw redirect("/auth/login");
|
|
|
|
const url = new URL(request.url);
|
|
const view: View = url.searchParams.get("view") === "public" ? "public" : "followed";
|
|
|
|
const rows =
|
|
view === "public"
|
|
? await listRecentPublicActivities(50)
|
|
: await listSocialFeed(user.id, 50);
|
|
|
|
return {
|
|
view,
|
|
activities: rows.map((a) => ({
|
|
id: a.id,
|
|
name: a.name,
|
|
sportType: a.sportType,
|
|
distance: a.distance,
|
|
elevationGain: a.elevationGain,
|
|
duration: a.duration,
|
|
startedAt: a.startedAt?.toISOString() ?? null,
|
|
createdAt: a.createdAt.toISOString(),
|
|
geojson: a.geojson ?? null,
|
|
ownerUsername: a.ownerUsername,
|
|
ownerDisplayName: a.ownerDisplayName,
|
|
// Remote (federated) attribution — only the followed view can
|
|
// contain remote rows; the public view is local-only.
|
|
ownerDomain: "ownerDomain" in a ? a.ownerDomain : null,
|
|
externalUrl: "externalUrl" in a ? a.externalUrl : null,
|
|
remote: "remote" in a ? a.remote : false,
|
|
})),
|
|
};
|
|
}
|