Merge 0.9->trunk

[prosody.git] / plugins / mod_motd.lua

diff --git a/plugins/mod_motd.lua b/plugins/mod_motd.lua
index d567288b8b985ed0fbb371294f5b591892c08329..fea2cb858b4eea62f8c7bf8077c3edecf55d56d4 100644 (file)
--- a/plugins/mod_motd.lua
+++ b/plugins/mod_motd.lua
@@ -13,17 +13,19 @@ local motd_jid = module:get_option_string("motd_jid", host);
 
 if not motd_text then return; end
 
+local jid_join = require "util.jid".join;
 local st = require "util.stanza";
 
 motd_text = motd_text:gsub("^%s*(.-)%s*$", "%1"):gsub("\n%s+", "\n"); -- Strip indentation from the config
 
-module:hook("resource-bind",
-       function (event)
-               local session = event.session;
-               local motd_stanza =
-                       st.message({ to = session.username..'@'..session.host, from = motd_jid })
-                               :tag("body"):text(motd_text);
-               core_route_stanza(hosts[host], motd_stanza);
-               module:log("debug", "MOTD send to user %s@%s", session.username, session.host);
-
-end);
+module:hook("presence/bare", function (event)
+               local session, stanza = event.origin, event.stanza;
+               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);
+                       module:send(motd_stanza);
+                       module:log("debug", "MOTD send to user %s", session.full_jid);
+               end
+end, 1);