Fix enduring follow requests to Pleroma

diff --git a/src/Protocol/ActivityPub/Receiver.php b/src/Protocol/ActivityPub/Receiver.php
index bb676b396e338113ee517be084f8dfde49ec994e..058d210a24072d484d799a9ff2f4933e2c29cce3 100644 (file)
--- a/src/Protocol/ActivityPub/Receiver.php
+++ b/src/Protocol/ActivityPub/Receiver.php
@@ -656,14 +656,19 @@ class Receiver
         */
        public static function switchContact($cid, $uid, $url)
        {
-               Contact::updateFromProbe($cid, '', true);
+               if (DBA::exists('contact', ['id' => $cid, 'network' => Protocol::ACTIVITYPUB])) {
+                       Logger::info('Contact is already ActivityPub', ['id' => $cid, 'uid' => $uid, 'url' => $url]);
+                       return;
+               }
 
-               Logger::log('Switch contact ' . $cid . ' (' . $url . ') for user ' . $uid . ' to ActivityPub');
+               if (Contact::updateFromProbe($cid, '', true)) {
+                       Logger::info('Update was successful', ['id' => $cid, 'uid' => $uid, 'url' => $url]);
+               }
 
                // Send a new follow request to be sure that the connection still exists
-               if (($uid != 0) && DBA::exists('contact', ['id' => $cid, 'rel' => [Contact::SHARING, Contact::FRIEND]])) {
+               if (($uid != 0) && DBA::exists('contact', ['id' => $cid, 'rel' => [Contact::SHARING, Contact::FRIEND], 'network' => Protocol::ACTIVITYPUB])) {
+                       Logger::info('Contact had been switched to ActivityPub. Sending a new follow request.', ['uid' => $uid, 'url' => $url]);
                        ActivityPub\Transmitter::sendActivity('Follow', $url, $uid);
-                       Logger::log('Send a new follow request to ' . $url . ' for user ' . $uid, Logger::DEBUG);
                }
        }