]> Untitled Git - lemmy.git/blobdiff - crates/api/src/community/block.rs
Diesel 2.0.0 upgrade (#2452)
[lemmy.git] / crates / api / src / community / block.rs
index a8672e3e2172a52a2090734218ca51d7f23fc97e..5f01ac3d7f86a4562e827ed376a21c0c9c9cdb99 100644 (file)
@@ -13,7 +13,7 @@ use lemmy_db_schema::{
   traits::{Blockable, Crud, Followable},
 };
 use lemmy_db_views_actor::structs::CommunityView;
-use lemmy_utils::{ConnectionId, LemmyError};
+use lemmy_utils::{error::LemmyError, ConnectionId};
 use lemmy_websocket::LemmyContext;
 
 #[async_trait::async_trait(?Send)]
@@ -38,7 +38,7 @@ impl Perform for BlockCommunity {
     };
 
     if data.block {
-      let block = move |conn: &'_ _| CommunityBlock::block(conn, &community_block_form);
+      let block = move |conn: &mut _| CommunityBlock::block(conn, &community_block_form);
       blocking(context.pool(), block)
         .await?
         .map_err(|e| LemmyError::from_error_message(e, "community_block_already_exists"))?;
@@ -47,9 +47,9 @@ impl Perform for BlockCommunity {
       let community_follower_form = CommunityFollowerForm {
         community_id: data.community_id,
         person_id,
-        pending: Some(false),
+        pending: false,
       };
-      blocking(context.pool(), move |conn: &'_ _| {
+      blocking(context.pool(), move |conn: &mut _| {
         CommunityFollower::unfollow(conn, &community_follower_form)
       })
       .await?
@@ -60,7 +60,7 @@ impl Perform for BlockCommunity {
       .await??;
       UndoFollowCommunity::send(&local_user_view.person.into(), &community.into(), context).await?;
     } else {
-      let unblock = move |conn: &'_ _| CommunityBlock::unblock(conn, &community_block_form);
+      let unblock = move |conn: &mut _| CommunityBlock::unblock(conn, &community_block_form);
       blocking(context.pool(), unblock)
         .await?
         .map_err(|e| LemmyError::from_error_message(e, "community_block_already_exists"))?;