changeset 2511:34a6ba5dfe4f

mod_mam: Bring hints processing in line with 0.10 version
author Kim Alvefur <zash@zash.se>
date Mon, 20 Feb 2017 00:09:13 +0100 (2017-02-19)
parents d81882aa0e1e
children bc7539ccbde1
files mod_mam/mod_mam.lua
diffstat 1 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/mod_mam/mod_mam.lua	Mon Feb 20 00:07:59 2017 +0100
+++ b/mod_mam/mod_mam.lua	Mon Feb 20 00:09:13 2017 +0100
@@ -268,12 +268,12 @@
 		return;
 	end
 	-- or if hints suggest we shouldn't
-	if stanza:get_child("no-permanent-storage", "urn:xmpp:hints") -- The XEP needs to decide on "store" or "storage"
-	or stanza:get_child("no-permanent-store", "urn:xmpp:hints")
-	or stanza:get_child("no-storage", "urn:xmpp:hints")
-	or stanza:get_child("no-store", "urn:xmpp:hints") then
-		log("debug", "Not archiving stanza: %s (hint)", stanza:top_tag());
-		return;
+	if not stanza:get_child("store", "urn:xmpp:hints") then -- No hint telling us we should store
+		if stanza:get_child("no-permanent-store", "urn:xmpp:hints")
+			or stanza:get_child("no-store", "urn:xmpp:hints") then -- Hint telling us we should NOT store
+			log("debug", "Not archiving stanza: %s (hint)", stanza:top_tag());
+			return;
+		end
 	end
 
 	-- Whos storage do we put it in?