mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-09-25 21:10:15 +00:00
5d837780f5
* Moving settings to Database. - Moves many settings into the database. Fixes #2285 - Adds a local_site and instance table. Fixes #2365 . Fixes #2368 - Separates SQL update an insert forms, to avoid runtime errors. - Adds TypedBuilder to all the SQL forms, instead of default. * Fix weird clippy issue. * Removing extra lines. * Some fixes from suggestions. * Fixing apub tests. * Using instance creation helper function. * Move forms to their own line. * Trying to fix local_site_data, still broken. * Testing out async * Testing out async 2 * Fixing federation tests. * Trying to fix check features 1. * Starting on adding diesel async. 1/4th done. * Added async to views and schema. * Adding some more async * Compiling now. * Added diesel async. Fixes #2465 * Running clippy --fix * Trying to fix cargo test on drone. * Trying new muslrust. * Trying a custom dns * Trying a custom dns 2 * Trying a custom dns 3 * Trying a custom dns 4 * Trying a custom dns 5 * Trying a custom dns 6 * Trying a custom dns 7 * Addressing PR comments. * Adding check_apub to all verify functions. * Reverting back drone. * Fixing merge * Fix docker images. * Adding missing discussion_languages. * Trying to fix federation tests. * Fix site setup user creation. * Fix clippy * Fix clippy 2 * Test api faster * Try to fix 1 * Try to fix 2 * What are these lines about * Trying to fix 3 * Moving federation test back to top. * Remove logging cat.
77 lines
2.4 KiB
Rust
77 lines
2.4 KiB
Rust
use crate::{
|
|
fetcher::post_or_comment::PostOrComment,
|
|
local_instance,
|
|
mentions::MentionOrValue,
|
|
objects::{comment::ApubComment, person::ApubPerson, post::ApubPost},
|
|
protocol::{objects::LanguageTag, 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_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>,
|
|
// lemmy extension
|
|
pub(crate) distinguished: Option<bool>,
|
|
pub(crate) language: Option<LanguageTag>,
|
|
}
|
|
|
|
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).await, 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 = Post::read(context.pool(), post_id).await?;
|
|
let comment = c.deref().to_owned();
|
|
Ok((post.into(), Some(comment)))
|
|
}
|
|
}
|
|
}
|
|
}
|