<?php
/**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
use Friendica\Network\HTTPException;
use Friendica\Protocol\Activity;
use Friendica\Protocol\ActivityPub;
-use Friendica\Protocol\Diaspora;
use Friendica\Protocol\Relay;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\HTTPSignature;
return false;
}
- $activity_id = ActivityPub\Transmitter::activityIDFromContact($contact['id']);
- $success = ActivityPub\Transmitter::sendActivity('Follow', $url, 0, $activity_id);
+ $activity_id = self::activityIDFromContact($contact['id']);
+ $success = self::sendActivity('Follow', $url, 0, $activity_id);
if ($success) {
Contact::update(['rel' => Contact::FRIEND], ['id' => $contact['id']]);
}
return false;
}
- $success = self::sendContactUndo($url, $contact['id'], 0);
+ $success = self::sendContactUndo($url, $contact['id'], User::getSystemAccount());
if ($success || $force) {
Contact::update(['rel' => Contact::NOTHING], ['id' => $contact['id']]);
return $data;
}
- /**
- * Public posts for the given owner
- *
- * @param array $owner Owner array
- * @param integer $page Page number
- * @param string $requester URL of requesting account
- * @param boolean $nocache Wether to bypass caching
- * @return array of posts
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
- * @throws \ImagickException
- */
- public static function getOutbox(array $owner, int $page = null, string $requester = '', bool $nocache = false): array
- {
- $condition = ['private' => [Item::PUBLIC, Item::UNLISTED]];
-
- if (!empty($requester)) {
- $requester_id = Contact::getIdForURL($requester, $owner['uid']);
- if (!empty($requester_id)) {
- $permissionSets = DI::permissionSet()->selectByContactId($requester_id, $owner['uid']);
- if (!empty($permissionSets)) {
- $condition = ['psid' => array_merge($permissionSets->column('id'),
- [DI::permissionSet()->selectPublicForUser($owner['uid'])])];
- }
- }
- }
-
- $condition = array_merge($condition, [
- 'uid' => $owner['uid'],
- 'author-id' => Contact::getIdForURL($owner['url'], 0, false),
- 'gravity' => [Item::GRAVITY_PARENT, Item::GRAVITY_COMMENT],
- 'network' => Protocol::FEDERATED,
- 'parent-network' => Protocol::FEDERATED,
- 'origin' => true,
- 'deleted' => false,
- 'visible' => true
- ]);
-
- $apcontact = APContact::getByURL($owner['url']);
-
- $data = ['@context' => ActivityPub::CONTEXT];
- $data['id'] = DI::baseUrl() . '/outbox/' . $owner['nickname'];
- $data['type'] = 'OrderedCollection';
- $data['totalItems'] = $apcontact['statuses_count'] ?? 0;
-
- if (!empty($page)) {
- $data['id'] .= '?' . http_build_query(['page' => $page]);
- }
-
- if (empty($page)) {
- $data['first'] = DI::baseUrl() . '/outbox/' . $owner['nickname'] . '?page=1';
- } else {
- $data['type'] = 'OrderedCollectionPage';
- $list = [];
-
- $items = Post::select(['id'], $condition, ['limit' => [($page - 1) * 20, 20], 'order' => ['created' => true]]);
- while ($item = Post::fetch($items)) {
- $activity = self::createActivityFromItem($item['id'], true);
- $activity['type'] = $activity['type'] == 'Update' ? 'Create' : $activity['type'];
-
- // Only list "Create" activity objects here, no reshares
- if (!empty($activity['object']) && ($activity['type'] == 'Create')) {
- $list[] = $activity['object'];
- }
- }
- DBA::close($items);
-
- if (count($list) == 20) {
- $data['next'] = DI::baseUrl() . '/outbox/' . $owner['nickname'] . '?page=' . ($page + 1);
- }
-
- // Fix the cached total item count when it is lower than the real count
- $total = (($page - 1) * 20) + $data['totalItems'];
- if ($total > $data['totalItems']) {
- $data['totalItems'] = $total;
- }
-
- $data['partOf'] = DI::baseUrl() . '/outbox/' . $owner['nickname'];
-
- $data['orderedItems'] = $list;
- }
-
- return $data;
- }
-
/**
* Public posts for the given owner
*
while ($item = Post::fetch($items)) {
$activity = self::createActivityFromItem($item['id'], true);
- $activity['type'] = $activity['type'] == 'Update' ? 'Create' : $activity['type'];
-
- // Only list "Create" activity objects here, no reshares
- if (!empty($activity['object']) && ($activity['type'] == 'Create')) {
- $list[] = $activity['object'];
+ if (!empty($activity)) {
+ $list[] = $activity;
}
}
DBA::close($items);
*
* @return array with service data
*/
- private static function getService(): array
+ public static function getService(): array
{
return [
'type' => 'Service',
'name' => App::PLATFORM . " '" . App::CODENAME . "' " . App::VERSION . '-' . DB_UPDATE_VERSION,
- 'url' => DI::baseUrl()->get()
+ 'url' => DI::baseUrl()
];
}
'owner' => $owner['url'],
'publicKeyPem' => $owner['pubkey']];
$data['endpoints'] = ['sharedInbox' => DI::baseUrl() . '/inbox'];
- $data['icon'] = ['type' => 'Image', 'url' => User::getAvatarUrl($owner)];
-
- $resourceid = Photo::ridFromURI($owner['photo']);
- if (!empty($resourceid)) {
- $photo = Photo::selectFirst(['type'], ["resource-id" => $resourceid]);
- if (!empty($photo['type'])) {
- $data['icon']['mediaType'] = $photo['type'];
- }
- }
-
- if (!empty($owner['header'])) {
- $data['image'] = ['type' => 'Image', 'url' => Contact::getHeaderUrlForId($owner['id'], '', $owner['updated'])];
+ if ($uid != 0) {
+ $data['icon'] = ['type' => 'Image', 'url' => User::getAvatarUrl($owner)];
- $resourceid = Photo::ridFromURI($owner['header']);
+ $resourceid = Photo::ridFromURI($owner['photo']);
if (!empty($resourceid)) {
$photo = Photo::selectFirst(['type'], ["resource-id" => $resourceid]);
if (!empty($photo['type'])) {
- $data['image']['mediaType'] = $photo['type'];
+ $data['icon']['mediaType'] = $photo['type'];
}
}
- }
- $custom_fields = [];
+ if (!empty($owner['header'])) {
+ $data['image'] = ['type' => 'Image', 'url' => Contact::getHeaderUrlForId($owner['id'], '', $owner['updated'])];
- foreach (DI::profileField()->selectByContactId(0, $uid) as $profile_field) {
- $custom_fields[] = [
- 'type' => 'PropertyValue',
- 'name' => $profile_field->label,
- 'value' => BBCode::convertForUriId($owner['uri-id'], $profile_field->value)
- ];
- };
+ $resourceid = Photo::ridFromURI($owner['header']);
+ if (!empty($resourceid)) {
+ $photo = Photo::selectFirst(['type'], ["resource-id" => $resourceid]);
+ if (!empty($photo['type'])) {
+ $data['image']['mediaType'] = $photo['type'];
+ }
+ }
+ }
+
+ $custom_fields = [];
+
+ foreach (DI::profileField()->selectByContactId(0, $uid) as $profile_field) {
+ $custom_fields[] = [
+ 'type' => 'PropertyValue',
+ 'name' => $profile_field->label,
+ 'value' => BBCode::convertForUriId($owner['uri-id'], $profile_field->value)
+ ];
+ };
- if (!empty($custom_fields)) {
- $data['attachment'] = $custom_fields;
+ if (!empty($custom_fields)) {
+ $data['attachment'] = $custom_fields;
+ }
}
$data['generator'] = self::getService();
return $data;
}
+ /**
+ * Get a minimal actror array for the C2S API
+ *
+ * @param integer $cid
+ * @return array
+ */
+ private static function getActorArrayByCid(int $cid): array
+ {
+ $contact = Contact::getById($cid);
+ $data = [
+ 'id' => $contact['url'],
+ 'type' => $data['type'] = ActivityPub::ACCOUNT_TYPES[$contact['contact-type']],
+ 'url' => $contact['alias'],
+ 'preferredUsername' => $contact['nick'],
+ 'name' => $contact['name'],
+ 'icon' => ['type' => 'Image', 'url' => Contact::getAvatarUrlForId($cid, '', $contact['updated'])],
+ 'image' => ['type' => 'Image', 'url' => Contact::getHeaderUrlForId($cid, '', $contact['updated'])],
+ 'manuallyApprovesFollowers' => (bool)$contact['manually-approve'],
+ 'discoverable' => !$contact['unsearchable'],
+ ];
+
+ if (empty($data['url'])) {
+ $data['url'] = $data['id'];
+ }
+
+ return $data;
+ }
+
/**
* @param string $username
* @return array
$is_forum_thread = false;
}
- if (self::isAnnounce($item) || DI::config()->get('debug', 'total_ap_delivery') || self::isAPPost($last_id)) {
+ if (self::isAnnounce($item) || self::isAPPost($last_id)) {
// Will be activated in a later step
$networks = Protocol::FEDERATED;
} else {
}
$exclusive = false;
+ $mention = false;
+
+ if ($is_forum_thread) {
+ foreach (Tag::getByURIId($item['parent-uri-id'], [Tag::MENTION, Tag::EXCLUSIVE_MENTION]) as $term) {
+ $profile = APContact::getByURL($term['url'], false);
+ if (!empty($profile) && ($profile['type'] == 'Group')) {
+ if ($term['type'] == Tag::EXCLUSIVE_MENTION) {
+ $exclusive = true;
+ } elseif ($term['type'] == Tag::MENTION) {
+ $mention = true;
+ }
+ }
+ }
+ }
$terms = Tag::getByURIId($item['uri-id'], [Tag::MENTION, Tag::IMPLICIT_MENTION, Tag::EXCLUSIVE_MENTION]);
if (!empty($profile['followers']) && ($profile['type'] == 'Group')) {
$data['cc'][] = $profile['followers'];
}
+ } elseif (($term['type'] == Tag::MENTION) && ($profile['type'] == 'Group')) {
+ $mention = true;
}
$data['to'][] = $profile['url'];
}
if (!empty($profile['followers']) && ($profile['type'] == 'Group')) {
$data['cc'][] = $profile['followers'];
}
+ } elseif (($term['type'] == Tag::MENTION) && ($profile['type'] == 'Group')) {
+ $mention = true;
}
$data['to'][] = $profile['url'];
}
}
}
+ if ($mention) {
+ $exclusive = false;
+ }
+
if ($is_forum && !$exclusive && !empty($follower)) {
$data['cc'][] = $follower;
} elseif (!$exclusive) {
}
}
- if (DI::config()->get('debug', 'total_ap_delivery') || $all_ap) {
+ if ($all_ap) {
// Will be activated in a later step
$networks = Protocol::FEDERATED;
} else {
*
* @param integer $item_id
* @param boolean $object_mode Is the activity item is used inside another object?
+ * @param boolean $api_mode "true" if used for the API
* @return false|array
* @throws \Exception
*/
- public static function createActivityFromItem(int $item_id, bool $object_mode = false)
+ public static function createActivityFromItem(int $item_id, bool $object_mode = false, $api_mode = false)
{
- Logger::info('Fetching activity', ['item' => $item_id]);
- $item = Post::selectFirst(Item::DELIVER_FIELDLIST, ['id' => $item_id, 'parent-network' => Protocol::NATIVE_SUPPORT]);
+ $condition = ['id' => $item_id];
+ if (!$api_mode) {
+ $condition['parent-network'] = Protocol::NATIVE_SUPPORT;
+ }
+ Logger::info('Fetching activity', $condition);
+ $item = Post::selectFirst(Item::DELIVER_FIELDLIST, $condition);
if (!DBA::isResult($item)) {
return false;
}
+ return self::createActivityFromArray($item, $object_mode, $api_mode);
+ }
- if (empty($item['uri-id'])) {
- Logger::warning('Item without uri-id', ['item' => $item]);
+ /**
+ * Creates an activity array for a given URI-Id and uid
+ *
+ * @param integer $uri_id
+ * @param integer $uid
+ * @param boolean $object_mode Is the activity item is used inside another object?
+ * @param boolean $api_mode "true" if used for the API
+ * @return false|array
+ * @throws \Exception
+ */
+ public static function createActivityFromUriId(int $uri_id, int $uid, bool $object_mode = false, $api_mode = false)
+ {
+ $condition = ['uri-id' => $uri_id, 'uid' => [0, $uid]];
+ if (!$api_mode) {
+ $condition['parent-network'] = Protocol::NATIVE_SUPPORT;
+ }
+ Logger::info('Fetching activity', $condition);
+ $item = Post::selectFirst(Item::DELIVER_FIELDLIST, $condition, ['order' => ['uid' => true]]);
+ if (!DBA::isResult($item)) {
return false;
}
- if (!$item['deleted']) {
+ return self::createActivityFromArray($item, $object_mode, $api_mode);
+ }
+
+ /**
+ * Creates an activity array for a given item id
+ *
+ * @param integer $item_id
+ * @param boolean $object_mode Is the activity item is used inside another object?
+ * @param boolean $api_mode "true" if used for the API
+ * @return false|array
+ * @throws \Exception
+ */
+ private static function createActivityFromArray(array $item, bool $object_mode = false, $api_mode = false)
+ {
+ if (!$api_mode && !$item['deleted'] && $item['network'] == Protocol::ACTIVITYPUB) {
$data = Post\Activity::getByURIId($item['uri-id']);
if (!$item['origin'] && !empty($data)) {
- if ($object_mode) {
- unset($data['@context']);
- unset($data['signature']);
+ if (!$object_mode) {
+ Logger::info('Return stored conversation', ['item' => $item['id']]);
+ return $data;
+ } elseif (!empty($data['object'])) {
+ Logger::info('Return stored conversation object', ['item' => $item['id']]);
+ return $data['object'];
}
- Logger::info('Return stored conversation', ['item' => $item_id]);
- return $data;
}
}
- if (!$item['origin'] && empty($object)) {
- Logger::debug('Post is not ours and is not stored', ['id' => $item_id, 'uri-id' => $item['uri-id']]);
+ if (!$api_mode && !$item['origin']) {
+ Logger::debug('Post is not ours and is not stored', ['id' => $item['id'], 'uri-id' => $item['uri-id']]);
return false;
}
$data['type'] = $type;
if (($type != 'Announce') || ($item['gravity'] != Item::GRAVITY_PARENT)) {
- $data['actor'] = $item['author-link'];
+ $link = $item['author-link'];
+ $id = $item['author-id'];
+ } else {
+ $link = $item['owner-link'];
+ $id = $item['owner-id'];
+ }
+
+ if ($api_mode) {
+ $data['actor'] = self::getActorArrayByCid($id);
} else {
- $data['actor'] = $item['owner-link'];
+ $data['actor'] = $link;
}
$data['published'] = DateTimeFormat::utc($item['created'] . '+00:00', DateTimeFormat::ATOM);
$data = array_merge($data, self::createPermissionBlockForItem($item, false));
if (in_array($data['type'], ['Create', 'Update', 'Delete'])) {
- $data['object'] = $object ?? self::createNote($item);
- $data['published'] = DateTimeFormat::utcNow(DateTimeFormat::ATOM);
+ $data['object'] = self::createNote($item, $api_mode);
} elseif ($data['type'] == 'Add') {
$data = self::createAddTag($item, $data);
} elseif ($data['type'] == 'Announce') {
if ($item['verb'] == ACTIVITY::ANNOUNCE) {
$data['object'] = $item['thr-parent'];
} else {
- $data = self::createAnnounce($item, $data);
+ $data = self::createAnnounce($item, $data, $api_mode);
}
} elseif ($data['type'] == 'Follow') {
$data['object'] = $item['parent-uri'];
} elseif ($data['type'] == 'Undo') {
- $data['object'] = self::createActivityFromItem($item_id, true);
+ $data['object'] = self::createActivityFromItem($item['id'], true);
} else {
$data['diaspora:guid'] = $item['guid'];
if (!empty($item['signed_text'])) {
$uid = $item['uid'];
}
- $owner = User::getOwnerDataById($uid);
+ Logger::info('Fetched activity', ['item' => $item['id'], 'uid' => $uid]);
- Logger::info('Fetched activity', ['item' => $item_id, 'uid' => $uid]);
-
- // We don't sign if we aren't the actor. This is important for relaying content especially for forums
- if (!$object_mode && !empty($owner) && ($data['actor'] == $owner['url'])) {
+ // We only sign our own activities
+ if (!$api_mode && !$object_mode && $item['origin']) {
+ $owner = User::getOwnerDataById($uid);
return LDSignature::sign($data, $owner);
} else {
return $data;
*/
private static function removePictures(string $body): string
{
- // Simplify image codes
- $body = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $body);
- $body = preg_replace("/\[img\=(.*?)\](.*?)\[\/img\]/ism", '[img]$1[/img]', $body);
-
- // Now remove local links
- $body = preg_replace_callback(
- '/\[url=([^\[\]]*)\]\[img\](.*)\[\/img\]\[\/url\]/Usi',
- function ($match) {
- // We remove the link when it is a link to a local photo page
- if (Photo::isLocalPage($match[1])) {
- return '';
- }
- // otherwise we just return the link
- return '[url]' . $match[1] . '[/url]';
- },
- $body
- );
-
- // Remove all pictures
- $body = preg_replace("/\[img\]([^\[\]]*)\[\/img\]/Usi", '', $body);
-
- return $body;
+ return BBCode::performWithEscapedTags($body, ['code', 'noparse', 'nobb', 'pre'], function ($text) {
+ // Simplify image codes
+ $text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $text);
+ $text = preg_replace("/\[img\=(.*?)\](.*?)\[\/img\]/ism", '[img]$1[/img]', $text);
+
+ // Now remove local links
+ $text = preg_replace_callback(
+ '/\[url=([^\[\]]*)\]\[img\](.*)\[\/img\]\[\/url\]/Usi',
+ function ($match) {
+ // We remove the link when it is a link to a local photo page
+ if (Photo::isLocalPage($match[1])) {
+ return '';
+ }
+ // otherwise we just return the link
+ return '[url]' . $match[1] . '[/url]';
+ },
+ $text
+ );
+
+ // Remove all pictures
+ return preg_replace("/\[img\]([^\[\]]*)\[\/img\]/Usi", '', $text);
+ });
}
/**
* Creates a note/article object array
*
* @param array $item
+ * @param bool $api_mode
* @return array with the object data
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- public static function createNote(array $item): array
+ public static function createNote(array $item, bool $api_mode = false): array
{
if (empty($item)) {
return [];
}
$data['url'] = $link ?? $item['plink'];
- $data['attributedTo'] = $item['author-link'];
+ if ($api_mode) {
+ $data['attributedTo'] = self::getActorArrayByCid($item['author-id']);
+ } else {
+ $data['attributedTo'] = $item['author-link'];
+ }
$data['sensitive'] = self::isSensitive($item['uri-id']);
if (!empty($item['conversation']) && ($item['conversation'] != './')) {
$real_quote = false;
+ $item = Post\Media::addHTMLAttachmentToItem($item);
+
$body = $item['body'];
if ($type == 'Note') {
*
* } elseif (($type == 'Article') && empty($data['summary'])) {
* $regexp = "/[@!]\[url\=([^\[\]]*)\].*?\[\/url\]/ism";
- * $summary = preg_replace_callback($regexp, ['self', 'mentionAddrCallback'], $body);
+ * $summary = preg_replace_callback($regexp, [self::class, 'mentionAddrCallback'], $body);
* $data['summary'] = BBCode::toPlaintext(Plaintext::shorten(self::removePictures($summary), 1000));
* }
*/
if ($type == 'Page') {
// When we transmit "Page" posts we have to remove the attachment.
// The attachment contains the link that we already transmit in the "url" field.
- $body = preg_replace("/\s*\[attachment .*?\].*?\[\/attachment\]\s*/ism", '', $body);
+ $body = BBCode::removeAttachment($body);
}
$body = BBCode::setMentionsToNicknames($body);
- if (!empty($item['quote-uri']) && Post::exists(['uri-id' => $item['quote-uri-id'], 'network' => [Protocol::ACTIVITYPUB, Protocol::DFRN]])) {
- $real_quote = true;
- if (Diaspora::isReshare($body, false)) {
- $body = BBCode::replaceSharedData($body);
- } elseif (strpos($body, $item['quote-uri']) === false) {
- $body .= "\n♲ " . $item['quote-uri'];
+ if (!empty($item['quote-uri-id'])) {
+ if (Post::exists(['uri-id' => $item['quote-uri-id'], 'network' => [Protocol::ACTIVITYPUB, Protocol::DFRN]])) {
+ $real_quote = true;
+ $data['quoteUrl'] = $item['quote-uri'];
+ $body = DI::contentItem()->addShareLink($body, $item['quote-uri-id']);
+ } else {
+ $body = DI::contentItem()->addSharedPost($item, $body);
}
- $data['quoteUrl'] = $item['quote-uri'];
- } elseif (!empty($item['quote-uri']) && !Diaspora::isReshare($body, false)) {
- $body .= "\n" . DI::contentItem()->createSharedPostByUriId($item['quote-uri-id'], $item['uid'], true);
- $item['body'] = Item::improveSharedDataInBody($item, true);
}
$data['content'] = BBCode::convertForUriId($item['uri-id'], $body, BBCode::ACTIVITYPUB);
$language = self::getLanguage($item);
if (!empty($language)) {
$richbody = BBCode::setMentionsToNicknames($item['body'] ?? '');
-
- if ($real_quote) {
- $shared = BBCode::fetchShareAttributes($richbody);
- if (!empty($shared['link']) && !empty($shared['guid']) && !empty($shared['comment'])) {
- $richbody = BBCode::replaceSharedData($richbody);
+ $richbody = Post\Media::removeFromEndOfBody($richbody);
+ if (!empty($item['quote-uri-id'])) {
+ if ($real_quote) {
+ $richbody = DI::contentItem()->addShareLink($richbody, $item['quote-uri-id']);
+ } else {
+ $richbody = DI::contentItem()->addSharedPost($item, $richbody);
}
}
-
- $richbody = BBCode::removeAttachment($richbody);
+ $richbody = BBCode::replaceAttachment($richbody);
$data['contentMap'][$language] = BBCode::convertForUriId($item['uri-id'], $richbody, BBCode::EXTERNAL);
}
- $data['source'] = ['content' => $item['body'], 'mediaType' => "text/bbcode"];
+ if (!empty($item['quote-uri-id'])) {
+ $source = DI::contentItem()->addSharedPost($item, $item['body']);
+ } else {
+ $source = $item['body'];
+ }
+
+ $data['source'] = ['content' => $source, 'mediaType' => "text/bbcode"];
if (!empty($item['signed_text']) && ($item['uri'] != $item['thr-parent'])) {
$data['diaspora:comment'] = $item['signed_text'];
}
$data['attachment'] = self::createAttachmentList($item);
- $data['tag'] = self::createTagList($item, $data['quoteUrl'] ?? '');
+ $data['tag'] = self::createTagList($item, $data['quoteUrl'] ?? '');
if (empty($data['location']) && (!empty($item['coord']) || !empty($item['location']))) {
$data['location'] = self::createLocation($item);
*
* @param array $item Item array
* @param array $activity activity data
+ * @param bool $api_mode
* @return array with activity data
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- private static function createAnnounce(array $item, array $activity): array
+ private static function createAnnounce(array $item, array $activity, bool $api_mode = false): array
{
$orig_body = $item['body'];
$announce = self::getAnnounceArray($item);
if (empty($announce)) {
$activity['type'] = 'Create';
- $activity['object'] = self::createNote($item);
+ $activity['object'] = self::createNote($item, $api_mode);
return $activity;
}
// Quote
$activity['type'] = 'Create';
$item['body'] = $announce['comment'] . "\n" . $announce['object']['plink'];
- $activity['object'] = self::createNote($item);
+ $activity['object'] = self::createNote($item, $api_mode);
/// @todo Finally descide how to implement this in AP. This is a possible way:
$activity['object']['attachment'][] = self::createNote($announce['object']);
* @param array $item
* @return array Announcement array
*/
- public static function getAnnounceArray(array $item): array
+ private static function getAnnounceArray(array $item): array
{
- $reshared = Item::getShareArray($item);
- if (empty($reshared['guid'])) {
- return [];
- }
-
- $reshared_item = Post::selectFirst(Item::DELIVER_FIELDLIST, ['guid' => $reshared['guid']]);
- if (!DBA::isResult($reshared_item)) {
+ $reshared = DI::contentItem()->getSharedPost($item, Item::DELIVER_FIELDLIST);
+ if (empty($reshared)) {
return [];
}
- if (!in_array($reshared_item['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN])) {
+ if (!in_array($reshared['post']['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN])) {
return [];
}
- $profile = APContact::getByURL($reshared_item['author-link'], false);
+ $profile = APContact::getByURL($reshared['post']['author-link'], false);
if (empty($profile)) {
return [];
}
- return ['object' => $reshared_item, 'actor' => $profile, 'comment' => $reshared['comment']];
+ return ['object' => $reshared['post'], 'actor' => $profile, 'comment' => $reshared['comment']];
}
/**
/**
* Transmits a contact suggestion to a given inbox
*
- * @param integer $uid User ID
+ * @param array $owner Sender owner-view record
* @param string $inbox Target inbox
* @param integer $suggestion_id Suggestion ID
* @return boolean was the transmission successful?
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \Exception
*/
- public static function sendContactSuggestion(int $uid, string $inbox, int $suggestion_id): bool
+ public static function sendContactSuggestion(array $owner, string $inbox, int $suggestion_id): bool
{
- $owner = User::getOwnerDataById($uid);
-
$suggestion = DI::fsuggest()->selectOneById($suggestion_id);
$data = [
$signed = LDSignature::sign($data, $owner);
- Logger::info('Deliver profile deletion for user ' . $uid . ' to ' . $inbox . ' via ActivityPub');
- return HTTPSignature::transmit($signed, $inbox, $uid);
+ Logger::info('Deliver profile deletion for user ' . $owner['uid'] . ' to ' . $inbox . ' via ActivityPub');
+ return HTTPSignature::transmit($signed, $inbox, $owner);
}
/**
* Transmits a profile relocation to a given inbox
*
- * @param integer $uid User ID
- * @param string $inbox Target inbox
+ * @param array $owner Sender owner-view record
+ * @param string $inbox Target inbox
* @return boolean was the transmission successful?
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \Exception
*/
- public static function sendProfileRelocation(int $uid, string $inbox): bool
+ public static function sendProfileRelocation(array $owner, string $inbox): bool
{
- $owner = User::getOwnerDataById($uid);
-
$data = [
'@context' => ActivityPub::CONTEXT,
'id' => DI::baseUrl() . '/activity/' . System::createGUID(),
$signed = LDSignature::sign($data, $owner);
- Logger::info('Deliver profile relocation for user ' . $uid . ' to ' . $inbox . ' via ActivityPub');
- return HTTPSignature::transmit($signed, $inbox, $uid);
+ Logger::info('Deliver profile relocation for user ' . $owner['uid'] . ' to ' . $inbox . ' via ActivityPub');
+ return HTTPSignature::transmit($signed, $inbox, $owner);
}
/**
* Transmits a profile deletion to a given inbox
*
- * @param integer $uid User ID
- * @param string $inbox Target inbox
+ * @param array $owner Sender owner-view record
+ * @param string $inbox Target inbox
* @return boolean was the transmission successful?
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \Exception
*/
- public static function sendProfileDeletion(int $uid, string $inbox): bool
+ public static function sendProfileDeletion(array $owner, string $inbox): bool
{
- $owner = User::getOwnerDataById($uid);
-
- if (empty($owner)) {
- Logger::error('No owner data found, the deletion message cannot be processed.', ['user' => $uid]);
- return false;
- }
-
if (empty($owner['uprvkey'])) {
- Logger::error('No private key for owner found, the deletion message cannot be processed.', ['user' => $uid]);
+ Logger::error('No private key for owner found, the deletion message cannot be processed.', ['user' => $owner['uid']]);
return false;
}
$signed = LDSignature::sign($data, $owner);
- Logger::info('Deliver profile deletion for user ' . $uid . ' to ' . $inbox . ' via ActivityPub');
- return HTTPSignature::transmit($signed, $inbox, $uid);
+ Logger::info('Deliver profile deletion for user ' . $owner['uid'] . ' to ' . $inbox . ' via ActivityPub');
+ return HTTPSignature::transmit($signed, $inbox, $owner);
}
/**
* Transmits a profile change to a given inbox
*
- * @param integer $uid User ID
- * @param string $inbox Target inbox
+ * @param array $owner Sender owner-view record
+ * @param string $inbox Target inbox
* @return boolean was the transmission successful?
* @throws HTTPException\InternalServerErrorException
* @throws HTTPException\NotFoundException
* @throws \ImagickException
*/
- public static function sendProfileUpdate(int $uid, string $inbox): bool
+ public static function sendProfileUpdate(array $owner, string $inbox): bool
{
- $owner = User::getOwnerDataById($uid);
$profile = APContact::getByURL($owner['url']);
$data = ['@context' => ActivityPub::CONTEXT,
'id' => DI::baseUrl() . '/activity/' . System::createGUID(),
'type' => 'Update',
'actor' => $owner['url'],
- 'object' => self::getProfile($uid),
+ 'object' => self::getProfile($owner['uid']),
'published' => DateTimeFormat::utcNow(DateTimeFormat::ATOM),
'instrument' => self::getService(),
'to' => [$profile['followers']],
$signed = LDSignature::sign($data, $owner);
- Logger::info('Deliver profile update for user ' . $uid . ' to ' . $inbox . ' via ActivityPub');
- return HTTPSignature::transmit($signed, $inbox, $uid);
+ Logger::info('Deliver profile update for user ' . $owner['uid'] . ' to ' . $inbox . ' via ActivityPub');
+ return HTTPSignature::transmit($signed, $inbox, $owner);
}
/**
}
$owner = User::getOwnerDataById($uid);
+ if (empty($owner)) {
+ Logger::warning('No user found for actor, aborting', ['uid' => $uid]);
+ return false;
+ }
if (empty($id)) {
$id = DI::baseUrl() . '/activity/' . System::createGUID();
Logger::info('Sending activity ' . $activity . ' to ' . $target . ' for user ' . $uid);
$signed = LDSignature::sign($data, $owner);
- return HTTPSignature::transmit($signed, $profile['inbox'], $uid);
+ return HTTPSignature::transmit($signed, $profile['inbox'], $owner);
}
/**
}
if (empty($uid)) {
- // Fetch the list of administrators
- $admin_mail = explode(',', str_replace(' ', '', DI::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'];
+ $admin = User::getFirstAdmin(['uid']);
+ if (!$admin) {
+ Logger::warning('No available admin user for transmission', ['target' => $target]);
+ return false;
+ }
+
+ $uid = $admin['uid'];
}
$condition = ['verb' => Activity::FOLLOW, 'uid' => 0, 'parent-uri' => $object,
Logger::info('Sending follow ' . $object . ' to ' . $target . ' for user ' . $uid);
$signed = LDSignature::sign($data, $owner);
- return HTTPSignature::transmit($signed, $profile['inbox'], $uid);
+ return HTTPSignature::transmit($signed, $profile['inbox'], $owner);
}
/**
}
$owner = User::getOwnerDataById($uid);
+ if (!$owner) {
+ Logger::notice('No user found for actor', ['uid' => $uid]);
+ return;
+ }
+
$data = [
'@context' => ActivityPub::CONTEXT,
'id' => DI::baseUrl() . '/activity/' . System::createGUID(),
Logger::debug('Sending accept to ' . $target . ' for user ' . $uid . ' with id ' . $id);
$signed = LDSignature::sign($data, $owner);
- HTTPSignature::transmit($signed, $profile['inbox'], $uid);
+ HTTPSignature::transmit($signed, $profile['inbox'], $owner);
}
/**
*
* @param string $target Target profile
* @param string $objectId Object id
- * @param int $uid User ID
+ * @param array $owner Sender owner-view record
* @return bool Operation success
* @throws HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- public static function sendContactReject(string $target, string $objectId, int $uid): bool
+ public static function sendContactReject(string $target, string $objectId, array $owner): bool
{
$profile = APContact::getByURL($target);
if (empty($profile['inbox'])) {
return false;
}
- $owner = User::getOwnerDataById($uid);
$data = [
'@context' => ActivityPub::CONTEXT,
'id' => DI::baseUrl() . '/activity/' . System::createGUID(),
'to' => [$profile['url']],
];
- Logger::debug('Sending reject to ' . $target . ' for user ' . $uid . ' with id ' . $objectId);
+ Logger::debug('Sending reject to ' . $target . ' for user ' . $owner['uid'] . ' with id ' . $objectId);
$signed = LDSignature::sign($data, $owner);
- return HTTPSignature::transmit($signed, $profile['inbox'], $uid);
+ return HTTPSignature::transmit($signed, $profile['inbox'], $owner);
}
/**
*
* @param string $target Target profile
* @param integer $cid Contact id
- * @param integer $uid User ID
+ * @param array $owner Sender owner-view record
* @return bool success
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
* @throws \Exception
*/
- public static function sendContactUndo(string $target, int $cid, int $uid): bool
+ public static function sendContactUndo(string $target, int $cid, array $owner): bool
{
$profile = APContact::getByURL($target);
if (empty($profile['inbox'])) {
$objectId = DI::baseUrl() . '/activity/' . System::createGUID();
- $owner = User::getOwnerDataById($uid);
$data = [
'@context' => ActivityPub::CONTEXT,
'id' => $objectId,
'to' => [$profile['url']],
];
- Logger::info('Sending undo to ' . $target . ' for user ' . $uid . ' with id ' . $objectId);
+ Logger::info('Sending undo to ' . $target . ' for user ' . $owner['uid'] . ' with id ' . $objectId);
$signed = LDSignature::sign($data, $owner);
- return HTTPSignature::transmit($signed, $profile['inbox'], $uid);
+ return HTTPSignature::transmit($signed, $profile['inbox'], $owner);
}
/**
projects / friendica.git / blobdiff