Merge pull request #9609 from annando/contact-reshare

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

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 226aebfc003b08c48e02bd752da2d914f28910b9..38c87cf452439c7d5b2d600304a85bf7a8f438aa 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
@@ -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()];
@@ -1336,15 +1341,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);
@@ -1749,9 +1748,12 @@ class Contact
                $condition['rel'] = self::SHARING;
                DBA::update('contact', $fields, $condition);
 
-               unset($fields['last-update']);
-               unset($fields['success_update']);
-               unset($fields['failure_update']);
+               // If the contact failed, propagate the update fields to all contacts
+               if (empty($fields['failed'])) {
+                       unset($fields['last-update']);
+                       unset($fields['success_update']);
+                       unset($fields['failure_update']);
+               }
 
                if (empty($fields)) {
                        return;
@@ -1872,9 +1874,7 @@ class Contact
 
                // If Probe::uri fails the network code will be different ("feed" or "unkn")
                if (in_array($ret['network'], [Protocol::FEED, Protocol::PHANTOM]) && ($ret['network'] != $contact['network'])) {
-                       if ($uid == 0) {
-                               self::updateContact($id, $uid, $ret['url'], ['failed' => true, 'last-update' => $updated, 'failure_update' => $updated]);
-                       }
+                       self::updateContact($id, $uid, $ret['url'], ['failed' => true, 'last-update' => $updated, 'failure_update' => $updated]);
                        return false;
                }
 
@@ -1943,6 +1943,7 @@ class Contact
 
                $ret['nurl'] = Strings::normaliseLink($ret['url']);
                $ret['updated'] = $updated;
+               $ret['failed'] = false;
 
                // Only fill the pubkey if it had been empty before. We have to prevent identity theft.
                if (empty($pubkey) && !empty($new_pubkey)) {
@@ -1960,7 +1961,6 @@ class Contact
                if ($uid == 0) {
                        $ret['last-update'] = $updated;
                        $ret['success_update'] = $updated;
-                       $ret['failed'] = false;
                }
 
                unset($ret['photo']);
@@ -2425,18 +2425,12 @@ class Contact
                                        in_array($user['page-flags'], [User::PAGE_FLAGS_NORMAL])) {
 
                                        notification([
-                                               'type'         => Type::INTRO,
-                                               'notify_flags' => $user['notify-flags'],
-                                               'language'     => $user['language'],
-                                               'to_name'      => $user['username'],
-                                               'to_email'     => $user['email'],
-                                               'uid'          => $user['uid'],
-                                               'link'         => DI::baseUrl() . '/notifications/intros',
-                                               'source_name'  => ((strlen(stripslashes($contact_record['name']))) ? stripslashes($contact_record['name']) : DI::l10n()->t('[Name Withheld]')),
-                                               'source_link'  => $contact_record['url'],
-                                               'source_photo' => $contact_record['photo'],
-                                               'verb'         => ($sharing ? Activity::FRIEND : Activity::FOLLOW),
-                                               'otype'        => 'intro'
+                                               'type'  => Type::INTRO,
+                                               'otype' => Notify\ObjectType::INTRO,
+                                               'verb'  => ($sharing ? Activity::FRIEND : Activity::FOLLOW),
+                                               'uid'   => $user['uid'],
+                                               'cid'   => $contact_record['id'],
+                                               'link'  => DI::baseUrl() . '/notifications/intros',
                                        ]);
                                }
                        } elseif (DBA::isResult($user) && in_array($user['page-flags'], [User::PAGE_FLAGS_SOAPBOX, User::PAGE_FLAGS_FREELOVE, User::PAGE_FLAGS_COMMUNITY])) {