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

do not include archived items in library or subscription

Browse source
This commit is contained in:
Hongbo Wu 2023-07-18 16:45:24 +08:00
parent 89ee3675b9
commit dcb306bcfc
1 changed files with 28 additions and 25 deletions
Show stats 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
}