use Friendica\BaseObject;
use Friendica\Content\Feature;
-use Friendica\Database\DBA;
+use Friendica\Content\Text\BBCode;
+use Friendica\Content\Text\Plaintext;
+use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Core\Logger;
use Friendica\Core\System;
+use Friendica\Protocol\Activity;
use Friendica\Util\HTTPSignature;
use Friendica\Core\Protocol;
-use Friendica\Model\Conversation;
-use Friendica\Model\Contact;
+use Friendica\Core\System;
+use Friendica\Database\DBA;
use Friendica\Model\APContact;
+use Friendica\Model\Contact;
+use Friendica\Model\Conversation;
use Friendica\Model\Item;
+use Friendica\Model\Profile;
use Friendica\Model\Term;
use Friendica\Model\User;
+use Friendica\Protocol\ActivityPub;
use Friendica\Util\DateTimeFormat;
-use Friendica\Content\Text\BBCode;
-use Friendica\Content\Text\Plaintext;
-use Friendica\Util\XML;
+use Friendica\Util\HTTPSignature;
+use Friendica\Util\Images;
use Friendica\Util\JsonLD;
use Friendica\Util\LDSignature;
-use Friendica\Model\Profile;
-use Friendica\Object\Image;
-use Friendica\Protocol\ActivityPub;
-use Friendica\Core\Cache;
use Friendica\Util\Map;
use Friendica\Util\Network;
+use Friendica\Util\XML;
require_once 'include/api.php';
require_once 'mod/share.php';
if (empty($page)) {
$data['first'] = System::baseUrl() . '/followers/' . $owner['nickname'] . '?page=1';
} else {
+ $data['type'] = 'OrderedCollectionPage';
$list = [];
$contacts = DBA::select('contact', ['url'], $condition, ['limit' => [($page - 1) * 100, 100]]);
if (empty($page)) {
$data['first'] = System::baseUrl() . '/following/' . $owner['nickname'] . '?page=1';
} else {
+ $data['type'] = 'OrderedCollectionPage';
$list = [];
$contacts = DBA::select('contact', ['url'], $condition, ['limit' => [($page - 1) * 100, 100]]);
if (empty($page)) {
$data['first'] = System::baseUrl() . '/outbox/' . $owner['nickname'] . '?page=1';
} else {
+ $data['type'] = 'OrderedCollectionPage';
$list = [];
$condition['parent-network'] = Protocol::NATIVE_SUPPORT;
return [];
}
- // On old installations and never changed contacts this might not be filled
- if (empty($contact['avatar'])) {
- $contact['avatar'] = $contact['photo'];
- }
-
$data = ['@context' => ActivityPub::CONTEXT];
$data['id'] = $contact['url'];
$data['diaspora:guid'] = $user['guid'];
'publicKeyPem' => $user['pubkey']];
$data['endpoints'] = ['sharedInbox' => System::baseUrl() . '/inbox'];
$data['icon'] = ['type' => 'Image',
- 'url' => $contact['avatar']];
+ 'url' => $contact['photo']];
$data['generator'] = self::getService();
if (Config::get('debug', 'total_ap_delivery')) {
// Will be activated in a later step
- $networks = [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS];
+ $networks = Protocol::FEDERATED;
} else {
// For now only send to these contacts:
$networks = [Protocol::ACTIVITYPUB, Protocol::OSTATUS];
}
}
} else {
- $receiver_list = Item::enumeratePermissions($item);
+ $receiver_list = Item::enumeratePermissions($item, true);
foreach ($terms as $term) {
$cid = Contact::getIdForURL($term['url'], $item['uid']);
if (Config::get('debug', 'total_ap_delivery')) {
// Will be activated in a later step
- $networks = [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS];
+ $networks = Protocol::FEDERATED;
} else {
// For now only send to these contacts:
$networks = [Protocol::ACTIVITYPUB, Protocol::OSTATUS];
$contacts = DBA::select('contact', ['url', 'network', 'protocol'], $condition);
while ($contact = DBA::fetch($contacts)) {
+ if (Contact::isLocal($contact['url'])) {
+ continue;
+ }
+
if (!in_array($contact['network'], $networks) && ($contact['protocol'] != Protocol::ACTIVITYPUB)) {
continue;
}
if ($receiver == $item_profile['followers']) {
$inboxes = array_merge($inboxes, self::fetchTargetInboxesforUser($uid, $personal));
} else {
+ if (Contact::isLocal($receiver)) {
+ continue;
+ }
+
$profile = APContact::getByURL($receiver, false);
if (!empty($profile)) {
if (empty($profile['sharedinbox']) || $personal || $blindcopy) {
if ($reshared) {
$type = 'Announce';
- } elseif ($item['verb'] == ACTIVITY_POST) {
+ } elseif ($item['verb'] == Activity::POST) {
if ($item['created'] == $item['edited']) {
$type = 'Create';
} else {
$type = 'Update';
}
- } elseif ($item['verb'] == ACTIVITY_LIKE) {
+ } elseif ($item['verb'] == Activity::LIKE) {
$type = 'Like';
- } elseif ($item['verb'] == ACTIVITY_DISLIKE) {
+ } elseif ($item['verb'] == Activity::DISLIKE) {
$type = 'Dislike';
- } elseif ($item['verb'] == ACTIVITY_ATTEND) {
+ } elseif ($item['verb'] == Activity::ATTEND) {
$type = 'Accept';
- } elseif ($item['verb'] == ACTIVITY_ATTENDNO) {
+ } elseif ($item['verb'] == Activity::ATTENDNO) {
$type = 'Reject';
- } elseif ($item['verb'] == ACTIVITY_ATTENDMAYBE) {
+ } elseif ($item['verb'] == Activity::ATTENDMAYBE) {
$type = 'TentativeAccept';
- } elseif ($item['verb'] == ACTIVITY_FOLLOW) {
+ } elseif ($item['verb'] == Activity::FOLLOW) {
$type = 'Follow';
- } elseif ($item['verb'] == ACTIVITY_TAG) {
+ } elseif ($item['verb'] == Activity::TAG) {
$type = 'Add';
} else {
$type = '';
// Simplify image codes
$body = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $item['body']);
- // Grab all pictures and create attachments out of them
+ // Grab all pictures without alternative descriptions and create attachments out of them
if (preg_match_all("/\[img\]([^\[\]]*)\[\/img\]/Usi", $body, $pictures)) {
foreach ($pictures[1] as $picture) {
- $imgdata = Image::getInfoFromURL($picture);
+ $imgdata = Images::getInfoFromURLCached($picture);
if ($imgdata) {
$attachments[] = ['type' => 'Document',
'mediaType' => $imgdata['mime'],
}
}
+ // Grab all pictures with alternative description and create attachments out of them
+ if (preg_match_all("/\[img=([^\[\]]*)\]([^\[\]]*)\[\/img\]/Usi", $body, $pictures, PREG_SET_ORDER)) {
+ foreach ($pictures as $picture) {
+ $imgdata = Images::getInfoFromURLCached($picture[1]);
+ if ($imgdata) {
+ $attachments[] = ['type' => 'Document',
+ 'mediaType' => $imgdata['mime'],
+ 'url' => $picture[1],
+ 'name' => $picture[2]];
+ }
+ }
+ }
+
return $attachments;
}
*/
private static function createAnnounce($item, $data)
{
+ $orig_body = $item['body'];
$announce = api_share_as_retweet($item);
if (empty($announce['plink'])) {
$data['type'] = 'Create';
if (!empty($activity)) {
$ldactivity = JsonLD::compact($activity);
$id = JsonLD::fetchElement($ldactivity, '@id');
+ $type = str_replace('as:', '', JsonLD::fetchElement($ldactivity, '@type'));
if (!empty($id)) {
- $data['object'] = $id;
+ if (empty($announce['share-pre-body'])) {
+ // Pure announce, without a quote
+ $data['type'] = 'Announce';
+ $data['object'] = $id;
+ return $data;
+ }
+
+ // Quote
+ $data['type'] = 'Create';
+ $item['body'] = trim($announce['share-pre-body']) . "\n" . $id;
+ $data['object'] = self::createNote($item);
+
+ /// @todo Finally descide how to implement this in AP. This is a possible way:
+ $data['object']['attachment'][] = ['type' => $type, 'id' => $id];
+
+ $data['object']['source']['content'] = $orig_body;
return $data;
}
}
+ $item['body'] = $orig_body;
$data['type'] = 'Create';
$data['object'] = self::createNote($item);
return $data;
public static function sendActivity($activity, $target, $uid, $id = '')
{
$profile = APContact::getByURL($target);
+ if (empty($profile['inbox'])) {
+ Logger::warning('No inbox found for target', ['target' => $target, 'profile' => $profile]);
+ return;
+ }
$owner = User::getOwnerDataById($uid);
public static function sendFollowObject($object, $target, $uid = 0)
{
$profile = APContact::getByURL($target);
+ if (empty($profile['inbox'])) {
+ Logger::warning('No inbox found for target', ['target' => $target, 'profile' => $profile]);
+ return;
+ }
if (empty($uid)) {
// Fetch the list of administrators
$uid = $first_user['uid'];
}
- $condition = ['verb' => ACTIVITY_FOLLOW, 'uid' => 0, 'parent-uri' => $object,
+ $condition = ['verb' => Activity::FOLLOW, 'uid' => 0, 'parent-uri' => $object,
'author-id' => Contact::getPublicIdByUserId($uid)];
if (Item::exists($condition)) {
Logger::log('Follow for ' . $object . ' for user ' . $uid . ' does already exist.', Logger::DEBUG);
public static function sendContactAccept($target, $id, $uid)
{
$profile = APContact::getByURL($target);
+ if (empty($profile['inbox'])) {
+ Logger::warning('No inbox found for target', ['target' => $target, 'profile' => $profile]);
+ return;
+ }
$owner = User::getOwnerDataById($uid);
$data = ['@context' => ActivityPub::CONTEXT,
public static function sendContactReject($target, $id, $uid)
{
$profile = APContact::getByURL($target);
+ if (empty($profile['inbox'])) {
+ Logger::warning('No inbox found for target', ['target' => $target, 'profile' => $profile]);
+ return;
+ }
$owner = User::getOwnerDataById($uid);
$data = ['@context' => ActivityPub::CONTEXT,
public static function sendContactUndo($target, $cid, $uid)
{
$profile = APContact::getByURL($target);
+ if (empty($profile['inbox'])) {
+ Logger::warning('No inbox found for target', ['target' => $target, 'profile' => $profile]);
+ return;
+ }
$object_id = self::activityIDFromContact($cid);
if (empty($object_id)) {
projects / friendica.git / blobdiff