prehistoric-systems/omnivore
1
0
Fork 0
mirror of https://github.com/omnivore-app/omnivore.git synced 2026-03-11 08:54:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3598 from omnivore-app/fix/archive

Browse source 
fix search results for archived items which state is not archived
This commit is contained in:
Hongbo Wu 2024-02-29 16:44:35 +08:00 committed by GitHub
commit 97777df784
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/api/src/services/library_item.ts
View file

@ -274,12 +274,12 @@ export const buildQueryString = (
case InFilter.ALL:
return null
case InFilter.ARCHIVE:
return "library_item.state = 'ARCHIVED'"
return "(library_item.state = 'ARCHIVED' or (library_item.state != 'DELETED' and library_item.archived_at is not null))"
case InFilter.TRASH:
// return only deleted pages within 14 days
return "(library_item.state = 'DELETED' AND library_item.deleted_at >= now() - interval '14 days')"
default: {
let sql = "library_item.state <> 'ARCHIVED'"
let sql = 'library_item.archived_at is null'
if (useFolders) {
const param = `folder_${parameters.length}`
const folderSql = escapeQueryWithParameters(