use Friendica\Model\User;
use Friendica\Protocol\Activity;
use Friendica\Protocol\ActivityPub;
+use Friendica\Protocol\Relay;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\HTTPSignature;
use Friendica\Util\JsonLD;
return $inboxes;
}
+ /**
+ * Add relay servers to the list of inboxes
+ *
+ * @param array $inboxes
+ * @return array inboxes with added relay servers
+ */
+ public static function addRelayServerInboxesForItem(int $item_id, array $inboxes = [])
+ {
+ $relays = Relay::getList($item_id, [], [Protocol::ACTIVITYPUB]);
+ if (empty($relays)) {
+ return $inboxes;
+ }
+
+ foreach ($relays as $relay) {
+ if (!in_array($relay['batch'], $inboxes)) {
+ $inboxes[] = $relay['batch'];
+ }
+ }
+ return $inboxes;
+ }
+
/**
* Subscribe to a relay
*
'deleted' => false,
'hidden' => false,
'archive' => false,
- 'pending' => false
+ 'pending' => false,
+ 'blocked' => false,
];
$condition = DBA::buildCondition($parameters);
$activity = json_decode($conversation['source'], true);
$actor = JsonLD::fetchElement($activity, 'actor', 'id');
- $profile = APContact::getByURL($actor);
+ if (!empty($actor)) {
+ $permissions['to'][] = $actor;
+ $profile = APContact::getByURL($actor);
+ } else {
+ $profile = [];
+ }
$item_profile = APContact::getByURL($item['author-link']);
$exclude[] = $item['author-link'];
$exclude[] = $item['owner-link'];
}
- $permissions['to'][] = $actor;
-
foreach (['to', 'cc', 'bto', 'bcc'] as $element) {
if (empty($activity[$element])) {
continue;
*
* @return boolean "true" if inbox is archived
*/
- private static function archivedInbox($url)
+ public static function archivedInbox($url)
{
return DBA::exists('inbox-status', ['url' => $url, 'archive' => true]);
}
$networks = [Protocol::ACTIVITYPUB, Protocol::OSTATUS];
}
- $condition = ['uid' => $uid, 'archive' => false, 'pending' => false];
+ $condition = ['uid' => $uid, 'archive' => false, 'pending' => false, 'blocked' => false];
if (!empty($uid)) {
$condition['rel'] = [Contact::FOLLOWER, Contact::FRIEND];
continue;
}
- if ($isforum && ($contact['dfrn'] == Protocol::DFRN)) {
+ if ($isforum && ($contact['network'] == Protocol::DFRN)) {
continue;
}
if (!empty($author['nurl'])) {
$self = Contact::selectFirst(['uid'], ['nurl' => $author['nurl'], 'self' => true]);
if (!empty($self['uid'])) {
- $item = Item::selectFirst([], ['uri-id' => $item['uri-id'], 'uid' => $self['uid']]);
+ $forum_item = Item::selectFirst([], ['uri-id' => $item['uri-id'], 'uid' => $self['uid']]);
+ if (DBA::isResult($item)) {
+ $item = $forum_item;
+ }
}
}
}
+ if (empty($item['uri-id'])) {
+ Logger::warning('Item without uri-id', ['item' => $item]);
+ return false;
+ }
+
if (empty($type)) {
$condition = ['item-uri' => $item['uri'], 'protocol' => Conversation::PARCEL_ACTIVITYPUB];
$conversation = DBA::selectFirst('conversation', ['source'], $condition);
return '';
}
- $data = Contact::getByURL($match[1], false, ['url', 'nick']);
+ $data = Contact::getByURL($match[1], false, ['url', 'alias', 'nick']);
if (empty($data['nick'])) {
return $match[0];
}
- return '@[url=' . $data['url'] . ']' . $data['nick'] . '[/url]';
+ return '[url=' . ($data['alias'] ?: $data['url']) . ']@' . $data['nick'] . '[/url]';
}
/**
}
if (empty($item['uid']) || !Feature::isEnabled($item['uid'], 'explicit_mentions')) {
- $body = self::prependMentions($body, $item['uri-id']);
+ $body = self::prependMentions($body, $item['uri-id'], $item['author-link']);
}
if ($type == 'Event') {
return HTTPSignature::transmit($signed, $profile['inbox'], $uid);
}
- private static function prependMentions($body, int $uriid)
+ private static function prependMentions($body, int $uriid, string $authorLink)
{
$mentions = [];
&& $profile['contact-type'] != Contact::TYPE_COMMUNITY
&& !strstr($body, $profile['addr'])
&& !strstr($body, $tag['url'])
+ && $tag['url'] !== $authorLink
) {
$mentions[] = '@[url=' . $tag['url'] . ']' . $profile['nick'] . '[/url]';
}