Merge 0.9->trunk

[prosody.git] / plugins / mod_motd.lua

diff --git a/plugins/mod_motd.lua b/plugins/mod_motd.lua
index 39b74de98ef4af57e95bb635aa0016a1fe427b68..fea2cb858b4eea62f8c7bf8077c3edecf55d56d4 100644 (file)
--- a/plugins/mod_motd.lua
+++ b/plugins/mod_motd.lua
@@ -20,11 +20,12 @@ motd_text = motd_text:gsub("^%s*(.-)%s*$", "%1"):gsub("\n%s+", "\n"); -- Strip i
 
 module:hook("presence/bare", function (event)
                local session, stanza = event.origin, event.stanza;
-               if not session.presence and not stanza.attr.type then
+               if session.username and not session.presence
+               and not stanza.attr.type and not stanza.attr.to then
                        local motd_stanza =
                                st.message({ to = session.full_jid, from = motd_jid })
                                        :tag("body"):text(motd_text);
-                       core_route_stanza(hosts[host], motd_stanza);
+                       module:send(motd_stanza);
                        module:log("debug", "MOTD send to user %s", session.full_jid);
                end
 end, 1);