feat(federation): Finalize Versia 0.6 port

packages/kit/db/note.ts

@@ -941,20 +941,19 @@ export class Note extends BaseInterface<typeof Notes, NoteTypeWithRelations> {
      */
     public static async resolve(
         reference: VersiaEntities.Reference,
+        defaultInstance?: Instance,
     ): Promise<Note | null> {
         // Check if note not already in database
         if (
-            !reference.domain ||
+            !(reference.domain || defaultInstance) ||
             reference.domain === config.http.base_url.hostname
         ) {
             return await Note.fromId(reference.id);
         }
 
-        const instance = await Instance.resolve(reference.domain);
-
-        if (!instance) {
-            return null;
-        }
+        const instance = reference.domain
+            ? await Instance.resolve(reference.domain)
+            : (defaultInstance as Instance);
 
         const foundNote = await Note.fromSql(
             and(
@@ -963,7 +962,7 @@ export class Note extends BaseInterface<typeof Notes, NoteTypeWithRelations> {
                     Notes.authorId,
                     sql`(
                     SELECT "Users".id FROM "Users"
-                    WHERE "Users".instanceId = ${instance.id}
+                    WHERE "Users"."instanceId" = ${instance.id}
                     LIMIT 1
                 )`,
                 ),
@@ -974,7 +973,14 @@ export class Note extends BaseInterface<typeof Notes, NoteTypeWithRelations> {
             return foundNote;
         }
 
-        return Note.fromVersia(reference);
+        return Note.fromVersia(
+            reference.domain
+                ? reference
+                : new VersiaEntities.Reference(
+                      reference.id,
+                      instance.data.baseUrl,
+                  ),
+        );
     }
 
     /**
@@ -983,28 +989,45 @@ export class Note extends BaseInterface<typeof Notes, NoteTypeWithRelations> {
      * If the note already exists, it will update it.
      * @param versiaNote - Reference or Versia Note representation
      */
+    public static async fromVersia(
+        versiaNote: VersiaEntities.Note,
+        instance: Instance,
+    ): Promise<Note>;
+
+    public static async fromVersia(
+        reference: VersiaEntities.Reference,
+    ): Promise<Note>;
+
     public static async fromVersia(
         versiaNote: VersiaEntities.Note | VersiaEntities.Reference,
+        instance?: Instance,
     ): Promise<Note> {
         if (versiaNote instanceof VersiaEntities.Reference) {
+            if (!versiaNote.domain) {
+                throw new Error(
+                    "Cannot fetch Versia note from reference without domain",
+                );
+            }
+
             // No bridge support for notes yet
             const note = await Instance.federationRequester.fetchEntity(
                 versiaNote,
                 VersiaEntities.Note,
             );
 
-            return Note.fromVersia(note);
+            const instance = await Instance.resolve(versiaNote.domain);
+
+            return Note.fromVersia(note, instance);
+        }
+
+        if (!instance) {
+            throw new Error("Instance must be provided when fetching note");
         }
 
         const { created_at, extensions, group, id, is_sensitive, subject } =
             versiaNote.data;
 
-        if (!versiaNote.author.domain) {
-            throw new Error("Entity author domain is missing");
-        }
-
-        const instance = await Instance.resolve(versiaNote.author.domain);
-        const author = await User.resolve(versiaNote.author);
+        const author = await User.resolve(versiaNote.author, instance);
 
         if (!author) {
             throw new Error("Entity author could not be resolved");
@@ -1041,7 +1064,7 @@ export class Note extends BaseInterface<typeof Notes, NoteTypeWithRelations> {
 
         const mentions = (
             await Promise.all(
-                versiaNote.mentions.map((m) => User.resolve(m)) ?? [],
+                versiaNote.mentions.map((m) => User.resolve(m, instance)) ?? [],
             )
         ).filter((m) => m !== null);
 
@@ -1052,10 +1075,10 @@ export class Note extends BaseInterface<typeof Notes, NoteTypeWithRelations> {
                 : (group as "public" | "followers" | "unlisted");
 
         const reply = versiaNote.repliesTo
-            ? await Note.resolve(versiaNote.repliesTo)
+            ? await Note.resolve(versiaNote.repliesTo, instance)
             : null;
         const quote = versiaNote.quotes
-            ? await Note.resolve(versiaNote.quotes)
+            ? await Note.resolve(versiaNote.quotes, instance)
             : null;
         const spoiler = subject ? await sanitizedHtmlStrip(subject) : undefined;
 

packages/kit/db/user.ts

@@ -672,9 +672,18 @@ export class User extends BaseInterface<typeof Users, UserWithRelations> {
      * If the user already exists, it will update it.
      * @param versiaUser Reference or Versia User representation
      */
+    public static async fromVersia(
+        versiaUser: VersiaEntities.User,
+        instance: Instance,
+    ): Promise<User>;
+
+    public static async fromVersia(
+        versiaUser: VersiaEntities.Reference,
+    ): Promise<User>;
+
     public static async fromVersia(
         versiaUser: VersiaEntities.User | VersiaEntities.Reference,
-        domain: string,
+        instance?: Instance,
     ): Promise<User> {
         if (versiaUser instanceof VersiaEntities.Reference) {
             if (!versiaUser.domain) {
@@ -688,7 +697,13 @@ export class User extends BaseInterface<typeof Users, UserWithRelations> {
                 VersiaEntities.User,
             );
 
-            return User.fromVersia(user, versiaUser.domain);
+            const instance = await Instance.resolve(versiaUser.domain);
+
+            return User.fromVersia(user, instance);
+        }
+
+        if (!instance) {
+            throw new Error("Instance must be provided when fetching user");
         }
 
         const {
@@ -702,7 +717,6 @@ export class User extends BaseInterface<typeof Users, UserWithRelations> {
             extensions,
         } = versiaUser.data;
 
-        const instance = await Instance.resolve(domain);
         const existingUser = await User.fromSql(
             and(eq(Users.instanceId, instance.id), eq(Users.remoteId, id)),
         );
@@ -788,10 +802,11 @@ export class User extends BaseInterface<typeof Users, UserWithRelations> {
 
     public static async resolve(
         reference: VersiaEntities.Reference,
+        defaultInstance?: Instance,
     ): Promise<User> {
         // Check if user not already in database
         if (
-            !reference.domain ||
+            !(reference.domain || defaultInstance) ||
             reference.domain === config.http.base_url.hostname
         ) {
             const user = await User.fromId(reference.id);
@@ -805,7 +820,9 @@ export class User extends BaseInterface<typeof Users, UserWithRelations> {
             return user;
         }
 
-        const instance = await Instance.resolve(reference.domain);
+        const instance = reference.domain
+            ? await Instance.resolve(reference.domain)
+            : (defaultInstance as Instance);
 
         const foundUser = await User.fromSql(
             and(
@@ -818,7 +835,14 @@ export class User extends BaseInterface<typeof Users, UserWithRelations> {
             return foundUser;
         }
 
-        return User.fromVersia(reference, reference.domain);
+        return User.fromVersia(
+            reference.domain
+                ? reference
+                : new VersiaEntities.Reference(
+                      reference.id,
+                      instance.data.baseUrl,
+                  ),
+        );
     }
 
     /**