feat(search): add filtering by post type

Author: realprogrammersusevim

src/post.rs

@@ -26,6 +26,16 @@ impl From<String> for ContentType {
     }
 }
 
+impl Into<String> for ContentType {
+    fn into(self) -> String {
+        match self {
+            ContentType::Post => "post".into(),
+            ContentType::Link => "link".into(),
+            ContentType::Quote => "quote".into(),
+        }
+    }
+}
+
 #[derive(Debug, Clone, Serialize)]
 pub struct Post {
     pub id: String,

src/services/post.rs

@@ -129,7 +129,7 @@ impl PostService {
                     rusqlite::Error::QueryReturnedNoRows => {
                         anyhow::anyhow!("Post not found: {}", id_for_error)
                     }
-                    _ => e.into()
+                    _ => e.into(),
                 }
             } else {
                 e
@@ -160,7 +160,7 @@ impl PostService {
                     rusqlite::Error::QueryReturnedNoRows => {
                         anyhow::anyhow!("Special page not found: {}", id_for_error)
                     }
-                    _ => e.into()
+                    _ => e.into(),
                 }
             } else {
                 e

src/services/search.rs

@@ -31,7 +31,13 @@ impl SearchService {
             tags: query.tags.clone(),
             from_date: query.from_date.clone(),
             to_date: query.to_date.clone(),
+            post_type: Default::default(),
         };
+        let post_types_as_strings: Vec<String> = query
+            .post_type
+            .iter()
+            .map(|pt| pt.to_owned().into())
+            .collect();
         let offset = (page - 1) * per_page;
         let pool = self.pool.clone();
 
@@ -52,7 +58,9 @@ impl SearchService {
             }
 
             for tag in &owned_query.tags {
-                conditions.push("EXISTS (SELECT 1 FROM json_each(posts.tags) WHERE value = ?)".to_string());
+                conditions.push(
+                    "EXISTS (SELECT 1 FROM json_each(posts.tags) WHERE value = ?)".to_string(),
+                );
                 params.push(Box::new(tag));
             }
 
@@ -65,6 +73,18 @@ impl SearchService {
                 params.push(Box::new(date));
             }
 
+            if !post_types_as_strings.is_empty() {
+                let placeholders = post_types_as_strings
+                    .iter()
+                    .map(|_| "?")
+                    .collect::<Vec<_>>()
+                    .join(", ");
+                conditions.push(format!("posts.content_type IN ({})", placeholders));
+                for pt_str in &post_types_as_strings {
+                    params.push(Box::new(pt_str.clone()));
+                }
+            }
+
             let where_clause = if !conditions.is_empty() {
                 format!("WHERE {}", conditions.join(" AND "))
             } else {

src/services/search_query.rs

@@ -1,18 +1,22 @@
 use regex::Regex;
 
+use crate::post::ContentType;
+
 #[derive(Debug, Default)]
 pub struct SearchQuery {
     pub text_query: String,
     pub tags: Vec<String>,
     pub from_date: Option<String>,
     pub to_date: Option<String>,
+    pub post_type: Vec<ContentType>,
 }
 
 impl SearchQuery {
     pub fn from_raw(raw: &str) -> Self {
         let mut result = SearchQuery::default();
         let tag_re = Regex::new(r"tag:([^\s]+)").unwrap();
         let date_re = Regex::new(r"(from|to):(\d{4}-\d{2}-\d{2})").unwrap();
+        let type_re = Regex::new(r"type:(post|link|quote)").unwrap();
 
         // Extract tags
         for cap in tag_re.captures_iter(raw) {
@@ -32,9 +36,17 @@ impl SearchQuery {
             }
         }
 
+        // Extract type
+        for cap in type_re.captures_iter(raw) {
+            if let Some(p_type) = cap.get(1).map(|m| m.as_str().to_string()) {
+                result.post_type.push(ContentType::from(p_type));
+            }
+        }
+
         // Clean text query
         result.text_query = tag_re.replace_all(raw, "").to_string();
         result.text_query = date_re.replace_all(&result.text_query, "").to_string();
+        result.text_query = type_re.replace_all(&result.text_query, "").to_string();
         result.text_query = result.text_query.trim().to_string();
 
         result