From 52f302f5b0c9dbb445c5bd8a5269743ef3b8b300 Mon Sep 17 00:00:00 2001
From: Jackson Harper <jacksonh@gmail.com>
Date: Fri, 21 Apr 2023 12:33:23 +0800
Subject: [PATCH] Fetch all label and highlight info when doing library updates

---
 android/Omnivore/app/src/main/graphql/Search.graphql       | 7 ++-----
 android/Omnivore/app/src/main/graphql/UpdatesSince.graphql | 7 ++-----
 .../java/app/omnivore/omnivore/dataService/LibrarySync.kt  | 6 +++---
 .../java/app/omnivore/omnivore/networking/SearchQuery.kt   | 6 +++---
 4 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/android/Omnivore/app/src/main/graphql/Search.graphql b/android/Omnivore/app/src/main/graphql/Search.graphql
index 9a397ce81..e35140fc2 100644
--- a/android/Omnivore/app/src/main/graphql/Search.graphql
+++ b/android/Omnivore/app/src/main/graphql/Search.graphql
@@ -22,13 +22,10 @@ query Search($after: String, $first: Int, $query: String) {
           originalArticleUrl
           uploadFileId
           labels {
-            id
-            name
-            color
+            ...LabelFields
           }
           highlights {
-            id
-            type
+            ...HighlightFields
           }
           pageId
           shortId
diff --git a/android/Omnivore/app/src/main/graphql/UpdatesSince.graphql b/android/Omnivore/app/src/main/graphql/UpdatesSince.graphql
index d1a7434bd..aa93b28d5 100644
--- a/android/Omnivore/app/src/main/graphql/UpdatesSince.graphql
+++ b/android/Omnivore/app/src/main/graphql/UpdatesSince.graphql
@@ -24,13 +24,10 @@ query UpdatesSince($after: String, $first: Int, $since: Date!) {
           originalArticleUrl
           uploadFileId
           labels {
-            id
-            name
-            color
+            ...LabelFields
           }
           highlights {
-            id
-            type
+            ...HighlightFields
           }
           pageId
           shortId
diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/dataService/LibrarySync.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/dataService/LibrarySync.kt
index adb4fe09c..cb2e546c7 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/dataService/LibrarySync.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/dataService/LibrarySync.kt
@@ -76,9 +76,9 @@ suspend fun DataService.sync(since: String, cursor: String?, limit: Int = 20): S
   for (item in syncResult.items) {
     val itemLabels = (item.labels ?: listOf()).map {
       SavedItemLabel(
-        savedItemLabelId = it.id,
-        name = it.name,
-        color = it.color,
+        savedItemLabelId = it.labelFields.id,
+        name = it.labelFields.name,
+        color = it.labelFields.color,
         createdAt = null,
         labelDescription = null
       )
diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/networking/SearchQuery.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/networking/SearchQuery.kt
index 45bb98d1a..2662789f8 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/networking/SearchQuery.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/networking/SearchQuery.kt
@@ -91,9 +91,9 @@ suspend fun Networker.search(
         ),
         labels = (it.node.labels ?: listOf()).map { label ->
           SavedItemLabel(
-            savedItemLabelId = label.id,
-            name = label.name,
-            color = label.color,
+            savedItemLabelId = label.labelFields.id,
+            name = label.labelFields.name,
+            color = label.labelFields.color,
             createdAt = null,
             labelDescription = null
           )