mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 21:57:45 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.11->trunk

Browse source
This commit is contained in:
Kim Alvefur 2019-01-17 01:09:38 +01:00
commit 06e29c834c
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/mod_motd.lua
View file

@ -19,11 +19,9 @@ motd_text = motd_text:gsub("^%s*(.-)%s*$", "%1"):gsub("\n[ \t]+", "\n"); -- Stri
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
end, 1);

1
plugins/mod_presence.lua
View file

@ -63,6 +63,7 @@ function handle_normal_presence(origin, stanza)
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