X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FActivityPub%2FTransmitter.php;h=9cb5efca413038ce9aef3538a5aae04a019be66c;hb=c6aa42dd4ee431f47eef690e980e429e934400df;hp=014afe0963dbaa7d17dcb0f1d6f39b4fc501a017;hpb=d5f64e11560b34e2b2c3195bb3bd6527315a4440;p=friendica.git diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php index 014afe0963..9cb5efca41 100644 --- a/src/Protocol/ActivityPub/Transmitter.php +++ b/src/Protocol/ActivityPub/Transmitter.php @@ -639,7 +639,7 @@ class Transmitter continue; } - if ($receiver == $item_profile['followers']) { + if ($item_profile && $receiver == $item_profile['followers']) { $inboxes = array_merge($inboxes, self::fetchTargetInboxesforUser($uid, $personal)); } else { if (Contact::isLocal($receiver)) { @@ -729,7 +729,7 @@ class Transmitter $data = []; } - $data['id'] = $mail['uri'] . '#Create'; + $data['id'] = $mail['uri'] . '/Create'; $data['type'] = 'Create'; $data['actor'] = $mail['author-link']; $data['published'] = DateTimeFormat::utc($mail['created'] . '+00:00', DateTimeFormat::ATOM); @@ -893,7 +893,7 @@ class Transmitter $data = []; } - $data['id'] = $item['uri'] . '#' . $type; + $data['id'] = $item['uri'] . '/' . $type; $data['type'] = $type; if (Item::isForumPost($item) && ($type != 'Announce')) { @@ -1215,7 +1215,7 @@ class Transmitter { $event = []; $event['name'] = $item['event-summary']; - $event['content'] = BBCode::convert($item['event-desc'], false, 9); + $event['content'] = BBCode::convert($item['event-desc'], false, BBCode::ACTIVITYPUB); $event['startTime'] = DateTimeFormat::utc($item['event-start'] . '+00:00', DateTimeFormat::ATOM); if (!$item['event-nofinish']) { @@ -1309,7 +1309,7 @@ class Transmitter $regexp = "/[@!]\[url\=([^\[\]]*)\].*?\[\/url\]/ism"; $body = preg_replace_callback($regexp, ['self', 'mentionCallback'], $body); - $data['content'] = BBCode::convert($body, false, 9); + $data['content'] = BBCode::convert($body, false, BBCode::ACTIVITYPUB); } // The regular "content" field does contain a minimized HTML. This is done since systems like @@ -1845,10 +1845,6 @@ class Transmitter private static function prependMentions($body, int $uriid) { - if (DI::config()->get('system', 'disable_implicit_mentions')) { - return $body; - } - $mentions = []; foreach (Tag::getByURIId($uriid, [Tag::IMPLICIT_MENTION]) as $tag) {