web: make whole row of search results clickable

No longer allow searching by tag by clicking on chiclet

.cargo/config.toml

@@ -0,0 +1,4 @@
+
+[build]
+rustflags = [ "--cfg=web_sys_unstable_apis" ]
+

Cargo.lock

@@ -1427,6 +1427,15 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "html-escape"
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d1ad449764d627e22bfd7cd5e8868264fc9236e07c752972b4080cd351cb476"
+dependencies = [
+ "utf8-width",
+]
+
 [[package]]
 name = "html5ever"
 version = "0.26.0"
@@ -3168,6 +3177,7 @@ dependencies = [
  "async-graphql-rocket",
  "css-inline",
  "glog",
+ "html-escape",
  "linkify",
  "log",
  "lol_html",
@@ -4140,10 +4150,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
 
 [[package]]
-name = "uuid"
-version = "1.9.1"
+name = "utf8-width"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439"
+checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3"
+
+[[package]]
+name = "uuid"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
 dependencies = [
  "getrandom 0.2.15",
 ]

Cargo.toml

@@ -1,5 +1,8 @@
 [workspace]
 resolver = "2"
+default-members = [
+  "server"
+]
 members = [
   "web",
   "server",

server/.sqlx/query-113694cd5bf0d2582ff3a635776daa608fe88abe1185958c4215646c92335afb.json

@@ -0,0 +1,64 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT\n    date,\n    is_read,\n    link,\n    site,\n    summary,\n    title,\n    name,\n    homepage\nFROM\n    post p\n    JOIN feed f ON p.site = f.slug\nWHERE\n    uid = $1\n",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "date",
+        "type_info": "Timestamp"
+      },
+      {
+        "ordinal": 1,
+        "name": "is_read",
+        "type_info": "Bool"
+      },
+      {
+        "ordinal": 2,
+        "name": "link",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 3,
+        "name": "site",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 4,
+        "name": "summary",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 5,
+        "name": "title",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 6,
+        "name": "name",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 7,
+        "name": "homepage",
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true,
+      true
+    ]
+  },
+  "hash": "113694cd5bf0d2582ff3a635776daa608fe88abe1185958c4215646c92335afb"
+}

server/.sqlx/query-2c1954b6db3cbcabf9b878cd1c8ea01c607f46dc43a85b58e19217e7633cf337.json

@@ -0,0 +1,55 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT\n    site,\n    date,\n    is_read,\n    title,\n    uid,\n    name\nFROM\n    post p\n    JOIN feed f ON p.site = f.slug\nWHERE\n    ($1::text IS NULL OR site = $1)\n    AND (\n        NOT $2\n        OR NOT is_read\n    )\nORDER BY\n    date DESC,\n    title OFFSET $3\nLIMIT\n    $4\n",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "site",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 1,
+        "name": "date",
+        "type_info": "Timestamp"
+      },
+      {
+        "ordinal": 2,
+        "name": "is_read",
+        "type_info": "Bool"
+      },
+      {
+        "ordinal": 3,
+        "name": "title",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 4,
+        "name": "uid",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 5,
+        "name": "name",
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Bool",
+        "Int8",
+        "Int8"
+      ]
+    },
+    "nullable": [
+      true,
+      true,
+      true,
+      true,
+      false,
+      true
+    ]
+  },
+  "hash": "2c1954b6db3cbcabf9b878cd1c8ea01c607f46dc43a85b58e19217e7633cf337"
+}

server/.sqlx/query-2dcbedef656e1b725c5ba4fb67d31ce7962d8714449b2fb630f49a7ed1acc270.json

@@ -0,0 +1,32 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT\n    site,\n    name,\n    count (\n        NOT is_read\n        OR NULL\n    ) unread\nFROM\n    post AS p\n    JOIN feed AS f ON p.site = f.slug --\n    -- TODO: figure this out to make the query faster when only looking for unread\n    --WHERE\n    --    (\n    --        NOT $1\n    --        OR NOT is_read\n    --    )\nGROUP BY\n    1,\n    2\nORDER BY\n    site\n",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "site",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 1,
+        "name": "name",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 2,
+        "name": "unread",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      true,
+      true,
+      null
+    ]
+  },
+  "hash": "2dcbedef656e1b725c5ba4fb67d31ce7962d8714449b2fb630f49a7ed1acc270"
+}

server/.sqlx/query-b39147b9d06171cb742141eda4675688cb702fb284758b1224ed3aa2d7f3b3d9.json

@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "UPDATE\n    post\nSET\n    is_read = $1\nWHERE\n    uid = $2\n",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Bool",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "b39147b9d06171cb742141eda4675688cb702fb284758b1224ed3aa2d7f3b3d9"
+}

server/.sqlx/query-e28b890e308f483aa6bd08617548ae66294ae1e99b1cab49f5f4211e0fd7d419.json

@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT\n    COUNT(*) count\nFROM\n    post\nWHERE\n    ($1::text IS NULL OR site = $1)\n    AND (\n        NOT $2\n        OR NOT is_read\n    )\n",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "count",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Bool"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "e28b890e308f483aa6bd08617548ae66294ae1e99b1cab49f5f4211e0fd7d419"
+}

server/Cargo.toml

@@ -30,4 +30,5 @@ maplit = "1.0.2"
 linkify = "0.10.0"
 sqlx = { version = "0.7.4", features = ["postgres", "runtime-tokio", "time"] }
 url = "2.5.2"
+html-escape = "0.2.13"
 

server/sql/count.sql

@@ -3,7 +3,7 @@ SELECT
 FROM
     post
 WHERE
-    site = $1
+    ($1::text IS NULL OR site = $1)
     AND (
         NOT $2
         OR NOT is_read

server/sql/set_unread.sql

@@ -0,0 +1,6 @@
+UPDATE
+    post
+SET
+    is_read = $1
+WHERE
+    uid = $2

server/sql/threads.sql

@@ -1,4 +1,5 @@
 SELECT
+    site,
     date,
     is_read,
     title,
@@ -8,7 +9,7 @@ FROM
     post p
     JOIN feed f ON p.site = f.slug
 WHERE
-    site = $1
+    ($1::text IS NULL OR site = $1)
     AND (
         NOT $2
         OR NOT is_read

server/src/bin/cleanhtml.rs

@@ -9,7 +9,7 @@ fn main() -> anyhow::Result<()> {
     println!("Sanitizing {src} into {dst}");
     let bytes = fs::read(src)?;
     let html = String::from_utf8_lossy(&bytes);
-    let html = sanitize_html(&html, "")?;
+    let html = sanitize_html(&html, "", &None)?;
     fs::write(dst, html)?;
 
     Ok(())

server/src/custom.css

@@ -0,0 +1,8 @@
+pre {
+  background-color: var(--color-bg);
+  color: var(--color-text);
+}
+
+code {
+  background-color: var(--color-bg-secondary);
+}

server/src/error.rs

@@ -3,7 +3,7 @@ use std::{convert::Infallible, str::Utf8Error, string::FromUtf8Error};
 use mailparse::MailParseError;
 use thiserror::Error;
 
-use crate::SanitizeError;
+use crate::TransformError;
 
 #[derive(Error, Debug)]
 pub enum ServerError {
@@ -19,8 +19,8 @@ pub enum ServerError {
     PartNotFound,
     #[error("sqlx error: {0}")]
     SQLXError(#[from] sqlx::Error),
-    #[error("html sanitize error: {0}")]
-    SanitizeError(#[from] SanitizeError),
+    #[error("html transform error: {0}")]
+    TransformError(#[from] TransformError),
     #[error("UTF8 error: {0}")]
     Utf8Error(#[from] Utf8Error),
     #[error("FromUTF8 error: {0}")]

server/src/graphql.rs

@@ -1,10 +1,11 @@
-
 use async_graphql::{
-    connection::{Connection},
-    Context, EmptySubscription, Enum, Error, FieldResult, Object, Schema, SimpleObject, Union,
+    connection::{self, Connection, Edge, OpaqueCursor},
+    Context, EmptySubscription, Enum, Error, FieldResult, InputObject, Object, Schema,
+    SimpleObject, Union,
 };
 use log::info;
 use notmuch::Notmuch;
+use serde::{Deserialize, Serialize};
 use sqlx::postgres::PgPool;
 
 use crate::{newsreader, nm};
@@ -194,13 +195,19 @@ pub struct Email {
 }
 
 #[derive(SimpleObject)]
-pub(crate) struct Tag {
+pub struct Tag {
     pub name: String,
     pub fg_color: String,
     pub bg_color: String,
     pub unread: usize,
 }
 
+#[derive(Serialize, Deserialize, Debug, InputObject)]
+struct SearchCursor {
+    newsreader_offset: i32,
+    notmuch_offset: i32,
+}
+
 pub struct QueryRoot;
 #[Object]
 impl QueryRoot {
@@ -208,12 +215,9 @@ impl QueryRoot {
         let nm = ctx.data_unchecked::<Notmuch>();
         let pool = ctx.data_unchecked::<PgPool>();
 
-        // TODO: make this search both copra and merge results
-        if newsreader::is_newsreader_search(&query) {
-            Ok(newsreader::count(pool, &query).await?)
-        } else {
-            Ok(nm::count(nm, &query).await?)
-        }
+        let newsreader_query: newsreader::Query = query.parse()?;
+
+        Ok(newsreader::count(pool, &newsreader_query).await? + nm::count(nm, &query).await?)
     }
 
     async fn search<'ctx>(
@@ -224,17 +228,110 @@ impl QueryRoot {
         first: Option<i32>,
         last: Option<i32>,
         query: String,
-    ) -> Result<Connection<usize, ThreadSummary>, Error> {
-        info!("search({after:?} {before:?} {first:?} {last:?} {query:?})");
+    ) -> Result<Connection<OpaqueCursor<SearchCursor>, ThreadSummary>, Error> {
+        // TODO: add keywords to limit search to one corpus, i.e. is:news or is:mail
+        info!("search({after:?} {before:?} {first:?} {last:?} {query:?})",);
         let nm = ctx.data_unchecked::<Notmuch>();
         let pool = ctx.data_unchecked::<PgPool>();
 
-        // TODO: make this search both copra and merge results
-        if newsreader::is_newsreader_search(&query) {
-            Ok(newsreader::search(pool, after, before, first, last, query).await?)
-        } else {
-            Ok(nm::search(nm, after, before, first, last, query).await?)
+        enum ThreadSummaryCursor {
+            Newsreader(i32, ThreadSummary),
+            Notmuch(i32, ThreadSummary),
         }
+        Ok(connection::query(
+            after,
+            before,
+            first,
+            last,
+            |after: Option<OpaqueCursor<SearchCursor>>,
+             before: Option<OpaqueCursor<SearchCursor>>,
+             first: Option<usize>,
+             last: Option<usize>| async move {
+                info!(
+                    "search({:?} {:?} {first:?} {last:?} {query:?})",
+                    after.as_ref().map(|v| &v.0),
+                    before.as_ref().map(|v| &v.0)
+                );
+                let newsreader_after = after.as_ref().map(|sc| sc.newsreader_offset);
+                let notmuch_after = after.as_ref().map(|sc| sc.newsreader_offset);
+                let newsreader_before = before.as_ref().map(|sc| sc.newsreader_offset);
+                let notmuch_before = before.as_ref().map(|sc| sc.notmuch_offset);
+
+                let newsreader_query: newsreader::Query = query.parse()?;
+                let newsreader_results = newsreader::search(
+                    pool,
+                    newsreader_after,
+                    newsreader_before,
+                    first.map(|v| v as i32),
+                    last.map(|v| v as i32),
+                    &newsreader_query,
+                )
+                .await?
+                .into_iter()
+                .map(|(cur, ts)| ThreadSummaryCursor::Newsreader(cur, ts));
+
+                let notmuch_results = nm::search(
+                    nm,
+                    notmuch_after,
+                    notmuch_before,
+                    first.map(|v| v as i32),
+                    last.map(|v| v as i32),
+                    query,
+                )
+                .await?
+                .into_iter()
+                .map(|(cur, ts)| ThreadSummaryCursor::Notmuch(cur, ts));
+
+                let mut results: Vec<_> = newsreader_results.chain(notmuch_results).collect();
+
+                // The leading '-' is to reverse sort
+                results.sort_by_key(|item| match item {
+                    ThreadSummaryCursor::Newsreader(_, ts) => -ts.timestamp,
+                    ThreadSummaryCursor::Notmuch(_, ts) => -ts.timestamp,
+                });
+
+                let mut has_next_page = before.is_some();
+                if let Some(first) = first {
+                    if results.len() > first {
+                        has_next_page = true;
+                        results.truncate(first);
+                    }
+                }
+
+                let mut has_previous_page = after.is_some();
+                if let Some(last) = last {
+                    if results.len() > last {
+                        has_previous_page = true;
+                        results.truncate(last);
+                    }
+                }
+
+                let mut connection = Connection::new(has_previous_page, has_next_page);
+                let mut newsreader_offset = 0;
+                let mut notmuch_offset = 0;
+
+                connection.edges.extend(results.into_iter().map(|item| {
+                    let thread_summary;
+                    match item {
+                        ThreadSummaryCursor::Newsreader(offset, ts) => {
+                            thread_summary = ts;
+                            newsreader_offset = offset;
+                        }
+                        ThreadSummaryCursor::Notmuch(offset, ts) => {
+                            thread_summary = ts;
+                            notmuch_offset = offset;
+                        }
+                    }
+                    let cur = OpaqueCursor(SearchCursor {
+                        newsreader_offset,
+                        notmuch_offset,
+                    });
+                    Edge::new(cur, thread_summary)
+                }));
+                Ok::<_, async_graphql::Error>(connection)
+            },
+        )
+        .await?)
     }
 
     async fn tags<'ctx>(&self, ctx: &Context<'ctx>) -> FieldResult<Vec<Tag>> {
@@ -273,11 +370,14 @@ impl Mutation {
         unread: bool,
     ) -> Result<bool, Error> {
         let nm = ctx.data_unchecked::<Notmuch>();
-        info!("set_read_status({unread})");
-        if unread {
-            nm.tag_add("unread", &format!("{query}"))?;
-        } else {
-            nm.tag_remove("unread", &format!("{query}"))?;
+        let pool = ctx.data_unchecked::<PgPool>();
+
+        for q in query.split_whitespace() {
+            if newsreader::is_newsreader_thread(&q) {
+                newsreader::set_read_status(pool, &q, unread).await?;
+            } else {
+                nm::set_read_status(nm, q, unread).await?;
+            }
         }
         Ok(true)
     }

server/src/lib.rs

@@ -11,14 +11,79 @@ use maplit::{hashmap, hashset};
 use thiserror::Error;
 use url::Url;
 
+// TODO: figure out how to use Cow
+trait Transformer {
+    fn should_run(&self, _html: &str) -> bool {
+        true
+    }
+    // TODO: should html be something like `html_escape` uses:
+    // <S: ?Sized + AsRef<str>>(text: &S) -> Cow<str>
+    fn transform(&self, html: &str) -> Result<String, TransformError>;
+}
+
+// TODO: how would we make this more generic to allow good implementations of Transformer outside
+// of this module?
 #[derive(Error, Debug)]
-pub enum SanitizeError {
+pub enum TransformError {
     #[error("lol-html rewrite error")]
     RewritingError(#[from] RewritingError),
     #[error("css inline error")]
     InlineError(#[from] InlineError),
 }
 
+struct SanitizeHtml<'a> {
+    cid_prefix: &'a str,
+    base_url: &'a Option<Url>,
+}
+
+impl<'a> Transformer for SanitizeHtml<'a> {
+    fn transform(&self, html: &str) -> Result<String, TransformError> {
+        Ok(sanitize_html(html, self.cid_prefix, self.base_url)?)
+    }
+}
+
+struct EscapeHtml;
+
+impl Transformer for EscapeHtml {
+    fn should_run(&self, html: &str) -> bool {
+        html.starts_with("&lt")
+    }
+    fn transform(&self, html: &str) -> Result<String, TransformError> {
+        Ok(html_escape::decode_html_entities(html).to_string())
+    }
+}
+
+struct InlineStyle;
+
+impl Transformer for InlineStyle {
+    fn transform(&self, html: &str) -> Result<String, TransformError> {
+        let css = concat!(
+            "/* mvp.css */\n",
+            include_str!("mvp.css"),
+            "/* Xinu Specific overrides */\n",
+            include_str!("custom.css"),
+        );
+        let inline_opts = InlineOptions {
+            inline_style_tags: false,
+            keep_style_tags: false,
+            keep_link_tags: false,
+            base_url: None,
+            load_remote_stylesheets: false,
+            extra_css: Some(css.into()),
+            preallocate_node_capacity: 32,
+            ..InlineOptions::default()
+        };
+
+        Ok(match CSSInliner::new(inline_opts).inline(&html) {
+            Ok(inlined_html) => inlined_html,
+            Err(err) => {
+                error!("failed to inline CSS: {err}");
+                html.to_string()
+            }
+        })
+    }
+}
+
 pub fn linkify_html(text: &str) -> String {
     let mut finder = LinkFinder::new();
     let finder = finder.url_must_have_scheme(false).kinds(&[LinkKind::Url]);
@@ -50,31 +115,15 @@ pub fn linkify_html(text: &str) -> String {
 pub fn sanitize_html(
     html: &str,
     cid_prefix: &str,
-    base_url: &Url,
-) -> Result<String, SanitizeError> {
-    let element_content_handlers = vec![
+    base_url: &Option<Url>,
+) -> Result<String, TransformError> {
+    let mut element_content_handlers = vec![
         // Open links in new tab
         element!("a[href]", |el| {
             el.set_attribute("target", "_blank").unwrap();
 
             Ok(())
         }),
-        // Make links with relative URLs absolute
-        element!("a[href]", |el| {
-            if let Some(Ok(href)) = el.get_attribute("href").map(|href| base_url.join(&href)) {
-                el.set_attribute("href", &href.as_str()).unwrap();
-            }
-
-            Ok(())
-        }),
-        // Make images with relative srcs absolute
-        element!("img[src]", |el| {
-            if let Some(Ok(src)) = el.get_attribute("src").map(|src| base_url.join(&src)) {
-                el.set_attribute("src", &src.as_str()).unwrap();
-            }
-
-            Ok(())
-        }),
         // Replace mixed part CID images with URL
         element!("img[src]", |el| {
             let src = el
@@ -98,6 +147,26 @@ pub fn sanitize_html(
             Ok(())
         }),
     ];
+    if let Some(base_url) = base_url {
+        element_content_handlers.extend(vec![
+            // Make links with relative URLs absolute
+            element!("a[href]", |el| {
+                if let Some(Ok(href)) = el.get_attribute("href").map(|href| base_url.join(&href)) {
+                    el.set_attribute("href", &href.as_str()).unwrap();
+                }
+
+                Ok(())
+            }),
+            // Make images with relative srcs absolute
+            element!("img[src]", |el| {
+                if let Some(Ok(src)) = el.get_attribute("src").map(|src| base_url.join(&src)) {
+                    el.set_attribute("src", &src.as_str()).unwrap();
+                }
+
+                Ok(())
+            }),
+        ]);
+    }
 
     let inline_opts = InlineOptions {
         inline_style_tags: true,
@@ -276,3 +345,39 @@ pub fn sanitize_html(
 
     Ok(clean_html)
 }
+
+fn compute_offset_limit(
+    after: Option<i32>,
+    before: Option<i32>,
+    first: Option<i32>,
+    last: Option<i32>,
+) -> (i32, i32) {
+    let default_page_size = 100;
+    match (after, before, first, last) {
+        // Reasonable defaults
+        (None, None, None, None) => (0, default_page_size),
+        (None, None, Some(first), None) => (0, first),
+        (Some(after), None, None, None) => (after + 1, default_page_size),
+        (Some(after), None, Some(first), None) => (after + 1, first),
+        (None, Some(before), None, None) => (0.max(before - default_page_size), default_page_size),
+        (None, Some(before), None, Some(last)) => (0.max(before - last), last),
+        (None, None, None, Some(_)) => {
+            panic!("specifying last and no before doesn't make sense")
+        }
+        (None, None, Some(_), Some(_)) => {
+            panic!("specifying first and last doesn't make sense")
+        }
+        (None, Some(_), Some(_), _) => {
+            panic!("specifying before and first doesn't make sense")
+        }
+        (Some(_), Some(_), _, _) => {
+            panic!("specifying after and before doesn't make sense")
+        }
+        (Some(_), None, None, Some(_)) => {
+            panic!("specifying after and last doesn't make sense")
+        }
+        (Some(_), None, Some(_), Some(_)) => {
+            panic!("specifying after, first and last doesn't make sense")
+        }
+    }
+}

server/src/mvp.css

@@ -0,0 +1,498 @@
+/* MVP.css v1.15 - https://github.com/andybrewer/mvp */
+
+/* :root content stored in client side index.html */
+
+html {
+  scroll-behavior: smooth;
+}
+
+@media (prefers-reduced-motion: reduce) {
+  html {
+    scroll-behavior: auto;
+  }
+}
+
+/* Layout */
+article aside {
+  background: var(--color-secondary-accent);
+  border-left: 4px solid var(--color-secondary);
+  padding: 0.01rem 0.8rem;
+}
+
+body {
+  background: var(--color-bg);
+  color: var(--color-text);
+  font-family: var(--font-family);
+  line-height: var(--line-height);
+  margin: 0;
+  overflow-x: hidden;
+  padding: 0;
+}
+
+footer,
+header,
+main {
+  margin: 0 auto;
+  max-width: var(--width-content);
+  padding: 3rem 1rem;
+}
+
+hr {
+  background-color: var(--color-bg-secondary);
+  border: none;
+  height: 1px;
+  margin: 4rem 0;
+  width: 100%;
+}
+
+section {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: var(--justify-important);
+}
+
+section img,
+article img {
+  max-width: 100%;
+}
+
+section pre {
+  overflow: auto;
+}
+
+section aside {
+  border: 1px solid var(--color-bg-secondary);
+  border-radius: var(--border-radius);
+  box-shadow: var(--box-shadow) var(--color-shadow);
+  margin: 1rem;
+  padding: 1.25rem;
+  width: var(--width-card);
+}
+
+section aside:hover {
+  box-shadow: var(--box-shadow) var(--color-bg-secondary);
+}
+
+[hidden] {
+  display: none;
+}
+
+/* Headers */
+article header,
+div header,
+main header {
+  padding-top: 0;
+}
+
+header {
+  text-align: var(--justify-important);
+}
+
+header a b,
+header a em,
+header a i,
+header a strong {
+  margin-left: 0.5rem;
+  margin-right: 0.5rem;
+}
+
+header nav img {
+  margin: 1rem 0;
+}
+
+section header {
+  padding-top: 0;
+  width: 100%;
+}
+
+/* Nav */
+nav {
+  align-items: center;
+  display: flex;
+  font-weight: bold;
+  justify-content: space-between;
+  margin-bottom: 7rem;
+}
+
+nav ul {
+  list-style: none;
+  padding: 0;
+}
+
+nav ul li {
+  display: inline-block;
+  margin: 0 0.5rem;
+  position: relative;
+  text-align: left;
+}
+
+/* Nav Dropdown */
+nav ul li:hover ul {
+  display: block;
+}
+
+nav ul li ul {
+  background: var(--color-bg);
+  border: 1px solid var(--color-bg-secondary);
+  border-radius: var(--border-radius);
+  box-shadow: var(--box-shadow) var(--color-shadow);
+  display: none;
+  height: auto;
+  left: -2px;
+  padding: .5rem 1rem;
+  position: absolute;
+  top: 1.7rem;
+  white-space: nowrap;
+  width: auto;
+  z-index: 1;
+}
+
+nav ul li ul::before {
+  /* fill gap above to make mousing over them easier */
+  content: "";
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: -0.5rem;
+  height: 0.5rem;
+}
+
+nav ul li ul li,
+nav ul li ul li a {
+  display: block;
+}
+
+/* Typography */
+code,
+samp {
+  background-color: var(--color-accent);
+  border-radius: var(--border-radius);
+  color: var(--color-text);
+  display: inline-block;
+  margin: 0 0.1rem;
+  padding: 0 0.5rem;
+}
+
+details {
+  margin: 1.3rem 0;
+}
+
+details summary {
+  font-weight: bold;
+  cursor: pointer;
+}
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+  line-height: var(--line-height);
+  text-wrap: balance;
+}
+
+mark {
+  padding: 0.1rem;
+}
+
+ol li,
+ul li {
+  padding: 0.2rem 0;
+}
+
+p {
+  margin: 0.75rem 0;
+  padding: 0;
+  width: 100%;
+}
+
+pre {
+  margin: 1rem 0;
+  max-width: var(--width-card-wide);
+  padding: 1rem 0;
+}
+
+pre code,
+pre samp {
+  display: block;
+  max-width: var(--width-card-wide);
+  padding: 0.5rem 2rem;
+  white-space: pre-wrap;
+}
+
+small {
+  color: var(--color-text-secondary);
+}
+
+sup {
+  background-color: var(--color-secondary);
+  border-radius: var(--border-radius);
+  color: var(--color-bg);
+  font-size: xx-small;
+  font-weight: bold;
+  margin: 0.2rem;
+  padding: 0.2rem 0.3rem;
+  position: relative;
+  top: -2px;
+}
+
+/* Links */
+a {
+  color: var(--color-link);
+  display: inline-block;
+  font-weight: bold;
+  text-decoration: underline;
+}
+
+a:hover {
+  filter: brightness(var(--hover-brightness));
+}
+
+a:active {
+  filter: brightness(var(--active-brightness));
+}
+
+a b,
+a em,
+a i,
+a strong,
+button,
+input[type="submit"] {
+  border-radius: var(--border-radius);
+  display: inline-block;
+  font-size: medium;
+  font-weight: bold;
+  line-height: var(--line-height);
+  margin: 0.5rem 0;
+  padding: 1rem 2rem;
+}
+
+button,
+input[type="submit"] {
+  font-family: var(--font-family);
+}
+
+button:hover,
+input[type="submit"]:hover {
+  cursor: pointer;
+  filter: brightness(var(--hover-brightness));
+}
+
+button:active,
+input[type="submit"]:active {
+  filter: brightness(var(--active-brightness));
+}
+
+a b,
+a strong,
+button,
+input[type="submit"] {
+  background-color: var(--color-link);
+  border: 2px solid var(--color-link);
+  color: var(--color-bg);
+}
+
+a em,
+a i {
+  border: 2px solid var(--color-link);
+  border-radius: var(--border-radius);
+  color: var(--color-link);
+  display: inline-block;
+  padding: 1rem 2rem;
+}
+
+article aside a {
+  color: var(--color-secondary);
+}
+
+/* Images */
+figure {
+  margin: 0;
+  padding: 0;
+}
+
+figure img {
+  max-width: 100%;
+}
+
+figure figcaption {
+  color: var(--color-text-secondary);
+}
+
+/* Forms */
+button:disabled,
+input:disabled {
+  background: var(--color-bg-secondary);
+  border-color: var(--color-bg-secondary);
+  color: var(--color-text-secondary);
+  cursor: not-allowed;
+}
+
+button[disabled]:hover,
+input[type="submit"][disabled]:hover {
+  filter: none;
+}
+
+form {
+  border: 1px solid var(--color-bg-secondary);
+  border-radius: var(--border-radius);
+  box-shadow: var(--box-shadow) var(--color-shadow);
+  display: block;
+  max-width: var(--width-card-wide);
+  min-width: var(--width-card);
+  padding: 1.5rem;
+  text-align: var(--justify-normal);
+}
+
+form header {
+  margin: 1.5rem 0;
+  padding: 1.5rem 0;
+}
+
+input,
+label,
+select,
+textarea {
+  display: block;
+  font-size: inherit;
+  max-width: var(--width-card-wide);
+}
+
+input[type="checkbox"],
+input[type="radio"] {
+  display: inline-block;
+}
+
+input[type="checkbox"]+label,
+input[type="radio"]+label {
+  display: inline-block;
+  font-weight: normal;
+  position: relative;
+  top: 1px;
+}
+
+input[type="range"] {
+  padding: 0.4rem 0;
+}
+
+input,
+select,
+textarea {
+  border: 1px solid var(--color-bg-secondary);
+  border-radius: var(--border-radius);
+  margin-bottom: 1rem;
+  padding: 0.4rem 0.8rem;
+}
+
+input[type="text"],
+input[type="password"] textarea {
+  width: calc(100% - 1.6rem);
+}
+
+input[readonly],
+textarea[readonly] {
+  background-color: var(--color-bg-secondary);
+}
+
+label {
+  font-weight: bold;
+  margin-bottom: 0.2rem;
+}
+
+/* Popups */
+dialog {
+  border: 1px solid var(--color-bg-secondary);
+  border-radius: var(--border-radius);
+  box-shadow: var(--box-shadow) var(--color-shadow);
+  position: fixed;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  width: 50%;
+  z-index: 999;
+}
+
+/* Tables */
+table {
+  border: 1px solid var(--color-bg-secondary);
+  border-radius: var(--border-radius);
+  border-spacing: 0;
+  display: inline-block;
+  max-width: 100%;
+  overflow-x: auto;
+  padding: 0;
+  white-space: nowrap;
+}
+
+table td,
+table th,
+table tr {
+  padding: 0.4rem 0.8rem;
+  text-align: var(--justify-important);
+}
+
+table thead {
+  background-color: var(--color-table);
+  border-collapse: collapse;
+  border-radius: var(--border-radius);
+  color: var(--color-bg);
+  margin: 0;
+  padding: 0;
+}
+
+table thead tr:first-child th:first-child {
+  border-top-left-radius: var(--border-radius);
+}
+
+table thead tr:first-child th:last-child {
+  border-top-right-radius: var(--border-radius);
+}
+
+table thead th:first-child,
+table tr td:first-child {
+  text-align: var(--justify-normal);
+}
+
+table tr:nth-child(even) {
+  background-color: var(--color-accent);
+}
+
+/* Quotes */
+blockquote {
+  display: block;
+  font-size: x-large;
+  line-height: var(--line-height);
+  margin: 1rem auto;
+  max-width: var(--width-card-medium);
+  padding: 1.5rem 1rem;
+  text-align: var(--justify-important);
+}
+
+blockquote footer {
+  color: var(--color-text-secondary);
+  display: block;
+  font-size: small;
+  line-height: var(--line-height);
+  padding: 1.5rem 0;
+}
+
+/* Scrollbars */
+* {
+  scrollbar-width: thin;
+  scrollbar-color: var(--color-scrollbar) transparent;
+}
+
+*::-webkit-scrollbar {
+  width: 5px;
+  height: 5px;
+}
+
+*::-webkit-scrollbar-track {
+  background: transparent;
+}
+
+*::-webkit-scrollbar-thumb {
+  background-color: var(--color-scrollbar);
+  border-radius: 10px;
+}

server/src/newsreader.rs

@@ -4,18 +4,19 @@ use std::{
     str::FromStr,
 };
 
-use async_graphql::connection::{self, Connection, Edge};
 use log::info;
 use sqlx::postgres::PgPool;
 use url::Url;
 
 const TAG_PREFIX: &'static str = "News/";
 const THREAD_PREFIX: &'static str = "news:";
+const NON_EXISTENT_SITE_NAME: &'static str = "NO-SUCH-SITE";
 
 use crate::{
+    compute_offset_limit,
     error::ServerError,
     graphql::{Body, Email, Html, Message, Tag, Thread, ThreadSummary},
-    sanitize_html,
+    EscapeHtml, InlineStyle, SanitizeHtml, Transformer,
 };
 
 pub fn is_newsreader_search(query: &str) -> bool {
@@ -26,10 +27,8 @@ pub fn is_newsreader_thread(query: &str) -> bool {
     query.starts_with(THREAD_PREFIX)
 }
 
-pub async fn count(pool: &PgPool, query: &str) -> Result<usize, ServerError> {
-    let query: Query = query.parse()?;
-    let site = query.site.expect("search has no site");
-    let row = sqlx::query_file!("sql/count.sql", site, query.unread_only)
+pub async fn count(pool: &PgPool, query: &Query) -> Result<usize, ServerError> {
+    let row = sqlx::query_file!("sql/count.sql", query.site, query.unread_only)
         .fetch_one(pool)
         .await?;
     Ok(row.count.unwrap_or(0).try_into().unwrap_or(0))
@@ -37,105 +36,61 @@ pub async fn count(pool: &PgPool, query: &str) -> Result<usize, ServerError> {
 
 pub async fn search(
     pool: &PgPool,
-    after: Option<String>,
-    before: Option<String>,
+    after: Option<i32>,
+    before: Option<i32>,
     first: Option<i32>,
     last: Option<i32>,
-    query: String,
-) -> Result<Connection<usize, ThreadSummary>, async_graphql::Error> {
-    let query: Query = query.parse()?;
-    info!("news search query {query:?}");
-    let site = query.site.expect("search has no site");
-    connection::query(
-        after,
-        before,
-        first,
-        last,
-        |after: Option<usize>, before: Option<usize>, first, last| async move {
-            info!("search page info {after:#?}, {before:#?}, {first:#?}, {last:#?}");
-            let default_page_size = 100;
-            let (offset, limit) = match (after, before, first, last) {
-                // Reasonable defaults
-                (None, None, None, None) => (0, default_page_size),
-                (None, None, Some(first), None) => (0, first),
-                (Some(after), None, None, None) => (after, default_page_size),
-                (Some(after), None, Some(first), None) => (after, first),
-                (None, Some(before), None, None) => {
-                    (before.saturating_sub(default_page_size), default_page_size)
-                }
-                (None, Some(before), None, Some(last)) => (before.saturating_sub(last), last),
-                (None, None, None, Some(_)) => {
-                    panic!("specifying last and no before doesn't make sense")
-                }
-                (None, None, Some(_), Some(_)) => {
-                    panic!("specifying first and last doesn't make sense")
-                }
-                (None, Some(_), Some(_), _) => {
-                    panic!("specifying before and first doesn't make sense")
-                }
-                (Some(_), Some(_), _, _) => {
-                    panic!("specifying after and before doesn't make sense")
-                }
-                (Some(_), None, None, Some(_)) => {
-                    panic!("specifying after and last doesn't make sense")
-                }
-                (Some(_), None, Some(_), Some(_)) => {
-                    panic!("specifying after, first and last doesn't make sense")
-                }
-            };
-            // The +1 is to see if there are more pages of data available.
-            let limit = limit + 1;
+    query: &Query,
+) -> Result<Vec<(i32, ThreadSummary)>, async_graphql::Error> {
+    info!("search({after:?} {before:?} {first:?} {last:?} {query:?}");
+    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.
+        // Searching backwards implies there's more pages forward, because the value represented by
+        // `before` is on the next page.
+        limit = limit + 1;
+    }
+    info!("search offset {offset} limit {limit}");
 
-            info!("search page offset {offset} limit {limit}");
-            let rows = sqlx::query_file!(
-                "sql/threads.sql",
-                site,
-                query.unread_only,
-                offset as i64,
-                limit as i64
-            )
-            .fetch_all(pool)
-            .await?;
-
-            let mut slice = rows
-                .into_iter()
-                .map(|r| {
-                    let tags = if r.is_read.unwrap_or(false) {
-                        vec![site.clone()]
-                    } else {
-                        vec!["unread".to_string(), site.clone()]
-                    };
-                    ThreadSummary {
-                        thread: format!("{THREAD_PREFIX}{}", r.uid),
-                        timestamp: r
-                            .date
-                            .expect("post missing date")
-                            .assume_utc()
-                            .unix_timestamp() as isize,
-                        date_relative: "TODO date_relative".to_string(),
-                        matched: 0,
-                        total: 1,
-                        authors: r.name.unwrap_or_else(|| site.clone()),
-                        subject: r.title.unwrap_or("NO TITLE".to_string()),
-                        tags,
-                    }
-                })
-                .collect::<Vec<_>>();
-            let has_more = slice.len() == limit;
-            let mut connection = Connection::new(offset > 0, has_more);
-            if has_more {
-                slice.pop();
-            };
-            connection.edges.extend(
-                slice
-                    .into_iter()
-                    .enumerate()
-                    .map(|(idx, item)| Edge::new(offset + idx, item)),
-            );
-            Ok::<_, async_graphql::Error>(connection)
-        },
+    let rows = sqlx::query_file!(
+        "sql/threads.sql",
+        query.site,
+        query.unread_only,
+        offset as i64,
+        limit as i64
     )
-    .await
+    .fetch_all(pool)
+    .await?;
+
+    Ok(rows
+        .into_iter()
+        .enumerate()
+        .map(|(i, r)| {
+            let site = r.site.unwrap_or("UNKOWN SITE".to_string());
+            let tags = if r.is_read.unwrap_or(false) {
+                vec![site.clone()]
+            } else {
+                vec!["unread".to_string(), site.clone()]
+            };
+            (
+                i as i32 + offset,
+                ThreadSummary {
+                    thread: format!("{THREAD_PREFIX}{}", r.uid),
+                    timestamp: r
+                        .date
+                        .expect("post missing date")
+                        .assume_utc()
+                        .unix_timestamp() as isize,
+                    date_relative: "TODO date_relative".to_string(),
+                    matched: 0,
+                    total: 1,
+                    authors: r.name.unwrap_or_else(|| site.clone()),
+                    subject: r.title.unwrap_or("NO TITLE".to_string()),
+                    tags,
+                },
+            )
+        })
+        .collect())
 }
 
 pub async fn tags(pool: &PgPool, _needs_unread: bool) -> Result<Vec<Tag>, ServerError> {
@@ -188,18 +143,18 @@ pub async fn thread(pool: &PgPool, thread_id: String) -> Result<Thread, ServerEr
             })
             .unwrap_or(default_homepage.to_string()),
     )?;
-    let link = Url::parse(
-        &r.link
-            .as_ref()
-            .map(|h| {
-                if h.is_empty() {
-                    default_homepage.to_string()
-                } else {
-                    h.to_string()
-                }
-            })
-            .unwrap_or(default_homepage.to_string()),
-    )?;
+    let link = &r
+        .link
+        .as_ref()
+        .map(|h| {
+            if h.is_empty() {
+                default_homepage.to_string()
+            } else {
+                h.to_string()
+            }
+        })
+        .map(|h| Url::parse(&h).ok())
+        .flatten();
     let addr = r.link.as_ref().map(|link| {
         if link.contains('@') {
             link.clone()
@@ -211,11 +166,23 @@ pub async fn thread(pool: &PgPool, thread_id: String) -> Result<Thread, ServerEr
             }
         }
     });
-    let html = r.summary.unwrap_or("NO SUMMARY".to_string());
+    let mut html = r.summary.unwrap_or("NO SUMMARY".to_string());
     // TODO: add site specific cleanups. For example:
     // * Grafana does <div class="image-wrapp"><img class="lazyload>"<img src="/media/...>"</img></div>
-    // * Some sites appear to be HTML encoded, unencode them, i.e. imperialviolet
-    let html = sanitize_html(&html, "", &link)?;
+    // * Some sites appear to be HTML encoded, unencode them, i.e. imperialviolent
+    let tranformers: Vec<Box<dyn Transformer>> = vec![
+        Box::new(EscapeHtml),
+        Box::new(InlineStyle),
+        Box::new(SanitizeHtml {
+            cid_prefix: "",
+            base_url: &link,
+        }),
+    ];
+    for t in tranformers.iter() {
+        if t.should_run(&html) {
+            html = t.transform(&html)?;
+        }
+    }
     let body = Body::Html(Html {
         html,
         content_tree: "".to_string(),
@@ -250,10 +217,11 @@ pub async fn thread(pool: &PgPool, thread_id: String) -> Result<Thread, ServerEr
 }
 
 #[derive(Debug)]
-struct Query {
-    unread_only: bool,
-    site: Option<String>,
-    remainder: Vec<String>,
+pub struct Query {
+    pub unread_only: bool,
+    pub site: Option<String>,
+    pub uid: Option<String>,
+    pub remainder: Vec<String>,
 }
 
 impl FromStr for Query {
@@ -261,6 +229,7 @@ impl FromStr for Query {
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         let mut unread_only = false;
         let mut site = None;
+        let mut uid = None;
         let mut remainder = Vec::new();
         let site_prefix = format!("tag:{TAG_PREFIX}");
         for word in s.split_whitespace() {
@@ -268,6 +237,12 @@ impl FromStr for Query {
                 unread_only = true
             } else if word.starts_with(&site_prefix) {
                 site = Some(word[site_prefix.len()..].to_string())
+            } else if word.starts_with("tag:") {
+                // Any tag that doesn't match site_prefix should explicitly set the site to something not in the
+                // database
+                site = Some(NON_EXISTENT_SITE_NAME.to_string());
+            } else if word.starts_with(THREAD_PREFIX) {
+                uid = Some(word[THREAD_PREFIX.len()..].to_string())
             } else {
                 remainder.push(word.to_string());
             }
@@ -275,7 +250,20 @@ impl FromStr for Query {
         Ok(Query {
             unread_only,
             site,
+            uid,
             remainder,
         })
     }
 }
+
+pub async fn set_read_status<'ctx>(
+    pool: &PgPool,
+    query: &str,
+    unread: bool,
+) -> Result<bool, ServerError> {
+    let query: Query = query.parse()?;
+    sqlx::query_file!("sql/set_unread.sql", !unread, query.uid)
+        .execute(pool)
+        .await?;
+    Ok(true)
+}

server/src/nm.rs

@@ -5,14 +5,13 @@ use std::{
     time::Instant,
 };
 
-use async_graphql::connection::{self, Connection, Edge};
 use log::{error, info, warn};
 use mailparse::{parse_mail, MailHeader, MailHeaderMap, ParsedMail};
 use memmap::MmapOptions;
 use notmuch::Notmuch;
-use url::Url;
 
 use crate::{
+    compute_offset_limit,
     error::ServerError,
     graphql::{
         Attachment, Body, DispositionType, Email, Header, Html, Message, PlainText, Tag, Thread,
@@ -45,42 +44,23 @@ pub async fn count(nm: &Notmuch, query: &str) -> Result<usize, ServerError> {
 
 pub async fn search(
     nm: &Notmuch,
-    after: Option<String>,
-    before: Option<String>,
+    after: Option<i32>,
+    before: Option<i32>,
     first: Option<i32>,
     last: Option<i32>,
     query: String,
-) -> Result<Connection<usize, ThreadSummary>, async_graphql::Error> {
-    connection::query(
-        after,
-        before,
-        first,
-        last,
-        |after, before, first, last| async move {
-            let total = nm.count(&query)?;
-            let (first, last) = if let (None, None) = (first, last) {
-                info!("neither first nor last set, defaulting first to 20");
-                (Some(20), None)
-            } else {
-                (first, last)
-            };
-
-            let mut start = after.map(|after| after + 1).unwrap_or(0);
-            let mut end = before.unwrap_or(total);
-            if let Some(first) = first {
-                end = (start + first).min(end);
-            }
-            if let Some(last) = last {
-                start = if last > end - start { end } else { end - last };
-            }
-
-            let count = end - start;
-            let slice: Vec<ThreadSummary> = nm
-                .search(&query, start, count)?
-                .0
-                .into_iter()
-                .map(|ts| ThreadSummary {
-                    thread: ts.thread,
+) -> Result<Vec<(i32, ThreadSummary)>, async_graphql::Error> {
+    let (offset, limit) = compute_offset_limit(after, before, first, last);
+    Ok(nm
+        .search(&query, offset as usize, limit as usize)?
+        .0
+        .into_iter()
+        .enumerate()
+        .map(|(i, ts)| {
+            (
+                offset + i as i32,
+                ThreadSummary {
+                    thread: format!("thread:{}", ts.thread),
                     timestamp: ts.timestamp,
                     date_relative: ts.date_relative,
                     matched: ts.matched,
@@ -88,20 +68,10 @@ pub async fn search(
                     authors: ts.authors,
                     subject: ts.subject,
                     tags: ts.tags,
-                })
-                .collect();
-
-            let mut connection = Connection::new(start > 0, end < total);
-            connection.edges.extend(
-                slice
-                    .into_iter()
-                    .enumerate()
-                    .map(|(idx, item)| Edge::new(start + idx, item)),
-            );
-            Ok::<_, async_graphql::Error>(connection)
-        },
-    )
-    .await
+                },
+            )
+        })
+        .collect())
 }
 
 pub fn tags(nm: &Notmuch, needs_unread: bool) -> Result<Vec<Tag>, ServerError> {
@@ -179,7 +149,7 @@ pub async fn thread(
             .get_first_value("date")
             .and_then(|d| mailparse::dateparse(&d).ok());
         let cid_prefix = shared::urls::cid_prefix(None, &id);
-        let base_url = Url::parse("https://there-should-be-no-relative-urls-in-email").unwrap();
+        let base_url = None;
         let body = match extract_body(&m, &id)? {
             Body::PlainText(PlainText { text, content_tree }) => {
                 let text = if text.len() > MAX_RAW_MESSAGE_SIZE {
@@ -248,7 +218,7 @@ pub async fn thread(
         // TODO(wathiede): parse message and fill out attachments
         let attachments = extract_attachments(&m, &id)?;
         messages.push(Message {
-            id,
+            id: format!("id:{id}"),
             from,
             to,
             cc,
@@ -752,3 +722,16 @@ fn render_content_type_tree(m: &ParsedMail) -> String {
         SKIP_HEADERS.join("\n  ")
     )
 }
+
+pub async fn set_read_status<'ctx>(
+    nm: &Notmuch,
+    query: &str,
+    unread: bool,
+) -> Result<bool, ServerError> {
+    if unread {
+        nm.tag_add("unread", &format!("{query}"))?;
+    } else {
+        nm.tag_remove("unread", &format!("{query}"))?;
+    }
+    Ok(true)
+}

web/Cargo.toml

@@ -36,6 +36,8 @@ wasm-opt = ['-Os']
 [dependencies.web-sys]
 version = "0.3.58"
 features = [
+  "Clipboard",
   "MediaQueryList",
+  "Navigator",
   "Window"
 ]

web/src/state.rs

@@ -372,7 +372,7 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
             {
                 let threads = selected_threads
                     .iter()
-                    .map(|tid| format!("thread:{tid}"))
+                    .map(|tid| tid.to_string())
                     .collect::<Vec<_>>()
                     .join(" ");
                 orders
@@ -387,7 +387,7 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
             {
                 let threads = selected_threads
                     .iter()
-                    .map(|tid| format!("thread:{tid}"))
+                    .map(|tid| tid.to_string())
                     .collect::<Vec<_>>()
                     .join(" ");
                 orders
@@ -402,7 +402,7 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
             {
                 let threads = selected_threads
                     .iter()
-                    .map(|tid| format!("thread:{tid}"))
+                    .map(|tid| tid.to_string())
                     .collect::<Vec<_>>()
                     .join(" ");
                 orders
@@ -417,7 +417,7 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
             {
                 let threads = selected_threads
                     .iter()
-                    .map(|tid| format!("thread:{tid}"))
+                    .map(|tid| tid.to_string())
                     .collect::<Vec<_>>()
                     .join(" ");
                 orders
@@ -452,6 +452,17 @@ pub fn update(msg: Msg, model: &mut Model, orders: &mut impl Orders<Msg>) {
             }
         }
         Msg::MultiMsg(msgs) => msgs.into_iter().for_each(|msg| update(msg, model, orders)),
+        Msg::CopyToClipboard(text) => {
+            let clipboard = seed::window()
+                .navigator()
+                .clipboard()
+                .expect("couldn't get clipboard");
+            orders.perform_cmd(async move {
+                wasm_bindgen_futures::JsFuture::from(clipboard.write_text(&text))
+                    .await
+                    .expect("failed to copy to clipboard");
+            });
+        }
     }
 }
 // `Model` describes our app state.
@@ -551,4 +562,6 @@ pub enum Msg {
     MessageCollapse(String),
     MessageExpand(String),
     MultiMsg(Vec<Msg>),
+
+    CopyToClipboard(String),
 }

web/src/view/desktop.rs

@@ -3,8 +3,8 @@ use seed_hooks::{state_access::CloneState, topo, use_state};
 
 use crate::{
     api::urls,
-    state::{Context, Model, Msg, Tag},
-    view::{self, view_header, view_search_results},
+    state::{Context, Model, Msg},
+    view::{self, view_header, view_search_results, view_tags},
 };
 
 #[topo::nested]
@@ -33,100 +33,9 @@ pub(super) fn view(model: &Model) -> Node<Msg> {
             show_icon_text,
         ),
     };
-    fn view_tag_li(display_name: &str, indent: usize, t: &Tag, search_unread: bool) -> Node<Msg> {
-        let href = if search_unread {
-            urls::search(&format!("is:unread tag:{}", t.name), 0)
-        } else {
-            urls::search(&format!("tag:{}", t.name), 0)
-        };
-        li![a![
-            attrs! {
-                At::Href => href
-            },
-            (0..indent).map(|_| span![C!["tag-indent"], ""]),
-            i![
-                C!["tag-tag", "fa-solid", "fa-tag"],
-                style! {
-                    //"--fa-primary-color" => t.fg_color,
-                    St::Color => t.bg_color,
-                },
-            ],
-            display_name,
-            IF!(t.unread>0 => format!(" ({})", t.unread))
-        ]]
-    }
-    fn matches(a: &[&str], b: &[&str]) -> usize {
-        std::iter::zip(a.iter(), b.iter())
-            .take_while(|(a, b)| a == b)
-            .count()
-    }
-    fn view_tag_list<'a>(
-        tags: impl Iterator<Item = &'a Tag>,
-        search_unread: bool,
-    ) -> Vec<Node<Msg>> {
-        let mut lis = Vec::new();
-        let mut last = Vec::new();
-        for t in tags {
-            let parts: Vec<_> = t.name.split('/').collect();
-            let mut n = matches(&last, &parts);
-            if n <= parts.len() - 2 && parts.len() > 1 {
-                // Synthesize fake tags for proper indenting.
-                for i in n..parts.len() - 1 {
-                    let display_name = parts[n];
-                    lis.push(view_tag_li(
-                        &display_name,
-                        n,
-                        &Tag {
-                            name: parts[..i + 1].join("/"),
-                            bg_color: "#fff".to_string(),
-                            fg_color: "#000".to_string(),
-                            unread: 0,
-                        },
-                        search_unread,
-                    ));
-                }
-                n = parts.len() - 1;
-            }
-            let display_name = parts[n];
-            lis.push(view_tag_li(&display_name, n, t, search_unread));
-            last = parts;
-        }
-        lis
-    }
-    let unread = model
-        .tags
-        .as_ref()
-        .map(|tags| tags.iter().filter(|t| t.unread > 0).collect())
-        .unwrap_or(Vec::new());
-    let tags_open = use_state(|| false);
-    let force_tags_open = unread.is_empty();
     div![
         C!["main-content"],
-        aside![
-            C!["tags-menu", "menu"],
-            IF!(!unread.is_empty() => p![C!["menu-label"], "Unread"]),
-            IF!(!unread.is_empty() => ul![C!["menu-list"], view_tag_list(unread.into_iter(),true)]),
-            p![
-                C!["menu-label"],
-                IF!(!force_tags_open =>
-                i![C![
-                    "fa-solid",
-                    if tags_open.get() {
-                        "fa-angle-up"
-                    } else {
-                        "fa-angle-down"
-                    }
-                ]]),
-                " Tags",
-                ev(Ev::Click, move |_| {
-                    tags_open.set(!tags_open.get());
-                })
-            ],
-            ul![
-                C!["menu-list"],
-                IF!(force_tags_open||tags_open.get() => model.tags.as_ref().map(|tags| view_tag_list(tags.iter(),false))),
-            ]
-        ],
+        view_tags(model),
         div![
             view_header(&model.query, &model.refreshing_state),
             content,

web/src/view/mobile.rs

@@ -6,7 +6,10 @@ use crate::{
     api::urls,
     graphql::front_page_query::*,
     state::{Context, Model, Msg},
-    view::{self, human_age, pretty_authors, search_toolbar, set_title, tags_chiclet, view_header},
+    view::{
+        self, human_age, pretty_authors, search_toolbar, set_title, tags_chiclet, view_header,
+        view_tags,
+    },
 };
 
 pub(super) fn view(model: &Model) -> Node<Msg> {
@@ -37,6 +40,7 @@ pub(super) fn view(model: &Model) -> Node<Msg> {
         view_header(&model.query, &model.refreshing_state),
         content,
         view_header(&model.query, &model.refreshing_state),
+        view_tags(model),
     ]
 }
 

web/src/view/mod.rs

@@ -6,14 +6,14 @@ use std::{
 use chrono::{DateTime, Datelike, Duration, Local, Utc};
 use human_format::{Formatter, Scales};
 use itertools::Itertools;
-use log::error;
+use log::{error, info};
 use seed::{prelude::*, *};
 use seed_hooks::{state_access::CloneState, topo, use_state};
 
 use crate::{
     api::urls,
     graphql::{front_page_query::*, show_thread_query::*},
-    state::{unread_query, Model, Msg, RefreshingState},
+    state::{unread_query, Model, Msg, RefreshingState, Tag},
 };
 
 mod desktop;
@@ -40,23 +40,11 @@ fn tags_chiclet(tags: &[String], is_mobile: bool) -> impl Iterator<Item = Node<M
         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![classes, style, "📎"],
-                "replied" => span![classes, style, i![C!["fa-solid", "fa-reply"]]],
-                _ => span![classes, style, &tag],
-            },
-            ev(Ev::Click, move |_| Msg::FrontPageRequest {
-                query: format!("tag:{tag}"),
-                after: None,
-                before: None,
-                first: None,
-                last: None,
-            })
-        ]
+        a![match tag.as_str() {
+            "attachment" => span![classes, style, "📎"],
+            "replied" => span![classes, style, i![C!["fa-solid", "fa-reply"]]],
+            _ => span![classes, style, &tag],
+        },]
     })
 }
 
@@ -73,6 +61,7 @@ fn removable_tags_chiclet<'a>(
             "is-grouped-multiline"
         ],
         tags.iter().map(move |tag| {
+            let thread_id = thread_id.to_string();
             let hex = compute_color(tag);
             let style = style! {St::BackgroundColor=>hex};
             let classes = C!["tag", IF!(is_mobile => "is-small")];
@@ -81,7 +70,6 @@ fn removable_tags_chiclet<'a>(
             };
             let tag = tag.clone();
             let rm_tag = tag.clone();
-            let thread_id = format!("thread:{thread_id}");
             div![
                 C!["control"],
                 div![
@@ -122,14 +110,16 @@ fn pretty_authors(authors: &str) -> impl Iterator<Item = Node<Msg>> + '_ {
             if one_person {
                 return Some(span![
                     attrs! {
-                    At::Title => author.trim()},
+                        At::Title => author.trim()
+                    },
                     author
                 ]);
             }
             author.split_whitespace().nth(0).map(|first| {
                 span![
                     attrs! {
-                    At::Title => author.trim()},
+                        At::Title => author.trim()
+                    },
                     first
                 ]
             })
@@ -232,10 +222,10 @@ fn view_search_results(
             ],
             td![
                 C!["subject"],
-                tags_chiclet(&tags, false),
-                " ",
                 a![
-                    C!["has-text-light", "text"],
+                    tags_chiclet(&tags, false),
+                    " ",
+                    C!["has-text-light", "text", "subject-link"],
                     attrs! {
                         At::Href => urls::thread(&tid)
                     },
@@ -303,23 +293,11 @@ fn search_toolbar(
     show_bulk_edit: bool,
     show_icon_text: bool,
 ) -> Node<Msg> {
-    let start = pager
-        .start_cursor
-        .as_ref()
-        .map(|i| i.parse().unwrap_or(0))
-        .unwrap_or(0)
-        + 1;
-    let end = pager
-        .end_cursor
-        .as_ref()
-        .map(|i| i.parse().unwrap_or(count))
-        .unwrap_or(count)
-        + 1;
     nav![
         C!["level", "is-mobile"],
-        IF!(show_bulk_edit =>
         div![
             C!["level-left"],
+            IF!(show_bulk_edit =>
             div![
                 C!["level-item"],
                 div![C!["buttons", "has-addons"],
@@ -338,7 +316,8 @@ fn search_toolbar(
                         ev(Ev::Click, |_| Msg::SelectionMarkAsUnread)
                     ]
                 ]
-            ],
+            ]),
+            IF!(show_bulk_edit =>
             div![
                 C!["level-item"],
                 div![C!["buttons", "has-addons"],
@@ -355,8 +334,8 @@ fn search_toolbar(
                         )
                     ],
                 ],
-            ]
-        ]),
+            ])
+        ],
         div![
             C!["level-right"],
             nav![
@@ -381,10 +360,7 @@ fn search_toolbar(
                     ">",
                     IF!(pager.has_next_page => ev(Ev::Click, |_| Msg::NextPage))
                 ],
-                ul![
-                    C!["pagination-list"],
-                    li![format!("{} - {} of {}", start, end, count)],
-                ],
+                ul![C!["pagination-list"], li![format!("{count} results")],],
             ]
         ]
     ]
@@ -442,8 +418,10 @@ fn has_unread(tags: &[String]) -> bool {
 fn render_avatar(avatar: Option<String>, from: &str) -> Node<Msg> {
     let initials: String = from
         .to_lowercase()
+        .trim()
         .split(" ")
         .map(|word| word.chars().next().unwrap())
+        .filter(|c| c.is_alphanumeric())
         // Limit to 2 characters because more characters don't fit in the box
         .take(2)
         .collect();
@@ -516,7 +494,17 @@ fn render_open_header(msg: &ShowThreadQueryThreadMessages) -> Node<Msg> {
                 p![
                     strong![from],
                     br![],
-                    small![from_detail],
+                    small![
+                        &from_detail,
+                        " ",
+                        from_detail.map(|detail| span![
+                            i![C!["far", "fa-clone"]],
+                            ev(Ev::Click, move |e| {
+                                e.stop_propagation();
+                                Msg::CopyToClipboard(detail.to_string())
+                            })
+                        ])
+                    ],
                     table![
                         IF!(!msg.to.is_empty() =>
                         tr![
@@ -526,19 +514,31 @@ fn render_open_header(msg: &ShowThreadQueryThreadMessages) -> Node<Msg> {
                                 msg.to.iter().enumerate().map(|(i, to)|
                                     small![
                                         if i>0 { ", " }else { "" },
-                                        match to {
-                                            ShowThreadQueryThreadMessagesTo {
-                                                name: Some(name),
-                                                addr:Some(addr),
-                                            } => format!("{name} <{addr}>"),
-                                            ShowThreadQueryThreadMessagesTo {
-                                                name: Some(name),
-                                                addr:None
-                                            } => format!("{name}"),
-                                            ShowThreadQueryThreadMessagesTo {
-                                                addr: Some(addr), ..
-                                            } => format!("{addr}"),
-                                            _ => String::from("UNKNOWN"),
+                                        {
+                                            let to = match to {
+                                                ShowThreadQueryThreadMessagesTo {
+                                                    name: Some(name),
+                                                    addr:Some(addr),
+                                                } => format!("{name} <{addr}>"),
+                                                ShowThreadQueryThreadMessagesTo {
+                                                    name: Some(name),
+                                                    addr:None
+                                                } => format!("{name}"),
+                                                ShowThreadQueryThreadMessagesTo {
+                                                    addr: Some(addr), ..
+                                                } => format!("{addr}"),
+                                                _ => String::from("UNKNOWN"),
+                                            };
+                                            span![
+                                                &to, " ",
+                                                span![
+                                                    i![C!["far", "fa-clone"]],
+                                                    ev(Ev::Click, move |e| {
+                                                        e.stop_propagation();
+                                                        Msg::CopyToClipboard(to)
+                                                    })
+                                                ]
+                                            ]
                                         }
 
                                     ])
@@ -551,21 +551,32 @@ fn render_open_header(msg: &ShowThreadQueryThreadMessages) -> Node<Msg> {
                                 msg.cc.iter().enumerate().map(|(i, cc)|
                                     small![
                                         if i>0 { ", " }else { "" },
-                                        match cc {
-                                            ShowThreadQueryThreadMessagesCc {
-                                                name: Some(name),
-                                                addr:Some(addr),
-                                            } => format!("{name} <{addr}>"),
-                                            ShowThreadQueryThreadMessagesCc {
-                                                name: Some(name),
-                                                addr:None
-                                            } => format!("{name}"),
-                                            ShowThreadQueryThreadMessagesCc {
-                                                addr: Some(addr), ..
-                                            } => format!("<{addr}>"),
-                                            _ => String::from("UNKNOWN"),
+                                        {
+                                            let cc = match cc {
+                                                ShowThreadQueryThreadMessagesCc {
+                                                    name: Some(name),
+                                                    addr:Some(addr),
+                                                } => format!("{name} <{addr}>"),
+                                                ShowThreadQueryThreadMessagesCc {
+                                                    name: Some(name),
+                                                    addr:None
+                                                } => format!("{name}"),
+                                                ShowThreadQueryThreadMessagesCc {
+                                                    addr: Some(addr), ..
+                                                } => format!("<{addr}>"),
+                                                _ => String::from("UNKNOWN"),
+                                            };
+                                            span![
+                                                &cc, " ",
+                                                span![
+                                                    i![C!["far", "fa-clone"]],
+                                                    ev(Ev::Click, move |e| {
+                                                        e.stop_propagation();
+                                                        Msg::CopyToClipboard(cc)
+                                                    })
+                                                ]
+                                            ]
                                         }
-
                                     ])
                             ]
                         ]),
@@ -592,7 +603,7 @@ fn render_open_header(msg: &ShowThreadQueryThreadMessages) -> Node<Msg> {
             ],
             ev(Ev::Click, move |e| {
                 e.stop_propagation();
-                Msg::SetUnread(format!("id:{id}"), !is_unread)
+                Msg::SetUnread(id, !is_unread)
             })
         ]
     ]
@@ -664,7 +675,7 @@ fn render_closed_header(msg: &ShowThreadQueryThreadMessages) -> Node<Msg> {
                     ],
                     ev(Ev::Click, move |e| {
                         e.stop_propagation();
-                        Msg::SetUnread(format!("id:{id}"), !is_unread)
+                        Msg::SetUnread(id, !is_unread)
                     })
                 ]
             ]
@@ -808,7 +819,8 @@ fn thread(
     });
     let read_thread_id = thread.thread_id.clone();
     let unread_thread_id = thread.thread_id.clone();
-    let spam_thread_id = thread.thread_id.clone();
+    let spam_add_thread_id = thread.thread_id.clone();
+    let spam_unread_thread_id = thread.thread_id.clone();
     div![
         C!["thread"],
         h3![C!["is-size-5"], subject],
@@ -827,20 +839,14 @@ fn thread(
                         attrs! {At::Title => "Mark as read"},
                         span![C!["icon", "is-small"], i![C!["far", "fa-envelope-open"]]],
                         IF!(show_icon_text=>span!["Read"]),
-                        ev(Ev::Click, move |_| Msg::SetUnread(
-                            format!("thread:{read_thread_id}"),
-                            false
-                        )),
+                        ev(Ev::Click, move |_| Msg::SetUnread(read_thread_id, false)),
                     ],
                     button![
                         C!["button", "mark-unread"],
                         attrs! {At::Title => "Mark as unread"},
                         span![C!["icon", "is-small"], i![C!["far", "fa-envelope"]]],
                         IF!(show_icon_text=>span!["Unread"]),
-                        ev(Ev::Click, move |_| Msg::SetUnread(
-                            format!("thread:{unread_thread_id}"),
-                            true
-                        )),
+                        ev(Ev::Click, move |_| Msg::SetUnread(unread_thread_id, true)),
                     ],
                 ],
             ],
@@ -854,8 +860,8 @@ fn thread(
                         span![C!["icon", "is-small"], i![C!["far", "fa-hand"]]],
                         IF!(show_icon_text=>span!["Spam"]),
                         ev(Ev::Click, move |_| Msg::MultiMsg(vec![
-                            Msg::AddTag(format!("thread:{spam_thread_id}"), "Spam".to_string()),
-                            Msg::SetUnread(format!("thread:{spam_thread_id}"), false)
+                            Msg::AddTag(spam_add_thread_id, "Spam".to_string()),
+                            Msg::SetUnread(spam_unread_thread_id, false)
                         ])),
                     ],
                 ],
@@ -970,3 +976,102 @@ pub fn view(model: &Model) -> Node<Msg> {
         _ => div![C!["desktop"], desktop::view(model)],
     },]
 }
+pub fn view_tags(model: &Model) -> Node<Msg> {
+    fn view_tag_li(display_name: &str, indent: usize, t: &Tag, search_unread: bool) -> Node<Msg> {
+        let href = if search_unread {
+            urls::search(&format!("is:unread tag:{}", t.name), 0)
+        } else {
+            urls::search(&format!("tag:{}", t.name), 0)
+        };
+        li![a![
+            attrs! {
+                At::Href => href
+            },
+            (0..indent).map(|_| span![C!["tag-indent"], ""]),
+            i![
+                C!["tag-tag", "fa-solid", "fa-tag"],
+                style! {
+                    //"--fa-primary-color" => t.fg_color,
+                    St::Color => t.bg_color,
+                },
+            ],
+            display_name,
+            IF!(t.unread>0 => format!(" ({})", t.unread)),
+            ev(Ev::Click, |_| {
+                // Scroll window to the top when searching for a tag.
+                info!("scrolling to the top because you clicked a tag");
+                web_sys::window().unwrap().scroll_to_with_x_and_y(0., 0.);
+            })
+        ]]
+    }
+    fn matches(a: &[&str], b: &[&str]) -> usize {
+        std::iter::zip(a.iter(), b.iter())
+            .take_while(|(a, b)| a == b)
+            .count()
+    }
+    fn view_tag_list<'a>(
+        tags: impl Iterator<Item = &'a Tag>,
+        search_unread: bool,
+    ) -> Vec<Node<Msg>> {
+        let mut lis = Vec::new();
+        let mut last = Vec::new();
+        for t in tags {
+            let parts: Vec<_> = t.name.split('/').collect();
+            let mut n = matches(&last, &parts);
+            if n <= parts.len() - 2 && parts.len() > 1 {
+                // Synthesize fake tags for proper indenting.
+                for i in n..parts.len() - 1 {
+                    let display_name = parts[n];
+                    lis.push(view_tag_li(
+                        &display_name,
+                        n,
+                        &Tag {
+                            name: parts[..i + 1].join("/"),
+                            bg_color: "#fff".to_string(),
+                            fg_color: "#000".to_string(),
+                            unread: 0,
+                        },
+                        search_unread,
+                    ));
+                }
+                n = parts.len() - 1;
+            }
+            let display_name = parts[n];
+            lis.push(view_tag_li(&display_name, n, t, search_unread));
+            last = parts;
+        }
+        lis
+    }
+    let unread = model
+        .tags
+        .as_ref()
+        .map(|tags| tags.iter().filter(|t| t.unread > 0).collect())
+        .unwrap_or(Vec::new());
+    let tags_open = use_state(|| false);
+    let force_tags_open = unread.is_empty();
+    aside![
+        C!["tags-menu", "menu"],
+        IF!(!unread.is_empty() => p![C!["menu-label"], "Unread"]),
+        IF!(!unread.is_empty() => ul![C!["menu-list"], view_tag_list(unread.into_iter(),true)]),
+        p![
+            C!["menu-label"],
+            IF!(!force_tags_open =>
+            i![C![
+                "fa-solid",
+                if tags_open.get() {
+                    "fa-angle-up"
+                } else {
+                    "fa-angle-down"
+                }
+            ]]),
+            " Tags",
+            ev(Ev::Click, move |_| {
+                tags_open.set(!tags_open.get());
+            })
+        ],
+        ul![
+            C!["menu-list"],
+            IF!(force_tags_open||tags_open.get() => model.tags.as_ref().map(|tags| view_tag_list(tags.iter(),false))),
+        ]
+    ]
+}

web/src/view/tablet.rs

@@ -2,7 +2,7 @@ use seed::{prelude::*, *};
 
 use crate::{
     state::{Context, Model, Msg},
-    view::{self, view_header, view_search_results},
+    view::{self, view_header, view_search_results, view_tags},
 };
 
 pub(super) fn view(model: &Model) -> Node<Msg> {
@@ -36,6 +36,7 @@ pub(super) fn view(model: &Model) -> Node<Msg> {
             view_header(&model.query, &model.refreshing_state),
             content,
             view_header(&model.query, &model.refreshing_state),
+            view_tags(model),
         ]
     ]
 }

web/static/style.css

@@ -1,3 +1,44 @@
+:root {
+  --active-brightness: 0.85;
+  --border-radius: 5px;
+  --box-shadow: 2px 2px 10px;
+  --color-accent: #118bee15;
+  --color-bg: #fff;
+  --color-bg-secondary: #e9e9e9;
+  --color-link: #118bee;
+  --color-secondary: #920de9;
+  --color-secondary-accent: #920de90b;
+  --color-shadow: #f4f4f4;
+  --color-table: #118bee;
+  --color-text: #000;
+  --color-text-secondary: #999;
+  --color-scrollbar: #cacae8;
+  --font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
+  --hover-brightness: 1.2;
+  --justify-important: center;
+  --justify-normal: left;
+  --line-height: 1.5;
+  --width-card: 285px;
+  --width-card-medium: 460px;
+  --width-card-wide: 800px;
+  --width-content: 1080px;
+}
+
+@media (prefers-color-scheme: dark) {
+  :root[color-mode="user"] {
+    --color-accent: #0097fc4f;
+    --color-bg: #333;
+    --color-bg-secondary: #555;
+    --color-link: #0097fc;
+    --color-secondary: #e20de9;
+    --color-secondary-accent: #e20de94f;
+    --color-shadow: #bbbbbb20;
+    --color-table: #0097fc;
+    --color-text: #f7f7f7;
+    --color-text-secondary: #aaa;
+  }
+}
+
 .message {
   display: inline-block;
   padding: 0.5em;
@@ -65,8 +106,9 @@
 }
 
 .view-part-text-plain {
-  padding: 0.5em;
+  font-family: monospace;
   overflow-wrap: break-word;
+  padding: 0.5em;
   white-space: pre-wrap;
   word-break: break-word;
   word-wrap: break-word;
@@ -167,6 +209,10 @@ input::placeholder,
   padding: 1em;
 }
 
+.search-results>nav {
+  margin: 1.25rem;
+}
+
 .tablet .thread h3,
 .mobile .thread h3 {
   overflow-wrap: break-word;
@@ -189,8 +235,6 @@ input::placeholder,
   width: 100%;
 }
 
-.search-results .row .checkbox {}
-
 .search-results .row .summary {
   min-width: 0;
   width: 100%;
@@ -202,16 +246,13 @@ input::placeholder,
   white-space: nowrap;
 }
 
-.search-results td.subject {}
-
-.search-results .subject .tag {}
-
 .search-results .subject .text {
   padding-left: 0.5rem;
-  width: 100%;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
+  display: inline-block;
+  width: 100%;
 }
 
 .search-results .row .from {