Reflect changes in the xmpp lib

diff --git a/rebar.config b/rebar.config
index 5806e6ae348b325e7d9f669bc7d42f53c89a4e2e..f24a16777798f52c0cdeb1df28da6845d32d1939 100644 (file)
--- a/rebar.config
+++ b/rebar.config
@@ -25,7 +25,7 @@
         {fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.0.16"}}},
         {stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.10"}}},
         {fast_xml, ".*", {git, "https://github.com/processone/fast_xml", {tag, "1.1.24"}}},
-        {xmpp, ".*", {git, "https://github.com/processone/xmpp", {tag, "1.1.15"}}},
+        {xmpp, ".*", {git, "https://github.com/processone/xmpp", "d551ba9"}},
         {fast_yaml, ".*", {git, "https://github.com/processone/fast_yaml", {tag, "1.0.11"}}},
         {jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "0.14.8"}}},
         {p1_oauth2, ".*", {git, "https://github.com/processone/p1_oauth2", {tag, "0.6.2"}}},

diff --git a/src/mod_muc_room.erl b/src/mod_muc_room.erl
index 27ecceecfda218c97a49996e5cc514d83805cde4..6e83a374ff0e2e8e119fc03426f5be2396abe8fe 100644 (file)
--- a/src/mod_muc_room.erl
+++ b/src/mod_muc_room.erl
@@ -1241,7 +1241,7 @@ get_error_condition(undefined) ->
 
 -spec get_error_text(stanza_error()) -> binary().
 get_error_text(#stanza_error{text = Txt}) ->
-    xmpp:get_text([Txt]).
+    xmpp:get_text(Txt).
 
 -spec make_reason(stanza(), jid(), state(), binary()) -> binary().
 make_reason(Packet, From, StateData, Reason1) ->

diff --git a/src/mod_s2s_dialback.erl b/src/mod_s2s_dialback.erl
index 403ac9cceeea8718029919342e03e1b826e3b6db..b4c2ed9df82ce62906e8194377b43f974cff14fa 100644 (file)
--- a/src/mod_s2s_dialback.erl
+++ b/src/mod_s2s_dialback.erl
@@ -353,9 +353,9 @@ format_stanza_error(#stanza_error{reason = Reason, text = Txt}) ->
                 #redirect{} -> <<"redirect">>;
                 _ -> erlang:atom_to_binary(Reason, latin1)
             end,
-    case Txt of
-       undefined -> Slogan;
-       #text{data = <<"">>} -> Slogan;
-       #text{data = Data} ->
+    case xmpp:get_text(Txt) of
+       <<"">> ->
+           Slogan;
+       Data ->
            <<Data/binary, " (", Slogan/binary, ")">>
     end.

diff --git a/src/xmpp_stream_in.erl b/src/xmpp_stream_in.erl
index d9be3d4f7ba24d2c4fd6343d1d3eeeced3f1e97b..329ebad61a9bb9d8784645abb5e4e61b2cde2655 100644 (file)
--- a/src/xmpp_stream_in.erl
+++ b/src/xmpp_stream_in.erl
@@ -1117,17 +1117,17 @@ format_inet_error(Reason) ->
        Txt -> Txt
     end.
 
--spec format_stream_error(atom() | 'see-other-host'(), undefined | text()) -> string().
+-spec format_stream_error(atom() | 'see-other-host'(), [text()]) -> string().
 format_stream_error(Reason, Txt) ->
     Slogan = case Reason of
                 undefined -> "no reason";
                 #'see-other-host'{} -> "see-other-host";
                 _ -> atom_to_list(Reason)
             end,
-    case Txt of
-       undefined -> Slogan;
-       #text{data = <<"">>} -> Slogan;
-       #text{data = Data} ->
+    case xmpp:get_text(Txt) of
+       <<"">> ->
+           Slogan;
+       Data ->
            binary_to_list(Data) ++ " (" ++ Slogan ++ ")"
     end.
 

diff --git a/src/xmpp_stream_out.erl b/src/xmpp_stream_out.erl
index 982be4dee5acc94ba1202676fb8fc05631ed95ac..460f380d2b57677ca10cf64450f62428f8be0321 100644 (file)
--- a/src/xmpp_stream_out.erl
+++ b/src/xmpp_stream_out.erl
@@ -796,17 +796,17 @@ format_inet_error(Reason) ->
        Txt -> Txt
     end.
 
--spec format_stream_error(atom() | 'see-other-host'(), undefined | text()) -> string().
+-spec format_stream_error(atom() | 'see-other-host'(), [text()]) -> string().
 format_stream_error(Reason, Txt) ->
     Slogan = case Reason of
                 undefined -> "no reason";
                 #'see-other-host'{} -> "see-other-host";
                 _ -> atom_to_list(Reason)
             end,
-    case Txt of
-       undefined -> Slogan;
-       #text{data = <<"">>} -> Slogan;
-       #text{data = Data} ->
+    case xmpp:get_text(Txt) of
+       <<"">> ->
+           Slogan;
+       Data ->
            binary_to_list(Data) ++ " (" ++ Slogan ++ ")"
     end.