diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2016-11-12 13:27:15 +0300 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2016-11-12 13:27:15 +0300 |
| commit | 78a44e01762e00102f5e3e3f0b49690cc7866c31 (patch) | |
| tree | b8ac7773f510ee3c1da4802bce2badc71c34c0b2 /src/mod_announce.erl | |
| parent | Add more tests for offline storage (diff) | |
| parent | Support several groups separated by ; in add_rosteritem command (diff) | |
Merge branch 'master' into xml-ng
Conflicts:
src/adhoc.erl
src/cyrsasl_oauth.erl
src/ejabberd_c2s.erl
src/ejabberd_config.erl
src/ejabberd_service.erl
src/gen_mod.erl
src/mod_admin_extra.erl
src/mod_announce.erl
src/mod_carboncopy.erl
src/mod_client_state.erl
src/mod_configure.erl
src/mod_echo.erl
src/mod_mam.erl
src/mod_muc.erl
src/mod_muc_room.erl
src/mod_offline.erl
src/mod_pubsub.erl
src/mod_stats.erl
src/node_flat_sql.erl
src/randoms.erl
Diffstat (limited to 'src/mod_announce.erl')
| -rw-r--r-- | src/mod_announce.erl | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/mod_announce.erl b/src/mod_announce.erl index 495cbf94..1d93cbe6 100644 --- a/src/mod_announce.erl +++ b/src/mod_announce.erl @@ -609,8 +609,8 @@ announce_all(From, To, Packet) -> Local = jid:make(To#jid.server), lists:foreach( fun({User, Server}) -> - Dest = jid:make(User, Server), - ejabberd_router:route(Local, Dest, Packet) + Dest = jid:make(User, Server, <<>>), + ejabberd_router:route(Local, Dest, add_store_hint(Packet)) end, ejabberd_auth:get_vh_registered_users(Host)) end. @@ -626,8 +626,8 @@ announce_all_hosts_all(From, To, Packet) -> Local = jid:make(To#jid.server), lists:foreach( fun({User, Server}) -> - Dest = jid:make(User, Server), - ejabberd_router:route(Local, Dest, Packet) + Dest = jid:make(User, Server, <<>>), + ejabberd_router:route(Local, Dest, add_store_hint(Packet)) end, ejabberd_auth:dirty_get_registered_users()) end. @@ -813,7 +813,7 @@ send_announcement_to_all(Host, SubjectS, BodyS) -> lists:foreach( fun({U, S, R}) -> Dest = jid:make(U, S, R), - ejabberd_router:route(Local, Dest, Packet) + ejabberd_router:route(Local, Dest, add_store_hint(Packet)) end, Sessions). -spec get_access(global | binary()) -> atom(). @@ -823,6 +823,10 @@ get_access(Host) -> fun(A) -> A end, none). +-spec add_store_hint(stanza()) -> stanza(). +add_store_hint(El) -> + xmpp:set_subtag(El, #hint{type = store}). + %%------------------------------------------------------------------------- export(LServer) -> Mod = gen_mod:db_mod(LServer, ?MODULE), |