X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_motd.lua;h=574a9cf408e6fe883c801ae65d6a35d5e3485e1b;hb=73e841ddd082009e3f19502b207231bbddfa0dbb;hp=ddde9c7850d25c013955dbb9a4b6f619b6850fca;hpb=241115ad50770c63c39a016a7a20f1cd576c12a0;p=prosody.git

diff --git a/plugins/mod_motd.lua b/plugins/mod_motd.lua
index ddde9c78..574a9cf4 100644
--- a/plugins/mod_motd.lua
+++ b/plugins/mod_motd.lua
@@ -2,7 +2,7 @@
 -- Copyright (C) 2008-2010 Matthew Wild
 -- Copyright (C) 2008-2010 Waqas Hussain
 -- Copyright (C) 2010 Jeff Mitchell
--- 
+--
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
 --
@@ -13,14 +13,14 @@ local motd_jid = module:get_option_string("motd_jid", host);
 
 if not motd_text then return; end
 
-local jid_join = require "util.jid".join;
 local st = require "util.stanza";
 
-motd_text = motd_text:gsub("^%s*(.-)%s*$", "%1"):gsub("\n%s+", "\n"); -- Strip indentation from the config
+motd_text = motd_text:gsub("^%s*(.-)%s*$", "%1"):gsub("\n[ \t]+", "\n"); -- Strip indentation from the config
 
 module:hook("presence/bare", function (event)
 		local session, stanza = event.origin, event.stanza;
-		if not session.presence and not stanza.attr.type then
+		if session.username and not session.presence
+		and 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);