Cargo.lock

@@ -2910,7 +2910,7 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "letterbox"
-version = "0.0.118"
+version = "0.0.117"
 dependencies = [
  "build-info",
  "build-info-build",
@@ -2936,7 +2936,7 @@ dependencies = [
 
 [[package]]
 name = "letterbox-server"
-version = "0.0.118"
+version = "0.0.117"
 dependencies = [
  "ammonia",
  "anyhow",
@@ -3455,7 +3455,7 @@ dependencies = [
 
 [[package]]
 name = "notmuch"
-version = "0.0.118"
+version = "0.0.117"
 dependencies = [
  "itertools 0.10.5",
  "log",
@@ -4250,7 +4250,7 @@ dependencies = [
 
 [[package]]
 name = "procmail2notmuch"
-version = "0.0.118"
+version = "0.0.117"
 dependencies = [
  "anyhow",
 ]
@@ -5329,7 +5329,7 @@ dependencies = [
 
 [[package]]
 name = "shared"
-version = "0.0.118"
+version = "0.0.117"
 dependencies = [
  "build-info",
  "notmuch",

notmuch/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "notmuch"
-version = "0.0.118"
+version = "0.0.117"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

procmail2notmuch/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "procmail2notmuch"
-version = "0.0.118"
+version = "0.0.117"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

server/.sqlx/query-113694cd5bf0d2582ff3a635776daa608fe88abe1185958c4215646c92335afb.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "SELECT\n    date,\n    is_read,\n    link,\n    site,\n    summary,\n    clean_summary,\n    title,\n    name,\n    homepage\nFROM\n    post AS p\nINNER JOIN feed AS f ON p.site = f.slug\nWHERE\n    uid = $1\n",
+  "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": [
       {
@@ -30,21 +30,16 @@
       },
       {
         "ordinal": 5,
-        "name": "clean_summary",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 6,
         "name": "title",
         "type_info": "Text"
       },
       {
-        "ordinal": 7,
+        "ordinal": 6,
         "name": "name",
         "type_info": "Text"
       },
       {
-        "ordinal": 8,
+        "ordinal": 7,
         "name": "homepage",
         "type_info": "Text"
       }
@@ -62,9 +57,8 @@
       true,
       true,
       true,
-      true,
       true
     ]
   },
-  "hash": "383221a94bc3746322ba78e41cde37994440ee67dc32e88d2394c51211bde6cd"
+  "hash": "113694cd5bf0d2582ff3a635776daa608fe88abe1185958c4215646c92335afb"
 }

server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "letterbox-server"
-version = "0.0.118"
+version = "0.0.117"
 edition = "2021"
 default-run = "letterbox-server"
 

server/sql/thread.sql

@@ -4,12 +4,11 @@ SELECT
     link,
     site,
     summary,
-    clean_summary,
     title,
     name,
     homepage
 FROM
-    post AS p
+    post p
-INNER JOIN feed AS f ON p.site = f.slug
+    JOIN feed f ON p.site = f.slug
 WHERE
     uid = $1

server/src/newsreader.rs

@@ -190,7 +190,7 @@ pub async fn thread(
     let site = r.name.unwrap_or("NO SITE".to_string());
     // TODO: remove the various places that have this as an Option
     let link = Some(Url::parse(&r.link)?);
-    let mut body = r.clean_summary.unwrap_or("NO SUMMARY".to_string());
+    let mut body = r.summary.unwrap_or("NO SUMMARY".to_string());
     let cacher = Arc::new(Mutex::new(FilesystemCacher::new(&config.slurp_cache_path)?));
     let body_tranformers: Vec<Box<dyn Transformer>> = vec![
         Box::new(SlurpContents {

shared/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "shared"
-version = "0.0.118"
+version = "0.0.117"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

web/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-version = "0.0.118"
+version = "0.0.117"
 name = "letterbox"
 repository = "https://github.com/seed-rs/seed-quickstart"
 authors = ["Bill Thiede <git@xinu.tv>"]