diff options
| author | Marco Nassabain <marco.nassabain@hotmail.com> | 2021-02-24 23:04:12 +0100 |
|---|---|---|
| committer | Sean Molenaar <SMillerDev@users.noreply.github.com> | 2021-04-08 22:31:21 +0200 |
| commit | 1f0924fb57f431a751dd3836a6145d5a8955af8f (patch) | |
| tree | e629c45ac194d2907efa391b73e78f9901a4cbd3 /lib/Db | |
| parent | 26ae92bc7b0275cb732bef12f66471091134a5ca (diff) | |
✨ ItemMapperV2: exclude shared items in functions
updated the following functions to exclude shared_items:
- findAllInFeedAfter
- findAllInFolderAfter
- findAllFeed
- findAllFolder
Signed-off-by: Marco Nassabain <marco.nassabain@hotmail.com>
Diffstat (limited to 'lib/Db')
| -rw-r--r-- | lib/Db/ItemMapperV2.php | 4 |
1 files changed, 4 insertions, 0 deletions
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')) |