1d38aad9d3
* a lot * merge * Fix stuff broken by merge * Get rid of repetitive `&mut *context.conn().await?` * Add blank lines under each line with `conn =` * Fix style mistakes (partial) * Revert "Fix style mistakes (partial)" This reverts commit 48a033b87f4fdc1ce14ff86cc019e1c703cd2741. * Revert "Add blank lines under each line with `conn =`" This reverts commit 773a6d3beba2cf89eac75913078b40c4f5190dd4. * Revert "Get rid of repetitive `&mut *context.conn().await?`" This reverts commit d2c6263ea13710177d49b2791278db5ad115fca5. * Use DbConn for CaptchaAnswer methods * DbConn trait * Remove more `&mut *` * Fix stuff * Re-run CI * try to make ci start * fix * fix * Fix api_common::utils * Fix apub::activities::block * Fix apub::api::resolve_object * Fix some things * Revert "Fix some things" This reverts commit 2bf8574bc8333d8d34ca542d61a0a5b50039c24d. * Revert "Fix apub::api::resolve_object" This reverts commit 3e4059aabbe485b2ff060bdeced8ef958ff62832. * Revert "Fix apub::activities::block" This reverts commit 3b02389abd780a7b1b8a2c89e26febdaa6a12159. * Revert "Fix api_common::utils" This reverts commit 7dc73de613a5618fa57eb06450f3699bbcb41254. * Revert "Revert "Fix api_common::utils"" This reverts commit f740f115e5457e83e53cc223e48196a2c47a9975. * Revert "Revert "Fix apub::activities::block"" This reverts commit 2ee206af7c885c10092cf209bf4a5b1d60327866. * Revert "Revert "Fix apub::api::resolve_object"" This reverts commit 96ed8bf2e9dcadae760743929498312334e23d2e. * Fix fetch_local_site_data * Fix get_comment_parent_creator * Remove unused perma deleted text * Fix routes::feeds * Fix lib.rs * Update lib.rs * rerun ci * Attempt to create custom GetConn and RunQueryDsl traits * Start over * Add GetConn trait * aaaa * Revert "aaaa" This reverts commit acc9ca1aed10c39efdd91cefece066e035a1fe80. * Revert "Revert "aaaa"" This reverts commit 443a2a00a56d152bb7eb429efd0d29a78e21b163. * still aaaaaaaaaaaaa * Return to earlier thing Revert "Add GetConn trait" This reverts commit ab4e94aea5bd9d34cbcddf017339131047e75344. * Try to use DbPool enum * Revert "Try to use DbPool enum" This reverts commit e4d1712646a52006b865a1fbe0dcf79976fdb027. * DbConn and DbPool enums (db_schema only fails to compile for tests) * fmt * Make functions take `&mut DbPool<'_>` and make db_schema tests compile * Add try_join_with_pool macro and run fix-clippy on more crates * Fix some errors * I did it * Remove function variants that take connection * rerun ci * rerun ci * rerun ci
107 lines
3.4 KiB
Rust
107 lines
3.4 KiB
Rust
use crate::objects::{comment::ApubComment, community::ApubCommunity, person::ApubPerson};
|
|
use activitypub_federation::{
|
|
config::Data,
|
|
fetch::{object_id::ObjectId, webfinger::webfinger_resolve_actor},
|
|
kinds::link::MentionType,
|
|
traits::Actor,
|
|
};
|
|
use lemmy_api_common::context::LemmyContext;
|
|
use lemmy_db_schema::{
|
|
source::{comment::Comment, person::Person, post::Post},
|
|
traits::Crud,
|
|
utils::DbPool,
|
|
};
|
|
use lemmy_utils::{error::LemmyError, utils::mention::scrape_text_for_mentions};
|
|
use serde::{Deserialize, Serialize};
|
|
use serde_json::Value;
|
|
use url::Url;
|
|
|
|
#[derive(Clone, Debug, Deserialize, Serialize)]
|
|
#[serde(untagged)]
|
|
pub enum MentionOrValue {
|
|
Mention(Mention),
|
|
Value(Value),
|
|
}
|
|
|
|
#[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<MentionOrValue>,
|
|
}
|
|
|
|
/// 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: &Data<LemmyContext>,
|
|
) -> Result<MentionsAndAddresses, LemmyError> {
|
|
let parent_creator = get_comment_parent_creator(&mut context.pool(), comment).await?;
|
|
let mut addressed_ccs: Vec<Url> = vec![community_id.into(), parent_creator.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.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));
|
|
|
|
for mention in mentions {
|
|
let identifier = format!("{}@{}", mention.name, mention.domain);
|
|
let person = webfinger_resolve_actor::<LemmyContext, ApubPerson>(&identifier, context).await;
|
|
if let Ok(person) = person {
|
|
addressed_ccs.push(person.actor_id.to_string().parse()?);
|
|
|
|
let mention_tag = Mention {
|
|
href: person.id(),
|
|
name: Some(mention.full_name()),
|
|
kind: MentionType::Mention,
|
|
};
|
|
tags.push(mention_tag);
|
|
}
|
|
}
|
|
|
|
let tags = tags.into_iter().map(MentionOrValue::Mention).collect();
|
|
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: &mut DbPool<'_>,
|
|
comment: &Comment,
|
|
) -> Result<ApubPerson, LemmyError> {
|
|
let parent_creator_id = if let Some(parent_comment_id) = comment.parent_comment_id() {
|
|
let parent_comment = Comment::read(pool, parent_comment_id).await?;
|
|
parent_comment.creator_id
|
|
} else {
|
|
let parent_post_id = comment.post_id;
|
|
let parent_post = Post::read(pool, parent_post_id).await?;
|
|
parent_post.creator_id
|
|
};
|
|
Ok(Person::read(pool, parent_creator_id).await?.into())
|
|
}
|