Issue 8151: Automatic Friend is working again

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

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 5eb4ed036fa00ef9ebb23c66e677ccde55cca21f..e4f142e3a2d93d06bfb74ef3d6fad368de333489 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -640,35 +640,6 @@ class Contact
                return $return;
        }
 
-       /**
-        * Returns the count of OStatus contacts in a group
-        *
-        * @param int $gid
-        * @return int
-        * @throws \Exception
-        */
-       public static function getOStatusCountByGroupId($gid)
-       {
-               $return = 0;
-               if (intval($gid)) {
-                       $contacts = DBA::fetchFirst('SELECT COUNT(*) AS `count`
-                               FROM `contact`
-                               INNER JOIN `group_member`
-                                       ON `contact`.`id` = `group_member`.`contact-id`
-                               WHERE `gid` = ?
-                               AND `contact`.`uid` = ?
-                               AND `contact`.`network` = ?
-                               AND `contact`.`notify` != ""',
-                               $gid,
-                               local_user(),
-                               Protocol::OSTATUS
-                       );
-                       $return = $contacts['count'];
-               }
-
-               return $return;
-       }
-
        /**
         * Creates the self-contact for the provided user id
         *
@@ -733,7 +704,7 @@ class Contact
                        return;
                }
 
-               $fields = ['nickname', 'page-flags', 'account-type', 'hidewall'];
+               $fields = ['nickname', 'page-flags', 'account-type'];
                $user = DBA::selectFirst('user', $fields, ['uid' => $uid]);
                if (!DBA::isResult($user)) {
                        return;
@@ -1066,6 +1037,7 @@ class Contact
                }
 
                if (DBA::isResult($r)) {
+                       $authoritativeResult = true;
                        // If there is more than one entry we filter out the connector networks
                        if (count($r) > 1) {
                                foreach ($r as $id => $result) {
@@ -1099,6 +1071,7 @@ class Contact
                                $profile["bd"] = DBA::NULL_DATE;
                        }
                } else {
+                       $authoritativeResult = false;
                        $profile = $default;
                }
 
@@ -1135,7 +1108,11 @@ class Contact
                        $profile["birthday"] = DBA::NULL_DATE;
                }
 
-               $cache[$url][$uid] = $profile;
+               // Only cache the result if it came from the DB since this method is used in widely different contexts
+               // @see display_fetch_author for an example of $default parameter diverging from the DB result
+               if ($authoritativeResult) {
+                       $cache[$url][$uid] = $profile;
+               }
 
                return $profile;
        }
@@ -1278,6 +1255,10 @@ class Contact
                        }
                }
 
+               if (!empty($follow_link) || !empty($unfollow_link)) {
+                       $contact_drop_link = '';
+               }
+
                /**
                 * Menu array:
                 * "name" => [ "Label", "link", (bool)Should the link opened in a new tab? ]
@@ -1804,7 +1785,15 @@ class Contact
                                $cid, GRAVITY_PARENT, GRAVITY_COMMENT, local_user()];
                }
 
-               $pager = new Pager(DI::args()->getQueryString());
+               if (DI::mode()->isMobile()) {
+                       $itemsPerPage = DI::pConfig()->get(local_user(), 'system', 'itemspage_mobile_network',
+                               DI::config()->get('system', 'itemspage_network_mobile'));
+               } else {
+                       $itemsPerPage = DI::pConfig()->get(local_user(), 'system', 'itemspage_network',
+                               DI::config()->get('system', 'itemspage_network'));
+               }
+
+               $pager = new Pager(DI::l10n(), DI::args()->getQueryString(), $itemsPerPage);
 
                $params = ['order' => ['received' => true],
                        'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
@@ -1814,13 +1803,13 @@ class Contact
 
                        $items = Item::inArray($r);
 
-                       $o = conversation($a, $items, $pager, 'contacts', $update, false, 'commented', local_user());
+                       $o = conversation($a, $items, 'contacts', $update, false, 'commented', local_user());
                } else {
                        $r = Item::selectForUser(local_user(), [], $condition, $params);
 
                        $items = Item::inArray($r);
 
-                       $o = conversation($a, $items, $pager, 'contact-posts', false);
+                       $o = conversation($a, $items, 'contact-posts', false);
                }
 
                if (!$update) {
@@ -2664,8 +2653,17 @@ class Contact
                                        ]);
                                }
                        } elseif (DBA::isResult($user) && in_array($user['page-flags'], [User::PAGE_FLAGS_SOAPBOX, User::PAGE_FLAGS_FREELOVE, User::PAGE_FLAGS_COMMUNITY])) {
+                               if (($user['page-flags'] == User::PAGE_FLAGS_FREELOVE) && ($network != Protocol::DIASPORA)) {
+                                       self::createFromProbe($importer['uid'], $url, false, $network);
+                               }
+
                                $condition = ['uid' => $importer['uid'], 'url' => $url, 'pending' => true];
-                               DBA::update('contact', ['pending' => false], $condition);
+                               $fields = ['pending' => false];
+                               if ($user['page-flags'] == User::PAGE_FLAGS_FREELOVE) {
+                                       $fields['rel'] = Contact::FRIEND;
+                               }
+
+                               DBA::update('contact', $fields, $condition);
 
                                return true;
                        }