diff --git a/src/main.rs b/src/main.rs index 3cdb4ef..57f0cf2 100644 --- a/src/main.rs +++ b/src/main.rs @@ -74,6 +74,7 @@ async fn main() -> actix_web::Result<(), anyhow::Error> { let user = entities::user::ActiveModel { id: Set(ap_id.into()), username: Set(username), + name: Set("Test account <3".to_string()), inbox: Set(inbox.to_string()), public_key: Set(keypair.public_key.clone()), private_key: Set(Some(keypair.private_key.clone())), diff --git a/src/objects/person.rs b/src/objects/person.rs index e9ab100..261e6d8 100644 --- a/src/objects/person.rs +++ b/src/objects/person.rs @@ -15,6 +15,7 @@ use activitypub_federation::{ use chrono::{prelude, DateTime, Utc}; use sea_orm::{ActiveModelTrait, ColumnTrait, EntityTrait, QueryFilter, Set}; use serde::{Deserialize, Serialize}; +use tracing::info; use std::fmt::Debug; use url::Url; @@ -64,6 +65,9 @@ pub struct Person { #[serde(rename = "type")] kind: PersonType, preferred_username: String, + name: String, + summary: Option, + url: Url, id: ObjectId, inbox: Url, public_key: PublicKey, @@ -97,6 +101,9 @@ impl Object for user::Model { id: Url::parse(&self.id).unwrap().into(), inbox: Url::parse(&self.inbox).unwrap(), public_key: self.public_key(), + name: self.name.clone(), + summary: self.summary.clone(), + url: Url::parse(&self.url).unwrap(), }) } @@ -116,13 +123,22 @@ impl Object for user::Model { let model = user::ActiveModel { id: Set(json.id.to_string()), username: Set(json.preferred_username), + name: Set(json.name), inbox: Set(json.inbox.to_string()), public_key: Set(json.public_key.public_key_pem), local: Set(false), + summary: Set(json.summary), + url: Set(json.url.to_string()), ..Default::default() }; - let model = model.insert(_data.database_connection.as_ref()).await?; - Ok(model) + let model = model.insert(_data.database_connection.as_ref()).await; + if let Err(err) = model { + eprintln!("Error inserting user: {:?}", err); + Err(err.into()) + } else { + info!("User inserted: {:?}", model.as_ref().unwrap()); + Ok(model.unwrap()) + } } } diff --git a/src/objects/post.rs b/src/objects/post.rs index 7915af1..67e664c 100644 --- a/src/objects/post.rs +++ b/src/objects/post.rs @@ -16,6 +16,7 @@ use activitypub_federation::{ use activitystreams_kinds::link::MentionType; use sea_orm::{ActiveModelTrait, Set}; use serde::{Deserialize, Serialize}; +use tracing::info; use url::Url; #[derive(Clone, Debug, Serialize, Deserialize)] @@ -88,7 +89,15 @@ impl Object for post::Model { }; let post = post .insert(data.app_data().database_connection.clone().as_ref()) - .await?; + .await; + + if let Err(err) = post { + eprintln!("Error inserting post: {:?}", err); + return Err(err.into()); + } + info!("Post inserted: {:?}", post.as_ref().unwrap()); + + let post = post.unwrap(); let mention = Mention { href: Url::parse(&creator.id)?,