return $data;
}
- public static function fetchPermissionBlockFromConversation($item)
+ private static function fetchPermissionBlockFromConversation($item)
{
if (empty($item['thr-parent'])) {
return [];
$actor = JsonLD::fetchElement($activity, 'actor', 'id');
$profile = ActivityPub::fetchprofile($actor);
+ $item_profile = ActivityPub::fetchprofile($item['owner-link']);
+
$permissions = [];
$elements = ['to', 'cc', 'bto', 'bcc'];
$activity[$element] = [$activity[$element]];
}
foreach ($activity[$element] as $receiver) {
- if ($receiver == $profile['followers']) {
- $receiver = System::baseUrl() . '/followers/' . $item['author-nick'];
+ if ($receiver == $profile['followers'] && !empty($item_profile['followers'])) {
+ $receiver = $item_profile['followers'];
+ }
+ if ($receiver != $item['owner-link']) {
+ $permissions[$element][] = $receiver;
}
- $permissions[$element][] = $receiver;
}
}
return $permissions;
$data = array_merge($data, self::fetchPermissionBlockFromConversation($item));
+ $actor_profile = ActivityPub::fetchprofile($item['author-link']);
+
$terms = Term::tagArrayFromItemId($item['id']);
+ $contacts[$item['author-link']] = $item['author-link'];
+
if (!$item['private']) {
$data['to'][] = self::PUBLIC;
- $data['cc'][] = System::baseUrl() . '/followers/' . $item['author-nick'];
+ if (!empty($actor_profile['followers'])) {
+ $data['cc'][] = $actor_profile['followers'];
+ }
foreach ($terms as $term) {
if ($term['type'] != TERM_MENTION) {
continue;
}
$profile = self::fetchprofile($term['url']);
- if (!empty($profile)) {
+ if (!empty($profile) && empty($contacts[$profile['url']])) {
$data['cc'][] = $profile['url'];
+ $contacts[$profile['url']] = $profile['url'];
}
}
} else {
- //$data['cc'][] = System::baseUrl() . '/followers/' . $item['author-nick'];
$receiver_list = Item::enumeratePermissions($item);
$mentioned = [];
- $contacts = [];
foreach ($terms as $term) {
if ($term['type'] != TERM_MENTION) {
$contacts[$contact['url']] = $contact['url'];
}
}
-
- if (empty($data['to'])) {
- $data['to'] = $data['cc'];
- $data['cc'] = [];
- }
}
- return $data;
- }
-
- public static function fetchTargetInboxes($item, $uid)
- {
- $inboxes = [];
-
$parents = Item::select(['author-link', 'owner-link'], ['parent' => $item['parent']]);
while ($parent = Item::fetch($parents)) {
$profile = self::fetchprofile($parent['author-link']);
- if (!empty($profile)) {
- $target = defaults($profile, 'sharedinbox', $profile['inbox']);
- $inboxes[$target] = $target;
+ if (!empty($profile) && empty($contacts[$profile['url']])) {
+ $data['cc'][] = $profile['url'];
+ $contacts[$profile['url']] = $profile['url'];
}
+
$profile = self::fetchprofile($parent['owner-link']);
- if (!empty($profile)) {
- $target = defaults($profile, 'sharedinbox', $profile['inbox']);
- $inboxes[$target] = $target;
+ if (!empty($profile) && empty($contacts[$profile['url']])) {
+ $data['cc'][] = $profile['url'];
+ $contacts[$profile['url']] = $profile['url'];
}
}
DBA::close($parents);
- $terms = Term::tagArrayFromItemId($item['id']);
- if (!$item['private']) {
- $contacts = DBA::select('contact', ['notify', 'batch'], ['uid' => $uid,
- 'rel' => [Contact::FOLLOWER, Contact::FRIEND], 'network' => Protocol::ACTIVITYPUB]);
- while ($contact = DBA::fetch($contacts)) {
- $contact = defaults($contact, 'batch', $contact['notify']);
- $inboxes[$contact] = $contact;
- }
- DBA::close($contacts);
+ if (empty($data['to'])) {
+ $data['to'] = $data['cc'];
+ $data['cc'] = [];
+ }
- foreach ($terms as $term) {
- if ($term['type'] != TERM_MENTION) {
- continue;
- }
- $profile = self::fetchprofile($term['url']);
- if (!empty($profile)) {
- $target = defaults($profile, 'sharedinbox', $profile['inbox']);
- $inboxes[$target] = $target;
- }
- }
- } else {
- $receiver_list = Item::enumeratePermissions($item);
- $mentioned = [];
+ return $data;
+ }
- foreach ($terms as $term) {
- if ($term['type'] != TERM_MENTION) {
- continue;
- }
- $cid = Contact::getIdForURL($term['url'], $uid);
- if (!empty($cid) && in_array($cid, $receiver_list)) {
- $contact = DBA::selectFirst('contact', ['url'], ['id' => $cid, 'network' => Protocol::ACTIVITYPUB]);
- $profile = self::fetchprofile($contact['url']);
+ public static function fetchTargetInboxes($item, $uid)
+ {
+ $permissions = self::createPermissionBlockForItem($item);
+ if (empty($permissions)) {
+ return [];
+ }
+
+ $inboxes = [];
+
+ $item_profile = ActivityPub::fetchprofile($item['owner-link']);
+
+ $elements = ['to', 'cc', 'bto', 'bcc'];
+ foreach ($elements as $element) {
+ if (empty($permissions[$element])) {
+ continue;
+ }
+ foreach ($permissions[$element] as $receiver) {
+ if ($receiver == $item_profile['followers']) {
+ $contacts = DBA::select('contact', ['notify', 'batch'], ['uid' => $uid,
+ 'rel' => [Contact::FOLLOWER, Contact::FRIEND], 'network' => Protocol::ACTIVITYPUB]);
+ while ($contact = DBA::fetch($contacts)) {
+ $contact = defaults($contact, 'batch', $contact['notify']);
+ $inboxes[$contact] = $contact;
+ }
+ DBA::close($contacts);
+ } else {
+ $profile = self::fetchprofile($receiver);
if (!empty($profile)) {
$target = defaults($profile, 'sharedinbox', $profile['inbox']);
$inboxes[$target] = $target;
}
}
}
-
- foreach ($receiver_list as $receiver) {
- $contact = DBA::selectFirst('contact', ['url'], ['id' => $receiver, 'network' => Protocol::ACTIVITYPUB]);
- $profile = self::fetchprofile($contact['url']);
- if (!empty($profile)) {
- $target = defaults($profile, 'sharedinbox', $profile['inbox']);
- $inboxes[$target] = $target;
- }
- }
}
- $profile = self::fetchprofile($item['author-link']);
- if (!empty($profile['sharedinbox'])) {
- unset($inboxes[$profile['sharedinbox']]);
+ if (!empty($item_profile['sharedinbox'])) {
+ unset($inboxes[$item_profile['sharedinbox']]);
}
- if (!empty($profile['inbox'])) {
- unset($inboxes[$profile['inbox']]);
+ if (!empty($item_profile['inbox'])) {
+ unset($inboxes[$item_profile['inbox']]);
}
return $inboxes;
$data['updated'] = DateTimeFormat::utc($item["edited"]."+00:00", DateTimeFormat::ATOM);
}
+ $data['context_id'] = $item['parent'];
+ $data['context'] = self::createConversationURLFromItem($item);
+
$data = array_merge($data, ActivityPub::createPermissionBlockForItem($item));
- $data['object'] = self::createNote($item);
+ $data['object'] = self::createObjectTypeFromItem($item);
$owner = User::getOwnerDataById($item['uid']);
'conversation' => 'ostatus:conversation',
'inReplyToAtomUri' => 'ostatus:inReplyToAtomUri']]];
- $data = array_merge($data, self::createNote($item));
+ $data = array_merge($data, self::createObjectTypeFromItem($item));
return $data;
$tags[] = ['type' => 'Mention', 'href' => $term['url'], 'name' => $mention];
}
}
-
return $tags;
}
- public static function createNote($item)
+ private static function createConversationURLFromItem($item)
{
+ $conversation = DBA::selectFirst('conversation', ['conversation-uri'], ['item-uri' => $item['parent-uri']]);
+ if (DBA::isResult($conversation) && !empty($conversation['conversation-uri'])) {
+ $conversation_uri = $conversation['conversation-uri'];
+ } else {
+ $conversation_uri = $item['parent-uri'];
+ }
+ return $conversation_uri;
+ }
+
+ private static function createObjectTypeFromItem($item)
+ {
+ if (!empty($item['title'])) {
+ $type = 'Article';
+ } else {
+ $type = 'Note';
+ }
+
$data = [];
$data['id'] = $item['uri'];
- $data['type'] = 'Note';
+ $data['type'] = $type;
$data['summary'] = null; // Ignore by now
if ($item['uri'] != $item['thr-parent']) {
$data['updated'] = DateTimeFormat::utc($item["edited"]."+00:00", DateTimeFormat::ATOM);
}
- $data['url'] = $item['uri'];
+ $data['url'] = $item['plink'];
$data['attributedTo'] = $item['author-link'];
$data['actor'] = $item['author-link'];
$data['sensitive'] = false; // - Query NSFW
-
- $conversation = DBA::selectFirst('conversation', ['conversation-uri'], ['item-uri' => $item['parent-uri']]);
- if (DBA::isResult($conversation) && !empty($conversation['conversation-uri'])) {
- $conversation_uri = $conversation['conversation-uri'];
- } else {
- $conversation_uri = $item['parent-uri'];
- }
-
- $data['conversation'] = $conversation_uri;
+ $data['context_id'] = $item['parent'];
+ $data['conversation'] = $data['context'] = self::createConversationURLFromItem($item);
if (!empty($item['title'])) {
$data['name'] = BBCode::convert($item['title'], false, 7);
if (LDSignature::isSigned($activity)) {
$ld_signer = LDSignature::getSigner($activity);
- if (!empty($ld_signer)) {
+ if (!empty($ld_signer && ($actor == $http_signer))) {
+ logger('The HTTP and the JSON-LD signature belong to ' . $ld_signer, LOGGER_DEBUG);
+ $trust_source = true;
+ } elseif (!empty($ld_signer)) {
logger('JSON-LD signature is signed by ' . $ld_signer, LOGGER_DEBUG);
$trust_source = true;
} elseif ($actor == $http_signer) {
logger('Bad JSON-LD signature, but HTTP signer fits the actor.', LOGGER_DEBUG);
$trust_source = true;
} else {
- logger('Invalid JSON-LD signature.', LOGGER_DEBUG);
+ logger('Invalid JSON-LD signature and the HTTP signer is different.', LOGGER_DEBUG);
$trust_source = false;
}
} elseif ($actor == $http_signer) {
return false;
}
logger('Using already stored item for url ' . $object_url, LOGGER_DEBUG);
- $data = self::createNote($item);
+ $data = self::createObjectTypeFromItem($item);
}
if (empty($data['type'])) {
projects / friendica.git / blobdiff