*/
public static function addRelayServerInboxes(array $inboxes = [])
{
- $contacts = DBA::select('apcontact', ['inbox'],
- ["`type` = ? AND `url` IN (SELECT `url` FROM `contact` WHERE `uid` = ? AND `rel` = ?)",
- 'Application', 0, Contact::FRIEND]);
- while ($contact = DBA::fetch($contacts)) {
+ foreach (Relay::getList(['inbox']) as $contact) {
$inboxes[$contact['inbox']] = $contact['inbox'];
}
- DBA::close($contacts);
return $inboxes;
}
return $inboxes;
}
- $relays = Relay::getList($item_id, [], [Protocol::ACTIVITYPUB]);
+ $relays = Relay::getDirectRelayList($item_id);
if (empty($relays)) {
return $inboxes;
}
return $success;
}
-
+
/**
* Collects a list of contacts of the given owner
*
*/
public static function getProfile($uid)
{
- if ($uid != 0) {
- $condition = ['uid' => $uid, 'blocked' => false, 'account_expired' => false,
- 'account_removed' => false, 'verified' => true];
- $fields = ['guid', 'nickname', 'pubkey', 'account-type', 'page-flags'];
- $user = DBA::selectFirst('user', $fields, $condition);
- if (!DBA::isResult($user)) {
- return [];
- }
-
- $fields = ['locality', 'region', 'country-name'];
- $profile = DBA::selectFirst('profile', $fields, ['uid' => $uid]);
- if (!DBA::isResult($profile)) {
- return [];
- }
-
- $fields = ['name', 'url', 'location', 'about', 'avatar', 'photo'];
- $contact = DBA::selectFirst('contact', $fields, ['uid' => $uid, 'self' => true]);
- if (!DBA::isResult($contact)) {
- return [];
- }
- } else {
- $contact = User::getSystemAccount();
- $user = ['guid' => '', 'nickname' => $contact['nick'], 'pubkey' => $contact['pubkey'],
- 'account-type' => $contact['contact-type'], 'page-flags' => User::PAGE_FLAGS_NORMAL];
- $profile = ['locality' => '', 'region' => '', 'country-name' => ''];
- }
+ $owner = User::getOwnerDataById($uid);
$data = ['@context' => ActivityPub::CONTEXT];
- $data['id'] = $contact['url'];
+ $data['id'] = $owner['url'];
- if (!empty($user['guid'])) {
- $data['diaspora:guid'] = $user['guid'];
+ if (!empty($owner['guid'])) {
+ $data['diaspora:guid'] = $owner['guid'];
}
- $data['type'] = ActivityPub::ACCOUNT_TYPES[$user['account-type']];
-
+ $data['type'] = ActivityPub::ACCOUNT_TYPES[$owner['account-type']];
+
if ($uid != 0) {
- $data['following'] = DI::baseUrl() . '/following/' . $user['nickname'];
- $data['followers'] = DI::baseUrl() . '/followers/' . $user['nickname'];
- $data['inbox'] = DI::baseUrl() . '/inbox/' . $user['nickname'];
- $data['outbox'] = DI::baseUrl() . '/outbox/' . $user['nickname'];
+ $data['following'] = DI::baseUrl() . '/following/' . $owner['nick'];
+ $data['followers'] = DI::baseUrl() . '/followers/' . $owner['nick'];
+ $data['inbox'] = DI::baseUrl() . '/inbox/' . $owner['nick'];
+ $data['outbox'] = DI::baseUrl() . '/outbox/' . $owner['nick'];
} else {
$data['inbox'] = DI::baseUrl() . '/friendica/inbox';
}
- $data['preferredUsername'] = $user['nickname'];
- $data['name'] = $contact['name'];
+ $data['preferredUsername'] = $owner['nick'];
+ $data['name'] = $owner['name'];
- if (!empty($profile['country-name'] . $profile['region'] . $profile['locality'])) {
- $data['vcard:hasAddress'] = ['@type' => 'vcard:Home', 'vcard:country-name' => $profile['country-name'],
- 'vcard:region' => $profile['region'], 'vcard:locality' => $profile['locality']];
+ if (!empty($owner['country-name'] . $owner['region'] . $owner['locality'])) {
+ $data['vcard:hasAddress'] = ['@type' => 'vcard:Home', 'vcard:country-name' => $owner['country-name'],
+ 'vcard:region' => $owner['region'], 'vcard:locality' => $owner['locality']];
}
- if (!empty($contact['about'])) {
- $data['summary'] = BBCode::convert($contact['about'], false);
+ if (!empty($owner['about'])) {
+ $data['summary'] = BBCode::convertForUriId($owner['uri-id'], $owner['about'], BBCode::EXTERNAL);
}
- $data['url'] = $contact['url'];
- $data['manuallyApprovesFollowers'] = in_array($user['page-flags'], [User::PAGE_FLAGS_NORMAL, User::PAGE_FLAGS_PRVGROUP]);
- $data['publicKey'] = ['id' => $contact['url'] . '#main-key',
- 'owner' => $contact['url'],
- 'publicKeyPem' => $user['pubkey']];
+ $data['url'] = $owner['url'];
+ $data['manuallyApprovesFollowers'] = in_array($owner['page-flags'], [User::PAGE_FLAGS_NORMAL, User::PAGE_FLAGS_PRVGROUP]);
+ $data['discoverable'] = $owner['net-publish'];
+ $data['publicKey'] = ['id' => $owner['url'] . '#main-key',
+ 'owner' => $owner['url'],
+ 'publicKeyPem' => $owner['pubkey']];
$data['endpoints'] = ['sharedInbox' => DI::baseUrl() . '/inbox'];
- $data['icon'] = ['type' => 'Image',
- 'url' => $contact['photo']];
+ $data['icon'] = ['type' => 'Image', 'url' => Contact::getAvatarUrlForId($owner['id'], '', $owner['updated'])];
+
+ $resourceid = Photo::ridFromURI($owner['photo']);
+ if (!empty($resourceid)) {
+ $photo = Photo::selectFirst(['type'], ["resource-id" => $resourceid]);
+ if (!empty($photo['type'])) {
+ $data['icon']['mediaType'] = $photo['type'];
+ }
+ }
+
+ if (!empty($owner['header'])) {
+ $data['image'] = ['type' => 'Image', 'url' => Contact::getHeaderUrlForId($owner['id'], '', $owner['updated'])];
+
+ $resourceid = Photo::ridFromURI($owner['header']);
+ if (!empty($resourceid)) {
+ $photo = Photo::selectFirst(['type'], ["resource-id" => $resourceid]);
+ if (!empty($photo['type'])) {
+ $data['image']['mediaType'] = $photo['type'];
+ }
+ }
+ }
$data['generator'] = self::getService();
if (!empty($profile)) {
if ($term['type'] == Tag::EXCLUSIVE_MENTION) {
$exclusive = true;
+ if (!empty($profile['followers']) && ($profile['type'] == 'Group')) {
+ $data['cc'][] = $profile['followers'];
+ }
}
$data['to'][] = $profile['url'];
}
// But comments to forums aren't directed to the followers collection
// This rule is only valid when the actor isn't the forum.
// The forum needs to transmit their content to their followers.
- if (($profile['type'] == 'Group') && ($profile['url'] != $actor_profile['url'])) {
+ if (($profile['type'] == 'Group') && ($profile['url'] != ($actor_profile['url'] ?? ''))) {
$data['to'][] = $profile['url'];
} else {
$data['cc'][] = $profile['url'];
}
}
} elseif (!$exclusive) {
- // Public thread parent post always are directed to the followers
+ // Public thread parent post always are directed to the followers.
+ // This mustn't be done by posts that are directed to forum servers via the exclusive mention.
+ // But possibly in that case we could add the "followers" collection of the forum to the message.
if (($item['private'] != Item::PRIVATE) && !$forum_mode) {
$data['cc'][] = $actor_profile['followers'];
}
/**
* Check if a given contact should be delivered via AP
*
- * @param array $contact
- * @param array $networks
- * @return bool
- * @throws Exception
+ * @param array $contact
+ * @param array $networks
+ * @return bool
+ * @throws Exception
*/
private static function isAPContact(array $contact, array $networks)
{
if (!empty($self['uid'])) {
$forum_item = Post::selectFirst(Item::DELIVER_FIELDLIST, ['uri-id' => $item['uri-id'], 'uid' => $self['uid']]);
if (DBA::isResult($forum_item)) {
- $item = $forum_item;
+ $item = $forum_item;
}
}
}
}
$urls[] = $attachment['url'];
- $attachments[] = ['type' => 'Document',
+ $attach = ['type' => 'Document',
'mediaType' => $attachment['mimetype'],
'url' => $attachment['url'],
'name' => $attachment['description']];
+
+ if (!empty($attachment['height'])) {
+ $attach['height'] = $attachment['height'];
+ }
+
+ if (!empty($attachment['width'])) {
+ $attach['width'] = $attachment['width'];
+ }
+
+ if (!empty($attachment['preview'])) {
+ $attach['image'] = $attachment['preview'];
+ }
+
+ $attachments[] = $attach;
}
}
}
$urls[] = $attachment['url'];
- $attachments[] = ['type' => 'Document',
+ $attach = ['type' => 'Document',
'mediaType' => $attachment['mimetype'],
'url' => $attachment['url'],
'name' => $attachment['description']];
+
+ if (!empty($attachment['height'])) {
+ $attach['height'] = $attachment['height'];
+ }
+
+ if (!empty($attachment['width'])) {
+ $attach['width'] = $attachment['width'];
+ }
+
+ if (!empty($attachment['preview'])) {
+ $attach['image'] = $attachment['preview'];
+ }
+
+ $attachments[] = $attach;
}
// Currently deactivated, since it creates side effects on Mastodon and Pleroma.
// It will be activated, once this cleared.
{
$event = [];
$event['name'] = $item['event-summary'];
- $event['content'] = BBCode::convert($item['event-desc'], false, BBCode::ACTIVITYPUB);
+ $event['content'] = BBCode::convertForUriId($item['uri-id'], $item['event-desc'], BBCode::ACTIVITYPUB);
$event['startTime'] = DateTimeFormat::utc($item['event-start'] . '+00:00', DateTimeFormat::ATOM);
if (!$item['event-nofinish']) {
* This part is currently deactivated. The automated summary seems to be more
* confusing than helping. But possibly we will find a better way.
* So the code is left here for now as a reminder
- *
+ *
* } elseif (($type == 'Article') && empty($data['summary'])) {
* $regexp = "/[@!]\[url\=([^\[\]]*)\].*?\[\/url\]/ism";
* $summary = preg_replace_callback($regexp, ['self', 'mentionAddrCallback'], $body);
$regexp = "/[@!]\[url\=([^\[\]]*)\].*?\[\/url\]/ism";
$body = preg_replace_callback($regexp, ['self', 'mentionCallback'], $body);
- $data['content'] = BBCode::convert($body, false, BBCode::ACTIVITYPUB);
+ $data['content'] = BBCode::convertForUriId($item['uri-id'], $body, BBCode::ACTIVITYPUB);
}
// The regular "content" field does contain a minimized HTML. This is done since systems like
$richbody = preg_replace_callback($regexp, ['self', 'mentionCallback'], $item['body']);
$richbody = BBCode::removeAttachment($richbody);
- $data['contentMap'][$language] = BBCode::convert($richbody, false, BBCode::EXTERNAL);
+ $data['contentMap'][$language] = BBCode::convertForUriId($item['uri-id'], $richbody, BBCode::EXTERNAL);
}
$data['source'] = ['content' => $item['body'], 'mediaType' => "text/bbcode"];
projects / friendica.git / blobdiff