From cba83c159392c28792f5b74959cae2332e114b76 Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Wed, 3 Jan 2024 12:56:26 +0800
Subject: [PATCH 1/2] Update the default Highlights query

This query is more of what people want, all their created
highlights, not just ones in their current inbox. Since a normal
workflow would be: read + highlight, archive, review highlights.
---
 .../0152.do.update_highlights_saved_search.sql       | 12 ++++++++++++
 .../0152.undo.update_highlights_saved_search.sql     | 12 ++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100755 packages/db/migrations/0152.do.update_highlights_saved_search.sql
 create mode 100755 packages/db/migrations/0152.undo.update_highlights_saved_search.sql

diff --git a/packages/db/migrations/0152.do.update_highlights_saved_search.sql b/packages/db/migrations/0152.do.update_highlights_saved_search.sql
new file mode 100755
index 000000000..29fe3586e
--- /dev/null
+++ b/packages/db/migrations/0152.do.update_highlights_saved_search.sql
@@ -0,0 +1,12 @@
+-- Type: DO
+-- Name: update_highlights_saved_search
+-- Description: Update highlights saved search to use all instead of inbox
+
+BEGIN;
+
+UPDATE omnivore.filters 
+  SET filter = 'in:all has:highlights mode:highlights' 
+  WHERE name = 'Highlights' 
+  AND filter = 'has:highlights mode:highlights' ;
+
+COMMIT;
diff --git a/packages/db/migrations/0152.undo.update_highlights_saved_search.sql b/packages/db/migrations/0152.undo.update_highlights_saved_search.sql
new file mode 100755
index 000000000..a842c252d
--- /dev/null
+++ b/packages/db/migrations/0152.undo.update_highlights_saved_search.sql
@@ -0,0 +1,12 @@
+-- Type: UNDO
+-- Name: update_highlights_saved_search
+-- Description: Update highlights saved search to use all instead of inbox
+
+BEGIN;
+
+UPDATE omnivore.filters 
+  SET filter = 'has:highlights mode:highlights' 
+  WHERE name = 'Highlights' 
+  AND filter = 'in:all has:highlights mode:highlights' ;
+
+COMMIT;

From a1ea20b964b7b8a7b75934e8876558c780c70557 Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Wed, 3 Jan 2024 18:21:13 +0800
Subject: [PATCH 2/2] Update highlights query for new users

---
 packages/api/src/services/create_user.ts                    | 2 +-
 packages/web/components/templates/homeFeed/EmptyLibrary.tsx | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/api/src/services/create_user.ts b/packages/api/src/services/create_user.ts
index a04ff8164..fdeb188c2 100644
--- a/packages/api/src/services/create_user.ts
+++ b/packages/api/src/services/create_user.ts
@@ -160,7 +160,7 @@ const createDefaultFiltersForUser =
         filter: 'in:inbox sort:read-desc is:reading',
       },
       { name: 'Non-Feed Items', filter: 'no:subscription' },
-      { name: 'Highlights', filter: 'has:highlights mode:highlights' },
+      { name: 'Highlights', filter: 'in:all has:highlights mode:highlights' },
       { name: 'Unlabeled', filter: 'no:label' },
       { name: 'Oldest First', filter: 'sort:saved-asc' },
       { name: 'Files', filter: 'type:file' },
diff --git a/packages/web/components/templates/homeFeed/EmptyLibrary.tsx b/packages/web/components/templates/homeFeed/EmptyLibrary.tsx
index 23dfe3d7b..dc7ca5777 100644
--- a/packages/web/components/templates/homeFeed/EmptyLibrary.tsx
+++ b/packages/web/components/templates/homeFeed/EmptyLibrary.tsx
@@ -171,7 +171,9 @@ export const EmptyLibrary = (props: EmptyLibraryProps) => {
           return 'continue'
         case 'no:subscription':
           return 'non-feed'
+        // Handle both cases while we migrate
         case 'has:highlights mode:highlights':
+        case 'in:all has:highlights mode:highlights':
           return 'highlight'
         case 'no:label':
           return 'unlabeled'