mod_auth_internal_hashed: Log calls to provider methods and be consistent with mod_au...

[prosody.git] / plugins / mod_motd.lua

diff --git a/plugins/mod_motd.lua b/plugins/mod_motd.lua
index d567288b8b985ed0fbb371294f5b591892c08329..1e2ee395af1c98d6282759d85a638c6103b5906c 100644 (file)
--- a/plugins/mod_motd.lua
+++ b/plugins/mod_motd.lua
@@ -2,7 +2,7 @@
 -- Copyright (C) 2008-2010 Matthew Wild
 -- Copyright (C) 2008-2010 Waqas Hussain
 -- Copyright (C) 2010 Jeff Mitchell
--- 
+--
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
 --
@@ -17,13 +17,14 @@ 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);