Software / code / prosody
Changeset
3278:5ca2ed58788f
mod_announce: A little cleanup.
| author | Waqas Hussain <waqas20@gmail.com> |
|---|---|
| date | Fri, 18 Jun 2010 14:29:28 +0500 |
| parents | 3277:da0f55661e2b |
| children | 3279:8b0a4a7d2c6e |
| files | plugins/mod_announce.lua |
| diffstat | 1 files changed, 7 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_announce.lua Fri Jun 18 14:22:17 2010 +0500 +++ b/plugins/mod_announce.lua Fri Jun 18 14:29:28 2010 +0500 @@ -10,10 +10,10 @@ local is_admin = require "core.usermanager".is_admin; -function send_to_online(message, server) +function send_to_online(message, host) local sessions; - if server then - sessions = { [server] = hosts[server] }; + if host then + sessions = { [host] = hosts[host] }; else sessions = hosts; end @@ -35,9 +35,9 @@ -- Old <message>-based jabberd-style announcement sending -function handle_announcement(data) - local origin, stanza = data.origin, data.stanza; - local host, resource = select(2, jid.split(stanza.attr.to)); +function handle_announcement(event) + local origin, stanza = event.origin, event.stanza; + local node, host, resource = jid.split(stanza.attr.to); if resource ~= "announce/online" then return; -- Not an announcement @@ -45,12 +45,11 @@ if not is_admin(stanza.attr.from) then -- Not an admin? Not allowed! - module:log("warn", "Non-admin %s tried to send server announcement", tostring(jid.bare(stanza.attr.from))); + module:log("warn", "Non-admin '%s' tried to send server announcement", stanza.attr.from); return; end module:log("info", "Sending server announcement to all online users"); - local host_session = hosts[host]; local message = st.clone(stanza); message.attr.type = "headline"; message.attr.from = host;
