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

diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php
index 5768c4439a..259c8c2251 100644
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@@ -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'];
@@ -557,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;
@@ -581,6 +624,10 @@ class Transmitter
 				continue;
 			}
 
+			if ($isforum && ($contact['dfrn'] == Protocol::DFRN)) {
+				continue;
+			}
+
 			if (Network::isUrlBlocked($contact['url'])) {
 				continue;
 			}
@@ -629,6 +676,10 @@ 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) {
@@ -1524,7 +1575,7 @@ class Transmitter
 	 */
 	public static function isAnnounce($item)
 	{
-		if ($item['verb'] == Activity::ANNOUNCE) {
+		if (!empty($item['verb']) && ($item['verb'] == Activity::ANNOUNCE)) {
 			return true;
 		}