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

improve search

Browse Source
This commit is contained in:
Hongbo Wu
2024-08-23 10:51:27 +08:00
parent 7a4016ed0c
commit 1d50bc9506
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/api/src/services/library_item.ts
View File

@ -324,17 +324,16 @@ export const buildQueryString = (
// 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.archived_at IS NULL'
if (useFolders) {
const param = `folder_${parameters.length}`
const folderSql = escapeQueryWithParameters(
`library_item.folder = :${param}`,
{ [param]: value }
)
sql = `(${sql} AND ${folderSql})`
return `(library_item.archived_at IS NULL AND ${folderSql})`
}
return sql
return '(library_item.archived_at IS NULL AND library_item.folder IS NOT NULL)'
}
}
}
@ -656,7 +655,7 @@ export const createSearchQueryBuilder = (
const orders: Sort[] = []
let queryString: string | null = null
if (args.query) {
if (args.query !== null && args.query !== undefined) {
const searchQuery = parseSearchQuery(args.query)
// build query string and save parameters

2
packages/api/src/utils/search.ts
View File

@ -17,7 +17,7 @@ export const parseSearchQuery = (query: string): LiqeQuery => {
// by default we want to search in the inbox if no in: is specified
if (!searchQuery.includes('in:')) {
searchQuery = `(${searchQuery}) in:inbox`
searchQuery = `in:inbox (${searchQuery})`
}
return parse(searchQuery)