mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-06-01 18:52:27 +00:00
9c3efe32e7
* First pass at adding comment trees. - Extracted comment replies into its own table. - Added ltree column to comment - Added parent_id param to GetComments to fetch a tree branch - No paging / limiting yet * Adding child_count to comment_aggregates. * Adding parent comment update counts * Fix unit tests. * Comment tree paging mostly done. * Fix clippy * Fix drone tests wrong postgres version. * Fix unit tests. * Add back in delete in unit test. * Add postgres upgrade script. * Fixing some PR comments. * Move update ltree into Comment::create * Updating based on comments. * Fix send soft fail.
76 lines
2.3 KiB
Rust
76 lines
2.3 KiB
Rust
use crate::{
|
|
fetcher::post_or_comment::PostOrComment,
|
|
local_instance,
|
|
mentions::MentionOrValue,
|
|
objects::{comment::ApubComment, person::ApubPerson, post::ApubPost},
|
|
protocol::Source,
|
|
};
|
|
use activitypub_federation::{
|
|
core::object_id::ObjectId,
|
|
deser::{
|
|
helpers::{deserialize_one_or_many, deserialize_skip_error},
|
|
values::MediaTypeMarkdownOrHtml,
|
|
},
|
|
};
|
|
use activitystreams_kinds::object::NoteType;
|
|
use chrono::{DateTime, FixedOffset};
|
|
use lemmy_api_common::utils::blocking;
|
|
use lemmy_db_schema::{source::post::Post, traits::Crud};
|
|
use lemmy_utils::error::LemmyError;
|
|
use lemmy_websocket::LemmyContext;
|
|
use serde::{Deserialize, Serialize};
|
|
use serde_with::skip_serializing_none;
|
|
use std::ops::Deref;
|
|
use url::Url;
|
|
|
|
#[skip_serializing_none]
|
|
#[derive(Clone, Debug, Deserialize, Serialize)]
|
|
#[serde(rename_all = "camelCase")]
|
|
pub struct Note {
|
|
pub(crate) r#type: NoteType,
|
|
pub(crate) id: ObjectId<ApubComment>,
|
|
pub(crate) attributed_to: ObjectId<ApubPerson>,
|
|
#[serde(deserialize_with = "deserialize_one_or_many")]
|
|
pub(crate) to: Vec<Url>,
|
|
#[serde(deserialize_with = "deserialize_one_or_many", default)]
|
|
pub(crate) cc: Vec<Url>,
|
|
pub(crate) content: String,
|
|
pub(crate) in_reply_to: ObjectId<PostOrComment>,
|
|
|
|
pub(crate) media_type: Option<MediaTypeMarkdownOrHtml>,
|
|
#[serde(deserialize_with = "deserialize_skip_error", default)]
|
|
pub(crate) source: Option<Source>,
|
|
pub(crate) published: Option<DateTime<FixedOffset>>,
|
|
pub(crate) updated: Option<DateTime<FixedOffset>>,
|
|
#[serde(default)]
|
|
pub(crate) tag: Vec<MentionOrValue>,
|
|
}
|
|
|
|
impl Note {
|
|
pub(crate) async fn get_parents(
|
|
&self,
|
|
context: &LemmyContext,
|
|
request_counter: &mut i32,
|
|
) -> Result<(ApubPost, Option<ApubComment>), LemmyError> {
|
|
// Fetch parent comment chain in a box, otherwise it can cause a stack overflow.
|
|
let parent = Box::pin(
|
|
self
|
|
.in_reply_to
|
|
.dereference(context, local_instance(context), request_counter)
|
|
.await?,
|
|
);
|
|
match parent.deref() {
|
|
PostOrComment::Post(p) => {
|
|
let post = p.deref().to_owned();
|
|
Ok((post, None))
|
|
}
|
|
PostOrComment::Comment(c) => {
|
|
let post_id = c.post_id;
|
|
let post = blocking(context.pool(), move |conn| Post::read(conn, post_id)).await??;
|
|
let comment = c.deref().to_owned();
|
|
Ok((post.into(), Some(comment)))
|
|
}
|
|
}
|
|
}
|
|
}
|