mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-05-12 06:52:39 +00:00
375d9a2a3c
* persistent activity queue * fixes * fixes * make federation workers function callable from outside * log federation instances * dead instance detection not needed here * taplo fmt * split federate bin/lib * minor fix * better logging * log * create struct to hold cancellable task for readability * use boxfuture for readability * reset submodule * fix * fix lint * swap * remove json column, use separate array columns instead * some review comments * make worker a struct for readability * minor readability * add local filter to community follower view * remove separate lemmy_federate entry point * fix remaining duration * address review comments mostly * fix lint * upgrade actitypub-fed to simpler interface * fix sql format * increase delays a bit * fixes after merge * remove selectable * fix instance selectable * add comment * start federation based on latest id at the time * rename federate process args * dead instances in one query * filter follow+report activities by local * remove synchronous federation remove activity sender queue * lint * fix federation tests by waiting for results to change * fix fed test * fix comment report * wait some more * Apply suggestions from code review Co-authored-by: SorteKanin <sortekanin@gmail.com> * fix most remaining tests * wait until private messages * fix community tests * fix community tests * move arg parse * use instance_id instead of domain in federation_queue_state table --------- Co-authored-by: Dessalines <dessalines@users.noreply.github.com> Co-authored-by: SorteKanin <sortekanin@gmail.com>
151 lines
4.5 KiB
Rust
151 lines
4.5 KiB
Rust
use crate::{
|
|
activities::{
|
|
block::{generate_cc, SiteOrCommunity},
|
|
community::send_activity_in_community,
|
|
generate_activity_id,
|
|
send_lemmy_activity,
|
|
verify_is_public,
|
|
},
|
|
activity_lists::AnnouncableActivities,
|
|
insert_received_activity,
|
|
objects::person::ApubPerson,
|
|
protocol::activities::block::{block_user::BlockUser, undo_block_user::UndoBlockUser},
|
|
};
|
|
use activitypub_federation::{
|
|
config::Data,
|
|
kinds::{activity::UndoType, public},
|
|
protocol::verification::verify_domains_match,
|
|
traits::{ActivityHandler, Actor},
|
|
};
|
|
use lemmy_api_common::{context::LemmyContext, utils::sanitize_html_federation_opt};
|
|
use lemmy_db_schema::{
|
|
source::{
|
|
activity::ActivitySendTargets,
|
|
community::{CommunityPersonBan, CommunityPersonBanForm},
|
|
moderator::{ModBan, ModBanForm, ModBanFromCommunity, ModBanFromCommunityForm},
|
|
person::{Person, PersonUpdateForm},
|
|
},
|
|
traits::{Bannable, Crud},
|
|
};
|
|
use lemmy_utils::error::LemmyError;
|
|
use url::Url;
|
|
|
|
impl UndoBlockUser {
|
|
#[tracing::instrument(skip_all)]
|
|
pub async fn send(
|
|
target: &SiteOrCommunity,
|
|
user: &ApubPerson,
|
|
mod_: &ApubPerson,
|
|
reason: Option<String>,
|
|
context: &Data<LemmyContext>,
|
|
) -> Result<(), LemmyError> {
|
|
let block = BlockUser::new(target, user, mod_, None, reason, None, context).await?;
|
|
let audience = if let SiteOrCommunity::Community(c) = target {
|
|
Some(c.id().into())
|
|
} else {
|
|
None
|
|
};
|
|
|
|
let id = generate_activity_id(
|
|
UndoType::Undo,
|
|
&context.settings().get_protocol_and_hostname(),
|
|
)?;
|
|
let undo = UndoBlockUser {
|
|
actor: mod_.id().into(),
|
|
to: vec![public()],
|
|
object: block,
|
|
cc: generate_cc(target, &mut context.pool()).await?,
|
|
kind: UndoType::Undo,
|
|
id: id.clone(),
|
|
audience,
|
|
};
|
|
|
|
let mut inboxes = ActivitySendTargets::to_inbox(user.shared_inbox_or_inbox());
|
|
match target {
|
|
SiteOrCommunity::Site(_) => {
|
|
inboxes.set_all_instances();
|
|
send_lemmy_activity(context, undo, mod_, inboxes, false).await
|
|
}
|
|
SiteOrCommunity::Community(c) => {
|
|
let activity = AnnouncableActivities::UndoBlockUser(undo);
|
|
send_activity_in_community(activity, mod_, c, inboxes, true, context).await
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
#[async_trait::async_trait]
|
|
impl ActivityHandler for UndoBlockUser {
|
|
type DataType = LemmyContext;
|
|
type Error = LemmyError;
|
|
|
|
fn id(&self) -> &Url {
|
|
&self.id
|
|
}
|
|
|
|
fn actor(&self) -> &Url {
|
|
self.actor.inner()
|
|
}
|
|
|
|
#[tracing::instrument(skip_all)]
|
|
async fn verify(&self, context: &Data<LemmyContext>) -> Result<(), LemmyError> {
|
|
insert_received_activity(&self.id, context).await?;
|
|
verify_is_public(&self.to, &self.cc)?;
|
|
verify_domains_match(self.actor.inner(), self.object.actor.inner())?;
|
|
self.object.verify(context).await?;
|
|
Ok(())
|
|
}
|
|
|
|
#[tracing::instrument(skip_all)]
|
|
async fn receive(self, context: &Data<LemmyContext>) -> Result<(), LemmyError> {
|
|
let expires = self.object.expires.map(Into::into);
|
|
let mod_person = self.actor.dereference(context).await?;
|
|
let blocked_person = self.object.object.dereference(context).await?;
|
|
match self.object.target.dereference(context).await? {
|
|
SiteOrCommunity::Site(_site) => {
|
|
let blocked_person = Person::update(
|
|
&mut context.pool(),
|
|
blocked_person.id,
|
|
&PersonUpdateForm {
|
|
banned: Some(false),
|
|
ban_expires: Some(expires),
|
|
..Default::default()
|
|
},
|
|
)
|
|
.await?;
|
|
|
|
// write mod log
|
|
let form = ModBanForm {
|
|
mod_person_id: mod_person.id,
|
|
other_person_id: blocked_person.id,
|
|
reason: sanitize_html_federation_opt(&self.object.summary),
|
|
banned: Some(false),
|
|
expires,
|
|
};
|
|
ModBan::create(&mut context.pool(), &form).await?;
|
|
}
|
|
SiteOrCommunity::Community(community) => {
|
|
let community_user_ban_form = CommunityPersonBanForm {
|
|
community_id: community.id,
|
|
person_id: blocked_person.id,
|
|
expires: None,
|
|
};
|
|
CommunityPersonBan::unban(&mut context.pool(), &community_user_ban_form).await?;
|
|
|
|
// write to mod log
|
|
let form = ModBanFromCommunityForm {
|
|
mod_person_id: mod_person.id,
|
|
other_person_id: blocked_person.id,
|
|
community_id: community.id,
|
|
reason: sanitize_html_federation_opt(&self.object.summary),
|
|
banned: Some(false),
|
|
expires,
|
|
};
|
|
ModBanFromCommunity::create(&mut context.pool(), &form).await?;
|
|
}
|
|
}
|
|
|
|
Ok(())
|
|
}
|
|
}
|