fix(federation): 🐛 Fix fetching of ActivityPub users not working anymore

classes/functions/status.ts

@@ -323,7 +323,7 @@ export const parseTextMentions = async (
             signatureConstructor,
         );
 
-        const uri = await manager.webFinger(person?.[1] ?? "");
+        const uri = await User.webFinger(manager, person?.[1] ?? "");
 
         const user = await User.resolve(uri);
 

cli/commands/federation/user/fetch.ts

@@ -54,7 +54,7 @@ export default class FederationUserFetch extends BaseCommand<
             signatureConstructor,
         );
 
-        const uri = await manager.webFinger(username);
+        const uri = await User.webFinger(manager, username);
 
         const newUser = await User.resolve(uri);
 

cli/commands/federation/user/finger.ts

@@ -54,7 +54,7 @@ export default class FederationUserFinger extends BaseCommand<
             signatureConstructor,
         );
 
-        const uri = await manager.webFinger(username);
+        const uri = await User.webFinger(manager, username);
 
         spinner.succeed("Fetched user URI");
 

drizzle/migrations/0030_curvy_vulture.sql

@@ -0,0 +1,2 @@
+DROP INDEX IF EXISTS "Users_username_index";--> statement-breakpoint
+CREATE INDEX IF NOT EXISTS "Users_username_index" ON "Users" USING btree ("username");

drizzle/migrations/meta/_journal.json

@@ -211,6 +211,13 @@
             "when": 1721155789219,
             "tag": "0029_shiny_korvac",
             "breakpoints": true
+        },
+        {
+            "idx": 30,
+            "version": "7",
+            "when": 1721223331975,
+            "tag": "0030_curvy_vulture",
+            "breakpoints": true
         }
     ]
 }

drizzle/schema.ts

@@ -421,7 +421,7 @@ export const Users = pgTable(
     (table) => {
         return {
             uriKey: uniqueIndex().on(table.uri),
-            usernameKey: uniqueIndex().on(table.username),
+            usernameKey: index().on(table.username),
             emailKey: uniqueIndex().on(table.email),
         };
     },

packages/database-interface/instance.ts

@@ -139,7 +139,12 @@ export class Instance extends BaseInterface<typeof Instances> {
                 proxy: config.http.proxy.address,
             });
 
-            if (!response.ok) {
+            if (
+                !(
+                    response.ok &&
+                    response.headers.get("content-type")?.includes("json")
+                )
+            ) {
                 // If the server doesn't have a Lysand well-known endpoint, it's not a Lysand instance
                 // Try to resolve ActivityPub metadata instead
                 const data = await Instance.fetchActivityPubMetadata(url);

packages/database-interface/user.ts

@@ -7,6 +7,7 @@ import type {
     Mention as ApiMention,
 } from "@lysand-org/client/types";
 import { EntityValidator } from "@lysand-org/federation";
+import type { FederationRequester } from "@lysand-org/federation/requester";
 import type { Entity, User as LysandUser } from "@lysand-org/federation/types";
 import {
     type InferInsertModel,
@@ -198,6 +199,20 @@ export class User extends BaseInterface<typeof Users, UserWithRelations> {
         );
     }
 
+    static async webFinger(
+        manager: FederationRequester,
+        username: string,
+    ): Promise<string> {
+        return (
+            (await manager.webFinger(username).catch(() => null)) ??
+            (await manager.webFinger(
+                username,
+                manager.url.hostname,
+                "application/activity+json",
+            ))
+        );
+    }
+
     static async getCount() {
         return (
             await db

server/api/api/v1/accounts/lookup/index.ts

@@ -92,7 +92,7 @@ export default (app: Hono) =>
                     signatureConstructor,
                 );
 
-                const uri = await manager.webFinger(username);
+                const uri = await User.webFinger(manager, username);
 
                 const foundAccount = await User.resolve(uri);
 

server/api/api/v1/accounts/search/index.ts

@@ -103,7 +103,7 @@ export default (app: Hono) =>
                     signatureConstructor,
                 );
 
-                const uri = await manager.webFinger(username);
+                const uri = await User.webFinger(manager, username);
 
                 const resolvedUser = await User.resolve(uri);
 

server/api/api/v2/search/index.ts

@@ -141,7 +141,7 @@ export default (app: Hono) =>
                             signatureConstructor,
                         );
 
-                        const uri = await manager.webFinger(username);
+                        const uri = await User.webFinger(manager, username);
 
                         const newUser = await User.resolve(uri);