Benature/omnivore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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
parent a5f3c5992a 2636524642
commit 97777df784
1 changed files with 2 additions and 2 deletions
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: case InFilter.ALL:
return null return null
case InFilter.ARCHIVE: 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: case InFilter.TRASH:
// return only deleted pages within 14 days // return only deleted pages within 14 days
return "(library_item.state = 'DELETED' AND library_item.deleted_at >= now() - interval '14 days')" return "(library_item.state = 'DELETED' AND library_item.deleted_at >= now() - interval '14 days')"
default: { default: {
let sql = "library_item.state <> 'ARCHIVED'" let sql = 'library_item.archived_at is null'
if (useFolders) { if (useFolders) {
const param = `folder_${parameters.length}` const param = `folder_${parameters.length}`
const folderSql = escapeQueryWithParameters( const folderSql = escapeQueryWithParameters(