aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWaqas Hussain <waqas20@gmail.com>2010-06-18 14:29:28 +0500
committerWaqas Hussain <waqas20@gmail.com>2010-06-18 14:29:28 +0500
commit29fd792c7f3c41c34eb85eeec2fb4d284f83f158 (patch)
tree3abd200b68c9131948875a7f5c26e03c917468b0
parent9cab19bb05478782752bf4fa9322c51af53c88dc (diff)
downloadprosody-29fd792c7f3c41c34eb85eeec2fb4d284f83f158.tar.gz
prosody-29fd792c7f3c41c34eb85eeec2fb4d284f83f158.zip
mod_announce: A little cleanup.
-rw-r--r--plugins/mod_announce.lua15
1 files changed, 7 insertions, 8 deletions
diff --git a/plugins/mod_announce.lua b/plugins/mod_announce.lua
index 705afb2a..77555bec 100644
--- a/plugins/mod_announce.lua
+++ b/plugins/mod_announce.lua
@@ -10,10 +10,10 @@ local st, jid = require "util.stanza", require "util.jid";
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 @@ end
-- 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 @@ function handle_announcement(data)
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;