Merge pull request #11082 from annando/Fix-rendertime

[friendica.git] / src / Model / Contact.php

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 1221261c87ebe5ed8fd21fad3a190b061083987d..4898ec56783e57368fab52a946457eeacb5f9d1b 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -57,36 +57,6 @@ class Contact
        const DEFAULT_AVATAR_THUMB = '/images/person-80.jpg';
        const DEFAULT_AVATAR_MICRO = '/images/person-48.jpg';
 
-       /**
-        * @deprecated since version 2019.03
-        * @see User::PAGE_FLAGS_NORMAL
-        */
-       const PAGE_NORMAL    = User::PAGE_FLAGS_NORMAL;
-       /**
-        * @deprecated since version 2019.03
-        * @see User::PAGE_FLAGS_SOAPBOX
-        */
-       const PAGE_SOAPBOX   = User::PAGE_FLAGS_SOAPBOX;
-       /**
-        * @deprecated since version 2019.03
-        * @see User::PAGE_FLAGS_COMMUNITY
-        */
-       const PAGE_COMMUNITY = User::PAGE_FLAGS_COMMUNITY;
-       /**
-        * @deprecated since version 2019.03
-        * @see User::PAGE_FLAGS_FREELOVE
-        */
-       const PAGE_FREELOVE  = User::PAGE_FLAGS_FREELOVE;
-       /**
-        * @deprecated since version 2019.03
-        * @see User::PAGE_FLAGS_BLOG
-        */
-       const PAGE_BLOG      = User::PAGE_FLAGS_BLOG;
-       /**
-        * @deprecated since version 2019.03
-        * @see User::PAGE_FLAGS_PRVGROUP
-        */
-       const PAGE_PRVGROUP  = User::PAGE_FLAGS_PRVGROUP;
        /**
         * @}
         */
@@ -2409,7 +2379,7 @@ class Contact
                }
 
                if (($network != '') && ($ret['network'] != $network)) {
-                       Logger::log('Expected network ' . $network . ' does not match actual network ' . $ret['network']);
+                       Logger::notice('Expected network ' . $network . ' does not match actual network ' . $ret['network']);
                        return $result;
                }
 
@@ -2522,7 +2492,7 @@ class Contact
                $contact_id = $contact['id'];
                $result['cid'] = $contact_id;
 
-               Group::addMember(User::getDefaultGroup($uid, $contact["network"]), $contact_id);
+               Group::addMember(User::getDefaultGroup($uid), $contact_id);
 
                // Update the avatar
                self::updateAvatar($contact_id, $ret['photo']);
@@ -2538,61 +2508,11 @@ class Contact
                        Worker::add(PRIORITY_HIGH, 'UpdateContact', $contact_id);
                }
 
-               $owner = User::getOwnerDataById($uid);
+               $result['success'] = Protocol::follow($uid, $contact, $protocol);
 
-               if (DBA::isResult($owner)) {
-                       if (in_array($protocol, [Protocol::OSTATUS, Protocol::DFRN])) {
-                               // create a follow slap
-                               $item = [];
-                               $item['verb'] = Activity::FOLLOW;
-                               $item['gravity'] = GRAVITY_ACTIVITY;
-                               $item['follow'] = $contact["url"];
-                               $item['body'] = '';
-                               $item['title'] = '';
-                               $item['guid'] = '';
-                               $item['uri-id'] = 0;
-
-                               $slap = OStatus::salmon($item, $owner);
-
-                               if (!empty($contact['notify'])) {
-                                       Salmon::slapper($owner, $contact['notify'], $slap);
-                               }
-                       } elseif ($protocol == Protocol::DIASPORA) {
-                               $ret = Diaspora::sendShare($owner, $contact);
-                               Logger::log('share returns: ' . $ret);
-                       } elseif ($protocol == Protocol::ACTIVITYPUB) {
-                               $activity_id = ActivityPub\Transmitter::activityIDFromContact($contact_id);
-                               if (empty($activity_id)) {
-                                       // This really should never happen
-                                       return false;
-                               }
-
-                               $ret = ActivityPub\Transmitter::sendActivity('Follow', $contact['url'], $uid, $activity_id);
-                               Logger::log('Follow returns: ' . $ret);
-                       }
-               }
-
-               $result['success'] = true;
                return $result;
        }
 
-       /**
-        * Follow a contact
-        *
-        * @param int $cid Public contact id
-        * @param int $uid  User ID
-        *
-        * @return bool "true" if following had been successful
-        */
-       public static function follow(int $cid, int $uid)
-       {
-               $contact = self::getById($cid, ['url']);
-
-               $result = self::createFromProbeForUser($uid, $contact['url']);
-
-               return $result['cid'];
-       }
-
        /**
         * Unfollow a contact
         *
@@ -2686,7 +2606,7 @@ class Contact
                } else {
                        // send email notification to owner?
                        if (DBA::exists('contact', ['nurl' => Strings::normaliseLink($url), 'uid' => $importer['uid'], 'pending' => true])) {
-                               Logger::log('ignoring duplicated connection request from pending contact ' . $url);
+                               Logger::notice('ignoring duplicated connection request from pending contact ' . $url);
                                return null;
                        }
 
@@ -2729,7 +2649,7 @@ class Contact
                                        DI::intro()->save($intro);
                                }
 
-                               Group::addMember(User::getDefaultGroup($importer['uid'], $contact_record["network"]), $contact_record['id']);
+                               Group::addMember(User::getDefaultGroup($importer['uid']), $contact_record['id']);
 
                                if (($user['notify-flags'] & Notification\Type::INTRO) &&
                                        in_array($user['page-flags'], [User::PAGE_FLAGS_NORMAL])) {
@@ -2806,7 +2726,7 @@ class Contact
                $contacts = DBA::select('contact', ['id', 'uid', 'name', 'url', 'bd'], $condition);
 
                while ($contact = DBA::fetch($contacts)) {
-                       Logger::log('update_contact_birthday: ' . $contact['bd']);
+                       Logger::notice('update_contact_birthday: ' . $contact['bd']);
 
                        $nextbd = DateTimeFormat::utcNow('Y') . substr($contact['bd'], 4);