traits::{ActivityHandler, Actor},
};
use activitystreams_kinds::{activity::AddType, public};
-use lemmy_api_common::utils::blocking;
use lemmy_db_schema::{
source::{
community::{CommunityModerator, CommunityModeratorForm},
cc: vec![community.actor_id()],
kind: AddType::Add,
id: id.clone(),
- unparsed: Default::default(),
};
let activity = AnnouncableActivities::AddMod(add);
let inboxes = vec![added_mod.shared_inbox_or_inbox()];
- send_activity_in_community(activity, actor, community, inboxes, context).await
+ send_activity_in_community(activity, actor, community, inboxes, true, context).await
}
}
verify_mod_action(
&self.actor,
self.object.inner(),
- &community,
+ community.id,
context,
request_counter,
)
let community = self.get_community(context, request_counter).await?;
let new_mod = self
.object
- .dereference(context, local_instance(context), request_counter)
+ .dereference(context, local_instance(context).await, request_counter)
.await?;
// If we had to refetch the community while parsing the activity, then the new mod has already
// been added. Skip it here as it would result in a duplicate key error.
let new_mod_id = new_mod.id;
- let moderated_communities = blocking(context.pool(), move |conn| {
- CommunityModerator::get_person_moderated_communities(conn, new_mod_id)
- })
- .await??;
+ let moderated_communities =
+ CommunityModerator::get_person_moderated_communities(context.pool(), new_mod_id).await?;
if !moderated_communities.contains(&community.id) {
let form = CommunityModeratorForm {
community_id: community.id,
person_id: new_mod.id,
};
- blocking(context.pool(), move |conn| {
- CommunityModerator::join(conn, &form)
- })
- .await??;
+ CommunityModerator::join(context.pool(), &form).await?;
// write mod log
let actor = self
.actor
- .dereference(context, local_instance(context), request_counter)
+ .dereference(context, local_instance(context).await, request_counter)
.await?;
let form = ModAddCommunityForm {
mod_person_id: actor.id,
community_id: community.id,
removed: Some(false),
};
- blocking(context.pool(), move |conn| {
- ModAddCommunity::create(conn, &form)
- })
- .await??;
+ ModAddCommunity::create(context.pool(), &form).await?;
}
// TODO: send websocket notification about added mod
Ok(())