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

show redact in context menu only if has PL to/sent message #3925

Merged
merged 6 commits into from
May 30, 2017
Merged

show redact in context menu only if has PL to/sent message #3925

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
aff1e14
first go at show redact only if we can redact
t3chguy May 16, 2017
d55f4f9
use new RoomState method from matrix-org/matrix-js-sdk/pull/435
t3chguy May 16, 2017
db78534
remove no longer required parseIntWithDefault
t3chguy May 16, 2017
58ada2c
move mxEvent.status check to js-sdk
t3chguy May 16, 2017
d3f9304
Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/…
t3chguy May 29, 2017
17c4e7a
check PL on change as well as on comp load, that way it'll show remov…
t3chguy May 29, 2017
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
29 changes: 27 additions & 2 deletions src/components/views/context_menus/MessageContextMenu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,31 @@ module.exports = React.createClass({
onFinished: React.PropTypes.func,
},

getInitialState: function() {
return {
canRedact: false,
};
},

componentWillMount: function() {
MatrixClientPeg.get().on('RoomMember.powerLevel', this._checkCanRedact);
this._checkCanRedact();
},

componentWillUnmount: function() {
const cli = MatrixClientPeg.get();
if (cli) {
cli.removeListener('RoomMember.powerLevel', this._checkCanRedact);
}
},

_checkCanRedact: function() {
const cli = MatrixClientPeg.get();
const room = cli.getRoom(this.props.mxEvent.getRoomId());
const canRedact = room.currentState.maySendRedactionForEvent(this.props.mxEvent, cli.credentials.userId);
this.setState({canRedact});
},

onResendClick: function() {
Resend.resend(this.props.mxEvent);
if (this.props.onFinished) this.props.onFinished();
Expand Down Expand Up @@ -136,7 +161,7 @@ module.exports = React.createClass({
);
}

if (!eventStatus && !this.props.mxEvent.isRedacted()) { // sent and not redacted
if (this.state.canRedact) {
redactButton = (
<div className="mx_MessageContextMenu_field" onClick={this.onRedactClick}>
{ _t('Remove') }
Expand Down Expand Up @@ -206,7 +231,7 @@ module.exports = React.createClass({
externalURLButton = (
<div className="mx_MessageContextMenu_field">
<a href={ this.props.mxEvent.event.content.external_url }
rel="noopener" target="_blank" onClick={ this.closeMenu }>{ _t('Source URL') }</a>
rel="noopener" target="_blank" onClick={ this.closeMenu }>{ _t('Source URL') }</a>
</div>
);
}
Expand Down