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

Revert "improve search"

Browse Source 
This reverts commit b2cf7d25d9a1da46a2f20c874a211158306b0e1c.
This commit is contained in:
Hongbo Wu
2024-08-26 14:14:30 +08:00
parent 322ca921b0
commit bb9967a209
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -324,16 +324,17 @@ 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 }
)
return `(library_item.archived_at IS NULL AND ${folderSql})`
sql = `(${sql} AND ${folderSql})`
}
return '(library_item.archived_at IS NULL AND library_item.folder IS NOT NULL)'
return sql
}
}
}
@ -655,7 +656,7 @@ export const createSearchQueryBuilder = (
const orders: Sort[] = []
let queryString: string | null = null
if (args.query !== null && args.query !== undefined) {
if (args.query) {
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 = `in:inbox (${searchQuery})`
searchQuery = `(${searchQuery}) in:inbox`
}
return parse(searchQuery)