diff options
Diffstat (limited to 'src/mod_offline.erl')
| -rw-r--r-- | src/mod_offline.erl | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/src/mod_offline.erl b/src/mod_offline.erl index 61fa65bc5..082386514 100644 --- a/src/mod_offline.erl +++ b/src/mod_offline.erl @@ -43,7 +43,6 @@ stop/1, store_packet/4, store_offline_msg/5, - resend_offline_messages/2, c2s_self_presence/1, get_sm_features/5, get_sm_identity/5, @@ -138,6 +137,7 @@ depends(_Host, _Opts) -> %%==================================================================== init([Host, Opts]) -> + process_flag(trap_exit, true), Mod = gen_mod:db_mod(Host, Opts, ?MODULE), Mod:init(Host, Opts), IQDisc = gen_mod:get_opt(iqdisc, Opts, fun gen_iq_handler:check_type/1, @@ -545,22 +545,6 @@ find_x_expire(TimeStamp, Msg) -> never end. -resend_offline_messages(User, Server) -> - LUser = jid:nodeprep(User), - LServer = jid:nameprep(Server), - Mod = gen_mod:db_mod(LServer, ?MODULE), - case Mod:pop_messages(LUser, LServer) of - {ok, Rs} -> - lists:foreach( - fun(R) -> - case offline_msg_to_route(LServer, R) of - error -> ok; - RouteMsg -> ejabberd_sm ! RouteMsg - end - end, lists:keysort(#offline_msg.timestamp, Rs)); - _ -> ok - end. - c2s_self_presence({_Pres, #{resend_offline := false}} = Acc) -> Acc; c2s_self_presence({#presence{type = available} = NewPres, State} = Acc) -> |