From 2bcd2eefc1862675075d64cd7609330d52a5fd39 Mon Sep 17 00:00:00 2001
From: Mar0xy <marie@kaifa.ch>
Date: Fri, 22 Sep 2023 02:46:41 +0200
Subject: [PATCH] change to default functions for resolving collections

---
 .../activitypub/models/ApPersonService.ts     | 113 ++----------------
 1 file changed, 8 insertions(+), 105 deletions(-)

diff --git a/packages/backend/src/core/activitypub/models/ApPersonService.ts b/packages/backend/src/core/activitypub/models/ApPersonService.ts
index 53105c6f2..2469583e5 100644
--- a/packages/backend/src/core/activitypub/models/ApPersonService.ts
+++ b/packages/backend/src/core/activitypub/models/ApPersonService.ts
@@ -291,55 +291,11 @@ export class ApPersonService implements OnModuleInit {
 			});
 		//#endregion
 
-		//#region Resolve counts
-		let followersCount: number | undefined;
-
-		if (typeof person.followers === "string") {
-			try {
-				this.logger.info(person.followers);
-				const data = await fetch(person.followers, {
-					headers: { Accept: "application/json" },
-				});
-				const json_data = JSON.parse(await data.text());
-
-				followersCount = json_data.totalItems;
-			} catch {
-				followersCount = undefined;
-			}
-		}
-
-		let followingCount: number | undefined;
-
-		if (typeof person.following === "string") {
-			try {
-				this.logger.info(person.following);
-				const data = await fetch(person.following, {
-					headers: { Accept: "application/json" },
-				});
-				const json_data = JSON.parse(await data.text());
-
-				followingCount = json_data.totalItems;
-			} catch (e) {
-				followingCount = undefined;
-			}
-		}
-
-		let notesCount: number | undefined;
-
-		if (typeof person.outbox === "string") {
-			try {
-				this.logger.info(person.outbox);
-				const data = await fetch(person.outbox, {
-					headers: { Accept: "application/json" },
-				});
-				const json_data = JSON.parse(await data.text());
-
-				notesCount = json_data.totalItems;
-			} catch (e) {
-				notesCount = undefined;
-			}
-		}
-		//#endregion
+		//#region resolve counts
+		const _resolver = resolver ?? this.apResolverService.createResolver();
+		const outboxcollection = await _resolver.resolveCollection(person.outbox);
+		const followerscollection = await _resolver.resolveCollection(person.followers!);
+		const followingcollection = await _resolver.resolveCollection(person.following!);
 
 		try {
 			// Start transaction
@@ -361,9 +317,9 @@ export class ApPersonService implements OnModuleInit {
 					host,
 					inbox: person.inbox,
 					sharedInbox: person.sharedInbox ?? person.endpoints?.sharedInbox,
-					notesCount: notesCount !== undefined ? notesCount : person.outbox && typeof person.outbox !== "string" && isCollectionOrOrderedCollection(person.outbox) ? person.outbox.totalItems : undefined,
-					followersCount: followersCount !== undefined ? followersCount : person.followers && typeof person.followers !== "string" && isCollectionOrOrderedCollection(person.followers) ? person.followers.totalItems : undefined,
-					followingCount: followingCount !== undefined ? followingCount : person.following && typeof person.following !== "string" && isCollectionOrOrderedCollection(person.following) ? person.following.totalItems : undefined,
+					notesCount: outboxcollection.totalItems ?? 0,
+					followersCount: followerscollection.totalItems ?? 0,
+					followingCount: followingcollection.totalItems ?? 0,
 					followersUri: person.followers ? getApId(person.followers) : undefined,
 					featured: person.featured ? getApId(person.featured) : undefined,
 					uri: person.id,
@@ -493,63 +449,10 @@ export class ApPersonService implements OnModuleInit {
 			throw new Error('unexpected schema of person url: ' + url);
 		}
 
-		//#region Resolve counts
-		let followersCount: number | undefined;
-
-		if (typeof person.followers === "string") {
-			try {
-				this.logger.info(person.followers);
-				const data = await fetch(person.followers, {
-					headers: { Accept: "application/json" },
-				});
-				const json_data = JSON.parse(await data.text());
-
-				followersCount = json_data.totalItems;
-			} catch {
-				followersCount = undefined;
-			}
-		}
-
-		let followingCount: number | undefined;
-
-		if (typeof person.following === "string") {
-			try {
-				this.logger.info(person.following);
-				const data = await fetch(person.following, {
-					headers: { Accept: "application/json" },
-				});
-				const json_data = JSON.parse(await data.text());
-
-				followingCount = json_data.totalItems;
-			} catch (e) {
-				followingCount = undefined;
-			}
-		}
-
-		let notesCount: number | undefined;
-
-		if (typeof person.outbox === "string") {
-			try {
-				this.logger.info(person.outbox);
-				const data = await fetch(person.outbox, {
-					headers: { Accept: "application/json" },
-				});
-				const json_data = JSON.parse(await data.text());
-
-				notesCount = json_data.totalItems;
-			} catch (e) {
-				notesCount = undefined;
-			}
-		}
-		//#endregion
-
 		const updates = {
 			lastFetchedAt: new Date(),
 			inbox: person.inbox,
 			sharedInbox: person.sharedInbox ?? person.endpoints?.sharedInbox,
-			notesCount: notesCount !== undefined ? notesCount : person.outbox && typeof person.outbox !== "string" && isCollectionOrOrderedCollection(person.outbox) ? person.outbox.totalItems : undefined,
-			followersCount: followersCount !== undefined ? followersCount : person.followers && typeof person.followers !== "string" && isCollectionOrOrderedCollection(person.followers) ? person.followers.totalItems : undefined,
-			followingCount: followingCount !== undefined ? followingCount : person.following && typeof person.following !== "string" && isCollectionOrOrderedCollection(person.following) ? person.following.totalItems : undefined,
 			followersUri: person.followers ? getApId(person.followers) : undefined,
 			featured: person.featured,
 			emojis: emojiNames,