mirror of
https://github.com/processone/ejabberd.git
synced 2024-12-26 17:38:45 +01:00
Remove try/catch
This commit is contained in:
parent
faed7698c2
commit
a91ae03dc6
@ -3722,18 +3722,15 @@ get_mucroom_disco_items(StateData) ->
|
||||
% Voice request support
|
||||
|
||||
is_voice_request({xmlelement, "x", _, _} = Elem) ->
|
||||
try
|
||||
case xml:get_tag_attr_s("xmlns", Elem) of
|
||||
?NS_XDATA ->
|
||||
Fields = jlib:parse_xdata_submit(Elem),
|
||||
lists:foldl(
|
||||
fun(X,Y) ->
|
||||
check_voice_request_fields(X,Y)
|
||||
end,
|
||||
true, Fields)
|
||||
end
|
||||
catch
|
||||
error: _ ->
|
||||
case xml:get_tag_attr_s("xmlns", Elem) of
|
||||
?NS_XDATA ->
|
||||
Fields = jlib:parse_xdata_submit(Elem),
|
||||
lists:foldl(
|
||||
fun(X,Y) ->
|
||||
check_voice_request_fields(X,Y)
|
||||
end,
|
||||
true, Fields);
|
||||
_ ->
|
||||
false
|
||||
end;
|
||||
is_voice_request(Els) ->
|
||||
@ -3795,18 +3792,15 @@ send_voice_request(From, StateData) ->
|
||||
end, Moderators).
|
||||
|
||||
is_voice_approvement({xmlelement, "x", _, _} = Elem) ->
|
||||
try
|
||||
case xml:get_tag_attr_s("xmlns", Elem) of
|
||||
?NS_XDATA ->
|
||||
Fields = jlib:parse_xdata_submit(Elem),
|
||||
lists:foldl(
|
||||
fun(X,Y) ->
|
||||
check_voice_approvement_fields(X,Y)
|
||||
end,
|
||||
true, Fields)
|
||||
end
|
||||
catch
|
||||
error: _ ->
|
||||
case xml:get_tag_attr_s("xmlns", Elem) of
|
||||
?NS_XDATA ->
|
||||
Fields = jlib:parse_xdata_submit(Elem),
|
||||
lists:foldl(
|
||||
fun(X,Y) ->
|
||||
check_voice_approvement_fields(X,Y)
|
||||
end,
|
||||
true, Fields);
|
||||
_ ->
|
||||
false
|
||||
end;
|
||||
is_voice_approvement(Els) ->
|
||||
|
Loading…
Reference in New Issue
Block a user