Merge branch 'main' into lexicons-extension

.idea/clippr.iml

···
       <excludeFolder url="file://$MODULE_DIR$/backend/build" />
       <excludeFolder url="file://$MODULE_DIR$/.idea/dataSources" />
       <excludeFolder url="file://$MODULE_DIR$/lexicons/dist" />
+      <excludeFolder url="file://$MODULE_DIR$/backend/logs" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

.idea/dictionaries/project.xml

···
       <w>appview</w>
       <w>atcute</w>
       <w>atproto</w>
+      <w>bluesky</w>
       <w>bsky</w>
       <w>clippr</w>
       <w>clipprjs</w>

backend/src/network/converters.ts

···
 	UnsupportedDidMethodError,
 	WebDidDocumentResolver,
 } from "@atcute/identity-resolver";
+import { Client, simpleFetchHandler } from "@atcute/client";
 
 /// Converts an ``At.DID`` type to a proper string, for type reasons.
 export function convertDidToString(did: `did:${string}`): string {
···
 	}
 }
 
-// TODO: Stop leeching off Bluesky's CDN and get the blob directly from the user's PDS
+// TODO: Stop leeching off the Bluesky CDN and get the blob directly from the user's PDS
+// Get a CDN URI from a blob's CID
 export async function getUriFromBlobCid(
 	did: string,
 	cid: string,
···
 	return `https://cdn.bsky.app/img/avatar/plain/${did}/${cid}`;
 }
 
+// Get a user's handle from their DID. DID method agnostic.
 export async function getHandleFromDid(did: string): Promise<string> {
 	const docResolver = new CompositeDidDocumentResolver({
 		methods: {
···
 		doc?.alsoKnownAs[0].lastIndexOf("/" + 1),
 	);
 }
+
+// Get a user's DID from their handle.
+export async function getDidFromHandle(handle: string): Promise<string> {
+	const handler = simpleFetchHandler({
+		service: "https://public.api.bsky.app",
+	});
+	const rpc = new Client({ handler });
+
+	const { ok, data } = await rpc.get("com.atproto.identity.resolveHandle", {
+		params: {
+			handle: handle as `${string}.${string}`,
+		},
+	});
+
+	if (!ok) {
+		switch (data.error) {
+			case "InvalidRequest": {
+				throw new Error("InvalidRequest", { cause: data.message });
+			}
+			case "AccountTakedown": {
+				throw new Error("AccountTakedown", { cause: data.message });
+			}
+			case "AccountDeactivated": {
+				throw new Error("AccountDeactivated", { cause: data.message });
+			}
+			default: {
+				throw new Error(data.error, { cause: data.message });
+			}
+		}
+	}
+
+	let actorDid;
+
+	if (ok) {
+		actorDid = data.did as string;
+	}
+
+	if (actorDid === undefined) {
+		throw new Error("InvalidRequest");
+	}
+
+	return actorDid;
+}

backend/src/routes/xrpc.ts

···
 import { Database } from "../db/database.js";
 import { usersTable } from "../db/schema.js";
 import { eq } from "drizzle-orm";
-import { getHandleFromDid, getUriFromBlobCid } from "../network/converters.js";
+import {
+	getDidFromHandle,
+	getHandleFromDid,
+	getUriFromBlobCid,
+} from "../network/converters.js";
 
 const app = new Hono();
 const db = Database.getInstance().getDb();
 
 app.get("/social.clippr.actor.getProfile", async (c) => {
-	const did = c.req.query("did");
-	if (did === undefined || did.length === 0) {
+	const actor = c.req.query("actor");
+	if (actor === undefined || actor.trim().length === 0) {
 		return c.json(
 			{
 				error: "InvalidRequest",
-				message: "Error: Params must have the did property included",
+				message: "Error: Parameters must have the actor property included",
 			},
 			400,
 		);
 	}
 
+	let actorDid = actor;
+
+	if (!actor.startsWith("did:")) {
+		try {
+			actorDid = await getDidFromHandle(actor);
+		} catch (e: unknown) {
+			if (e instanceof Error) {
+				return c.json(
+					{
+						error: e.message,
+						message: e.cause,
+					},
+					400,
+				);
+			} else {
+				return c.json(
+					{
+						error: "InvalidRequest" as string,
+						message: "Unknown error while resolving DID from handle" as string,
+					},
+					400,
+				);
+			}
+		}
+	}
+
 	const profileSearch = await db
 		.selectDistinct()
 		.from(usersTable)
-		.where(eq(usersTable.did, did));
+		.where(eq(usersTable.did, actorDid));
 
 	if (profileSearch.length === 0) {
 		return c.json(
···
 		);
 	}
 
-	const handle = await getHandleFromDid(did);
+	let actorHandle;
+
+	if (actor.startsWith("did:")) {
+		try {
+			actorHandle = await getHandleFromDid(actor);
+		} catch (e: unknown) {
+			if (e instanceof Error) {
+				return c.json(
+					{
+						error: "InvalidRequest",
+						message: `${e.message}`,
+					},
+					400,
+				);
+			} else {
+				return c.json(
+					{
+						error: "InvalidRequest" as string,
+						message: "Unknown error while resolving handle from DID" as string,
+					},
+					400,
+				);
+			}
+		}
+
+		if (actorHandle === undefined) {
+			actorHandle = "invalid.handle";
+		}
+	} else actorHandle = actor;
+
 	// TODO: Add placeholder avatar
 	const avatarCid: string =
 		profileSearch[0]?.avatar || "https://missing.avatar";
-	const avatar = await getUriFromBlobCid(did, avatarCid);
+	let actorAvatar;
+	if (avatarCid !== "https://missing.avatar") {
+		actorAvatar = await getUriFromBlobCid(actorDid, avatarCid);
+	} else actorAvatar = avatarCid;
 
 	// Right now we don't do de-duplication in the database, so we just take the
 	// first result and use that for our return call.
 	return c.json({
-		did: did,
-		handle: handle,
-		displayName: profileSearch[0]?.displayName || null,
-		avatar: avatar,
+		did: actorDid,
+		handle: actorHandle,
+		displayName: profileSearch[0]?.displayName,
+		avatar: actorAvatar,
 		description: profileSearch[0]?.description || null,
 		createdAt: profileSearch[0]?.createdAt,
 	});

backend/static/api.json

···
 		"/xrpc/social.clippr.actor.getProfile": {
 			"get": {
 				"summary": "Get a profile",
-				"description": "Get an user's profile based on their DID.",
+				"description": "Get an user's profile based on their DID or handle.",
 				"parameters": [
 					{
-						"name": "did",
+						"name": "actor",
 						"in": "query",
-						"description": "The DID of the account to get the profile record of.",
+						"description": "The DID or handle of the account to get the profile record of.",
 						"required": true,
 						"content": {
 							"schema": {
···
 										"message": {
 											"type": "string",
 											"description": "A detailed description of the error.",
-											"example": "Error: Params must have the did property included"
+											"example": "Error: Parameters must have the actor property included"
 										}
 									}
 								}