Merge pull request #10463 from annando/proxy-security

[friendica.git] / src / Protocol / ActivityPub / Transmitter.php

diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php
index 17fd1b1502ee06d0c5ae2011e54e36df799d6d4d..9ff3957c1e8eaedc93ca3c5f812d4b205ec4915b 100644 (file)
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@@ -143,7 +143,7 @@ class Transmitter
 
                return $success;
        }
-       
+
        /**
         * Collects a list of contacts of the given owner
         *
@@ -325,13 +325,13 @@ class Transmitter
                                return [];
                        }
 
-                       $fields = ['locality', 'region', 'country-name'];
+                       $fields = ['locality', 'region', 'country-name', 'net-publish'];
                        $profile = DBA::selectFirst('profile', $fields, ['uid' => $uid]);
                        if (!DBA::isResult($profile)) {
                                return [];
                        }
 
-                       $fields = ['name', 'url', 'location', 'about', 'avatar', 'photo'];
+                       $fields = ['id', 'name', 'url', 'location', 'about', 'avatar', 'photo', 'updated'];
                        $contact = DBA::selectFirst('contact', $fields, ['uid' => $uid, 'self' => true]);
                        if (!DBA::isResult($contact)) {
                                return [];
@@ -340,7 +340,7 @@ class Transmitter
                        $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' => ''];
+                       $profile = ['locality' => '', 'region' => '', 'country-name' => '', 'net-publish' => false];
                }
 
                $data = ['@context' => ActivityPub::CONTEXT];
@@ -351,7 +351,7 @@ class Transmitter
                }
 
                $data['type'] = ActivityPub::ACCOUNT_TYPES[$user['account-type']];
-               
+
                if ($uid != 0) {
                        $data['following'] = DI::baseUrl() . '/following/' . $user['nickname'];
                        $data['followers'] = DI::baseUrl() . '/followers/' . $user['nickname'];
@@ -375,11 +375,12 @@ class Transmitter
 
                $data['url'] = $contact['url'];
                $data['manuallyApprovesFollowers'] = in_array($user['page-flags'], [User::PAGE_FLAGS_NORMAL, User::PAGE_FLAGS_PRVGROUP]);
+               $data['discoverable'] = $profile['net-publish'];
                $data['publicKey'] = ['id' => $contact['url'] . '#main-key',
                        'owner' => $contact['url'],
                        'publicKeyPem' => $user['pubkey']];
                $data['endpoints'] = ['sharedInbox' => DI::baseUrl() . '/inbox'];
-               $data['icon'] = ['type' => 'Image', 'url' => $contact['photo']];
+               $data['icon'] = ['type' => 'Image', 'url' => Contact::getAvatarUrlForId($contact['id'], '', $contact['updated'])];
 
                $resourceid = Photo::ridFromURI($contact['photo']);
                if (!empty($resourceid)) {
@@ -390,7 +391,15 @@ class Transmitter
                }
 
                if (!empty($contact['header'])) {
-                       $data['image'] = ['type' => 'Image', 'url' => $contact['header']];
+                       $data['image'] = ['type' => 'Image', 'url' => Contact::getHeaderUrlForId($contact['id'], '', $contact['updated'])];
+
+                       $resourceid = Photo::ridFromURI($contact['header']);
+                       if (!empty($resourceid)) {
+                               $photo = Photo::selectFirst(['type'], ["resource-id" => $resourceid]);
+                               if (!empty($photo['type'])) {
+                                       $data['image']['mediaType'] = $photo['type'];
+                               }
+                       }
                }
 
                $data['generator'] = self::getService();
@@ -711,10 +720,10 @@ class Transmitter
        /**
         * Check if a given contact should be delivered via AP
         *
-        * @param array $contact 
-        * @param array $networks 
-        * @return bool 
-        * @throws Exception 
+        * @param array $contact
+        * @param array $networks
+        * @return bool
+        * @throws Exception
         */
        private static function isAPContact(array $contact, array $networks)
        {
@@ -1070,7 +1079,7 @@ class Transmitter
                                if (!empty($self['uid'])) {
                                        $forum_item = Post::selectFirst(Item::DELIVER_FIELDLIST, ['uri-id' => $item['uri-id'], 'uid' => $self['uid']]);
                                        if (DBA::isResult($forum_item)) {
-                                               $item = $forum_item; 
+                                               $item = $forum_item;
                                        }
                                }
                        }
@@ -1289,10 +1298,24 @@ class Transmitter
                                }
                                $urls[] = $attachment['url'];
 
-                               $attachments[] = ['type' => 'Document',
+                               $attach = ['type' => 'Document',
                                        'mediaType' => $attachment['mimetype'],
                                        'url' => $attachment['url'],
                                        'name' => $attachment['description']];
+                               
+                               if (!empty($attachment['height'])) {
+                                       $attach['height'] = $attachment['height'];
+                               }
+
+                               if (!empty($attachment['width'])) {
+                                       $attach['width'] = $attachment['width'];
+                               }
+       
+                               if (!empty($attachment['preview'])) {
+                                       $attach['image'] = $attachment['preview'];
+                               }
+
+                               $attachments[] = $attach;
                        }
                }
 
@@ -1307,10 +1330,24 @@ class Transmitter
                                }
                                $urls[] = $attachment['url'];
 
-                               $attachments[] = ['type' => 'Document',
+                               $attach = ['type' => 'Document',
                                        'mediaType' => $attachment['mimetype'],
                                        'url' => $attachment['url'],
                                        'name' => $attachment['description']];
+                               
+                               if (!empty($attachment['height'])) {
+                                       $attach['height'] = $attachment['height'];
+                               }
+
+                               if (!empty($attachment['width'])) {
+                                       $attach['width'] = $attachment['width'];
+                               }
+
+                               if (!empty($attachment['preview'])) {
+                                       $attach['image'] = $attachment['preview'];
+                               }
+
+                               $attachments[] = $attach;       
                        }
                        // Currently deactivated, since it creates side effects on Mastodon and Pleroma.
                        // It will be activated, once this cleared.
@@ -1541,7 +1578,7 @@ class Transmitter
                 * This part is currently deactivated. The automated summary seems to be more
                 * confusing than helping. But possibly we will find a better way.
                 * So the code is left here for now as a reminder
-                * 
+                *
                 * } elseif (($type == 'Article') && empty($data['summary'])) {
                 *              $regexp = "/[@!]\[url\=([^\[\]]*)\].*?\[\/url\]/ism";
                 *              $summary = preg_replace_callback($regexp, ['self', 'mentionAddrCallback'], $body);