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

fix(web): more consistent object rendering

Browse source
This commit is contained in:
əlemi 2024-05-11 21:49:55 +02:00
parent a60b5774a1
commit 99d613a1e8
Signed by: alemi
GPG key ID: A4895B84D311642C
2 changed files with 50 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,7 @@
use leptos::*;
use crate::prelude::*;
use apb::{target::Addressed, Activity, Object};
use apb::{target::Addressed, Base, Activity, Object};
#[component]
@ -31,3 +31,39 @@ pub fn ActivityLine(activity: crate::Object) -> impl IntoView {
</div>
}
}
#[component]
pub fn Item(item: crate::Object) -> impl IntoView {
let id = item.id().unwrap_or_default().to_string();
match item.object_type() {
// special case for placeholder activities
Some(apb::ObjectType::Note) | Some(apb::ObjectType::Document(_)) =>
view! { <Object object=item /> }.into_view(),
// everything else
Some(apb::ObjectType::Activity(t)) => {
let object_id = item.object().id().unwrap_or_default();
let object = match t {
apb::ActivityType::Create | apb::ActivityType::Announce =>
CACHE.get(&object_id).map(|obj| {
view! { <Object object=obj /> }
}.into_view()),
apb::ActivityType::Follow =>
CACHE.get(&object_id).map(|obj| {
view! {
<div class="ml-1">
<ActorBanner object=obj />
<FollowRequestButtons activity_id=id actor_id=object_id />
</div>
}
}.into_view()),
_ => None,
};
view! {
<ActivityLine activity=item />
{object}
}.into_view()
},
// should never happen
_ => view! { <p><code>type not implemented</code></p> }.into_view(),
}
}

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

@ -92,45 +92,16 @@ pub fn TimelineRepliesRecursive(tl: Timeline, root: String) -> impl IntoView {
<For
each=root_values
key=|k| k.id().unwrap_or_default().to_string()
children=move |object: crate::Object| {
match object.object_type() {
Some(apb::ObjectType::Activity(apb::ActivityType::Create)) => {
let oid = object.object().id().unwrap_or_default().to_string();
if let Some(note) = CACHE.get(&oid) {
children=move |obj: crate::Object| {
let oid = obj.id().unwrap_or_default().to_string();
view! {
<div class="context depth-r">
<ActivityLine activity=object />
<Object object=note />
<Item item=obj />
<div class="depth-r">
<TimelineRepliesRecursive tl=tl root=oid />
</div>
</div>
}
} else {
view! {
<div class="context depth-r">
<ActivityLine activity=object />
</div>
}
}
},
Some(apb::ObjectType::Activity(_)) => view! {
<div class="context depth-r">
<ActivityLine activity=object />
</div>
},
_ => {
let oid = object.id().unwrap_or_default().to_string();
view! {
<div class="context depth-r">
<Object object=object />
<div class="depth-r">
<TimelineRepliesRecursive tl=tl root=oid />
</div>
</div>
}
},
}
}
/ >
}
@ -168,42 +139,13 @@ pub fn TimelineFeed(tl: Timeline) -> impl IntoView {
key=|k| k.to_string()
children=move |id: String| {
match CACHE.get(&id) {
Some(item) => match item.object_type() {
// special case for placeholder activities
Some(apb::ObjectType::Note) => view! {
<Object object=item.clone() />
<hr/ >
Some(i) => view! {
<Item item=i />
<hr />
}.into_view(),
// everything else
Some(apb::ObjectType::Activity(t)) => {
let object_id = item.object().id().unwrap_or_default();
let object = match t {
apb::ActivityType::Create | apb::ActivityType::Announce =>
CACHE.get(&object_id).map(|obj| {
view! { <Object object=obj /> }
}.into_view()),
apb::ActivityType::Follow =>
CACHE.get(&object_id).map(|obj| {
view! {
<div class="ml-1">
<ActorBanner object=obj />
<FollowRequestButtons activity_id=id actor_id=object_id />
</div>
}
}.into_view()),
_ => None,
};
view! {
<ActivityLine activity=item />
{object}
<hr/ >
}.into_view()
},
// should never happen
_ => view! { <p><code>type not implemented</code></p><hr /> }.into_view(),
},
None => view! {
<p><code>{id}</code>" "[<a href={uri}>go</a>]</p>
<hr />
}.into_view(),
}
}