X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FActivityPub%2FTransmitter.php;h=259c8c225181a5f29cc67ee18f4c09747557bad9;hb=fc2340d4afe6466c58e35afd64fe9010bf185b04;hp=bd6f67128f3924182bb0a457c594b4b09c1533e6;hpb=a24fca818d459092d04482564d90266fd46668e7;p=friendica.git

diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php
index bd6f67128f..259c8c2251 100644
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@@ -150,7 +150,7 @@ class Transmitter
 	 */
 	public static function getOutbox($owner, $page = null)
 	{
-		$public_contact = Contact::getIdForURL($owner['url'], 0, true);
+		$public_contact = Contact::getIdForURL($owner['url']);
 
 		$condition = ['uid' => 0, 'contact-id' => $public_contact, 'author-id' => $public_contact,
 			'private' => [Item::PUBLIC, Item::UNLISTED], 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT],
@@ -214,39 +214,63 @@ class Transmitter
 	 */
 	public static function getProfile($uid)
 	{
-		$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 [];
-		}
+		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 = ['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 [];
+			$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' => ''];
 		}
 
 		$data = ['@context' => ActivityPub::CONTEXT];
 		$data['id'] = $contact['url'];
-		$data['diaspora:guid'] = $user['guid'];
+
+		if (!empty($user['guid'])) {
+			$data['diaspora:guid'] = $user['guid'];
+		}
+
 		$data['type'] = ActivityPub::ACCOUNT_TYPES[$user['account-type']];
-		$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'];
+		
+		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'];
+		} else {
+			$data['inbox'] = DI::baseUrl() . '/friendica/inbox';
+		}
+
 		$data['preferredUsername'] = $user['nickname'];
 		$data['name'] = $contact['name'];
-		$data['vcard:hasAddress'] = ['@type' => 'vcard:Home', 'vcard:country-name' => $profile['country-name'],
-			'vcard:region' => $profile['region'], 'vcard:locality' => $profile['locality']];
-		$data['summary'] = BBCode::convert($contact['about'], false);
+
+		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($contact['about'])) {
+			$data['summary'] = BBCode::convert($contact['about'], false);
+		}
+
 		$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',
@@ -356,12 +380,14 @@ class Transmitter
 		}
 
 		$always_bcc = false;
+		$isforum = false;
 
 		// Check if we should always deliver our stuff via BCC
 		if (!empty($item['uid'])) {
-			$profile = Profile::getByUID($item['uid']);
+			$profile = User::getOwnerDataById($item['uid']);
 			if (!empty($profile)) {
 				$always_bcc = $profile['hide-friends'];
+				$isforum = $profile['account-type'] == User::ACCOUNT_TYPE_COMMUNITY;
 			}
 		}
 
@@ -369,7 +395,7 @@ class Transmitter
 			$always_bcc = true;
 		}
 
-		if (self::isAnnounce($item) || DI::config()->get('debug', 'total_ap_delivery')) {
+		if ((self::isAnnounce($item) && !$isforum) || DI::config()->get('debug', 'total_ap_delivery')) {
 			// Will be activated in a later step
 			$networks = Protocol::FEDERATED;
 		} else {
@@ -423,6 +449,10 @@ class Transmitter
 						continue;
 					}
 
+					if ($isforum && DBA::isResult($contact) && ($contact['dfrn'] == Protocol::DFRN)) {
+						continue;
+					}
+
 					if (!empty($profile = APContact::getByURL($contact['url'], false))) {
 						$data['to'][] = $profile['url'];
 					}
@@ -435,6 +465,10 @@ class Transmitter
 					continue;
 				}
 
+				if ($isforum && DBA::isResult($contact) && ($contact['dfrn'] == Protocol::DFRN)) {
+					continue;
+				}
+
 				if (!empty($profile = APContact::getByURL($contact['url'], false))) {
 					if ($contact['hidden'] || $always_bcc) {
 						$data['bcc'][] = $profile['url'];
@@ -454,7 +488,9 @@ class Transmitter
 						if ($item['gravity'] != GRAVITY_PARENT) {
 							// Comments to forums are directed to the forum
 							// But comments to forums aren't directed to the followers collection
-							if ($profile['type'] == 'Group') {
+							// 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'])) {
 								$data['to'][] = $profile['url'];
 							} else {
 								$data['cc'][] = $profile['url'];
@@ -555,6 +591,15 @@ class Transmitter
 	{
 		$inboxes = [];
 
+		$isforum = false;
+
+		if (!empty($item['uid'])) {
+			$profile = User::getOwnerDataById($item['uid']);
+			if (!empty($profile)) {
+				$isforum = $profile['account-type'] == User::ACCOUNT_TYPE_COMMUNITY;
+			}
+		}
+
 		if (DI::config()->get('debug', 'total_ap_delivery')) {
 			// Will be activated in a later step
 			$networks = Protocol::FEDERATED;
@@ -579,6 +624,10 @@ class Transmitter
 				continue;
 			}
 
+			if ($isforum && ($contact['dfrn'] == Protocol::DFRN)) {
+				continue;
+			}
+
 			if (Network::isUrlBlocked($contact['url'])) {
 				continue;
 			}
@@ -627,6 +676,12 @@ class Transmitter
 			$item_profile = APContact::getByURL($item['owner-link'], false);
 		}
 
+		if (empty($item_profile)) {
+			return [];
+		}
+
+		$profile_uid = User::getIdForURL($item_profile['url']);
+
 		foreach (['to', 'cc', 'bto', 'bcc'] as $element) {
 			if (empty($permissions[$element])) {
 				continue;
@@ -639,7 +694,7 @@ class Transmitter
 					continue;
 				}
 
-				if ($item_profile && $receiver == $item_profile['followers']) {
+				if ($item_profile && ($receiver == $item_profile['followers']) && ($uid == $profile_uid)) {
 					$inboxes = array_merge($inboxes, self::fetchTargetInboxesforUser($uid, $personal));
 				} else {
 					if (Contact::isLocal($receiver)) {
@@ -807,6 +862,8 @@ class Transmitter
 			$type = 'Follow';
 		} elseif ($item['verb'] == Activity::TAG) {
 			$type = 'Add';
+		} elseif ($item['verb'] == Activity::ANNOUNCE) {
+			$type = 'Announce';
 		} else {
 			$type = '';
 		}
@@ -851,12 +908,13 @@ class Transmitter
 	 */
 	public static function createActivityFromItem($item_id, $object_mode = false)
 	{
+		Logger::info('Fetching activity', ['item' => $item_id]);
 		$item = Item::selectFirst([], ['id' => $item_id, 'parent-network' => Protocol::NATIVE_SUPPORT]);
-
 		if (!DBA::isResult($item)) {
 			return false;
 		}
 
+		/// @todo This code should be removed by the end of the year 2020
 		if ($item['wall'] && ($item['uri'] == $item['parent-uri'])) {
 			$owner = User::getOwnerDataById($item['uid']);
 			if (($owner['account-type'] == User::ACCOUNT_TYPE_COMMUNITY) && ($item['author-link'] != $owner['url'])) {
@@ -868,6 +926,21 @@ class Transmitter
 			}
 		}
 
+		/*
+		/// @todo This code should be activated by the end of the year 2020		
+		// See also "tagDeliver";
+		// In case of a forum post ensure to return the original post if author and forum are on the same machine
+		if (!empty($item['forum_mode'])) {
+			$author = Contact::getById($item['author-id'], ['nurl']);
+			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']]);
+				}
+			}
+		}
+		*/
+
 		if (empty($type)) {
 			$condition = ['item-uri' => $item['uri'], 'protocol' => Conversation::PARCEL_ACTIVITYPUB];
 			$conversation = DBA::selectFirst('conversation', ['source'], $condition);
@@ -879,6 +952,7 @@ class Transmitter
 							unset($data['@context']);
 							unset($data['signature']);
 						}
+						Logger::info('Return stored conversation', ['item' => $item_id]);
 						return $data;
 					} elseif (in_array('as:' . $data['type'], Receiver::CONTENT_TYPES)) {
 						if (!empty($data['@context'])) {
@@ -909,7 +983,7 @@ class Transmitter
 		$data['id'] = $item['uri'] . '/' . $type;
 		$data['type'] = $type;
 
-		if (Item::isForumPost($item) && ($type != 'Announce')) {
+		if (($type != 'Announce') || ($item['gravity'] != GRAVITY_PARENT)) {
 			$data['actor'] = $item['author-link'];
 		} else {
 			$data['actor'] = $item['owner-link'];
@@ -926,7 +1000,11 @@ class Transmitter
 		} elseif ($data['type'] == 'Add') {
 			$data = self::createAddTag($item, $data);
 		} elseif ($data['type'] == 'Announce') {
-			$data = self::createAnnounce($item, $data);
+			if ($item['verb'] == ACTIVITY::ANNOUNCE) {
+				$data['object'] = $item['thr-parent'];
+			} else {
+				$data = self::createAnnounce($item, $data);
+			}
 		} elseif ($data['type'] == 'Follow') {
 			$data['object'] = $item['parent-uri'];
 		} elseif ($data['type'] == 'Undo') {
@@ -947,7 +1025,10 @@ class Transmitter
 
 		$owner = User::getOwnerDataById($uid);
 
-		if (!$object_mode && !empty($owner)) {
+		Logger::info('Fetched activity', ['item' => $item_id, 'uid' => $uid]);
+
+		// We don't sign if we aren't the actor. This is important for relaying content especially for forums
+		if (!$object_mode && !empty($owner) && ($data['actor'] == $owner['url'])) {
 			return LDSignature::sign($data, $owner);
 		} else {
 			return $data;
@@ -1009,6 +1090,9 @@ class Transmitter
 				$tags[] = ['type' => 'Hashtag', 'href' => $url, 'name' => '#' . $term['name']];
 			} else {
 				$contact = Contact::getByURL($term['url'], false, ['addr']);
+				if (empty($contact)) {
+					continue;
+				}
 				if (!empty($contact['addr'])) {
 					$mention = '@' . $contact['addr'];
 				} else {
@@ -1491,6 +1575,10 @@ class Transmitter
 	 */
 	public static function isAnnounce($item)
 	{
+		if (!empty($item['verb']) && ($item['verb'] == Activity::ANNOUNCE)) {
+			return true;
+		}
+
 		$announce = self::getAnnounceArray($item);
 		if (empty($announce)) {
 			return false;