diff --git a/plume-models/src/posts.rs b/plume-models/src/posts.rs index c6206e65..647d3c02 100644 --- a/plume-models/src/posts.rs +++ b/plume-models/src/posts.rs @@ -3,7 +3,6 @@ use crate::{ post_authors::*, safe_string::SafeString, schema::posts, tags::*, timeline::*, users::User, Connection, Error, PostEvent::*, Result, CONFIG, POST_CHAN, }; -use activitypub::{object::Article, CustomObject}; use activitystreams::{ activity::{Create as Create07, Delete as Delete07, Update as Update07}, base::{AnyBase, Base}, @@ -23,9 +22,8 @@ use plume_common::{ activity_pub::{ inbox::{AsActor, AsObject, FromId}, sign::Signer, - Hashtag, HashtagType, Id, IntoId, Licensed, Licensed07, - LicensedArticle as LicensedArticle07, Source, SourceProperty, ToAsString, ToAsUri, - PUBLIC_VISIBILITY, + Hashtag, HashtagType, Id, IntoId, Licensed07, LicensedArticle as LicensedArticle07, Source, + SourceProperty, ToAsString, ToAsUri, PUBLIC_VISIBILITY, }, utils::{iri_percent_encode_seg, md_to_html}, }; @@ -33,8 +31,6 @@ use riker::actors::{Publish, Tell}; use std::collections::{HashMap, HashSet}; use std::sync::{Arc, Mutex}; -pub type LicensedArticle = CustomObject; - static BLOG_FQN_CACHE: Lazy>> = Lazy::new(|| Mutex::new(HashMap::new())); #[derive(Queryable, Identifiable, Clone, AsChangeset, Debug)] @@ -1091,49 +1087,6 @@ mod tests { }); } - #[test] - 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 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() - ); - } - #[test] fn to_activity07() { let conn = db();