From b2b6fbbea6da3b757cb7e2a02db5b4b94eefd64b Mon Sep 17 00:00:00 2001
From: Pierre Lehnen <55164754+pierre-lehnen-rc@users.noreply.github.com>
Date: Mon, 9 Jan 2023 17:26:39 -0300
Subject: [PATCH] [BREAK] [FIX] VideoConference Ringer working intermittently
 on microservices (#27703)

---
 apps/meteor/client/lib/VideoConfManager.ts              | 2 +-
 apps/meteor/server/services/video-conference/service.ts | 6 +++---
 packages/core-typings/src/IVideoConference.ts           | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/meteor/client/lib/VideoConfManager.ts b/apps/meteor/client/lib/VideoConfManager.ts
index 35f6cc2b549..257bcfd0184 100644
--- a/apps/meteor/client/lib/VideoConfManager.ts
+++ b/apps/meteor/client/lib/VideoConfManager.ts
@@ -170,7 +170,7 @@ export const VideoConfManager = new (class VideoConfManager extends Emitter<Vide
 
 		switch (data.type) {
 			case 'direct':
-				return this.callUser({ uid: data.callee, rid: roomId, callId: data.callId });
+				return this.callUser({ uid: data.calleeId, rid: roomId, callId: data.callId });
 			case 'videoconference':
 				return this.joinCall(data.callId);
 			case 'livechat':
diff --git a/apps/meteor/server/services/video-conference/service.ts b/apps/meteor/server/services/video-conference/service.ts
index 0785fbd0fb0..11e0a167d25 100644
--- a/apps/meteor/server/services/video-conference/service.ts
+++ b/apps/meteor/server/services/video-conference/service.ts
@@ -581,8 +581,8 @@ export class VideoConfService extends ServiceClassInternal implements IVideoConf
 		{ _id: rid, uids }: AtLeast<IRoom, '_id' | 'uids'>,
 		extraData?: Partial<IDirectVideoConference>,
 	): Promise<DirectCallInstructions> {
-		const callee = uids?.filter((uid) => uid !== user._id).pop();
-		if (!callee) {
+		const calleeId = uids?.filter((uid) => uid !== user._id).pop();
+		if (!calleeId) {
 			// Are you trying to call yourself?
 			throw new Error('invalid-call-target');
 		}
@@ -629,7 +629,7 @@ export class VideoConfService extends ServiceClassInternal implements IVideoConf
 		return {
 			type: 'direct',
 			callId,
-			callee,
+			calleeId,
 		};
 	}
 
diff --git a/packages/core-typings/src/IVideoConference.ts b/packages/core-typings/src/IVideoConference.ts
index 5d36287aa9b..abf69392029 100644
--- a/packages/core-typings/src/IVideoConference.ts
+++ b/packages/core-typings/src/IVideoConference.ts
@@ -14,7 +14,7 @@ export enum VideoConferenceStatus {
 
 export type DirectCallInstructions = {
 	type: 'direct';
-	callee: IUser['_id'];
+	calleeId: IUser['_id'];
 	callId: string;
 };