Use MatrixClientPeg::safeGet for strict typing (#10989)

src/autocomplete/NotifProvider.tsx

@@ -38,9 +38,9 @@ export default class NotifProvider extends AutocompleteProvider {
         force = false,
         limit = -1,
     ): Promise<ICompletion[]> {
-        const client = MatrixClientPeg.get();
+        const client = MatrixClientPeg.safeGet();
 
-        if (!this.room.currentState.mayTriggerNotifOfType("room", client.credentials.userId!)) return [];
+        if (!this.room.currentState.mayTriggerNotifOfType("room", client.getSafeUserId())) return [];
 
         const { command, range } = this.getCurrentCommand(query, selection, force);
         if (

src/autocomplete/RoomProvider.tsx

@@ -65,7 +65,7 @@ export default class RoomProvider extends AutocompleteProvider {
     }
 
     protected getRooms(): Room[] {
-        const cli = MatrixClientPeg.get();
+        const cli = MatrixClientPeg.safeGet();
 
         // filter out spaces here as they get their own autocomplete provider
         return cli

src/autocomplete/SpaceProvider.tsx

@@ -24,7 +24,7 @@ import RoomProvider from "./RoomProvider";
 
 export default class SpaceProvider extends RoomProvider {
     protected getRooms(): Room[] {
-        return MatrixClientPeg.get()
+        return MatrixClientPeg.safeGet()
             .getVisibleRooms(SettingsStore.getValue("feature_dynamic_room_predecessors"))
             .filter((r) => r.isSpaceRoom());
     }

src/autocomplete/UserProvider.tsx

@@ -60,15 +60,13 @@ export default class UserProvider extends AutocompleteProvider {
             shouldMatchWordsOnly: false,
         });
 
-        MatrixClientPeg.get().on(RoomEvent.Timeline, this.onRoomTimeline);
-        MatrixClientPeg.get().on(RoomStateEvent.Update, this.onRoomStateUpdate);
+        MatrixClientPeg.safeGet().on(RoomEvent.Timeline, this.onRoomTimeline);
+        MatrixClientPeg.safeGet().on(RoomStateEvent.Update, this.onRoomStateUpdate);
     }
 
     public destroy(): void {
-        if (MatrixClientPeg.get()) {
-            MatrixClientPeg.get().removeListener(RoomEvent.Timeline, this.onRoomTimeline);
-            MatrixClientPeg.get().removeListener(RoomStateEvent.Update, this.onRoomStateUpdate);
-        }
+        MatrixClientPeg.get()?.removeListener(RoomEvent.Timeline, this.onRoomTimeline);
+        MatrixClientPeg.get()?.removeListener(RoomStateEvent.Update, this.onRoomStateUpdate);
     }
 
     private onRoomTimeline = (
@@ -155,7 +153,7 @@ export default class UserProvider extends AutocompleteProvider {
             lastSpoken[event.getSender()!] = event.getTs();
         }
 
-        const currentUserId = MatrixClientPeg.get().credentials.userId;
+        const currentUserId = MatrixClientPeg.safeGet().credentials.userId;
         this.users = this.room.getJoinedMembers().filter(({ userId }) => userId !== currentUserId);
         this.users = this.users.concat(this.room.getMembersWithMembership("invite"));
 
@@ -167,7 +165,7 @@ export default class UserProvider extends AutocompleteProvider {
     public onUserSpoke(user: RoomMember | null): void {
         if (!this.users) return;
         if (!user) return;
-        if (user.userId === MatrixClientPeg.get().credentials.userId) return;
+        if (user.userId === MatrixClientPeg.safeGet().getSafeUserId()) return;
 
         // Move the user that spoke to the front of the array
         this.users.splice(