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

fix: awa

Browse source
This commit is contained in:
aprilthepink 2024-08-03 08:05:17 +02:00
parent 01ba54328e
commit f7be000097
2 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/lysand/http.rs
View file

@ -230,6 +230,29 @@ pub async fn lysand_url_to_user_and_model(
let db = DB.get().unwrap(); let db = DB.get().unwrap();
let data = FEDERATION_CONFIG.get().unwrap(); let data = FEDERATION_CONFIG.get().unwrap();
let opt_model = prelude::User::find()
.filter(user::Column::Url.eq(url.as_str()))
.one(db)
.await?;
let target;
if let Some(model) = opt_model {
target = model;
} else {
target = ObjectId::<user::Model>::from(url)
.dereference(&data.to_request_data())
.await
.unwrap();
}
Ok((lysand_user_from_db(target.clone()).await?, target))
}
pub async fn main_lysand_url_to_user_and_model(
url: Url,
) -> anyhow::Result<(super::objects::User, user::Model)> {
let db = DB.get().unwrap();
let data = FEDERATION_CONFIG.get().unwrap();
let opt_model = prelude::User::find() let opt_model = prelude::User::find()
.filter(user::Column::Url.eq(url.as_str())) .filter(user::Column::Url.eq(url.as_str()))
.one(db) .one(db)

9
src/lysand/inbox.rs
View file

@ -1,12 +1,9 @@
use crate::{ use crate::{
activities::follow::Follow, activities::follow::Follow, entities::{
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, DB, FEDERATION_CONFIG
utils::generate_follow_req_id,
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,
@ -75,7 +72,7 @@ async fn follow_request(follow: super::objects::Follow) -> Result<()> {
)); ));
} }
let data = FEDERATION_CONFIG.get().unwrap(); let data = FEDERATION_CONFIG.get().unwrap();
let author = lysand_url_to_user_and_model(follow.author.into()).await?; let author = main_lysand_url_to_user_and_model(follow.author.into()).await?;
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(),