FediMovies/fedimovies
1
1
Fork 0
Code Issues 3 Pull requests Projects Releases Packages Activity

Create type for deserializing Move() activities

Browse source
This commit is contained in:
silverpill 2022-12-07 22:49:05 +00:00
parent b7a1803715
commit f21f72b96e
1 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/activitypub/handlers/move.rs
View file

@ -1,15 +1,15 @@
use serde::Deserialize;
use serde_json::Value; use serde_json::Value;
use tokio_postgres::GenericClient; use tokio_postgres::GenericClient;
use crate::activitypub::{ use crate::activitypub::{
activity::Activity,
builders::{ builders::{
follow::prepare_follow, follow::prepare_follow,
undo_follow::prepare_undo_follow, undo_follow::prepare_undo_follow,
}, },
fetcher::helpers::get_or_import_profile_by_actor_id, fetcher::helpers::get_or_import_profile_by_actor_id,
identifiers::parse_local_actor_id, identifiers::parse_local_actor_id,
receiver::{find_object_id, parse_array}, receiver::parse_array,
vocabulary::PERSON, vocabulary::PERSON,
}; };
use crate::config::Config; use crate::config::Config;
@ -27,22 +27,24 @@ use crate::models::{
}; };
use super::HandlerResult; use super::HandlerResult;
#[derive(Deserialize)]
struct Move {
actor: String,
object: String,
target: String,
}
pub async fn handle_move( pub async fn handle_move(
config: &Config, config: &Config,
db_client: &mut impl GenericClient, db_client: &mut impl GenericClient,
activity: Value, activity: Value,
) -> HandlerResult { ) -> HandlerResult {
// Move(Person) // Move(Person)
let activity: Activity = serde_json::from_value(activity) let activity: Move = serde_json::from_value(activity)
.map_err(|_| ValidationError("unexpected activity structure"))?; .map_err(|_| ValidationError("unexpected activity structure"))?;
let object_id = find_object_id(&activity.object)?; // Mastodon: actor is old profile (object)
let target_value = activity.target // Mitra: actor is new profile (target)
.ok_or(ValidationError("target is missing"))?; if activity.object != activity.actor && activity.target != activity.actor {
let target_id = find_object_id(&target_value)?;
// Actor is old profile (Mastodon)
// Actor is new profile (Mitra)
if object_id != activity.actor && target_id != activity.actor {
return Err(ValidationError("actor ID mismatch").into()); return Err(ValidationError("actor ID mismatch").into());
}; };
@ -50,7 +52,7 @@ pub async fn handle_move(
let media_dir = config.media_dir(); let media_dir = config.media_dir();
let old_profile = if let Ok(username) = parse_local_actor_id( let old_profile = if let Ok(username) = parse_local_actor_id(
&instance.url(), &instance.url(),
&object_id, &activity.object,
) { ) {
let old_user = get_user_by_name(db_client, &username).await?; let old_user = get_user_by_name(db_client, &username).await?;
old_user.profile old_user.profile
@ -59,7 +61,7 @@ pub async fn handle_move(
db_client, db_client,
&instance, &instance,
&media_dir, &media_dir,
&object_id, &activity.object,
).await? ).await?
}; };
let old_actor_id = old_profile.actor_id(&instance.url()); let old_actor_id = old_profile.actor_id(&instance.url());
@ -67,9 +69,10 @@ pub async fn handle_move(
db_client, db_client,
&instance, &instance,
&media_dir, &media_dir,
&target_id, &activity.target,
).await?; ).await?;
let new_actor = new_profile.actor_json.unwrap(); let new_actor = new_profile.actor_json
.expect("target should be a remote actor");
// Find aliases by DIDs // Find aliases by DIDs
let mut aliases = vec![]; let mut aliases = vec![];