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

feat: show following/followers counts for users

Browse source
This commit is contained in:
əlemi 2024-04-18 03:06:56 +02:00
parent 8721a44354
commit 45a69f0332
Signed by: alemi
GPG key ID: A4895B84D311642C
1 changed files with 30 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/routes/activitypub/user/mod.rs
View file

@ -7,8 +7,8 @@ pub mod following;
use axum::extract::{Path, State}; use axum::extract::{Path, State};
use sea_orm::EntityTrait; use sea_orm::EntityTrait;
use apb::{PublicKeyMut, ActorMut, DocumentMut, DocumentType, ObjectMut, BaseMut, Node}; use apb::{ActorMut, BaseMut, CollectionMut, DocumentMut, DocumentType, Node, ObjectMut, PublicKeyMut};
use crate::{errors::UpubError, model::{self, user}, server::Context, url}; use crate::{errors::UpubError, model::{self, user}, server::{auth::AuthIdentity, Context}, url};
use super::{jsonld::LD, JsonLD}; use super::{jsonld::LD, JsonLD};
@ -46,6 +46,7 @@ pub fn ap_user(user: model::user::Model) -> serde_json::Value {
pub async fn view( pub async fn view(
State(ctx) : State<Context>, State(ctx) : State<Context>,
AuthIdentity(auth): AuthIdentity,
Path(id): Path<String>, Path(id): Path<String>,
) -> crate::Result<JsonLD<serde_json::Value>> { ) -> crate::Result<JsonLD<serde_json::Value>> {
let uid = if id.starts_with('+') { let uid = if id.starts_with('+') {
@ -58,12 +59,36 @@ pub async fn view(
.one(ctx.db()).await? .one(ctx.db()).await?
{ {
// local user // local user
Some((user, Some(_cfg))) => { 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::link(url!(ctx, "/users/{id}/following"))) .set_following(Node::object(
.set_followers(Node::link(url!(ctx, "/users/{id}/followers"))) serde_json::Value::new_object()
.set_id(Some(&url!(ctx, "/users/{id}/following")))
.set_collection_type(Some(apb::CollectionType::OrderedCollection))
.set_first(Node::link(url!(ctx, "/users/{id}/following/page")))
.set_total_items(
if auth.is_user(&user.id) || cfg.show_following {
Some(user.following_count as u64)
} else {
None
}
)
))
.set_followers(Node::object(
serde_json::Value::new_object()
.set_id(Some(&url!(ctx, "/users/{id}/followers")))
.set_collection_type(Some(apb::CollectionType::OrderedCollection))
.set_first(Node::link(url!(ctx, "/users/{id}/followers/page")))
.set_total_items(
if auth.is_user(&user.id) || cfg.show_followers {
Some(user.followers_count as u64)
} else {
None
}
)
))
// .set_public_key(user.public_key) // TODO // .set_public_key(user.public_key) // TODO
.ld_context() .ld_context()
)) ))