diff options
| author | Sean Molenaar <sean@seanmolenaar.eu> | 2021-03-23 20:05:58 +0100 |
|---|---|---|
| committer | Sean Molenaar <SMillerDev@users.noreply.github.com> | 2021-03-23 21:11:25 +0100 |
| commit | baf1ca8ec9e3964c97c6e11ca9c6a56e38b8fe48 (patch) | |
| tree | 146a42d1be66f2ca81443f0bf084cc70d4dc2a35 /lib | |
| parent | 4e1d6eaa32524c119c4d2838e904aa02d3fced1b (diff) | |
DB: Don't show deleted feed items
Signed-off-by: Sean Molenaar <sean@seanmolenaar.eu>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Db/ItemMapperV2.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/Db/ItemMapperV2.php b/lib/Db/ItemMapperV2.php index 33b4611f9..93457d4f9 100644 --- a/lib/Db/ItemMapperV2.php +++ b/lib/Db/ItemMapperV2.php @@ -316,6 +316,7 @@ class ItemMapperV2 extends NewsMapperV2 ->andWhere('items.last_modified >= :updatedSince') ->andWhere('feeds.user_id = :userId') ->andWhere('feeds.id = :feedId') + ->andWhere('feeds.deleted_at = 0') ->setParameters([ 'updatedSince' => $updatedSince, 'feedId' => $feedId, @@ -353,6 +354,7 @@ class ItemMapperV2 extends NewsMapperV2 ->innerJoin('feeds', FolderMapperV2::TABLE_NAME, 'folders', 'feeds.folder_id = folders.id') ->andWhere('items.last_modified >= :updatedSince') ->andWhere('feeds.user_id = :userId') + ->andWhere('feeds.deleted_at = 0') ->andWhere('folders.id = :folderId') ->setParameters(['updatedSince' => $updatedSince, 'folderId' => $folderId, 'userId' => $userId]) ->orderBy('items.last_modified', 'DESC') @@ -381,6 +383,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('feeds.deleted_at = 0') ->andWhere('feeds.user_id = :userId') ->setParameters(['updatedSince' => $updatedSince, 'userId' => $userId]) ->orderBy('items.last_modified', 'DESC') @@ -443,6 +446,7 @@ class ItemMapperV2 extends NewsMapperV2 $builder->select('items.*') ->from($this->tableName, 'items') ->innerJoin('items', FeedMapperV2::TABLE_NAME, 'feeds', 'items.feed_id = feeds.id') + ->andWhere('feeds.deleted_at = 0') ->andWhere('feeds.user_id = :userId') ->andWhere('items.feed_id = :feedId') ->setParameter('userId', $userId) @@ -503,6 +507,7 @@ class ItemMapperV2 extends NewsMapperV2 ->from($this->tableName, 'items') ->innerJoin('items', FeedMapperV2::TABLE_NAME, 'feeds', 'items.feed_id = feeds.id') ->andWhere('feeds.user_id = :userId') + ->andWhere('feeds.deleted_at = 0') ->andWhere($folderWhere) ->setParameter('userId', $userId) ->setMaxResults($limit) @@ -554,6 +559,7 @@ class ItemMapperV2 extends NewsMapperV2 ->from($this->tableName, 'items') ->innerJoin('items', FeedMapperV2::TABLE_NAME, 'feeds', 'items.feed_id = feeds.id') ->andWhere('feeds.user_id = :userId') + ->andWhere('feeds.deleted_at = 0') ->setParameter('userId', $userId) ->setMaxResults($limit) ->orderBy('items.last_modified', ($oldestFirst ? 'ASC' : 'DESC')) |