zaaarf/upub
1
0
Fork 0
forked from alemi/upub
Code Pull requests Activity

fix: fetch user which liked

Browse source 
fixes lemmy sending us remote likes
This commit is contained in:
əlemi 2024-06-06 18:20:43 +02:00
parent da68423a47
commit f3d28c9371
Signed by: alemi
GPG key ID: A4895B84D311642C
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
upub/core/src/traits/process.rs
View file

@ -83,13 +83,11 @@ pub async fn create(ctx: &crate::Context, activity: impl apb::Activity, tx: &Dat
pub async fn like(ctx: &crate::Context, activity: impl apb::Activity, tx: &DatabaseTransaction) -> Result<(), ProcessorError> { pub async fn like(ctx: &crate::Context, activity: impl apb::Activity, tx: &DatabaseTransaction) -> Result<(), ProcessorError> {
let uid = activity.actor().id()?.to_string(); let uid = activity.actor().id()?.to_string();
let internal_uid = crate::model::actor::Entity::ap_to_internal(&uid, tx) let actor = ctx.fetch_user(&uid, tx).await?;
.await?
.ok_or(ProcessorError::Incomplete)?;
let object_uri = activity.object().id()?.to_string(); let object_uri = activity.object().id()?.to_string();
let published = activity.published().unwrap_or_else(|_|chrono::Utc::now()); let published = activity.published().unwrap_or_else(|_|chrono::Utc::now());
let obj = ctx.fetch_object(&object_uri, tx).await?; let obj = ctx.fetch_object(&object_uri, tx).await?;
if crate::model::like::Entity::find_by_uid_oid(internal_uid, obj.internal) if crate::model::like::Entity::find_by_uid_oid(actor.internal, obj.internal)
.any(tx) .any(tx)
.await? .await?
{ {
@ -100,7 +98,7 @@ pub async fn like(ctx: &crate::Context, activity: impl apb::Activity, tx: &Datab
let like = crate::model::like::ActiveModel { let like = crate::model::like::ActiveModel {
internal: NotSet, internal: NotSet,
actor: Set(internal_uid), actor: Set(actor.internal),
object: Set(obj.internal), object: Set(obj.internal),
activity: Set(activity_model.internal), activity: Set(activity_model.internal),
published: Set(published), published: Set(published),
@ -355,9 +353,6 @@ pub async fn undo(ctx: &crate::Context, activity: impl apb::Activity, tx: &Datab
pub async fn announce(ctx: &crate::Context, activity: impl apb::Activity, tx: &DatabaseTransaction) -> Result<(), ProcessorError> { pub async fn announce(ctx: &crate::Context, activity: impl apb::Activity, tx: &DatabaseTransaction) -> Result<(), ProcessorError> {
let uid = activity.actor().id()?.to_string(); let uid = activity.actor().id()?.to_string();
let actor = ctx.fetch_user(&uid, tx).await?; let actor = ctx.fetch_user(&uid, tx).await?;
let internal_uid = crate::model::actor::Entity::ap_to_internal(&uid, tx)
.await?
.ok_or(ProcessorError::Incomplete)?;
let announced_id = activity.object().id()?.to_string(); let announced_id = activity.object().id()?.to_string();
let published = activity.published().unwrap_or(chrono::Utc::now()); let published = activity.published().unwrap_or(chrono::Utc::now());
let addressed = activity.addressed(); let addressed = activity.addressed();
@ -400,7 +395,7 @@ pub async fn announce(ctx: &crate::Context, activity: impl apb::Activity, tx: &D
let share = crate::model::announce::ActiveModel { let share = crate::model::announce::ActiveModel {
internal: NotSet, internal: NotSet,
actor: Set(internal_uid), actor: Set(actor.internal),
object: Set(object_model.internal), object: Set(object_model.internal),
published: Set(published), published: Set(published),
}; };