# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1742757549 -3600
# Node ID aecdec3dad83b7d6707137c49063ccd49e71740a
# Parent  3e72cdca6bebc41c7b186517ab51014a13c163a3# Parent  24252947a8ca84516bc760a62829d5c538a1793d
Merge 13.0->trunk

diff -r 3e72cdca6beb -r aecdec3dad83 doc/doap.xml
--- a/doc/doap.xml	Sun Mar 23 17:24:49 2025 +0100
+++ b/doc/doap.xml	Sun Mar 23 20:19:09 2025 +0100
@@ -381,6 +381,15 @@
     </implements>
     <implements>
       <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0156.html"/>
+        <xmpp:version>1.4.0</xmpp:version>
+        <xmpp:since>13.0.0</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>mod_http_altconnect</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
         <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0157.html"/>
         <xmpp:version>1.1.1</xmpp:version>
         <xmpp:since>0.10.0</xmpp:since>
@@ -717,6 +726,24 @@
     </implements>
     <implements>
       <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0333.html"/>
+        <xmpp:version>1.0.0</xmpp:version>
+        <xmpp:since>0.10.0</xmpp:since>
+        <xmpp:status>partial</xmpp:status>
+        <xmpp:note>Used in mod_mam and mod_muc</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
+        <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0334.html"/>
+        <xmpp:version>1.0.0</xmpp:version>
+        <xmpp:since>0.10.0</xmpp:since>
+        <xmpp:status>complete</xmpp:status>
+        <xmpp:note>Used in mod_carbons, mod_mam, and mod_muc</xmpp:note>
+      </xmpp:SupportedXep>
+    </implements>
+    <implements>
+      <xmpp:SupportedXep>
         <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0352.html"/>
         <xmpp:version>1.0.0</xmpp:version>
         <xmpp:since>0.11.0</xmpp:since>
diff -r 3e72cdca6beb -r aecdec3dad83 plugins/mod_mam/mod_mam.lua
--- a/plugins/mod_mam/mod_mam.lua	Sun Mar 23 17:24:49 2025 +0100
+++ b/plugins/mod_mam/mod_mam.lua	Sun Mar 23 20:19:09 2025 +0100
@@ -341,7 +341,6 @@
 	end
 	if stanza:get_child("no-store", "urn:xmpp:hints")
 	or stanza:get_child("no-permanent-store", "urn:xmpp:hints") then
-		-- XXX Experimental XEP
 		return false, "hint";
 	end
 	if stanza:get_child("store", "urn:xmpp:hints") then
@@ -365,7 +364,6 @@
 		return true, "receipt";
 	end
 	if stanza:get_child(nil, "urn:xmpp:chat-markers:0") then
-		-- XXX Experimental XEP
 		return true, "marker";
 	end
 	if stanza:get_child("x", "jabber:x:conference")
diff -r 3e72cdca6beb -r aecdec3dad83 plugins/muc/history.lib.lua
--- a/plugins/muc/history.lib.lua	Sun Mar 23 17:24:49 2025 +0100
+++ b/plugins/muc/history.lib.lua	Sun Mar 23 20:19:09 2025 +0100
@@ -204,7 +204,6 @@
 	local stanza = event.stanza;
 	if stanza:get_child("no-store", "urn:xmpp:hints")
 	or stanza:get_child("no-permanent-store", "urn:xmpp:hints") then
-		-- XXX Experimental XEP
 		return false, "hint";
 	end
 	if stanza:get_child("store", "urn:xmpp:hints") then
@@ -219,7 +218,6 @@
 		return true, "encrypted";
 	end
 	if stanza:get_child(nil, "urn:xmpp:chat-markers:0") then
-		-- XXX Experimental XEP
 		return true, "marker";
 	end
 end, -1);