Make functions work with both connection and pool (#3420)

[lemmy.git] / crates / apub / src / activities / block / mod.rs

diff --git a/crates/apub/src/activities/block/mod.rs b/crates/apub/src/activities/block/mod.rs
index a1315bb78facfa3f6acece87752943854f759d49..7ee9ec17739d97b0c1d1791d15d96074ee492b95 100644 (file)
--- a/crates/apub/src/activities/block/mod.rs
+++ b/crates/apub/src/activities/block/mod.rs
@@ -16,7 +16,7 @@ use lemmy_api_common::{
   community::{BanFromCommunity, BanFromCommunityResponse},
   context::LemmyContext,
   person::{BanPerson, BanPersonResponse},
-  utils::get_local_user_view_from_jwt,
+  utils::local_user_view_from_jwt,
 };
 use lemmy_db_schema::{
   source::{community::Community, person::Person, site::Site},
@@ -118,7 +118,10 @@ impl SiteOrCommunity {
   }
 }
 
-async fn generate_cc(target: &SiteOrCommunity, pool: &DbPool) -> Result<Vec<Url>, LemmyError> {
+async fn generate_cc(
+  target: &SiteOrCommunity,
+  pool: &mut DbPool<'_>,
+) -> Result<Vec<Url>, LemmyError> {
   Ok(match target {
     SiteOrCommunity::Site(_) => Site::read_remote_sites(pool)
       .await?
@@ -138,10 +141,9 @@ impl SendActivity for BanPerson {
     _response: &Self::Response,
     context: &Data<LemmyContext>,
   ) -> Result<(), LemmyError> {
-    let local_user_view =
-      get_local_user_view_from_jwt(&request.auth, context.pool(), context.secret()).await?;
-    let person = Person::read(context.pool(), request.person_id).await?;
-    let site = SiteOrCommunity::Site(SiteView::read_local(context.pool()).await?.site.into());
+    let local_user_view = local_user_view_from_jwt(&request.auth, context).await?;
+    let person = Person::read(&mut context.pool(), request.person_id).await?;
+    let site = SiteOrCommunity::Site(SiteView::read_local(&mut context.pool()).await?.site.into());
     let expires = request.expires.map(naive_from_unix);
 
     // if the action affects a local user, federate to other instances
@@ -182,12 +184,11 @@ impl SendActivity for BanFromCommunity {
     _response: &Self::Response,
     context: &Data<LemmyContext>,
   ) -> Result<(), LemmyError> {
-    let local_user_view =
-      get_local_user_view_from_jwt(&request.auth, context.pool(), context.secret()).await?;
-    let community: ApubCommunity = Community::read(context.pool(), request.community_id)
+    let local_user_view = local_user_view_from_jwt(&request.auth, context).await?;
+    let community: ApubCommunity = Community::read(&mut context.pool(), request.community_id)
       .await?
       .into();
-    let banned_person: ApubPerson = Person::read(context.pool(), request.person_id)
+    let banned_person: ApubPerson = Person::read(&mut context.pool(), request.person_id)
       .await?
       .into();
     let expires = request.expires.map(naive_from_unix);