Eliminate the use of MatrixClientPeg in utils (#10910)
This commit is contained in:
parent
a0c2676c38
commit
30429df948
108 changed files with 409 additions and 325 deletions
|
@ -18,7 +18,6 @@ import { logger } from "matrix-js-sdk/src/logger";
|
|||
import { ClientEvent, MatrixClient } from "matrix-js-sdk/src/matrix";
|
||||
|
||||
import defaultDispatcher from "../dispatcher/dispatcher";
|
||||
import { MatrixClientPeg } from "../MatrixClientPeg";
|
||||
import { LocalRoom, LocalRoomState } from "../models/LocalRoom";
|
||||
import { isLocalRoom } from "./localRoom/isLocalRoom";
|
||||
import { isRoomReady } from "./localRoom/isRoomReady";
|
||||
|
@ -39,10 +38,9 @@ import { isRoomReady } from "./localRoom/isRoomReady";
|
|||
export async function doMaybeLocalRoomAction<T>(
|
||||
roomId: string,
|
||||
fn: (actualRoomId: string) => Promise<T>,
|
||||
client?: MatrixClient,
|
||||
client: MatrixClient,
|
||||
): Promise<T> {
|
||||
if (isLocalRoom(roomId)) {
|
||||
client = client ?? MatrixClientPeg.get();
|
||||
const room = client.getRoom(roomId) as LocalRoom;
|
||||
|
||||
if (room.isCreated) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue