Search content in articles

Author: jocmp

Gemfile

@@ -1,4 +1,4 @@
 source "https://rubygems.org"
 
 gem 'fastlane', "~> 2.222"
-gem "rexml", "~> 3.3.4"
+gem "rexml", "~> 3.3.6"

Gemfile.lock

@@ -171,7 +171,7 @@ GEM
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.3.4)
+    rexml (3.3.6)
       strscan
     rouge (2.0.7)
     ruby2_keywords (0.0.5)
@@ -214,7 +214,7 @@ PLATFORMS
 
 DEPENDENCIES
   fastlane (~> 2.222)
-  rexml (~> 3.3.4)
+  rexml (~> 3.3.6)
 
 BUNDLED WITH
    2.4.21

app/src/main/java/com/capyreader/app/ui/articles/detail/ArticleView.kt

@@ -90,18 +90,6 @@ fun ArticleView(
                 .padding(innerPadding)
                 .fillMaxSize()
         ) {
-            if (article == null) {
-                Box(
-                    contentAlignment = Alignment.Center,
-                    modifier = Modifier
-                        .padding(bottom = 64.dp)
-
-                        .fillMaxSize()
-                ) {
-                    CapyPlaceholder()
-                }
-            }
-
             Column(
                 Modifier.fillMaxSize()
             ) {
@@ -112,6 +100,17 @@ fun ArticleView(
                     modifier = Modifier.fillMaxSize(),
                 )
             }
+
+            if (article == null) {
+                Box(
+                    contentAlignment = Alignment.Center,
+                    modifier = Modifier
+                        .padding(bottom = 64.dp)
+                        .fillMaxSize()
+                ) {
+                    CapyPlaceholder()
+                }
+            }
         }
     }
 

capy/src/main/sqldelight/com/jocmp/capy/db/articles.sq

@@ -19,7 +19,7 @@ JOIN feeds ON articles.feed_id = feeds.id
 JOIN article_statuses ON articles.id = article_statuses.article_id
 WHERE ((article_statuses.read = :read AND article_statuses.last_read_at IS NULL OR article_statuses.last_read_at >= :lastReadAt) OR :read IS NULL)
 AND (article_statuses.starred = :starred OR :starred IS NULL)
-AND (articles.title LIKE '%' || :query || '%' OR articles.summary  LIKE '%' || :query || '%' OR :query IS NULL)
+AND (articles.title LIKE '%' || :query || '%' OR articles.content_html LIKE '%' || :query || '%' OR :query IS NULL)
 GROUP BY articles.id
 ORDER BY articles.published_at DESC
 LIMIT :limit OFFSET :offset;
@@ -30,7 +30,7 @@ FROM articles
 JOIN article_statuses ON articles.id = article_statuses.article_id
 WHERE ((article_statuses.read = :read AND article_statuses.last_read_at IS NULL OR article_statuses.last_read_at >= :lastReadAt) OR :read IS NULL)
 AND (article_statuses.starred = :starred OR :starred IS NULL)
-AND (articles.title LIKE '%' || :query || '%' OR articles.summary  LIKE '%' || :query || '%' OR :query IS NULL);
+AND (articles.title LIKE '%' || :query || '%' OR articles.content_html LIKE '%' || :query || '%' OR :query IS NULL);
 
 allByFeeds:
 SELECT
@@ -54,7 +54,7 @@ JOIN article_statuses ON articles.id = article_statuses.article_id
 WHERE articles.feed_id IN :feedIDs
 AND ((article_statuses.read = :read AND article_statuses.last_read_at IS NULL OR article_statuses.last_read_at >= :lastReadAt) OR :read IS NULL)
 AND (article_statuses.starred = :starred OR :starred IS NULL)
-AND (articles.title LIKE '%' || :query || '%' OR articles.summary  LIKE '%' || :query || '%' OR :query IS NULL)
+AND (articles.title LIKE '%' || :query || '%' OR articles.content_html LIKE '%' || :query || '%' OR :query IS NULL)
 GROUP BY articles.id
 ORDER BY articles.published_at DESC
 LIMIT :limit OFFSET :offset;
@@ -65,7 +65,7 @@ FROM articles
 JOIN article_statuses ON articles.id = article_statuses.article_id
 WHERE articles.feed_id IN :feedIDs
 AND ((article_statuses.read = :read AND article_statuses.last_read_at IS NULL OR article_statuses.last_read_at >= :lastReadAt) OR :read IS NULL)
-AND (articles.title LIKE '%' || :query || '%' OR articles.summary  LIKE '%' || :query || '%' OR :query IS NULL)
+AND (articles.title LIKE '%' || :query || '%' OR articles.content_html LIKE '%' || :query || '%' OR :query IS NULL)
 AND (article_statuses.starred = :starred OR :starred IS NULL);
 
 findArticleIDsByStatus: