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

PISTON-1123: Fixes voicemail forward confirmation. #6646

Closed
wants to merge 2 commits into from
Closed

PISTON-1123: Fixes voicemail forward confirmation. #6646

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
315c23e
PISTON-1123: Fixes voicemail forward confirmation.
Oct 16, 2020
0fdd61e
PISTON-1123: Deletes trailing whitespace.
Oct 16, 2020
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
42 changes: 28 additions & 14 deletions applications/callflow/src/module/cf_voicemail.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1213,24 +1213,39 @@ maybe_forward(AttachmentName, Message, SourceBoxId, #mailbox{media_extension=Ext
{'ok', 'record'} ->
record_forward(tmp_file(Ext), Message, SourceBoxId, DestinationBox, Call);
{'ok', _Selection} ->
cf_util:start_task(fun forward_message/6
,[AttachmentName, Length, Message, SourceBoxId, DestinationBox]
, Call
)
forward_message(AttachmentName, Length, Message, SourceBoxId, DestinationBox, Call)
end;
maybe_forward(AttachmentName, Message, SourceBoxId, DestinationBox, Call, Msg, {'error', _E}) ->
Length = kz_json:get_integer_value(<<"Length">>, Msg, 0),
forward_message(AttachmentName, Length, Message, SourceBoxId, DestinationBox, Call).

%%------------------------------------------------------------------------------
%% @doc Starts a task to asynchronously forward a message to another vmbox and
%% plays a confirmation of the operation.
%% @end
%%------------------------------------------------------------------------------
-spec forward_message(kz_term:api_ne_binary(), non_neg_integer(), kz_json:object(), kz_term:ne_binary(), mailbox(), kapps_call:call()) -> 'ok'.
forward_message(AttachmentName, Length, Message, SrcBoxId, #mailbox{mailbox_number=BoxNum
,mailbox_id=BoxId
,timezone=Timezone
,owner_id=OwnerId
,transcribe_voicemail=MaybeTranscribe
,after_notify_action=Action
,media_extension=Extension
}=DestBox, Call) ->
forward_message(AttachmentName, Length, Message, SourceBoxId, DestinationBox, Call) ->
cf_util:start_task(fun forward_message_task/6
,[AttachmentName, Length, Message, SourceBoxId, DestinationBox]
,Call
),
_ = kapps_call_command:b_prompt(<<"vm-forward_confirmed">>, Call),
'ok'.

%%------------------------------------------------------------------------------
%% @doc Forwards a message to another vmbox.
%% @end
%%------------------------------------------------------------------------------
-spec forward_message_task(kz_term:api_ne_binary(), non_neg_integer(), kz_json:object(), kz_term:ne_binary(), mailbox(), kapps_call:call()) -> 'ok'.
forward_message_task(AttachmentName, Length, Message, SrcBoxId, #mailbox{mailbox_number=BoxNum
,mailbox_id=BoxId
,timezone=Timezone
,owner_id=OwnerId
,transcribe_voicemail=MaybeTranscribe
,after_notify_action=Action
,media_extension=Extension
}=DestBox, Call) ->
NewMsgProps = props:filter_undefined(
[{<<"Box-Id">>, BoxId}
,{<<"Owner-Id">>, OwnerId}
Expand All @@ -1245,8 +1260,7 @@ forward_message(AttachmentName, Length, Message, SrcBoxId, #mailbox{mailbox_numb
]
),
case kvm_message:forward_message(Call, Message, SrcBoxId, NewMsgProps) of
{'ok', NewCall} ->
_ = kapps_call_command:b_prompt(<<"vm-forward_confirmed">>, NewCall),
{'ok', _} ->
send_mwi_update(DestBox);
{'error', _, _Msg} ->
lager:warning("failed to save forwarded voice mail message recorded media : ~p", [_Msg])
Expand Down