X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FActivityPub%2FTransmitter.php;h=9cb5efca413038ce9aef3538a5aae04a019be66c;hb=c6aa42dd4ee431f47eef690e980e429e934400df;hp=b393abd9e1798d331120b84bc72d07cd0185fa4b;hpb=ccb69414d26e2d645396ff9ca522d4cb9c7583d6;p=friendica.git

diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php
index b393abd9e1..9cb5efca41 100644
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@@ -74,16 +74,30 @@ class Transmitter
 	 */
 	public static function getContacts($owner, $rel, $module, $page = null)
 	{
-		$condition = ['rel' => $rel, 'network' => Protocol::FEDERATED, 'uid' => $owner['uid'],
-			'self' => false, 'deleted' => false, 'hidden' => false, 'archive' => false, 'pending' => false];
-		$count = DBA::count('contact', $condition);
+		$parameters = [
+			'rel' => $rel,
+			'uid' => $owner['uid'],
+			'self' => false,
+			'deleted' => false,
+			'hidden' => false,
+			'archive' => false,
+			'pending' => false
+		];
+		$condition = DBA::buildCondition($parameters);
+
+		$sql = "SELECT COUNT(*) as `count`
+			FROM `contact`
+			JOIN `apcontact` ON `apcontact`.`url` = `contact`.`url`
+			" . $condition;
+
+		$contacts = DBA::fetchFirst($sql, ...$parameters);
 
 		$modulePath = '/' . $module . '/';
 
 		$data = ['@context' => ActivityPub::CONTEXT];
 		$data['id'] = DI::baseUrl() . $modulePath . $owner['nickname'];
 		$data['type'] = 'OrderedCollection';
-		$data['totalItems'] = $count;
+		$data['totalItems'] = $contacts['count'];
 
 		// When we hide our friends we will only show the pure number but don't allow more.
 		$profile = Profile::getByUID($owner['uid']);
@@ -97,7 +111,16 @@ class Transmitter
 			$data['type'] = 'OrderedCollectionPage';
 			$list = [];
 
-			$contacts = DBA::select('contact', ['url'], $condition, ['limit' => [($page - 1) * 100, 100]]);
+			$sql = "SELECT `contact`.`url`
+				FROM `contact`
+				JOIN `apcontact` ON `apcontact`.`url` = `contact`.`url`
+				" . $condition . "
+				LIMIT ?, ?";
+
+			$parameters[] = ($page - 1) * 100;
+			$parameters[] = 100;
+
+			$contacts = DBA::p($sql, ...$parameters);
 			while ($contact = DBA::fetch($contacts)) {
 				$list[] = $contact['url'];
 			}
@@ -616,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)) {
@@ -706,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);
@@ -870,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')) {
@@ -1192,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']) {
@@ -1271,7 +1294,7 @@ class Transmitter
 		$body = $item['body'];
 
 		if (empty($item['uid']) || !Feature::isEnabled($item['uid'], 'explicit_mentions')) {
-			$body = self::prependMentions($body, $permission_block);
+			$body = self::prependMentions($body, $item['uri-id']);
 		}
 
 		if ($type == 'Note') {
@@ -1286,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
@@ -1820,22 +1843,18 @@ class Transmitter
 		HTTPSignature::transmit($signed, $profile['inbox'], $uid);
 	}
 
-	private static function prependMentions($body, array $permission_block)
+	private static function prependMentions($body, int $uriid)
 	{
-		if (DI::config()->get('system', 'disable_implicit_mentions')) {
-			return $body;
-		}
-
 		$mentions = [];
 
-		foreach ($permission_block['to'] as $profile_url) {
-			$profile = Contact::getDetailsByURL($profile_url);
+		foreach (Tag::getByURIId($uriid, [Tag::IMPLICIT_MENTION]) as $tag) {
+			$profile = Contact::getDetailsByURL($tag['url']);
 			if (!empty($profile['addr'])
 				&& $profile['contact-type'] != Contact::TYPE_COMMUNITY
 				&& !strstr($body, $profile['addr'])
-				&& !strstr($body, $profile_url)
+				&& !strstr($body, $tag['url'])
 			) {
-				$mentions[] = '@[url=' . $profile_url . ']' . $profile['nick'] . '[/url]';
+				$mentions[] = '@[url=' . $tag['url'] . ']' . $profile['nick'] . '[/url]';
 			}
 		}