Compare commits
2 commits
a6015a32ed
...
677cab1871
Author | SHA1 | Date | |
---|---|---|---|
677cab1871 | |||
d8feeec26f |
3 changed files with 50 additions and 10 deletions
|
@ -113,7 +113,7 @@ impl<T : super::Base> Node<T> {
|
||||||
Node::Empty => vec![],
|
Node::Empty => vec![],
|
||||||
Node::Link(uri) => vec![uri.href().to_string()],
|
Node::Link(uri) => vec![uri.href().to_string()],
|
||||||
Node::Object(x) => x.id().map_or(vec![], |x| vec![x.to_string()]),
|
Node::Object(x) => x.id().map_or(vec![], |x| vec![x.to_string()]),
|
||||||
Node::Array(x) => x.iter().filter_map(|x| x.id().ok()).map(|x| x.to_string()).collect()
|
Node::Array(x) => x.iter().filter_map(|x| Some(x.id().ok()?.to_string())).collect()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -43,3 +43,34 @@ impl<T: Object> Addressed for T {
|
||||||
// to
|
// to
|
||||||
// }
|
// }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod test {
|
||||||
|
use super::Addressed;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
#[cfg(feature = "unstructured")]
|
||||||
|
fn addressed_trait_finds_all_targets_on_json_objects() {
|
||||||
|
let obj = serde_json::json!({
|
||||||
|
"id": "http://localhost:8080/obj/1",
|
||||||
|
"type": "Note",
|
||||||
|
"content": "hello world!",
|
||||||
|
"published": "2024-06-04T17:09:20+00:00",
|
||||||
|
"to": ["http://localhost:8080/usr/root/followers"],
|
||||||
|
"bto": ["https://localhost:8080/usr/secret"],
|
||||||
|
"cc": [crate::target::PUBLIC],
|
||||||
|
"bcc": [],
|
||||||
|
});
|
||||||
|
|
||||||
|
let addressed = obj.addressed();
|
||||||
|
|
||||||
|
assert_eq!(
|
||||||
|
addressed,
|
||||||
|
vec![
|
||||||
|
"http://localhost:8080/usr/root/followers".to_string(),
|
||||||
|
"https://localhost:8080/usr/secret".to_string(),
|
||||||
|
crate::target::PUBLIC.to_string(),
|
||||||
|
]
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -15,15 +15,16 @@ pub fn ObjectPage(tl: Timeline) -> impl IntoView {
|
||||||
let object = create_local_resource(
|
let object = create_local_resource(
|
||||||
move || params.get().get("id").cloned().unwrap_or_default(),
|
move || params.get().get("id").cloned().unwrap_or_default(),
|
||||||
move |oid| async move {
|
move |oid| async move {
|
||||||
let tl_url = format!("{}/page", Uri::api(U::Context, &oid, false));
|
let obj = match CACHE.get(&Uri::full(U::Object, &oid)) {
|
||||||
if !tl.next.get().starts_with(&tl_url) {
|
Some(x) => x.clone(),
|
||||||
tl.reset(tl_url);
|
|
||||||
}
|
|
||||||
match CACHE.get(&Uri::full(U::Object, &oid)) {
|
|
||||||
Some(x) => Some(x.clone()),
|
|
||||||
None => {
|
None => {
|
||||||
let obj = Http::fetch::<serde_json::Value>(&Uri::api(U::Object, &oid, true), auth).await.ok()?;
|
let obj = match Http::fetch::<serde_json::Value>(&Uri::api(U::Object, &oid, true), auth).await {
|
||||||
let obj = Arc::new(obj);
|
Ok(obj) => Arc::new(obj),
|
||||||
|
Err(e) => {
|
||||||
|
tracing::error!("failed loading object from backend: {e}");
|
||||||
|
return None;
|
||||||
|
},
|
||||||
|
};
|
||||||
if let Ok(author) = obj.attributed_to().id() {
|
if let Ok(author) = obj.attributed_to().id() {
|
||||||
if let Ok(user) = Http::fetch::<serde_json::Value>(
|
if let Ok(user) = Http::fetch::<serde_json::Value>(
|
||||||
&Uri::api(U::Actor, author, true), auth
|
&Uri::api(U::Actor, author, true), auth
|
||||||
|
@ -32,9 +33,17 @@ pub fn ObjectPage(tl: Timeline) -> impl IntoView {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
CACHE.put(Uri::full(U::Object, &oid), obj.clone());
|
CACHE.put(Uri::full(U::Object, &oid), obj.clone());
|
||||||
Some(obj)
|
obj
|
||||||
|
}
|
||||||
|
};
|
||||||
|
if let Ok(ctx) = obj.context().id() {
|
||||||
|
let tl_url = format!("{}/page", ctx);
|
||||||
|
if !tl.next.get().starts_with(&tl_url) {
|
||||||
|
tl.reset(tl_url);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Some(obj)
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
view! {
|
view! {
|
||||||
|
|
Loading…
Reference in a new issue