X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FActivityPub%2FTransmitter.php;h=a65ebc8cda8ab1ff202860c9b6414b3630336972;hb=f62f82df75ef96b8c8c09e5a9d3c090b00d352ac;hp=a65f85542296cc79a047f33db4b92fcdfde58946;hpb=6331e1e71c467e15161aab311089d66d324dbb04;p=friendica.git diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php index a65f855422..a65ebc8cda 100644 --- a/src/Protocol/ActivityPub/Transmitter.php +++ b/src/Protocol/ActivityPub/Transmitter.php @@ -235,26 +235,28 @@ class Transmitter */ public static function getOutbox($owner, $page = null, $requester = '') { - $public_contact = Contact::getIdForURL($owner['url']); - $condition = ['uid' => 0, 'contact-id' => $public_contact, - 'private' => [Item::PUBLIC, Item::UNLISTED]]; + $condition = ['private' => [Item::PUBLIC, Item::UNLISTED]]; if (!empty($requester)) { $requester_id = Contact::getIdForURL($requester, $owner['uid']); if (!empty($requester_id)) { $permissionSets = DI::permissionSet()->selectByContactId($requester_id, $owner['uid']); if (!empty($permissionSets)) { - $condition = ['uid' => $owner['uid'], 'origin' => true, - 'psid' => array_merge($permissionSets->column('id'), + $condition = ['psid' => array_merge($permissionSets->column('id'), [DI::permissionSet()->getIdFromACL($owner['uid'], '', '', '', '')])]; } } } $condition = array_merge($condition, - ['author-id' => $public_contact, - 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT], - 'deleted' => false, 'visible' => true]); + ['uid' => $owner['uid'], + 'author-id' => Contact::getIdForURL($owner['url'], 0, false), + 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT], + 'network' => Protocol::FEDERATED, + 'parent-network' => Protocol::FEDERATED, + 'origin' => true, + 'deleted' => false, + 'visible' => true]); $count = Post::count($condition); @@ -269,8 +271,6 @@ class Transmitter $data['type'] = 'OrderedCollectionPage'; $list = []; - $condition['parent-network'] = Protocol::NATIVE_SUPPORT; - $items = Post::select(['id'], $condition, ['limit' => [($page - 1) * 20, 20], 'order' => ['created' => true]]); while ($item = Post::fetch($items)) { $activity = self::createActivityFromItem($item['id'], true);