From af986758089ce95eb62a787b372948eaba65cd3e Mon Sep 17 00:00:00 2001
From: Opliko <opliko.reg@protonmail.com>
Date: Mon, 6 May 2024 23:57:47 +0200
Subject: [PATCH] fix: remove unnecessary check and guard against unsupported
 URIs before fetching

---
 src/activitypub/actors.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/activitypub/actors.js b/src/activitypub/actors.js
index 3736a93df7..5477d79833 100644
--- a/src/activitypub/actors.js
+++ b/src/activitypub/actors.js
@@ -33,7 +33,7 @@ Actors.assert = async (ids, options = {}) => {
 		const originalId = id;
 		const isUri = activitypub.helpers.isUri(id);
 		// only look up webfinger if the id is not a supported URI
-		if (id.includes('@') && !(isUri && activitypub._constants.acceptedProtocols.includes(new URL(id).protocol.slice(0, -1)))) {
+		if (id.includes('@') && !isUri) {
 			const host = isUri ? new URL(id).host : id.split('@')[1];
 			if (host === nconf.get('url_parsed').host) { // do not assert loopback ids
 				return 'loopback';
@@ -41,8 +41,10 @@ Actors.assert = async (ids, options = {}) => {
 
 			({ actorUri: id } = await activitypub.helpers.query(id));
 		}
-		if (!id) {
+		// ensure the final id is a valid URI
+		if (!id || !activitypub.helpers.isUri(id)) {
 			failedWebfingerCache.set(originalId, true);
+			return;
 		}
 		return id;
 	})));