Improved the performance of recipients gathering during sending activities

Author: dahlia

.gitignore

@@ -1,4 +1,5 @@
 .env
 assets/
 fedify-hollo-*.tgz
+*.jsonl
 node_modules/

CHANGES.md

@@ -21,6 +21,8 @@ To be released.
  -  Added `LOG_FILE` environment variable to specify the file path to write
     structured logs.  The logs are written in JSON Lines format.
 
+ -  Improved the performance of recipients gathering during sending activities.
+
 [#65]: https://github.com/dahlia/hollo/issues/65
 
 

log.jsonl

@@ -180,8 +180,8 @@ federation
       const owner = await db.query.accountOwners.findFirst({
         where: eq(accountOwners.handle, identifier),
       });
-      if (owner == null || cursor == null) return null;
-      const offset = Number.parseInt(cursor);
+      if (owner == null) return null;
+      const offset = cursor == null ? undefined : Number.parseInt(cursor);
       if (!Number.isInteger(offset)) return null;
       const followers = await db.query.accounts.findMany({
         where: and(
@@ -203,17 +203,19 @@ federation
         ),
         offset,
         orderBy: accounts.id,
-        limit: 41,
+        limit: offset == null ? undefined : 41,
       });
+      const items = offset == null ? followers : followers.slice(0, 40);
       return {
-        items: followers.slice(0, 40).map((f) => ({
+        items: items.map((f) => ({
           id: new URL(f.iri),
           inboxId: new URL(f.inboxUrl),
           endpoints: {
             sharedInbox: f.sharedInboxUrl ? new URL(f.sharedInboxUrl) : null,
           },
         })),
-        nextCursor: followers.length > 40 ? `${offset + 40}` : null,
+        nextCursor:
+          offset != null && followers.length > 40 ? `${offset + 40}` : null,
       };
     },
   )