web & server: using tantivy for news post search

server/src/newsreader.rs

@@ -13,14 +13,14 @@ use crate::{
     clean_title, compute_offset_limit,
     config::Config,
     error::ServerError,
-    graphql::{NewsPost, Tag, Thread, ThreadSummary},
+    graphql::{Corpus, NewsPost, Tag, Thread, ThreadSummary},
     thread_summary_from_row, AddOutlink, EscapeHtml, FrameImages, InlineStyle, Query, SanitizeHtml,
-    SlurpContents, StripHtml, ThreadSummaryRecord, Transformer, NEWSREADER_TAG_PREFIX,
+    SlurpContents, ThreadSummaryRecord, Transformer, NEWSREADER_TAG_PREFIX,
     NEWSREADER_THREAD_PREFIX,
 };
 
-pub fn is_newsreader_search(query: &str) -> bool {
-    query.contains(NEWSREADER_TAG_PREFIX)
+pub fn is_newsreader_query(query: &Query) -> bool {
+    query.is_newsreader || query.corpus == Some(Corpus::Newsreader)
 }
 
 pub fn is_newsreader_thread(query: &str) -> bool {
@@ -28,7 +28,11 @@ pub fn is_newsreader_thread(query: &str) -> bool {
 }
 
 pub fn extract_thread_id(query: &str) -> &str {
-    &query[NEWSREADER_THREAD_PREFIX.len()..]
+    if query.starts_with(NEWSREADER_THREAD_PREFIX) {
+        &query[NEWSREADER_THREAD_PREFIX.len()..]
+    } else {
+        query
+    }
 }
 
 pub fn extract_site(tag: &str) -> &str {
@@ -39,14 +43,33 @@ pub fn make_news_tag(tag: &str) -> String {
     format!("tag:{NEWSREADER_TAG_PREFIX}{tag}")
 }
 
+fn site_from_tags(tags: &[String]) -> Option<String> {
+    for t in tags {
+        if t.starts_with(NEWSREADER_TAG_PREFIX) {
+            return Some(extract_site(t).to_string());
+        }
+    }
+    None
+}
+
 pub async fn count(pool: &PgPool, query: &Query) -> Result<usize, ServerError> {
+    if !is_newsreader_query(query) {
+        return Ok(0);
+    }
     if !query.remainder.is_empty() {
         // TODO: handle full text search against all sites, for now, early return if search words
         // are specified.
         return Ok(0);
     }
 
-    let row = sqlx::query_file!("sql/count.sql", query.tag, query.unread_only)
+    let site = site_from_tags(&query.tags);
+    if !query.tags.is_empty() && site.is_none() {
+        // Newsreader can only handle all sites read/unread queries, anything with a non-site tag
+        // isn't supported
+        return Ok(0);
+    }
+
+    let row = sqlx::query_file!("sql/count.sql", site, query.unread_only)
         .fetch_one(pool)
         .await?;
     Ok(row.count.unwrap_or(0).try_into().unwrap_or(0))
@@ -61,12 +84,22 @@ pub async fn search(
     query: &Query,
 ) -> Result<Vec<(i32, ThreadSummary)>, async_graphql::Error> {
     info!("search({after:?} {before:?} {first:?} {last:?} {query:?}");
+    if !is_newsreader_query(query) {
+        return Ok(Vec::new());
+    }
     if !query.remainder.is_empty() {
         // TODO: handle full text search against all sites, for now, early return if search words
         // are specified.
         return Ok(Vec::new());
     }
 
+    let site = site_from_tags(&query.tags);
+    if !query.tags.is_empty() && site.is_none() {
+        // Newsreader can only handle all sites read/unread queries, anything with a non-site tag
+        // isn't supported
+        return Ok(Vec::new());
+    }
+
     let (offset, mut limit) = compute_offset_limit(after, before, first, last);
     if before.is_none() {
         // When searching forward, the +1 is to see if there are more pages of data available.
@@ -75,7 +108,6 @@ pub async fn search(
         limit = limit + 1;
     }
 
-    let site = query.tag.as_ref().map(|t| extract_site(&t).to_string());
     info!(
         "search offset {offset} limit {limit} site {site:?} unread_only {}",
         query.unread_only
@@ -102,6 +134,7 @@ pub async fn search(
                 title: r.title,
                 uid: r.uid,
                 name: r.name,
+                corpus: Corpus::Newsreader,
             })
             .await,
         ));
@@ -243,12 +276,22 @@ pub async fn thread(
 }
 pub async fn set_read_status<'ctx>(
     pool: &PgPool,
-    query: &str,
+    query: &Query,
     unread: bool,
 ) -> Result<bool, ServerError> {
-    let query: Query = query.parse()?;
-    sqlx::query_file!("sql/set_unread.sql", !unread, query.uid)
-        .execute(pool)
-        .await?;
+    // TODO: make single query when query.uids.len() > 1
+    let uids: Vec<_> = query
+        .uids
+        .iter()
+        .filter(|uid| is_newsreader_thread(uid))
+        .map(
+            |uid| extract_thread_id(uid), // TODO strip prefix
+        )
+        .collect();
+    for uid in uids {
+        sqlx::query_file!("sql/set_unread.sql", !unread, uid)
+            .execute(pool)
+            .await?;
+    }
     Ok(true)
 }