Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: respect my_clients_only param in sendh callback #14587

Merged
merged 5 commits into from
Jan 31, 2023
Merged

feat: respect my_clients_only param in sendh callback #14587

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
36a7001
feat: respect my_clients_only param in sendh callback
PatrykBuniX Jan 30, 2023
8afac4a
chore: update comment
PatrykBuniX Jan 30, 2023
88f3bc1
chore: update comment
PatrykBuniX Jan 30, 2023
ca76553
refactor: add condition to existing if
PatrykBuniX Jan 30, 2023
b1ba378
refactor: pass myClientsOnly as extra prop in sendCallingMessage
PatrykBuniX Jan 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions src/script/calling/CallingRepository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1129,6 +1129,9 @@ export class CallingRepository {
targets: string | null,
_unused: string | null,
payload: string,
_len: number,
_trans: number,
myClientsOnly: number,
): number => {
const conversationId = this.parseQualifiedId(convId);
const call = this.findCall(conversationId);
Expand All @@ -1148,7 +1151,7 @@ export class CallingRepository {
};
}

this.sendCallingMessage(conversationId, payload, options).catch(error => {
this.sendCallingMessage(conversationId, payload, options, myClientsOnly === 1).catch(error => {
this.logger.warn('Failed to send calling message, aborting call', error);
this.abortCall(conversationId, LEAVE_CALL_REASON.ABORTED_BECAUSE_FAILED_TO_SEND_CALLING_MESSAGE);
});
Expand All @@ -1159,6 +1162,7 @@ export class CallingRepository {
conversationId: QualifiedId,
payload: string | Object,
options?: MessageSendingOptions,
myClientsOnly: boolean = false,
): Promise<void> => {
const conversation = this.conversationState.findConversation(conversationId);
if (!conversation) {
Expand All @@ -1168,18 +1172,12 @@ export class CallingRepository {
const content = typeof payload === 'string' ? payload : JSON.stringify(payload);

/**
* @note If the AVS message type is REJECT, we should ignore the message,
* eventually this will be send to the self-conversation
* @note If myClientsOnly option is true, the message should be sent via the self-conversation.
* This message is used to tell your other clients you have answered or
* rejected a call and to stop ringing.
* @todo Remove the restriction when we are able to send MLS messages to a specific user in a call.
*/
if (typeof payload === 'string' && conversation.isUsingMLSProtocol) {
const parsedPayload = JSON.parse(payload);
const messageType = parsedPayload.type as CALL_MESSAGE_TYPE;
if (messageType === CALL_MESSAGE_TYPE.REJECT) {
return void this.messageRepository.sendSelfCallingMessage(payload, conversation.qualifiedId);
}
if (typeof payload === 'string' && conversation.isUsingMLSProtocol && myClientsOnly) {
return void this.messageRepository.sendSelfCallingMessage(payload, conversation.qualifiedId);
}

const message = await this.messageRepository.sendCallingMessage(conversation, content, options);
Expand Down