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

fix: apparently i need to put flat links...

Browse source 
what's the point of being ActivityPub if you expect a fixed structure!!!
This commit is contained in:
əlemi 2024-03-27 00:15:17 +01:00
parent e9dc33a39d
commit a2f77fa6fb
Signed by: alemi
GPG key ID: A4895B84D311642C
1 changed files with 17 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/activitypub/user/mod.rs
View file

@ -32,18 +32,20 @@ pub fn ap_user(user: model::user::Model) -> serde_json::Value {
.set_preferred_username(Some(&user.preferred_username)) .set_preferred_username(Some(&user.preferred_username))
.set_inbox(Node::maybe_link(user.inbox)) .set_inbox(Node::maybe_link(user.inbox))
.set_outbox(Node::maybe_link(user.outbox)) .set_outbox(Node::maybe_link(user.outbox))
.set_following(Node::object( .set_following(Node::maybe_link(user.following))
serde_json::Value::new_object() // .set_following(Node::object(
.set_id(user.following.as_deref()) // serde_json::Value::new_object()
.set_collection_type(Some(CollectionType::OrderedCollection)) // .set_id(user.following.as_deref())
.set_total_items(Some(user.following_count as u64)) // .set_collection_type(Some(CollectionType::OrderedCollection))
)) // .set_total_items(Some(user.following_count as u64))
.set_followers(Node::object( // ))
serde_json::Value::new_object() .set_followers(Node::maybe_link(user.followers))
.set_id(user.followers.as_deref()) // .set_followers(Node::object(
.set_collection_type(Some(CollectionType::OrderedCollection)) // serde_json::Value::new_object()
.set_total_items(Some(user.followers_count as u64)) // .set_id(user.followers.as_deref())
)) // .set_collection_type(Some(CollectionType::OrderedCollection))
// .set_total_items(Some(user.followers_count as u64))
// ))
.set_public_key(Node::object( .set_public_key(Node::object(
serde_json::Value::new_object() serde_json::Value::new_object()
.set_id(Some(&format!("{}#main-key", user.id))) .set_id(Some(&format!("{}#main-key", user.id)))
@ -60,24 +62,12 @@ pub async fn view(State(ctx) : State<Context>, Path(id): Path<String>) -> Result
.one(ctx.db()).await .one(ctx.db()).await
{ {
// local user // local user
Ok(Some((user, Some(cfg)))) => { Ok(Some((user, Some(_cfg)))) => {
Ok(JsonLD(ap_user(user.clone()) // ew ugly clone TODO Ok(JsonLD(ap_user(user.clone()) // ew ugly clone TODO
.set_inbox(Node::link(url!(ctx, "/users/{id}/inbox"))) .set_inbox(Node::link(url!(ctx, "/users/{id}/inbox")))
.set_outbox(Node::link(url!(ctx, "/users/{id}/outbox"))) .set_outbox(Node::link(url!(ctx, "/users/{id}/outbox")))
.set_following(Node::object( .set_following(Node::link(url!(ctx, "/users/{id}/following")))
serde_json::Value::new_object() .set_followers(Node::link(url!(ctx, "/users/{id}/followers")))
.set_id(Some(&url!(ctx, "/users/{id}/following")))
.set_collection_type(Some(CollectionType::OrderedCollection))
.set_total_items(if cfg.show_following_count { Some(user.following_count as u64) } else { None })
.set_first(Node::link(url!(ctx, "/users/{id}/following?page=true")))
))
.set_followers(Node::object(
serde_json::Value::new_object()
.set_id(Some(&url!(ctx, "/users/{id}/followers")))
.set_collection_type(Some(CollectionType::OrderedCollection))
.set_total_items(if cfg.show_followers_count { Some(user.followers_count as u64) } else { None })
.set_first(Node::link(url!(ctx, "/users/{id}/followers?page=true")))
))
// .set_public_key(user.public_key) // TODO // .set_public_key(user.public_key) // TODO
.ld_context() .ld_context()
)) ))