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

Merge pull request #2502 from omnivore-app/fix/read-later

Browse Source 
do not include archived items in library or subscription
This commit is contained in:
Hongbo Wu
2023-07-18 16:48:29 +08:00
committed by GitHub
parent f37896fd3a dcb306bcfc
commit 11ebde2988
1 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
packages/api/src/elastic/pages.ts
View File

@ -149,38 +149,40 @@ const appendInFilter = (builder: ESBuilder, filter: InFilter): ESBuilder => {
},
})
case InFilter.LIBRARY:
return builder.query('bool', {
should: [
{
nested: {
path: 'labels',
query: {
term: {
'labels.name': 'library',
return builder
.query('bool', {
should: [
{
nested: {
path: 'labels',
query: {
term: {
'labels.name': 'library',
},
},
},
},
},
{
bool: {
must_not: [
{
nested: {
path: 'labels',
query: {
terms: {
'labels.name': ['newsletter', 'rss'],
{
bool: {
must_not: [
{
nested: {
path: 'labels',
query: {
terms: {
'labels.name': ['newsletter', 'rss'],
},
},
},
},
},
],
should: [],
],
should: [],
},
},
},
],
minimum_should_match: 1,
})
],
minimum_should_match: 1,
})
.notQuery('exists', { field: 'archivedAt' })
case InFilter.SUBSCRIPTION:
return builder
.andQuery('nested', {
@ -199,6 +201,7 @@ const appendInFilter = (builder: ESBuilder, filter: InFilter): ESBuilder => {
},
},
})
.notQuery('exists', { field: 'archivedAt' })
default:
return builder
}