Avoid using MatrixClientPeg where it isn't needed

Author: t3chguy

src/RoomInvite.tsx

@@ -22,7 +22,6 @@ import { logger } from "matrix-js-sdk/src/logger";
 import { EventType } from "matrix-js-sdk/src/@types/event";
 import { MatrixClient } from "matrix-js-sdk/src/matrix";
 
-import { MatrixClientPeg } from "./MatrixClientPeg";
 import MultiInviter, { CompletionStates } from "./utils/MultiInviter";
 import Modal from "./Modal";
 import { _t } from "./languageHandler";
@@ -115,7 +114,7 @@ export function inviteUsersToRoom(
 ): Promise<void> {
     return inviteMultipleToRoom(client, roomId, userIds, sendSharedHistoryKeys, progressCallback)
         .then((result) => {
-            const room = MatrixClientPeg.get().getRoom(roomId)!;
+            const room = client.getRoom(roomId)!;
             showAnyInviteErrors(result.states, room, result.inviter);
         })
         .catch((err) => {
@@ -153,7 +152,7 @@ export function showAnyInviteErrors(
             }
         }
 
-        const cli = MatrixClientPeg.get();
+        const cli = room.client;
         if (errorList.length > 0) {
             // React 16 doesn't let us use `errorList.join(<br />)` anymore, so this is our solution
             const description = (

src/Rooms.ts

@@ -46,7 +46,7 @@ export function getDisplayAliasForAliasSet(canonicalAlias: string | null, altAli
 export function guessAndSetDMRoom(room: Room, isDirect: boolean): Promise<void> {
     let newTarget;
     if (isDirect) {
-        const guessedUserId = guessDMRoomTargetId(room, MatrixClientPeg.get().getUserId()!);
+        const guessedUserId = guessDMRoomTargetId(room, room.client.getSafeUserId());
         newTarget = guessedUserId;
     } else {
         newTarget = null;

src/WhoIsTyping.ts

@@ -17,15 +17,14 @@ limitations under the License.
 import { Room } from "matrix-js-sdk/src/models/room";
 import { RoomMember } from "matrix-js-sdk/src/models/room-member";
 
-import { MatrixClientPeg } from "./MatrixClientPeg";
 import { _t } from "./languageHandler";
 
 export function usersTypingApartFromMeAndIgnored(room: Room): RoomMember[] {
-    return usersTyping(room, [MatrixClientPeg.get().getUserId()!].concat(MatrixClientPeg.get().getIgnoredUsers()));
+    return usersTyping(room, [room.client.getSafeUserId()].concat(room.client.getIgnoredUsers()));
 }
 
 export function usersTypingApartFromMe(room: Room): RoomMember[] {
-    return usersTyping(room, [MatrixClientPeg.get().getUserId()!]);
+    return usersTyping(room, [room.client.getSafeUserId()]);
 }
 
 /**