From fa48060a9418db32c142881b594f01962d9bfd4a Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Sun, 12 Sep 2021 02:14:17 +0900 Subject: [PATCH] Define Instance::to_activity() --- plume-models/src/instance.rs | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/plume-models/src/instance.rs b/plume-models/src/instance.rs index 1576b7c5..f8cb66cb 100644 --- a/plume-models/src/instance.rs +++ b/plume-models/src/instance.rs @@ -6,11 +6,17 @@ use crate::{ users::{Role, User}, Connection, Error, Result, }; +use activitypub::{actor::Service, CustomObject}; use chrono::NaiveDateTime; use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl}; -use plume_common::{activity_pub::sign::gen_keypair, utils::md_to_html}; +use plume_common::{ + activity_pub::{sign::gen_keypair, ApSignature, PublicKey}, + utils::md_to_html, +}; use std::sync::RwLock; +pub type CustomService = CustomObject; + #[derive(Clone, Identifiable, Queryable)] pub struct Instance { pub id: i32, @@ -256,6 +262,30 @@ impl Instance { .and(Ok(())) .map_err(Error::from) } + + pub fn to_activity(&self) -> Result { + let mut actor = Service::default(); + let id = ap_url(&format!( + "{}/!/{}", + Self::get_local()?.public_domain, + self.public_domain + )); + actor.object_props.set_id_string(id.clone())?; + actor.object_props.set_name_string(self.name.clone())?; + + let mut ap_signature = ApSignature::default(); + if self.local { + if let Some(pub_key) = self.public_key.clone() { + let mut public_key = PublicKey::default(); + public_key.set_id_string(format!("{}#main-key", id))?; + public_key.set_owner_string(id)?; + public_key.set_public_key_pem_string(pub_key)?; + ap_signature.set_public_key_publickey(public_key)?; + } + }; + + Ok(CustomService::new(actor, ap_signature)) + } } impl NewInstance {