diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2017-12-11 09:46:26 +0300 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2017-12-11 09:46:26 +0300 |
| commit | bd064fa3fc96dc765d9db4442073da51f14d593a (patch) | |
| tree | f85dd79d9002976c7a511b6e5d3c77bb108d9977 /src/mod_muc_room.erl | |
| parent | Include <x/> tag in presence errors related to nick change (diff) | |
Use xmpp:try_subtag/2 wherever possible
Diffstat (limited to 'src/mod_muc_room.erl')
| -rw-r--r-- | src/mod_muc_room.erl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/mod_muc_room.erl b/src/mod_muc_room.erl index 271e49b4..e8d61dac 100644 --- a/src/mod_muc_room.erl +++ b/src/mod_muc_room.erl @@ -4006,7 +4006,7 @@ route_invitation(From, Invitation, Lang, StateData) -> %% Otherwise, an error message is sent to the sender. -spec handle_roommessage_from_nonparticipant(message(), state(), jid()) -> ok. handle_roommessage_from_nonparticipant(Packet, StateData, From) -> - case xmpp:get_subtag(Packet, #muc_user{}) of + try xmpp:try_subtag(Packet, #muc_user{}) of #muc_user{decline = #muc_decline{to = #jid{} = To} = Decline} = XUser -> NewDecline = Decline#muc_decline{to = undefined, from = From}, NewXUser = XUser#muc_user{decline = NewDecline}, @@ -4018,6 +4018,10 @@ handle_roommessage_from_nonparticipant(Packet, StateData, From) -> "to the conference">>, Err = xmpp:err_not_acceptable(ErrText, xmpp:get_lang(Packet)), ejabberd_router:route_error(Packet, Err) + catch _:{xmpp_codec, Why} -> + Txt = xmpp:io_format_error(Why), + Err = xmpp:err_bad_request(Txt, xmpp:get_lang(Packet)), + ejabberd_router:route_error(Packet, Err) end. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% |