This repository has been archived by the owner on Sep 11, 2024. It is now read-only.
Show who banned the user on hover #1441
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lukebarnard1
suggested changes
Oct 11, 2017
| @@ -652,8 +655,9 @@ module.exports = React.createClass({ | |||
| <ul className="mx_RoomSettings_banned"> | |||
| {banned.map(function(member) { | |||
| const banEvent = member.events.member.getContent(); | |||
| const bannedBy = self.props.room.getMember(member.events.member.getSender()); | |||
There was a problem hiding this comment.
This could potentially be null but BannedUser has a requirement for by. I suggest falling back to the user ID for the sender if by is falsey.
Fixes element-hq/element-web#5039 Signed-off-by: Travis Ralston <travpc@gmail.com>
Signed-off-by: Travis Ralston <travpc@gmail.com>
turt2live
force-pushed
the
travis/who_banned
branch
from
340a943
to
8a2813a
Compare
|
Apologies for the force push. I screwed up the merge. Should be fixed now @lukebarnard1 |
lukebarnard1
approved these changes
Oct 11, 2017
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes element-hq/element-web#5039