Eliminate the use of MatrixClientPeg in utils (#10910)

src/RoomInvite.tsx

@@ -20,6 +20,7 @@ import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 import { User } from "matrix-js-sdk/src/models/user";
 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";
@@ -49,12 +50,13 @@ export interface IInviteResult {
  * @returns {Promise} Promise
  */
 export function inviteMultipleToRoom(
+    client: MatrixClient,
     roomId: string,
     addresses: string[],
     sendSharedHistoryKeys = false,
     progressCallback?: () => void,
 ): Promise<IInviteResult> {
-    const inviter = new MultiInviter(roomId, progressCallback);
+    const inviter = new MultiInviter(client, roomId, progressCallback);
     return inviter
         .invite(addresses, undefined, sendSharedHistoryKeys)
         .then((states) => Promise.resolve({ states, inviter }));
@@ -105,12 +107,13 @@ export function isValid3pidInvite(event: MatrixEvent): boolean {
 }
 
 export function inviteUsersToRoom(
+    client: MatrixClient,
     roomId: string,
     userIds: string[],
     sendSharedHistoryKeys = false,
     progressCallback?: () => void,
 ): Promise<void> {
-    return inviteMultipleToRoom(roomId, userIds, sendSharedHistoryKeys, progressCallback)
+    return inviteMultipleToRoom(client, roomId, userIds, sendSharedHistoryKeys, progressCallback)
         .then((result) => {
             const room = MatrixClientPeg.get().getRoom(roomId)!;
             showAnyInviteErrors(result.states, room, result.inviter);