use Friendica\Model\PushSubscriber;
use Friendica\Model\Tag;
use Friendica\Model\User;
-use Friendica\Network\Probe;
+use Friendica\Protocol\Activity;
use Friendica\Protocol\ActivityPub;
use Friendica\Protocol\Diaspora;
use Friendica\Protocol\OStatus;
// Only deliver threaded replies (comment to a comment) to Diaspora
// when the original comment author does support the Diaspora protocol.
- if ($target_item['parent-uri'] != $target_item['thr-parent']) {
+ if ($thr_parent['author-link'] && $target_item['parent-uri'] != $target_item['thr-parent']) {
$diaspora_delivery = Diaspora::isSupportedByContactUrl($thr_parent['author-link']);
Logger::info('Threaded comment', ['diaspora_delivery' => (int)$diaspora_delivery]);
}
// if our parent is a public forum (forum_mode == 1), uplink to the origional author causing
// a delivery fork. private groups (forum_mode == 2) do not uplink
+ /// @todo Possibly we should not uplink when the author is the forum itself?
- if ((intval($parent['forum_mode']) == 1) && !$top_level && ($cmd !== Delivery::UPLINK)) {
+ if ((intval($parent['forum_mode']) == 1) && !$top_level && ($cmd !== Delivery::UPLINK)
+ && ($target_item['verb'] != Activity::ANNOUNCE)) {
Worker::add($a->queue['priority'], 'Notifier', Delivery::UPLINK, $target_id);
}
if ($followup) {
$recipients = $recipients_followup;
}
- $condition = ['id' => $recipients, 'self' => false,
+ $condition = ['id' => $recipients, 'self' => false, 'uid' => [0, $uid],
'blocked' => false, 'pending' => false, 'archive' => false];
if (!empty($networks)) {
$condition['network'] = $networks;
// 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 && !Item::isForumPost($target_item, $owner)) {
+ if (!$followup && !Item::isForumPost($target_item, $owner) && !self::isForumPost($target_item)) {
$relay_list = Diaspora::relayList($target_id, $relay_list);
}
}
continue;
}
- if (self::skipDFRN($rr, $target_item, $parent, $thr_parent, $cmd)) {
+ if (self::skipDFRN($rr, $target_item, $parent, $thr_parent, $owner, $cmd)) {
Logger::info('Contact can be delivered via AP, so skip delivery via legacy DFRN/Diaspora', ['id' => $target_id, 'url' => $rr['url']]);
continue;
}
continue;
}
- if (self::skipDFRN($contact, $target_item, $parent, $thr_parent, $cmd)) {
+ if (self::skipDFRN($contact, $target_item, $parent, $thr_parent, $owner, $cmd)) {
Logger::info('Contact can be delivered via AP, so skip delivery via legacy DFRN/Diaspora', ['target' => $target_id, 'url' => $contact['url']]);
continue;
}
* @param array $item The post
* @param array $parent The parent
* @param array $thr_parent The thread parent
+ * @param array $owner Owner array
* @param string $cmd Notifier command
* @return bool
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- private static function skipDFRN($contact, $item, $parent, $thr_parent, $cmd)
+ private static function skipDFRN($contact, $item, $parent, $thr_parent, $owner, $cmd)
{
if (empty($parent['network'])) {
return false;
return true;
}
+ // For the time being we always deliver forum post via DFRN if possible
+ // This can be removed possible at the end of 2020 when hopefully most system can process AP forum posts
+ if ($owner['account-type'] == User::ACCOUNT_TYPE_COMMUNITY) {
+ return false;
+ }
+
// Skip DFRN when the item will be (forcefully) delivered via AP
if (DI::config()->get('debug', 'total_ap_delivery') && ($contact['network'] == Protocol::DFRN) && !empty(APContact::getByURL($contact['url'], false))) {
return true;
if ($target_item['origin']) {
$inboxes = ActivityPub\Transmitter::fetchTargetInboxes($target_item, $uid);
+
+ if (in_array($target_item['private'], [Item::PUBLIC])) {
+ $inboxes = ActivityPub\Transmitter::addRelayServerInboxes($inboxes);
+ }
+
Logger::log('Origin item ' . $target_item['id'] . ' with URL ' . $target_item['uri'] . ' will be distributed.', Logger::DEBUG);
} elseif (Item::isForumPost($target_item, $owner)) {
$inboxes = ActivityPub\Transmitter::fetchTargetInboxes($target_item, $uid, false, 0, true);
return $delivery_queue_count;
}
+
+ /**
+ * Check if the delivered item is a forum post
+ *
+ * @param array $item
+ * @return boolean
+ */
+ public static function isForumPost(array $item)
+ {
+ return !empty($item['forum_mode']);
+ }
}