schaefera/feedsignal
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Add feed sidebar navigation #8

Merged
schaefera merged 14 commits from worktree-feed-sidebar-nav into main 2026-09-15 07:20:41 +00:00
Conversation 0 Commits 14 Files changed 42 +19 -15
1 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit cc79f59a7d - Show all commits

34
crates/db/src/articles.rs
View file

@ -108,7 +108,6 @@ impl Db {
if let Some(feed_id) = feed_id { if let Some(feed_id) = feed_id {
query = query.filter(dsl::feed_id.eq(feed_id.to_string())); query = query.filter(dsl::feed_id.eq(feed_id.to_string()));
} }
type Row = (String, String, String, String, String, String, Option<f32>);
let rows: Vec<Row> = query let rows: Vec<Row> = query
.order(dsl::final_score.desc()) .order(dsl::final_score.desc())
.limit(limit) .limit(limit)
@ -123,20 +122,25 @@ impl Db {
)) ))
.load(&mut conn) .load(&mut conn)
.await?; .await?;
Ok(rows Ok(rows.into_iter().map(RankedArticleRow::from).collect())
.into_iter() }
.map( }
|(id, feed_id, title, url, summary, topics_json, final_score)| RankedArticleRow {
id, /// Raw shape of one `list_ranked_articles` row as loaded from SQLite —
feed_id, /// `topics` is still the JSON string column, not yet decoded.
title, type Row = (String, String, String, String, String, String, Option<f32>);
url,
summary, impl From<Row> for RankedArticleRow {
topics: serde_json::from_str(&topics_json).unwrap_or_default(), fn from((id, feed_id, title, url, summary, topics_json, final_score): Row) -> Self {
final_score, Self {
}, id,
) feed_id,
.collect()) title,
url,
summary,
topics: serde_json::from_str(&topics_json).unwrap_or_default(),
final_score,
}
} }
} }