<?php
/**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
}
// Should the post be transmitted to Diaspora?
- $diaspora_delivery = true;
+ $diaspora_delivery = ($owner['account-type'] != User::ACCOUNT_TYPE_COMMUNITY);
// If this is a public conversation, notify the feed hub
$public_message = true;
$relay_to_owner = true;
}
- if (($cmd === Delivery::UPLINK) && (intval($parent['forum_mode']) == 1) && !$top_level) {
- $relay_to_owner = true;
- }
-
// until the 'origin' flag has been in use for several months
// we will just use it as a fallback test
// later we will be able to use it as the primary test of whether or not to relay.
}
// Special treatment for forum posts
- if (Item::isForumPost($target_item, $owner)) {
+ if (Item::isForumPost($target_item['uri-id'])) {
$relay_to_owner = true;
$direct_forum_delivery = true;
}
// Avoid that comments in a forum thread are sent to OStatus
- if (Item::isForumPost($parent, $owner)) {
+ if (Item::isForumPost($parent['uri-id'])) {
$direct_forum_delivery = true;
}
$deny_people = $aclFormatter->expand($parent['deny_cid']);
$deny_groups = Group::expand($uid, $aclFormatter->expand($parent['deny_gid']));
- // 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)
- && ($target_item['verb'] != Activity::ANNOUNCE)) {
- Worker::add($a->getQueueValue('priority'), 'Notifier', Delivery::UPLINK, $post_uriid, $sender_uid);
- }
-
foreach ($items as $item) {
$recipients[] = $item['contact-id'];
// pull out additional tagged people to notify (if public message)
if ($diaspora_delivery && !$unlisted) {
$batch_delivery = true;
- $participants_stmt = DBA::p(
- "SELECT
- `batch`, `network`, `protocol`,
- ANY_VALUE(`id`) AS `id`,
- ANY_VALUE(`url`) AS `url`,
- ANY_VALUE(`name`) AS `name`
- FROM `contact`
- WHERE `network` = ?
- AND `batch` != ''
- AND `uid` = ?
- AND `rel` != ?
- AND NOT `blocked`
- AND NOT `pending`
- AND NOT `archive`
- GROUP BY `batch`, `network`, `protocol`",
- Protocol::DIASPORA,
- $owner['uid'],
- Contact::SHARING
- );
- $participants = DBA::toArray($participants_stmt);
+ $participants = DBA::selectToArray('contact', ['batch', 'network', 'protocol', 'id', 'url', 'name'],
+ ["`network` = ? AND `batch` != '' AND `uid` = ? AND `rel` != ? AND NOT `blocked` AND NOT `pending` AND NOT `archive`", Protocol::DIASPORA, $owner['uid'], Contact::SHARING],
+ ['group_by' => ['batch', 'network', 'protocol']]);
// Fetch the participation list
// The function will ensure that there are no duplicates
$uid = $target_item['contact-uid'] ?: $target_item['uid'];
+ // Update the locally stored follower list when we deliver to a forum
+ foreach (Tag::getByURIId($target_item['uri-id'], [Tag::MENTION, Tag::EXCLUSIVE_MENTION]) as $tag) {
+ $target_contact = Contact::getByURL(Strings::normaliseLink($tag['url']), null, [], $uid);
+ if ($target_contact && $target_contact['contact-type'] == Contact::TYPE_COMMUNITY && $target_contact['manually-approve']) {
+ Group::updateMembersForForum($target_contact['id']);
+ }
+ }
+
if ($target_item['origin']) {
$inboxes = ActivityPub\Transmitter::fetchTargetInboxes($target_item, $uid);
}
Logger::info('Origin item ' . $target_item['id'] . ' with URL ' . $target_item['uri'] . ' will be distributed.');
- } elseif (Item::isForumPost($target_item, $owner)) {
- $inboxes = ActivityPub\Transmitter::fetchTargetInboxes($target_item, $uid, false, 0, true);
- Logger::info('Forum item ' . $target_item['id'] . ' with URL ' . $target_item['uri'] . ' will be distributed.');
} elseif (!DBA::exists('conversation', ['item-uri' => $target_item['uri'], 'protocol' => Conversation::PARCEL_ACTIVITYPUB])) {
Logger::info('Remote item ' . $target_item['id'] . ' with URL ' . $target_item['uri'] . ' is no AP post. It will not be distributed.');
return ['count' => 0, 'contacts' => []];
return ['count' => $delivery_queue_count, 'contacts' => $contacts];
}
-
- /**
- * Check if the delivered item is a forum post
- *
- * @param array $item
- * @return boolean
- */
- public static function isForumPost(array $item)
- {
- return ($item['gravity'] == GRAVITY_PARENT) && !empty($item['forum_mode']);
- }
}