use Friendica\Core\Protocol;
use Friendica\DI;
use Friendica\Model\Contact;
+use Friendica\Model\Conversation;
use Friendica\Model\GServer;
use Friendica\Model\Item;
use Friendica\Model\ItemURI;
use Friendica\Model\Post\Category;
use Friendica\Model\Tag;
use Friendica\Model\Verb;
+use Friendica\Protocol\ActivityPub\Processor;
+use Friendica\Protocol\ActivityPub\Receiver;
+use Friendica\Util\JsonLD;
use Friendica\Util\Strings;
/**
// Needed for the helper function to read from the legacy term table
const OBJECT_TYPE_POST = 1;
- const VERSION = 1427;
+ const VERSION = 1452;
/**
* Calls the post update functions
if (!self::update1427()) {
return false;
}
+ if (!self::update1452()) {
+ return false;
+ }
return true;
}
return false;
}
+
+ /**
+ * Fill the receivers of the post via the raw source
+ *
+ * @return bool "true" when the job is done
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \ImagickException
+ */
+ private static function update1452()
+ {
+ // Was the script completed?
+ if (DI::config()->get('system', 'post_update_version') >= 1452) {
+ return true;
+ }
+
+ $id = DI::config()->get('system', 'post_update_version_1452_id', 0);
+
+ Logger::info('Start', ['uri-id' => $id]);
+
+ $start_id = $id;
+ $rows = 0;
+
+ $conversations = DBA::p("SELECT `post-view`.`uri-id`, `conversation`.`source`, `conversation`.`received` FROM `conversation`
+ INNER JOIN `post-view` ON `post-view`.`uri` = `conversation`.`item-uri`
+ WHERE NOT `source` IS NULL AND `conversation`.`protocol` = ? AND `uri-id` > ? LIMIT ?",
+ Conversation::PARCEL_ACTIVITYPUB, $id, 1000);
+
+ if (DBA::errorNo() != 0) {
+ Logger::error('Database error', ['no' => DBA::errorNo(), 'message' => DBA::errorMessage()]);
+ return false;
+ }
+
+ while ($conversation = DBA::fetch($conversations)) {
+ $id = $conversation['uri-id'];
+ $received = $conversation['received'];
+
+ $raw = json_decode($conversation['source'], true);
+ if (empty($raw)) {
+ continue;
+ }
+ $activity = JsonLD::compact($raw);
+
+ $urls = Receiver::getReceiverURL($activity);
+ Processor::storeReceivers($conversation['uri-id'], $urls);
+
+ if (!empty($activity['as:object'])) {
+ $urls = array_merge($urls, Receiver::getReceiverURL($activity['as:object']));
+ Processor::storeReceivers($conversation['uri-id'], $urls);
+ }
+ ++$rows;
+ }
+
+ DBA::close($conversations);
+
+ DI::config()->set('system', 'post_update_version_1452_id', $id);
+
+ Logger::info('Processed', ['rows' => $rows, 'last' => $id, 'last-received' => $received]);
+
+ if ($start_id == $id) {
+ DI::config()->set('system', 'post_update_version', 1452);
+ Logger::info('Done');
+ return true;
+ }
+
+ return false;
+ }
}
*/
const IMPLICIT_MENTION = 8;
/**
- * An exclusive mention transfers the ownership of the post to the target account, usually a forum.
+ * An exclusive mention transmits the post only to the target account without transmitting it to the followers, usually a forum.
*/
const EXCLUSIVE_MENTION = 9;
+ const TO = 10;
+ const CC = 11;
+ const BTO = 12;
+ const BCC = 13;
+
const TAG_CHARACTER = [
self::HASHTAG => '#',
self::MENTION => '@',
* @param integer $type
* @param string $name
* @param string $url
- * @param boolean $probing
*/
- public static function store(int $uriid, int $type, string $name, string $url = '', $probing = true)
+ public static function store(int $uriid, int $type, string $name, string $url = '')
{
if ($type == self::HASHTAG) {
// Trim Unicode non-word characters
$tags = explode(self::TAG_CHARACTER[self::HASHTAG], $name);
if (count($tags) > 1) {
foreach ($tags as $tag) {
- self::store($uriid, $type, $tag, $url, $probing);
+ self::store($uriid, $type, $tag, $url);
}
return;
}
$cid = 0;
$tagid = 0;
- if (in_array($type, [self::MENTION, self::EXCLUSIVE_MENTION, self::IMPLICIT_MENTION])) {
+ if (in_array($type, [self::MENTION, self::EXCLUSIVE_MENTION, self::IMPLICIT_MENTION, self::TO, self::CC, self::BTO, self::BCC])) {
if (empty($url)) {
// No mention without a contact url
return;
Logger::notice('Wrong scheme in url', ['url' => $url, 'callstack' => System::callstack(20)]);
}
- if (!$probing) {
- $condition = ['nurl' => Strings::normaliseLink($url), 'uid' => 0, 'deleted' => false];
- $contact = DBA::selectFirst('contact', ['id'], $condition, ['order' => ['id']]);
- if (DBA::isResult($contact)) {
- $cid = $contact['id'];
- Logger::info('Got id for contact url', ['cid' => $cid, 'url' => $url]);
- }
-
- if (empty($cid)) {
- $ssl_url = str_replace('http://', 'https://', $url);
- $condition = ['`alias` IN (?, ?, ?) AND `uid` = ? AND NOT `deleted`', $url, Strings::normaliseLink($url), $ssl_url, 0];
- $contact = DBA::selectFirst('contact', ['id'], $condition, ['order' => ['id']]);
- if (DBA::isResult($contact)) {
- $cid = $contact['id'];
- Logger::info('Got id for contact alias', ['cid' => $cid, 'url' => $url]);
- }
- }
- } else {
- $cid = Contact::getIdForURL($url, 0, false);
- Logger::info('Got id by probing', ['cid' => $cid, 'url' => $url]);
- }
+ $cid = Contact::getIdForURL($url, 0, false);
+ Logger::debug('Got id for contact', ['cid' => $cid, 'url' => $url]);
if (empty($cid)) {
// The contact wasn't found in the system (most likely some dead account)
// We ensure that we only store a single entry by overwriting the previous name
- Logger::info('Contact not found, updating tag', ['url' => $url, 'name' => $name]);
+ Logger::info('URL is not a known contact, updating tag', ['url' => $url, 'name' => $name]);
if (!DBA::exists('tag', ['name' => substr($name, 0, 96), 'url' => $url])) {
DBA::update('tag', ['name' => substr($name, 0, 96)], ['url' => $url]);
}
}
if (empty($cid)) {
- if (($type != self::HASHTAG) && !empty($url) && ($url != $name)) {
- $url = strtolower($url);
- } else {
- $url = '';
+ if (!in_array($type, [self::TO, self::CC, self::BTO, self::BCC])) {
+ if (($type != self::HASHTAG) && !empty($url) && ($url != $name)) {
+ $url = strtolower($url);
+ } else {
+ $url = '';
+ }
}
$tagid = self::getID($name, $url);
$direction = [];
if (!empty($item['direction'])) {
$direction = $item['direction'];
- } elseif (DI::config()->get('debug', 'show_direction')) {
- $conversation = DBA::selectFirst('conversation', ['direction'], ['item-uri' => $item['uri']]);
- if (!empty($conversation['direction']) && in_array($conversation['direction'], [1, 2])) {
- $direction_title = [1 => DI::l10n()->t('Pushed'), 2 => DI::l10n()->t('Pulled')];
- $direction = ['direction' => $conversation['direction'], 'title' => $direction_title[$conversation['direction']]];
- }
}
$languages = [];
self::storeFromBody($item);
self::storeTags($item['uri-id'], $activity['tags']);
+ self::storeReceivers($item['uri-id'], $activity['receiver_urls'] ?? []);
+
$item['location'] = $activity['location'];
if (!empty($activity['latitude']) && !empty($activity['longitude'])) {
}
}
+ public static function storeReceivers(int $uriid, array $receivers)
+ {
+ foreach (['as:to' => Tag::TO, 'as:cc' => Tag::CC, 'as:bto' => Tag::BTO, 'as:bcc' => Tag::BCC] as $element => $type) {
+ if (!empty($receivers[$element])) {
+ foreach ($receivers[$element] as $receiver) {
+ if ($receiver == ActivityPub::PUBLIC_COLLECTION) {
+ $name = Receiver::PUBLIC_COLLECTION;
+ } else {
+ $name = trim(parse_url($receiver, PHP_URL_PATH), '/');
+ }
+ Tag::store($uriid, $type, $name, $receiver);
+ }
+ }
+ }
+ }
+
/**
* Creates an mail post
*
$reception_types[$data['uid']] = $data['type'] ?? self::TARGET_UNKNOWN;
}
+ $urls = self::getReceiverURL($activity);
+
// When it is a delivery to a personal inbox we add that user to the receivers
if (!empty($uid)) {
$additional = [$uid => $uid];
$receivers = array_replace($receivers, $additional);
if (empty($activity['thread-completion']) && (empty($reception_types[$uid]) || in_array($reception_types[$uid], [self::TARGET_UNKNOWN, self::TARGET_FOLLOWER, self::TARGET_ANSWER, self::TARGET_GLOBAL]))) {
$reception_types[$uid] = self::TARGET_BCC;
+ $owner = User::getOwnerDataById($uid);
+ if (!empty($owner['url'])) {
+ $urls['as:bcc'][] = $owner['url'];
+ }
}
}
$object_data['object_type'] = $object_type;
}
+ foreach (['as:to', 'as:cc', 'as:bto', 'as:bcc'] as $element) {
+ if (!empty($urls[$element])) {
+ $object_data['receiver_urls'][$element] = array_unique(array_merge($object_data['receiver_urls'][$element] ?? [], $urls[$element]));
+ }
+ }
+
$object_data['type'] = $type;
$object_data['actor'] = $actor;
$object_data['item_receiver'] = $receivers;
return $uid;
}
+ public static function getReceiverURL($activity)
+ {
+ $urls = [];
+
+ foreach (['as:to', 'as:cc', 'as:bto', 'as:bcc'] as $element) {
+ $receiver_list = JsonLD::fetchElementArray($activity, $element, '@id');
+ if (empty($receiver_list)) {
+ continue;
+ }
+
+ foreach ($receiver_list as $receiver) {
+ if ($receiver == self::PUBLIC_COLLECTION) {
+ $receiver = ActivityPub::PUBLIC_COLLECTION;
+ }
+ $urls[$element][] = $receiver;
+ }
+ }
+
+ return $urls;
+ }
+
/**
* Fetch the receiver list from an activity array
*
$reception_types[$data['uid']] = $data['type'] ?? 0;
}
- $object_data['receiver'] = $receivers;
+ $object_data['receiver_urls'] = self::getReceiverURL($object);
+ $object_data['receiver'] = $receivers;
$object_data['reception_type'] = $reception_types;
$object_data['unlisted'] = in_array(-1, $object_data['receiver']);
}
/**
- * Returns an array with permissions of a given item array
+ * Returns an array with permissions of the thread parent of the given item array
*
* @param array $item
*
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- private static function fetchPermissionBlockFromConversation($item)
+ public static function fetchPermissionBlockFromThreadParent($item)
{
- if (empty($item['thr-parent'])) {
+ if (empty($item['thr-parent-id'])) {
return [];
}
- $condition = ['item-uri' => $item['thr-parent'], 'protocol' => Conversation::PARCEL_ACTIVITYPUB];
- $conversation = DBA::selectFirst('conversation', ['source'], $condition);
- if (!DBA::isResult($conversation)) {
+ $parent = Post::selectFirstPost(['author-link'], ['uri-id' => $item['thr-parent-id']]);
+ if (empty($parent)) {
return [];
}
$permissions = [
- 'to' => [],
+ 'to' => [$parent['author-link']],
'cc' => [],
'bto' => [],
'bcc' => [],
];
- $activity = json_decode($conversation['source'], true);
-
- $actor = JsonLD::fetchElement($activity, 'actor', 'id');
- if (!empty($actor)) {
- $permissions['to'][] = $actor;
- $profile = APContact::getByURL($actor);
- } else {
- $profile = [];
- }
+ $parent_profile = APContact::getByURL($parent['author-link']);
$item_profile = APContact::getByURL($item['author-link']);
$exclude[] = $item['author-link'];
$exclude[] = $item['owner-link'];
}
- foreach (['to', 'cc', 'bto', 'bcc'] as $element) {
- if (empty($activity[$element])) {
- continue;
- }
- if (is_string($activity[$element])) {
- $activity[$element] = [$activity[$element]];
- }
-
- foreach ($activity[$element] as $receiver) {
- if (empty($receiver)) {
- continue;
- }
-
- if (!empty($profile['followers']) && $receiver == $profile['followers'] && !empty($item_profile['followers'])) {
- $permissions[$element][] = $item_profile['followers'];
- } elseif (!in_array($receiver, $exclude)) {
- $permissions[$element][] = $receiver;
- }
+ $type = [Tag::TO => 'to', Tag::CC => 'cc', Tag::BTO => 'bto', Tag::BCC => 'bcc'];
+ foreach (Tag::getByURIId($item['thr-parent-id'], [Tag::TO, Tag::CC, Tag::BTO, Tag::BCC]) as $receiver) {
+ if (!empty($parent_profile['followers']) && $receiver['url'] == $parent_profile['followers'] && !empty($item_profile['followers'])) {
+ $permissions[$type[$receiver['type']]][] = $item_profile['followers'];
+ } elseif (!in_array($receiver['url'], $exclude)) {
+ $permissions[$type[$receiver['type']]][] = $receiver['url'];
}
}
+
return $permissions;
}
$data['cc'][] = $announce['actor']['url'];
}
- $data = array_merge($data, self::fetchPermissionBlockFromConversation($item));
+ $data = array_merge($data, self::fetchPermissionBlockFromThreadParent($item));
// Check if the item is completely public or unlisted
if ($item['private'] == Item::PUBLIC) {
unset($receivers['bcc']);
}
+ foreach (['to' => Tag::TO, 'cc' => Tag::CC, 'bcc' => Tag::BCC] as $element => $type) {
+ if (!empty($receivers[$element])) {
+ foreach ($receivers[$element] as $receiver) {
+ if ($receiver == ActivityPub::PUBLIC_COLLECTION) {
+ $name = Receiver::PUBLIC_COLLECTION;
+ } else {
+ $name = trim(parse_url($receiver, PHP_URL_PATH), '/');
+ }
+ Tag::store($item['uri-id'], $type, $name, $receiver);
+ }
+ }
+ }
+
return $receivers;
}
// Logs every call to /inbox as a JSON file in Friendica's temporary directory
'ap_inbox_log' => false,
- // show_direction (Boolean)
- // Display if a post had been fetched or had been pushed towards our server
- 'show_direction' => false,
-
// total_ap_delivery (Boolean)
// Deliver via AP to every possible receiver and we suppress the delivery to these contacts with other protocols
'total_ap_delivery' => false,
projects / friendica.git / commitdiff