grishka/lemmy
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #1145 from LemmyNet/fix_remote_subscribe

Browse source 
Fixing remote subscribe result. Fixes #1144
This commit is contained in:
Nutomic 2020-09-21 19:09:48 +00:00 committed by GitHub
commit b5860a4283
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/api/community.rs
View file

@ -495,15 +495,21 @@ impl Perform for FollowCommunity {
return Err(APIError::err("community_follower_already_exists").into()); return Err(APIError::err("community_follower_already_exists").into());
} }
} }
// TODO: this needs to return a "pending" state, until Accept is received from the remote server
let community_id = data.community_id; let community_id = data.community_id;
let user_id = user.id; let user_id = user.id;
let community_view = blocking(context.pool(), move |conn| { let mut community_view = blocking(context.pool(), move |conn| {
CommunityView::read(conn, community_id, Some(user_id)) CommunityView::read(conn, community_id, Some(user_id))
}) })
.await??; .await??;
// TODO: this needs to return a "pending" state, until Accept is received from the remote server
// For now, just assume that remote follows are accepted.
// Otherwise, the subscribed will be null
if !community.local {
community_view.subscribed = Some(data.follow);
}
Ok(CommunityResponse { Ok(CommunityResponse {
community: community_view, community: community_view,
}) })