We don't update inside the probing anymore

diff --git a/src/Model/APContact.php b/src/Model/APContact.php
index 6d50582e68452251144b1bef22731af6c1fdf5c0..82afc0769622959c068d320d293cd0f48808d3e2 100644 (file)
--- a/src/Model/APContact.php
+++ b/src/Model/APContact.php
@@ -237,41 +237,6 @@ class APContact extends BaseObject
                        DBA::delete('apcontact', ['url' => $url]);
                }
 
-               // Update some data in the contact table with various ways to catch them all
-               $contact_fields = ['name' => $apcontact['name'], 'about' => $apcontact['about'], 'alias' => $apcontact['alias']];
-
-               // Fetch the type and match it with the contact type
-               $contact_types = array_keys(ActivityPub::ACCOUNT_TYPES, $apcontact['type']);
-               if (!empty($contact_types)) {
-                       $contact_type = array_pop($contact_types);
-                       if (is_int($contact_type)) {
-                               $contact_fields['contact-type'] = $contact_type;
-
-                               if ($contact_fields['contact-type'] != User::ACCOUNT_TYPE_COMMUNITY) {
-                                       // Resetting the 'forum' and 'prv' field when it isn't a forum
-                                       $contact_fields['forum'] = false;
-                                       $contact_fields['prv'] = false;
-                               } else {
-                                       // Otherwise set the corresponding forum type
-                                       $contact_fields['forum'] = !$apcontact['manually-approve'];
-                                       $contact_fields['prv'] = $apcontact['manually-approve'];
-                               }
-                       }
-               }
-
-               DBA::update('contact', $contact_fields, ['nurl' => Strings::normaliseLink($url)]);
-
-               if (!empty($apcontact['photo'])) {
-                       $contacts = DBA::select('contact', ['uid', 'id'], ['nurl' => Strings::normaliseLink($url)]);
-                       while ($contact = DBA::fetch($contacts)) {
-                               Contact::updateAvatar($apcontact['photo'], $contact['uid'], $contact['id']);
-                       }
-                       DBA::close($contacts);
-               }
-
-               // Update the gcontact table
-               GContact::updateFromPublicContactURL($url);
-
                Logger::log('Updated profile for ' . $url, Logger::DEBUG);
 
                return $apcontact;

diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index 101942642ec11261f69fa925a00a567be7e5b6dc..6ba0c8f8486179110fd7f2a02432aca50ef864d7 100644 (file)
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -611,8 +611,7 @@ class Processor
                }
 
                Logger::log('Updating profile for ' . $activity['object_id'], Logger::DEBUG);
-               APContact::getByURL($activity['object_id'], true);
-//             Contact::updateFromProbe($activity['object_id'], $network = '', $force = false)
+               Contact::updateFromProbeByURL($activity['object_id'], true);
        }
 
        /**