Comparison

mod_mam: Stamp outgoing messages with <archived> as well, but remove it after they should have passed through mod_carbons

comparison

equal deleted inserted replaced

-:a172e7389cf6
+:d677d1807bb0
 	if shall_store(store_user, with) then
 		module:log("debug", "Archiving stanza: %s", stanza:top_tag());
 		-- And stash it
 		local ok, id = archive:append(store_user, time_now(), with, stanza);
-		if ok and not c2s then
+		if ok then
 			stanza:tag("archived", { xmlns = xmlns_mam, by = store_user.."@"..host, id = id }):up();
 		end
 	else
 		module:log("debug", "Not archiving stanza: %s (prefs)", stanza:top_tag());
 	end
 module:hook("pre-message/full", c2s_message_handler, 2);
 -- Stanszas to local clients
 module:hook("message/bare", message_handler, 2);
 module:hook("message/full", message_handler, 2);
+local function post_carbons_handler(event)
+	event.stanza:maptags(function(tag)
+		if not ( tag.attr.xmlns == xmlns_mam and tag.name == "archived" ) then
+			return tag;
+		end
+	end);
+end
+module:hook("pre-message/bare", post_carbons_handler, 0.9);
+module:hook("pre-message/full", post_carbons_handler, 0.9);
 module:add_feature(xmlns_mam);