aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-04-22 14:54:36 +0100
committerMatthew Wild <mwild1@gmail.com>2012-04-22 14:54:36 +0100
commit51ab962e5540b1af96170b7801135f768f4c75cf (patch)
tree1d083173d3c5d798ff88e077bbe2fb46f1877e52
parentb90b319b82362a71fa26e706aff9ec1f9a48c8e0 (diff)
downloadprosody-51ab962e5540b1af96170b7801135f768f4c75cf.tar.gz
prosody-51ab962e5540b1af96170b7801135f768f4c75cf.zip
mod_motd: Use presence/bare to catch a client's initial presence and send the MOTD then (fixes #282)
-rw-r--r--plugins/mod_motd.lua19
1 files changed, 10 insertions, 9 deletions
diff --git a/plugins/mod_motd.lua b/plugins/mod_motd.lua
index 646bf8cd..39b74de9 100644
--- 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);