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

Disable redacting reactions if we don't have sufficient permissions #8767

Merged
merged 11 commits into from
Jun 10, 2022
Merged

Disable redacting reactions if we don't have sufficient permissions #8767

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
85a284a
Disable redacting reactions if we don't have sufficient permissions
SimonBrandner Jun 5, 2022
1ff3bde
Export `canRedact()`
SimonBrandner Jun 6, 2022
aca02be
Disable redacting in `ReactionPicker` without sufficient permissions
SimonBrandner Jun 6, 2022
1261e9c
Move `canRedact()` to `EventUtils`
SimonBrandner Jun 8, 2022
ade966c
Merge remote-tracking branch 'upstream/develop' into SimonBrandner/fe…
SimonBrandner Jun 8, 2022
da36117
Merge remote-tracking branch 'upstream/develop' into SimonBrandner/fe…
SimonBrandner Jun 9, 2022
edfd70a
Add `canSelfRedact` to `RoomContext`
SimonBrandner Jun 9, 2022
278f988
Code refactor
SimonBrandner Jun 9, 2022
8fe7a0f
Fix tests
SimonBrandner Jun 10, 2022
3d4e198
Make `not-allowed` cursor default for `mx_AccessibleButton_disabled`
SimonBrandner Jun 10, 2022
e313f20
Remove unnecessary line
SimonBrandner Jun 10, 2022
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
15 changes: 13 additions & 2 deletions src/components/views/messages/ReactionsRowButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,13 @@ import dis from "../../../dispatcher/dispatcher";
import ReactionsRowButtonTooltip from "./ReactionsRowButtonTooltip";
import AccessibleButton from "../elements/AccessibleButton";
import MatrixClientContext from "../../../contexts/MatrixClientContext";
import { MatrixClientPeg } from "../../../MatrixClientPeg";

const canRedact = (roomId: string, mxEvent: MatrixEvent): boolean => {
const client = MatrixClientPeg.get();
const room = client.getRoom(roomId);
return room.currentState.maySendRedactionForEvent(mxEvent, client.getUserId());
};

interface IProps {
// The event we're displaying reactions for
Expand All @@ -47,6 +54,7 @@ interface IState {

export default class ReactionsRowButton extends React.PureComponent<IProps, IState> {
static contextType = MatrixClientContext;
public context!: React.ContextType<typeof MatrixClientContext>;

state = {
tooltipRendered: false,
Expand All @@ -56,8 +64,11 @@ export default class ReactionsRowButton extends React.PureComponent<IProps, ISta
onClick = () => {
const { mxEvent, myReactionEvent, content } = this.props;
if (myReactionEvent) {
const roomId = mxEvent.getRoomId();
if (!canRedact(roomId, myReactionEvent)) return;

this.context.redactEvent(
mxEvent.getRoomId(),
roomId,
myReactionEvent.getId(),
);
} else {
Expand Down Expand Up @@ -126,7 +137,7 @@ export default class ReactionsRowButton extends React.PureComponent<IProps, ISta
className={classes}
aria-label={label}
onClick={this.onClick}
disabled={this.props.disabled}
disabled={this.props.disabled || (myReactionEvent && !canRedact(mxEvent.getRoomId(), myReactionEvent))}
onMouseOver={this.onMouseOver}
onMouseLeave={this.onMouseLeave}
>
Expand Down