mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-11-10 02:05:10 +00:00
Merge branch 'dev' into icons
This commit is contained in:
commit
15e91e4b4c
|
@ -466,7 +466,7 @@ impl Perform<GetUserDetailsResponse> for Oper<GetUserDetails> {
|
|||
}
|
||||
};
|
||||
|
||||
let user_view = UserView::read(&conn, user_details_id)?;
|
||||
let mut user_view = UserView::read(&conn, user_details_id)?;
|
||||
|
||||
let mut posts_query = PostQueryBuilder::create(&conn)
|
||||
.sort(&sort)
|
||||
|
@ -502,6 +502,15 @@ impl Perform<GetUserDetailsResponse> for Oper<GetUserDetails> {
|
|||
let creator_user = admins.remove(creator_index);
|
||||
admins.insert(0, creator_user);
|
||||
|
||||
// If its not the same user, remove the email
|
||||
if let Some(user_id) = user_id {
|
||||
if user_details_id != user_id {
|
||||
user_view.email = None;
|
||||
}
|
||||
} else {
|
||||
user_view.email = None;
|
||||
}
|
||||
|
||||
// Return the jwt
|
||||
Ok(GetUserDetailsResponse {
|
||||
user: user_view,
|
||||
|
|
Loading…
Reference in a new issue