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

Allow admins to add mods and transfer communities

Browse source 
- Fixes #238
This commit is contained in:
Dessalines 2019-08-29 15:18:50 -07:00
parent de6ddeeca4
commit 8d1db3c395
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
server/src/api/community.rs
View file

@ -605,8 +605,15 @@ impl Perform<GetCommunityResponse> for Oper<TransferCommunity> {
let read_community = Community::read(&conn, data.community_id)?; let read_community = Community::read(&conn, data.community_id)?;
// Make sure user is the creator let site_creator_id = Site::read(&conn, 1)?.creator_id;
if read_community.creator_id != user_id { let mut admins = UserView::admins(&conn)?;
let creator_index = admins.iter().position(|r| r.id == site_creator_id).unwrap();
let creator_user = admins.remove(creator_index);
admins.insert(0, creator_user);
// Make sure user is the creator, or an admin
if user_id != read_community.creator_id && !admins.iter().map(|a| a.id).collect::<Vec<i32>>().contains(&user_id) {
return Err(APIError::err(&self.op, "not_an_admin"))? return Err(APIError::err(&self.op, "not_an_admin"))?
} }
@ -675,11 +682,6 @@ impl Perform<GetCommunityResponse> for Oper<TransferCommunity> {
} }
}; };
let site_creator_id = Site::read(&conn, 1)?.creator_id;
let mut admins = UserView::admins(&conn)?;
let creator_index = admins.iter().position(|r| r.id == site_creator_id).unwrap();
let creator_user = admins.remove(creator_index);
admins.insert(0, creator_user);
// Return the jwt // Return the jwt
Ok( Ok(

6
ui/src/components/comment-node.tsx vendored
View file

@ -152,8 +152,8 @@ export class CommentNode extends Component<CommentNodeProps, CommentNodeState> {
} }
</> </>
} }
{/* Community creators can transfer community to another mod */} {/* Community creators and admins can transfer community to another mod */}
{this.amCommunityCreator && this.isMod && {(this.amCommunityCreator || this.canAdmin) && this.isMod &&
<li className="list-inline-item"> <li className="list-inline-item">
{!this.state.showConfirmTransferCommunity ? {!this.state.showConfirmTransferCommunity ?
<span class="pointer" onClick={linkEvent(this, this.handleShowConfirmTransferCommunity)}><T i18nKey="transfer_community">#</T> <span class="pointer" onClick={linkEvent(this, this.handleShowConfirmTransferCommunity)}><T i18nKey="transfer_community">#</T>
@ -491,6 +491,7 @@ export class CommentNode extends Component<CommentNodeProps, CommentNodeState> {
user_id: i.props.node.comment.creator_id, user_id: i.props.node.comment.creator_id,
}; };
WebSocketService.Instance.transferCommunity(form); WebSocketService.Instance.transferCommunity(form);
i.state.showConfirmTransferCommunity = false;
i.setState(i.state); i.setState(i.state);
} }
@ -509,6 +510,7 @@ export class CommentNode extends Component<CommentNodeProps, CommentNodeState> {
user_id: i.props.node.comment.creator_id, user_id: i.props.node.comment.creator_id,
}; };
WebSocketService.Instance.transferSite(form); WebSocketService.Instance.transferSite(form);
i.state.showConfirmTransferSite = false;
i.setState(i.state); i.setState(i.state);
} }