*/
namespace Friendica\Protocol\ActivityPub;
+use Friendica\BaseObject;
use Friendica\Database\DBA;
+use Friendica\Core\Logger;
use Friendica\Core\System;
use Friendica\Util\HTTPSignature;
use Friendica\Core\Protocol;
use Friendica\Core\Config;
use Friendica\Object\Image;
use Friendica\Protocol\ActivityPub;
+use Friendica\Protocol\Diaspora;
use Friendica\Core\Cache;
+use Friendica\Util\Map;
+use Friendica\Util\Network;
+
+require_once 'include/api.php';
/**
* @brief ActivityPub Transmitter Protocol class
*
* To-Do:
- *
- * Missing object fields:
- * - service (App)
- * - location
- *
- * Missing object types:
- * - Event
- *
- * Complicated object types:
- * - Announce
* - Undo Announce
- *
- * General:
- * - Queueing unsucessful deliveries
*/
class Transmitter
{
{
$public_contact = Contact::getIdForURL($owner['url'], 0, true);
- $condition = ['uid' => $owner['uid'], 'contact-id' => $owner['id'], 'author-id' => $public_contact,
- 'wall' => true, 'private' => false, 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT],
+ $condition = ['uid' => 0, 'contact-id' => $public_contact, 'author-id' => $public_contact,
+ 'private' => false, 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT],
'deleted' => false, 'visible' => true];
$count = DBA::count('item', $condition);
foreach ($activity[$element] as $receiver) {
if ($receiver == $profile['followers'] && !empty($item_profile['followers'])) {
- $receiver = $item_profile['followers'];
- }
- if (!in_array($receiver, $exclude)) {
+ $permissions[$element][] = $item_profile['followers'];
+ } elseif (!in_array($receiver, $exclude)) {
$permissions[$element][] = $receiver;
}
}
* Creates an array of permissions from an item thread
*
* @param array $item
+ * @param boolean $blindcopy
*
* @return array with permission data
*/
- private static function createPermissionBlockForItem($item)
+ private static function createPermissionBlockForItem($item, $blindcopy)
{
- $data = ['to' => [], 'cc' => []];
+ // 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];
- $data = array_merge($data, self::fetchPermissionBlockFromConversation($item));
+ $data = ['to' => [], 'cc' => [], 'bcc' => []];
$actor_profile = APContact::getByURL($item['author-link']);
$terms = Term::tagArrayFromItemId($item['id'], TERM_MENTION);
- $contacts[$item['author-link']] = $item['author-link'];
-
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);
- if (!empty($profile) && empty($contacts[$profile['url']])) {
- $data['cc'][] = $profile['url'];
- $contacts[$profile['url']] = $profile['url'];
+ if (!empty($profile)) {
+ $data['to'][] = $profile['url'];
}
}
} else {
foreach ($terms as $term) {
$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]);
- $data['to'][] = $contact['url'];
- $contacts[$contact['url']] = $contact['url'];
+ $contact = DBA::selectFirst('contact', ['url'], ['id' => $cid, 'network' => $networks]);
+ if (DBA::isResult($contact) && !empty($profile = APContact::getByURL($contact['url'], false))) {
+ $data['to'][] = $profile['url'];
+ }
}
}
foreach ($receiver_list as $receiver) {
- $contact = DBA::selectFirst('contact', ['url'], ['id' => $receiver, 'network' => Protocol::ACTIVITYPUB]);
- if (empty($contacts[$contact['url']])) {
- $data['cc'][] = $contact['url'];
- $contacts[$contact['url']] = $contact['url'];
+ $contact = DBA::selectFirst('contact', ['url'], ['id' => $receiver, 'network' => $networks]);
+ if (DBA::isResult($contact) && !empty($profile = APContact::getByURL($contact['url'], false))) {
+ // BCC is currently deactivated, due to Pleroma and Mastodon not reacting like expected
+ // $data['bcc'][] = $profile['url'];
+ $data['cc'][] = $profile['url'];
}
}
}
- $parents = Item::select(['id', 'author-link', 'owner-link', 'gravity'], ['parent' => $item['parent']]);
+ $parents = Item::select(['id', 'author-link', 'owner-link', 'gravity', 'uri'], ['parent' => $item['parent']]);
while ($parent = Item::fetch($parents)) {
// Don't include data from future posts
if ($parent['id'] >= $item['id']) {
}
$profile = APContact::getByURL($parent['author-link'], false);
- if (!empty($profile) && empty($contacts[$profile['url']])) {
- $data['cc'][] = $profile['url'];
- $contacts[$profile['url']] = $profile['url'];
+ if (!empty($profile)) {
+ if ($parent['uri'] == $item['thr-parent']) {
+ $data['to'][] = $profile['url'];
+ } else {
+ $data['cc'][] = $profile['url'];
+ }
}
if ($item['gravity'] != GRAVITY_PARENT) {
}
$profile = APContact::getByURL($parent['owner-link'], false);
- if (!empty($profile) && empty($contacts[$profile['url']])) {
+ if (!empty($profile)) {
$data['cc'][] = $profile['url'];
- $contacts[$profile['url']] = $profile['url'];
}
}
DBA::close($parents);
- if (empty($data['to'])) {
- $data['to'] = $data['cc'];
- $data['cc'] = [];
+ $data['to'] = array_unique($data['to']);
+ $data['cc'] = array_unique($data['cc']);
+ $data['bcc'] = array_unique($data['bcc']);
+
+ if (($key = array_search($item['author-link'], $data['to'])) !== false) {
+ unset($data['to'][$key]);
}
- return $data;
+ if (($key = array_search($item['author-link'], $data['cc'])) !== false) {
+ unset($data['cc'][$key]);
+ }
+
+ if (($key = array_search($item['author-link'], $data['bcc'])) !== false) {
+ unset($data['bcc'][$key]);
+ }
+
+ foreach ($data['to'] as $to) {
+ if (($key = array_search($to, $data['cc'])) !== false) {
+ unset($data['cc'][$key]);
+ }
+
+ if (($key = array_search($to, $data['bcc'])) !== false) {
+ unset($data['bcc'][$key]);
+ }
+ }
+
+ foreach ($data['cc'] as $cc) {
+ if (($key = array_search($cc, $data['bcc'])) !== false) {
+ unset($data['bcc'][$key]);
+ }
+ }
+
+ $receivers = ['to' => array_values($data['to']), 'cc' => array_values($data['cc']), 'bcc' => array_values($data['bcc'])];
+
+ if (!$blindcopy) {
+ unset($receivers['bcc']);
+ }
+
+ return $receivers;
}
/**
* Fetches a list of inboxes of followers of a given user
*
* @param integer $uid User ID
+ * @param boolean $personal fetch personal inboxes
*
* @return array of follower inboxes
*/
- public static function fetchTargetInboxesforUser($uid)
+ public static function fetchTargetInboxesforUser($uid, $personal = false)
{
$inboxes = [];
- $condition = ['uid' => $uid, 'network' => Protocol::ACTIVITYPUB, 'archive' => false, 'pending' => false];
+ // 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];
+
+ $condition = ['uid' => $uid, 'network' => $networks, 'archive' => false, 'pending' => false];
if (!empty($uid)) {
$condition['rel'] = [Contact::FOLLOWER, Contact::FRIEND];
}
- $contacts = DBA::select('contact', ['notify', 'batch'], $condition);
+ $contacts = DBA::select('contact', ['url'], $condition);
while ($contact = DBA::fetch($contacts)) {
- $contact = defaults($contact, 'batch', $contact['notify']);
- $inboxes[$contact] = $contact;
+ if (Network::isUrlBlocked($contact['url'])) {
+ continue;
+ }
+
+ $profile = APContact::getByURL($contact['url'], false);
+ if (!empty($profile)) {
+ if (empty($profile['sharedinbox']) || $personal) {
+ $target = $profile['inbox'];
+ } else {
+ $target = $profile['sharedinbox'];
+ }
+ $inboxes[$target] = $target;
+ }
}
DBA::close($contacts);
*
* @param array $item
* @param integer $uid User ID
+ * @param boolean $personal fetch personal inboxes
*
* @return array with inboxes
*/
- public static function fetchTargetInboxes($item, $uid)
+ public static function fetchTargetInboxes($item, $uid, $personal = false)
{
- $permissions = self::createPermissionBlockForItem($item);
+ $permissions = self::createPermissionBlockForItem($item, true);
if (empty($permissions)) {
return [];
}
$inboxes = [];
if ($item['gravity'] == GRAVITY_ACTIVITY) {
- $item_profile = APContact::getByURL($item['author-link']);
+ $item_profile = APContact::getByURL($item['author-link'], false);
} else {
- $item_profile = APContact::getByURL($item['owner-link']);
+ $item_profile = APContact::getByURL($item['owner-link'], false);
}
foreach (['to', 'cc', 'bto', 'bcc'] as $element) {
continue;
}
+ $blindcopy = in_array($element, ['bto', 'bcc']);
+
foreach ($permissions[$element] as $receiver) {
+ if (Network::isUrlBlocked($receiver)) {
+ continue;
+ }
+
if ($receiver == $item_profile['followers']) {
- $inboxes = self::fetchTargetInboxesforUser($uid);
+ $inboxes = array_merge($inboxes, self::fetchTargetInboxesforUser($uid, $personal));
} else {
- $profile = APContact::getByURL($receiver);
+ $profile = APContact::getByURL($receiver, false);
if (!empty($profile)) {
- $target = defaults($profile, 'sharedinbox', $profile['inbox']);
+ if (empty($profile['sharedinbox']) || $personal || $blindcopy) {
+ $target = $profile['inbox'];
+ } else {
+ $target = $profile['sharedinbox'];
+ }
$inboxes[$target] = $target;
}
}
*/
private static function getTypeOfItem($item)
{
- if ($item['verb'] == ACTIVITY_POST) {
+ if (!empty(Diaspora::isReshare($item['body'], false))) {
+ $type = 'Announce';
+ } elseif ($item['verb'] == ACTIVITY_POST) {
if ($item['created'] == $item['edited']) {
$type = 'Create';
} else {
* Creates the activity or fetches it from the cache
*
* @param integer $item_id
+ * @param boolean $force Force new cache entry
*
* @return array with the activity
*/
- public static function createCachedActivityFromItem($item_id)
+ public static function createCachedActivityFromItem($item_id, $force = false)
{
$cachekey = 'APDelivery:createActivity:' . $item_id;
- $data = Cache::get($cachekey);
- if (!is_null($data)) {
- return $data;
+
+ if (!$force) {
+ $data = Cache::get($cachekey);
+ if (!is_null($data)) {
+ return $data;
+ }
}
$data = ActivityPub\Transmitter::createActivityFromItem($item_id);
- Cache::set($cachekey, $data, CACHE_QUARTER_HOUR);
+ Cache::set($cachekey, $data, Cache::QUARTER_HOUR);
return $data;
}
$data['published'] = DateTimeFormat::utc($item['created'] . '+00:00', DateTimeFormat::ATOM);
- $data = array_merge($data, self::createPermissionBlockForItem($item));
+ $data['instrument'] = ['type' => 'Service', 'name' => BaseObject::getApp()->getUserAgent()];
+
+ $data = array_merge($data, self::createPermissionBlockForItem($item, false));
- if (in_array($data['type'], ['Create', 'Update', 'Announce', 'Delete'])) {
+ if (in_array($data['type'], ['Create', 'Update', 'Delete'])) {
$data['object'] = self::createNote($item);
+ } elseif ($data['type'] == 'Announce') {
+ $data['object'] = self::createAnnounce($item);
} elseif ($data['type'] == 'Undo') {
$data['object'] = self::createActivityFromItem($item_id, true);
} else {
$data['diaspora:guid'] = $item['guid'];
+ if (!empty($item['signed_text'])) {
+ $data['diaspora:like'] = $item['signed_text'];
+ }
$data['object'] = $item['thr-parent'];
}
- $owner = User::getOwnerDataById($item['uid']);
+ $owner = User::getOwnerDataById($item['contact-uid']);
if (!$object_mode) {
return LDSignature::sign($data, $owner);
return $data;
}
+ /**
+ * Creates a location entry for a given item array
+ *
+ * @param array $item
+ *
+ * @return array with location array
+ */
+ private static function createLocation($item)
+ {
+ $location = ['type' => 'Place'];
+
+ if (!empty($item['location'])) {
+ $location['name'] = $item['location'];
+ }
+
+ $coord = [];
+
+ if (empty($item['coord'])) {
+ $coord = Map::getCoordinates($item['location']);
+ } else {
+ $coords = explode(' ', $item['coord']);
+ if (count($coords) == 2) {
+ $coord = ['lat' => $coords[0], 'lon' => $coords[1]];
+ }
+ }
+
+ if (!empty($coord['lat']) && !empty($coord['lon'])) {
+ $location['latitude'] = $coord['lat'];
+ $location['longitude'] = $coord['lon'];
+ }
+
+ return $location;
+ }
+
/**
* Returns a tag array for a given item array
*
return $attachments;
}
+ /**
+ * @brief Callback function to replace a Friendica style mention in a mention that is used on AP
+ *
+ * @param array $match Matching values for the callback
+ * @return string Replaced mention
+ */
+ private static function mentionCallback($match)
+ {
+ if (empty($match[1])) {
+ return;
+ }
+
+ $data = Contact::getDetailsByURL($match[1]);
+ if (empty($data) || empty($data['nick'])) {
+ return;
+ }
+
+ return '@[url=' . $data['url'] . ']' . $data['nick'] . '[/url]';
+ }
+
/**
* Remove image elements and replaces them with links to the image
*
return DBA::exists('term', $condition);
}
+ /**
+ * Creates event data
+ *
+ * @param array $item
+ *
+ * @return array with the event data
+ */
+ public static function createEvent($item)
+ {
+ $event = [];
+ $event['name'] = $item['event-summary'];
+ $event['content'] = BBCode::convert($item['event-desc'], false, 7);
+ $event['startTime'] = DateTimeFormat::utc($item['event-start'] . '+00:00', DateTimeFormat::ATOM);
+
+ if (!$item['event-nofinish']) {
+ $event['endTime'] = DateTimeFormat::utc($item['event-finish'] . '+00:00', DateTimeFormat::ATOM);
+ }
+
+ if (!empty($item['event-location'])) {
+ $item['location'] = $item['event-location'];
+ $event['location'] = self::createLocation($item);
+ }
+
+ return $event;
+ }
+
/**
* Creates a note/article object array
*
*/
public static function createNote($item)
{
- if (!empty($item['title'])) {
+ if ($item['event-type'] == 'event') {
+ $type = 'Event';
+ } elseif (!empty($item['title'])) {
$type = 'Article';
} else {
$type = 'Note';
$body = self::removePictures($body);
}
- $data['content'] = BBCode::convert($body, false, 7);
+ if ($type == 'Event') {
+ $data = array_merge($data, self::createEvent($item));
+ } else {
+ $regexp = "/[@!]\[url\=([^\[\]]*)\].*?\[\/url\]/ism";
+ $body = preg_replace_callback($regexp, ['self', 'mentionCallback'], $body);
+
+ $data['content'] = BBCode::convert($body, false, 7);
+ }
+
$data['source'] = ['content' => $item['body'], 'mediaType' => "text/bbcode"];
if (!empty($item['signed_text']) && ($item['uri'] != $item['thr-parent'])) {
$data['attachment'] = self::createAttachmentList($item, $type);
$data['tag'] = self::createTagList($item);
- $data = array_merge($data, self::createPermissionBlockForItem($item));
+
+ if (empty($data['location']) && (!empty($item['coord']) || !empty($item['location']))) {
+ $data['location'] = self::createLocation($item);
+ }
+
+ if (!empty($item['app'])) {
+ $data['generator'] = ['type' => 'Application', 'name' => $item['app']];
+ }
+
+ $data = array_merge($data, self::createPermissionBlockForItem($item, false));
return $data;
}
+ /**
+ * Creates an announce object entry
+ *
+ * @param array $item
+ *
+ * @return string with announced object url
+ */
+ public static function createAnnounce($item)
+ {
+ $announce = api_share_as_retweet($item);
+ if (empty($announce['plink'])) {
+ return self::createNote($item);
+ }
+
+ return $announce['plink'];
+ }
+
/**
* Transmits a contact suggestion to a given inbox
*
* @param integer $uid User ID
* @param string $inbox Target inbox
* @param integer $suggestion_id Suggestion ID
+ *
+ * @return boolean was the transmission successful?
*/
public static function sendContactSuggestion($uid, $inbox, $suggestion_id)
{
$owner = User::getOwnerDataById($uid);
- $profile = APContact::getByURL($owner['url']);
$suggestion = DBA::selectFirst('fsuggest', ['url', 'note', 'created'], ['id' => $suggestion_id]);
- $data = ['@context' => 'https://www.w3.org/ns/activitystreams',
+ $data = ['@context' => ActivityPub::CONTEXT,
'id' => System::baseUrl() . '/activity/' . System::createGUID(),
'type' => 'Announce',
'actor' => $owner['url'],
'object' => $suggestion['url'],
'content' => $suggestion['note'],
- 'published' => DateTimeFormat::utc($suggestion['created'] . '+00:00', DateTimeFormat::ATOM),
+ 'instrument' => ['type' => 'Service', 'name' => BaseObject::getApp()->getUserAgent()],
'to' => [ActivityPub::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);
+ Logger::log('Deliver profile deletion for user ' . $uid . ' to ' . $inbox . ' via ActivityPub', Logger::DEBUG);
+ return HTTPSignature::transmit($signed, $inbox, $uid);
+ }
+
+ /**
+ * Transmits a profile relocation to a given inbox
+ *
+ * @param integer $uid User ID
+ * @param string $inbox Target inbox
+ *
+ * @return boolean was the transmission successful?
+ */
+ public static function sendProfileRelocation($uid, $inbox)
+ {
+ $owner = User::getOwnerDataById($uid);
+
+ $data = ['@context' => ActivityPub::CONTEXT,
+ 'id' => System::baseUrl() . '/activity/' . System::createGUID(),
+ 'type' => 'dfrn:relocate',
+ 'actor' => $owner['url'],
+ 'object' => $owner['url'],
+ 'published' => DateTimeFormat::utcNow(DateTimeFormat::ATOM),
+ 'instrument' => ['type' => 'Service', 'name' => BaseObject::getApp()->getUserAgent()],
+ 'to' => [ActivityPub::PUBLIC_COLLECTION],
+ 'cc' => []];
+
+ $signed = LDSignature::sign($data, $owner);
+
+ Logger::log('Deliver profile relocation for user ' . $uid . ' to ' . $inbox . ' via ActivityPub', Logger::DEBUG);
+ return HTTPSignature::transmit($signed, $inbox, $uid);
}
/**
*
* @param integer $uid User ID
* @param string $inbox Target inbox
+ *
+ * @return boolean was the transmission successful?
*/
public static function sendProfileDeletion($uid, $inbox)
{
$owner = User::getOwnerDataById($uid);
- $profile = APContact::getByURL($owner['url']);
- $data = ['@context' => 'https://www.w3.org/ns/activitystreams',
+ $data = ['@context' => ActivityPub::CONTEXT,
'id' => System::baseUrl() . '/activity/' . System::createGUID(),
'type' => 'Delete',
'actor' => $owner['url'],
'object' => $owner['url'],
'published' => DateTimeFormat::utcNow(DateTimeFormat::ATOM),
+ 'instrument' => ['type' => 'Service', 'name' => BaseObject::getApp()->getUserAgent()],
'to' => [ActivityPub::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);
+ Logger::log('Deliver profile deletion for user ' . $uid . ' to ' . $inbox . ' via ActivityPub', Logger::DEBUG);
+ return HTTPSignature::transmit($signed, $inbox, $uid);
}
/**
*
* @param integer $uid User ID
* @param string $inbox Target inbox
+ *
+ * @return boolean was the transmission successful?
*/
public static function sendProfileUpdate($uid, $inbox)
{
$owner = User::getOwnerDataById($uid);
$profile = APContact::getByURL($owner['url']);
- $data = ['@context' => 'https://www.w3.org/ns/activitystreams',
+ $data = ['@context' => ActivityPub::CONTEXT,
'id' => System::baseUrl() . '/activity/' . System::createGUID(),
'type' => 'Update',
'actor' => $owner['url'],
'object' => self::getProfile($uid),
'published' => DateTimeFormat::utcNow(DateTimeFormat::ATOM),
+ 'instrument' => ['type' => 'Service', 'name' => BaseObject::getApp()->getUserAgent()],
'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);
+ Logger::log('Deliver profile update for user ' . $uid . ' to ' . $inbox . ' via ActivityPub', Logger::DEBUG);
+ return HTTPSignature::transmit($signed, $inbox, $uid);
}
/**
$owner = User::getOwnerDataById($uid);
- $data = ['@context' => 'https://www.w3.org/ns/activitystreams',
+ $data = ['@context' => ActivityPub::CONTEXT,
'id' => System::baseUrl() . '/activity/' . System::createGUID(),
'type' => $activity,
'actor' => $owner['url'],
'object' => $profile['url'],
+ 'instrument' => ['type' => 'Service', 'name' => BaseObject::getApp()->getUserAgent()],
'to' => $profile['url']];
- logger('Sending activity ' . $activity . ' to ' . $target . ' for user ' . $uid, LOGGER_DEBUG);
+ Logger::log('Sending activity ' . $activity . ' to ' . $target . ' for user ' . $uid, Logger::DEBUG);
$signed = LDSignature::sign($data, $owner);
HTTPSignature::transmit($signed, $profile['inbox'], $uid);
$profile = APContact::getByURL($target);
$owner = User::getOwnerDataById($uid);
- $data = ['@context' => 'https://www.w3.org/ns/activitystreams',
+ $data = ['@context' => ActivityPub::CONTEXT,
'id' => System::baseUrl() . '/activity/' . System::createGUID(),
'type' => 'Accept',
'actor' => $owner['url'],
'object' => ['id' => $id, 'type' => 'Follow',
'actor' => $profile['url'],
'object' => $owner['url']],
+ 'instrument' => ['type' => 'Service', 'name' => BaseObject::getApp()->getUserAgent()],
'to' => $profile['url']];
- logger('Sending accept to ' . $target . ' for user ' . $uid . ' with id ' . $id, LOGGER_DEBUG);
+ Logger::log('Sending accept to ' . $target . ' for user ' . $uid . ' with id ' . $id, Logger::DEBUG);
$signed = LDSignature::sign($data, $owner);
HTTPSignature::transmit($signed, $profile['inbox'], $uid);
$profile = APContact::getByURL($target);
$owner = User::getOwnerDataById($uid);
- $data = ['@context' => 'https://www.w3.org/ns/activitystreams',
+ $data = ['@context' => ActivityPub::CONTEXT,
'id' => System::baseUrl() . '/activity/' . System::createGUID(),
'type' => 'Reject',
'actor' => $owner['url'],
'object' => ['id' => $id, 'type' => 'Follow',
'actor' => $profile['url'],
'object' => $owner['url']],
+ 'instrument' => ['type' => 'Service', 'name' => BaseObject::getApp()->getUserAgent()],
'to' => $profile['url']];
- logger('Sending reject to ' . $target . ' for user ' . $uid . ' with id ' . $id, LOGGER_DEBUG);
+ Logger::log('Sending reject to ' . $target . ' for user ' . $uid . ' with id ' . $id, Logger::DEBUG);
$signed = LDSignature::sign($data, $owner);
HTTPSignature::transmit($signed, $profile['inbox'], $uid);
$id = System::baseUrl() . '/activity/' . System::createGUID();
$owner = User::getOwnerDataById($uid);
- $data = ['@context' => 'https://www.w3.org/ns/activitystreams',
+ $data = ['@context' => ActivityPub::CONTEXT,
'id' => $id,
'type' => 'Undo',
'actor' => $owner['url'],
'object' => ['id' => $id, 'type' => 'Follow',
'actor' => $owner['url'],
'object' => $profile['url']],
+ 'instrument' => ['type' => 'Service', 'name' => BaseObject::getApp()->getUserAgent()],
'to' => $profile['url']];
- logger('Sending undo to ' . $target . ' for user ' . $uid . ' with id ' . $id, LOGGER_DEBUG);
+ Logger::log('Sending undo to ' . $target . ' for user ' . $uid . ' with id ' . $id, Logger::DEBUG);
$signed = LDSignature::sign($data, $owner);
HTTPSignature::transmit($signed, $profile['inbox'], $uid);
projects / friendica.git / blobdiff