Typescript fixes due to MatrixEvent being TSified

src/Avatar.ts

@@ -14,18 +14,23 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {RoomMember} from "matrix-js-sdk/src/models/room-member";
-import {User} from "matrix-js-sdk/src/models/user";
-import {Room} from "matrix-js-sdk/src/models/room";
+import { RoomMember } from "matrix-js-sdk/src/models/room-member";
+import { User } from "matrix-js-sdk/src/models/user";
+import { Room } from "matrix-js-sdk/src/models/room";
 
 import DMRoomMap from './utils/DMRoomMap';
-import {mediaFromMxc} from "./customisations/Media";
+import { mediaFromMxc } from "./customisations/Media";
 import SettingsStore from "./settings/SettingsStore";
 
 export type ResizeMethod = "crop" | "scale";
 
 // Not to be used for BaseAvatar urls as that has similar default avatar fallback already
-export function avatarUrlForMember(member: RoomMember, width: number, height: number, resizeMethod: ResizeMethod) {
+export function avatarUrlForMember(
+ member: RoomMember,
+ width: number,
+ height: number,
+ resizeMethod: ResizeMethod,
+): string {
  let url: string;
  if (member?.getMxcAvatarUrl()) {
  url = mediaFromMxc(member.getMxcAvatarUrl()).getThumbnailOfSourceHttp(width, height, resizeMethod);
@@ -39,7 +44,12 @@ export function avatarUrlForMember(member: RoomMember, width: number, height: nu
  return url;
 }
 
-export function avatarUrlForUser(user: User, width: number, height: number, resizeMethod?: ResizeMethod) {
+export function avatarUrlForUser(
+ user: Pick<User, "avatarUrl">,
+ width: number,
+ height: number,
+ resizeMethod?: ResizeMethod,
+): string | null {
  if (!user.avatarUrl) return null;
  return mediaFromMxc(user.avatarUrl).getThumbnailOfSourceHttp(width, height, resizeMethod);
 }

src/Searching.js

@@ -468,7 +468,7 @@ function restoreEncryptionInfo(searchResultSlice = []) {
  ev.event.curve25519Key,
  ev.event.ed25519Key,
  );
- ev._forwardingCurve25519KeyChain = ev.event.forwardingCurve25519KeyChain;
+ ev.forwardingCurve25519KeyChain = ev.event.forwardingCurve25519KeyChain;
 
  delete ev.event.curve25519Key;
  delete ev.event.ed25519Key;

src/autocomplete/UserProvider.tsx

@@ -20,19 +20,19 @@ limitations under the License.
 import React from 'react';
 import { _t } from '../languageHandler';
 import AutocompleteProvider from './AutocompleteProvider';
-import {PillCompletion} from './Components';
+import { PillCompletion } from './Components';
 import * as sdk from '../index';
 import QueryMatcher from './QueryMatcher';
-import {sortBy} from 'lodash';
-import {MatrixClientPeg} from '../MatrixClientPeg';
-
-import MatrixEvent from "matrix-js-sdk/src/models/event";
-import Room from "matrix-js-sdk/src/models/room";
-import RoomMember from "matrix-js-sdk/src/models/room-member";
-import RoomState from "matrix-js-sdk/src/models/room-state";
-import EventTimeline from "matrix-js-sdk/src/models/event-timeline";
-import {makeUserPermalink} from "../utils/permalinks/Permalinks";
-import {ICompletion, ISelectionRange} from "./Autocompleter";
+import { sortBy } from 'lodash';
+import { MatrixClientPeg } from '../MatrixClientPeg';
+
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { RoomMember } from "matrix-js-sdk/src/models/room-member";
+import { RoomState } from "matrix-js-sdk/src/models/room-state";
+import { EventTimeline } from "matrix-js-sdk/src/models/event-timeline";
+import { makeUserPermalink } from "../utils/permalinks/Permalinks";
+import { ICompletion, ISelectionRange } from "./Autocompleter";
 
 const USER_REGEX = /\B@\S*/g;
 

src/components/structures/RoomView.tsx

@@ -25,6 +25,7 @@ import React, { createRef } from 'react';
 import classNames from 'classnames';
 import { Room } from "matrix-js-sdk/src/models/room";
 import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { SearchResult } from "matrix-js-sdk/src/models/search-result";
 import { EventSubscription } from "fbemitter";
 
 import shouldHideEvent from '../../shouldHideEvent';
@@ -142,7 +143,7 @@ export interface IState {
  searchResults?: XOR<{}, {
  count: number;
  highlights: string[];
- results: MatrixEvent[];
+ results: SearchResult[];
  next_batch: string; // eslint-disable-line camelcase
  }>;
  searchHighlights?: string[];

src/components/views/dialogs/DevtoolsDialog.tsx

@@ -525,11 +525,11 @@ class RoomStateExplorer extends React.PureComponent<IExplorerProps, IRoomStateEx
 }
 
 interface IAccountDataExplorerState {
+ [inputId: string]: boolean | string | any;
  isRoomAccountData: boolean;
  event?: MatrixEvent;
  editing: boolean;
  queryEventType: string;
- [inputId: string]: boolean | string;
 }
 
 class AccountDataExplorer extends React.PureComponent<IExplorerProps, IAccountDataExplorerState> {

src/components/views/dialogs/InviteDialog.tsx

@@ -153,8 +153,8 @@ class ThreepidMember extends Member {
 }
 
 interface IDMUserTileProps {
- member: RoomMember;
- onRemove(member: RoomMember): void;
+ member: Member;
+ onRemove(member: Member): void;
 }
 
 class DMUserTile extends React.PureComponent<IDMUserTileProps> {
@@ -168,7 +168,7 @@ class DMUserTile extends React.PureComponent<IDMUserTileProps> {
 
  render() {
  const avatarSize = 20;
- const avatar = this.props.member.isEmail
+ const avatar = (this.props.member as ThreepidMember).isEmail
  ? <img
  className='mx_InviteDialog_userTile_avatar mx_InviteDialog_userTile_threepidAvatar'
  src={require("../../../../res/img/icon-email-pill-avatar.svg")}
@@ -210,9 +210,9 @@ class DMUserTile extends React.PureComponent<IDMUserTileProps> {
 }
 
 interface IDMRoomTileProps {
- member: RoomMember;
+ member: Member;
  lastActiveTs: number;
- onToggle(member: RoomMember): void;
+ onToggle(member: Member): void;
  highlightWord: string;
  isSelected: boolean;
 }
@@ -270,7 +270,7 @@ class DMRoomTile extends React.PureComponent<IDMRoomTileProps> {
  }
 
  const avatarSize = 36;
- const avatar = this.props.member.isEmail
+ const avatar = (this.props.member as ThreepidMember).isEmail
  ? <img
  src={require("../../../../res/img/icon-email-pill-avatar.svg")}
  width={avatarSize} height={avatarSize} />
@@ -298,7 +298,7 @@ class DMRoomTile extends React.PureComponent<IDMRoomTileProps> {
  </span>
  );
 
- const caption = this.props.member.isEmail
+ const caption = (this.props.member as ThreepidMember).isEmail
  ? _t("Invite by email")
  : this.highlightName(this.props.member.userId);
 
@@ -334,7 +334,7 @@ interface IInviteDialogProps {
 }
 
 interface IInviteDialogState {
- targets: RoomMember[]; // array of Member objects (see interface above)
+ targets: Member[]; // array of Member objects (see interface above)
  filterText: string;
  recents: { user: Member, userId: string }[];
  numRecentsShown: number;

src/components/views/elements/MemberEventListSummary.tsx

@@ -24,7 +24,7 @@ import { _t } from '../../../languageHandler';
 import { formatCommaSeparatedList } from '../../../utils/FormattingUtils';
 import { isValid3pidInvite } from "../../../RoomInvite";
 import EventListSummary from "./EventListSummary";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 
 interface IProps {
  // An array of member events to summarise
@@ -303,7 +303,7 @@ export default class MemberEventListSummary extends React.Component<IProps> {
  return res;
  }
 
- private static getTransitionSequence(events: MatrixEvent[]) {
+ private static getTransitionSequence(events: IUserEvents[]) {
  return events.map(MemberEventListSummary.getTransition);
  }
 
@@ -315,7 +315,7 @@ export default class MemberEventListSummary extends React.Component<IProps> {
  * @returns {string?} the transition type given to this event. This defaults to `null`
  * if a transition is not recognised.
  */
- private static getTransition(e: MatrixEvent): TransitionType {
+ private static getTransition(e: IUserEvents): TransitionType {
  if (e.mxEvent.getType() === 'm.room.third_party_invite') {
  // Handle 3pid invites the same as invites so they get bundled together
  if (!isValid3pidInvite(e.mxEvent)) {

src/components/views/messages/MVoiceMessageBody.tsx

@@ -24,6 +24,7 @@ import {_t} from "../../../languageHandler";
 import {mediaFromContent} from "../../../customisations/Media";
 import {decryptFile} from "../../../utils/DecryptFile";
 import RecordingPlayback from "../voice_messages/RecordingPlayback";
+import {IMediaEventContent} from "../../../customisations/models/IMediaEventContent";
 
 interface IProps {
  mxEvent: MatrixEvent;
@@ -45,7 +46,7 @@ export default class MVoiceMessageBody extends React.PureComponent<IProps, IStat
 
  public async componentDidMount() {
  let buffer: ArrayBuffer;
- const content = this.props.mxEvent.getContent();
+ const content: IMediaEventContent = this.props.mxEvent.getContent();
  const media = mediaFromContent(content);
  if (media.isEncrypted) {
  try {

src/components/views/messages/SenderProfile.tsx

@@ -17,10 +17,10 @@
 import React from 'react';
 import Flair from '../elements/Flair.js';
 import FlairStore from '../../../stores/FlairStore';
-import {getUserNameColorClass} from '../../../utils/FormattingUtils';
+import { getUserNameColorClass } from '../../../utils/FormattingUtils';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
-import {replaceableComponent} from "../../../utils/replaceableComponent";
-import MatrixEvent from "matrix-js-sdk/src/models/event";
+import { replaceableComponent } from "../../../utils/replaceableComponent";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 
 interface IProps {
  mxEvent: MatrixEvent;

src/components/views/right_panel/EncryptionInfo.tsx

@@ -17,8 +17,9 @@ limitations under the License.
 import React from "react";
 
 import * as sdk from "../../../index";
-import {_t} from "../../../languageHandler";
-import {RoomMember} from "matrix-js-sdk/src/models/room-member";
+import { _t } from "../../../languageHandler";
+import { RoomMember } from "matrix-js-sdk/src/models/room-member";
+import { User } from "matrix-js-sdk/src/models/user";
 
 export const PendingActionSpinner = ({text}) => {
  const Spinner = sdk.getComponent('elements.Spinner');
@@ -31,7 +32,7 @@ export const PendingActionSpinner = ({text}) => {
 interface IProps {
  waitingForOtherParty: boolean;
  waitingForNetwork: boolean;
- member: RoomMember;
+ member: RoomMember | User;
  onStartVerification: () => Promise<void>;
  isRoomEncrypted: boolean;
  inDialog: boolean;
@@ -55,7 +56,7 @@ const EncryptionInfo: React.FC<IProps> = ({
  text = _t("Accept on your other login…");
  } else {
  text = _t("Waiting for %(displayName)s to accept…", {
- displayName: member.displayName || member.name || member.userId,
+ displayName: (member as User).displayName || (member as RoomMember).name || member.userId,
  });
  }
  } else {