Merge pull request #12298 from annando/api-suggestions

[friendica.git] / src / Model / Post / Collection.php

diff --git a/src/Model/Post/Collection.php b/src/Model/Post/Collection.php
index 34b5dc6dee7a2ae83b3e22075fbb0833083b5043..2758d8027749684c1d9b8952d58572965813ac00 100644 (file)
--- a/src/Model/Post/Collection.php
+++ b/src/Model/Post/Collection.php
@@ -25,6 +25,7 @@ use Friendica\Database\DBA;
 use BadMethodCallException;
 use Friendica\Database\Database;
 use Friendica\DI;
+use Friendica\Model\Item;
 use Friendica\Protocol\ActivityPub;
 
 class Collection
@@ -36,15 +37,16 @@ class Collection
         *
         * @param integer $uri_id
         * @param integer $type
+        * @param integer $author_id
         * @param integer $cache_uid If set to a non zero value, the featured cache is cleared
         */
-       public static function add(int $uri_id, int $type, int $cache_uid = 0)
+       public static function add(int $uri_id, int $type, int $author_id, int $cache_uid = 0)
        {
                if (empty($uri_id)) {
                        throw new BadMethodCallException('Empty URI_id');
                }
 
-               DBA::insert('post-collection', ['uri-id' => $uri_id, 'type' => $type], Database::INSERT_IGNORE);
+               DBA::insert('post-collection', ['uri-id' => $uri_id, 'type' => $type, 'author-id' => $author_id], Database::INSERT_IGNORE);
 
                if (!empty($cache_uid) && ($type == self::FEATURED)) {
                        DI::cache()->delete(ActivityPub\Transmitter::CACHEKEY_FEATURED . $cache_uid);
@@ -81,6 +83,6 @@ class Collection
         */
        public static function selectToArrayForContact(int $cid, int $type = self::FEATURED, array $fields = []) 
        {
-               return DBA::selectToArray('collection-view', $fields, ['cid' => $cid, 'type' => $type]);
+               return DBA::selectToArray('collection-view', $fields, ['cid' => $cid, 'private' => [Item::PUBLIC, Item::UNLISTED], 'deleted' => false, 'type' => $type]);
        }
 }