HoovesSocial/hippofish
2
0
Fork 0
Code Issues 3 Pull requests 1 Projects Releases Packages Wiki Activity Actions

fix (backend-rs): followee/follower uri may be null

Browse source
This commit is contained in:
naskya 2024-07-29 23:29:40 +09:00
parent b85f459cfe
commit 07c5bfa600
No known key found for this signature in database
GPG key ID: 712D413B3A9FED5C
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/backend-rs/index.d.ts vendored
View file

@ -1554,7 +1554,7 @@ export interface UserKeypair {
export interface UserLike {
id: string
host: string | null
uri: string
uri: string | null
}
export interface UserList {

22
packages/backend-rs/src/federation/activitypub/object/follow.rs
View file

@ -5,7 +5,7 @@ use crate::{config::CONFIG, federation::internal_actor, misc::user};
pub struct UserLike {
pub id: String,
pub host: Option<String>,
pub uri: String,
pub uri: Option<String>,
}
#[macros::export(object)]
@ -18,23 +18,31 @@ pub struct Follow {
impl ActivityPubObject for Follow {}
#[macros::errors]
pub enum Error {
#[error("follower uri is missing")]
MissingFollowerUri,
#[error("followee uri is missing")]
MissingFolloweeUri,
}
impl Follow {
#[allow(dead_code)] // TODO: remove this line
fn new(follower: UserLike, followee: UserLike, request_id: Option<String>) -> Self {
Self {
fn new(follower: UserLike, followee: UserLike, request_id: Option<String>) -> Result<Self, Error> {
Ok(Self {
id: request_id.unwrap_or_else(|| {
format!("{}/follows/{}/{}", CONFIG.url, follower.id, followee.id)
}),
r#type: Activity::Follow,
actor: match user::is_local!(follower) {
true => format!("{}/users/{}", CONFIG.url, follower.id),
false => follower.uri,
false => follower.uri.ok_or(Error::MissingFollowerUri)?,
},
object: match user::is_local!(followee) {
true => format!("{}/users/{}", CONFIG.url, followee.id),
false => followee.uri,
false => followee.uri.ok_or(Error::MissingFolloweeUri)?,
},
}
})
}
#[allow(dead_code)] // TODO: remove this line
@ -53,7 +61,7 @@ impl Follow {
}
#[macros::ts_export]
pub fn render_follow(follower: UserLike, followee: UserLike, request_id: Option<String>) -> Follow {
pub fn render_follow(follower: UserLike, followee: UserLike, request_id: Option<String>) -> Result<Follow, Error> {
Follow::new(follower, followee, request_id)
}