@ -3,31 +3,29 @@ use crate::{
post_authors ::* , safe_string ::SafeString , schema ::posts , tags ::* , timeline ::* , users ::User ,
Connection , Error , PostEvent ::* , Result , CONFIG , POST_CHAN ,
} ;
use activity streams ::{
use activity pub ::{
activity ::{ Create , Delete , Update } ,
base ::{ AnyBase , Base } ,
iri_string ::types ::IriString ,
link ::{ self , kind ::MentionType } ,
object ::{ kind ::ImageType , ApObject , Article , AsApObject , Image , ObjectExt , Tombstone } ,
prelude ::* ,
time ::OffsetDateTime ,
link ,
object ::{ Article , Image , Tombstone } ,
CustomObject ,
} ;
use chrono ::{ NaiveDateTime , Utc } ;
use diesel ::{ self , BelongingToDsl , ExpressionMethods , QueryDsl , RunQueryDsl } ;
use chrono ::{ NaiveDateTime , TimeZone , Utc } ;
use diesel ::{ self , BelongingToDsl , ExpressionMethods , QueryDsl , RunQueryDsl , SaveChangesDsl } ;
use heck ::KebabCase ;
use once_cell ::sync ::Lazy ;
use plume_common ::{
activity_pub ::{
inbox ::{ AsActor , AsObject , FromId } ,
sign ::Signer ,
Hashtag , HashtagType , Id , IntoId , Licensed , LicensedArticle , ToAsString , ToAsUri ,
PUBLIC_VISIBILITY ,
inbox ::{ AsObject , FromId } ,
Hashtag , Id , IntoId , Licensed , Source , PUBLIC_VISIBILITY ,
} ,
utils ::{ iri_percent_encode_seg , md_to_html } ,
utils ::md_to_html ,
} ;
use riker ::actors ::{ Publish , Tell } ;
use std ::collections ::{ HashMap , HashSet } ;
use std ::sync ::{ Arc , Mutex } ;
pub type LicensedArticle = CustomObject < Licensed , Article > ;
static BLOG_FQN_CACHE : Lazy < Mutex < HashMap < i32 , String > > > = Lazy ::new ( | | Mutex ::new ( HashMap ::new ( ) ) ) ;
#[ derive(Queryable, Identifiable, Clone, AsChangeset, Debug) ]
@ -69,15 +67,20 @@ impl Post {
find_by ! ( posts , find_by_ap_url , ap_url as & str ) ;
last ! ( posts ) ;
pub fn insert ( conn : & Connection , mut new : NewPost ) -> Result < Self > {
if new . ap_url . is_empty ( ) {
let blog = Blog ::get ( conn , new . blog_id ) ? ;
new . ap_url = Self ::ap_url ( blog , & new . slug ) ;
}
pub fn insert ( conn : & Connection , new : NewPost ) -> Result < Self > {
diesel ::insert_into ( posts ::table )
. values ( new )
. execute ( conn ) ? ;
let post = Self ::last ( conn ) ? ;
let mut post = Self ::last ( conn ) ? ;
if post . ap_url . is_empty ( ) {
post . ap_url = ap_url ( & format! (
"{}/~/{}/{}/" ,
CONFIG . base_url ,
post . get_blog ( conn ) ? . fqn ,
post . slug
) ) ;
let _ : Post = post . save_changes ( conn ) ? ;
}
if post . published {
post . publish_published ( ) ;
@ -91,16 +94,13 @@ impl Post {
let post = Self ::get ( conn , self . id ) ? ;
// TODO: Call publish_published() when newly published
if post . published {
let blog = post . get_blog ( conn ) ;
if blog . is_ok ( ) & & blog . unwrap ( ) . is_local ( ) {
self . publish_updated ( ) ;
}
self . publish_updated ( ) ;
}
Ok ( post )
}
pub fn delete ( & self , conn : & Connection ) -> Result < ( ) > {
for m in Mention ::list_for_post ( conn , self . id ) ? {
for m in Mention ::list_for_post ( & conn , self . id ) ? {
m . delete ( conn ) ? ;
}
diesel ::delete ( self ) . execute ( conn ) ? ;
@ -251,20 +251,6 @@ impl Post {
. map_err ( Error ::from )
}
pub fn ap_url ( blog : Blog , slug : & str ) -> String {
ap_url ( & format! (
"{}/~/{}/{}/" ,
CONFIG . base_url ,
blog . fqn ,
iri_percent_encode_seg ( slug )
) )
}
// It's better to calc slug in insert and update
pub fn slug ( title : & str ) -> & str {
title
}
pub fn get_authors ( & self , conn : & Connection ) -> Result < Vec < User > > {
use crate ::schema ::post_authors ;
use crate ::schema ::users ;
@ -355,92 +341,92 @@ impl Post {
. collect ::< Vec < serde_json ::Value > > ( ) ;
mentions_json . append ( & mut tags_json ) ;
let mut article = A pObject::new ( Article ::new ( ) ) ;
article . ( self . title . clone ( ) ) ;
article . ( self . ap_url . parse::< IriString > ( ) ? ) ;
let mut article = A rticle::default ( ) ;
article . object_props. set_name_string ( self . title . clone ( ) ) ? ;
article . object_props. set_id_string ( self . ap_url . clone( ) ) ? ;
let mut authors = self
. get_authors ( conn ) ?
. into_iter ( )
. filter_ map( | x | x. ap_url . parse ::< IriString > ( ) . ok ( ) )
. collect ::< Vec < I riString > > ( ) ;
authors . push ( self . get_blog ( conn ) ? . ap_url. parse ::< IriString > ( ) ? ) ; // add the blog URL here too
article . set_many_attributed_tos ( authors ) ;
article . set_content ( self . content . get ( ) . clone ( ) ) ;
let source = AnyBase ::from_arbitrary_json ( serde_json ::json ! ( {
"content" : self . source ,
"mediaType" : "text/markdown" ,
} ) ) ? ;
article . set_source( source ) ;
article . set_published (
OffsetDateTime::from_unix_timestamp_nanos ( self . creation_date . timestamp_nanos ( ) . into ( ) )
. expect ( "OffsetDateTime" ) ,
) ;
article . set_summary ( & * self . subtitle ) ;
article . set_many_tags (
mentions_json
. iter ( )
. filter_map ( | mention_json | AnyBase ::from_arbitrary_json ( mention_json ) . ok ( ) ) ,
) ;
. ( | x | Id::new ( x . ap_url ) )
. collect ::< Vec < I d > > ( ) ;
authors . push ( self . get_blog ( conn ) ? . into_id( ) ) ; // add the blog URL here too
article
. object_props
. set_attributed_to_link_vec ::< Id > ( authors ) ? ;
article
. object_props
. set_content_string ( self . content . get ( ) . clone ( ) ) ? ;
article . ap_object_props. set_source_object ( Source {
content : self . source . clone ( ) ,
media_type: String ::from ( "text/markdown" ) ,
} ) ? ;
article
. object_props
. set_published_utctime ( Utc . from_utc_datetime ( & self . creation_date ) ) ? ;
article
. object_props
. set_summary_string ( self . subtitle . clone ( ) ) ? ;
article . object_props . tag = Some ( json ! ( mentions_json ) ) ;
if let Some ( media_id ) = self . cover_id {
let media = Media ::get ( conn , media_id ) ? ;
let mut cover = Image ::new ( ) ;
cover . ( media . url ( ) ? ) ;
let mut cover = Image ::default ( ) ;
cover . object_props. set_url_string ( media . url ( ) ? ) ? ;
if media . sensitive {
cover . set_summary ( media . content_warning . unwrap_or_default ( ) ) ;
cover
. object_props
. set_summary_string ( media . content_warning . unwrap_or_default ( ) ) ? ;
}
cover . set_content ( media . alt_text ) ;
cover . set_many_attributed_tos ( vec! [ User ::get ( conn , media . owner_id ) ?
. ap_url
. parse::< IriString > ( ) ? ] ) ;
article . set_icon( cover . into_any_base ( ) ? ) ;
cover . object_props. set_content_string ( media . alt_text ) ? ;
cover
. object_props
. set_attributed_to_link_vec( vec! [ User ::get ( conn , media . owner_id ) ? . into_id ( ) ] ) ? ;
article . object_props. set_icon_object ( cover ) ? ;
}
article . set_url ( self . ap_url . parse ::< IriString > ( ) ? ) ;
article . set_many_tos (
to . into_iter ( )
. filter_map ( | to | to . parse ::< IriString > ( ) . ok ( ) )
. collect ::< Vec < IriString > > ( ) ,
) ;
article . set_many_ccs (
cc . into_iter ( )
. filter_map ( | cc | cc . parse ::< IriString > ( ) . ok ( ) )
. collect ::< Vec < IriString > > ( ) ,
) ;
let license = Licensed {
license : Some ( self . license . clone ( ) ) ,
} ;
article . object_props . set_url_string ( self . ap_url . clone ( ) ) ? ;
article
. object_props
. set_to_link_vec ::< Id > ( to . into_iter ( ) . map ( Id ::new ) . collect ( ) ) ? ;
article
. object_props
. set_cc_link_vec ::< Id > ( cc . into_iter ( ) . map ( Id ::new ) . collect ( ) ) ? ;
let mut license = Licensed ::default ( ) ;
license . set_license_string ( self . license . clone ( ) ) ? ;
Ok ( LicensedArticle ::new ( article , license ) )
}
pub fn create_activity ( & self , conn : & Connection ) -> Result < Create > {
let article = self . to_activity ( conn ) ? ;
let to = article . to ( ) . ok_or ( Error ::MissingApProperty ) ? . clone ( ) ;
let cc = article . cc ( ) . ok_or ( Error ::MissingApProperty ) ? . clone ( ) ;
let mut act = Create ::new (
self . get_authors ( conn ) ? [ 0 ] . ap_url . parse ::< IriString > ( ) ? ,
Base ::retract ( article ) ? . into_generic ( ) ? ,
) ;
act . set_id ( format! ( "{}/activity" , self . ap_url ) . parse ::< IriString > ( ) ? ) ;
act . set_many_tos ( to ) ;
act . set_many_ccs ( cc ) ;
let mut act = Create ::default ( ) ;
act . object_props
. set_id_string ( format! ( "{}activity" , self . ap_url ) ) ? ;
act . object_props
. set_to_link_vec ::< Id > ( article . object . object_props . to_link_vec ( ) ? ) ? ;
act . object_props
. set_cc_link_vec ::< Id > ( article . object . object_props . cc_link_vec ( ) ? ) ? ;
act . create_props
. set_actor_link ( Id ::new ( self . get_authors ( conn ) ? [ 0 ] . clone ( ) . ap_url ) ) ? ;
act . create_props . set_object_object ( article ) ? ;
Ok ( act )
}
pub fn update_activity ( & self , conn : & Connection ) -> Result < Update > {
let article = self . to_activity ( conn ) ? ;
let to = article . to ( ) . ok_or ( Error ::MissingApProperty ) ? . clone ( ) ;
let cc = article . cc ( ) . ok_or ( Error ::MissingApProperty ) ? . clone ( ) ;
let mut act = Update ::new (
self . get_authors ( conn ) ? [ 0 ] . ap_url . parse ::< IriString > ( ) ? ,
Base ::retract ( article ) ? . into_generic ( ) ? ,
) ;
act . set_id (
format! ( "{}/update-{}" , self . ap_url , Utc ::now ( ) . timestamp ( ) ) . parse ::< IriString > ( ) ? ,
) ;
act . set_many_tos ( to ) ;
act . set_many_ccs ( cc ) ;
let mut act = Update ::default ( ) ;
act . object_props . set_id_string ( format! (
"{}/update-{}" ,
self . ap_url ,
Utc ::now ( ) . timestamp ( )
) ) ? ;
act . object_props
. set_to_link_vec ::< Id > ( article . object . object_props . to_link_vec ( ) ? ) ? ;
act . object_props
. set_cc_link_vec ::< Id > ( article . object . object_props . cc_link_vec ( ) ? ) ? ;
act . update_props
. set_actor_link ( Id ::new ( self . get_authors ( conn ) ? [ 0 ] . clone ( ) . ap_url ) ) ? ;
act . update_props . set_object_object ( article ) ? ;
Ok ( act )
}
@ -449,23 +435,31 @@ impl Post {
. into_iter ( )
. map ( | m | {
(
m . href ( )
. and_then ( | ap_url | User ::find_by_ap_url ( conn , ap_url . as_ref ( ) ) . ok ( ) )
m . link_props
. href_string ( )
. ok ( )
. and_then ( | ap_url | User ::find_by_ap_url ( conn , & ap_url ) . ok ( ) )
. map ( | u | u . id ) ,
m ,
)
} )
. filter_map ( | ( id , m ) | id . map ( | id | ( m , id ) ) )
. filter_map ( | ( id , m ) | {
if let Some ( id ) = id {
Some ( ( m , id ) )
} else {
None
}
} )
. collect ::< Vec < _ > > ( ) ;
let old_mentions = Mention ::list_for_post ( conn , self . id ) ? ;
let old_mentions = Mention ::list_for_post ( & conn , self . id ) ? ;
let old_user_mentioned = old_mentions
. iter ( )
. map ( | m | m . mentioned_id )
. collect ::< HashSet < _ > > ( ) ;
for ( m , id ) in & mentions {
if ! old_user_mentioned . contains ( id ) {
Mention ::from_activity ( & * conn , m , self . id , true , true ) ? ;
if ! old_user_mentioned . contains ( & id ) {
Mention ::from_activity ( & * conn , & m , self . id , true , true ) ? ;
}
}
@ -477,7 +471,7 @@ impl Post {
. iter ( )
. filter ( | m | ! new_mentions . contains ( & m . mentioned_id ) )
{
m . delete ( conn ) ? ;
m . delete ( & conn ) ? ;
}
Ok ( ( ) )
}
@ -485,7 +479,7 @@ impl Post {
pub fn update_tags ( & self , conn : & Connection , tags : Vec < Hashtag > ) -> Result < ( ) > {
let tags_name = tags
. iter ( )
. filter_map ( | t | t . name . as_ref ( ) . map ( | name | name . as_str ( ) . to_string ( ) ) )
. filter_map ( | t | t . name _string( ) . ok ( ) )
. collect ::< HashSet < _ > > ( ) ;
let old_tags = Tag ::for_post ( & * conn , self . id ) ? ;
@ -502,9 +496,8 @@ impl Post {
for t in tags {
if ! t
. name
. as_ref ( )
. map ( | n | old_tags_name . contains ( n . as_str ( ) ) )
. name_string ( )
. map ( | n | old_tags_name . contains ( & n ) )
. unwrap_or ( true )
{
Tag ::from_activity ( conn , & t , self . id , false ) ? ;
@ -522,7 +515,7 @@ impl Post {
pub fn update_hashtags ( & self , conn : & Connection , tags : Vec < Hashtag > ) -> Result < ( ) > {
let tags_name = tags
. iter ( )
. filter_map ( | t | t . name . as_ref ( ) . map ( | name | name . as_str ( ) . to_string ( ) ) )
. filter_map ( | t | t . name _string( ) . ok ( ) )
. collect ::< HashSet < _ > > ( ) ;
let old_tags = Tag ::for_post ( & * conn , self . id ) ? ;
@ -539,9 +532,8 @@ impl Post {
for t in tags {
if ! t
. name
. as_ref ( )
. map ( | n | old_tags_name . contains ( n . as_str ( ) ) )
. name_string ( )
. map ( | n | old_tags_name . contains ( & n ) )
. unwrap_or ( true )
{
Tag ::from_activity ( conn , & t , self . id , true ) ? ;
@ -568,19 +560,18 @@ impl Post {
}
pub fn build_delete ( & self , conn : & Connection ) -> Result < Delete > {
let mut tombstone = Tombstone ::new ( ) ;
tombstone . set_id ( self . ap_url . parse ( ) ? ) ;
let mut act = Delete ::new (
self . get_authors ( conn ) ? [ 0 ]
. clone ( )
. into_id ( )
. parse ::< IriString > ( ) ? ,
Base ::retract ( tombstone ) ? . into_generic ( ) ? ,
) ;
act . set_id ( format! ( "{}#delete" , self . ap_url ) . parse ( ) ? ) ;
act . set_many_tos ( vec! [ PUBLIC_VISIBILITY . parse ::< IriString > ( ) ? ] ) ;
let mut act = Delete ::default ( ) ;
act . delete_props
. set_actor_link ( self . get_authors ( conn ) ? [ 0 ] . clone ( ) . into_id ( ) ) ? ;
let mut tombstone = Tombstone ::default ( ) ;
tombstone . object_props . set_id_string ( self . ap_url . clone ( ) ) ? ;
act . delete_props . set_object_object ( tombstone ) ? ;
act . object_props
. set_id_string ( format! ( "{}#delete" , self . ap_url ) ) ? ;
act . object_props
. set_to_link_vec ( vec! [ Id ::new ( PUBLIC_VISIBILITY ) ] ) ? ;
Ok ( act )
}
@ -624,184 +615,88 @@ impl FromId<DbConn> for Post {
}
fn from_activity ( conn : & DbConn , article : LicensedArticle ) -> Result < Self > {
let license = article . ext_one . license . unwrap_or_default ( ) ;
let article = article . inner ;
let conn = conn ;
let license = article . custom_props . license_string ( ) . unwrap_or_default ( ) ;
let article = article . object ;
let ( blog , authors ) = article
. ap_object_ref ( )
. attributed_to ( )
. ok_or ( Error ::MissingApProperty ) ?
. iter ( )
. object_props
. attributed_to_link_vec ::< Id > ( ) ?
. into_iter ( )
. fold ( ( None , vec! [ ] ) , | ( blog , mut authors ) , link | {
if let Some ( url ) = link . id ( ) {
match User ::from_id ( conn , url . as_str ( ) , None , CONFIG . proxy ( ) ) {
Ok ( u ) = > {
authors . push ( u ) ;
( blog , authors )
}
Err ( _ ) = > (
blog . or_else ( | | {
Blog ::from_id ( conn , url . as_str ( ) , None , CONFIG . proxy ( ) ) . ok ( )
} ) ,
authors ,
) ,
let url = link ;
match User ::from_id ( conn , & url , None , CONFIG . proxy ( ) ) {
Ok ( u ) = > {
authors . push ( u ) ;
( blog , authors )
}
} else {
// logically, url possible to be an object without id proprty like {"type":"Person", "name":"Sally"} but we ignore the case
( blog , authors )
Err ( _ ) = > (
blog . or_else ( | | Blog ::from_id ( conn , & url , None , CONFIG . proxy ( ) ) . ok ( ) ) ,
authors ,
) ,
}
} ) ;
let cover = article . icon ( ) . and_then ( | icon | {
icon . iter ( ) . next ( ) . and_then ( | img | {
let image = img . to_owned ( ) . extend ::< Image , ImageType > ( ) . ok ( ) ? ? ;
Media ::from_activity ( conn , & image ) . ok ( ) . map ( | m | m . id )
} )
} ) ;
let title = article
. name ( )
. and_then ( | name | name . to_as_string ( ) )
. ok_or ( Error ::MissingApProperty ) ? ;
let id = AnyBase ::from_extended ( article . clone ( ) ) // FIXME: Don't clone
let cover = article
. object_props
. icon_object ::< Image > ( )
. ok ( )
. ok_or ( Error ::MissingApProperty ) ?
. id ( )
. map ( | id | id . to_string ( ) ) ;
let ap_url = article
. url ( )
. and_then ( | url | url . to_as_uri ( ) . or ( id ) )
. ok_or ( Error ::MissingApProperty ) ? ;
let source = article
. source ( )
. and_then ( | s | {
serde_json ::to_value ( s ) . ok ( ) . and_then ( | obj | {
if ! obj . is_object ( ) {
return None ;
}
obj . get ( "content" )
. and_then ( | content | content . as_str ( ) . map ( | c | c . to_string ( ) ) )
} )
} )
. unwrap_or_default ( ) ;
let post = Post ::from_db ( conn , & ap_url )
. and_then ( | mut post | {
let mut updated = false ;
let slug = Self ::slug ( & title ) ;
let content = SafeString ::new (
& article
. content ( )
. and_then ( | content | content . to_as_string ( ) )
. ok_or ( Error ::MissingApProperty ) ? ,
) ;
let subtitle = article
. summary ( )
. and_then ( | summary | summary . to_as_string ( ) )
. ok_or ( Error ::MissingApProperty ) ? ;
if post . slug ! = slug {
post . slug = slug . to_string ( ) ;
updated = true ;
}
if post . title ! = title {
post . title = title . clone ( ) ;
updated = true ;
}
if post . content ! = content {
post . content = content ;
updated = true ;
}
if post . license ! = license {
post . license = license . clone ( ) ;
updated = true ;
}
if post . subtitle ! = subtitle {
post . subtitle = subtitle ;
updated = true ;
}
if post . source ! = source {
post . source = source . clone ( ) ;
updated = true ;
}
if post . cover_id ! = cover {
post . cover_id = cover ;
updated = true ;
}
if updated {
post . update ( conn ) ? ;
}
Ok ( post )
} )
. or_else ( | _ | {
Post ::insert (
conn ,
NewPost {
blog_id : blog . ok_or ( Error ::NotFound ) ? . id ,
slug : Self ::slug ( & title ) . to_string ( ) ,
title ,
content : SafeString ::new (
& article
. content ( )
. and_then ( | content | content . to_as_string ( ) )
. ok_or ( Error ::MissingApProperty ) ? ,
) ,
published : true ,
license ,
// FIXME: This is wrong: with this logic, we may use the display URL as the AP ID. We need two different fields
ap_url ,
creation_date : article . published ( ) . map ( | published | {
let timestamp_secs = published . unix_timestamp ( ) ;
let timestamp_nanos = published . unix_timestamp_nanos ( )
- ( timestamp_secs as i128 ) * 1000 i128 * 1000 i128 * 1000 i128 ;
NaiveDateTime ::from_timestamp ( timestamp_secs , timestamp_nanos as u32 )
} ) ,
subtitle : article
. summary ( )
. and_then ( | summary | summary . to_as_string ( ) )
. ok_or ( Error ::MissingApProperty ) ? ,
source ,
cover_id : cover ,
} ,
)
. and_then ( | post | {
for author in authors {
PostAuthor ::insert (
conn ,
NewPostAuthor {
post_id : post . id ,
author_id : author . id ,
} ,
) ? ;
}
. and_then ( | img | Media ::from_activity ( conn , & img ) . ok ( ) . map ( | m | m . id ) ) ;
let title = article . object_props . name_string ( ) ? ;
// TODO: upsert
let post = Post ::insert (
conn ,
NewPost {
blog_id : blog ? . id ,
slug : title . to_kebab_case ( ) ,
title ,
content : SafeString ::new ( & article . object_props . content_string ( ) ? ) ,
published : true ,
license ,
// FIXME: This is wrong: with this logic, we may use the display URL as the AP ID. We need two different fields
ap_url : article
. object_props
. url_string ( )
. or_else ( | _ | article . object_props . id_string ( ) ) ? ,
creation_date : Some ( article . object_props . published_utctime ( ) ? . naive_utc ( ) ) ,
subtitle : article . object_props . summary_string ( ) ? ,
source : article . ap_object_props . source_object ::< Source > ( ) ? . content ,
cover_id : cover ,
} ,
) ? ;
Ok ( post )
} )
} ) ? ;
for author in authors {
PostAuthor ::insert (
conn ,
NewPostAuthor {
post_id : post . id ,
author_id : author . id ,
} ,
) ? ;
}
// save mentions and tags
let mut hashtags = md_to_html ( & post . source , None , false , None )
. 2
. into_iter ( )
. collect ::< HashSet < _ > > ( ) ;
if let Some ( tags ) = article . tag ( ) {
for tag in tags . iter ( ) {
tag . clone ( )
. extend ::< link ::Mention , MentionType > ( ) // FIXME: Don't clone
. map ( | mention | {
mention . map ( | m | Mention ::from_activity ( conn , & m , post . id , true , true ) )
} )
if let Some ( serde_json ::Value ::Array ( tags ) ) = article . object_props . tag {
for tag in tags {
serde_json ::from_value ::< link ::Mention > ( tag . clone ( ) )
. map ( | m | Mention ::from_activity ( conn , & m , post . id , true , true ) )
. ok ( ) ;
tag . clone ( )
. extend ::< Hashtag , HashtagType > ( ) // FIXME: Don't clone
. map ( | hashtag | {
hashtag . and_then ( | t | {
let tag_name = t . name . clone ( ) ? . as_str ( ) . to_string ( ) ;
Tag ::from_activity ( conn , & t , post . id , hashtags . remove ( & tag_name ) ) . ok ( )
} )
serde_json ::from_value ::< Hashtag > ( tag . clone ( ) )
. map_err ( Error ::from )
. and_then ( | t | {
let tag_name = t . name_string ( ) ? ;
Ok ( Tag ::from_activity (
conn ,
& t ,
post . id ,
hashtags . remove ( & tag_name ) ,
) )
} )
. ok ( ) ;
}
@ -811,17 +706,13 @@ impl FromId<DbConn> for Post {
Ok ( post )
}
fn get_sender ( ) -> & ' static dyn Signer {
Instance ::get_local_instance_user ( ) . expect ( "Failed to get local instance user" )
}
}
impl AsObject < User , Create , & DbConn > for Post {
type Error = Error ;
type Output = Self ;
type Output = Post ;
fn activity ( self , _conn : & DbConn , _actor : User , _id : & str ) -> Result < Self ::Outpu > {
fn activity ( self , _conn : & DbConn , _actor : User , _id : & str ) -> Result < Pos > {
// TODO: check that _actor is actually one of the author?
Ok ( self )
}
@ -831,7 +722,7 @@ impl AsObject<User, Delete, &DbConn> for Post {
type Error = Error ;
type Output = ( ) ;
fn activity ( self , conn : & DbConn , actor : User , _id : & str ) -> Result < Self ::Output > {
fn activity ( self , conn : & DbConn , actor : User , _id : & str ) -> Result < ( ) > {
let can_delete = self
. get_authors ( conn ) ?
. into_iter ( )
@ -864,58 +755,27 @@ impl FromId<DbConn> for PostUpdate {
Err ( Error ::NotFound )
}
fn from_activity ( conn : & DbConn , updated : Self ::Object ) -> Result < Self > {
let mut post_update = PostUpdate {
ap_url : updated
. ap_object_ref ( )
. id_unchecked ( )
. ok_or ( Error ::MissingApProperty ) ?
. to_string ( ) ,
title : updated
. ap_object_ref ( )
. name ( )
. and_then ( | name | name . to_as_string ( ) ) ,
subtitle : updated
. ap_object_ref ( )
. summary ( )
. and_then ( | summary | summary . to_as_string ( ) ) ,
content : updated
. ap_object_ref ( )
. content ( )
. and_then ( | content | content . to_as_string ( ) ) ,
cover : None ,
source : updated . source ( ) . and_then ( | s | {
serde_json ::to_value ( s ) . ok ( ) . and_then ( | obj | {
if ! obj . is_object ( ) {
return None ;
}
obj . get ( "content" )
. and_then ( | content | content . as_str ( ) . map ( | c | c . to_string ( ) ) )
} )
} ) ,
license : None ,
tags : updated
. tag ( )
. and_then ( | tags | serde_json ::to_value ( tags ) . ok ( ) ) ,
} ;
post_update . cover = updated . ap_object_ref ( ) . icon ( ) . and_then ( | img | {
img . iter ( )
. next ( )
. and_then ( | img | {
img . clone ( )
. extend ::< Image , ImageType > ( )
. map ( | img | img . and_then ( | img | Media ::from_activity ( conn , & img ) . ok ( ) ) )
. ok ( )
} )
. and_then ( | m | m . map ( | m | m . id ) )
} ) ;
post_update . license = updated . ext_one . license ;
Ok ( post_update )
}
fn get_sender ( ) -> & ' static dyn Signer {
Instance ::get_local_instance_user ( ) . expect ( "Failed to local instance user" )
fn from_activity ( conn : & DbConn , updated : LicensedArticle ) -> Result < Self > {
Ok ( PostUpdate {
ap_url : updated . object . object_props . id_string ( ) ? ,
title : updated . object . object_props . name_string ( ) . ok ( ) ,
subtitle : updated . object . object_props . summary_string ( ) . ok ( ) ,
content : updated . object . object_props . content_string ( ) . ok ( ) ,
cover : updated
. object
. object_props
. icon_object ::< Image > ( )
. ok ( )
. and_then ( | img | Media ::from_activity ( conn , & img ) . ok ( ) . map ( | m | m . id ) ) ,
source : updated
. object
. ap_object_props
. source_object ::< Source > ( )
. ok ( )
. map ( | x | x . content ) ,
license : updated . custom_props . license_string ( ) . ok ( ) ,
tags : updated . object . object_props . tag ,
} )
}
}
@ -933,7 +793,7 @@ impl AsObject<User, Update, &DbConn> for PostUpdate {
}
if let Some ( title ) = self . title {
post . slug = Post::slug ( & title ) . to_string ( ) ;
post . slug = title. to_kebab_case ( ) ;
post . title = title ;
}
@ -971,12 +831,8 @@ impl AsObject<User, Update, &DbConn> for PostUpdate {
serde_json ::from_value ::< Hashtag > ( tag . clone ( ) )
. map_err ( Error ::from )
. and_then ( | t | {
let tag_name = t . name . as_ref ( ) . ok_or ( Error ::MissingApProperty ) ? ;
let tag_name_str = tag_name
. as_xsd_string ( )
. or_else ( | | tag_name . as_rdf_lang_string ( ) . map ( | rls | & * rls . value ) )
. ok_or ( Error ::MissingApProperty ) ? ;
if txt_hashtags . remove ( tag_name_str ) {
let tag_name = t . name_string ( ) ? ;
if txt_hashtags . remove ( & tag_name ) {
hashtags . push ( t ) ;
} else {
tags . push ( t ) ;
@ -1024,28 +880,9 @@ impl From<PostEvent> for Arc<Post> {
mod tests {
use super ::* ;
use crate ::inbox ::{ inbox , tests ::fill_database , InboxResult } ;
use crate ::mentions ::{ Mention , NewMention } ;
use crate ::safe_string ::SafeString ;
use crate ::tests ::{ db , format_datetime } ;
use assert_json_diff ::assert_json_eq ;
use crate ::tests ::db ;
use diesel ::Connection ;
use serde_json ::{ json , to_value } ;
fn prepare_activity ( conn : & DbConn ) -> ( Post , Mention , Vec < Post > , Vec < User > , Vec < Blog > ) {
let ( posts , users , blogs ) = fill_database ( conn ) ;
let post = & posts [ 0 ] ;
let mentioned = & users [ 1 ] ;
let mention = Mention ::insert (
& conn ,
NewMention {
mentioned_id : mentioned . id ,
post_id : Some ( post . id ) ,
comment_id : None ,
} ,
)
. unwrap ( ) ;
( post . to_owned ( ) , mention . to_owned ( ) , posts , users , blogs )
}
// creates a post, get it's Create activity, delete the post,
// "send" the Create to the inbox, and check it works
@ -1098,177 +935,45 @@ mod tests {
}
#[ test ]
fn to_activity ( ) {
let conn = db ( ) ;
conn . test_transaction ::< _ , Error , _ > ( | | {
let ( post , _mention , _posts , _users , _blogs ) = prepare_activity ( & conn ) ;
let act = post . to_activity ( & conn ) ? ;
let expected = json ! ( {
"attributedTo" : [ "https://plu.me/@/admin/" , "https://plu.me/~/BlogName/" ] ,
"cc" : [ ] ,
"content" : "Hello" ,
"id" : "https://plu.me/~/BlogName/testing" ,
"license" : "WTFPL" ,
"name" : "Testing" ,
"published" : format_datetime ( & post . creation_date ) ,
"source" : {
"content" : "Hello" ,
"mediaType" : "text/markdown"
} ,
"summary" : "Bye" ,
"tag" : [
{
"href" : "https://plu.me/@/user/" ,
"name" : "@user" ,
"type" : "Mention"
}
] ,
"to" : [ "https://www.w3.org/ns/activitystreams#Public" ] ,
"type" : "Article" ,
"url" : "https://plu.me/~/BlogName/testing"
} ) ;
assert_json_eq ! ( to_value ( act ) ? , expected ) ;
Ok ( ( ) )
} ) ;
}
#[ test ]
fn create_activity ( ) {
let conn = db ( ) ;
conn . test_transaction ::< _ , Error , _ > ( | | {
let ( post , _mention , _posts , _users , _blogs ) = prepare_activity ( & conn ) ;
let act = post . create_activity ( & conn ) ? ;
let expected = json ! ( {
"actor" : "https://plu.me/@/admin/" ,
"cc" : [ ] ,
"id" : "https://plu.me/~/BlogName/testing/activity" ,
"object" : {
"attributedTo" : [ "https://plu.me/@/admin/" , "https://plu.me/~/BlogName/" ] ,
"cc" : [ ] ,
"content" : "Hello" ,
"id" : "https://plu.me/~/BlogName/testing" ,
"license" : "WTFPL" ,
"name" : "Testing" ,
"published" : format_datetime ( & post . creation_date ) ,
"source" : {
"content" : "Hello" ,
"mediaType" : "text/markdown"
} ,
"summary" : "Bye" ,
"tag" : [
{
"href" : "https://plu.me/@/user/" ,
"name" : "@user" ,
"type" : "Mention"
}
] ,
"to" : [ "https://www.w3.org/ns/activitystreams#Public" ] ,
"type" : "Article" ,
"url" : "https://plu.me/~/BlogName/testing"
} ,
"to" : [ "https://www.w3.org/ns/activitystreams#Public" ] ,
"type" : "Create"
} ) ;
assert_json_eq ! ( to_value ( act ) ? , expected ) ;
Ok ( ( ) )
} ) ;
}
#[ test ]
fn update_activity ( ) {
let conn = db ( ) ;
conn . test_transaction ::< _ , Error , _ > ( | | {
let ( post , _mention , _posts , _users , _blogs ) = prepare_activity ( & conn ) ;
let act = post . update_activity ( & conn ) ? ;
let expected = json ! ( {
"actor" : "https://plu.me/@/admin/" ,
"cc" : [ ] ,
"id" : "https://plu.me/~/BlogName/testing/update-" ,
"object" : {
"attributedTo" : [ "https://plu.me/@/admin/" , "https://plu.me/~/BlogName/" ] ,
"cc" : [ ] ,
"content" : "Hello" ,
"id" : "https://plu.me/~/BlogName/testing" ,
"license" : "WTFPL" ,
"name" : "Testing" ,
"published" : format_datetime ( & post . creation_date ) ,
"source" : {
"content" : "Hello" ,
"mediaType" : "text/markdown"
} ,
"summary" : "Bye" ,
"tag" : [
{
"href" : "https://plu.me/@/user/" ,
"name" : "@user" ,
"type" : "Mention"
}
] ,
"to" : [ "https://www.w3.org/ns/activitystreams#Public" ] ,
"type" : "Article" ,
"url" : "https://plu.me/~/BlogName/testing"
} ,
"to" : [ "https://www.w3.org/ns/activitystreams#Public" ] ,
"type" : "Update"
} ) ;
let actual = to_value ( act ) ? ;
let id = actual [ "id" ] . to_string ( ) ;
let ( id_pre , id_post ) = id . rsplit_once ( "-" ) . unwrap ( ) ;
assert_eq! ( post . ap_url , "https://plu.me/~/BlogName/testing" ) ;
assert_eq! (
id_pre ,
to_value ( "\"https://plu.me/~/BlogName/testing/update" )
. unwrap ( )
. as_str ( )
. unwrap ( )
) ;
assert_eq! ( id_post . len ( ) , 11 ) ;
assert_eq! (
id_post . matches ( char ::is_numeric ) . collect ::< String > ( ) . len ( ) ,
10
) ;
for ( key , value ) in actual . as_object ( ) . unwrap ( ) . into_iter ( ) {
if key = = "id" {
continue ;
}
assert_json_eq ! ( value , expected . get ( key ) . unwrap ( ) ) ;
}
Ok ( ( ) )
} ) ;
fn licensed_article_serde ( ) {
let mut article = Article ::default ( ) ;
article . object_props . set_id_string ( "Yo" . into ( ) ) . unwrap ( ) ;
let mut license = Licensed ::default ( ) ;
license . set_license_string ( "WTFPL" . into ( ) ) . unwrap ( ) ;
let full_article = LicensedArticle ::new ( article , license ) ;
let json = serde_json ::to_value ( full_article ) . unwrap ( ) ;
let article_from_json : LicensedArticle = serde_json ::from_value ( json ) . unwrap ( ) ;
assert_eq! (
"Yo" ,
& article_from_json . object . object_props . id_string ( ) . unwrap ( )
) ;
assert_eq! (
"WTFPL" ,
& article_from_json . custom_props . license_string ( ) . unwrap ( )
) ;
}
#[ test ]
fn build_delete ( ) {
let conn = db ( ) ;
conn . test_transaction ::< _ , Error , _ > ( | | {
let ( post , _mention , _posts , _users , _blogs ) = prepare_activity ( & conn ) ;
let act = post . build_delete ( & conn ) ? ;
let expected = json ! ( {
"actor" : "https://plu.me/@/admin/" ,
"id" : "https://plu.me/~/BlogName/testing#delete" ,
"object" : {
"id" : "https://plu.me/~/BlogName/testing" ,
"type" : "Tombstone"
} ,
"to" : [
"https://www.w3.org/ns/activitystreams#Public"
] ,
"type" : "Delete"
} ) ;
assert_json_eq ! ( to_value ( act ) ? , expected ) ;
Ok ( ( ) )
fn licensed_article_deserialization ( ) {
let json = json ! ( {
"type" : "Article" ,
"id" : "https://plu.me/~/Blog/my-article" ,
"attributedTo" : [ "https://plu.me/@/Admin" , "https://plu.me/~/Blog" ] ,
"content" : "Hello." ,
"name" : "My Article" ,
"summary" : "Bye." ,
"source" : {
"content" : "Hello." ,
"mediaType" : "text/markdown"
} ,
"published" : "2014-12-12T12:12:12Z" ,
"to" : [ plume_common ::activity_pub ::PUBLIC_VISIBILITY ]
} ) ;
let article : LicensedArticle = serde_json ::from_value ( json ) . unwrap ( ) ;
assert_eq! (
"https://plu.me/~/Blog/my-article" ,
& article . object . object_props . id_string ( ) . unwrap ( )
) ;
}
}
Trinity Pointard