Merge remote-tracking branch 'upstream/2021.09-rc' into user-contact

diff --cc src/Model/Contact.php
index e7a6b529d3d562b90d4b67f014a160310067f346,54fae63b64802024c89905dad9d32242c427ea32..cd56b672c158f0a9857412fea992118b5466b853
--- 1/src/Model/Contact.php
--- 2/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@@ -791,11 -765,14 +791,14 @@@ class Contac
                        // Update the public contact as well
                        $fields['prvkey'] = null;
                        $fields['self']   = false;
 -                      DBA::update('contact', $fields, ['uid' => 0, 'nurl' => $self['nurl']]);
 +                      self::update($fields, ['uid' => 0, 'nurl' => $self['nurl']]);
  
                        // Update the profile
-                       $fields = ['photo' => DI::baseUrl() . '/photo/profile/' .$uid . '.' . $file_suffix,
-                               'thumb' => DI::baseUrl() . '/photo/avatar/' . $uid .'.' . $file_suffix];
+                       $fields = [
+                               'photo' => User::getAvatarUrlForId($uid),
+                               'thumb' => User::getAvatarUrlForId($uid, Proxy::SIZE_THUMB)
+                       ];
+ 
                        DBA::update('profile', $fields, ['uid' => $uid]);
                }
  

diff --cc src/Model/User.php
Simple merge

diff --cc src/Module/Contact.php
Simple merge

diff --cc src/Protocol/ActivityPub/Processor.php
Simple merge

diff --cc src/Protocol/ActivityPub/Transmitter.php
Simple merge

diff --cc src/Protocol/DFRN.php
Simple merge

diff --cc src/Protocol/Diaspora.php
Simple merge

diff --cc src/Protocol/Feed.php
Simple merge

diff --cc src/Protocol/OStatus.php
Simple merge