From 54f6e7dfc62af86a17aca389351395a54ba49571 Mon Sep 17 00:00:00 2001 From: Bat Date: Sun, 9 Sep 2018 16:08:53 +0100 Subject: [PATCH] Use a more classical flow for creating comments Don't locally federate them anymore It allows us to have them fetched later too --- plume-models/src/comments.rs | 119 ++++++++++++++--------------------- plume-models/src/lib.rs | 14 ----- src/main.rs | 1 + src/routes/comments.rs | 38 +++++++---- 4 files changed, 75 insertions(+), 97 deletions(-) diff --git a/plume-models/src/comments.rs b/plume-models/src/comments.rs index 5f14dec1..e4baf5ed 100644 --- a/plume-models/src/comments.rs +++ b/plume-models/src/comments.rs @@ -12,7 +12,7 @@ use plume_common::activity_pub::{ inbox::{FromActivity, Notify} }; use plume_common::utils; -use {get_next_id, ap_url}; +use ap_url; use instance::Instance; use mentions::Mention; use notifications::*; @@ -83,8 +83,54 @@ impl Comment { json } + pub fn update_ap_url(&self, conn: &PgConnection) -> Comment { + if self.ap_url.is_none() { + diesel::update(self) + .set(comments::ap_url.eq(self.compute_id(conn))) + .get_result(conn) + .expect("Failed to update comment AP URL") + } else { + self.clone() + } + } + pub fn compute_id(&self, conn: &PgConnection) -> String { - ap_url(format!("{}#comment-{}", self.get_post(conn).ap_url, self.id)) + ap_url(format!("{}comment/{}", self.get_post(conn).ap_url, self.id)) + } + + pub fn into_activity(&self, conn: &PgConnection) -> Note { + let (html, mentions) = utils::md_to_html(self.content.get().as_ref()); + + let author = User::get(conn, self.author_id).unwrap(); + let mut note = Note::default(); + let to = vec![Id::new(PUBLIC_VISIBILTY.to_string())]; + + note.object_props.set_id_string(self.ap_url.clone().unwrap_or(String::new())).expect("NewComment::create: note.id error"); + note.object_props.set_summary_string(self.spoiler_text.clone()).expect("NewComment::create: note.summary error"); + note.object_props.set_content_string(html).expect("NewComment::create: note.content error"); + note.object_props.set_in_reply_to_link(Id::new(self.in_response_to_id.map_or_else(|| Post::get(conn, self.post_id).unwrap().ap_url, |id| { + let comm = Comment::get(conn, id).unwrap(); + comm.ap_url.clone().unwrap_or(comm.compute_id(conn)) + }))).expect("NewComment::create: note.in_reply_to error"); + note.object_props.set_published_string(chrono::Utc::now().to_rfc3339()).expect("NewComment::create: note.published error"); + note.object_props.set_attributed_to_link(author.clone().into_id()).expect("NewComment::create: note.attributed_to error"); + note.object_props.set_to_link_vec(to.clone()).expect("NewComment::create: note.to error"); + note.object_props.set_tag_link_vec(mentions.into_iter().map(|m| Mention::build_activity(conn, m)).collect::>()) + .expect("NewComment::create: note.tag error"); + note + } + + pub fn create_activity(&self, conn: &PgConnection) -> Create { + let author = User::get(conn, self.author_id).unwrap(); + + let note = self.into_activity(conn); + let mut act = Create::default(); + act.create_props.set_actor_link(author.into_id()).expect("NewComment::create_acitivity: actor error"); + act.create_props.set_object_object(note.clone()).expect("NewComment::create_acitivity: object error"); + act.object_props.set_id_string(format!("{}/activity", self.ap_url.clone().unwrap())).expect("NewComment::create_acitivity: id error"); + act.object_props.set_to_link_vec(note.object_props.to_link_vec::().expect("WTF")).expect("NewComment::create_acitivity: to error"); + act.object_props.set_cc_link_vec::(vec![]).expect("NewComment::create_acitivity: cc error"); + act } } @@ -133,72 +179,3 @@ impl Notify for Comment { } } } - -impl NewComment { - pub fn build() -> Self { - NewComment::default() - } - - pub fn content>(mut self, val: T) -> Self { - self.content = SafeString::new(val.as_ref()); - self - } - - pub fn in_response_to_id(mut self, val: Option) -> Self { - self.in_response_to_id = val; - self - } - - pub fn post(mut self, post: Post) -> Self { - self.post_id = post.id; - self - } - - pub fn author(mut self, author: User) -> Self { - self.author_id = author.id; - self - } - - pub fn create(mut self, conn: &PgConnection) -> (Create, i32) { - let post = Post::get(conn, self.post_id).unwrap(); - // We have to manually compute it since the new comment haven't been inserted yet, and it needs the activity we are building to be created - let next_id = get_next_id(conn, "comments_id_seq"); - self.ap_url = Some(format!("{}#comment-{}", post.ap_url, next_id)); - self.sensitive = false; - self.spoiler_text = String::new(); - - let (html, mentions) = utils::md_to_html(self.content.get().as_ref()); - - let author = User::get(conn, self.author_id).unwrap(); - let mut note = Note::default(); - let mut to = author.get_followers(conn).into_iter().map(User::into_id).collect::>(); - to.append(&mut post - .get_authors(conn) - .into_iter() - .flat_map(|a| a.get_followers(conn)) - .map(User::into_id) - .collect::>()); - to.push(Id::new(PUBLIC_VISIBILTY.to_string())); - - note.object_props.set_id_string(self.ap_url.clone().unwrap_or(String::new())).expect("NewComment::create: note.id error"); - note.object_props.set_summary_string(self.spoiler_text.clone()).expect("NewComment::create: note.summary error"); - note.object_props.set_content_string(html).expect("NewComment::create: note.content error"); - note.object_props.set_in_reply_to_link(Id::new(self.in_response_to_id.map_or_else(|| Post::get(conn, self.post_id).unwrap().ap_url, |id| { - let comm = Comment::get(conn, id).unwrap(); - comm.ap_url.clone().unwrap_or(comm.compute_id(conn)) - }))).expect("NewComment::create: note.in_reply_to error"); - note.object_props.set_published_string(chrono::Utc::now().to_rfc3339()).expect("NewComment::create: note.published error"); - note.object_props.set_attributed_to_link(author.clone().into_id()).expect("NewComment::create: note.attributed_to error"); - note.object_props.set_to_link_vec(to.clone()).expect("NewComment::create: note.to error"); - note.object_props.set_tag_link_vec(mentions.into_iter().map(|m| Mention::build_activity(conn, m)).collect::>()) - .expect("NewComment::create: note.tag error"); - - let mut act = Create::default(); - act.create_props.set_actor_link(author.into_id()).expect("NewComment::create: actor error"); - act.create_props.set_object_object(note).expect("NewComment::create: object error"); - act.object_props.set_id_string(format!("{}/activity", self.ap_url.clone().unwrap())).expect("NewComment::create: id error"); - act.object_props.set_to_link_vec(to).expect("NewComment::create: to error"); - act.object_props.set_cc_link_vec::(vec![]).expect("NewComment::create: cc error"); - (act, next_id) - } -} diff --git a/plume-models/src/lib.rs b/plume-models/src/lib.rs index dbf1f730..c44dfa58 100644 --- a/plume-models/src/lib.rs +++ b/plume-models/src/lib.rs @@ -21,7 +21,6 @@ extern crate serde_json; extern crate url; extern crate webfinger; -use diesel::{PgConnection, RunQueryDsl, select}; use std::env; macro_rules! find_by { @@ -84,19 +83,6 @@ macro_rules! update { }; } -sql_function!(nextval, nextval_t, (seq: ::diesel::sql_types::Text) -> ::diesel::sql_types::BigInt); -sql_function!(setval, setval_t, (seq: ::diesel::sql_types::Text, val: ::diesel::sql_types::BigInt) -> ::diesel::sql_types::BigInt); - -fn get_next_id(conn: &PgConnection, seq: &str) -> i32 { - // We cant' use currval because it may fail if nextval have never been called before - let next = select(nextval(seq)).get_result::(conn).expect("Next ID fail"); - if next > 1 { - select(setval(seq, next - 1)).get_result::(conn).expect("Reset ID fail"); - } - next as i32 -} - - lazy_static! { pub static ref BASE_URL: String = env::var("BASE_URL") .unwrap_or(format!("127.0.0.1:{}", env::var("ROCKET_PORT").unwrap_or(String::from("8000")))); diff --git a/src/main.rs b/src/main.rs index 01cfdf62..4b74a582 100644 --- a/src/main.rs +++ b/src/main.rs @@ -55,6 +55,7 @@ fn main() { routes::blogs::atom_feed, routes::comments::create, + routes::comments::activity_pub, routes::instance::index, routes::instance::paginated_local, diff --git a/src/routes/comments.rs b/src/routes/comments.rs index e74d6960..17d49828 100644 --- a/src/routes/comments.rs +++ b/src/routes/comments.rs @@ -1,3 +1,4 @@ +use activitypub::object::Note; use rocket::{ State, request::LenientForm, @@ -8,16 +9,16 @@ use serde_json; use validator::Validate; use workerpool::{Pool, thunk::*}; -use plume_common::activity_pub::broadcast; +use plume_common::{utils, activity_pub::{broadcast, ApRequest, ActivityStream}}; use plume_models::{ blogs::Blog, comments::*, db_conn::DbConn, - instance::Instance, + mentions::Mention, posts::Post, + safe_string::SafeString, users::User }; -use inbox::Inbox; #[derive(FromForm, Debug, Validate)] struct NewCommentForm { @@ -33,16 +34,24 @@ fn create(blog_name: String, slug: String, data: LenientForm, us let form = data.get(); form.validate() .map(|_| { - let (new_comment, _) = NewComment::build() - .content(form.content.clone()) - .in_response_to_id(form.responding_to.clone()) - .post(post.clone()) - .author(user.clone()) - .create(&*conn); + let (html, mentions) = utils::md_to_html(form.content.as_ref()); + let comm = Comment::insert(&*conn, NewComment { + content: SafeString::new(html.as_ref()), + in_response_to_id: form.responding_to.clone(), + post_id: post.id, + author_id: user.id, + ap_url: None, + sensitive: false, + spoiler_text: String::new() + }).update_ap_url(&*conn); + let new_comment = comm.create_activity(&*conn); - let instance = Instance::get_local(&*conn).unwrap(); - instance.received(&*conn, serde_json::to_value(new_comment.clone()).expect("JSON serialization error")) - .expect("We are not compatible with ourselve: local broadcast failed (new comment)"); + // save mentions + for ment in mentions { + Mention::from_activity(&*conn, Mention::build_activity(&*conn, ment), post.id, true, true); + } + + // federate let dest = User::one_by_instance(&*conn); let user_clone = user.clone(); worker.execute(Thunk::of(move || broadcast(&user_clone, new_comment, dest))); @@ -71,3 +80,8 @@ fn create(blog_name: String, slug: String, data: LenientForm, us })) }) } + +#[get("/~/<_blog>/<_slug>/comment/")] +fn activity_pub(_blog: String, _slug: String, id: i32, _ap: ApRequest, conn: DbConn) -> Option> { + Comment::get(&*conn, id).map(|c| ActivityStream::new(c.into_activity(&*conn))) +}