# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1547683778 -3600
# Node ID 4a419089ad00c6e86e267433ce76a0a95b7760b7
# Parent  6625efab91e24e7ac2dfbdae4aea024aa0346aac# Parent  abd32bc33a9c3ed109f20e5e5be138348a53e489
Merge 0.11->trunk

diff -r 6625efab91e2 -r 4a419089ad00 plugins/mod_motd.lua
--- 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);
diff -r 6625efab91e2 -r 4a419089ad00 plugins/mod_presence.lua
--- 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