Adds active filter

Author: sanpii

api/src/services/search.rs

@@ -2,6 +2,7 @@ use actix_web::web::{Data, Query};
 
 #[derive(serde::Deserialize)]
 struct Request {
+    active: Option<bool>,
     q: Option<String>,
     tag: Option<String>,
     source: Option<String>,
@@ -53,7 +54,7 @@ fn search(
     clause: &elephantry::Where,
     query: &Request,
 ) -> oxfeed::Result<actix_web::HttpResponse> {
-    use std::fmt::Write;
+    use std::fmt::Write as _;
 
     let mut clause = clause.clone();
 
@@ -64,6 +65,10 @@ fn search(
         include_str!("../../sql/search_items.sql").to_string()
     };
 
+    if let Some(active) = &query.active {
+        clause.and_where("s.active = $*", vec![active]);
+    }
+
     if let Some(tag) = &query.tag {
         clause.and_where("$* = any(tags)", vec![tag]);
     }
@@ -118,6 +123,10 @@ async fn sources(
         .and_where("source.title ~* $*", vec![&q])
         .build();
 
+    if let Some(active) = &query.active {
+        clause.and_where("source.active = $*", vec![active]);
+    }
+
     if let Some(source) = &query.source {
         clause.and_where("source.url ~* $*", vec![source])
     }

front/src/filter.rs

@@ -1,5 +1,6 @@
 #[derive(Clone, Default, Eq, PartialEq)]
 pub(crate) struct Filter {
+    active: Option<bool>,
     q: String,
     source: String,
     tag: String,
@@ -14,6 +15,7 @@ impl Filter {
     #[must_use]
     pub fn from(location: &crate::Location) -> Self {
         Self {
+            active: location.active(),
             q: location.q(),
             source: location.param("source"),
             tag: location.param("tag"),
@@ -22,13 +24,17 @@ impl Filter {
 
     #[must_use]
     pub fn is_empty(&self) -> bool {
-        self.q.is_empty() && self.tag.is_empty() && self.source.is_empty()
+        self.active.is_none() && self.q.is_empty() && self.tag.is_empty() && self.source.is_empty()
     }
 
     #[must_use]
     pub fn to_url_param(&self) -> String {
         let mut params = Vec::new();
 
+        if let Some(active) = self.active {
+            params.push(format!("active={active}"));
+        }
+
         if !self.q.is_empty() {
             params.push(format!("q={}", urlencoding::encode(&self.q)));
         }
@@ -47,15 +53,19 @@ impl Filter {
 
 impl From<String> for Filter {
     fn from(query: String) -> Self {
+        let mut active = None;
         let mut q = query.clone();
         let mut source = String::new();
         let mut tag = String::new();
 
         let regex =
-            regex::Regex::new(r#"(:?source=(?P<source>[^ ]+) )?(tag=(?P<tag>[^ ]+) )?(?P<q>.*)"#)
+            regex::Regex::new(r#"(:?active=(?P<active>[^ ]+) )?(:?source=(?P<source>[^ ]+) )?(tag=(?P<tag>[^ ]+) )?(?P<q>.*)"#)
                 .unwrap();
 
         if let Some(captures) = regex.captures(&query) {
+            active = captures
+                .name("active")
+                .and_then(|x| x.as_str().parse().ok());
             q = captures
                 .name("q")
                 .map_or_else(|| query.clone(), |x| x.as_str().to_string());
@@ -69,12 +79,21 @@ impl From<String> for Filter {
                 .unwrap_or_default();
         }
 
-        Self { q, source, tag }
+        Self {
+            active,
+            q,
+            source,
+            tag,
+        }
     }
 }
 
 impl std::fmt::Display for Filter {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        if let Some(active) = self.active {
+            write!(f, "active={active} ")?;
+        }
+
         if !self.source.is_empty() {
             write!(f, "source={} ", self.source)?;
         }

front/src/location.rs

@@ -24,6 +24,11 @@ impl Location {
         self.history.location().path().to_string()
     }
 
+    #[must_use]
+    pub fn active(&self) -> Option<bool> {
+        self.param("active").parse().ok()
+    }
+
     #[must_use]
     pub fn q(&self) -> String {
         self.param("q")