Software / code / prosody
Changeset
9790:4a419089ad00
Merge 0.11->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 17 Jan 2019 01:09:38 +0100 |
| parents | 9787:6625efab91e2 (current diff) 9789:abd32bc33a9c (diff) |
| children | 9792:561b0e20e901 |
| files | plugins/mod_presence.lua |
| diffstat | 2 files changed, 7 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_motd.lua Wed Jan 16 20:01:38 2019 +0100 +++ b/plugins/mod_motd.lua Thu Jan 17 01:09:38 2019 +0100 @@ -18,12 +18,10 @@ motd_text = motd_text:gsub("^%s*(.-)%s*$", "%1"):gsub("\n[ \t]+", "\n"); -- Strip indentation from the config module:hook("presence/initial", function (event) - local session, stanza = event.origin, event.stanza; - if 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 + local session, stanza = event.origin, event.stanza; + 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, 1);
--- a/plugins/mod_presence.lua Wed Jan 16 20:01:38 2019 +0100 +++ b/plugins/mod_presence.lua Thu Jan 17 01:09:38 2019 +0100 @@ -63,6 +63,7 @@ core_post_stanza(origin, stanza, true); end end + stanza.attr.to = nil; if stanza.attr.type == nil and not origin.presence then -- initial presence module:fire_event("presence/initial", { origin = origin, stanza = stanza } ); origin.presence = stanza; -- FIXME repeated later
