mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-11-19 19:01:19 +00:00
Riley
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
111 lines
3.5 KiB
Rust
111 lines
3.5 KiB
Rust
use crate::{
|
|
fetcher::webfinger::webfinger_resolve_actor,
|
|
objects::{comment::ApubComment, community::ApubCommunity, person::ApubPerson},
|
|
};
|
|
use activitystreams_kinds::link::MentionType;
|
|
use lemmy_api_common::blocking;
|
|
use lemmy_apub_lib::{object_id::ObjectId, traits::ActorType};
|
|
use lemmy_db_schema::{
|
|
source::{comment::Comment, person::Person, post::Post},
|
|
traits::Crud,
|
|
DbPool,
|
|
};
|
|
use lemmy_utils::{
|
|
utils::{scrape_text_for_mentions, MentionData},
|
|
LemmyError,
|
|
};
|
|
use lemmy_websocket::LemmyContext;
|
|
use serde::{Deserialize, Serialize};
|
|
use url::Url;
|
|
|
|
#[derive(Clone, Debug, Deserialize, Serialize)]
|
|
pub struct Mention {
|
|
pub href: Url,
|
|
name: Option<String>,
|
|
#[serde(rename = "type")]
|
|
pub kind: MentionType,
|
|
}
|
|
|
|
pub struct MentionsAndAddresses {
|
|
pub ccs: Vec<Url>,
|
|
pub tags: Vec<Mention>,
|
|
}
|
|
|
|
/// This takes a comment, and builds a list of to_addresses, inboxes,
|
|
/// and mention tags, so they know where to be sent to.
|
|
/// Addresses are the persons / addresses that go in the cc field.
|
|
#[tracing::instrument(skip(comment, community_id, context))]
|
|
pub async fn collect_non_local_mentions(
|
|
comment: &ApubComment,
|
|
community_id: ObjectId<ApubCommunity>,
|
|
context: &LemmyContext,
|
|
request_counter: &mut i32,
|
|
) -> Result<MentionsAndAddresses, LemmyError> {
|
|
let parent_creator = get_comment_parent_creator(context.pool(), comment).await?;
|
|
let mut addressed_ccs: Vec<Url> = vec![community_id.into(), parent_creator.actor_id()];
|
|
|
|
// Add the mention tag
|
|
let parent_creator_tag = Mention {
|
|
href: parent_creator.actor_id.clone().into(),
|
|
name: Some(format!(
|
|
"@{}@{}",
|
|
&parent_creator.name,
|
|
&parent_creator.actor_id().domain().expect("has domain")
|
|
)),
|
|
kind: MentionType::Mention,
|
|
};
|
|
let mut tags = vec![parent_creator_tag];
|
|
|
|
// Get the person IDs for any mentions
|
|
let mentions = scrape_text_for_mentions(&comment.content)
|
|
.into_iter()
|
|
// Filter only the non-local ones
|
|
.filter(|m| !m.is_local(&context.settings().hostname))
|
|
.collect::<Vec<MentionData>>();
|
|
|
|
for mention in &mentions {
|
|
// TODO should it be fetching it every time?
|
|
let identifier = format!("{}@{}", mention.name, mention.domain);
|
|
let actor_id =
|
|
webfinger_resolve_actor::<ApubPerson>(&identifier, context, request_counter).await;
|
|
if let Ok(actor_id) = actor_id {
|
|
let actor_id: ObjectId<ApubPerson> = ObjectId::new(actor_id);
|
|
addressed_ccs.push(actor_id.to_string().parse()?);
|
|
|
|
let mention_tag = Mention {
|
|
href: actor_id.into(),
|
|
name: Some(mention.full_name()),
|
|
kind: MentionType::Mention,
|
|
};
|
|
tags.push(mention_tag);
|
|
}
|
|
}
|
|
|
|
Ok(MentionsAndAddresses {
|
|
ccs: addressed_ccs,
|
|
tags,
|
|
})
|
|
}
|
|
|
|
/// Returns the apub ID of the person this comment is responding to. Meaning, in case this is a
|
|
/// top-level comment, the creator of the post, otherwise the creator of the parent comment.
|
|
#[tracing::instrument(skip(pool, comment))]
|
|
async fn get_comment_parent_creator(
|
|
pool: &DbPool,
|
|
comment: &Comment,
|
|
) -> Result<ApubPerson, LemmyError> {
|
|
let parent_creator_id = if let Some(parent_comment_id) = comment.parent_id {
|
|
let parent_comment =
|
|
blocking(pool, move |conn| Comment::read(conn, parent_comment_id)).await??;
|
|
parent_comment.creator_id
|
|
} else {
|
|
let parent_post_id = comment.post_id;
|
|
let parent_post = blocking(pool, move |conn| Post::read(conn, parent_post_id)).await??;
|
|
parent_post.creator_id
|
|
};
|
|
Ok(
|
|
blocking(pool, move |conn| Person::read(conn, parent_creator_id))
|
|
.await??
|
|
.into(),
|
|
)
|
|
}
|