mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-06-02 06:00:32 +00:00
35cbae61bc
* Respond directly with LemmyError Instrument Perform implementations for more precise traces Use ApiError to format JSON errors when messages are present Keep SpanTrace output in LemmyError Display impl * Hide SpanTrace debug output from LemmyError * Don't log when entering spans, only when leaving * Update actix-web * Update actix-rt * Add newline after error info in LemmyError Display impl * Propogate span information to blocking operations * Instrument apub functions * Use skip_all for more instrument attributes, don't skip 'self' in some api actions * Make message a static string * Send proper JSON over websocket * Add 'message' to LemmyError display if present * Use a quieter root span builder, don't pretty-print logs * Keep passwords and emails out of logs * Re-enable logging Login * Instrument feeds * Emit our own errors * Move error log after status code recording * Make Sensitive generic over the inner type * Remove line that logged secrets
105 lines
2.7 KiB
Rust
105 lines
2.7 KiB
Rust
use crate::{
|
|
objects::{comment::ApubComment, post::ApubPost},
|
|
protocol::objects::{note::Note, page::Page},
|
|
};
|
|
use chrono::NaiveDateTime;
|
|
use lemmy_apub_lib::traits::ApubObject;
|
|
use lemmy_utils::LemmyError;
|
|
use lemmy_websocket::LemmyContext;
|
|
use serde::Deserialize;
|
|
use url::Url;
|
|
|
|
#[derive(Clone, Debug)]
|
|
pub enum PostOrComment {
|
|
Post(Box<ApubPost>),
|
|
Comment(Box<ApubComment>),
|
|
}
|
|
|
|
#[derive(Deserialize)]
|
|
#[serde(untagged)]
|
|
pub enum PageOrNote {
|
|
Page(Page),
|
|
Note(Note),
|
|
}
|
|
|
|
#[async_trait::async_trait(?Send)]
|
|
impl ApubObject for PostOrComment {
|
|
type DataType = LemmyContext;
|
|
type ApubType = PageOrNote;
|
|
type TombstoneType = ();
|
|
|
|
fn last_refreshed_at(&self) -> Option<NaiveDateTime> {
|
|
None
|
|
}
|
|
|
|
// TODO: this can probably be implemented using a single sql query
|
|
#[tracing::instrument(skip_all)]
|
|
async fn read_from_apub_id(
|
|
object_id: Url,
|
|
data: &Self::DataType,
|
|
) -> Result<Option<Self>, LemmyError> {
|
|
let post = ApubPost::read_from_apub_id(object_id.clone(), data).await?;
|
|
Ok(match post {
|
|
Some(o) => Some(PostOrComment::Post(Box::new(o))),
|
|
None => ApubComment::read_from_apub_id(object_id, data)
|
|
.await?
|
|
.map(|c| PostOrComment::Comment(Box::new(c))),
|
|
})
|
|
}
|
|
|
|
#[tracing::instrument(skip_all)]
|
|
async fn delete(self, data: &Self::DataType) -> Result<(), LemmyError> {
|
|
match self {
|
|
PostOrComment::Post(p) => p.delete(data).await,
|
|
PostOrComment::Comment(c) => c.delete(data).await,
|
|
}
|
|
}
|
|
|
|
async fn into_apub(self, _data: &Self::DataType) -> Result<Self::ApubType, LemmyError> {
|
|
unimplemented!()
|
|
}
|
|
|
|
fn to_tombstone(&self) -> Result<Self::TombstoneType, LemmyError> {
|
|
unimplemented!()
|
|
}
|
|
|
|
#[tracing::instrument(skip_all)]
|
|
async fn verify(
|
|
apub: &Self::ApubType,
|
|
expected_domain: &Url,
|
|
data: &Self::DataType,
|
|
request_counter: &mut i32,
|
|
) -> Result<(), LemmyError> {
|
|
match apub {
|
|
PageOrNote::Page(a) => ApubPost::verify(a, expected_domain, data, request_counter).await,
|
|
PageOrNote::Note(a) => ApubComment::verify(a, expected_domain, data, request_counter).await,
|
|
}
|
|
}
|
|
|
|
#[tracing::instrument(skip_all)]
|
|
async fn from_apub(
|
|
apub: PageOrNote,
|
|
context: &LemmyContext,
|
|
request_counter: &mut i32,
|
|
) -> Result<Self, LemmyError> {
|
|
Ok(match apub {
|
|
PageOrNote::Page(p) => PostOrComment::Post(Box::new(
|
|
ApubPost::from_apub(p, context, request_counter).await?,
|
|
)),
|
|
PageOrNote::Note(n) => PostOrComment::Comment(Box::new(
|
|
ApubComment::from_apub(n, context, request_counter).await?,
|
|
)),
|
|
})
|
|
}
|
|
}
|
|
|
|
impl PostOrComment {
|
|
pub(crate) fn ap_id(&self) -> Url {
|
|
match self {
|
|
PostOrComment::Post(p) => p.ap_id.clone(),
|
|
PostOrComment::Comment(c) => c.ap_id.clone(),
|
|
}
|
|
.into()
|
|
}
|
|
}
|