Fix Comment::to_activity()

This commit is contained in:
Kitaiti Makoto 2022-01-09 13:10:54 +09:00
parent 2087a659f9
commit e8153d4b42

View File

@ -16,7 +16,7 @@ use activitypub::{
link, link,
object::{Note, Tombstone}, object::{Note, Tombstone},
}; };
use chrono::{self, NaiveDateTime}; use chrono::{self, NaiveDateTime, TimeZone, Utc};
use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl, SaveChangesDsl}; use diesel::{self, ExpressionMethods, QueryDsl, RunQueryDsl, SaveChangesDsl};
use plume_common::{ use plume_common::{
activity_pub::{ activity_pub::{
@ -59,7 +59,7 @@ impl Comment {
insert!(comments, NewComment, |inserted, conn| { insert!(comments, NewComment, |inserted, conn| {
if inserted.ap_url.is_none() { if inserted.ap_url.is_none() {
inserted.ap_url = Some(format!( inserted.ap_url = Some(format!(
"{}comment/{}", "{}/comment/{}",
inserted.get_post(conn)?.ap_url, inserted.get_post(conn)?.ap_url,
inserted.id inserted.id
)); ));
@ -129,7 +129,7 @@ impl Comment {
|id| Ok(Comment::get(conn, id)?.ap_url.unwrap_or_default()) as Result<String>, |id| Ok(Comment::get(conn, id)?.ap_url.unwrap_or_default()) as Result<String>,
)?))?; )?))?;
note.object_props note.object_props
.set_published_string(chrono::Utc::now().to_rfc3339())?; .set_published_utctime(Utc.from_utc_datetime(&self.creation_date))?;
note.object_props.set_attributed_to_link(author.into_id())?; note.object_props.set_attributed_to_link(author.into_id())?;
note.object_props.set_to_link_vec(to)?; note.object_props.set_to_link_vec(to)?;
note.object_props.set_tag_link_vec( note.object_props.set_tag_link_vec(