X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FActivityPub%2FTransmitter.php;h=7f5f51c38aedcde640271d4f8bfba59250606102;hb=32f70abf9a7913df1ddb28b9745eb37941d09d80;hp=f5ef35337af8a3964fe5b539a64c47e3480db266;hpb=ff6ab4caa39e2b7b343d955a1bb685c4b402c161;p=friendica.git

diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php
index f5ef35337a..7f5f51c38a 100644
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@@ -42,6 +42,7 @@ use Friendica\Model\Tag;
 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;
@@ -80,6 +81,27 @@ class Transmitter
 		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
 	 *
@@ -146,7 +168,8 @@ class Transmitter
 			'deleted' => false,
 			'hidden' => false,
 			'archive' => false,
-			'pending' => false
+			'pending' => false,
+			'blocked' => false,
 		];
 		$condition = DBA::buildCondition($parameters);
 
@@ -409,7 +432,12 @@ class Transmitter
 		$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'];
@@ -418,8 +446,6 @@ class Transmitter
 			$exclude[] = $item['owner-link'];
 		}
 
-		$permissions['to'][] = $actor;
-
 		foreach (['to', 'cc', 'bto', 'bcc'] as $element) {
 			if (empty($activity[$element])) {
 				continue;
@@ -644,7 +670,7 @@ class Transmitter
 	 *
 	 * @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]);
 	}
@@ -680,7 +706,7 @@ class Transmitter
 			$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];
@@ -696,7 +722,7 @@ class Transmitter
 				continue;
 			}
 
-			if ($isforum && ($contact['dfrn'] == Protocol::DFRN)) {
+			if ($isforum && ($contact['network'] == Protocol::DFRN)) {
 				continue;
 			}
 
@@ -994,11 +1020,19 @@ class Transmitter
 			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);
@@ -1253,12 +1287,12 @@ class Transmitter
 			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]';
 	}
 
 	/**
@@ -1425,7 +1459,7 @@ class Transmitter
 		}
 
 		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') {
@@ -1973,7 +2007,7 @@ class Transmitter
 		return HTTPSignature::transmit($signed, $profile['inbox'], $uid);
 	}
 
-	private static function prependMentions($body, int $uriid)
+	private static function prependMentions($body, int $uriid, string $authorLink)
 	{
 		$mentions = [];
 
@@ -1983,6 +2017,7 @@ class Transmitter
 				&& $profile['contact-type'] != Contact::TYPE_COMMUNITY
 				&& !strstr($body, $profile['addr'])
 				&& !strstr($body, $tag['url'])
+				&& $tag['url'] !== $authorLink
 			) {
 				$mentions[] = '@[url=' . $tag['url'] . ']' . $profile['nick'] . '[/url]';
 			}