Backed out changeset 661752889535 - obsoleted by 878f75ccc4fb.

[prosody.git] / plugins / mod_motd.lua

diff --git a/plugins/mod_motd.lua b/plugins/mod_motd.lua
index 646bf8cd7958b6dd3f0d64beef66f8095bd5e1f9..39b74de98ef4af57e95bb635aa0016a1fe427b68 100644 (file)
--- a/plugins/mod_motd.lua
+++ b/plugins/mod_motd.lua
@@ -18,12 +18,13 @@ 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 = jid_join(session.username, session.host, session.resource), 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 not session.presence and not stanza.attr.type 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:log("debug", "MOTD send to user %s", session.full_jid);
+               end
+end, 1);