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

fix(web): updated apb fields

Browse source
This commit is contained in:
əlemi 2024-05-02 00:59:47 +02:00
parent bcd8f27933
commit 0435c779c5
Signed by: alemi
GPG key ID: A4895B84D311642C
3 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
web/Cargo.toml
View file

@ -24,7 +24,7 @@ leptos = { version = "0.6", features = ["csr", "tracing"] }
leptos_router = { version = "0.6", features = ["csr"] }
leptos-use = { version = "0.10", features = ["serde"] }
reqwest = { version = "0.12", features = ["json"] }
apb = { path = "../apb", features = ["unstructured"] }
apb = { path = "../apb", features = ["unstructured", "activitypub-fe", "activitypub-counters"] }
futures = "0.3.30"
dissolve = "0.2" # TODO strip html without this crate
lazy_static = "1.4"

7
web/src/components/object.rs
View file

@ -90,12 +90,11 @@ pub fn Object(object: crate::Object) -> impl IntoView {
.collect_view();
let comments = object.replies().get()
.map_or(0, |x| x.total_items().unwrap_or(0));
let shares = object.generator().get()
let shares = object.shares().get()
.map_or(0, |x| x.total_items().unwrap_or(0));
let likes = object.audience().get()
let likes = object.likes().get()
.map_or(0, |x| x.total_items().unwrap_or(0));
let already_liked = object.audience().get()
.map_or(false, |x| !x.ordered_items().is_empty()); // TODO check if contains my uid
let already_liked = object.liked_by_me().unwrap_or(false);
let attachments_padding = if object.attachment().is_empty() {
None
} else {

32
web/src/page.rs
View file

@ -97,24 +97,16 @@ pub fn UserPage(tl: Timeline) -> impl IntoView {
Some(view! { <sup class="ml-s"><small>"["{actor_type.as_ref().to_lowercase()}"]"</small></sup> } )
};
let created = object.published();
let following = object.generator().get().map(|x| x.total_items().unwrap_or(0)).unwrap_or(0);
let followers = object.audience().get().map(|x| x.total_items().unwrap_or(0)).unwrap_or(0);
let statuses = object.replies().get().map(|x| x.total_items().unwrap_or(0)).unwrap_or(0);
let following = object.following_count().unwrap_or(0);
let followers = object.followers_count().unwrap_or(0);
let statuses = object.statuses_count().unwrap_or(0);
let tl_url = format!("{}/outbox/page", Uri::api(FetchKind::User, &id.clone(), false));
if !tl.next.get().starts_with(&tl_url) {
tl.reset(tl_url);
}
let _uid = uid.clone(); // TODO ughhhh
let followed_by_me = object.audience()
.get()
.filter(|x| x.ordered_items().is_empty()) // TODO check if contains my uid
.map(|_| view! { <input type="submit" value="follow" on:click=move |_| send_follow_request(_uid.clone()) /> }.into_view())
.unwrap_or(view! { <code class="color">following</code> }.into_view());
// let following_me = object.generator()
// .get()
// .filter(|x| !x.ordered_items().is_empty()) // TODO check if contains my uid
// .map(|_| view! { <input type="submit" value="remove" /> });
let following_me = object.following_me().unwrap_or(false);
let followed_by_me = object.followed_by_me().unwrap_or(false);
let _uid = uid.clone();
view! {
<div class="ml-3 mr-3">
@ -150,8 +142,16 @@ pub fn UserPage(tl: Timeline) -> impl IntoView {
</tr>
</table>
<div class="rev mr-1">
{followed_by_me}
// {following_me}
{if followed_by_me {
view! { <code class="color">following</code> }.into_view()
} else {
view! { <input type="submit" value="follow" on:click=move |_| send_follow_request(_uid.clone()) /> }.into_view()
}}
{if following_me {
Some(view! { <code class="ml-1 color">follows you</code> })
} else {
None
}}
</div>
<blockquote class="ml-2 mt-1">{
dissolve::strip_html_tags(&summary)