birdclaw 0.6.0 → 0.8.0

package/src/components/TimelineCard.tsx

@@ -6,8 +6,10 @@ import {
 	Image,
 	MessageCircle,
 	Repeat2,
+	UserSearch,
 } from "lucide-react";
 import { formatCompactNumber, formatShortTimestamp } from "#/lib/present";
+import { normalizeTweetUrlEntityRangeForText } from "#/lib/tweet-render";
 import type {
 	TimelineItem,
 	TweetEntities,
@@ -98,10 +100,10 @@ function isUnresolvedShortUrlEntity(entry: TweetUrlEntity) {
 	return !entry.displayUrl && isShortUrl(entry.url);
 }
 
-function unresolvedShortUrlRanges(entities: TweetEntities) {
+function unresolvedShortUrlRanges(text: string, entities: TweetEntities) {
 	return (entities.urls ?? [])
 		.filter(isUnresolvedShortUrlEntity)
-		.map((entry) => ({ start: entry.start, end: entry.end }));
+		.map((entry) => normalizeTweetUrlEntityRangeForText(text, entry));
 }
 
 function textOutsideRanges(
@@ -133,7 +135,7 @@ function shouldHideUnresolvedShortUrls(
 	mediaUrls: Set<string>,
 ) {
 	if (mediaUrls.size === 0) return false;
-	const ranges = unresolvedShortUrlRanges(entities);
+	const ranges = unresolvedShortUrlRanges(text, entities);
 	if (ranges.length === 0) return false;
 	return textOutsideRanges(text, ranges).trim().length === 0;
 }
@@ -201,7 +203,7 @@ function getHiddenMediaUrlRanges(
 				isMediaUrlEntity(entry, mediaUrls, tweetId) ||
 				(hideUnresolvedShortUrls && isUnresolvedShortUrlEntity(entry)),
 		)
-		.map((entry) => ({ start: entry.start, end: entry.end }));
+		.map((entry) => normalizeTweetUrlEntityRangeForText(text, entry));
 }
 
 function getVisibleUrlCards(
@@ -444,6 +446,20 @@ export function TimelineCard({
 								<span className="text-[13px]">Reply</span>
 							</button>
 						) : null}
+						<a
+							aria-label={`Analyse @${displayAuthor.handle}`}
+							className={feedActionButtonClass}
+							href={`/profiles/${encodeURIComponent(displayAuthor.handle)}`}
+							onClick={(event) => {
+								event.stopPropagation();
+							}}
+							title={`Analyse @${displayAuthor.handle}`}
+						>
+							<span className={feedActionIconWrapClass}>
+								<UserSearch className={feedActionIconClass} strokeWidth={1.7} />
+							</span>
+							<span className="text-[13px]">Analyse</span>
+						</a>
 						{showLikeIndicator ? (
 							<span
 								aria-label={`${formatCompactNumber(displayLikeCount)} likes`}

package/src/components/TimelineRouteFrame.tsx

@@ -78,6 +78,9 @@ export function TimelineRouteFrame({
 		retry,
 		refreshLocalView,
 		replyToTweet,
+		hasMore,
+		loadingMore,
+		loadMore,
 	} = useTimelineRouteData({
 		resource,
 		replyFilter,
@@ -99,6 +102,7 @@ export function TimelineRouteFrame({
 						kind={syncKind}
 						label={syncLabel}
 						onSynced={refreshLocalView}
+						showAccountPicker
 					/>
 				</div>
 				<div className="px-4 pb-3">
@@ -163,6 +167,18 @@ export function TimelineRouteFrame({
 					{items.map((item) => (
 						<TimelineCard key={item.id} item={item} onReply={replyToTweet} />
 					))}
+					{!loading && !error && hasMore ? (
+						<div className="flex justify-center py-4">
+							<button
+								className="rounded-full bg-[var(--accent)] px-5 py-1.5 text-[14px] font-bold text-white disabled:opacity-60"
+								disabled={loadingMore}
+								onClick={loadMore}
+								type="button"
+							>
+								{loadingMore ? "Loading…" : "Load more"}
+							</button>
+						</div>
+					) : null}
 				</section>
 			</ConversationSurfaceScope>
 		</>

package/src/components/TweetRichText.tsx

@@ -1,8 +1,9 @@
 import { Fragment } from "react";
 import type { ReactNode } from "react";
 import {
-	collectTweetSegments,
+	collectTweetSegmentsForText,
 	enrichFallbackUrlEntities,
+	normalizeTweetUrlEntityRangeForText,
 } from "#/lib/tweet-render";
 import type { TweetEntities } from "#/lib/types";
 import {
@@ -14,23 +15,40 @@ import {
 import { safeHttpUrl } from "#/lib/url-safety";
 import { ProfilePreview } from "./ProfilePreview";
 
+function rangeKey(range: { start: number; end: number }) {
+	return `${range.start}:${range.end}`;
+}
+
 export function TweetRichText({
 	text,
 	entities,
 	className = "body-copy",
 	hiddenUrlRanges = [],
+	urlLabel = "display",
+	as = "p",
 }: {
 	text: string;
 	entities: TweetEntities;
 	className?: string;
 	hiddenUrlRanges?: Array<{ start: number; end: number }>;
+	urlLabel?: "display" | "expanded";
+	as?: "p" | "span";
 }) {
 	const richEntities = enrichFallbackUrlEntities(text, entities);
-	const segments = collectTweetSegments(richEntities);
+	const segments = collectTweetSegmentsForText(text, richEntities);
+	const hiddenRawRangeKeys = new Set(hiddenUrlRanges.map(rangeKey));
+	const hiddenRangeKeys = new Set(hiddenRawRangeKeys);
+	for (const entry of richEntities.urls ?? []) {
+		if (!hiddenRawRangeKeys.has(rangeKey(entry))) continue;
+		hiddenRangeKeys.add(
+			rangeKey(normalizeTweetUrlEntityRangeForText(text, entry)),
+		);
+	}
+	const Wrapper = as;
 	let cursor = 0;
 
 	return (
-		<p className={className === "body-copy" ? bodyCopyClass : className}>
+		<Wrapper className={className === "body-copy" ? bodyCopyClass : className}>
 			{segments.map((segment, index) => {
 				if (
 					segment.start < cursor ||
@@ -48,13 +66,7 @@ export function TweetRichText({
 						{text.slice(segment.start, segment.end)}
 					</Fragment>
 				);
-				if (
-					segment.kind === "url" &&
-					hiddenUrlRanges.some(
-						(range) =>
-							range.start === segment.start && range.end === segment.end,
-					)
-				) {
+				if (segment.kind === "url" && hiddenRangeKeys.has(rangeKey(segment))) {
 					node = null;
 				} else if (segment.kind === "mention" && segment.profile) {
 					node = (
@@ -65,6 +77,16 @@ export function TweetRichText({
 							<span className={tweetMentionClass}>@{segment.username}</span>
 						</ProfilePreview>
 					);
+				} else if (segment.kind === "mention") {
+					node = (
+						<a
+							key={`segment-${String(index)}`}
+							className={tweetMentionClass}
+							href={`/profiles/${encodeURIComponent(segment.username)}`}
+						>
+							@{segment.username}
+						</a>
+					);
 				} else if (segment.kind === "url") {
 					const href = safeHttpUrl(segment.expandedUrl);
 					if (href) {
@@ -76,7 +98,9 @@ export function TweetRichText({
 								rel="noreferrer"
 								target="_blank"
 							>
-								{segment.displayUrl}
+								{urlLabel === "expanded"
+									? segment.expandedUrl
+									: segment.displayUrl}
 							</a>
 						);
 					}
@@ -99,6 +123,6 @@ export function TweetRichText({
 				);
 			})}
 			{text.slice(cursor)}
-		</p>
+		</Wrapper>
 	);
 }

package/src/components/useTimelineRouteData.ts

@@ -1,4 +1,4 @@
-import { useEffect, useState } from "react";
+import { useEffect, useRef, useState } from "react";
 import type {
 	QueryEnvelope,
 	ReplyFilter,
@@ -12,6 +12,8 @@ import {
 } from "#/lib/api-client";
 import { useSelectedAccountId } from "./account-selection";
 
+const PAGE_SIZE = 50;
+
 interface UseTimelineRouteDataOptions {
 	resource: Exclude<ResourceKind, "dms">;
 	search: string;
@@ -35,7 +37,14 @@ export function useTimelineRouteData({
 	const [error, setError] = useState<string | null>(null);
 	const [replyError, setReplyError] = useState<string | null>(null);
 	const [refreshTick, setRefreshTick] = useState(0);
+	const [hasMore, setHasMore] = useState(false);
+	const [loadingMore, setLoadingMore] = useState(false);
 	const selectedAccountId = useSelectedAccountId(meta?.accounts);
+	// Bumped whenever the active filters change. A `loadMore` request that
+	// resolves against a stale generation is discarded so its older page is
+	// never appended to a freshly loaded feed.
+	const generationRef = useRef(0);
+	const loadMoreControllerRef = useRef<AbortController | null>(null);
 
 	async function loadStatus() {
 		setMeta(await fetchQueryEnvelope());
@@ -45,10 +54,14 @@ export function useTimelineRouteData({
 		void loadStatus();
 	}, []);
 
-	useEffect(() => {
+	// Build the /api/query URL for the current filters. Passing the last item's
+	// (createdAt, id) requests the next (older) page via the server's keyset
+	// cursor, which is deterministic across duplicate timestamps.
+	function buildQueryUrl(until?: string, untilId?: string) {
 		const url = new URL("/api/query", window.location.origin);
 		url.searchParams.set("resource", resource);
 		url.searchParams.set("refresh", String(refreshTick));
+		url.searchParams.set("limit", String(PAGE_SIZE));
 		if (selectedAccountId) {
 			url.searchParams.set("account", selectedAccountId);
 		}
@@ -64,16 +77,29 @@ export function useTimelineRouteData({
 		if (search.trim()) {
 			url.searchParams.set("search", search.trim());
 		}
+		if (until) {
+			url.searchParams.set("until", until);
+		}
+		if (untilId) {
+			url.searchParams.set("untilId", untilId);
+		}
+		return url;
+	}
 
+	useEffect(() => {
+		generationRef.current += 1;
+		loadMoreControllerRef.current?.abort();
 		const controller = new AbortController();
 		let active = true;
 		setError(null);
 		setLoading(true);
-		fetchQueryResponse(url, { signal: controller.signal })
+		setLoadingMore(false);
+		fetchQueryResponse(buildQueryUrl(), { signal: controller.signal })
 			.then((data) => {
-				if (active) {
-					setItems(data.items as TimelineItem[]);
-				}
+				if (!active) return;
+				const next = data.items as TimelineItem[];
+				setItems(next);
+				setHasMore(next.length >= PAGE_SIZE);
 			})
 			.catch((fetchError: unknown) => {
 				if (
@@ -87,6 +113,7 @@ export function useTimelineRouteData({
 					fetchError instanceof Error ? fetchError.message : errorFallback,
 				);
 				setItems([]);
+				setHasMore(false);
 			})
 			.finally(() => {
 				if (active) {
@@ -109,6 +136,44 @@ export function useTimelineRouteData({
 		selectedAccountId,
 	]);
 
+	async function loadMore() {
+		if (loading || loadingMore || !hasMore || items.length === 0) return;
+		const lastItem = items[items.length - 1];
+		const until = lastItem?.createdAt;
+		const untilId = lastItem?.id;
+		if (!until || !untilId) return;
+		const generation = generationRef.current;
+		const controller = new AbortController();
+		loadMoreControllerRef.current = controller;
+		setLoadingMore(true);
+		try {
+			const data = await fetchQueryResponse(buildQueryUrl(until, untilId), {
+				signal: controller.signal,
+			});
+			// Discard if the filters changed (new generation) while in flight.
+			if (generation !== generationRef.current) return;
+			const page = data.items as TimelineItem[];
+			setItems((prev) => {
+				const seen = new Set(prev.map((item) => item.id));
+				return [...prev, ...page.filter((item) => !seen.has(item.id))];
+			});
+			setHasMore(page.length >= PAGE_SIZE);
+		} catch (loadError) {
+			if (
+				loadError instanceof DOMException &&
+				loadError.name === "AbortError"
+			) {
+				return;
+			}
+			if (generation !== generationRef.current) return;
+			setError(loadError instanceof Error ? loadError.message : errorFallback);
+		} finally {
+			if (generation === generationRef.current) {
+				setLoadingMore(false);
+			}
+		}
+	}
+
 	function retry() {
 		setRefreshTick((value) => value + 1);
 	}
@@ -149,5 +214,8 @@ export function useTimelineRouteData({
 		refreshLocalView,
 		replyToTweet,
 		selectedAccountId,
+		hasMore,
+		loadingMore,
+		loadMore,
 	};
 }

package/src/lib/account-sync-job.ts

@@ -249,12 +249,22 @@ async function runStep({
 	}): Promise<AccountSyncAuditStep> {
 	try {
 		if (kind === "timeline") {
-			if (!allowBirdAccount) {
+			const timelineMode =
+				mode === "auto"
+					? account
+						? allowBirdAccount
+							? "bird"
+							: "xurl"
+						: "auto"
+					: mode;
+			if (timelineMode === "bird" && !allowBirdAccount) {
 				return { kind, ok: false, count: 0, error: birdAccountError(kind) };
 			}
 			const result = await syncHomeTimeline({
 				account,
+				mode: timelineMode,
 				limit,
+				maxPages,
 				following: true,
 				refresh,
 				cacheTtlMs,
@@ -267,12 +277,14 @@ async function runStep({
 			};
 		}
 		if (kind === "mentions") {
-			if (!allowBirdAccount) {
+			if (mode === "bird" && !allowBirdAccount) {
 				return { kind, ok: false, count: 0, error: birdAccountError(kind) };
 			}
+			const mentionMode =
+				mode === "auto" ? (allowBirdAccount ? "auto" : "xurl") : mode;
 			const result = await syncMentions({
 				account,
-				mode: "bird",
+				mode: mentionMode,
 				limit,
 				maxPages,
 				refresh,

package/src/lib/archive-finder.ts

@@ -75,7 +75,7 @@ function searchDirectoryEffect(directoryPath: string) {
 		);
 
 		return candidates.filter((item) => item !== null);
-	});
+	}).pipe(Effect.catchAll(() => Effect.succeed([])));
 }
 
 function searchSpotlightEffect(query: string) {