*/
namespace Friendica\Protocol\ActivityPub;
+use Friendica\BaseObject;
use Friendica\Database\DBA;
use Friendica\Core\System;
use Friendica\Util\HTTPSignature;
use Friendica\Core\Config;
use Friendica\Object\Image;
use Friendica\Protocol\ActivityPub;
+use Friendica\Protocol\Diaspora;
use Friendica\Core\Cache;
+use Friendica\Util\Map;
+
+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:
{
$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 ($terms as $term) {
$profile = APContact::getByURL($term['url'], false);
if (!empty($profile) && empty($contacts[$profile['url']])) {
- $data['cc'][] = $profile['url'];
+ $data['to'][] = $profile['url'];
$contacts[$profile['url']] = $profile['url'];
+
+ if (($key = array_search($profile['url'], $data['cc'])) !== false) {
+ unset($data['cc'][$key]);
+ }
}
}
} else {
$contact = DBA::selectFirst('contact', ['url'], ['id' => $cid, 'network' => Protocol::ACTIVITYPUB]);
$data['to'][] = $contact['url'];
$contacts[$contact['url']] = $contact['url'];
+
+ if (($key = array_search($profile['url'], $data['cc'])) !== false) {
+ unset($data['cc'][$key]);
+ }
}
}
foreach ($receiver_list as $receiver) {
$contact = DBA::selectFirst('contact', ['url'], ['id' => $receiver, 'network' => Protocol::ACTIVITYPUB]);
- if (empty($contacts[$contact['url']])) {
+ if (DBA::isResult($contact) && empty($contacts[$contact['url']])) {
$data['cc'][] = $contact['url'];
$contacts[$contact['url']] = $contact['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) && ($parent['uri'] == $item['thr-parent'])) {
+ $data['to'][] = $profile['url'];
+ $contacts[$profile['url']] = $profile['url'];
+
+ if (($key = array_search($profile['url'], $data['cc'])) !== false) {
+ unset($data['cc'][$key]);
+ }
+ }
+
if (!empty($profile) && empty($contacts[$profile['url']])) {
$data['cc'][] = $profile['url'];
$contacts[$profile['url']] = $profile['url'];
}
DBA::close($parents);
- if (empty($data['to'])) {
- $data['to'] = $data['cc'];
- $data['cc'] = [];
+ 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]);
+ }
+
+ return ['to' => array_values(array_unique($data['to'])), 'cc' => array_values(array_unique($data['cc']))];
}
/**
*/
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 {
$data['published'] = DateTimeFormat::utc($item['created'] . '+00:00', DateTimeFormat::ATOM);
+ $data['instrument'] = ['type' => 'Service', 'name' => BaseObject::getApp()->getUserAgent()];
+
$data = array_merge($data, self::createPermissionBlockForItem($item));
- 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 {
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
*
$data['attachment'] = self::createAttachmentList($item, $type);
$data['tag'] = self::createTagList($item);
+
+ if (!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));
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
*
'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' => []];
'actor' => $owner['url'],
'object' => $owner['url'],
'published' => DateTimeFormat::utcNow(DateTimeFormat::ATOM),
+ 'instrument' => ['type' => 'Service', 'name' => BaseObject::getApp()->getUserAgent()],
'to' => [ActivityPub::PUBLIC_COLLECTION],
'cc' => []];
'actor' => $owner['url'],
'object' => self::getProfile($uid),
'published' => DateTimeFormat::utcNow(DateTimeFormat::ATOM),
+ 'instrument' => ['type' => 'Service', 'name' => BaseObject::getApp()->getUserAgent()],
'to' => [$profile['followers']],
'cc' => []];
'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);
'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);
'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);
'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);
projects / friendica.git / blobdiff