Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix space admin check false positive on multiple admins #6824

Merged
merged 2 commits into from
Sep 27, 2021
Merged

Fix space admin check false positive on multiple admins #6824

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2fc3662
Fix space admin check false positive on multiple admins
t3chguy Sep 17, 2021
c39519a
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into…
t3chguy Sep 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/components/views/dialogs/LeaveSpaceDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,13 @@ interface IProps {
}

const isOnlyAdmin = (room: Room): boolean => {
return !room.getJoinedMembers().some(member => {
return member.userId !== room.client.credentials.userId && member.powerLevelNorm === 100;
const userId = room.client.getUserId();
if (room.getMember(userId).powerLevelNorm !== 100) {
return false; // user is not an admin
}
return room.getJoinedMembers().every(member => {
// return true if every other member has a lower power level (we are highest)
Palid marked this conversation as resolved.
Show resolved Hide resolved
return member.userId === userId || member.powerLevelNorm < 100;
});
};

Expand Down