Merge branch 'master' into develop

[friendica.git] / src / Worker / Delivery.php

diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php
index e8d432cc7ae01c9a7059ab7cf3a375a3171bb24d..dc6caab3db9c95fe0cdece3100077ed633c7ac4c 100644 (file)
--- a/src/Worker/Delivery.php
+++ b/src/Worker/Delivery.php
@@ -4,23 +4,20 @@
  */
 namespace Friendica\Worker;
 
-use Friendica\App;
-use Friendica\Core\System;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Model\Contact;
+use Friendica\Model\Item;
 use Friendica\Model\Queue;
 use Friendica\Model\User;
-use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\DFRN;
+use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\Email;
 use dba;
 
-require_once 'include/html2plain.php';
-require_once 'include/datetime.php';
 require_once 'include/items.php';
-require_once 'include/bbcode.php';
 
 /// @todo This is some ugly code that needs to be split into several methods
 
@@ -35,11 +32,12 @@ class Delivery {
                $relocate = false;
                $top_level = false;
                $recipients = [];
-               $url_recipients = [];
                $followup = false;
 
                $normal_mode = true;
 
+               $item = null;
+
                $recipients[] = $contact_id;
 
                if ($cmd === 'mail') {
@@ -183,16 +181,14 @@ class Delivery {
 
                }
 
-               $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `blocked` = 0 AND `pending` = 0",
-                       intval($contact_id)
+               // We don't deliver our items to blocked or pending contacts, and not to ourselves either
+               $contact = dba::selectFirst('contact', [],
+                       ['id' => $contact_id, 'blocked' => false, 'pending' => false, 'self' => false]
                );
-
-               if (DBM::is_result($r)) {
-                       $contact = $r[0];
-               }
-               if ($contact['self']) {
+               if (!DBM::is_result($contact)) {
                        return;
                }
+
                $deliver_status = 0;
 
                // Transmit via Diaspora if not possible via Friendica
@@ -208,7 +204,7 @@ class Delivery {
                                logger('notifier: '.$target_item["guid"].' dfrndelivery: '.$contact['name']);
 
                                if ($mail) {
-                                       $item['body'] = Item::fixPrivatePhotos($item['body'],$owner['uid'],null,$message[0]['contact-id']);
+                                       $item['body'] = Item::fixPrivatePhotos($item['body'], $owner['uid'], null, $item['contact-id']);
                                        $atom = DFRN::mail($item, $owner);
                                } elseif ($fsuggest) {
                                        $atom = DFRN::fsuggest($item, $owner);
@@ -245,7 +241,8 @@ class Delivery {
                                                }
 
                                                if ($normal_mode) {
-                                                       if ($item_id == $item['id'] || $item['id'] == $item['parent']) {
+                                                       // Only add the parent when we don't delete other items.
+                                                       if ($item_id == $item['id'] || (($item['id'] == $item['parent']) && ($cmd != 'drop'))) {
                                                                $item["entry:comment-allow"] = true;
                                                                $item["entry:cid"] = (($top_level) ? $contact['id'] : 0);
                                                                $msgitems[] = $item;
@@ -323,7 +320,7 @@ class Delivery {
 
                                if ($deliver_status < 0) {
                                        logger('notifier: delivery failed: queuing message');
-                                       Queue::add($contact['id'], NETWORK_DFRN, $atom);
+                                       Queue::add($contact['id'], NETWORK_DFRN, $atom, false, $target_item['guid']);
 
                                        // The message could not be delivered. We mark the contact as "dead"
                                        Contact::markForArchival($contact);