Use Reshare::to_activity07() instead of to_activity()
This commit is contained in:
parent
ae9c9262f7
commit
f365041a45
@ -2,9 +2,8 @@ use crate::{
|
|||||||
db_conn::DbConn, instance::Instance, notifications::*, posts::Post, schema::reshares,
|
db_conn::DbConn, instance::Instance, notifications::*, posts::Post, schema::reshares,
|
||||||
timeline::*, users::User, Connection, Error, Result, CONFIG,
|
timeline::*, users::User, Connection, Error, Result, CONFIG,
|
||||||
};
|
};
|
||||||
use activitypub::activity::Announce;
|
|
||||||
use activitystreams::{
|
use activitystreams::{
|
||||||
activity::{ActorAndObjectRef, Announce as Announce07, Undo},
|
activity::{ActorAndObjectRef, Announce, Undo},
|
||||||
base::AnyBase,
|
base::AnyBase,
|
||||||
iri_string::types::IriString,
|
iri_string::types::IriString,
|
||||||
prelude::*,
|
prelude::*,
|
||||||
@ -14,7 +13,7 @@ use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl};
|
|||||||
use plume_common::activity_pub::{
|
use plume_common::activity_pub::{
|
||||||
inbox::{AsActor, AsObject, FromId},
|
inbox::{AsActor, AsObject, FromId},
|
||||||
sign::Signer,
|
sign::Signer,
|
||||||
Id, IntoId, PUBLIC_VISIBILITY,
|
PUBLIC_VISIBILITY,
|
||||||
};
|
};
|
||||||
|
|
||||||
#[derive(Clone, Queryable, Identifiable)]
|
#[derive(Clone, Queryable, Identifiable)]
|
||||||
@ -66,23 +65,8 @@ impl Reshare {
|
|||||||
User::get(conn, self.user_id)
|
User::get(conn, self.user_id)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn to_activity(&self, conn: &Connection) -> Result<Announce> {
|
pub fn to_activity07(&self, conn: &Connection) -> Result<Announce> {
|
||||||
let mut act = Announce::default();
|
let mut act = Announce::new(
|
||||||
act.announce_props
|
|
||||||
.set_actor_link(User::get(conn, self.user_id)?.into_id())?;
|
|
||||||
act.announce_props
|
|
||||||
.set_object_link(Post::get(conn, self.post_id)?.into_id())?;
|
|
||||||
act.object_props.set_id_string(self.ap_url.clone())?;
|
|
||||||
act.object_props
|
|
||||||
.set_to_link_vec(vec![Id::new(PUBLIC_VISIBILITY.to_string())])?;
|
|
||||||
act.object_props
|
|
||||||
.set_cc_link_vec(vec![Id::new(self.get_user(conn)?.followers_endpoint)])?;
|
|
||||||
|
|
||||||
Ok(act)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn to_activity07(&self, conn: &Connection) -> Result<Announce07> {
|
|
||||||
let mut act = Announce07::new(
|
|
||||||
User::get(conn, self.user_id)?.ap_url.parse::<IriString>()?,
|
User::get(conn, self.user_id)?.ap_url.parse::<IriString>()?,
|
||||||
Post::get(conn, self.post_id)?.ap_url.parse::<IriString>()?,
|
Post::get(conn, self.post_id)?.ap_url.parse::<IriString>()?,
|
||||||
);
|
);
|
||||||
@ -129,7 +113,7 @@ impl Reshare {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl AsObject<User, Announce07, &DbConn> for Post {
|
impl AsObject<User, Announce, &DbConn> for Post {
|
||||||
type Error = Error;
|
type Error = Error;
|
||||||
type Output = Reshare;
|
type Output = Reshare;
|
||||||
|
|
||||||
@ -152,13 +136,13 @@ impl AsObject<User, Announce07, &DbConn> for Post {
|
|||||||
|
|
||||||
impl FromId<DbConn> for Reshare {
|
impl FromId<DbConn> for Reshare {
|
||||||
type Error = Error;
|
type Error = Error;
|
||||||
type Object = Announce07;
|
type Object = Announce;
|
||||||
|
|
||||||
fn from_db07(conn: &DbConn, id: &str) -> Result<Self> {
|
fn from_db07(conn: &DbConn, id: &str) -> Result<Self> {
|
||||||
Reshare::find_by_ap_url(conn, id)
|
Reshare::find_by_ap_url(conn, id)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn from_activity07(conn: &DbConn, act: Announce07) -> Result<Self> {
|
fn from_activity07(conn: &DbConn, act: Announce) -> Result<Self> {
|
||||||
let res = Reshare::insert(
|
let res = Reshare::insert(
|
||||||
conn,
|
conn,
|
||||||
NewReshare {
|
NewReshare {
|
||||||
@ -238,30 +222,6 @@ mod test {
|
|||||||
use assert_json_diff::assert_json_eq;
|
use assert_json_diff::assert_json_eq;
|
||||||
use serde_json::{json, to_value};
|
use serde_json::{json, to_value};
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn to_activity() {
|
|
||||||
let conn = db();
|
|
||||||
conn.test_transaction::<_, Error, _>(|| {
|
|
||||||
let (posts, _users, _blogs) = fill_database(&conn);
|
|
||||||
let post = &posts[0];
|
|
||||||
let user = &post.get_authors(&conn)?[0];
|
|
||||||
let reshare = Reshare::insert(&*conn, NewReshare::new(post, user))?;
|
|
||||||
let act = reshare.to_activity(&conn).unwrap();
|
|
||||||
|
|
||||||
let expected = json!({
|
|
||||||
"actor": "https://plu.me/@/admin/",
|
|
||||||
"cc": ["https://plu.me/@/admin/followers"],
|
|
||||||
"id": "https://plu.me/@/admin/reshare/https://plu.me/~/BlogName/testing",
|
|
||||||
"object": "https://plu.me/~/BlogName/testing",
|
|
||||||
"to": ["https://www.w3.org/ns/activitystreams#Public"],
|
|
||||||
"type": "Announce",
|
|
||||||
});
|
|
||||||
assert_json_eq!(to_value(act)?, expected);
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn to_activity07() {
|
fn to_activity07() {
|
||||||
let conn = db();
|
let conn = db();
|
||||||
|
@ -3,7 +3,7 @@ use rocket_i18n::I18n;
|
|||||||
|
|
||||||
use crate::routes::errors::ErrorPage;
|
use crate::routes::errors::ErrorPage;
|
||||||
use crate::utils::requires_login;
|
use crate::utils::requires_login;
|
||||||
use plume_common::activity_pub::{broadcast, broadcast07};
|
use plume_common::activity_pub::broadcast07;
|
||||||
use plume_models::{
|
use plume_models::{
|
||||||
blogs::Blog, db_conn::DbConn, inbox::inbox, posts::Post, reshares::*, timeline::*, users::User,
|
blogs::Blog, db_conn::DbConn, inbox::inbox, posts::Post, reshares::*, timeline::*, users::User,
|
||||||
Error, PlumeRocket, CONFIG,
|
Error, PlumeRocket, CONFIG,
|
||||||
@ -27,10 +27,10 @@ pub fn create(
|
|||||||
Timeline::add_to_all_timelines(&conn, &post, Kind::Reshare(&user))?;
|
Timeline::add_to_all_timelines(&conn, &post, Kind::Reshare(&user))?;
|
||||||
|
|
||||||
let dest = User::one_by_instance(&conn)?;
|
let dest = User::one_by_instance(&conn)?;
|
||||||
let act = reshare.to_activity(&conn)?;
|
let act = reshare.to_activity07(&conn)?;
|
||||||
rockets
|
rockets
|
||||||
.worker
|
.worker
|
||||||
.execute(move || broadcast(&user, act, dest, CONFIG.proxy().cloned()));
|
.execute(move || broadcast07(&user, act, dest, CONFIG.proxy().cloned()));
|
||||||
} else {
|
} else {
|
||||||
let reshare = Reshare::find_by_user_on_post(&conn, user.id, post.id)?;
|
let reshare = Reshare::find_by_user_on_post(&conn, user.id, post.id)?;
|
||||||
let delete_act = reshare.build_undo07(&conn)?;
|
let delete_act = reshare.build_undo07(&conn)?;
|
||||||
|
Loading…
Reference in New Issue
Block a user