From 01de917bdb73b503abdabcdbec09be4a7c371250 Mon Sep 17 00:00:00 2001
From: alemi <me@alemi.dev>
Date: Sun, 11 Aug 2024 15:21:25 +0200
Subject: [PATCH] fix(web): properly process and display search results

---
 web/src/page/search.rs  | 22 +++++++++++++---------
 web/src/timeline/mod.rs |  3 ++-
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/web/src/page/search.rs b/web/src/page/search.rs
index b81708b..30e9179 100644
--- a/web/src/page/search.rs
+++ b/web/src/page/search.rs
@@ -31,7 +31,10 @@ pub fn SearchPage() -> impl IntoView {
 		move || use_query_map().get().get("q").cloned().unwrap_or_default(),
 		move |q| {
 			let search = format!("{URL_BASE}/search?q={q}");
-			async move { Http::fetch::<serde_json::Value>(&search, auth).await.ok() }
+			async move {
+				let items = Http::fetch::<serde_json::Value>(&search, auth).await.ok()?;
+				Some(crate::timeline::process_activities(items.ordered_items().collect(), auth).await)
+			}
 		}
 	);
 
@@ -73,16 +76,17 @@ pub fn SearchPage() -> impl IntoView {
 			None => Some(view! { <p class="center"><small>searching...</small></p> }.into_view()),
 			Some(None) => None,
 			Some(Some(items)) => Some(view! {
-				// TODO this is jank af! i should do the same thing i do for timelines, aka first process
-				//      all items and store in cache and then pass a vec of strings here!!!
+				// TODO ughhh too many clones
 				<For
-					each=move || items.ordered_items()
-					key=|item| item.id().unwrap_or_default().to_string()
+					each=move || items.clone()
+					key=|id| id.clone()
 					children=move |item| {
-						view! {
-							<Item item=item.into() />
-							<hr />
-						}.into_view()
+						cache::OBJECTS.get(&item)
+							.map(|x| view! {
+									<Item item=x />
+									<hr />
+								}.into_view()
+							)
 					}
 				/ >
 			}.into_view())
diff --git a/web/src/timeline/mod.rs b/web/src/timeline/mod.rs
index 7172510..6991f3c 100644
--- a/web/src/timeline/mod.rs
+++ b/web/src/timeline/mod.rs
@@ -100,7 +100,8 @@ impl Timeline {
 	}
 }
 
-async fn process_activities(activities: Vec<serde_json::Value>, auth: Auth) -> Vec<String> {
+// TODO ughhh this shouldn't be here if its pub!!!
+pub async fn process_activities(activities: Vec<serde_json::Value>, auth: Auth) -> Vec<String> {
 	let mut sub_tasks : Vec<Pin<Box<dyn futures::Future<Output = ()>>>> = Vec::new();
 	let mut gonna_fetch = BTreeSet::new();
 	let mut actors_seen = BTreeSet::new();