alemi/upub
alemi/upub
1
0
Fork 1
Code Issues 4 Pull requests Projects Releases Packages 1 Wiki Activity Actions

chore(web): get_untracked when needed

Browse source
This commit is contained in:
əlemi 2024-05-03 03:55:26 +02:00
parent 11557f5616
commit a16b20f6fa
Signed by: alemi
GPG key ID: A4895B84D311642C
3 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
web/src/app.rs
View file

@ -17,9 +17,12 @@ pub fn App() -> impl IntoView {
let auth = Auth { token, userid }; let auth = Auth { token, userid };
provide_context(auth); 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 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 context_tl = Timeline::new(format!("{URL_BASE}/outbox/page"));
let reply_controls = ReplyControls::default(); 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 { spawn_local(async move {
if let Err(e) = home_tl.more(auth).await { if let Err(e) = home_tl.more(auth).await {
tracing::error!("error populating timeline: {e}"); 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! { view! {
<nav class="w-100 mt-1 mb-1 pb-s"> <nav class="w-100 mt-1 mb-1 pb-s">

4
web/src/components/timeline.rs
View file

@ -37,13 +37,13 @@ impl Timeline {
async fn more_inner(&self, auth: Auth) -> reqwest::Result<()> { async fn more_inner(&self, auth: Auth) -> reqwest::Result<()> {
use apb::{Collection, CollectionPage}; 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 collection : serde_json::Value = Http::fetch(&feed_url, auth).await?;
let activities : Vec<serde_json::Value> = collection let activities : Vec<serde_json::Value> = collection
.ordered_items() .ordered_items()
.collect(); .collect();
let mut feed = self.feed.get(); let mut feed = self.feed.get_untracked();
let mut older = process_activities(activities, auth) let mut older = process_activities(activities, auth)
.await .await
.into_iter() .into_iter()

4
web/src/lib.rs
View file

@ -85,12 +85,12 @@ impl Http {
data: Option<&T>, data: Option<&T>,
auth: Auth, auth: Auth,
) -> reqwest::Result<reqwest::Response> { ) -> reqwest::Result<reqwest::Response> {
use leptos::SignalGet; use leptos::SignalGetUntracked;
let mut req = reqwest::Client::new() let mut req = reqwest::Client::new()
.request(method, url); .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)); req = req.header("Authorization", format!("Bearer {}", auth));
} }