Code refactor

Signed-off-by: Šimon Brandner <[email protected]>

Author: SimonBrandner

src/components/views/emojipicker/ReactionPicker.tsx

@@ -26,7 +26,6 @@ import dis from "../../../dispatcher/dispatcher";
 import { Action } from '../../../dispatcher/actions';
 import RoomContext from "../../../contexts/RoomContext";
 import { FocusComposerPayload } from '../../../dispatcher/payloads/FocusComposerPayload';
-import { canRedact } from "../../../utils/EventUtils";
 
 interface IProps {
     mxEvent: MatrixEvent;
@@ -74,15 +73,15 @@ class ReactionPicker extends React.Component<IProps, IState> {
         }
     }
 
-    private getReactions(): Record<string, MatrixEvent> {
+    private getReactions(): Record<string, string> {
         if (!this.props.reactions) {
             return {};
         }
         const userId = MatrixClientPeg.get().getUserId();
         const myAnnotations = this.props.reactions.getAnnotationsBySender()[userId] || [];
         return Object.fromEntries([...myAnnotations]
             .filter(event => !event.isRedacted())
-            .map(event => [event.getRelation().key, event]));
+            .map(event => [event.getRelation().key, event.getId()]));
     }
 
     private onReactionsChange = () => {
@@ -97,9 +96,9 @@ class ReactionPicker extends React.Component<IProps, IState> {
         const roomId = this.props.mxEvent.getRoomId();
         const myReactions = this.getReactions();
         if (myReactions.hasOwnProperty(reaction)) {
-            if (!canRedact(roomId, myReactions[reaction])) return;
+            if (this.props.mxEvent.isRedacted() || !this.context.canSelfRedact) return;
 
-            MatrixClientPeg.get().redactEvent(roomId, myReactions[reaction].getId());
+            MatrixClientPeg.get().redactEvent(roomId, myReactions[reaction]);
             dis.dispatch<FocusComposerPayload>({
                 action: Action.FocusAComposer,
                 context: this.context.timelineRenderingType,
@@ -124,10 +123,11 @@ class ReactionPicker extends React.Component<IProps, IState> {
     };
 
     private isEmojiDisabled = (unicode: string): boolean => {
-        const reaction = this.getReactions()[unicode];
+        if (!this.getReactions()[unicode]) return false;
+        if (this.props.mxEvent.isRedacted()) return false;
+        if (this.context.canSelfRedact) return false;
 
-        if (!reaction) return false;
-        return !canRedact(this.props.mxEvent.getRoomId(), reaction);
+        return true;
     };
 
     render() {

src/components/views/messages/ReactionsRow.tsx

@@ -183,7 +183,10 @@ export default class ReactionsRow extends React.PureComponent<IProps, IState> {
                 mxEvent={mxEvent}
                 reactionEvents={events}
                 myReactionEvent={myReactionEvent}
-                disabled={!this.context.canReact}
+                disabled={
+                    !this.context.canReact ||
+                    (myReactionEvent && !myReactionEvent.isRedacted() && !this.context.canSelfRedact)
+                }
             />;
         }).filter(item => !!item);
 

src/components/views/messages/ReactionsRowButton.tsx

@@ -24,7 +24,6 @@ import dis from "../../../dispatcher/dispatcher";
 import ReactionsRowButtonTooltip from "./ReactionsRowButtonTooltip";
 import AccessibleButton from "../elements/AccessibleButton";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
-import { canRedact } from "../../../utils/EventUtils";
 
 interface IProps {
     // The event we're displaying reactions for
@@ -58,11 +57,8 @@ 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(
-                roomId,
+                mxEvent.getRoomId(),
                 myReactionEvent.getId(),
             );
         } else {
@@ -131,7 +127,7 @@ export default class ReactionsRowButton extends React.PureComponent<IProps, ISta
             className={classes}
             aria-label={label}
             onClick={this.onClick}
-            disabled={this.props.disabled || (myReactionEvent && !canRedact(mxEvent.getRoomId(), myReactionEvent))}
+            disabled={this.props.disabled}
             onMouseOver={this.onMouseOver}
             onMouseLeave={this.onMouseLeave}
         >

src/utils/EventUtils.ts

@@ -292,9 +292,3 @@ export function canForward(event: MatrixEvent): boolean {
 export function hasThreadSummary(event: MatrixEvent): boolean {
     return event.isThreadRoot && event.getThread()?.length && !!event.getThread().replyToEvent;
 }
-
-export function canRedact(roomId: string, mxEvent: MatrixEvent): boolean {
-    const client = MatrixClientPeg.get();
-    const room = client.getRoom(roomId);
-    return room.currentState.maySendRedactionForEvent(mxEvent, client.getUserId());
-}