versia-pub/activitypub
2
0
Fork 0
mirror of https://github.com/versia-pub/activitypub.git synced 2025-12-06 14:48:19 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: fmt

Browse source
This commit is contained in:
aprilthepink 2024-08-03 15:30:34 +02:00
parent 42abaa0779
commit faa9ca4270
4 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/activities/follow.rs
View file

@ -11,10 +11,15 @@ use serde::{Deserialize, Serialize};
use url::Url; use url::Url;
use crate::{ use crate::{
database::StateHandle, entities::{ database::StateHandle,
entities::{
follow_relation::{self, Entity}, follow_relation::{self, Entity},
post, prelude, user, post, prelude, user,
}, error, lysand::funcs::send_follow_accept_to_lysand, utils::{generate_follow_accept_id, generate_random_object_id}, DB },
error,
lysand::funcs::send_follow_accept_to_lysand,
utils::{generate_follow_accept_id, generate_random_object_id},
DB,
}; };
#[derive(Deserialize, Serialize, Debug)] #[derive(Deserialize, Serialize, Debug)]

13
src/lysand/inbox.rs
View file

@ -1,9 +1,13 @@
use crate::{ use crate::{
activities::follow::Follow, entities::{ activities::follow::Follow,
entities::{
self, follow_relation, self, follow_relation,
prelude::{self, FollowRelation}, prelude::{self, FollowRelation},
user, user,
}, lysand::http::main_lysand_url_to_user_and_model, utils::generate_follow_req_id, API_DOMAIN, DB, FEDERATION_CONFIG },
lysand::http::main_lysand_url_to_user_and_model,
utils::generate_follow_req_id,
API_DOMAIN, DB, FEDERATION_CONFIG,
}; };
use activitypub_federation::{ use activitypub_federation::{
activity_sending::SendActivityTask, fetch::object_id::ObjectId, protocol::context::WithContext, activity_sending::SendActivityTask, fetch::object_id::ObjectId, protocol::context::WithContext,
@ -73,10 +77,7 @@ async fn follow_request(follow: super::objects::Follow) -> Result<()> {
} }
let data = FEDERATION_CONFIG.get().unwrap(); let data = FEDERATION_CONFIG.get().unwrap();
let author = main_lysand_url_to_user_and_model(follow.author.into()).await?; let author = main_lysand_url_to_user_and_model(follow.author.into()).await?;
println!( println!("Followee URL: {}", &follow.followee.to_string());
"Followee URL: {}",
&follow.followee.to_string()
);
let followee = lysand_url_to_user_and_model(follow.followee.into()).await?; let followee = lysand_url_to_user_and_model(follow.followee.into()).await?;
let serial_ap_author = serde_json::from_str::<crate::objects::person::Person>( let serial_ap_author = serde_json::from_str::<crate::objects::person::Person>(
&(author.1.ap_json.clone()).unwrap(), &(author.1.ap_json.clone()).unwrap(),

4
src/main.rs
View file

@ -15,7 +15,9 @@ use clap::Parser;
use database::Database; use database::Database;
use entities::post; use entities::post;
use http::{http_get_user, http_post_user_inbox, webfinger}; use http::{http_get_user, http_post_user_inbox, webfinger};
use lysand::http::{create_activity, fetch_lysand_post, fetch_post, fetch_user, lysand_inbox, query_post}; use lysand::http::{
create_activity, fetch_lysand_post, fetch_post, fetch_user, lysand_inbox, query_post,
};
use objects::person::{DbUser, Person}; use objects::person::{DbUser, Person};
use sea_orm::{ActiveModelTrait, DatabaseConnection, Set}; use sea_orm::{ActiveModelTrait, DatabaseConnection, Set};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};

5
src/objects/person.rs
View file

@ -167,7 +167,10 @@ impl Object for user::Model {
.filter(entities::user::Column::Url.eq(object_id.to_string())) .filter(entities::user::Column::Url.eq(object_id.to_string()))
.one(data.database_connection.as_ref()) .one(data.database_connection.as_ref())
.await?; .await?;
println!("!!!!!!!!Reading user from id!!!!!!!!!!!: {}", res.clone().is_some()); println!(
"!!!!!!!!Reading user from id!!!!!!!!!!!: {}",
res.clone().is_some()
);
Ok(res) Ok(res)
} }