Merge 0.11->trunk

1 files changed, 12 insertions, 3 deletions

diff --git a/plugins/mod_scansion_record.lua b/plugins/mod_scansion_record.lua
index 3fbc8b6b..8d772b4e 100644
--- a/plugins/mod_scansion_record.lua
+++ b/plugins/mod_scansion_record.lua
@@ -6,6 +6,7 @@ local filters = require "util.filters";
 local id = require "util.id";
 local dt = require "util.datetime";
 local dm = require "util.datamanager";
+local st = require "util.stanza";
 
 local record_id = id.medium():lower();
 local record_date = os.date("%Y%b%d"):lower();
@@ -36,12 +37,16 @@ local function record_event(session, event)
 end
 
 local function record_stanza(stanza, session, verb)
-	record(session.scansion_id.." "..verb..":\n\t"..tostring(stanza).."\n\n");
+	local flattened = tostring(stanza):gsub("><", ">\n\t<");
+	-- TODO Proper prettyprinting with indentation
+	record(session.scansion_id.." "..verb..":\n\t"..flattened.."\n\n");
 end
 
 local function record_stanza_in(stanza, session)
 	if stanza.attr.xmlns == nil then
-		record_stanza(stanza, session, "sends")
+		local copy = st.clone(stanza);
+		copy.attr.from = nil;
+		record_stanza(copy, session, "sends")
 	end
 	return stanza;
 end
@@ -49,7 +54,11 @@ end
 local function record_stanza_out(stanza, session)
 	if stanza.attr.xmlns == nil then
 		if not (stanza.name == "iq" and stanza:get_child("bind", "urn:ietf:params:xml:ns:xmpp-bind")) then
-			record_stanza(stanza, session, "receives");
+			local copy = st.clone(stanza);
+			if copy.attr.to == session.full_jid then
+				copy.attr.to = nil;
+			end
+			record_stanza(copy, session, "receives");
 		end
 	end
 	return stanza;