Remove old forwarding code

This has been replaced by ForwardDialog.

Signed-off-by: Robin Townsend <robin@robin.town>

src/components/structures/RoomView.tsx

@@ -60,7 +60,6 @@ import ScrollPanel from "./ScrollPanel";
 import TimelinePanel from "./TimelinePanel";
 import ErrorBoundary from "../views/elements/ErrorBoundary";
 import RoomPreviewBar from "../views/rooms/RoomPreviewBar";
-import ForwardMessage from "../views/rooms/ForwardMessage";
 import SearchBar from "../views/rooms/SearchBar";
 import RoomUpgradeWarningBar from "../views/rooms/RoomUpgradeWarningBar";
 import PinnedEventsPanel from "../views/rooms/PinnedEventsPanel";
@@ -136,7 +135,6 @@ export interface IState {
  // Whether to highlight the event scrolled to
  isInitialEventHighlighted?: boolean;
  replyToEvent?: MatrixEvent;
- forwardingEvent?: MatrixEvent;
  numUnreadMessages: number;
  draggingFile: boolean;
  searching: boolean;
@@ -324,7 +322,6 @@ export default class RoomView extends React.Component<IProps, IState> {
  initialEventId: RoomViewStore.getInitialEventId(),
  isInitialEventHighlighted: RoomViewStore.isInitialEventHighlighted(),
  replyToEvent: RoomViewStore.getQuotingEvent(),
- forwardingEvent: RoomViewStore.getForwardingEvent(),
  // we should only peek once we have a ready client
  shouldPeek: this.state.matrixClientIsReady && RoomViewStore.shouldPeek(),
  showingPinned: SettingsStore.getValue("PinnedEvents.isOpen", roomId),
@@ -1394,18 +1391,6 @@ export default class RoomView extends React.Component<IProps, IState> {
  dis.dispatch({ action: "open_room_settings" });
  };
 
- private onCancelClick = () => {
- console.log("updateTint from onCancelClick");
- this.updateTint();
- if (this.state.forwardingEvent) {
- dis.dispatch({
- action: 'forward_event',
- event: null,
- });
- }
- dis.fire(Action.FocusComposer);
- };
-
  private onAppsClick = () => {
  dis.dispatch({
  action: "appsDrawer",
@@ -1856,11 +1841,7 @@ export default class RoomView extends React.Component<IProps, IState> {
 
  let aux = null;
  let previewBar;
- let hideCancel = false;
- if (this.state.forwardingEvent) {
- aux = <ForwardMessage onCancelClick={this.onCancelClick} />;
- } else if (this.state.searching) {
- hideCancel = true; // has own cancel
+ if (this.state.searching) {
  aux = <SearchBar
  searchInProgress={this.state.searchInProgress}
  onCancelClick={this.onCancelSearchClick}
@@ -1869,9 +1850,7 @@ export default class RoomView extends React.Component<IProps, IState> {
  />;
  } else if (showRoomUpgradeBar) {
  aux = <RoomUpgradeWarningBar room={this.state.room} recommendation={roomVersionRecommendation} />;
- hideCancel = true;
  } else if (this.state.showingPinned) {
- hideCancel = true; // has own cancel
  aux = <PinnedEventsPanel room={this.state.room} onCancelClick={this.onPinnedClick} />;
  } else if (myMembership !== "join") {
  // We do have a room object for this room, but we're not currently in it.
@@ -1881,7 +1860,6 @@ export default class RoomView extends React.Component<IProps, IState> {
  inviterName = this.props.oobData.inviterName;
  }
  const invitedEmail = this.props.threepidInvite?.toEmail;
- hideCancel = true;
  previewBar = (
  <RoomPreviewBar
  onJoinClick={this.onJoinButtonClicked}
@@ -1999,11 +1977,8 @@ export default class RoomView extends React.Component<IProps, IState> {
  hideMessagePanel = true;
  }
 
- const shouldHighlight = this.state.isInitialEventHighlighted;
  let highlightedEventId = null;
- if (this.state.forwardingEvent) {
- highlightedEventId = this.state.forwardingEvent.getId();
- } else if (shouldHighlight) {
+ if (this.state.isInitialEventHighlighted) {
  highlightedEventId = this.state.initialEventId;
  }
 
@@ -2091,7 +2066,6 @@ export default class RoomView extends React.Component<IProps, IState> {
  onSearchClick={this.onSearchClick}
  onSettingsClick={this.onSettingsClick}
  onPinnedClick={this.onPinnedClick}
- onCancelClick={(aux && !hideCancel) ? this.onCancelClick : null}
  onForgetClick={(myMembership === "leave") ? this.onForgetClick : null}
  onLeaveClick={(myMembership === "join") ? this.onLeaveClick : null}
  e2eStatus={this.state.e2eStatus}

src/components/views/rooms/RoomHeader.js

@@ -22,7 +22,6 @@ import { _t } from '../../../languageHandler';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import RateLimitedFunc from '../../../ratelimitedfunc';
 
-import {CancelButton} from './SimpleRoomHeader';
 import SettingsStore from "../../../settings/SettingsStore";
 import RoomHeaderButtons from '../right_panel/RoomHeaderButtons';
 import E2EIcon from './E2EIcon';
@@ -44,7 +43,6 @@ export default class RoomHeader extends React.Component {
  onPinnedClick: PropTypes.func,
  onSearchClick: PropTypes.func,
  onLeaveClick: PropTypes.func,
- onCancelClick: PropTypes.func,
  e2eStatus: PropTypes.string,
  onAppsClick: PropTypes.func,
  appsShown: PropTypes.bool,
@@ -54,7 +52,6 @@ export default class RoomHeader extends React.Component {
  static defaultProps = {
  editing: false,
  inRoom: false,
- onCancelClick: null,
  };
 
  componentDidMount() {
@@ -120,13 +117,8 @@ export default class RoomHeader extends React.Component {
 
  render() {
  let searchStatus = null;
- let cancelButton = null;
  let pinnedEventsButton = null;
 
- if (this.props.onCancelClick) {
- cancelButton = <CancelButton onClick={this.props.onCancelClick} />;
- }
-
  // don't display the search count until the search completes and
  // gives us a valid (possibly zero) searchCount.
  if (this.props.searchInfo &&
@@ -265,7 +257,6 @@ export default class RoomHeader extends React.Component {
  <div className="mx_RoomHeader_e2eIcon">{ e2eIcon }</div>
  { name }
  { topicElement }
- { cancelButton }
  { rightRow }
  <RoomHeaderButtons />
  </div>

src/components/views/rooms/SimpleRoomHeader.js

@@ -16,23 +16,9 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-import AccessibleButton from '../elements/AccessibleButton';
 import * as sdk from '../../../index';
-import { _t } from '../../../languageHandler';
 import {replaceableComponent} from "../../../utils/replaceableComponent";
 
-// cancel button which is shared between room header and simple room header
-export function CancelButton(props) {
- const {onClick} = props;
-
- return (
- <AccessibleButton className='mx_RoomHeader_cancelButton' onClick={onClick}>
- <img src={require("../../../../res/img/cancel.svg")} className='mx_filterFlipColor'
- width="18" height="18" alt={_t("Cancel")} />
- </AccessibleButton>
- );
-}
-
 /*
  * A stripped-down room header used for things like the user settings
  * and room directory.
@@ -41,18 +27,13 @@ export function CancelButton(props) {
 export default class SimpleRoomHeader extends React.Component {
  static propTypes = {
  title: PropTypes.string,
- onCancelClick: PropTypes.func,
 
  // `src` to a TintableSvg. Optional.
  icon: PropTypes.string,
  };
 
  render() {
- let cancelButton;
  let icon;
- if (this.props.onCancelClick) {
- cancelButton = <CancelButton onClick={this.props.onCancelClick} />;
- }
  if (this.props.icon) {
  const TintableSvg = sdk.getComponent('elements.TintableSvg');
  icon = <TintableSvg
@@ -67,7 +48,6 @@ export default class SimpleRoomHeader extends React.Component {
  <div className="mx_RoomHeader_simpleHeader">
  { icon }
  { this.props.title }
- { cancelButton }
  </div>
  </div>
  </div>

src/i18n/strings/en_EN.json

@@ -1458,7 +1458,6 @@
  "Encrypting your message...": "Encrypting your message...",
  "Your message was sent": "Your message was sent",
  "Failed to send": "Failed to send",
- "Please select the destination room for this message": "Please select the destination room for this message",
  "Scroll to most recent messages": "Scroll to most recent messages",
  "Close preview": "Close preview",
  "and %(count)s others...|other": "and %(count)s others...",

src/stores/RoomViewStore.tsx

@@ -53,8 +53,6 @@ const INITIAL_STATE = {
  // Any error that has occurred during loading
  roomLoadError: null,
 
- forwardingEvent: null,
-
  quotingEvent: null,
 
  replyingToEvent: null,
@@ -149,11 +147,6 @@ class RoomViewStore extends Store<ActionPayload> {
  case 'on_logged_out':
  this.reset();
  break;
- case 'forward_event':
- this.setState({
- forwardingEvent: payload.event,
- });
- break;
  case 'reply_to_event':
  // If currently viewed room does not match the room in which we wish to reply then change rooms
  // this can happen when performing a search across all rooms
@@ -186,7 +179,6 @@ class RoomViewStore extends Store<ActionPayload> {
  roomAlias: payload.room_alias,
  initialEventId: payload.event_id,
  isInitialEventHighlighted: payload.highlighted,
- forwardingEvent: null,
  roomLoading: false,
  roomLoadError: null,
  // should peek by default
@@ -206,14 +198,6 @@ class RoomViewStore extends Store<ActionPayload> {
  newState.replyingToEvent = payload.replyingToEvent;
  }
 
- if (this.state.forwardingEvent) {
- dis.dispatch({
- action: 'send_event',
- room_id: newState.roomId,
- event: this.state.forwardingEvent,
- });
- }
-
  this.setState(newState);
 
  if (payload.auto_join) {
@@ -419,11 +403,6 @@ class RoomViewStore extends Store<ActionPayload> {
  return this.state.joinError;
  }
 
- // The mxEvent if one is about to be forwarded
- public getForwardingEvent() {
- return this.state.forwardingEvent;
- }
-
  // The mxEvent if one is currently being replied to/quoted
  public getQuotingEvent() {
  return this.state.replyingToEvent;