From 1f0924fb57f431a751dd3836a6145d5a8955af8f Mon Sep 17 00:00:00 2001 From: Marco Nassabain Date: Wed, 24 Feb 2021 23:04:12 +0100 Subject: =?UTF-8?q?=E2=9C=A8=20ItemMapperV2:=20exclude=20shared=20items=20?= =?UTF-8?q?in=20functions=20updated=20the=20following=20functions=20to=20e?= =?UTF-8?q?xclude=20shared=5Fitems:=20-=20findAllInFeedAfter=20-=20findAll?= =?UTF-8?q?InFolderAfter=20-=20findAllFeed=20-=20findAllFolder?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marco Nassabain --- lib/Db/ItemMapperV2.php | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lib/Db') diff --git a/lib/Db/ItemMapperV2.php b/lib/Db/ItemMapperV2.php index b1a4e9015..0e90fca40 100644 --- a/lib/Db/ItemMapperV2.php +++ b/lib/Db/ItemMapperV2.php @@ -334,6 +334,7 @@ class ItemMapperV2 extends NewsMapperV2 ->from($this->tableName, 'items') ->innerJoin('items', FeedMapperV2::TABLE_NAME, 'feeds', 'items.feed_id = feeds.id') ->andWhere('items.last_modified >= :updatedSince') + ->andWhere('items.shared_by = \'\'') ->andWhere('feeds.user_id = :userId') ->andWhere('feeds.id = :feedId') ->andWhere('feeds.deleted_at = 0') @@ -374,6 +375,7 @@ class ItemMapperV2 extends NewsMapperV2 ->innerJoin('items', FeedMapperV2::TABLE_NAME, 'feeds', 'items.feed_id = feeds.id') ->innerJoin('feeds', FolderMapperV2::TABLE_NAME, 'folders', 'feeds.folder_id = folders.id') ->andWhere('items.last_modified >= :updatedSince') + ->andWhere('items.shared_by = \'\'') ->andWhere('feeds.user_id = :userId') ->andWhere('feeds.deleted_at = 0') ->andWhere('folders.id = :folderId') @@ -473,6 +475,7 @@ class ItemMapperV2 extends NewsMapperV2 ->andWhere('feeds.deleted_at = 0') ->andWhere('feeds.user_id = :userId') ->andWhere('items.feed_id = :feedId') + ->andWhere('items.shared_by = \'\'') ->setParameter('userId', $userId) ->setParameter('feedId', $feedId) ->orderBy('items.last_modified', ($oldestFirst ? 'ASC' : 'DESC')) @@ -536,6 +539,7 @@ class ItemMapperV2 extends NewsMapperV2 ->innerJoin('items', FeedMapperV2::TABLE_NAME, 'feeds', 'items.feed_id = feeds.id') ->andWhere('feeds.user_id = :userId') ->andWhere('feeds.deleted_at = 0') + ->andWhere('items.shared_by = \'\'') ->andWhere($folderWhere) ->setParameter('userId', $userId) ->orderBy('items.last_modified', ($oldestFirst ? 'ASC' : 'DESC')) -- cgit v1.2.3