diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2018-06-14 14:00:47 +0300 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2018-06-14 14:00:47 +0300 |
| commit | fd8e07af4789be362a61755ea47f216baeb64989 (patch) | |
| tree | 0ac0a7a779fd27e79e940519441161dc0c4dfd5f /src/mod_announce.erl | |
| parent | Log modules startup (diff) | |
Get rid of ejabberd.hrl header
The header consisted of too many unrelated stuff and macros misuse.
Some stuff is moved into scram.hrl and type_compat.hrl.
All macros have been replaced with the corresponding function calls.
TODO: probably type_compat.hrl is not even needed anymore since
we support only Erlang >= OTP 17.5
Diffstat (limited to 'src/mod_announce.erl')
| -rw-r--r-- | src/mod_announce.erl | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mod_announce.erl b/src/mod_announce.erl index e9da1d9c..b8ca970c 100644 --- a/src/mod_announce.erl +++ b/src/mod_announce.erl @@ -50,7 +50,6 @@ announce_motd_delete/1, announce_all_hosts_motd_delete/1]). --include("ejabberd.hrl"). -include("logger.hrl"). -include("xmpp.hrl"). -include("mod_announce.hrl"). @@ -670,7 +669,7 @@ announce_motd(#message{to = To} = Packet) -> announce_motd(To#jid.lserver, Packet). announce_all_hosts_motd(Packet) -> - Hosts = ?MYHOSTS, + Hosts = ejabberd_config:get_myhosts(), [announce_motd(Host, Packet) || Host <- Hosts]. announce_motd(Host, Packet) -> @@ -685,7 +684,7 @@ announce_motd_update(#message{to = To} = Packet) -> announce_motd_update(To#jid.lserver, Packet). announce_all_hosts_motd_update(Packet) -> - Hosts = ?MYHOSTS, + Hosts = ejabberd_config:get_myhosts(), [announce_motd_update(Host, Packet) || Host <- Hosts]. announce_motd_update(LServer, Packet) -> @@ -703,7 +702,7 @@ announce_all_hosts_motd_delete(_Packet) -> fun(Host) -> Mod = gen_mod:db_mod(Host, ?MODULE), delete_motd(Mod, Host) - end, ?MYHOSTS). + end, ejabberd_config:get_myhosts()). -spec send_motd({presence(), ejabberd_c2s:state()}) -> {presence(), ejabberd_c2s:state()}. send_motd({_, #{pres_last := _}} = Acc) -> |