use crate::{
check_is_apub_id_valid,
context::WithContext,
- fetcher::object_id::ObjectId,
generate_moderators_url,
insert_activity,
objects::{community::ApubCommunity, person::ApubPerson},
};
-use activitystreams::public;
-use anyhow::anyhow;
+use activitystreams_kinds::public;
use lemmy_api_common::blocking;
use lemmy_apub_lib::{
activity_queue::send_activity,
- traits::{ActivityFields, ActorType},
+ object_id::ObjectId,
+ traits::ActorType,
verify::verify_domains_match,
};
use lemmy_db_schema::source::community::Community;
};
use lemmy_utils::{settings::structs::Settings, LemmyError};
use lemmy_websocket::LemmyContext;
-use log::info;
-use serde::{Deserialize, Serialize};
-use strum_macros::ToString;
+use serde::Serialize;
+use tracing::info;
use url::{ParseError, Url};
use uuid::Uuid;
+pub mod block;
pub mod comment;
pub mod community;
pub mod deletion;
pub mod following;
pub mod post;
pub mod private_message;
-pub mod report;
pub mod voting;
-#[derive(Clone, Debug, ToString, Deserialize, Serialize)]
-pub enum CreateOrUpdateType {
- Create,
- Update,
-}
-
/// Checks that the specified Url actually identifies a Person (by fetching it), and that the person
/// doesn't have a site ban.
+#[tracing::instrument(skip_all)]
async fn verify_person(
person_id: &ObjectId<ApubPerson>,
context: &LemmyContext,
request_counter: &mut i32,
) -> Result<(), LemmyError> {
- let person = person_id.dereference(context, request_counter).await?;
+ let person = person_id
+ .dereference(context, context.client(), request_counter)
+ .await?;
if person.banned {
- return Err(anyhow!("Person {} is banned", person_id).into());
+ let error = LemmyError::from(anyhow::anyhow!("Person {} is banned", person_id));
+ return Err(error.with_message("banned"));
}
Ok(())
}
/// Fetches the person and community to verify their type, then checks if person is banned from site
/// or community.
+#[tracing::instrument(skip_all)]
pub(crate) async fn verify_person_in_community(
person_id: &ObjectId<ApubPerson>,
community: &ApubCommunity,
context: &LemmyContext,
request_counter: &mut i32,
) -> Result<(), LemmyError> {
- let person = person_id.dereference(context, request_counter).await?;
+ let person = person_id
+ .dereference(context, context.client(), request_counter)
+ .await?;
if person.banned {
- return Err(anyhow!("Person is banned from site").into());
+ return Err(LemmyError::from_message("Person is banned from site"));
}
let person_id = person.id;
let community_id = community.id;
let is_banned =
move |conn: &'_ _| CommunityPersonBanView::get(conn, person_id, community_id).is_ok();
if blocking(context.pool(), is_banned).await? {
- return Err(anyhow!("Person is banned from community").into());
+ return Err(LemmyError::from_message("Person is banned from community"));
}
Ok(())
}
-fn verify_activity(activity: &dyn ActivityFields, settings: &Settings) -> Result<(), LemmyError> {
- check_is_apub_id_valid(activity.actor(), false, settings)?;
- verify_domains_match(activity.id_unchecked(), activity.actor())?;
+fn verify_activity(id: &Url, actor: &Url, settings: &Settings) -> Result<(), LemmyError> {
+ check_is_apub_id_valid(actor, false, settings)?;
+ verify_domains_match(id, actor)?;
Ok(())
}
/// Verify that the actor is a community mod. This check is only run if the community is local,
/// because in case of remote communities, admins can also perform mod actions. As admin status
/// is not federated, we cant verify their actions remotely.
+#[tracing::instrument(skip_all)]
pub(crate) async fn verify_mod_action(
actor_id: &ObjectId<ApubPerson>,
community: &ApubCommunity,
request_counter: &mut i32,
) -> Result<(), LemmyError> {
if community.local {
- let actor = actor_id.dereference(context, request_counter).await?;
+ let actor = actor_id
+ .dereference(context, context.client(), request_counter)
+ .await?;
// Note: this will also return true for admins in addition to mods, but as we dont know about
// remote admins, it doesnt make any difference.
})
.await?;
if !is_mod_or_admin {
- return Err(anyhow!("Not a mod").into());
+ return Err(LemmyError::from_message("Not a mod"));
}
}
Ok(())
target: &Url,
community: &ApubCommunity,
) -> Result<(), LemmyError> {
- if target != &generate_moderators_url(&community.actor_id)?.into_inner() {
- return Err(anyhow!("Unkown target url").into());
+ if target != &generate_moderators_url(&community.actor_id)?.into() {
+ return Err(LemmyError::from_message("Unkown target url"));
}
Ok(())
}
-pub(crate) fn verify_is_public(to: &[Url]) -> Result<(), LemmyError> {
- if !to.contains(&public()) {
- return Err(anyhow!("Object is not public").into());
+pub(crate) fn verify_is_public(to: &[Url], cc: &[Url]) -> Result<(), LemmyError> {
+ if ![to, cc].iter().any(|set| set.contains(&public())) {
+ return Err(LemmyError::from_message("Object is not public"));
}
Ok(())
}
pub(crate) fn check_community_deleted_or_removed(community: &Community) -> Result<(), LemmyError> {
if community.deleted || community.removed {
- Err(anyhow!("New post or comment cannot be created in deleted or removed community").into())
+ Err(LemmyError::from_message(
+ "New post or comment cannot be created in deleted or removed community",
+ ))
} else {
Ok(())
}
Url::parse(&id)
}
+#[tracing::instrument(skip_all)]
async fn send_lemmy_activity<T: Serialize>(
context: &LemmyContext,
activity: &T,
let serialised_activity = serde_json::to_string(&activity)?;
- insert_activity(
- activity_id,
- serialised_activity.clone(),
- true,
- sensitive,
- context.pool(),
- )
- .await?;
+ let object_value = serde_json::to_value(&activity)?;
+ insert_activity(activity_id, object_value, true, sensitive, context.pool()).await?;
send_activity(
- serialised_activity,
+ activity_id,
actor,
inboxes,
+ serialised_activity,
context.client(),
context.activity_queue(),
)
projects / lemmy.git / blobdiff