From 13c603970043c556e6e5f1a598c967c5db14f5f9 Mon Sep 17 00:00:00 2001 From: Evgeniy Khramtsov Date: Sat, 19 Nov 2016 13:57:25 +0300 Subject: [PATCH] Use xmpp_util.erl from XMPP library --- rebar.config | 2 +- src/xmpp_util.erl | 169 ---------------------------------------------- 2 files changed, 1 insertion(+), 170 deletions(-) delete mode 100644 src/xmpp_util.erl diff --git a/rebar.config b/rebar.config index 0fa157e7a..6db14c87b 100644 --- a/rebar.config +++ b/rebar.config @@ -13,7 +13,7 @@ {fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.0.7"}}}, {stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.6"}}}, {fast_xml, ".*", {git, "https://github.com/processone/fast_xml", {tag, "1.1.16"}}}, - {xmpp, ".*", {git, "https://github.com/processone/xmpp", {tag, "1.0.2"}}}, + {xmpp, ".*", {git, "https://github.com/processone/xmpp", {tag, "1.0.3"}}}, {stun, ".*", {git, "https://github.com/processone/stun", {tag, "1.0.7"}}}, {esip, ".*", {git, "https://github.com/processone/esip", {tag, "1.0.8"}}}, {fast_yaml, ".*", {git, "https://github.com/processone/fast_yaml", {tag, "1.0.6"}}}, diff --git a/src/xmpp_util.erl b/src/xmpp_util.erl deleted file mode 100644 index 22b8ea597..000000000 --- a/src/xmpp_util.erl +++ /dev/null @@ -1,169 +0,0 @@ -%%%------------------------------------------------------------------- -%%% @author Evgeny Khramtsov -%%% @copyright (C) 2016, Evgeny Khramtsov -%%% @doc -%%% -%%% @end -%%% Created : 12 Jul 2016 by Evgeny Khramtsov -%%%------------------------------------------------------------------- --module(xmpp_util). - -%% API --export([add_delay_info/3, add_delay_info/4, unwrap_carbon/1, - is_standalone_chat_state/1, get_xdata_values/2, - set_xdata_field/2, has_xdata_var/2, - make_adhoc_response/1, make_adhoc_response/2, - decode_timestamp/1, encode_timestamp/1]). - --include("xmpp.hrl"). - -%%%=================================================================== -%%% API -%%%=================================================================== --spec add_delay_info(stanza(), jid(), erlang:timestamp()) -> stanza(). -add_delay_info(Stz, From, Time) -> - add_delay_info(Stz, From, Time, <<"">>). - --spec add_delay_info(stanza(), jid(), - erlang:timestamp(), binary()) -> stanza(). - -add_delay_info(Stz, From, Time, Desc) -> - NewDelay = #delay{stamp = Time, from = From, desc = Desc}, - case xmpp:get_subtag(Stz, #delay{}) of - #delay{from = OldFrom} -> - case jid:tolower(From) == jid:tolower(OldFrom) of - false -> - xmpp:set_subtag(Stz, NewDelay); - true -> - xmpp:append_subtags(Stz, [NewDelay]) - end; - false -> - xmpp:append_subtags(Stz, [NewDelay]) - end. - --spec unwrap_carbon(stanza()) -> xmpp_element(). -unwrap_carbon(#message{} = Msg) -> - try - case xmpp:get_subtag(Msg, #carbons_sent{}) of - #carbons_sent{forwarded = #forwarded{xml_els = [El]}} -> - xmpp:decode(El, ?NS_CLIENT, [ignore_els]); - _ -> - case xmpp:get_subtag(Msg, #carbons_received{}) of - #carbons_received{forwarded = #forwarded{xml_els = [El]}} -> - xmpp:decode(El, ?NS_CLIENT, [ignore_els]); - _ -> - Msg - end - end - catch _:{xmpp_codec, _} -> - Msg - end; -unwrap_carbon(Stanza) -> Stanza. - --spec is_standalone_chat_state(stanza()) -> boolean(). -is_standalone_chat_state(Stanza) -> - case unwrap_carbon(Stanza) of - #message{body = [], subject = [], sub_els = Els} -> - IgnoreNS = [?NS_CHATSTATES, ?NS_DELAY, ?NS_EVENT], - Stripped = [El || El <- Els, - not lists:member(xmpp:get_ns(El), IgnoreNS)], - Stripped == []; - _ -> - false - end. - --spec get_xdata_values(binary(), xdata()) -> [binary()]. -get_xdata_values(Var, #xdata{fields = Fields}) -> - case lists:keyfind(Var, #xdata_field.var, Fields) of - #xdata_field{values = Vals} -> Vals; - false -> [] - end. - --spec set_xdata_field(xdata_field(), xdata()) -> xdata(). -set_xdata_field(Field, #xdata{fields = Fields} = X) -> - NewFields = lists:keystore(Field#xdata_field.var, #xdata_field.var, - Fields, Field), - X#xdata{fields = NewFields}. - --spec has_xdata_var(binary(), xdata()) -> boolean(). -has_xdata_var(Var, #xdata{fields = Fields}) -> - lists:keymember(Var, #xdata_field.var, Fields). - --spec make_adhoc_response(adhoc_command(), adhoc_command()) -> adhoc_command(). -make_adhoc_response(#adhoc_command{lang = Lang, node = Node, sid = SID}, - Command) -> - make_adhoc_response( - Command#adhoc_command{lang = Lang, node = Node, sid = SID}). - --spec make_adhoc_response(adhoc_command()) -> adhoc_command(). -make_adhoc_response(#adhoc_command{sid = <<"">>, - status = Status, - actions = Actions} = Command) -> - SID = encode_timestamp(p1_time_compat:timestamp()), - NewActions = if Actions == undefined, Status /= completed -> - #adhoc_actions{execute = complete, complete = true}; - true -> - undefined - end, - Command#adhoc_command{sid = SID, actions = NewActions}; -make_adhoc_response(Command) -> - Command. - --spec decode_timestamp(binary()) -> erlang:timestamp(). -decode_timestamp(S) -> - try try_decode_timestamp(S) - catch _:_ -> erlang:error({bad_timestamp, S}) - end. - --spec encode_timestamp(erlang:timestamp()) -> binary(). -encode_timestamp({MegaSecs, Secs, MicroSecs}) -> - {{Year, Month, Day}, {Hour, Minute, Second}} = - calendar:now_to_universal_time({MegaSecs, Secs, MicroSecs}), - Fraction = if MicroSecs > 0 -> - io_lib:format(".~6..0B", [MicroSecs]); - true -> - "" - end, - list_to_binary(io_lib:format("~4..0B-~2..0B-~2..0BT" - "~2..0B:~2..0B:~2..0B~sZ", - [Year, Month, Day, Hour, Minute, Second, - Fraction])). - -%%%=================================================================== -%%% Internal functions -%%%=================================================================== -try_decode_timestamp(<>) -> - Date = {to_integer(Y, 1970, 9999), to_integer(Mo, 1, 12), to_integer(D, 1, 31)}, - Time = {to_integer(H, 0, 23), to_integer(Mi, 0, 59), to_integer(S, 0, 59)}, - {MS, {TZH, TZM}} = try_decode_fraction(T), - Seconds = calendar:datetime_to_gregorian_seconds({Date, Time}) - - calendar:datetime_to_gregorian_seconds({{1970,1,1}, {0,0,0}}) - - TZH * 60 * 60 - TZM * 60, - {Seconds div 1000000, Seconds rem 1000000, MS}; -try_decode_timestamp(<>) -> - try_decode_timestamp(<>). - -try_decode_fraction(<<$., T/binary>>) -> - {match, [V]} = re:run(T, <<"^[0-9]+">>, [{capture, [0], list}]), - Size = length(V), - <<_:Size/binary, TZD/binary>> = T, - {list_to_integer(string:left(V, 6, $0)), - try_decode_tzd(TZD)}; -try_decode_fraction(TZD) -> - {0, try_decode_tzd(TZD)}. - -try_decode_tzd(<<$Z>>) -> - {0, 0}; -try_decode_tzd(<<$-, H:2/binary, $:, M:2/binary>>) -> - {-1 * to_integer(H, 0, 12), to_integer(M, 0, 59)}; -try_decode_tzd(<<$+, H:2/binary, $:, M:2/binary>>) -> - {to_integer(H, 0, 12), to_integer(M, 0, 59)}. - -to_integer(S, Min, Max) -> - case binary_to_integer(S) of - I when I >= Min, I =< Max -> - I - end.