From bd581619058773b3709bba0e4f58cbd57271ff7a Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Mon, 26 Aug 2024 14:14:30 +0800
Subject: [PATCH] Revert "improve search"

This reverts commit b2cf7d25d9a1da46a2f20c874a211158306b0e1c.
---
 packages/api/src/services/library_item.ts | 7 ++++---
 packages/api/src/utils/search.ts          | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/api/src/services/library_item.ts b/packages/api/src/services/library_item.ts
index 054293c5d9..bd64cf1e03 100644
--- a/packages/api/src/services/library_item.ts
+++ b/packages/api/src/services/library_item.ts
@@ -321,16 +321,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
             }
           }
         }
@@ -652,7 +653,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
diff --git a/packages/api/src/utils/search.ts b/packages/api/src/utils/search.ts
index 1fcbf7f11e..871c1d9843 100644
--- a/packages/api/src/utils/search.ts
+++ b/packages/api/src/utils/search.ts
@@ -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)