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;
return;
}
foreach ($r as $contact) {
- Contact::terminateFriendship($user, $contact);
+ Contact::terminateFriendship($user, $contact, true);
}
return;
} elseif ($cmd == Delivery::RELOCATION) {
}
// 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;
}
}
+ $inboxes = [];
+
+ if ($target_item['origin']) {
+ $inboxes = ActivityPub::fetchTargetInboxes($target_item, $uid);
+ }
+
+ if ($parent['origin']) {
+ $parent_inboxes = ActivityPub::fetchTargetInboxes($parent, $uid);
+ $inboxes = array_merge($inboxes, $parent_inboxes);
+ }
+
+ foreach ($inboxes as $inbox) {
+ logger('Deliver ' . $item_id .' to ' . $inbox .' via ActivityPub', LOGGER_DEBUG);
+
+ Worker::add(['priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true],
+ 'APDelivery', $cmd, $item_id, $inbox);
+ }
+
// 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) {
return;
}
+
+ private static function isForumPost($item, $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']);
+ }
}