* To-do:
*
* Receiver:
- * - Update Note
- * - Delete Note
- * - Delete Person
+ * - Update (Image, Video, Article, Note)
+ * - Event
* - Undo Announce
- * - Reject Follow
- * - Undo Accept
- * - Undo Follow
+ *
+ * Check what this is meant to do:
* - Add
- * - Create Image
- * - Create Video
- * - Event
- * - Remove
* - Block
* - Flag
+ * - Remove
+ * - Undo Block
+ * - Undo Accept (Problem: This could invert a contact accept or an event accept)
*
* Transmitter:
+ * - Event
+ *
+ * Complicated:
* - Announce
* - Undo Announce
- * - Update Person
- * - Reject Follow
- * - Event
*
* General:
* - Attachments
'diaspora' => 'https://diasporafoundation.org/ns/',
'manuallyApprovesFollowers' => 'as:manuallyApprovesFollowers',
'sensitive' => 'as:sensitive', 'Hashtag' => 'as:Hashtag']];
-
+ const ACCOUNT_TYPES = ['Person', 'Organization', 'Service', 'Group', 'Application'];
+ const CONTENT_TYPES = ['Note', 'Article', 'Video', 'Image'];
+ const ACTIVITY_TYPES = ['Like', 'Dislike', 'Accept', 'Reject', 'TentativeAccept'];
/**
* @brief Checks if the web request is done for the AP protocol
*
$data['totalItems'] = $count;
// When we hide our friends we will only show the pure number but don't allow more.
- $profile = Profile::getProfileForUser($owner['uid']);
+ $profile = Profile::getByUID($owner['uid']);
if (!empty($profile['hide-friends'])) {
return $data;
}
$data['totalItems'] = $count;
// When we hide our friends we will only show the pure number but don't allow more.
- $profile = Profile::getProfileForUser($owner['uid']);
+ $profile = Profile::getByUID($owner['uid']);
if (!empty($profile['hide-friends'])) {
return $data;
}
*/
public static function profile($uid)
{
- $accounttype = ['Person', 'Organization', 'Service', 'Group', 'Application'];
$condition = ['uid' => $uid, 'blocked' => false, 'account_expired' => false,
'account_removed' => false, 'verified' => true];
$fields = ['guid', 'nickname', 'pubkey', 'account-type', 'page-flags'];
$data = ['@context' => self::CONTEXT];
$data['id'] = $contact['url'];
$data['diaspora:guid'] = $user['guid'];
- $data['type'] = $accounttype[$user['account-type']];
+ $data['type'] = self::ACCOUNT_TYPES[$user['account-type']];
$data['following'] = System::baseUrl() . '/following/' . $user['nickname'];
$data['followers'] = System::baseUrl() . '/followers/' . $user['nickname'];
$data['inbox'] = System::baseUrl() . '/inbox/' . $user['nickname'];
$activity = json_decode($conversation['source'], true);
$actor = JsonLD::fetchElement($activity, 'actor', 'id');
- $profile = APContact::getProfileByURL($actor);
+ $profile = APContact::getByURL($actor);
- $item_profile = APContact::getProfileByURL($item['author-link']);
+ $item_profile = APContact::getByURL($item['author-link']);
$exclude[] = $item['author-link'];
if ($item['gravity'] == GRAVITY_PARENT) {
$permissions['to'][] = $actor;
- $elements = ['to', 'cc', 'bto', 'bcc'];
- foreach ($elements as $element) {
+ foreach (['to', 'cc', 'bto', 'bcc'] as $element) {
if (empty($activity[$element])) {
continue;
}
$data = array_merge($data, self::fetchPermissionBlockFromConversation($item));
- $actor_profile = APContact::getProfileByURL($item['author-link']);
+ $actor_profile = APContact::getByURL($item['author-link']);
- $terms = Term::tagArrayFromItemId($item['id']);
+ $terms = Term::tagArrayFromItemId($item['id'], TERM_MENTION);
$contacts[$item['author-link']] = $item['author-link'];
}
foreach ($terms as $term) {
- if ($term['type'] != TERM_MENTION) {
- continue;
- }
- $profile = APContact::getProfileByURL($term['url'], false);
+ $profile = APContact::getByURL($term['url'], false);
if (!empty($profile) && empty($contacts[$profile['url']])) {
$data['cc'][] = $profile['url'];
$contacts[$profile['url']] = $profile['url'];
$mentioned = [];
foreach ($terms as $term) {
- if ($term['type'] != TERM_MENTION) {
- continue;
- }
$cid = Contact::getIdForURL($term['url'], $item['uid']);
if (!empty($cid) && in_array($cid, $receiver_list)) {
$contact = DBA::selectFirst('contact', ['url'], ['id' => $cid, 'network' => Protocol::ACTIVITYPUB]);
continue;
}
- $profile = APContact::getProfileByURL($parent['author-link'], false);
+ $profile = APContact::getByURL($parent['author-link'], false);
if (!empty($profile) && empty($contacts[$profile['url']])) {
$data['cc'][] = $profile['url'];
$contacts[$profile['url']] = $profile['url'];
continue;
}
- $profile = APContact::getProfileByURL($parent['owner-link'], false);
+ $profile = APContact::getByURL($parent['owner-link'], false);
if (!empty($profile) && empty($contacts[$profile['url']])) {
$data['cc'][] = $profile['url'];
$contacts[$profile['url']] = $profile['url'];
return $data;
}
+ /**
+ * @brief Fetches a list of inboxes of followers of a given user
+ *
+ * @param integer $uid User ID
+ *
+ * @return array of follower inboxes
+ */
+ public static function fetchTargetInboxesforUser($uid)
+ {
+ $inboxes = [];
+
+ $condition = ['uid' => $uid, 'network' => Protocol::ACTIVITYPUB, 'archive' => false, 'pending' => false];
+
+ if (!empty($uid)) {
+ $condition['rel'] = [Contact::FOLLOWER, Contact::FRIEND];
+ }
+
+ $contacts = DBA::select('contact', ['notify', 'batch'], $condition);
+ while ($contact = DBA::fetch($contacts)) {
+ $contact = defaults($contact, 'batch', $contact['notify']);
+ $inboxes[$contact] = $contact;
+ }
+ DBA::close($contacts);
+
+ return $inboxes;
+ }
+
/**
* @brief Fetches an array of inboxes for the given item and user
*
$inboxes = [];
if ($item['gravity'] == GRAVITY_ACTIVITY) {
- $item_profile = APContact::getProfileByURL($item['author-link']);
+ $item_profile = APContact::getByURL($item['author-link']);
} else {
- $item_profile = APContact::getProfileByURL($item['owner-link']);
+ $item_profile = APContact::getByURL($item['owner-link']);
}
- $elements = ['to', 'cc', 'bto', 'bcc'];
- foreach ($elements as $element) {
+ foreach (['to', 'cc', 'bto', 'bcc'] 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,
- 'archive' => false, 'pending' => false]);
- while ($contact = DBA::fetch($contacts)) {
- $contact = defaults($contact, 'batch', $contact['notify']);
- $inboxes[$contact] = $contact;
- }
- DBA::close($contacts);
+ $inboxes = self::fetchTargetInboxesforUser($uid);
} else {
- $profile = APContact::getProfileByURL($receiver);
+ $profile = APContact::getByURL($receiver);
if (!empty($profile)) {
$target = defaults($profile, 'sharedinbox', $profile['inbox']);
$inboxes[$target] = $target;
{
$tags = [];
- $terms = Term::tagArrayFromItemId($item['id']);
+ $terms = Term::tagArrayFromItemId($item['id'], TERM_MENTION);
foreach ($terms as $term) {
- if ($term['type'] == TERM_MENTION) {
- $contact = Contact::getDetailsByURL($term['url']);
- if (!empty($contact['addr'])) {
- $mention = '@' . $contact['addr'];
- } else {
- $mention = '@' . $term['url'];
- }
-
- $tags[] = ['type' => 'Mention', 'href' => $term['url'], 'name' => $mention];
+ $contact = Contact::getDetailsByURL($term['url']);
+ if (!empty($contact['addr'])) {
+ $mention = '@' . $contact['addr'];
+ } else {
+ $mention = '@' . $term['url'];
}
+
+ $tags[] = ['type' => 'Mention', 'href' => $term['url'], 'name' => $mention];
}
return $tags;
}
} elseif (DBA::isResult($conversation) && !empty($conversation['conversation-uri'])) {
$context_uri = $conversation['conversation-uri'];
} else {
- $context_uri = str_replace('/object/', '/context/', $item['parent-uri']);
+ $context_uri = str_replace('/objects/', '/context/', $item['parent-uri']);
}
return $context_uri;
}
return $data;
}
+ /**
+ * @brief Transmits a profile deletion to a given inbox
+ *
+ * @param integer $uid User ID
+ * @param string $inbox Target inbox
+ */
+ public static function transmitProfileDeletion($uid, $inbox)
+ {
+ $owner = User::getOwnerDataById($uid);
+ $profile = APContact::getByURL($owner['url']);
+
+ $data = ['@context' => 'https://www.w3.org/ns/activitystreams',
+ 'id' => System::baseUrl() . '/activity/' . System::createGUID(),
+ 'type' => 'Delete',
+ 'actor' => $owner['url'],
+ 'object' => self::profile($uid),
+ 'published' => DateTimeFormat::utcNow(DateTimeFormat::ATOM),
+ 'to' => [self::PUBLIC_COLLECTION],
+ 'cc' => []];
+
+ $signed = LDSignature::sign($data, $owner);
+
+ logger('Deliver profile deletion for user ' . $uid . ' to ' . $inbox .' via ActivityPub', LOGGER_DEBUG);
+ HTTPSignature::transmit($signed, $inbox, $uid);
+ }
+
+ /**
+ * @brief Transmits a profile change to a given inbox
+ *
+ * @param integer $uid User ID
+ * @param string $inbox Target inbox
+ */
+ public static function transmitProfileUpdate($uid, $inbox)
+ {
+ $owner = User::getOwnerDataById($uid);
+ $profile = APContact::getByURL($owner['url']);
+
+ $data = ['@context' => 'https://www.w3.org/ns/activitystreams',
+ 'id' => System::baseUrl() . '/activity/' . System::createGUID(),
+ 'type' => 'Update',
+ 'actor' => $owner['url'],
+ 'object' => self::profile($uid),
+ 'published' => DateTimeFormat::utcNow(DateTimeFormat::ATOM),
+ 'to' => [$profile['followers']],
+ 'cc' => []];
+
+ $signed = LDSignature::sign($data, $owner);
+
+ logger('Deliver profile update for user ' . $uid . ' to ' . $inbox .' via ActivityPub', LOGGER_DEBUG);
+ HTTPSignature::transmit($signed, $inbox, $uid);
+ }
+
/**
* @brief Transmits a given activity to a target
*
*/
public static function transmitActivity($activity, $target, $uid)
{
- $profile = APContact::getProfileByURL($target);
+ $profile = APContact::getByURL($target);
$owner = User::getOwnerDataById($uid);
*/
public static function transmitContactAccept($target, $id, $uid)
{
- $profile = APContact::getProfileByURL($target);
+ $profile = APContact::getByURL($target);
$owner = User::getOwnerDataById($uid);
$data = ['@context' => 'https://www.w3.org/ns/activitystreams',
*/
public static function transmitContactReject($target, $id, $uid)
{
- $profile = APContact::getProfileByURL($target);
+ $profile = APContact::getByURL($target);
$owner = User::getOwnerDataById($uid);
$data = ['@context' => 'https://www.w3.org/ns/activitystreams',
*/
public static function transmitContactUndo($target, $uid)
{
- $profile = APContact::getProfileByURL($target);
+ $profile = APContact::getByURL($target);
$id = System::baseUrl() . '/activity/' . System::createGUID();
{
$ret = Network::curl($url, false, $redirects, ['accept_content' => 'application/activity+json, application/ld+json']);
if (!$ret['success'] || empty($ret['body'])) {
- return;
+ return false;
}
+
return json_decode($ret['body'], true);
}
*/
public static function probeProfile($url)
{
- $apcontact = APContact::getProfileByURL($url, true);
+ $apcontact = APContact::getByURL($url, true);
if (empty($apcontact)) {
return false;
}
break;
case 'Update':
- if (in_array($object_data['object_type'], ['Person', 'Organization', 'Service', 'Group', 'Application'])) {
+ if (in_array($object_data['object_type'], self::CONTENT_TYPES)) {
+ /// @todo
+ } elseif (in_array($object_data['object_type'], self::ACCOUNT_TYPES)) {
self::updatePerson($object_data, $body);
}
break;
case 'Delete':
+ if ($object_data['object_type'] == 'Tombstone') {
+ self::deleteItem($object_data, $body);
+ } elseif (in_array($object_data['object_type'], self::ACCOUNT_TYPES)) {
+ self::deletePerson($object_data, $body);
+ }
break;
case 'Follow':
}
break;
+ case 'Reject':
+ if ($object_data['object_type'] == 'Follow') {
+ self::rejectFollowUser($object_data);
+ }
+ break;
+
case 'Undo':
if ($object_data['object_type'] == 'Follow') {
self::undoFollowUser($object_data);
- } elseif (in_array($object_data['object_type'], ['Like', 'Dislike', 'Accept', 'Reject', 'TentativeAccept'])) {
+ } elseif (in_array($object_data['object_type'], self::ACTIVITY_TYPES)) {
self::undoActivity($object_data);
}
break;
}
if (!empty($actor)) {
- $profile = APContact::getProfileByURL($actor);
+ $profile = APContact::getByURL($actor);
$followers = defaults($profile, 'followers', '');
logger('Actor: ' . $actor . ' - Followers: ' . $followers, LOGGER_DEBUG);
$followers = '';
}
- $elements = ['to', 'cc', 'bto', 'bcc'];
- foreach ($elements as $element) {
+ foreach (['to', 'cc', 'bto', 'bcc'] as $element) {
if (empty($activity[$element])) {
continue;
}
- // The receiver can be an arror or a string
+ // The receiver can be an array or a string
if (is_string($activity[$element])) {
$activity[$element] = [$activity[$element]];
}
return false;
}
- switch ($data['type']) {
- case 'Note':
- case 'Article':
- case 'Video':
- return self::processObject($data);
-
- case 'Announce':
- if (empty($data['object'])) {
- return false;
- }
- return self::fetchObject($data['object']);
-
- case 'Person':
- case 'Tombstone':
- break;
+ if (in_array($data['type'], self::CONTENT_TYPES)) {
+ return self::processObject($data);
+ }
- default:
- logger('Unknown object type: ' . $data['type'], LOGGER_DEBUG);
- break;
+ if ($data['type'] == 'Announce') {
+ if (empty($data['object'])) {
+ return false;
+ }
+ return self::fetchObject($data['object']);
}
+
+ logger('Unhandled object type: ' . $data['type'], LOGGER_DEBUG);
}
/**
*
* @return
*/
- private static function processObject(&$object)
+ private static function processObject($object)
{
if (empty($object['id'])) {
return false;
self::postItem($activity, $item, $body);
}
+ /**
+ * @brief Delete items
+ *
+ * @param array $activity
+ * @param $body
+ */
+ private static function deleteItem($activity)
+ {
+ $owner = Contact::getIdForURL($activity['owner']);
+ $object = JsonLD::fetchElement($activity, 'object', 'id');
+ logger('Deleting item ' . $object . ' from ' . $owner, LOGGER_DEBUG);
+ Item::delete(['uri' => $object, 'owner-id' => $owner]);
+ }
+
/**
* @brief
*
}
logger('Updating profile for ' . $activity['object']['id'], LOGGER_DEBUG);
- APContact::getProfileByURL($activity['object']['id'], true);
+ APContact::getByURL($activity['object']['id'], true);
+ }
+
+ /**
+ * @brief Delete the given profile
+ *
+ * @param array $activity
+ */
+ private static function deletePerson($activity)
+ {
+ if (empty($activity['object']['id']) || empty($activity['object']['actor'])) {
+ logger('Empty object id or actor.', LOGGER_DEBUG);
+ return;
+ }
+
+ if ($activity['object']['id'] != $activity['object']['actor']) {
+ logger('Object id does not match actor.', LOGGER_DEBUG);
+ return;
+ }
+
+ $contacts = DBA::select('contact', ['id'], ['nurl' => normalise_link($activity['object']['id'])]);
+ while ($contact = DBA::fetch($contacts)) {
+ Contact::remove($contact["id"]);
+ }
+ DBA::close($contacts);
+
+ logger('Deleted contact ' . $activity['object']['id'], LOGGER_DEBUG);
}
/**
logger('Accept contact request from contact ' . $cid . ' for user ' . $uid, LOGGER_DEBUG);
}
+ /**
+ * @brief Reject a follow request
+ *
+ * @param array $activity
+ */
+ private static function rejectFollowUser($activity)
+ {
+ $actor = JsonLD::fetchElement($activity, 'object', 'actor');
+ $uid = User::getIdForURL($actor);
+ if (empty($uid)) {
+ return;
+ }
+
+ $owner = User::getOwnerDataById($uid);
+
+ $cid = Contact::getIdForURL($activity['owner'], $uid);
+ if (empty($cid)) {
+ logger('No contact found for ' . $activity['owner'], LOGGER_DEBUG);
+ return;
+ }
+
+ if (DBA::exists('contact', ['id' => $cid, 'rel' => Contact::SHARING, 'pending' => true])) {
+ Contact::remove($cid);
+ logger('Rejected contact request from contact ' . $cid . ' for user ' . $uid . ' - contact had been removed.', LOGGER_DEBUG);
+ } else {
+ logger('Rejected contact request from contact ' . $cid . ' for user ' . $uid . '.', LOGGER_DEBUG);
+ }
+ }
+
/**
* @brief Undo activity like "like" or "dislike"
*
projects / friendica.git / blobdiff