From 1e310aa124577fb8c2ad7933e2fe9621a81b90c7 Mon Sep 17 00:00:00 2001 From: Diogo Peralta Cordeiro Date: Sun, 20 Feb 2022 13:59:06 +0000 Subject: [PATCH] [PLUGIN][ActivityPub][FreeNetwork] DB::findBy won't work if not commited first --- plugins/ActivityPub/ActivityPub.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/ActivityPub/ActivityPub.php b/plugins/ActivityPub/ActivityPub.php index 81b237a395..cb3080019c 100644 --- a/plugins/ActivityPub/ActivityPub.php +++ b/plugins/ActivityPub/ActivityPub.php @@ -382,7 +382,7 @@ class ActivityPub extends Plugin { try { if (FreeNetworkActorProtocol::canIAddr('activitypub', $addr = Discovery::normalize($target))) { - $ap_actor = ActivitypubActor::getByAddr($addr); + $ap_actor = DB::wrapInTransaction(fn() => ActivitypubActor::getByAddr($addr)); $actor = Actor::getById($ap_actor->getActorId()); FreeNetworkActorProtocol::protocolSucceeded('activitypub', $actor->getId(), $addr); return Event::stop; @@ -390,7 +390,7 @@ class ActivityPub extends Plugin return Event::next; } } catch (Exception $e) { - Log::error('ActivityPub Webfinger Mention check failed.', [$e]); + Log::error('ActivityPub WebFinger Mention check failed.', [$e]); return Event::next; } }