From bd00542c2897451b1989383aa7a79f53043f25cc Mon Sep 17 00:00:00 2001 From: Bill Thiede Date: Mon, 27 Jan 2025 15:47:55 -0800 Subject: [PATCH] server: use clean_summary field instead of summary --- server/sql/thread.sql | 5 +++-- server/src/newsreader.rs | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/server/sql/thread.sql b/server/sql/thread.sql index ee76a1b..55017b3 100644 --- a/server/sql/thread.sql +++ b/server/sql/thread.sql @@ -4,11 +4,12 @@ SELECT link, site, summary, + clean_summary, title, name, homepage FROM - post p - JOIN feed f ON p.site = f.slug + post AS p +INNER JOIN feed AS f ON p.site = f.slug WHERE uid = $1 diff --git a/server/src/newsreader.rs b/server/src/newsreader.rs index 5d34cf4..2ca7ac0 100644 --- a/server/src/newsreader.rs +++ b/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.summary.unwrap_or("NO SUMMARY".to_string()); + let mut body = r.clean_summary.unwrap_or("NO SUMMARY".to_string()); let cacher = Arc::new(Mutex::new(FilesystemCacher::new(&config.slurp_cache_path)?)); let body_tranformers: Vec> = vec![ Box::new(SlurpContents {