zaaarf/upub
1
0
Fork 0
forked from alemi/upub
Code Pull requests Activity

feat(web): we're back to activity timelines babyyyy

Browse source
This commit is contained in:
əlemi 2024-06-28 04:11:25 +02:00
parent 37a812f3c6
commit 157c97694e
Signed by: alemi
GPG key ID: A4895B84D311642C
8 changed files with 38 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
web/src/actors/activity.rs
View file

@ -1,25 +0,0 @@
use leptos::*;
use leptos_router::*;
use crate::prelude::*;
#[component]
pub fn ActorActivity() -> impl IntoView {
let feeds = use_context::<Feeds>().expect("missing feeds context");
let params = use_params::<super::IdParam>();
let id = Signal::derive(move || {
let id = params.get_untracked().ok().and_then(|x| x.id).unwrap_or_default();
let tl_url = format!("{}/outbox/page", Uri::api(U::Actor, &id, false));
if !feeds.user.next.get_untracked().starts_with(&tl_url) {
feeds.user.reset(Some(tl_url));
}
id
});
view! {
<code class="cw color center mt-1 mb-1 ml-3 mr-3">
<a class="clean" href={format!("/web/actors/{}", id.get())}><span class="emoji">"🖂"</span>" posts"</a>
" | "
<b>activity</b>" "<span class="emoji">"@"</span>
</code>
<Feed tl=feeds.user />
}
}

1
web/src/actors/mod.rs
View file

@ -1,7 +1,6 @@
pub mod follow; pub mod follow;
pub mod posts; pub mod posts;
pub mod header; pub mod header;
pub mod activity;
use leptos_router::Params; // TODO can i remove this? use leptos_router::Params; // TODO can i remove this?
#[derive(Clone, leptos::Params, PartialEq)] #[derive(Clone, leptos::Params, PartialEq)]

8
web/src/actors/posts.rs
View file

@ -6,19 +6,17 @@ use crate::prelude::*;
pub fn ActorPosts() -> impl IntoView { pub fn ActorPosts() -> impl IntoView {
let feeds = use_context::<Feeds>().expect("missing feeds context"); let feeds = use_context::<Feeds>().expect("missing feeds context");
let params = use_params::<super::IdParam>(); let params = use_params::<super::IdParam>();
let id = Signal::derive(move || { Signal::derive(move || {
let id = params.get_untracked().ok().and_then(|x| x.id).unwrap_or_default(); let id = params.get_untracked().ok().and_then(|x| x.id).unwrap_or_default();
let tl_url = format!("{}/streams/page", Uri::api(U::Actor, &id, false)); let tl_url = format!("{}/outbox/page", Uri::api(U::Actor, &id, false));
if !feeds.user.next.get_untracked().starts_with(&tl_url) { if !feeds.user.next.get_untracked().starts_with(&tl_url) {
feeds.user.reset(Some(tl_url)); feeds.user.reset(Some(tl_url));
} }
id id
}); }).track();
view! { view! {
<code class="cw color center mt-1 mb-1 ml-3 mr-3"> <code class="cw color center mt-1 mb-1 ml-3 mr-3">
<span class="emoji">"🖂"</span>" "<b>posts</b> <span class="emoji">"🖂"</span>" "<b>posts</b>
" | "
<a class="clean" href={format!("/web/actors/{}/activity", id.get())}>"activity "<span class="emoji">"@"</span></a>
</code> </code>
<Feed tl=feeds.user /> <Feed tl=feeds.user />
} }

28
web/src/app.rs
View file

@ -7,12 +7,9 @@ use leptos_use::{signal_debounced, storage::use_local_storage, use_cookie, use_e
#[derive(Clone, Copy)] #[derive(Clone, Copy)]
pub struct Feeds { pub struct Feeds {
// object feeds
pub home: Timeline, pub home: Timeline,
pub global: Timeline, pub global: Timeline,
// notification feeds pub notifications: Timeline,
pub private: Timeline,
pub public: Timeline,
// exploration feeds // exploration feeds
pub user: Timeline, pub user: Timeline,
pub server: Timeline, pub server: Timeline,
@ -22,10 +19,9 @@ pub struct Feeds {
impl Feeds { impl Feeds {
pub fn new(username: &str) -> Self { pub fn new(username: &str) -> Self {
Feeds { Feeds {
home: Timeline::new(format!("{URL_BASE}/actors/{username}/feed/page")), home: Timeline::new(format!("{URL_BASE}/actors/{username}/inbox/page")),
global: Timeline::new(format!("{URL_BASE}/feed/page")), notifications: Timeline::new(format!("{URL_BASE}/actors/{username}/notifications/page")),
private: Timeline::new(format!("{URL_BASE}/actors/{username}/inbox/page")), global: Timeline::new(format!("{URL_BASE}/inbox/page")),
public: Timeline::new(format!("{URL_BASE}/inbox/page")),
user: Timeline::new(format!("{URL_BASE}/actors/{username}/outbox/page")), user: Timeline::new(format!("{URL_BASE}/actors/{username}/outbox/page")),
server: Timeline::new(format!("{URL_BASE}/outbox/page")), server: Timeline::new(format!("{URL_BASE}/outbox/page")),
context: Timeline::new(format!("{URL_BASE}/outbox/page")), // TODO ehhh context: Timeline::new(format!("{URL_BASE}/outbox/page")), // TODO ehhh
@ -34,9 +30,8 @@ impl Feeds {
pub fn reset(&self) { pub fn reset(&self) {
self.home.reset(None); self.home.reset(None);
self.notifications.reset(None);
self.global.reset(None); self.global.reset(None);
self.private.reset(None);
self.public.reset(None);
self.user.reset(None); self.user.reset(None);
self.server.reset(None); self.server.reset(None);
self.context.reset(None); self.context.reset(None);
@ -122,9 +117,9 @@ pub fn App() -> impl IntoView {
} }
/> />
<Route path="home" view=move || view! { <Feed tl=feeds.home /> } /> <Route path="home" view=move || view! { <Feed tl=feeds.home /> } />
<Route path="server" view=move || view! { <Feed tl=feeds.global /> } /> <Route path="global" view=move || view! { <Feed tl=feeds.global /> } />
<Route path="local" view=move || view! { <Feed tl=feeds.server /> } /> <Route path="local" view=move || view! { <Feed tl=feeds.server /> } />
<Route path="inbox" view=move || view! { <Feed tl=feeds.private /> } /> <Route path="notifications" view=move || view! { <Feed tl=feeds.notifications /> } />
<Route path="about" view=AboutPage /> <Route path="about" view=AboutPage />
<Route path="config" view=move || view! { <ConfigPage setter=set_config /> } /> <Route path="config" view=move || view! { <ConfigPage setter=set_config /> } />
@ -134,7 +129,6 @@ pub fn App() -> impl IntoView {
<Route path="" view=ActorPosts /> <Route path="" view=ActorPosts />
<Route path="following" view=move || view! { <FollowList outgoing=true /> } /> <Route path="following" view=move || view! { <FollowList outgoing=true /> } />
<Route path="followers" view=move || view! { <FollowList outgoing=false /> } /> <Route path="followers" view=move || view! { <FollowList outgoing=false /> } />
<Route path="activity" view=ActorActivity />
</Route> </Route>
<Route path="objects/:id" view=ObjectView /> <Route path="objects/:id" view=ObjectView />
@ -165,12 +159,12 @@ fn Scrollable() -> impl IntoView {
let path = location.pathname.get(); let path = location.pathname.get();
if path.contains("/web/home") { if path.contains("/web/home") {
Some(feeds.home) Some(feeds.home)
} else if path.contains("/web/server") { } else if path.contains("/web/global") {
Some(feeds.global) Some(feeds.global)
} else if path.starts_with("/web/local") { } else if path.contains("/web/local") {
Some(feeds.server) Some(feeds.server)
} else if path.starts_with("/web/inbox") { } else if path.starts_with("/web/notifications") {
Some(feeds.private) Some(feeds.notifications)
} else if path.starts_with("/web/actors") { } else if path.starts_with("/web/actors") {
Some(feeds.user) Some(feeds.user)
} else if path.starts_with("/web/objects") { } else if path.starts_with("/web/objects") {

14
web/src/components/activity.rs
View file

@ -19,11 +19,12 @@ pub fn ActivityLine(activity: crate::Object) -> impl IntoView {
_ => Uri::web(U::Object, &object_id), _ => Uri::web(U::Object, &object_id),
}; };
view! { view! {
<div> <table class="align w-100">
<span class="ml-1-l"> <tr>
<td class="ml-1-r">
<ActorStrip object=actor /> <ActorStrip object=actor />
</span> </td>
<span style="float:right"> <td class="rev">
<code class="color moreinfo" title={activity.published().ok().map(|x| x.to_rfc2822())} > <code class="color moreinfo" title={activity.published().ok().map(|x| x.to_rfc2822())} >
<a class="upub-title clean" title={object_id} href={href} > <a class="upub-title clean" title={object_id} href={href} >
{kind.as_ref().to_string()} {kind.as_ref().to_string()}
@ -31,8 +32,9 @@ pub fn ActivityLine(activity: crate::Object) -> impl IntoView {
{activity_url} {activity_url}
<PrivacyMarker addressed=activity.addressed() /> <PrivacyMarker addressed=activity.addressed() />
</code> </code>
</span> </td>
</div> </tr>
</table>
} }
} }

12
web/src/components/login.rs
View file

@ -18,7 +18,7 @@ pub fn LoginBox(
token_tx.set(None); token_tx.set(None);
feeds.reset(); feeds.reset();
feeds.global.spawn_more(auth); feeds.global.spawn_more(auth);
feeds.public.spawn_more(auth); feeds.server.spawn_more(auth);
} /> } />
</div> </div>
<div class:hidden=move || auth.present() > <div class:hidden=move || auth.present() >
@ -44,14 +44,14 @@ pub fn LoginBox(
userid_tx.set(Some(auth_response.user)); userid_tx.set(Some(auth_response.user));
token_tx.set(Some(auth_response.token)); token_tx.set(Some(auth_response.token));
// reset home feed and point it to our user's inbox // reset home feed and point it to our user's inbox
feeds.home.reset(Some(format!("{URL_BASE}/actors/{username}/feed/page"))); feeds.home.reset(Some(format!("{URL_BASE}/actors/{username}/inbox/page")));
feeds.home.spawn_more(auth); feeds.home.spawn_more(auth);
feeds.private.reset(Some(format!("{URL_BASE}/actors/{username}/inbox/page"))); feeds.notifications.reset(Some(format!("{URL_BASE}/actors/{username}/notifications/page")));
feeds.private.spawn_more(auth); feeds.notifications.spawn_more(auth);
// reset server feed: there may be more content now that we're authed // reset server feed: there may be more content now that we're authed
feeds.global.reset(Some(format!("{URL_BASE}/feed/page"))); feeds.global.reset(Some(format!("{URL_BASE}/inbox/page")));
feeds.global.spawn_more(auth); feeds.global.spawn_more(auth);
feeds.server.reset(Some(format!("{URL_BASE}/inbox/page"))); feeds.server.reset(Some(format!("{URL_BASE}/outbox/page")));
feeds.server.spawn_more(auth); feeds.server.spawn_more(auth);
}); });
} > } >

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

@ -38,9 +38,9 @@ pub fn Navigator() -> impl IntoView {
</form> </form>
<table class="align w-100"> <table class="align w-100">
<tr><td colspan="2"><a href="/web/home"><input class="w-100" type="submit" class:hidden=move || !auth.present() value="home timeline" /></a></td></tr> <tr><td colspan="2"><a href="/web/home"><input class="w-100" type="submit" class:hidden=move || !auth.present() value="home timeline" /></a></td></tr>
<tr><td colspan="2"><a href="/web/server"><input class="w-100" type="submit" value="server timeline" /></a></td></tr> <tr><td colspan="2"><a href="/web/global"><input class="w-100" type="submit" value="global timeline" /></a></td></tr>
<tr><td colspan="2"><a href="/web/local"><input class="w-100" type="submit" value="local timeline" /></a></td></tr> <tr><td colspan="2"><a href="/web/local"><input class="w-100" type="submit" value="local timeline" /></a></td></tr>
<tr><td colspan="2"><a href="/web/inbox"><input class="w-100" type="submit" class:hidden=move || !auth.present() value="notifications" /></a></td></tr> <tr><td colspan="2"><a href="/web/notifications"><input class="w-100" type="submit" class:hidden=move || !auth.present() value="notifications" /></a></td></tr>
<tr> <tr>
<td class="w-50"><a href="/web/about"><input class="w-100" type="submit" value="about" /></a></td> <td class="w-50"><a href="/web/about"><input class="w-100" type="submit" value="about" /></a></td>
<td class="w-50"><a href="/web/config"><input class="w-100" type="submit" value="config" /></a></td> <td class="w-50"><a href="/web/config"><input class="w-100" type="submit" value="config" /></a></td>

1
web/src/prelude.rs
View file

@ -9,7 +9,6 @@ pub use crate::{
header::ActorHeader, header::ActorHeader,
follow::FollowList, follow::FollowList,
posts::ActorPosts, posts::ActorPosts,
activity::ActorActivity,
}, },
timeline::{ timeline::{
Timeline, Timeline,