use crate::Perform;
use actix_web::web::Data;
use lemmy_api_common::{
- community::{FollowCommunity, FollowCommunityResponse},
+ community::{CommunityResponse, FollowCommunity},
utils::{
blocking,
check_community_ban,
source::community::{Community, CommunityFollower, CommunityFollowerForm},
traits::{Crud, Followable},
};
-use lemmy_db_views_actor::structs::CommunityFollowerView;
-use lemmy_utils::{ConnectionId, LemmyError};
+use lemmy_db_views_actor::structs::CommunityView;
+use lemmy_utils::{error::LemmyError, ConnectionId};
use lemmy_websocket::LemmyContext;
#[async_trait::async_trait(?Send)]
impl Perform for FollowCommunity {
- type Response = FollowCommunityResponse;
+ type Response = CommunityResponse;
#[tracing::instrument(skip(context, _websocket_id))]
async fn perform(
&self,
context: &Data<LemmyContext>,
_websocket_id: Option<ConnectionId>,
- ) -> Result<Self::Response, LemmyError> {
+ ) -> Result<CommunityResponse, LemmyError> {
let data: &FollowCommunity = self;
let local_user_view =
get_local_user_view_from_jwt(&data.auth, context.pool(), context.secret()).await?;
let community_follower_form = CommunityFollowerForm {
community_id: data.community_id,
person_id: local_user_view.person.id,
- pending: false, // Don't worry, this form isn't used for remote follows
+ pending: false,
};
if community.local {
check_community_ban(local_user_view.person.id, community_id, context.pool()).await?;
check_community_deleted_or_removed(community_id, context.pool()).await?;
- let follow = move |conn: &'_ _| CommunityFollower::follow(conn, &community_follower_form);
+ let follow = move |conn: &mut _| CommunityFollower::follow(conn, &community_follower_form);
blocking(context.pool(), follow)
.await?
.map_err(|e| LemmyError::from_error_message(e, "community_follower_already_exists"))?;
} else {
let unfollow =
- move |conn: &'_ _| CommunityFollower::unfollow(conn, &community_follower_form);
+ move |conn: &mut _| CommunityFollower::unfollow(conn, &community_follower_form);
blocking(context.pool(), unfollow)
.await?
.map_err(|e| LemmyError::from_error_message(e, "community_follower_already_exists"))?;
} else {
UndoFollowCommunity::send(&local_user_view.person.clone().into(), &community, context)
.await?;
- let unfollow = move |conn: &'_ _| CommunityFollower::unfollow(conn, &community_follower_form);
+ let unfollow =
+ move |conn: &mut _| CommunityFollower::unfollow(conn, &community_follower_form);
blocking(context.pool(), unfollow)
.await?
.map_err(|e| LemmyError::from_error_message(e, "community_follower_already_exists"))?;
let community_id = data.community_id;
let person_id = local_user_view.person.id;
- let community_follower_view = blocking(context.pool(), move |conn| {
- CommunityFollowerView::read(conn, community_id, person_id)
+ let community_view = blocking(context.pool(), move |conn| {
+ CommunityView::read(conn, community_id, Some(person_id))
})
- .await?.ok();
+ .await??;
- Ok(Self::Response {
- community_follower_view,
- })
+ Ok(Self::Response { community_view })
}
}