X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FActivityPub%2FTransmitter.php;h=7d33fb2dc54713cdafdcd7a1bbe6713a811764e6;hb=8adc761da0e6012aa0176047812df15adb15c33a;hp=41239b3afdfa76c8f6a2b4950d8dd12eb8b998d6;hpb=9a5f9829c11998284620a804eee15049fccc0757;p=friendica.git diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php index 41239b3afd..7d33fb2dc5 100644 --- a/src/Protocol/ActivityPub/Transmitter.php +++ b/src/Protocol/ActivityPub/Transmitter.php @@ -5,7 +5,9 @@ namespace Friendica\Protocol\ActivityPub; use Friendica\BaseObject; +use Friendica\Content\Feature; use Friendica\Database\DBA; +use Friendica\Core\Config; use Friendica\Core\Logger; use Friendica\Core\System; use Friendica\Util\HTTPSignature; @@ -325,25 +327,28 @@ class Transmitter } } - // Will be activated in a later step - // $networks = [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS]; - - // For now only send to these contacts: - $networks = [Protocol::ACTIVITYPUB, Protocol::OSTATUS]; + if (Config::get('debug', 'total_ap_delivery')) { + // Will be activated in a later step + $networks = [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS]; + } else { + // For now only send to these contacts: + $networks = [Protocol::ACTIVITYPUB, Protocol::OSTATUS]; + } $data = ['to' => [], 'cc' => [], 'bcc' => []]; - $actor_profile = APContact::getByURL($item['author-link']); + if ($item['gravity'] == GRAVITY_PARENT) { + $actor_profile = APContact::getByURL($item['owner-link']); + } else { + $actor_profile = APContact::getByURL($item['author-link']); + } - $terms = Term::tagArrayFromItemId($item['id'], TERM_MENTION); + $terms = Term::tagArrayFromItemId($item['id'], [Term::MENTION, Term::IMPLICIT_MENTION]); if (!$item['private']) { $data = array_merge($data, self::fetchPermissionBlockFromConversation($item)); $data['to'][] = ActivityPub::PUBLIC_COLLECTION; - if (!empty($actor_profile['followers'])) { - $data['cc'][] = $actor_profile['followers']; - } foreach ($terms as $term) { $profile = APContact::getByURL($term['url'], false); @@ -378,6 +383,29 @@ class Transmitter $parents = Item::select(['id', 'author-link', 'owner-link', 'gravity', 'uri'], ['parent' => $item['parent']]); while ($parent = Item::fetch($parents)) { + if ($parent['gravity'] == GRAVITY_PARENT) { + $profile = APContact::getByURL($parent['owner-link'], false); + if (!empty($profile)) { + if ($item['gravity'] != GRAVITY_PARENT) { + // Comments to forums are directed to the forum + // But comments to forums aren't directed to the followers collection + if ($profile['type'] == 'Group') { + $data['to'][] = $profile['url']; + } else { + $data['cc'][] = $profile['url']; + if (!$item['private']) { + $data['cc'][] = $actor_profile['followers']; + } + } + } else { + // Public thread parent post always are directed to the followes + if (!$item['private']) { + $data['cc'][] = $actor_profile['followers']; + } + } + } + } + // Don't include data from future posts if ($parent['id'] >= $last_id) { continue; @@ -385,21 +413,12 @@ class Transmitter $profile = APContact::getByURL($parent['author-link'], false); if (!empty($profile)) { - if ($parent['uri'] == $item['thr-parent']) { + if (($profile['type'] == 'Group') || ($parent['uri'] == $item['thr-parent'])) { $data['to'][] = $profile['url']; } else { $data['cc'][] = $profile['url']; } } - - if ($item['gravity'] != GRAVITY_PARENT) { - continue; - } - - $profile = APContact::getByURL($parent['owner-link'], false); - if (!empty($profile)) { - $data['cc'][] = $profile['url']; - } } DBA::close($parents); @@ -458,11 +477,13 @@ class Transmitter { $inboxes = []; - // Will be activated in a later step - // $networks = [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS]; - - // For now only send to these contacts: - $networks = [Protocol::ACTIVITYPUB, Protocol::OSTATUS]; + if (Config::get('debug', 'total_ap_delivery')) { + // Will be activated in a later step + $networks = [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS]; + } else { + // For now only send to these contacts: + $networks = [Protocol::ACTIVITYPUB, Protocol::OSTATUS]; + } $condition = ['uid' => $uid, 'network' => $networks, 'archive' => false, 'pending' => false]; @@ -586,6 +607,8 @@ class Transmitter $type = 'Reject'; } elseif ($item['verb'] == ACTIVITY_ATTENDMAYBE) { $type = 'TentativeAccept'; + } elseif ($item['verb'] == ACTIVITY_FOLLOW) { + $type = 'Follow'; } else { $type = ''; } @@ -686,6 +709,8 @@ class Transmitter $data['object'] = self::createNote($item); } elseif ($data['type'] == 'Announce') { $data = self::createAnnounce($item, $data); + } elseif ($data['type'] == 'Follow') { + $data['object'] = $item['parent-uri']; } elseif ($data['type'] == 'Undo') { $data['object'] = self::createActivityFromItem($item_id, true); } else { @@ -782,12 +807,12 @@ class Transmitter { $tags = []; - $terms = Term::tagArrayFromItemId($item['id']); + $terms = Term::tagArrayFromItemId($item['id'], [Term::HASHTAG, Term::MENTION, Term::IMPLICIT_MENTION]); foreach ($terms as $term) { - if ($term['type'] == TERM_HASHTAG) { + if ($term['type'] == Term::HASHTAG) { $url = System::baseUrl() . '/search?tag=' . urlencode($term['term']); $tags[] = ['type' => 'Hashtag', 'href' => $url, 'name' => '#' . $term['term']]; - } elseif ($term['type'] == TERM_MENTION) { + } elseif ($term['type'] == Term::MENTION || $term['type'] == Term::IMPLICIT_MENTION) { $contact = Contact::getDetailsByURL($term['url']); if (!empty($contact['addr'])) { $mention = '@' . $contact['addr']; @@ -867,12 +892,12 @@ class Transmitter private static function mentionCallback($match) { if (empty($match[1])) { - return; + return ''; } $data = Contact::getDetailsByURL($match[1]); - if (empty($data) || empty($data['nick'])) { - return; + if (empty($data['nick'])) { + return $match[0]; } return '@[url=' . $data['url'] . ']' . $data['nick'] . '[/url]'; @@ -1013,8 +1038,14 @@ class Transmitter $data['name'] = BBCode::toPlaintext($item['title'], false); } + $permission_block = self::createPermissionBlockForItem($item, false); + $body = $item['body']; + if (empty($item['uid']) || !Feature::isEnabled($item['uid'], 'explicit_mentions')) { + $body = self::prependMentions($body, $permission_block); + } + if ($type == 'Note') { $body = self::removePictures($body); } @@ -1045,7 +1076,7 @@ class Transmitter $data['generator'] = ['type' => 'Application', 'name' => $item['app']]; } - $data = array_merge($data, self::createPermissionBlockForItem($item, false)); + $data = array_merge($data, $permission_block); return $data; } @@ -1054,8 +1085,9 @@ class Transmitter * Creates an announce object entry * * @param array $item + * @param array $data activity data * - * @return string with announced object url + * @return array with activity data * @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \ImagickException */ @@ -1259,6 +1291,55 @@ class Transmitter return HTTPSignature::transmit($signed, $profile['inbox'], $uid); } + /** + * Transmits a "follow object" activity to a target + * This is a preparation for sending automated "follow" requests when receiving "Announce" messages + * + * @param string $object Object URL + * @param string $target Target profile + * @param integer $uid User ID + * @return bool + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException + * @throws \Exception + */ + public static function sendFollowObject($object, $target, $uid = 0) + { + $profile = APContact::getByURL($target); + + if (empty($uid)) { + // Fetch the list of administrators + $admin_mail = explode(',', str_replace(' ', '', Config::get('config', 'admin_email'))); + + // We need to use some user as a sender. It doesn't care who it will send. We will use an administrator account. + $condition = ['verified' => true, 'blocked' => false, 'account_removed' => false, 'account_expired' => false, 'email' => $admin_mail]; + $first_user = DBA::selectFirst('user', ['uid'], $condition); + $uid = $first_user['uid']; + } + + $condition = ['verb' => ACTIVITY_FOLLOW, 'uid' => 0, 'parent-uri' => $object, + 'author-id' => Contact::getPublicIdByUserId($uid)]; + if (Item::exists($condition)) { + Logger::log('Follow for ' . $object . ' for user ' . $uid . ' does already exist.', Logger::DEBUG); + return false; + } + + $owner = User::getOwnerDataById($uid); + + $data = ['@context' => ActivityPub::CONTEXT, + 'id' => System::baseUrl() . '/activity/' . System::createGUID(), + 'type' => 'Follow', + 'actor' => $owner['url'], + 'object' => $object, + 'instrument' => ['type' => 'Service', 'name' => BaseObject::getApp()->getUserAgent()], + 'to' => [$profile['url']]]; + + Logger::log('Sending follow ' . $object . ' to ' . $target . ' for user ' . $uid, Logger::DEBUG); + + $signed = LDSignature::sign($data, $owner); + return HTTPSignature::transmit($signed, $profile['inbox'], $uid); + } + /** * Transmit a message that the contact request had been accepted * @@ -1355,4 +1436,28 @@ class Transmitter $signed = LDSignature::sign($data, $owner); HTTPSignature::transmit($signed, $profile['inbox'], $uid); } + + private static function prependMentions($body, array $permission_block) + { + if (Config::get('system', 'disable_implicit_mentions')) { + return $body; + } + + $mentions = []; + + foreach ($permission_block['to'] as $profile_url) { + $profile = Contact::getDetailsByURL($profile_url); + if (!empty($profile['addr']) + && $profile['contact-type'] != Contact::TYPE_COMMUNITY + && !strstr($body, $profile['addr']) + && !strstr($body, $profile_url) + ) { + $mentions[] = '@[url=' . $profile_url . ']' . $profile['nick'] . '[/url]'; + } + } + + $mentions[] = $body; + + return implode(' ', $mentions); + } }