Fix CI errors

Co-authored-by: Aaron Ogle <aaron@geekgonecrazy.com>
RocketChat · May 20, 2022 · df6279a · df6279a
1 parent a9fc18a
commit df6279a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/apps/meteor/app/federation-v2/server/matrix-client/message.ts b/apps/meteor/app/federation-v2/server/matrix-client/message.ts
@@ -18,7 +18,7 @@ export const send = async (message: IMessage): Promise<IMessage> => {
 		throw new Error(`Could not find room matrix id for ${message.rid}`);
 	}
 
-	const intent = matrixBridge.getIntent(userMatrixId);
+	const intent = matrixBridge.getInstance().getIntent(userMatrixId);
 	await intent.sendText(roomMatrixId, message.msg || '...not-supported...');
 
 	return message;

diff --git a/apps/meteor/app/federation-v2/server/matrix-client/room.ts b/apps/meteor/app/federation-v2/server/matrix-client/room.ts
@@ -23,7 +23,7 @@ export const create = async (user: IUser, room: IRoom): Promise<ICreateRoomResul
 		throw new Error(`Could not find user matrix id for ${user._id}`);
 	}
 
-	const intent = matrixBridge.getIntent(userMatrixId);
+	const intent = matrixBridge.getInstance().getIntent(userMatrixId);
 
 	const roomName = `@${room.name}`;
 

diff --git a/apps/meteor/app/federation-v2/server/matrix-client/user.ts b/apps/meteor/app/federation-v2/server/matrix-client/user.ts
@@ -85,14 +85,14 @@ export const invite = async (inviterId: string, roomId: string, invitedId: strin
 	// Invite && Auto-join if the user is Rocket.Chat controlled
 	if (!invitedUserIsRemote) {
 		// Invite the user to the room
-		await matrixBridge.getIntent(inviterUser.mui).invite(matrixRoomId, invitedUserMatrixId);
+		await matrixBridge.getInstance().getIntent(inviterUser.mui).invite(matrixRoomId, invitedUserMatrixId);
 
 		console.log(`[${inviterId}-${invitedId}-${roomId}] Auto-join room...`);
 
-		await matrixBridge.getIntent(invitedUserMatrixId).join(matrixRoomId);
+		await matrixBridge.getInstance().getIntent(invitedUserMatrixId).join(matrixRoomId);
 	} else {
 		// Invite the user to the room but don't wait as this is dependent on the user accepting the invite because we don't control this user
-		matrixBridge.getIntent(inviterUser.mui).invite(matrixRoomId, invitedUserMatrixId);
+		matrixBridge.getInstance().getIntent(inviterUser.mui).invite(matrixRoomId, invitedUserMatrixId);
 	}
 
 	// Add the matrix user to the invited room
@@ -104,7 +104,7 @@ export const createRemote = async (u: IUser): Promise<ICreateUserResult> => {
 
 	console.log(`Creating remote user ${matrixUserId}...`);
 
-	const intent = matrixBridge.getIntent(matrixUserId);
+	const intent = matrixBridge.getInstance().getIntent(matrixUserId);
 
 	await intent.ensureProfile(u.name);
 
@@ -120,7 +120,7 @@ export const createRemote = async (u: IUser): Promise<ICreateUserResult> => {
 export const createLocal = async (matrixUserId: string): Promise<ICreateUserResult> => {
 	console.log(`Creating local user ${matrixUserId}...`);
 
-	const intent = matrixBridge.getIntent(matrixUserId);
+	const intent = matrixBridge.getInstance().getIntent(matrixUserId);
 
 	let currentProfile: MatrixProfileInfo = {};
 

diff --git a/apps/meteor/app/federation-v2/server/startup.ts b/apps/meteor/app/federation-v2/server/startup.ts
@@ -16,7 +16,7 @@ import { isFederationMatrixEnabled } from './tools';
 
 	const [, , port] = settings.get<string>('Federation_Matrix_bridge_url').split(':') as bridgeUrlTuple;
 
-	matrixBridge.run(port);
+	matrixBridge.getInstance().run(port);
 
 	// TODO: Changes here should re-initialize the bridge instead of needing a restart
 	// Add settings listeners