[BREAK] [FIX] VideoConference Ringer working intermittently on microservices (#27703)

pull/27551/head^2
Pierre Lehnen 3 years ago committed by GitHub
parent b0a848a4f3
commit b2b6fbbea6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      apps/meteor/client/lib/VideoConfManager.ts
  2. 6
      apps/meteor/server/services/video-conference/service.ts
  3. 2
      packages/core-typings/src/IVideoConference.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':

@ -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,
};
}

@ -14,7 +14,7 @@ export enum VideoConferenceStatus {
export type DirectCallInstructions = {
type: 'direct';
callee: IUser['_id'];
calleeId: IUser['_id'];
callId: string;
};

Loading…
Cancel
Save