From a16b20f6faf988374b38ba2cef5ef4ffe10b917a Mon Sep 17 00:00:00 2001
From: alemi <me@alemi.dev>
Date: Fri, 3 May 2024 03:55:26 +0200
Subject: [PATCH] chore(web): get_untracked when needed

---
 web/src/app.rs                 | 12 ++++++++----
 web/src/components/timeline.rs |  4 ++--
 web/src/lib.rs                 |  4 ++--
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/web/src/app.rs b/web/src/app.rs
index d09bbfa..9e7845e 100644
--- a/web/src/app.rs
+++ b/web/src/app.rs
@@ -17,9 +17,12 @@ pub fn App() -> impl IntoView {
 	let auth = Auth { token, userid };
 	provide_context(auth);
 
-	let home_tl = Timeline::new(format!("{URL_BASE}/users/{}/inbox/page", auth.username()));
+	let username = auth.userid.get_untracked()
+		.map(|x| x.split('/').last().unwrap_or_default().to_string())
+		.unwrap_or_default();
+	let home_tl = Timeline::new(format!("{URL_BASE}/users/{username}/inbox/page"));
 	let server_tl = Timeline::new(format!("{URL_BASE}/inbox/page"));
-	let user_tl = Timeline::new(format!("{URL_BASE}/users/{}/outbox/page", auth.username()));
+	let user_tl = Timeline::new(format!("{URL_BASE}/users/{username}/outbox/page"));
 	let context_tl = Timeline::new(format!("{URL_BASE}/outbox/page"));
 
 	let reply_controls = ReplyControls::default();
@@ -36,7 +39,8 @@ pub fn App() -> impl IntoView {
 		}
 	});
 
-	if auth.present() {
+	let auth_present = auth.token.get_untracked().is_some(); // skip helper to use get_untracked
+	if auth_present { 
 		spawn_local(async move {
 			if let Err(e) = home_tl.more(auth).await {
 				tracing::error!("error populating timeline: {e}");
@@ -44,7 +48,7 @@ pub fn App() -> impl IntoView {
 		});
 	}
 
-	let title_target = if auth.present() { "/web/home" } else { "/web/server" };
+	let title_target = if auth_present { "/web/home" } else { "/web/server" };
 
 	view! {
 		<nav class="w-100 mt-1 mb-1 pb-s">
diff --git a/web/src/components/timeline.rs b/web/src/components/timeline.rs
index 0691265..9749ac5 100644
--- a/web/src/components/timeline.rs
+++ b/web/src/components/timeline.rs
@@ -37,13 +37,13 @@ impl Timeline {
 	async fn more_inner(&self, auth: Auth) -> reqwest::Result<()> {
 		use apb::{Collection, CollectionPage};
 
-		let feed_url = self.next.get();
+		let feed_url = self.next.get_untracked();
 		let collection : serde_json::Value = Http::fetch(&feed_url, auth).await?;
 		let activities : Vec<serde_json::Value> = collection
 			.ordered_items()
 			.collect();
 	
-		let mut feed = self.feed.get();
+		let mut feed = self.feed.get_untracked();
 		let mut older = process_activities(activities, auth)
 			.await
 			.into_iter()
diff --git a/web/src/lib.rs b/web/src/lib.rs
index afca220..5d49657 100644
--- a/web/src/lib.rs
+++ b/web/src/lib.rs
@@ -85,12 +85,12 @@ impl Http {
 		data: Option<&T>,
 		auth: Auth,
 	) -> reqwest::Result<reqwest::Response> {
-		use leptos::SignalGet;
+		use leptos::SignalGetUntracked;
 
 		let mut req = reqwest::Client::new()
 			.request(method, url);
 
-		if let Some(auth) = auth.token.get().filter(|x| !x.is_empty()) {
+		if let Some(auth) = auth.token.get_untracked().filter(|x| !x.is_empty()) {
 			req = req.header("Authorization", format!("Bearer {}", auth));
 		}