birdclaw 0.3.0 → 0.4.1

package/src/lib/bird.ts

@@ -73,6 +73,31 @@ export interface BirdDmsResponse {
 	events: BirdDmEvent[];
 }
 
+interface BirdUserOverviewPayload {
+	user?: {
+		id?: string;
+		username?: string;
+		name?: string;
+		description?: string;
+		location?: string;
+		url?: string;
+		verified?: boolean;
+		verifiedType?: string;
+		verified_type?: string;
+		followersCount?: number;
+		followingCount?: number;
+		profileImageUrl?: string;
+		createdAt?: string;
+		entities?: Record<string, unknown>;
+		affiliation?: Record<string, unknown>;
+	};
+}
+
+interface BirdProfilesPayload {
+	users?: NonNullable<BirdUserOverviewPayload["user"]>[];
+	errors?: Array<{ target?: string; error?: string }>;
+}
+
 function toIsoTimestamp(value: string) {
 	const parsed = new Date(value);
 	if (Number.isNaN(parsed.getTime())) {
@@ -161,6 +186,18 @@ function formatBirdCommandError(error: unknown, birdCommand: string) {
 	return error;
 }
 
+function isUnsupportedBirdOptionError(error: unknown, option: string) {
+	if (!error || typeof error !== "object") {
+		return false;
+	}
+	const text = [
+		error instanceof Error ? error.message : "",
+		"stderr" in error && typeof error.stderr === "string" ? error.stderr : "",
+		"stdout" in error && typeof error.stdout === "string" ? error.stdout : "",
+	].join("\n");
+	return text.includes(option) && /unknown option|error:/i.test(text);
+}
+
 async function runBirdJsonCommand(args: string[], timeoutMs?: number) {
 	const tempDir = mkdtempSync(join(tmpdir(), "birdclaw-bird-"));
 	const stdoutPath = join(tempDir, "stdout.json");
@@ -446,3 +483,155 @@ export async function listDirectMessagesViaBird({
 
 	return payload as BirdDmsResponse;
 }
+
+export async function lookupProfileViaBird(
+	usernameOrId: string,
+): Promise<XurlMentionUser | null> {
+	const target = usernameOrId.trim().replace(/^@/, "");
+	if (!target) {
+		return null;
+	}
+
+	let stdout: string;
+	try {
+		stdout = await runBirdJsonCommand([
+			"user",
+			target,
+			"--json",
+			"--profile-only",
+		]);
+	} catch (error) {
+		if (!isUnsupportedBirdOptionError(error, "--profile-only")) {
+			throw error;
+		}
+		stdout = await runBirdJsonCommand([
+			"user",
+			target,
+			"--json",
+			"--count",
+			"1",
+		]);
+	}
+	const payload = parseBirdJson(stdout) as BirdUserOverviewPayload;
+	return toXurlMentionUser(payload.user);
+}
+
+function toXurlMentionUser(
+	user: BirdUserOverviewPayload["user"],
+): XurlMentionUser | null {
+	if (!user?.id || !user.username) {
+		return null;
+	}
+
+	return {
+		id: String(user.id),
+		username: String(user.username).replace(/^@/, ""),
+		name: String(user.name ?? user.username),
+		description:
+			typeof user.description === "string" ? user.description : undefined,
+		location: typeof user.location === "string" ? user.location : undefined,
+		url: typeof user.url === "string" ? user.url : undefined,
+		verified: typeof user.verified === "boolean" ? user.verified : undefined,
+		verified_type:
+			typeof user.verifiedType === "string"
+				? user.verifiedType
+				: typeof user.verified_type === "string"
+					? user.verified_type
+					: undefined,
+		profile_image_url:
+			typeof user.profileImageUrl === "string"
+				? user.profileImageUrl
+				: undefined,
+		entities:
+			user.entities && typeof user.entities === "object"
+				? user.entities
+				: undefined,
+		affiliation:
+			user.affiliation && typeof user.affiliation === "object"
+				? user.affiliation
+				: undefined,
+		created_at: typeof user.createdAt === "string" ? user.createdAt : undefined,
+		public_metrics: {
+			followers_count: Number(user.followersCount ?? 0),
+			following_count: Number(user.followingCount ?? 0),
+		},
+	};
+}
+
+export async function lookupProfilesViaBird(
+	usernameOrIds: string[],
+): Promise<
+	Array<{ target: string; user: XurlMentionUser | null; error?: string }>
+> {
+	const targets = Array.from(
+		new Set(
+			usernameOrIds
+				.map((target) => target.trim().replace(/^@/, ""))
+				.filter((target) => target.length > 0),
+		),
+	);
+	if (targets.length === 0) {
+		return [];
+	}
+
+	try {
+		const stdout = await runBirdJsonCommand(["profiles", ...targets, "--json"]);
+		const payload = parseBirdJson(stdout) as BirdProfilesPayload;
+		const users = (payload.users ?? [])
+			.map(toXurlMentionUser)
+			.filter((user): user is XurlMentionUser => Boolean(user));
+		const byTarget = new Map<string, XurlMentionUser>();
+		for (const user of users) {
+			byTarget.set(String(user.id), user);
+			byTarget.set(user.username.toLowerCase(), user);
+		}
+		const errors = new Map(
+			(payload.errors ?? []).map((item) => [
+				String(item.target ?? "")
+					.replace(/^@/, "")
+					.toLowerCase(),
+				item.error ?? "Unknown error",
+			]),
+		);
+		return targets.map((target) => ({
+			target,
+			user: byTarget.get(target.toLowerCase()) ?? null,
+			...(errors.has(target.toLowerCase())
+				? { error: errors.get(target.toLowerCase()) }
+				: {}),
+		}));
+	} catch (error) {
+		if (!isUnsupportedBirdOptionError(error, "profiles")) {
+			throw error;
+		}
+		return Promise.all(
+			targets.map(async (target) => {
+				try {
+					return { target, user: await lookupProfileViaBird(target) };
+				} catch (lookupError) {
+					return {
+						target,
+						user: null,
+						error:
+							lookupError instanceof Error
+								? lookupError.message
+								: String(lookupError),
+					};
+				}
+			}),
+		);
+	}
+}
+
+export const __test__ = {
+	toIsoTimestamp,
+	escapeJsonStringControlChars,
+	parseBirdJson,
+	formatBirdCommandError,
+	isUnsupportedBirdOptionError,
+	getBirdTweetItems,
+	getBirdTweetItem,
+	toMediaEntities,
+	toReferencedTweets,
+	normalizeBirdTweets,
+};

package/src/lib/blocks.ts

@@ -1,4 +1,4 @@
-import type Database from "better-sqlite3";
+import type { Database } from "./sqlite";
 import { getNativeDb } from "./db";
 import {
 	getAccountHandle,
@@ -16,7 +16,7 @@ function remoteBlockSyncDisabled() {
 }
 
 function upsertRemoteBlock(
-	db: Database.Database,
+	db: Database,
 	accountId: string,
 	profileId: string,
 	blockedAt: string,
@@ -33,7 +33,7 @@ function upsertRemoteBlock(
 }
 
 function pruneRemoteBlocks(
-	db: Database.Database,
+	db: Database,
 	accountId: string,
 	profileIds: string[],
 ) {

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

@@ -3,7 +3,7 @@ import fs from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
 import { promisify } from "node:util";
-import type Database from "better-sqlite3";
+import type { Database } from "./sqlite";
 import { maybeAutoSyncBackup, type BackupAutoUpdateResult } from "./backup";
 import { ensureBirdclawDirs, getBirdclawPaths } from "./config";
 import { getNativeDb } from "./db";
@@ -31,7 +31,7 @@ export interface BookmarkSyncJobOptions {
 	cacheTtlMs?: number;
 	logPath?: string;
 	lockPath?: string;
-	db?: Database.Database;
+	db?: Database;
 }
 
 export interface BookmarkSyncAuditEntry {
@@ -117,7 +117,7 @@ export function getDefaultBookmarkSyncLockPath() {
 	return path.join(getBirdclawPaths().rootDir, "locks", "bookmarks-sync.lock");
 }
 
-function countBookmarks(db: Database.Database) {
+function countBookmarks(db: Database) {
 	const row = db
 		.prepare("select count(*) as count from tweet_collections where kind = ?")
 		.get("bookmarks") as { count: number };