Comparison

mod_mam: Rework hints handling Improved readability and early returns definite yes/no answer.

comparison

equal deleted inserted replaced

-:c5a3576a5335
+:b2ede421adeb
 local function should_store(stanza) --> boolean, reason: string
 	local st_type = stanza.attr.type or "normal";
 	local st_to_full = (stanza.attr.to or ""):find("/");
-	-- or if hints suggest we shouldn't
-	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
-			return false, "hint";
-		end
-	end
 	if st_type == "headline" then
 		-- Headline messages are ephemeral by definition
 		return false, "headline";
 	end
 	if st_type == "groupchat" and st_to_full then
 		-- MUC messages always go to the full JID, usually archived by the MUC
 		return false, "groupchat";
+	end
+	if stanza:get_child("no-permanent-store", "urn:xmpp:hints") then
+		return false, "hint";
+	end
+	if stanza:get_child("store", "urn:xmpp:hints") then
+		return true, "hint";
 	end
 	if stanza:get_child("body") then
 		return true, "body";
 	end