WIP

Move to shared definition of json requests between client/server.

Cargo.toml

@@ -1,8 +1,11 @@
 [workspace]
+resolver = "2"
 members = [
   "web",
   "server",
   "notmuch",
+  "procmail2notmuch",
+  "shared"
 ]
 
 [profile.release]

dev.sh

@@ -1,6 +1,7 @@
+cd -- "$( dirname -- "${BASH_SOURCE[0]}" )"
 tmux new-session -d -s letterbox-dev
 tmux rename-window web
-tmux send-keys "cd web; trunk serve --address 0.0.0.0 --port 6758 --proxy-backend http://localhost:9345/ --proxy-rewrite=/api/" C-m
+tmux send-keys "cd web; trunk serve -w ../shared -w ../notmuch -w ./" C-m
 tmux new-window -n server
-tmux send-keys "cd server; cargo watch -x run" C-m
+tmux send-keys "cd server; cargo watch -x run -w ../shared -w ../notmuch -w ./" C-m
 tmux attach -d -t letterbox-dev

notmuch/Cargo.toml

@@ -6,6 +6,8 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+anyhow = "1.0.75"
+clap = { version = "4.4.7", features = ["derive"] }
 log = "0.4.14"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0", features = ["unbounded_depth"] }

notmuch/src/lib.rs

@@ -454,6 +454,8 @@ pub enum NotmuchError {
     SerdeJson(#[from] serde_json::Error),
     #[error("failed to parse bytes as str")]
     Utf8Error(#[from] std::str::Utf8Error),
+    #[error("failed to parse bytes as String")]
+    StringUtf8Error(#[from] std::string::FromUtf8Error),
     #[error("failed to parse str as int")]
     ParseIntError(#[from] std::num::ParseIntError),
 }
@@ -478,8 +480,19 @@ impl Notmuch {
         self.run_notmuch(std::iter::empty::<&str>())
     }
 
-    pub fn search(&self, query: &str) -> Result<SearchSummary, NotmuchError> {
+    pub fn search(
-        let res = self.run_notmuch(["search", "--format=json", "--limit=20", query])?;
+        &self,
+        query: &str,
+        offset: usize,
+        limit: usize,
+    ) -> Result<SearchSummary, NotmuchError> {
+        let res = self.run_notmuch([
+            "search",
+            "--format=json",
+            &format!("--offset={offset}"),
+            &format!("--limit={limit}"),
+            query,
+        ])?;
         Ok(serde_json::from_slice(&res)?)
     }
 
@@ -597,7 +610,7 @@ mod tests {
     fn search() -> Result<(), NotmuchError> {
         let nm = Notmuch::with_config("testdata/notmuch.config");
         nm.new()?;
-        let res = nm.search("goof")?;
+        let res = nm.search("goof", 0, 100)?;
         assert_eq!(res.0.len(), 1);
         Ok(())
     }

notmuch/src/main.rs

@@ -0,0 +1,46 @@
+use std::path::PathBuf;
+
+use clap::{Parser, Subcommand};
+use notmuch::Notmuch;
+
+#[derive(Parser)]
+#[command(author, version, about, long_about = None)]
+#[command(propagate_version = true)]
+struct Cli {
+    /// Optional notmuch config file
+    #[arg(short, long)]
+    config: Option<PathBuf>,
+
+    #[command(subcommand)]
+    command: Commands,
+}
+
+#[derive(Subcommand)]
+enum Commands {
+    /// Show given search term
+    Show { search_term: String },
+    /// Search for given search term
+    Search { search_term: String },
+}
+
+fn main() -> anyhow::Result<()> {
+    let cli = Cli::parse();
+
+    let nm = if let Some(config_path) = cli.config {
+        Notmuch::with_config(config_path)
+    } else {
+        Notmuch::default()
+    };
+
+    // You can check for the existence of subcommands, and if found use their
+    // matches just as you would the top level cmd
+    match &cli.command {
+        Commands::Search { search_term } => {
+            println!("{:#?}", nm.search(&search_term, 0, 10)?);
+        }
+        Commands::Show { search_term } => {
+            println!("{:#?}", nm.show(&search_term)?);
+        }
+    }
+    Ok(())
+}

notmuch/tests/allmail.rs

@@ -5,12 +5,11 @@ use std::{
 };
 
 use itertools::Itertools;
+use notmuch::{Notmuch, NotmuchError, SearchSummary, ThreadSet};
 use rayon::iter::{ParallelBridge, ParallelIterator};
 
-use notmuch::{Notmuch, NotmuchError, SearchSummary, ThreadSet};
-
 #[test]
-#[ignore] // it is too expensive
+#[ignore] // it is too expensive, run with `cargo test -- --ignored`
 fn parse_one() -> Result<(), Box<dyn Error>> {
     // take_hook() returns the default hook in case when a custom one is not set
     let orig_hook = std::panic::take_hook();

procmail2notmuch/Cargo.toml

@@ -0,0 +1,9 @@
+[package]
+name = "procmail2notmuch"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+anyhow = "1.0.69"

procmail2notmuch/src/main.rs

@@ -0,0 +1,255 @@
+use std::{convert::Infallible, io::Write, str::FromStr};
+
+#[derive(Debug, Default)]
+enum MatchType {
+    From,
+    Sender,
+    To,
+    Cc,
+    Subject,
+    List,
+    DeliveredTo,
+    XForwardedTo,
+    ReplyTo,
+    XOriginalTo,
+    XSpam,
+    Body,
+    #[default]
+    Unknown,
+}
+#[derive(Debug, Default)]
+struct Match {
+    match_type: MatchType,
+    needle: String,
+}
+
+#[derive(Debug, Default)]
+struct Rule {
+    matches: Vec<Match>,
+    tags: Vec<String>,
+}
+
+fn unescape(s: &str) -> String {
+    s.replace('\\', "")
+}
+
+fn cleanup_match(prefix: &str, s: &str) -> String {
+    unescape(&s[prefix.len()..]).replace(".*", "")
+}
+
+mod matches {
+    pub const TO: &'static str = "TO";
+    pub const CC: &'static str = "Cc";
+    pub const TOCC: &'static str = "(TO|Cc)";
+    pub const FROM: &'static str = "From";
+    pub const SENDER: &'static str = "Sender";
+    pub const SUBJECT: &'static str = "Subject";
+    pub const DELIVERED_TO: &'static str = "Delivered-To";
+    pub const X_FORWARDED_TO: &'static str = "X-Forwarded-To";
+    pub const REPLY_TO: &'static str = "Reply-To";
+    pub const X_ORIGINAL_TO: &'static str = "X-Original-To";
+    pub const LIST_ID: &'static str = "List-ID";
+    pub const X_SPAM: &'static str = "X-Spam";
+    pub const X_SPAM_FLAG: &'static str = "X-Spam-Flag";
+}
+
+impl FromStr for Match {
+    type Err = Infallible;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        // Examples:
+        //   "* 1^0 ^TOsonyrewards.com@xinu.tv"
+        //   "* ^TOsonyrewards.com@xinu.tv"
+        let mut it = s.split_whitespace().skip(1);
+        let mut needle = it.next().unwrap();
+        if needle == "1^0" {
+            needle = it.next().unwrap();
+        }
+        let mut needle = vec![needle];
+        needle.extend(it);
+        let needle = needle.join(" ");
+        let first = needle.chars().nth(0).unwrap_or(' ');
+        use matches::*;
+        if first == '^' {
+            let needle = &needle[1..];
+            if needle.starts_with(TO) {
+                return Ok(Match {
+                    match_type: MatchType::To,
+                    needle: cleanup_match(TO, needle),
+                });
+            } else if needle.starts_with(FROM) {
+                return Ok(Match {
+                    match_type: MatchType::From,
+                    needle: cleanup_match(FROM, needle),
+                });
+            } else if needle.starts_with(CC) {
+                return Ok(Match {
+                    match_type: MatchType::Cc,
+                    needle: cleanup_match(CC, needle),
+                });
+            } else if needle.starts_with(TOCC) {
+                return Ok(Match {
+                    match_type: MatchType::To,
+                    needle: cleanup_match(TOCC, needle),
+                });
+            } else if needle.starts_with(SENDER) {
+                return Ok(Match {
+                    match_type: MatchType::Sender,
+                    needle: cleanup_match(SENDER, needle),
+                });
+            } else if needle.starts_with(SUBJECT) {
+                return Ok(Match {
+                    match_type: MatchType::Subject,
+                    needle: cleanup_match(SUBJECT, needle),
+                });
+            } else if needle.starts_with(X_ORIGINAL_TO) {
+                return Ok(Match {
+                    match_type: MatchType::XOriginalTo,
+                    needle: cleanup_match(X_ORIGINAL_TO, needle),
+                });
+            } else if needle.starts_with(LIST_ID) {
+                return Ok(Match {
+                    match_type: MatchType::List,
+                    needle: cleanup_match(LIST_ID, needle),
+                });
+            } else if needle.starts_with(REPLY_TO) {
+                return Ok(Match {
+                    match_type: MatchType::ReplyTo,
+                    needle: cleanup_match(REPLY_TO, needle),
+                });
+            } else if needle.starts_with(X_SPAM_FLAG) {
+                return Ok(Match {
+                    match_type: MatchType::XSpam,
+                    needle: '*'.to_string(),
+                });
+            } else if needle.starts_with(X_SPAM) {
+                return Ok(Match {
+                    match_type: MatchType::XSpam,
+                    needle: '*'.to_string(),
+                });
+            } else if needle.starts_with(DELIVERED_TO) {
+                return Ok(Match {
+                    match_type: MatchType::DeliveredTo,
+                    needle: cleanup_match(DELIVERED_TO, needle),
+                });
+            } else if needle.starts_with(X_FORWARDED_TO) {
+                return Ok(Match {
+                    match_type: MatchType::XForwardedTo,
+                    needle: cleanup_match(X_FORWARDED_TO, needle),
+                });
+            } else {
+                unreachable!("needle: '{needle}'")
+            }
+        } else {
+            return Ok(Match {
+                match_type: MatchType::Body,
+                needle: cleanup_match("", &needle),
+            });
+        }
+    }
+}
+
+fn notmuch_from_rules<W: Write>(mut w: W, rules: &[Rule]) -> anyhow::Result<()> {
+    // TODO(wathiede): if reindexing this many tags is too slow, see if combining rules per tag is
+    // faster.
+    let mut lines = Vec::new();
+    for r in rules {
+        for m in &r.matches {
+            for t in &r.tags {
+                if let MatchType::Unknown = m.match_type {
+                    eprintln!("rule has unknown match {:?}", r);
+                    continue;
+                }
+
+                let rule = match m.match_type {
+                    MatchType::From => "from:",
+                    // TODO(wathiede): something more specific?
+                    MatchType::Sender => "from:",
+                    MatchType::To => "to:",
+                    MatchType::Cc => "to:",
+                    MatchType::Subject => "subject:",
+                    MatchType::List => "List-ID:",
+                    MatchType::Body => "",
+                    // TODO(wathiede): these will probably require adding fields to notmuch
+                    // index. Handle them later.
+                    MatchType::DeliveredTo
+                    | MatchType::XForwardedTo
+                    | MatchType::ReplyTo
+                    | MatchType::XOriginalTo
+                    | MatchType::XSpam => continue,
+                    MatchType::Unknown => unreachable!(),
+                };
+                // Preserve unread status if run with --remove-all
+                lines.push(format!(
+                    r#"-unprocessed +{} +unread -- is:unread tag:unprocessed {}"{}""#,
+                    t, rule, m.needle
+                ));
+                lines.push(format!(
+                    // TODO(wathiede): this assumes `notmuch new` is configured to add
+                    // `tag:unprocessed` to all new mail.
+                    r#"-unprocessed +{} -- tag:unprocessed {}"{}""#,
+                    t, rule, m.needle
+                ));
+            }
+        }
+    }
+    lines.sort();
+    for l in lines {
+        writeln!(w, "{l}")?;
+    }
+    Ok(())
+}
+
+fn main() -> anyhow::Result<()> {
+    let input = "/home/wathiede/dotfiles/procmailrc";
+    let mut rules = Vec::new();
+    let mut cur_rule = Rule::default();
+    for l in std::fs::read_to_string(input)?.lines() {
+        let l = if let Some(idx) = l.find('#') {
+            &l[..idx]
+        } else {
+            l
+        }
+        .trim();
+        if l.is_empty() {
+            continue;
+        }
+        if l.find('=').is_some() {
+            // Probably a variable assignment, skip line
+            continue;
+        }
+        let first = l.chars().nth(0).unwrap_or(' ');
+        match first {
+            ':' => {
+                // start of rule
+            }
+            '*' => {
+                // add to current rule
+                let m: Match = l.parse()?;
+                cur_rule.matches.push(m);
+            }
+            '.' => {
+                // delivery to folder
+                cur_rule.tags.push(cleanup_match(
+                    "",
+                    &l.replace('.', "/")
+                        .replace(' ', "")
+                        .trim_matches('/')
+                        .to_string(),
+                ));
+                rules.push(cur_rule);
+                cur_rule = Rule::default();
+            }
+            '|' => cur_rule = Rule::default(), // external command
+            '$' => {
+                // TODO(wathiede): tag messages with no other tag as 'inbox'
+                cur_rule.tags.push(cleanup_match("", "inbox"));
+                rules.push(cur_rule);
+                cur_rule = Rule::default();
+            } // variable, should only be $DEFAULT in my config
+            _ => panic!("Unhandled first character '{}' {}", first, l),
+        }
+    }
+    notmuch_from_rules(std::io::stdout(), &rules)?;
+    Ok(())
+}

server/Cargo.toml

@@ -2,6 +2,7 @@
 name = "server"
 version = "0.1.0"
 edition = "2021"
+default-bin = "server"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -9,11 +10,14 @@ edition = "2021"
 rocket = { version = "0.5.0-rc.2", features = [ "json" ] }
 rocket_cors = { git = "https://github.com/lawliet89/rocket_cors", branch = "master" }
 notmuch = { path = "../notmuch" }
+shared = { path = "../shared" }
 serde_json = "1.0.87"
 thiserror = "1.0.37"
 serde = { version = "1.0.147", features = ["derive"] }
 log = "0.4.17"
 tokio = "1.26.0"
+glog = "0.1.0"
+urlencoding = "2.1.3"
 
 [dependencies.rocket_contrib]
 version = "0.4.11"

server/src/bin/server.rs

@@ -3,7 +3,8 @@ extern crate rocket;
 
 use std::{error::Error, io::Cursor, str::FromStr};
 
-use notmuch::{Notmuch, NotmuchError, SearchSummary, ThreadSet};
+use glog::Flags;
+use notmuch::{Notmuch, NotmuchError, ThreadSet};
 use rocket::{
     http::{ContentType, Header},
     request::Request,
@@ -12,6 +13,8 @@ use rocket::{
     Response, State,
 };
 use rocket_cors::{AllowedHeaders, AllowedOrigins};
+use server::{error::ServerError, nm::threadset_to_messages};
+use shared::Message;
 
 #[get("/")]
 fn hello() -> &'static str {
@@ -22,17 +25,32 @@ fn hello() -> &'static str {
 async fn refresh(nm: &State<Notmuch>) -> Result<Json<String>, Debug<NotmuchError>> {
     Ok(Json(String::from_utf8_lossy(&nm.new()?).to_string()))
 }
+
 #[get("/search")]
-async fn search_all(nm: &State<Notmuch>) -> Result<Json<SearchSummary>, Debug<NotmuchError>> {
+async fn search_all(
-    search(nm, "*").await
+    nm: &State<Notmuch>,
+) -> Result<Json<shared::SearchResult>, Debug<NotmuchError>> {
+    search(nm, "*", None, None).await
 }
 
-#[get("/search/<query>")]
+#[get("/search/<query>?<page>&<results_per_page>")]
 async fn search(
     nm: &State<Notmuch>,
     query: &str,
-) -> Result<Json<SearchSummary>, Debug<NotmuchError>> {
+    page: Option<usize>,
-    let res = nm.search(query)?;
+    results_per_page: Option<usize>,
+) -> Result<Json<shared::SearchResult>, Debug<NotmuchError>> {
+    let page = page.unwrap_or(0);
+    let results_per_page = results_per_page.unwrap_or(10);
+    let query = urlencoding::decode(query).map_err(NotmuchError::from)?;
+    info!(" search '{query}'");
+    let res = shared::SearchResult {
+        summary: nm.search(&query, page * results_per_page, results_per_page)?,
+        query: query.to_string(),
+        page,
+        results_per_page,
+        total: nm.count(&query)?,
+    };
     Ok(Json(res))
 }
 
@@ -40,14 +58,16 @@ async fn search(
 async fn show_pretty(
     nm: &State<Notmuch>,
     query: &str,
-) -> Result<Json<ThreadSet>, Debug<NotmuchError>> {
+) -> Result<Json<Vec<Message>>, Debug<ServerError>> {
-    let res = nm.show(query)?;
+    let query = urlencoding::decode(query).map_err(|e| ServerError::from(NotmuchError::from(e)))?;
+    let res = threadset_to_messages(nm.show(&query).map_err(ServerError::from)?)?;
     Ok(Json(res))
 }
 
 #[get("/show/<query>")]
 async fn show(nm: &State<Notmuch>, query: &str) -> Result<Json<ThreadSet>, Debug<NotmuchError>> {
-    let res = nm.show(query)?;
+    let query = urlencoding::decode(query).map_err(NotmuchError::from)?;
+    let res = nm.show(&query)?;
     Ok(Json(res))
 }
 
@@ -107,6 +127,14 @@ async fn original(
 
 #[rocket::main]
 async fn main() -> Result<(), Box<dyn Error>> {
+    glog::new()
+        .init(Flags {
+            colorlogtostderr: true,
+            //alsologtostderr: true, // use logtostderr to only write to stderr and not to files
+            logtostderr: true,
+            ..Default::default()
+        })
+        .unwrap();
     let allowed_origins = AllowedOrigins::all();
     let cors = rocket_cors::CorsOptions {
         allowed_origins,

server/src/error.rs

@@ -0,0 +1,9 @@
+use thiserror::Error;
+
+#[derive(Error, Debug)]
+pub enum ServerError {
+    #[error("notmuch")]
+    NotmuchError(#[from] notmuch::NotmuchError),
+    #[error("flatten")]
+    FlattenError,
+}

server/src/lib.rs

@@ -0,0 +1,2 @@
+pub mod error;
+pub mod nm;

server/src/nm.rs

@@ -0,0 +1,15 @@
+use shared::Message;
+
+use crate::error;
+
+// TODO(wathiede): decide good error type
+pub fn threadset_to_messages(
+    thread_set: notmuch::ThreadSet,
+) -> Result<Vec<Message>, error::ServerError> {
+    for t in thread_set.0 {
+        for tn in t.0 {
+            todo!()
+        }
+    }
+    Ok(Vec::new())
+}

shared/Cargo.toml

@@ -0,0 +1,10 @@
+[package]
+name = "shared"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+notmuch = { path = "../notmuch" }
+serde = { version = "1.0.147", features = ["derive"] }

shared/src/lib.rs

@@ -0,0 +1,13 @@
+use notmuch::SearchSummary;
+use serde::{Deserialize, Serialize};
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct SearchResult {
+    pub summary: SearchSummary,
+    pub query: String,
+    pub page: usize,
+    pub results_per_page: usize,
+    pub total: usize,
+}
+#[derive(Serialize, Deserialize, Debug)]
+pub struct Message {}

web/Cargo.toml

@@ -22,6 +22,7 @@ seed = "0.9.2"
 console_log = {git = "http://git-private.h.xinu.tv/wathiede/console_log.git"}
 serde = { version = "1.0.147", features = ["derive"] }
 notmuch = {path = "../notmuch"}
+shared = {path = "../shared"}
 itertools = "0.10.5"
 serde_json = { version = "1.0.93", features = ["unbounded_depth"] }
 wasm-timer = "0.2.5"

web/Trunk.toml

@@ -0,0 +1,11 @@
+[build]
+release = true
+
+[serve]
+# The address to serve on.
+address = "0.0.0.0"
+port = 6758
+
+[[proxy]]
+backend = "http://localhost:9345/"
+rewrite= "/api/"

web/index.html

@@ -4,16 +4,19 @@
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <link rel="modulepreload" href="/pkg/package.js" as="script" type="text/javascript">
+    <link rel="stylesheet", href="https://jenil.github.io/bulmaswatch/cyborg/bulmaswatch.min.css">
-    <link rel="preload" href="/pkg/package_bg.wasm" as="fetch" type="application/wasm" crossorigin="anonymous">
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@0.9.4/css/bulma.min.css">
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.3.0/css/all.min.css" integrity="sha512-SzlrxWUlpfuzQ+pcUCosxcglQRNAq/DZjVsC0lE40xsADsfeQoEypE+enwcOiGjk/bSuGGKHEyjSoQ1zVisanQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
 <style>
 .message {
-  padding-left: 0.5em;
+  padding: 0.5em;*/
 }
 .body {
-  padding-bottom: 1em;
+  background: white;
+  color: black;
+  padding: 0.5em;
+  margin-left: -0.5em;
+  margin-right: -0.5em;
+  margin-top: 0.5em;
 }
 .error {
   background-color: red;
@@ -25,16 +28,29 @@ iframe {
   height: 100%;
   width: 100%;
 }
+
+.index {
+  table-layout: fixed;
+  width: 100%;
+}
 .index .from {
-  width: 200px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  width: 15em;
 }
 .index .subject {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 .index .date {
+  width: 8em;
   white-space: nowrap;
 }
 .footer {
   background-color: #eee;
+  color: #222;
   position: fixed; 
   bottom: 0;
   left: 0;
@@ -56,23 +72,30 @@ iframe {
   animation-iteration-count: infinite;
   animation-timing-function: linear;
 }
-    @keyframes spin {
+@keyframes spin {
   from {
     transform:rotate(0deg);
   }
   to {
     transform:rotate(360deg);
   }
+}
+@media (max-width: 768px) {
+  .section {
+    padding: 1.5em;
   }
+}
+input, .input {
+  color: #000;
+}
+input::placeholder, .input::placeholder{
+  color: #555;
+}
 </style>
 </head>
 
 <body>
     <section id="app"></section>
-    <script type="module">
-        import init from '/pkg/package.js';
-        init('/pkg/package_bg.wasm');
-    </script>
 </body>
 
 </html>

web/src/lib.rs

@@ -8,57 +8,96 @@ use std::{
 };
 
 use itertools::Itertools;
-use log::{debug, error, info, warn, Level};
+use log::{debug, error, info, Level};
-use notmuch::{Content, Part, SearchSummary, Thread, ThreadNode, ThreadSet};
+use notmuch::{Content, Part, Thread, ThreadNode, ThreadSet};
 use seed::{prelude::*, *};
 use serde::de::Deserialize;
 use wasm_timer::Instant;
 
+const SEARCH_RESULTS_PER_PAGE: usize = 20;
+
 // ------ ------
 //     Init
 // ------ ------
 
 // `init` describes what should happen when your app started.
 fn init(url: Url, orders: &mut impl Orders<Msg>) -> Model {
-    warn!("init called");
+    if url.hash().is_none() {
-    log!(url);
+        orders.request_url(urls::search("is:unread", 0));
-    let mut url = url.clone();
+    } else {
-    let mut query = "".to_string();
+        orders.notify(subs::UrlRequested::new(url));
-    let hpp = url.next_hash_path_part();
-    log!(hpp);
-    match hpp {
-        Some("t") => {
-            let tid = url.next_hash_path_part().unwrap_or("").to_string();
-            orders.send_msg(Msg::ShowPrettyRequest(tid));
-        }
-        Some("s") => {
-            query = url.next_hash_path_part().unwrap_or("").to_string();
-            orders.send_msg(Msg::SearchRequest(query.clone()));
-        }
-        p => {
-            log!(p);
-            orders.send_msg(Msg::SearchRequest("".to_string()));
-        }
     };
-    orders.subscribe(|uc: subs::UrlChanged| {
+    orders.subscribe(on_url_changed);
-        info!("uc {:#?}", uc);
-    });
 
-    info!("init query '{}'", query);
     Model {
         context: Context::None,
-        query,
+        query: "".to_string(),
         refreshing_state: RefreshingState::None,
     }
 }
 
+fn on_url_changed(uc: subs::UrlChanged) -> Msg {
+    let mut url = uc.0;
+    info!(
+        "url changed '{}', history {}",
+        url,
+        history().length().unwrap_or(0)
+    );
+    let hpp = url.remaining_hash_path_parts();
+    match hpp.as_slice() {
+        ["t", tid] => Msg::ShowPrettyRequest(tid.to_string()),
+        ["s", query] => {
+            let query = Url::decode_uri_component(query).unwrap_or("".to_string());
+            Msg::SearchRequest {
+                query,
+                page: 0,
+                results_per_page: SEARCH_RESULTS_PER_PAGE,
+            }
+        }
+        ["s", query, page] => {
+            let query = Url::decode_uri_component(query).unwrap_or("".to_string());
+            let page = page[1..].parse().unwrap_or(0);
+            Msg::SearchRequest {
+                query,
+                page,
+                results_per_page: SEARCH_RESULTS_PER_PAGE,
+            }
+        }
+        p => {
+            if !p.is_empty() {
+                info!("Unhandled path '{p:?}'");
+            }
+            Msg::SearchRequest {
+                query: "".to_string(),
+                page: 0,
+                results_per_page: SEARCH_RESULTS_PER_PAGE,
+            }
+        }
+    }
+}
+
+mod urls {
+    use seed::Url;
+    pub fn search(query: &str, page: usize) -> Url {
+        let query = Url::encode_uri_component(query);
+        if page > 0 {
+            Url::new().set_hash_path(["s", &query, &format!("p{page}")])
+        } else {
+            Url::new().set_hash_path(["s", &query])
+        }
+    }
+    pub fn thread(tid: &str) -> Url {
+        Url::new().set_hash_path(["t", tid])
+    }
+}
+
 // ------ ------
 //     Model
 // ------ ------
 enum Context {
     None,
-    Search(SearchSummary),
+    Search(shared::SearchResult),
-    Thread(ThreadSet),
+    Thread(Vec<shared::Message>),
 }
 
 // `Model` describes our app state.
@@ -83,14 +122,23 @@ enum RefreshingState {
 // `Msg` describes the different events you can modify state with.
 enum Msg {
     Noop,
+    // Tell the client to refresh its state
+    Reload,
+    // Tell the server to update state
     RefreshStart,
     RefreshDone(Option<FetchError>),
-    SearchRequest(String),
+    SearchRequest {
-    SearchResult(fetch::Result<SearchSummary>),
+        query: String,
+        page: usize,
+        results_per_page: usize,
+    },
+    SearchResult(fetch::Result<shared::SearchResult>),
     ShowRequest(String),
     ShowResult(fetch::Result<ThreadSet>),
     ShowPrettyRequest(String),
-    ShowPrettyResult(fetch::Result<ThreadSet>),
+    ShowPrettyResult(fetch::Result<Vec<shared::Message>>),
+    NextPage,
+    PreviousPage,
 }
 
 // `update` describes how to handle each `Msg`.
@@ -107,15 +155,22 @@ fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
             } else {
                 RefreshingState::None
             };
+            orders.perform_cmd(async move { Msg::Reload });
+        }
+        Msg::Reload => {
+            orders.perform_cmd(async move { on_url_changed(subs::UrlChanged(Url::current())) });
         }
 
-        Msg::SearchRequest(query) => {
+        Msg::SearchRequest {
+            query,
+            page,
+            results_per_page,
+        } => {
+            info!("searching for '{query}' pg {page} # / pg {results_per_page}");
             model.query = query.clone();
-            let url = Url::new().set_hash_path(["s", &query]);
+            orders.skip().perform_cmd(async move {
-            orders.request_url(url);
+                Msg::SearchResult(search_request(&query, page, results_per_page).await)
-            orders
+            });
-                .skip()
-                .perform_cmd(async move { Msg::SearchResult(search_request(&query).await) });
         }
         Msg::SearchResult(Ok(response_data)) => {
             debug!("fetch ok {:#?}", response_data);
@@ -126,39 +181,58 @@ fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
         }
 
         Msg::ShowRequest(tid) => {
-            let url = Url::new().set_hash_path(["t", &tid]);
-            orders.request_url(url);
             orders
                 .skip()
                 .perform_cmd(async move { Msg::ShowResult(show_request(&tid).await) });
         }
+        // TODO(wathiede): remove
         Msg::ShowResult(Ok(response_data)) => {
             debug!("fetch ok {:#?}", response_data);
-            model.context = Context::Thread(response_data);
+            //model.context = Context::Thread(response_data);
         }
         Msg::ShowResult(Err(fetch_error)) => {
             error!("fetch failed {:?}", fetch_error);
         }
 
         Msg::ShowPrettyRequest(tid) => {
-            let url = Url::new().set_hash_path(["t", &tid]);
-            orders.request_url(url);
             orders
                 .skip()
                 .perform_cmd(async move { Msg::ShowPrettyResult(show_pretty_request(&tid).await) });
         }
         Msg::ShowPrettyResult(Ok(response_data)) => {
-            debug!("fetch ok {:#?}", response_data);
+            info!("fetch ok {:#?}", response_data);
             model.context = Context::Thread(response_data);
         }
         Msg::ShowPrettyResult(Err(fetch_error)) => {
             error!("fetch failed {:?}", fetch_error);
         }
+        Msg::NextPage => {
+            match &model.context {
+                Context::Search(sr) => {
+                    orders.request_url(urls::search(&sr.query, sr.page + 1));
+                }
+                Context::Thread(_) => (), // do nothing (yet?)
+                Context::None => (),      // do nothing (yet?)
+            };
+        }
+        Msg::PreviousPage => {
+            match &model.context {
+                Context::Search(sr) => {
+                    orders.request_url(urls::search(&sr.query, sr.page.saturating_sub(1)));
+                }
+                Context::Thread(_) => (), // do nothing (yet?)
+                Context::None => (),      // do nothing (yet?)
+            };
+        }
     }
 }
 
-async fn search_request(query: &str) -> fetch::Result<SearchSummary> {
+async fn search_request(
-    Request::new(api::search(query))
+    query: &str,
+    page: usize,
+    results_per_page: usize,
+) -> fetch::Result<shared::SearchResult> {
+    Request::new(api::search(query, page, results_per_page))
         .method(Method::Get)
         .fetch()
         .await?
@@ -168,12 +242,15 @@ async fn search_request(query: &str) -> fetch::Result<SearchSummary> {
 }
 
 mod api {
+    use seed::Url;
+
     const BASE_URL: &str = "/api";
     pub fn refresh() -> String {
         format!("{BASE_URL}/refresh")
     }
-    pub fn search(query: &str) -> String {
+    pub fn search(query: &str, page: usize, results_per_page: usize) -> String {
-        format!("{BASE_URL}/search/{query}")
+        let query = Url::encode_uri_component(query);
+        format!("{BASE_URL}/search/{query}?page={page}&results_per_page={results_per_page}")
     }
     pub fn show(tid: &str) -> String {
         format!("{BASE_URL}/show/{tid}")
@@ -212,7 +289,7 @@ async fn show_request(tid: &str) -> fetch::Result<ThreadSet> {
         .map_err(|_| FetchError::JsonError(fetch::JsonError::Serde(JsValue::NULL)))?)
 }
 
-async fn show_pretty_request(tid: &str) -> fetch::Result<ThreadSet> {
+async fn show_pretty_request(tid: &str) -> fetch::Result<Vec<shared::Message>> {
     Request::new(api::show_pretty(tid))
         .method(Method::Get)
         .fetch()
@@ -249,7 +326,6 @@ fn view_message(thread: &ThreadNode) -> Node<Msg> {
         div![C!["header"], "From: ", &message.headers.from],
         div![C!["header"], "Date: ", &message.headers.date],
         div![C!["header"], "To: ", &message.headers.to],
-        hr![],
         div![
             C!["body"],
             match &message.body {
@@ -280,9 +356,13 @@ fn view_part(part: &Part) -> Node<Msg> {
         "text/plain" => view_text_plain(&part.content),
         "text/html" => {
             if let Some(Content::String(html)) = &part.content {
-                let inlined = css_inline::inline(html).expect("failed to inline CSS");
+                let inliner = css_inline::CSSInliner::options()
+                    .load_remote_stylesheets(false)
+                    .remove_style_tags(true)
+                    .build();
+                let inlined = inliner.inline(html).expect("failed to inline CSS");
 
-                return div![C!["view-part-text-html"], div!["TEST"], raw![&inlined]];
+                return div![C!["view-part-text-html"], raw![&inlined]];
             } else {
                 div![
                     C!["error"],
@@ -351,17 +431,29 @@ fn set_title(title: &str) {
     seed::document().set_title(&format!("lb: {}", title));
 }
 
-fn tags_chiclet(tags: &[String]) -> impl Iterator<Item = Node<Msg>> + '_ {
+fn tags_chiclet(tags: &[String], is_mobile: bool) -> impl Iterator<Item = Node<Msg>> + '_ {
-    tags.iter().map(|tag| {
+    tags.iter().map(move |tag| {
         let mut hasher = DefaultHasher::new();
         tag.hash(&mut hasher);
         let hex = format!("#{:06x}", hasher.finish() % (1 << 24));
         let style = style! {St::BackgroundColor=>hex};
+        let classes = C!["tag", IF!(is_mobile => "is-small")];
+        let tag = tag.clone();
+        a![
+            attrs! {
+                At::Href => urls::search(&format!("tag:{tag}"), 0)
+            },
             match tag.as_str() {
-            "attachment" => span![C!["tag"], style, "📎"],
+                "attachment" => span![classes, style, "📎"],
-            "replied" => span![C!["tag"], style, i![C!["fa-solid", "fa-reply"]]],
+                "replied" => span![classes, style, i![C!["fa-solid", "fa-reply"]]],
-            _ => span![C!["tag"], style, tag],
+                _ => span![classes, style, &tag],
-        }
+            },
+            ev(Ev::Click, move |_| Msg::SearchRequest {
+                query: format!("tag:{tag}"),
+                page: 0,
+                results_per_page: SEARCH_RESULTS_PER_PAGE,
+            })
+        ]
     })
 }
 
@@ -390,13 +482,14 @@ fn pretty_authors(authors: &str) -> impl Iterator<Item = Node<Msg>> + '_ {
     )
 }
 
-fn view_mobile_search_results(query: &str, search_results: &SearchSummary) -> Node<Msg> {
+fn view_mobile_search_results(query: &str, search_results: &shared::SearchResult) -> Node<Msg> {
     if query.is_empty() {
         set_title("all mail");
     } else {
         set_title(query);
     }
-    let rows = search_results.0.iter().map(|r| {
+    let summaries = &search_results.summary.0;
+    let rows = summaries.iter().map(|r| {
         /*
         let tid = r.thread.clone();
         tr![
@@ -410,26 +503,37 @@ fn view_mobile_search_results(query: &str, search_results: &SearchSummary) -> No
         ev(Ev::Click, move |_| Msg::ShowPrettyRequest(tid)),
         ]
         */
+        let tid = r.thread.clone();
         div![
-            p![C!["subject"], &r.subject],
+            div![
+                C!["subject"],
+                &r.subject,
+                ev(Ev::Click, move |_| Msg::ShowPrettyRequest(tid)),
+            ],
             div![
                 span![C!["from"], pretty_authors(&r.authors)],
-                span![C!["tags"], tags_chiclet(&r.tags)],
+                span![C!["tags"], tags_chiclet(&r.tags, true)],
             ],
             span![C!["date"], &r.date_relative],
-            hr![],
         ]
     });
-    div![h1!["Search results"], rows]
+    let first = search_results.page * search_results.results_per_page;
+    div![
+        h1!["Search results"],
+        view_search_pager(first, summaries.len(), search_results.total),
+        rows,
+        view_search_pager(first, summaries.len(), search_results.total)
+    ]
 }
 
-fn view_search_results(query: &str, search_results: &SearchSummary) -> Node<Msg> {
+fn view_search_results(query: &str, search_results: &shared::SearchResult) -> Node<Msg> {
     if query.is_empty() {
         set_title("all mail");
     } else {
         set_title(query);
     }
-    let rows = search_results.0.iter().map(|r| {
+    let summaries = &search_results.summary.0;
+    let rows = summaries.iter().map(|r| {
         let tid = r.thread.clone();
         tr![
             td![
@@ -437,12 +541,25 @@ fn view_search_results(query: &str, search_results: &SearchSummary) -> Node<Msg>
                 pretty_authors(&r.authors),
                 IF!(r.total>1 => small![" ", r.total.to_string()]),
             ],
-            td![C!["subject"], tags_chiclet(&r.tags), " ", &r.subject],
+            td![
-            td![C!["date"], &r.date_relative],
+                C!["subject"],
-            ev(Ev::Click, move |_| Msg::ShowPrettyRequest(tid)),
+                tags_chiclet(&r.tags, false),
+                " ",
+                a![
+                    C!["has-text-light"],
+                    attrs! {
+                        At::Href => urls::thread(&tid)
+                    },
+                    &r.subject,
+                ]
+            ],
+            td![C!["date"], &r.date_relative]
         ]
     });
-    div![table![
+    let first = search_results.page * search_results.results_per_page;
+    div![
+        view_search_pager(first, summaries.len(), search_results.total),
+        table![
             C![
                 "table",
                 "index",
@@ -457,10 +574,38 @@ fn view_search_results(query: &str, search_results: &SearchSummary) -> Node<Msg>
                 th![C!["date"], "Date"]
             ]],
             tbody![rows]
-    ]]
+        ],
+        view_search_pager(first, summaries.len(), search_results.total)
+    ]
 }
 
-fn view_thread(thread_set: &ThreadSet) -> Node<Msg> {
+fn view_search_pager(start: usize, count: usize, total: usize) -> Node<Msg> {
+    let is_first = start <= 0;
+    let is_last = (start + SEARCH_RESULTS_PER_PAGE) >= total;
+    nav![
+        C!["pagination"],
+        a![
+            C!["pagination-previous", "button",],
+            IF!(is_first => attrs!{ At::Disabled=>true }),
+            "<",
+            ev(Ev::Click, |_| Msg::PreviousPage)
+        ],
+        a![
+            C!["pagination-next", "button", IF!(is_last => "is-static")],
+            IF!(is_last => attrs!{ At::Disabled=>true }),
+            ">",
+            ev(Ev::Click, |_| Msg::NextPage)
+        ],
+        ul![
+            C!["pagination-list"],
+            li![format!("{} - {} of {}", start, start + count, total)],
+        ],
+    ]
+}
+
+fn view_thread(messages: &[shared::Message]) -> Node<Msg> {
+    div!["TODO(wathiede): view_thread(messages)"]
+    /*
        assert_eq!(thread_set.0.len(), 1);
        let thread = &thread_set.0[0];
        assert_eq!(thread.0.len(), 1);
@@ -468,18 +613,22 @@ fn view_thread(thread_set: &ThreadSet) -> Node<Msg> {
        let subject = first_subject(&thread_node).unwrap_or("<No subject>".to_string());
        set_title(&subject);
        div![
-        h1![subject],
+       C!["container"],
+       h1![C!["title"], subject],
+       view_message(&thread_node),
        a![
        attrs! {At::Href=>api::original(&thread_node.0.as_ref().expect("message missing").id)},
        "Original"
        ],
-        view_message(&thread_node),
+    /*
     div![
     C!["debug"],
     "Add zippy for debug dump",
     view_debug_thread_set(thread_set)
     ] /* pre![format!("Thread: {:#?}", thread_set).replace("    ", "  ")] */
+    */
     ]
+    */
 }
 
 fn view_debug_thread_set(thread_set: &ThreadSet) -> Node<Msg> {
@@ -517,7 +666,7 @@ fn view_header(query: &str, refresh_request: &RefreshingState) -> Node<Msg> {
     } else {
         false
     };
-    let query = query.to_string();
+    let query = Url::decode_uri_component(query).unwrap_or("".to_string());
     nav![
         C!["navbar"],
         attrs! {At::Role=>"navigation"},
@@ -535,13 +684,17 @@ fn view_header(query: &str, refresh_request: &RefreshingState) -> Node<Msg> {
             ],
             a![
                 C!["navbar-item", "button"],
+                attrs! {
+                    At::Href => urls::search("is:unread", 0)
+                },
                 "Unread",
-                ev(Ev::Click, |_| Msg::SearchRequest("is:unread".to_string())),
             ],
             a![
                 C!["navbar-item", "button"],
+                attrs! {
+                    At::Href => urls::search("", 0)
+                },
                 "All",
-                ev(Ev::Click, |_| Msg::SearchRequest("".to_string())),
             ],
             input![
                 C!["navbar-item", "input"],
@@ -550,10 +703,18 @@ fn view_header(query: &str, refresh_request: &RefreshingState) -> Node<Msg> {
                     At::AutoFocus => true.as_at_value();
                     At::Value => query,
                 },
-                input_ev(Ev::Input, Msg::SearchRequest),
+                input_ev(Ev::Input, |q| Msg::SearchRequest {
+                    query: Url::encode_uri_component(q),
+                    page: 0,
+                    results_per_page: SEARCH_RESULTS_PER_PAGE,
+                }),
                 // Resend search on enter.
                 keyboard_ev(Ev::KeyUp, move |e| if e.key_code() == 0x0d {
-                    Msg::SearchRequest(query)
+                    Msg::SearchRequest {
+                        query: Url::encode_uri_component(query),
+                        page: 0,
+                        results_per_page: SEARCH_RESULTS_PER_PAGE,
+                    }
                 } else {
                     Msg::Noop
                 }),
@@ -575,24 +736,26 @@ fn view_footer(render_time_ms: u128) -> Node<Msg> {
 fn view_desktop(model: &Model) -> Node<Msg> {
     let content = match &model.context {
         Context::None => div![h1!["Loading"]],
-        Context::Thread(thread_set) => view_thread(thread_set),
+        Context::Thread(messages) => view_thread(messages),
         Context::Search(search_results) => view_search_results(&model.query, search_results),
     };
     div![
         view_header(&model.query, &model.refreshing_state),
-        section![C!["section"], div![C!["container"], content],]
+        section![C!["section"], content],
+        view_header(&model.query, &model.refreshing_state),
     ]
 }
 
 fn view_mobile(model: &Model) -> Node<Msg> {
     let content = match &model.context {
         Context::None => div![h1!["Loading"]],
-        Context::Thread(thread_set) => view_thread(thread_set),
+        Context::Thread(messages) => view_thread(messages),
         Context::Search(search_results) => view_mobile_search_results(&model.query, search_results),
     };
     div![
         view_header(&model.query, &model.refreshing_state),
-        section![C!["section"], div![C!["container"], content],]
+        section![C!["section"], div![C!["content"], content]],
+        view_header(&model.query, &model.refreshing_state),
     ]
 }