Merge pull request #8554 from annando/fix-8551

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

diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php
index 0b80e978637092848a0e6aa5789633bf22977895..0e5056dbe5e83d3b3f49ad0da946bf94a651e2ec 100644 (file)
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@@ -71,7 +71,7 @@ class Transmitter
         */
        public static function getFollowers($owner, $page = null)
        {
-               $condition = ['rel' => [Contact::FOLLOWER, Contact::FRIEND], 'network' => Protocol::NATIVE_SUPPORT, 'uid' => $owner['uid'],
+               $condition = ['rel' => [Contact::FOLLOWER, Contact::FRIEND], 'network' => Protocol::FEDERATED, 'uid' => $owner['uid'],
                        'self' => false, 'deleted' => false, 'hidden' => false, 'archive' => false, 'pending' => false];
                $count = DBA::count('contact', $condition);
 
@@ -120,7 +120,7 @@ class Transmitter
         */
        public static function getFollowing($owner, $page = null)
        {
-               $condition = ['rel' => [Contact::SHARING, Contact::FRIEND], 'network' => Protocol::NATIVE_SUPPORT, 'uid' => $owner['uid'],
+               $condition = ['rel' => [Contact::SHARING, Contact::FRIEND], 'network' => Protocol::FEDERATED, 'uid' => $owner['uid'],
                        'self' => false, 'deleted' => false, 'hidden' => false, 'archive' => false, 'pending' => false];
                $count = DBA::count('contact', $condition);
 
@@ -193,8 +193,10 @@ class Transmitter
                        $items = Item::select(['id'], $condition, ['limit' => [($page - 1) * 20, 20], 'order' => ['created' => true]]);
                        while ($item = Item::fetch($items)) {
                                $activity = self::createActivityFromItem($item['id'], true);
+                               $activity['type'] = $activity['type'] == 'Update' ? 'Create' : $activity['type'];
+
                                // Only list "Create" activity objects here, no reshares
-                               if (is_array($activity['object']) && ($activity['type'] == 'Create')) {
+                               if (!empty($activity['object']) && ($activity['type'] == 'Create')) {
                                        $list[] = $activity['object'];
                                }
                        }
@@ -341,7 +343,11 @@ class Transmitter
                        }
 
                        foreach ($activity[$element] as $receiver) {
-                               if ($receiver == $profile['followers'] && !empty($item_profile['followers'])) {
+                               if (empty($receiver)) {
+                                       continue;
+                               }
+
+                               if (!empty($profile['followers']) && $receiver == $profile['followers'] && !empty($item_profile['followers'])) {
                                        $permissions[$element][] = $item_profile['followers'];
                                } elseif (!in_array($receiver, $exclude)) {
                                        $permissions[$element][] = $receiver;
@@ -472,7 +478,7 @@ class Transmitter
                                                                $data['to'][] = $profile['url'];
                                                        } else {
                                                                $data['cc'][] = $profile['url'];
-                                                               if (($item['private'] != Item::PRIVATE) && $item['private'] && !empty($actor_profile['followers'])) {
+                                                               if (($item['private'] != Item::PRIVATE) && !empty($actor_profile['followers'])) {
                                                                        $data['cc'][] = $actor_profile['followers'];
                                                                }
                                                        }
@@ -649,7 +655,7 @@ class Transmitter
                        $blindcopy = in_array($element, ['bto', 'bcc']);
 
                        foreach ($permissions[$element] as $receiver) {
-                               if (Network::isUrlBlocked($receiver)) {
+                               if (empty($receiver) || Network::isUrlBlocked($receiver)) {
                                        continue;
                                }
 
@@ -1212,7 +1218,7 @@ class Transmitter
         */
        private static function isSensitive($item_id)
        {
-               $condition = ['otype' => TERM_OBJ_POST, 'oid' => $item_id, 'type' => TERM_HASHTAG, 'term' => 'nsfw'];
+               $condition = ['otype' => Term::OBJECT_TYPE_POST, 'oid' => $item_id, 'type' => Term::HASHTAG, 'term' => 'nsfw'];
                return DBA::exists('term', $condition);
        }
 
@@ -1400,8 +1406,8 @@ class Transmitter
         */
        private static function createAddTag($item, $data)
        {
-               $object = XML::parseString($item['object'], false);
-               $target = XML::parseString($item["target"], false);
+               $object = XML::parseString($item['object']);
+               $target = XML::parseString($item["target"]);
 
                $data['diaspora:guid'] = $item['guid'];
                $data['actor'] = $item['author-link'];