diff options
| author | Holger Weiss <holger@zedat.fu-berlin.de> | 2018-10-25 01:05:45 +0200 |
|---|---|---|
| committer | Holger Weiss <holger@zedat.fu-berlin.de> | 2018-10-25 01:05:45 +0200 |
| commit | a8b11b6474a910660b293fc46359841c291f50bb (patch) | |
| tree | d35d0efc978ae01006985ccf86a43eec482e1370 /src/mod_client_state.erl | |
| parent | Do no add 127.0.0.1 address to trusted_proxies list by default (diff) | |
Move some functions from xmpp back into ejabberd
Diffstat (limited to '')
| -rw-r--r-- | src/mod_client_state.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mod_client_state.erl b/src/mod_client_state.erl index 99a810fd..156fde72 100644 --- a/src/mod_client_state.erl +++ b/src/mod_client_state.erl @@ -237,7 +237,7 @@ filter_chat_states({#message{meta = #{csi_resend := true}}, _} = Acc) -> Acc; filter_chat_states({#message{from = From, to = To} = Msg, #{csi_state := inactive} = C2SState} = Acc) -> - case xmpp_util:is_standalone_chat_state(Msg) of + case misc:is_standalone_chat_state(Msg) of true -> case {From, To} of {#jid{luser = U, lserver = S}, #jid{luser = U, lserver = S}} -> @@ -352,7 +352,7 @@ flush_stanzas(#{lserver := LServer} = C2SState, Elems) -> -spec add_delay_info(stanza(), binary(), csi_timestamp()) -> stanza(). add_delay_info(Stanza, LServer, {_Seq, TimeStamp}) -> - Stanza1 = xmpp_util:add_delay_info( + Stanza1 = misc:add_delay_info( Stanza, jid:make(LServer), TimeStamp, <<"Client Inactive">>), xmpp:put_meta(Stanza1, csi_resend, true). |