Conform more of the codebase to strictNullChecks (matrix-org#10505

* Conform more of the codebase to `strictNullChecks` * Iterate * Conform more of the codebase to `strictNullChecks` * Iterate * Iterate * Iterate * Iterate

Author: t3chguy

src/MatrixClientPeg.ts

@@ -332,15 +332,15 @@ class MatrixClientPegClass implements IMatrixClientPeg {
 
  homeserverUrl: this.matrixClient.baseUrl,
  identityServerUrl: this.matrixClient.idBaseUrl,
- userId: this.matrixClient.credentials.userId,
+ userId: this.matrixClient.getSafeUserId(),
  deviceId: this.matrixClient.getDeviceId() ?? undefined,
  accessToken: this.matrixClient.getAccessToken(),
  guest: this.matrixClient.isGuest(),
  };
  }
 
  public getHomeserverName(): string {
- const matches = /^@[^:]+:(.+)$/.exec(this.matrixClient.credentials.userId);
+ const matches = /^@[^:]+:(.+)$/.exec(this.matrixClient.getSafeUserId());
  if (matches === null || matches.length < 1) {
  throw new Error("Failed to derive homeserver name from user ID!");
  }

src/components/structures/SpaceHierarchy.tsx

@@ -102,7 +102,7 @@ const Tile: React.FC<ITileProps> = ({
 }) => {
  const cli = useContext(MatrixClientContext);
  const [joinedRoom, setJoinedRoom] = useState<Room | undefined>(() => {
- const cliRoom = cli.getRoom(room.room_id);
+ const cliRoom = cli?.getRoom(room.room_id);
  return cliRoom?.getMyMembership() === "join" ? cliRoom : undefined;
  });
  const joinedRoomName = useTypedEventEmitterState(joinedRoom, RoomEvent.Name, (room) => room?.name);

src/components/structures/TimelinePanel.tsx

@@ -30,7 +30,6 @@ import { ClientEvent } from "matrix-js-sdk/src/client";
 import { Thread, ThreadEvent } from "matrix-js-sdk/src/models/thread";
 import { ReceiptType } from "matrix-js-sdk/src/@types/read_receipts";
 import { MatrixError } from "matrix-js-sdk/src/http-api";
-import { ReadReceipt } from "matrix-js-sdk/src/models/read-receipt";
 import { Relations } from "matrix-js-sdk/src/models/relations";
 
 import SettingsStore from "../../settings/SettingsStore";
@@ -515,23 +514,22 @@ class TimelinePanel extends React.Component<IProps, IState> {
 
  if (count > 0) {
  debuglog("Unpaginating", count, "in direction", dir);
- this.timelineWindow.unpaginate(count, backwards);
+ this.timelineWindow?.unpaginate(count, backwards);
 
  const { events, liveEvents, firstVisibleEventIndex } = this.getEvents();
  this.buildLegacyCallEventGroupers(events);
- const newState: Partial<IState> = {
+ this.setState({
  events,
  liveEvents,
  firstVisibleEventIndex,
- };
+ });
 
  // We can now paginate in the unpaginated direction
  if (backwards) {
- newState.canBackPaginate = true;
+ this.setState({ canBackPaginate: true });
  } else {
- newState.canForwardPaginate = true;
+ this.setState({ canForwardPaginate: true });
  }
- this.setState<null>(newState);
  }
  };
 
@@ -636,6 +634,7 @@ class TimelinePanel extends React.Component<IProps, IState> {
  private doManageReadMarkers = debounce(
  () => {
  const rmPosition = this.getReadMarkerPosition();
+ if (rmPosition === null) return;
  // we hide the read marker when it first comes onto the screen, but if
  // it goes back off the top of the screen (presumably because the user
  // clicks on the 'jump to bottom' button), we need to re-enable it.
@@ -1125,7 +1124,7 @@ class TimelinePanel extends React.Component<IProps, IState> {
  return;
  }
  const lastDisplayedEvent = this.state.events[lastDisplayedIndex];
- this.setReadMarker(lastDisplayedEvent.getId(), lastDisplayedEvent.getTs());
+ this.setReadMarker(lastDisplayedEvent.getId()!, lastDisplayedEvent.getTs());
 
  // the read-marker should become invisible, so that if the user scrolls
  // down, they don't see it.
@@ -1141,7 +1140,7 @@ class TimelinePanel extends React.Component<IProps, IState> {
 
  // advance the read marker past any events we sent ourselves.
  private advanceReadMarkerPastMyEvents(): void {
- if (!this.props.manageReadMarkers) return;
+ if (!this.props.manageReadMarkers || !this.timelineWindow) return;
 
  // we call `timelineWindow.getEvents()` rather than using
  // `this.state.liveEvents`, because React batches the update to the
@@ -1171,7 +1170,7 @@ class TimelinePanel extends React.Component<IProps, IState> {
  i--;
 
  const ev = events[i];
- this.setReadMarker(ev.getId(), ev.getTs());
+ this.setReadMarker(ev.getId()!, ev.getTs());
  }
 
  /* jump down to the bottom of this room, where new events are arriving
@@ -1280,6 +1279,7 @@ class TimelinePanel extends React.Component<IProps, IState> {
  public getReadMarkerPosition = (): number | null => {
  if (!this.props.manageReadMarkers) return null;
  if (!this.messagePanel.current) return null;
+ if (!this.props.timelineSet.room) return null;
 
  const ret = this.messagePanel.current.getReadMarkerPosition();
  if (ret !== null) {
@@ -1629,7 +1629,7 @@ class TimelinePanel extends React.Component<IProps, IState> {
  return 0;
  }
 
- const userId = cli.credentials.userId;
+ const userId = cli.getSafeUserId();
 
  // get the user's membership at the last event by getting the timeline
  // that the event belongs to, and traversing the timeline looking for
@@ -1648,7 +1648,7 @@ class TimelinePanel extends React.Component<IProps, IState> {
  continue;
  }
 
- userMembership = timeline.getState(EventTimeline.FORWARDS).getMember(userId)?.membership ?? "leave";
+ userMembership = timeline.getState(EventTimeline.FORWARDS)?.getMember(userId)?.membership ?? "leave";
  const timelineEvents = timeline.getEvents();
  for (let j = timelineEvents.length - 1; j >= 0; j--) {
  const event = timelineEvents[j];
@@ -1769,7 +1769,7 @@ class TimelinePanel extends React.Component<IProps, IState> {
  for (let i = this.state.liveEvents.length - 1; i >= 0; --i) {
  const ev = this.state.liveEvents[i];
 
- const node = messagePanel.getNodeForEventId(ev.getId());
+ const node = messagePanel.getNodeForEventId(ev.getId()!);
  const isInView = isNodeInView(node);
 
  // when we've reached the first visible event, and the previous
@@ -1829,8 +1829,8 @@ class TimelinePanel extends React.Component<IProps, IState> {
  }
 
  const myUserId = client.getSafeUserId();
- const receiptStore: ReadReceipt<any, any> = this.props.timelineSet.thread ?? this.props.timelineSet.room;
- return receiptStore?.getEventReadUpTo(myUserId, ignoreSynthesized);
+ const receiptStore = this.props.timelineSet.thread ?? this.props.timelineSet.room;
+ return receiptStore?.getEventReadUpTo(myUserId, ignoreSynthesized) ?? null;
  }
 
  private setReadMarker(eventId: string | null, eventTs: number, inhibitSetState = false): void {
@@ -1924,7 +1924,7 @@ class TimelinePanel extends React.Component<IProps, IState> {
  // If the state is PREPARED or CATCHUP, we're still waiting for the js-sdk to sync with
  // the HS and fetch the latest events, so we are effectively forward paginating.
  const forwardPaginating =
- this.state.forwardPaginating || ["PREPARED", "CATCHUP"].includes(this.state.clientSyncState);
+ this.state.forwardPaginating || ["PREPARED", "CATCHUP"].includes(this.state.clientSyncState!);
  const events = this.state.firstVisibleEventIndex
  ? this.state.events.slice(this.state.firstVisibleEventIndex)
  : this.state.events;
@@ -1985,7 +1985,7 @@ function serializeEventIdsFromTimelineSets(timelineSets: EventTimelineSet[]): {
  // Add a special label when it is the live timeline so we can tell
  // it apart from the others
  const isLiveTimeline = timeline === liveTimeline;
- timelineMap[isLiveTimeline ? "liveTimeline" : `${index}`] = timeline.getEvents().map((ev) => ev.getId());
+ timelineMap[isLiveTimeline ? "liveTimeline" : `${index}`] = timeline.getEvents().map((ev) => ev.getId()!);
  });
 
  return timelineMap;

src/components/views/context_menus/RoomGeneralContextMenu.tsx

@@ -89,6 +89,7 @@ export const RoomGeneralContextMenu: React.FC<RoomGeneralContextMenuProps> = ({
  };
 
  const onTagRoom = (ev: ButtonEvent, tagId: TagID): void => {
+ if (!cli) return;
  if (tagId === DefaultTagID.Favourite || tagId === DefaultTagID.LowPriority) {
  const inverseTag = tagId === DefaultTagID.Favourite ? DefaultTagID.LowPriority : DefaultTagID.Favourite;
  const isApplied = RoomListStore.instance.getTagsForRoom(room).includes(tagId);

src/components/views/dialogs/ConfirmAndWaitRedactDialog.tsx

@@ -53,7 +53,7 @@ export default class ConfirmAndWaitRedactDialog extends React.PureComponent<IPro
  };
  }
 
- public onParentFinished = async (proceed: boolean): Promise<void> => {
+ public onParentFinished = async (proceed?: boolean): Promise<void> => {
  if (proceed) {
  this.setState({ isRedacting: true });
  try {

src/components/views/dialogs/ConfirmRedactDialog.tsx

@@ -26,7 +26,8 @@ import ErrorDialog from "./ErrorDialog";
 import TextInputDialog from "./TextInputDialog";
 
 interface IProps {
- onFinished: (success: boolean) => void;
+ onFinished(success?: false, reason?: void): void;
+ onFinished(success: true, reason?: string): void;
 }
 
 /*
@@ -67,7 +68,7 @@ export function createRedactEventDialog({
  Modal.createDialog(
  ConfirmRedactDialog,
  {
- onFinished: async (proceed: boolean, reason?: string): Promise<void> => {
+ onFinished: async (proceed, reason): Promise<void> => {
  if (!proceed) return;
 
  const cli = MatrixClientPeg.get();

src/components/views/dialogs/KeySignatureUploadFailedDialog.tsx

@@ -72,7 +72,7 @@ const KeySignatureUploadFailedDialog: React.FC<IProps> = ({ failures, source, co
  }, [continuation, onFinished]);
 
  let body;
- if (!success && !cancelled && continuation && retry > 0) {
+ if (!success && !cancelled && retry > 0) {
  const reason = causes.get(source) || defaultCause;
  const brand = SdkConfig.get().brand;
 

src/components/views/dialogs/MessageEditHistoryDialog.tsx

@@ -20,6 +20,7 @@ import { EventType, RelationType } from "matrix-js-sdk/src/@types/event";
 import { defer } from "matrix-js-sdk/src/utils";
 import { logger } from "matrix-js-sdk/src/logger";
 import { MatrixClient } from "matrix-js-sdk/src/client";
+import { MatrixError } from "matrix-js-sdk/src/http-api";
 
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import { _t } from "../../../languageHandler";
@@ -37,12 +38,10 @@ interface IProps {
 }
 
 interface IState {
- originalEvent: MatrixEvent;
- error: {
- errcode: string;
- };
+ originalEvent: MatrixEvent | null;
+ error: MatrixError | null;
  events: MatrixEvent[];
- nextBatch: string;
+ nextBatch: string | null;
  isLoading: boolean;
  isTwelveHour: boolean;
 }
@@ -65,9 +64,9 @@ export default class MessageEditHistoryDialog extends React.PureComponent<IProps
  // bail out on backwards as we only paginate in one direction
  return false;
  }
- const opts = { from: this.state.nextBatch };
- const roomId = this.props.mxEvent.getRoomId();
- const eventId = this.props.mxEvent.getId();
+ const opts = { from: this.state.nextBatch ?? undefined };
+ const roomId = this.props.mxEvent.getRoomId()!;
+ const eventId = this.props.mxEvent.getId()!;
  const client = MatrixClientPeg.get();
 
  const { resolve, reject, promise } = defer<boolean>();
@@ -80,17 +79,17 @@ export default class MessageEditHistoryDialog extends React.PureComponent<IProps
  if (error.errcode) {
  logger.error("fetching /relations failed with error", error);
  }
- this.setState({ error }, () => reject(error));
+ this.setState({ error: error as MatrixError }, () => reject(error));
  return promise;
  }
 
  const newEvents = result.events;
  this.locallyRedactEventsIfNeeded(newEvents);
  this.setState(
  {
- originalEvent: this.state.originalEvent || result.originalEvent,
+ originalEvent: this.state.originalEvent ?? result.originalEvent ?? null,
  events: this.state.events.concat(newEvents),
- nextBatch: result.nextBatch,
+ nextBatch: result.nextBatch ?? null,
  isLoading: false,
  },
  () => {
@@ -105,6 +104,7 @@ export default class MessageEditHistoryDialog extends React.PureComponent<IProps
  const roomId = this.props.mxEvent.getRoomId();
  const client = MatrixClientPeg.get();
  const room = client.getRoom(roomId);
+ if (!room) return;
  const pendingEvents = room.getPendingEvents();
  for (const e of newEvents) {
  const pendingRedaction = pendingEvents.find((pe) => {
@@ -133,15 +133,15 @@ export default class MessageEditHistoryDialog extends React.PureComponent<IProps
  if (!lastEvent || wantsDateSeparator(lastEvent.getDate() || undefined, e.getDate() || undefined)) {
  nodes.push(
  <li key={e.getTs() + "~"}>
- <DateSeparator roomId={e.getRoomId()} ts={e.getTs()} />
+ <DateSeparator roomId={e.getRoomId()!} ts={e.getTs()} />
  </li>,
  );
  }
  const isBaseEvent = e.getId() === baseEventId;
  nodes.push(
  <EditHistoryMessage
  key={e.getId()}
- previousEdit={!isBaseEvent ? allEvents[i + 1] : null}
+ previousEdit={!isBaseEvent ? allEvents[i + 1] : undefined}
  isBaseEvent={isBaseEvent}
  mxEvent={e}
  isTwelveHour={this.state.isTwelveHour}

src/components/views/dialogs/ServerOfflineDialog.tsx

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import * as React from "react";
+import React, { ReactNode } from "react";
 
 import BaseDialog from "./BaseDialog";
 import { _t } from "../../../languageHandler";
@@ -46,7 +46,7 @@ export default class ServerOfflineDialog extends React.PureComponent<IProps> {
  this.forceUpdate(); // no state to worry about
  };
 
- private renderTimeline(): React.ReactElement[] {
+ private renderTimeline(): ReactNode[] {
  return EchoStore.instance.contexts.map((c, i) => {
  if (!c.firstFailedTime) return null; // not useful
  if (!(c instanceof RoomEchoContext))

src/components/views/dialogs/SlidingSyncOptionsDialog.tsx

@@ -124,7 +124,7 @@ export const SlidingSyncOptionsDialog: React.FC<{ onFinished(enabled: boolean):
  value={currentProxy}
  button={_t("Enable")}
  validator={validProxy}
- onFinished={(enable: boolean, proxyUrl: string) => {
+ onFinished={(enable, proxyUrl) => {
  if (enable) {
  SettingsStore.setValue("feature_sliding_sync_proxy_url", null, SettingLevel.DEVICE, proxyUrl);
  onFinished(true);