]> git.mxchange.org Git - friendica.git/blobdiff - src/Worker/Notifier.php
Refactor Worker/Notifier part 2
[friendica.git] / src / Worker / Notifier.php
index 61b05a1b197bcc38d37eba82f43176f0d1932c61..4103484f71aea1cee3e540c1efb86944ee80a3e8 100644 (file)
@@ -5,23 +5,24 @@
 namespace Friendica\Worker;
 
 use Friendica\BaseObject;
-use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Core\Hook;
+use Friendica\Core\Logger;
+use Friendica\Core\Protocol;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
+use Friendica\Model\Conversation;
 use Friendica\Model\Group;
 use Friendica\Model\Item;
 use Friendica\Model\PushSubscriber;
 use Friendica\Model\User;
 use Friendica\Network\Probe;
+use Friendica\Protocol\ActivityPub;
 use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\OStatus;
 use Friendica\Protocol\Salmon;
 
-require_once 'include/dba.php';
-require_once 'include/items.php';
-
 /*
  * The notifier is typically called with:
  *
@@ -49,11 +50,11 @@ require_once 'include/items.php';
 
 class Notifier
 {
-       public static function execute($cmd, $item_id)
+       public static function execute($cmd, $target_id)
        {
                $a = BaseObject::getApp();
 
-               logger('notifier: invoked: '.$cmd.': '.$item_id, LOGGER_DEBUG);
+               Logger::log('Invoked: ' . $cmd . ': ' . $target_id, Logger::DEBUG);
 
                $top_level = false;
                $recipients = [];
@@ -61,10 +62,12 @@ class Notifier
 
                $normal_mode = true;
                $recipients_relocate = [];
+               $target_item = [];
+               $items = [];
 
                if ($cmd == Delivery::MAIL) {
                        $normal_mode = false;
-                       $message = DBA::selectFirst('mail', ['uid', 'contact-id'], ['id' => $item_id]);
+                       $message = DBA::selectFirst('mail', ['uid', 'contact-id'], ['id' => $target_id]);
                        if (!DBA::isResult($message)) {
                                return;
                        }
@@ -72,60 +75,46 @@ class Notifier
                        $recipients[] = $message['contact-id'];
                } elseif ($cmd == Delivery::SUGGESTION) {
                        $normal_mode = false;
-                       $suggest = DBA::selectFirst('fsuggest', ['uid', 'cid'], ['id' => $item_id]);
+                       $suggest = DBA::selectFirst('fsuggest', ['uid', 'cid'], ['id' => $target_id]);
                        if (!DBA::isResult($suggest)) {
                                return;
                        }
                        $uid = $suggest['uid'];
                        $recipients[] = $suggest['cid'];
                } elseif ($cmd == Delivery::REMOVAL) {
-                       $r = q("SELECT `contact`.*, `user`.`prvkey` AS `uprvkey`,
-                                       `user`.`timezone`, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`,
-                                       `user`.`page-flags`, `user`.`prvnets`, `user`.`account-type`, `user`.`guid`
-                               FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
-                                       WHERE `contact`.`uid` = %d AND `contact`.`self` LIMIT 1",
-                                       intval($item_id));
-                       if (!$r) {
-                               return;
-                       }
-                       $user = $r[0];
-
-                       $r = q("SELECT * FROM `contact` WHERE NOT `self` AND `uid` = %d", intval($item_id));
-                       if (!$r) {
-                               return;
-                       }
-                       foreach ($r as $contact) {
-                               Contact::terminateFriendship($user, $contact);
-                       }
-                       return;
+                       return self::notifySelfRemoval($target_id, $a->queue['priority'], $a->queue['created']);
                } elseif ($cmd == Delivery::RELOCATION) {
                        $normal_mode = false;
-                       $uid = $item_id;
+                       $uid = $target_id;
 
                        $recipients_relocate = q("SELECT * FROM `contact` WHERE `uid` = %d AND NOT `self` AND `network` IN ('%s', '%s')",
-                                               intval($uid), NETWORK_DFRN, NETWORK_DIASPORA);
+                                               intval($uid), Protocol::DFRN, Protocol::DIASPORA);
                } else {
                        // find ancestors
-                       $condition = ['id' => $item_id, 'visible' => true, 'moderated' => false];
+                       $condition = ['id' => $target_id, 'visible' => true, 'moderated' => false];
                        $target_item = Item::selectFirst([], $condition);
 
                        if (!DBA::isResult($target_item) || !intval($target_item['parent'])) {
                                return;
                        }
 
-                       $parent_id = intval($target_item['parent']);
-                       $uid = $target_item['contact-uid'];
-                       $updated = $target_item['edited'];
+                       if (!empty($target_item['contact-uid'])) {
+                               $uid = $target_item['contact-uid'];
+                       } elseif (!empty($target_item['uid'])) {
+                               $uid = $target_item['uid'];
+                       } else {
+                               Logger::log('Only public users for item ' . $target_id, Logger::DEBUG);
+                               return;
+                       }
 
-                       $condition = ['parent' => $parent_id, 'visible' => true, 'moderated' => false];
+                       $condition = ['parent' => $target_item['parent'], 'visible' => true, 'moderated' => false];
                        $params = ['order' => ['id']];
-                       $ret = Item::select([], $condition, $params);
-
-                       if (!DBA::isResult($ret)) {
+                       $items_stmt = Item::select([], $condition, $params);
+                       if (!DBA::isResult($items_stmt)) {
                                return;
                        }
 
-                       $items = Item::inArray($ret);
+                       $items = Item::inArray($items_stmt);
 
                        // avoid race condition with deleting entries
                        if ($items[0]['deleted']) {
@@ -135,7 +124,7 @@ class Notifier
                        }
 
                        if ((count($items) == 1) && ($items[0]['id'] === $target_item['id']) && ($items[0]['uri'] === $items[0]['parent-uri'])) {
-                               logger('notifier: top level post');
+                               Logger::log('Top level post');
                                $top_level = true;
                        }
                }
@@ -145,8 +134,6 @@ class Notifier
                        return;
                }
 
-               $walltowall = ($top_level && ($owner['id'] != $items[0]['contact-id']) ? true : false);
-
                // Should the post be transmitted to Diaspora?
                $diaspora_delivery = true;
 
@@ -161,16 +148,17 @@ class Notifier
 
                $followup = false;
                $recipients_followup = [];
-               $conversants = [];
 
-               if (!in_array($cmd, [Delivery::MAIL, Delivery::SUGGESTION, Delivery::RELOCATION])) {
+               if (!empty($target_item) && !empty($items)) {
                        $parent = $items[0];
 
+                       self::activityPubDelivery($cmd, $target_item, $parent, $a->queue['priority'], $a->query_string['created']);
+
                        $fields = ['network', 'author-id', 'owner-id'];
                        $condition = ['uri' => $target_item["thr-parent"], 'uid' => $target_item["uid"]];
                        $thr_parent = Item::selectFirst($fields, $condition);
 
-                       logger('GUID: '.$target_item["guid"].': Parent is '.$parent['network'].'. Thread parent is '.$thr_parent['network'], LOGGER_DEBUG);
+                       Logger::log('GUID: ' . $target_item["guid"] . ': Parent is ' . $parent['network'] . '. Thread parent is ' . $thr_parent['network'], Logger::DEBUG);
 
                        // This is IMPORTANT!!!!
 
@@ -181,7 +169,7 @@ class Notifier
                        // if $parent['wall'] == 1 we will already have the parent message in our array
                        // and we will relay the whole lot.
 
-                       $localhost = str_replace('www.','',$a->get_hostname());
+                       $localhost = str_replace('www.','',$a->getHostName());
                        if (strpos($localhost,':')) {
                                $localhost = substr($localhost,0,strpos($localhost,':'));
                        }
@@ -216,33 +204,24 @@ class Notifier
                        }
 
                        // Special treatment for forum posts
-                       if (($target_item['author-id'] != $target_item['owner-id']) &&
-                               ($owner['id'] != $target_item['contact-id']) &&
-                               ($target_item['uri'] === $target_item['parent-uri'])) {
-
-                               $fields = ['forum', 'prv'];
-                               $condition = ['id' => $target_item['contact-id']];
-                               $contact = DBA::selectFirst('contact', $fields, $condition);
-                               if (!DBA::isResult($contact)) {
-                                       // Should never happen
-                                       return false;
-                               }
+                       if (self::isForumPost($target_item, $owner)) {
+                               $relay_to_owner = true;
+                               $direct_forum_delivery = true;
+                       }
 
-                               // Is the post from a forum?
-                               if ($contact['forum'] || $contact['prv']) {
-                                       $relay_to_owner = true;
-                                       $direct_forum_delivery = true;
-                               }
+                       // Avoid that comments in a forum thread are sent to OStatus
+                       if (self::isForumPost($parent, $owner)) {
+                               $direct_forum_delivery = true;
                        }
+
                        if ($relay_to_owner) {
                                // local followup to remote post
                                $followup = true;
                                $public_message = false; // not public
-                               $conversant_str = DBA::escape($parent['contact-id']);
                                $recipients = [$parent['contact-id']];
                                $recipients_followup  = [$parent['contact-id']];
 
-                               logger('notifier: followup '.$target_item["guid"].' to '.$conversant_str, LOGGER_DEBUG);
+                               Logger::log('Followup ' . $target_item['guid'] . ' to ' . $parent['contact-id'], Logger::DEBUG);
 
                                //if (!$target_item['private'] && $target_item['wall'] &&
                                if (!$target_item['private'] &&
@@ -250,15 +229,15 @@ class Notifier
                                                $target_item['deny_cid'].$target_item['deny_gid']) == 0))
                                        $push_notify = true;
 
-                               if (($thr_parent && ($thr_parent['network'] == NETWORK_OSTATUS)) || ($parent['network'] == NETWORK_OSTATUS)) {
+                               if (($thr_parent && ($thr_parent['network'] == Protocol::OSTATUS)) || ($parent['network'] == Protocol::OSTATUS)) {
                                        $push_notify = true;
 
-                                       if ($parent["network"] == NETWORK_OSTATUS) {
+                                       if ($parent["network"] == Protocol::OSTATUS) {
                                                // Distribute the message to the DFRN contacts as if this wasn't a followup since OStatus can't relay comments
                                                // Currently it is work at progress
                                                $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `network` = '%s' AND NOT `blocked` AND NOT `pending` AND NOT `archive`",
                                                        intval($uid),
-                                                       DBA::escape(NETWORK_DFRN)
+                                                       DBA::escape(Protocol::DFRN)
                                                );
                                                if (DBA::isResult($r)) {
                                                        foreach ($r as $rr) {
@@ -272,16 +251,16 @@ class Notifier
                                        $push_notify = false;
                                }
 
-                               logger("Notify ".$target_item["guid"]." via PuSH: ".($push_notify?"Yes":"No"), LOGGER_DEBUG);
+                               Logger::log('Notify ' . $target_item["guid"] .' via PuSH: ' . ($push_notify ? "Yes":"No"), Logger::DEBUG);
                        } else {
                                $followup = false;
 
-                               logger('Distributing directly '.$target_item["guid"], LOGGER_DEBUG);
+                               Logger::log('Distributing directly ' . $target_item["guid"], Logger::DEBUG);
 
                                // don't send deletions onward for other people's stuff
 
                                if ($target_item['deleted'] && !intval($target_item['wall'])) {
-                                       logger('notifier: ignoring delete notification for non-wall item');
+                                       Logger::log('Ignoring delete notification for non-wall item');
                                        return;
                                }
 
@@ -301,19 +280,17 @@ class Notifier
                                // a delivery fork. private groups (forum_mode == 2) do not uplink
 
                                if ((intval($parent['forum_mode']) == 1) && !$top_level && ($cmd !== 'uplink')) {
-                                       Worker::add($a->queue['priority'], 'Notifier', 'uplink', $item_id);
+                                       Worker::add($a->queue['priority'], 'Notifier', 'uplink', $target_id);
                                }
 
                                foreach ($items as $item) {
                                        $recipients[] = $item['contact-id'];
-                                       $conversants[] = $item['contact-id'];
                                        // pull out additional tagged people to notify (if public message)
                                        if ($public_message && strlen($item['inform'])) {
                                                $people = explode(',',$item['inform']);
                                                foreach ($people as $person) {
                                                        if (substr($person,0,4) === 'cid:') {
                                                                $recipients[] = intval(substr($person,4));
-                                                               $conversants[] = intval(substr($person,4));
                                                        } else {
                                                                $url_recipients[] = substr($person,4);
                                                        }
@@ -322,57 +299,53 @@ class Notifier
                                }
 
                                if (count($url_recipients)) {
-                                       logger('notifier: '.$target_item["guid"].' url_recipients ' . print_r($url_recipients,true));
+                                       Logger::log('Deliver ' . $target_item["guid"] . ' to _recipients ' . json_encode($url_recipients));
                                }
 
-                               $conversants = array_unique($conversants);
-
-                               $recipients = array_unique(array_merge($recipients,$allow_people,$allow_groups));
-                               $deny = array_unique(array_merge($deny_people,$deny_groups));
-                               $recipients = array_diff($recipients,$deny);
-
-                               $conversant_str = DBA::escape(implode(', ',$conversants));
+                               $recipients = array_unique(array_merge($recipients, $allow_people, $allow_groups));
+                               $deny = array_unique(array_merge($deny_people, $deny_groups));
+                               $recipients = array_diff($recipients, $deny);
                        }
 
                        // If the thread parent is OStatus then do some magic to distribute the messages.
                        // We have not only to look at the parent, since it could be a Friendica thread.
-                       if (($thr_parent && ($thr_parent['network'] == NETWORK_OSTATUS)) || ($parent['network'] == NETWORK_OSTATUS)) {
+                       if (($thr_parent && ($thr_parent['network'] == Protocol::OSTATUS)) || ($parent['network'] == Protocol::OSTATUS)) {
                                $diaspora_delivery = false;
 
-                               logger('Some parent is OStatus for '.$target_item["guid"]." - Author: ".$thr_parent['author-id']." - Owner: ".$thr_parent['owner-id'], LOGGER_DEBUG);
+                               Logger::log('Some parent is OStatus for '.$target_item["guid"]." - Author: ".$thr_parent['author-id']." - Owner: ".$thr_parent['owner-id'], Logger::DEBUG);
 
                                // Send a salmon to the parent author
                                $probed_contact = DBA::selectFirst('contact', ['url', 'notify'], ['id' => $thr_parent['author-id']]);
                                if (DBA::isResult($probed_contact) && !empty($probed_contact["notify"])) {
-                                       logger('Notify parent author '.$probed_contact["url"].': '.$probed_contact["notify"]);
+                                       Logger::log('Notify parent author '.$probed_contact["url"].': '.$probed_contact["notify"]);
                                        $url_recipients[$probed_contact["notify"]] = $probed_contact["notify"];
                                }
 
                                // Send a salmon to the parent owner
                                $probed_contact = DBA::selectFirst('contact', ['url', 'notify'], ['id' => $thr_parent['owner-id']]);
                                if (DBA::isResult($probed_contact) && !empty($probed_contact["notify"])) {
-                                       logger('Notify parent owner '.$probed_contact["url"].': '.$probed_contact["notify"]);
+                                       Logger::log('Notify parent owner '.$probed_contact["url"].': '.$probed_contact["notify"]);
                                        $url_recipients[$probed_contact["notify"]] = $probed_contact["notify"];
                                }
 
                                // Send a salmon notification to every person we mentioned in the post
                                $arr = explode(',',$target_item['tag']);
                                foreach ($arr as $x) {
-                                       //logger('Checking tag '.$x, LOGGER_DEBUG);
+                                       //Logger::log('Checking tag '.$x, Logger::DEBUG);
                                        $matches = null;
                                        if (preg_match('/@\[url=([^\]]*)\]/',$x,$matches)) {
                                                        $probed_contact = Probe::uri($matches[1]);
                                                if ($probed_contact["notify"] != "") {
-                                                       logger('Notify mentioned user '.$probed_contact["url"].': '.$probed_contact["notify"]);
+                                                       Logger::log('Notify mentioned user '.$probed_contact["url"].': '.$probed_contact["notify"]);
                                                        $url_recipients[$probed_contact["notify"]] = $probed_contact["notify"];
                                                }
                                        }
                                }
 
                                // It only makes sense to distribute answers to OStatus messages to Friendica and OStatus - but not Diaspora
-                               $networks = [NETWORK_OSTATUS, NETWORK_DFRN];
+                               $networks = [Protocol::OSTATUS, Protocol::DFRN];
                        } else {
-                               $networks = [NETWORK_OSTATUS, NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_MAIL];
+                               $networks = [Protocol::OSTATUS, Protocol::DFRN, Protocol::DIASPORA, Protocol::MAIL];
                        }
                } else {
                        $public_message = false;
@@ -385,7 +358,7 @@ class Notifier
                                && intval($target_item['pubmail'])) {
                                $r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `network` = '%s'",
                                        intval($uid),
-                                       DBA::escape(NETWORK_MAIL)
+                                       DBA::escape(Protocol::MAIL)
                                );
                                if (DBA::isResult($r)) {
                                        foreach ($r as $rr) {
@@ -395,8 +368,8 @@ class Notifier
                        }
                }
 
-               if (($cmd == Delivery::RELOCATION)) {
-                       $r = $recipients_relocate;
+               if ($cmd == Delivery::RELOCATION) {
+                       $contacts = $recipients_relocate;
                } else {
                        if ($followup) {
                                $recipients = $recipients_followup;
@@ -406,100 +379,215 @@ class Notifier
                        if (!empty($networks)) {
                                $condition['network'] = $networks;
                        }
-                       $contacts = DBA::select('contact', ['id', 'url', 'network'], $condition);
-                       $r = DBA::toArray($contacts);
+                       $result = DBA::select('contact', ['id', 'url', 'network', 'batch'], $condition);
+                       $contacts = DBA::toArray($result);
                }
 
-               // delivery loop
-               if (DBA::isResult($r)) {
-                       foreach ($r as $contact) {
-                               logger("Deliver ".$item_id." to ".$contact['url']." via network ".$contact['network'], LOGGER_DEBUG);
-
-                               Worker::add(['priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true],
-                                               'Delivery', $cmd, $item_id, (int)$contact['id']);
-                       }
-               }
-
-               // send salmon slaps to mentioned remote tags (@foo@example.com) in OStatus posts
-               // They are especially used for notifications to OStatus users that don't follow us.
-               if (!Config::get('system', 'dfrn_only') && count($url_recipients) && ($public_message || $push_notify) && $normal_mode) {
-                       $slap = OStatus::salmon($target_item, $owner);
-                       foreach ($url_recipients as $url) {
-                               if ($url) {
-                                       logger('notifier: urldelivery: ' . $url);
-                                       $deliver_status = Salmon::slapper($owner, $url, $slap);
-                                       /// @TODO Redeliver/queue these items on failure, though there is no contact record
-                               }
-                       }
-               }
+               $conversants = [];
+               $batch_delivery = false;
 
-               if ($public_message) {
+               if ($public_message && !in_array($cmd, [Delivery::MAIL, Delivery::SUGGESTION]) && !$followup) {
                        $r1 = [];
 
                        if ($diaspora_delivery) {
+                               $batch_delivery = true;
+
                                $r1 = q("SELECT `batch`, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`name`) AS `name`, ANY_VALUE(`network`) AS `network`
                                        FROM `contact` WHERE `network` = '%s' AND `batch` != ''
                                        AND `uid` = %d AND `rel` != %d AND NOT `blocked` AND NOT `pending` AND NOT `archive` GROUP BY `batch`",
-                                       DBA::escape(NETWORK_DIASPORA),
+                                       DBA::escape(Protocol::DIASPORA),
                                        intval($owner['uid']),
-                                       intval(CONTACT_IS_SHARING)
+                                       intval(Contact::SHARING)
                                );
 
                                // Fetch the participation list
                                // The function will ensure that there are no duplicates
-                               $r1 = Diaspora::participantsForThread($item_id, $r1);
+                               $r1 = Diaspora::participantsForThread($target_id, $r1);
 
-                               // Add the relay to the list, avoid duplicates
-                               if (!$followup) {
-                                       $r1 = Diaspora::relayList($item_id, $r1);
+                               // Add the relay to the list, avoid duplicates.
+                               // Don't send community posts to the relay. Forum posts via the Diaspora protocol are looking ugly.
+                               if (!$followup && !self::isForumPost($target_item, $owner)) {
+                                       $r1 = Diaspora::relayList($target_id, $r1);
                                }
                        }
 
-                       $condition = ['network' => NETWORK_DFRN, 'uid' => $owner['uid'], 'blocked' => false,
-                               'pending' => false, 'archive' => false, 'rel' => [CONTACT_IS_FOLLOWER, CONTACT_IS_FRIEND]];
+                       $condition = ['network' => Protocol::DFRN, 'uid' => $owner['uid'], 'blocked' => false,
+                               'pending' => false, 'archive' => false, 'rel' => [Contact::FOLLOWER, Contact::FRIEND]];
+
                        $r2 = DBA::toArray(DBA::select('contact', ['id', 'name', 'network'], $condition));
 
                        $r = array_merge($r2, $r1);
 
                        if (DBA::isResult($r)) {
-                               logger('pubdeliver '.$target_item["guid"].': '.print_r($r,true), LOGGER_DEBUG);
-
                                foreach ($r as $rr) {
-                                       // except for Diaspora batch jobs
-                                       // Don't deliver to folks who have already been delivered to
-
-                                       if (($rr['network'] !== NETWORK_DIASPORA) && (in_array($rr['id'], $conversants))) {
-                                               logger('notifier: already delivered id=' . $rr['id']);
-                                               continue;
-                                       }
-
-                                       if (!in_array($cmd, [Delivery::MAIL, Delivery::SUGGESTION]) && !$followup) {
-                                               logger('notifier: delivery agent: '.$rr['name'].' '.$rr['id'].' '.$rr['network'].' '.$target_item["guid"]);
-                                               Worker::add(['priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true],
-                                                               'Delivery', $cmd, $item_id, (int)$rr['id']);
+                                       $conversants[] = $rr['id'];
+                                       Logger::log('Public delivery of item ' . $target_item["guid"] . ' (' . $target_id . ') to ' . json_encode($rr), Logger::DEBUG);
+
+                                       // Ensure that posts with our own protocol arrives before Diaspora posts arrive.
+                                       // Situation is that sometimes Friendica servers receive Friendica posts over the Diaspora protocol first.
+                                       // The conversion in Markdown reduces the formatting, so these posts should arrive after the Friendica posts.
+                                       if ($rr['network'] == Protocol::DIASPORA) {
+                                               $deliver_options = ['priority' => $a->queue['priority'], 'dont_fork' => true];
+                                       } else {
+                                               $deliver_options = ['priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true];
                                        }
+                                       Worker::add($deliver_options, 'Delivery', $cmd, $target_id, (int)$rr['id']);
                                }
                        }
 
                        $push_notify = true;
                }
 
+               // delivery loop
+               if (DBA::isResult($contacts)) {
+                       foreach ($contacts as $contact) {
+                               // Don't deliver to Diaspora if it already had been done as batch delivery
+                               if (($contact['network'] == Protocol::DIASPORA) && $batch_delivery) {
+                                       Logger::log('Already delivered  id ' . $target_id . ' via batch to ' . json_encode($contact), Logger::DEBUG);
+                                       continue;
+                               }
+
+                               // Don't deliver to folks who have already been delivered to
+                               if (in_array($contact['id'], $conversants)) {
+                                       Logger::log('Already delivered id ' . $target_id. ' to ' . json_encode($contact), Logger::DEBUG);
+                                       continue;
+                               }
+
+                               Logger::log('Delivery of item ' . $target_id . ' to ' . json_encode($contact), Logger::DEBUG);
+
+                               // Ensure that posts with our own protocol arrives before Diaspora posts arrive.
+                               // Situation is that sometimes Friendica servers receive Friendica posts over the Diaspora protocol first.
+                               // The conversion in Markdown reduces the formatting, so these posts should arrive after the Friendica posts.
+                               if ($contact['network'] == Protocol::DIASPORA) {
+                                       $deliver_options = ['priority' => $a->queue['priority'], 'dont_fork' => true];
+                               } else {
+                                       $deliver_options = ['priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true];
+                               }
+                               Worker::add($deliver_options, 'Delivery', $cmd, $target_id, (int)$contact['id']);
+                       }
+               }
+
+               // send salmon slaps to mentioned remote tags (@foo@example.com) in OStatus posts
+               // They are especially used for notifications to OStatus users that don't follow us.
+               if (!Config::get('system', 'dfrn_only') && count($url_recipients) && ($public_message || $push_notify) && $normal_mode) {
+                       $slap = OStatus::salmon($target_item, $owner);
+                       foreach ($url_recipients as $url) {
+                               if ($url) {
+                                       Logger::log('Salmon delivery of item ' . $target_id . ' to ' . $url);
+                                       /// @TODO Redeliver/queue these items on failure, though there is no contact record
+                                       Salmon::slapper($owner, $url, $slap);
+                               }
+                       }
+               }
+
                // Notify PuSH subscribers (Used for OStatus distribution of regular posts)
                if ($push_notify) {
-                       logger('Activating internal PuSH for item '.$item_id, LOGGER_DEBUG);
+                       Logger::log('Activating internal PuSH for item '.$target_id, Logger::DEBUG);
 
                        // Handling the pubsubhubbub requests
                        PushSubscriber::publishFeed($owner['uid'], $a->queue['priority']);
                }
 
-               logger('notifier: calling hooks for ' . $cmd . ' ' . $item_id, LOGGER_DEBUG);
+               Logger::log('Calling hooks for ' . $cmd . ' ' . $target_id, Logger::DEBUG);
 
                if ($normal_mode) {
-                       Addon::forkHooks($a->queue['priority'], 'notifier_normal', $target_item);
+                       Hook::fork($a->queue['priority'], 'notifier_normal', $target_item);
                }
 
-               Addon::callHooks('notifier_end',$target_item);
+               Hook::callAll('notifier_end',$target_item);
 
                return;
        }
+
+       /**
+        * @param int    $self_user_id
+        * @param int    $priority     The priority the Notifier queue item was created with
+        * @param string $created      The date the Notifier queue item was created on
+        * @return bool
+        */
+       private static function notifySelfRemoval($self_user_id, $priority, $created)
+       {
+               $owner = User::getOwnerDataById($self_user_id);
+               if (!$owner) {
+                       return false;
+               }
+
+               $contacts_stmt = DBA::select('contact', [], ['self' => false, 'uid' => $self_user_id]);
+               if (!DBA::isResult($contacts_stmt)) {
+                       return false;
+               }
+
+               while($contact = DBA::fetch($contacts_stmt)) {
+                       Contact::terminateFriendship($owner, $contact, true);
+               }
+
+               $inboxes = ActivityPub\Transmitter::fetchTargetInboxesforUser(0);
+               foreach ($inboxes as $inbox) {
+                       Logger::log('Account removal for user ' . $self_user_id . ' to ' . $inbox .' via ActivityPub', Logger::DEBUG);
+                       Worker::add(['priority' => PRIORITY_NEGLIGIBLE, 'created' => $created, 'dont_fork' => true],
+                               'APDelivery', Delivery::REMOVAL, '', $inbox, $self_user_id);
+               }
+
+               return true;
+       }
+
+       /**
+        * @param string $cmd
+        * @param array  $target_item
+        * @param array  $parent
+        * @param int    $priority    The priority the Notifier queue item was created with
+        * @param string $created     The date the Notifier queue item was created on
+        */
+       private static function activityPubDelivery($cmd, array $target_item, array $parent, $priority, $created)
+       {
+               $inboxes = [];
+
+               if ($target_item['origin']) {
+                       $inboxes = ActivityPub\Transmitter::fetchTargetInboxes($target_item, $target_item['contact-uid']);
+                       Logger::log('Origin item ' . $target_item['id'] . ' with URL ' . $target_item['uri'] . ' will be distributed.', Logger::DEBUG);
+               } elseif (!DBA::exists('conversation', ['item-uri' => $target_item['uri'], 'protocol' => Conversation::PARCEL_ACTIVITYPUB])) {
+                       Logger::log('Remote item ' . $target_item['id'] . ' with URL ' . $target_item['uri'] . ' is no AP post. It will not be distributed.', Logger::DEBUG);
+                       return;
+               } elseif ($parent['origin']) {
+                       // Remote items are transmitted via the personal inboxes.
+                       // Doing so ensures that the dedicated receiver will get the message.
+                       $inboxes = ActivityPub\Transmitter::fetchTargetInboxes($parent, $target_item['contact-uid'], true, $target_item['id']);
+                       Logger::log('Remote item ' . $target_item['id'] . ' with URL ' . $target_item['uri'] . ' will be distributed.', Logger::DEBUG);
+               }
+
+               if (empty($inboxes)) {
+                       Logger::log('No inboxes found for item ' . $target_item['id'] . ' with URL ' . $target_item['uri'] . '. It will not be distributed.', Logger::DEBUG);
+                       return;
+               }
+
+               // Fill the item cache
+               ActivityPub\Transmitter::createCachedActivityFromItem($target_item['id'], true);
+
+               foreach ($inboxes as $inbox) {
+                       Logger::log('Deliver ' . $target_item['id'] .' to ' . $inbox .' via ActivityPub', Logger::DEBUG);
+
+                       Worker::add(['priority' => $priority, 'created' => $created, 'dont_fork' => true],
+                                       'APDelivery', $cmd, $target_item['id'], $inbox, $target_item['contact-uid']);
+               }
+       }
+
+       private static function isForumPost(array $item, array $owner)
+       {
+               if (($item['author-id'] == $item['owner-id']) ||
+                       ($owner['id'] == $item['contact-id']) ||
+                       ($item['uri'] != $item['parent-uri'])) {
+                       return false;
+               }
+
+               $fields = ['forum', 'prv'];
+               $condition = ['id' => $item['contact-id']];
+               $contact = DBA::selectFirst('contact', $fields, $condition);
+               if (!DBA::isResult($contact)) {
+                       // Should never happen
+                       return false;
+               }
+
+               // Is the post from a forum?
+               return ($contact['forum'] || $contact['prv']);
+       }
 }