Move Object\Image static methods to Util\Images

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

diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php
index e44ae1cf66c2dfa4ff9413cc2b457d10fbb39279..d804d7ca4faa97f74862c87c60069e5ad910e87d 100644 (file)
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@@ -6,30 +6,33 @@ namespace Friendica\Protocol\ActivityPub;
 
 use Friendica\BaseObject;
 use Friendica\Content\Feature;
-use Friendica\Database\DBA;
+use Friendica\Content\Text\BBCode;
+use Friendica\Content\Text\Plaintext;
+use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\System;
+use Friendica\Protocol\Activity;
 use Friendica\Util\HTTPSignature;
 use Friendica\Core\Protocol;
-use Friendica\Model\Conversation;
-use Friendica\Model\Contact;
+use Friendica\Core\System;
+use Friendica\Database\DBA;
 use Friendica\Model\APContact;
+use Friendica\Model\Contact;
+use Friendica\Model\Conversation;
 use Friendica\Model\Item;
+use Friendica\Model\Profile;
 use Friendica\Model\Term;
 use Friendica\Model\User;
+use Friendica\Protocol\ActivityPub;
 use Friendica\Util\DateTimeFormat;
-use Friendica\Content\Text\BBCode;
-use Friendica\Content\Text\Plaintext;
-use Friendica\Util\XML;
+use Friendica\Util\HTTPSignature;
+use Friendica\Util\Images;
 use Friendica\Util\JsonLD;
 use Friendica\Util\LDSignature;
-use Friendica\Model\Profile;
-use Friendica\Object\Image;
-use Friendica\Protocol\ActivityPub;
-use Friendica\Core\Cache;
 use Friendica\Util\Map;
 use Friendica\Util\Network;
+use Friendica\Util\XML;
 
 require_once 'include/api.php';
 require_once 'mod/share.php';
@@ -71,6 +74,7 @@ class Transmitter
                if (empty($page)) {
                        $data['first'] = System::baseUrl() . '/followers/' . $owner['nickname'] . '?page=1';
                } else {
+                       $data['type'] = 'OrderedCollectionPage';
                        $list = [];
 
                        $contacts = DBA::select('contact', ['url'], $condition, ['limit' => [($page - 1) * 100, 100]]);
@@ -119,6 +123,7 @@ class Transmitter
                if (empty($page)) {
                        $data['first'] = System::baseUrl() . '/following/' . $owner['nickname'] . '?page=1';
                } else {
+                       $data['type'] = 'OrderedCollectionPage';
                        $list = [];
 
                        $contacts = DBA::select('contact', ['url'], $condition, ['limit' => [($page - 1) * 100, 100]]);
@@ -165,6 +170,7 @@ class Transmitter
                if (empty($page)) {
                        $data['first'] = System::baseUrl() . '/outbox/' . $owner['nickname'] . '?page=1';
                } else {
+                       $data['type'] = 'OrderedCollectionPage';
                        $list = [];
 
                        $condition['parent-network'] = Protocol::NATIVE_SUPPORT;
@@ -544,6 +550,10 @@ class Transmitter
 
                $contacts = DBA::select('contact', ['url', 'network', 'protocol'], $condition);
                while ($contact = DBA::fetch($contacts)) {
+                       if (Contact::isLocal($contact['url'])) {
+                               continue;
+                       }
+
                        if (!in_array($contact['network'], $networks) && ($contact['protocol'] != Protocol::ACTIVITYPUB)) {
                                continue;
                        }
@@ -611,6 +621,10 @@ class Transmitter
                                if ($receiver == $item_profile['followers']) {
                                        $inboxes = array_merge($inboxes, self::fetchTargetInboxesforUser($uid, $personal));
                                } else {
+                                       if (Contact::isLocal($receiver)) {
+                                               continue;
+                                       }
+
                                        $profile = APContact::getByURL($receiver, false);
                                        if (!empty($profile)) {
                                                if (empty($profile['sharedinbox']) || $personal || $blindcopy) {
@@ -750,25 +764,25 @@ class Transmitter
 
                if ($reshared) {
                        $type = 'Announce';
-               } elseif ($item['verb'] == ACTIVITY_POST) {
+               } elseif ($item['verb'] == Activity::POST) {
                        if ($item['created'] == $item['edited']) {
                                $type = 'Create';
                        } else {
                                $type = 'Update';
                        }
-               } elseif ($item['verb'] == ACTIVITY_LIKE) {
+               } elseif ($item['verb'] == Activity::LIKE) {
                        $type = 'Like';
-               } elseif ($item['verb'] == ACTIVITY_DISLIKE) {
+               } elseif ($item['verb'] == Activity::DISLIKE) {
                        $type = 'Dislike';
-               } elseif ($item['verb'] == ACTIVITY_ATTEND) {
+               } elseif ($item['verb'] == Activity::ATTEND) {
                        $type = 'Accept';
-               } elseif ($item['verb'] == ACTIVITY_ATTENDNO) {
+               } elseif ($item['verb'] == Activity::ATTENDNO) {
                        $type = 'Reject';
-               } elseif ($item['verb'] == ACTIVITY_ATTENDMAYBE) {
+               } elseif ($item['verb'] == Activity::ATTENDMAYBE) {
                        $type = 'TentativeAccept';
-               } elseif ($item['verb'] == ACTIVITY_FOLLOW) {
+               } elseif ($item['verb'] == Activity::FOLLOW) {
                        $type = 'Follow';
-               } elseif ($item['verb'] == ACTIVITY_TAG) {
+               } elseif ($item['verb'] == Activity::TAG) {
                        $type = 'Add';
                } else {
                        $type = '';
@@ -1037,7 +1051,7 @@ class Transmitter
                // Grab all pictures without alternative descriptions and create attachments out of them
                if (preg_match_all("/\[img\]([^\[\]]*)\[\/img\]/Usi", $body, $pictures)) {
                        foreach ($pictures[1] as $picture) {
-                               $imgdata = Image::getInfoFromURL($picture);
+                               $imgdata = Images::getInfoFromURLCached($picture);
                                if ($imgdata) {
                                        $attachments[] = ['type' => 'Document',
                                                'mediaType' => $imgdata['mime'],
@@ -1050,7 +1064,7 @@ class Transmitter
                // Grab all pictures with alternative description and create attachments out of them
                if (preg_match_all("/\[img=([^\[\]]*)\]([^\[\]]*)\[\/img\]/Usi", $body, $pictures, PREG_SET_ORDER)) {
                        foreach ($pictures as $picture) {
-                               $imgdata = Image::getInfoFromURL($picture[1]);
+                               $imgdata = Images::getInfoFromURLCached($picture[1]);
                                if ($imgdata) {
                                        $attachments[] = ['type' => 'Document',
                                                'mediaType' => $imgdata['mime'],
@@ -1560,7 +1574,7 @@ class Transmitter
                        $uid = $first_user['uid'];
                }
 
-               $condition = ['verb' => ACTIVITY_FOLLOW, 'uid' => 0, 'parent-uri' => $object,
+               $condition = ['verb' => Activity::FOLLOW, 'uid' => 0, 'parent-uri' => $object,
                        'author-id' => Contact::getPublicIdByUserId($uid)];
                if (Item::exists($condition)) {
                        Logger::log('Follow for ' . $object . ' for user ' . $uid . ' does already exist.', Logger::DEBUG);