Moved updating personal contacts to updatecontact

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

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 33a73afacfc29302f01a59c304c74ff5b6835ba7..4c173c1be3db6780b4c85883181a81efb444533d 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -139,7 +139,12 @@ class Contact
         * @}
         */
 
-       /**
+        const MIRROR_DEACTIVATED = 0;
+        const MIRROR_FORWARDED = 1;
+        const MIRROR_OWN_POST = 2;
+        const MIRROR_NATIVE_RESHARE = 3;
+
+        /**
         * @param array $fields    Array of selected fields, empty for all
         * @param array $condition Array of fields for condition
         * @param array $params    Array of several parameters
@@ -1291,7 +1296,7 @@ class Contact
                }
 
                if (empty($contact["network"]) || in_array($contact["network"], Protocol::FEDERATED)) {
-                       $sql = "`item`.`uid` IN (0, ?)";
+                       $sql = "(`item`.`uid` = 0 OR (`item`.`uid` = ? AND NOT `item`.`global`))";
                } else {
                        $sql = "`item`.`uid` = ?";
                }
@@ -1299,8 +1304,8 @@ class Contact
                $contact_field = ((($contact["contact-type"] == self::TYPE_COMMUNITY) || ($contact['network'] == Protocol::MAIL)) ? 'owner-id' : 'author-id');
 
                if ($thread_mode) {
-                       $condition = ["(`$contact_field` = ? OR (`causer-id` = ? AND `post-type` = ?)) AND `gravity` = ? AND " . $sql,
-                               $cid, $cid, Item::PT_ANNOUNCEMENT, GRAVITY_PARENT, local_user()];
+                       $condition = ["((`$contact_field` = ? AND `gravity` = ?) OR (`author-id` = ? AND `gravity` = ? AND `vid` = ?)) AND " . $sql,
+                               $cid, GRAVITY_PARENT, $cid, GRAVITY_ACTIVITY, Verb::getID(Activity::ANNOUNCE), local_user()];
                } else {
                        $condition = ["`$contact_field` = ? AND `gravity` IN (?, ?) AND " . $sql,
                                $cid, GRAVITY_PARENT, GRAVITY_COMMENT, local_user()];
@@ -1325,8 +1330,7 @@ class Contact
 
                $pager = new Pager(DI::l10n(), DI::args()->getQueryString(), $itemsPerPage);
 
-               $params = ['order' => ['received' => true], 'group_by' => ['uri-id'],
-                       'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
+               $params = ['order' => ['received' => true], 'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
 
                if (DI::pConfig()->get(local_user(), 'system', 'infinite_scroll')) {
                        $tpl = Renderer::getMarkupTemplate('infinite_scroll_head.tpl');
@@ -1336,15 +1340,9 @@ class Contact
                }
 
                if ($thread_mode) {             
-                       $r = Item::selectForUser(local_user(), ['uri', 'gravity', 'parent-uri'], $condition, $params);
+                       $r = Item::selectForUser(local_user(), ['uri', 'gravity', 'parent-uri', 'thr-parent-id', 'author-id'], $condition, $params);
                        $items = [];
                        while ($item = DBA::fetch($r)) {
-                               if ($item['gravity'] != GRAVITY_PARENT) {
-                                       $item['uri'] = $item['parent-uri'];
-                               }
-                               unset($item['parent-uri']);
-                               unset($item['gravity']);
-                               
                                $items[] = $item;
                        }
                        DBA::close($r);
@@ -1724,31 +1722,38 @@ class Contact
                }
 
                // Search for duplicated contacts and get rid of them
-               if (self::removeDuplicates(Strings::normaliseLink($url), $uid) || ($uid != 0)) {
+               if (self::removeDuplicates(Strings::normaliseLink($url), $uid)) {
                        return;
                }
 
-               // Archive or unarchive the contact. We only need to do this for the public contact.
-               // The archive/unarchive function will update the personal contacts by themselves.
+               // Archive or unarchive the contact.
                $contact = DBA::selectFirst('contact', [], ['id' => $id]);
                if (!DBA::isResult($contact)) {
                        Logger::info('Couldn\'t select contact for archival.', ['id' => $id]);
                        return;
                }
 
-               if (!empty($fields['success_update'])) {
-                       self::unmarkForArchival($contact);
-               } elseif (!empty($fields['failure_update'])) {
-                       self::markForArchival($contact);
+               if (isset($fields['failed'])) {
+                       if ($fields['failed']) {
+                               self::markForArchival($contact);
+                       } else {
+                               self::unmarkForArchival($contact);
+                       }
                }
 
-               $condition = ['self' => false, 'nurl' => Strings::normaliseLink($url), 'network' => Protocol::FEDERATED];
+               if ($contact['uid'] != 0) {
+                       return;
+               }
+
+               // Update contact data for all users
+               $condition = ['self' => false, 'nurl' => Strings::normaliseLink($url)];
 
-               // These contacts are sharing with us, we don't poll them.
-               // This means that we don't set the update fields in "OnePoll.php".
-               $condition['rel'] = self::SHARING;
+               $condition['network'] = [Protocol::DFRN, Protocol::DIASPORA, Protocol::ACTIVITYPUB];
                DBA::update('contact', $fields, $condition);
 
+               // We mustn't set the update fields for OStatus contacts since they are updated in OnePoll
+               $condition['network'] = Protocol::OSTATUS;
+
                // If the contact failed, propagate the update fields to all contacts
                if (empty($fields['failed'])) {
                        unset($fields['last-update']);
@@ -1760,8 +1765,6 @@ class Contact
                        return;
                }
 
-               // We are polling these contacts, so we mustn't set the update fields here.
-               $condition['rel'] = [self::FOLLOWER, self::FRIEND];
                DBA::update('contact', $fields, $condition);
        }
 
@@ -1959,7 +1962,7 @@ class Contact
                        $ret['name-date'] = $updated;
                }
 
-               if ($uid == 0) {
+               if (($uid == 0) || in_array($ret['network'], [Protocol::DFRN, Protocol::DIASPORA, Protocol::ACTIVITYPUB])) {
                        $ret['last-update'] = $updated;
                        $ret['success_update'] = $updated;
                }
@@ -2226,8 +2229,11 @@ class Contact
                self::updateAvatar($contact_id, $ret['photo']);
 
                // pull feed and consume it, which should subscribe to the hub.
-
-               Worker::add(PRIORITY_HIGH, "OnePoll", $contact_id, "force");
+               if ($contact['network'] == Protocol::OSTATUS) {
+                       Worker::add(PRIORITY_HIGH, 'OnePoll', $contact_id, 'force');
+               } else {
+                       Worker::add(PRIORITY_HIGH, 'UpdateContact', $contact_id);
+               }
 
                $owner = User::getOwnerDataById($user['uid']);