MUC: Switch to official XEP-0317 namespace for Hats (including compat) (thanks nicoco)
--- a/doc/doap.xml Wed Mar 27 19:33:11 2024 +0100
+++ b/doc/doap.xml Thu Mar 28 15:26:57 2024 +0100
@@ -699,8 +699,8 @@
<implements>
<xmpp:SupportedXep>
<xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0317.html"/>
- <xmpp:version>0.1</xmpp:version>
- <xmpp:status>planned</xmpp:status>
+ <xmpp:version>0.2.0</xmpp:version>
+ <xmpp:status>complete</xmpp:status>
<xmpp:since>0.12.0</xmpp:since>
<xmpp:note>muc/hats</xmpp:note>
</xmpp:SupportedXep>
--- a/plugins/muc/hats.lib.lua Wed Mar 27 19:33:11 2024 +0100
+++ b/plugins/muc/hats.lib.lua Thu Mar 28 15:26:57 2024 +0100
@@ -1,7 +1,10 @@
local st = require "prosody.util.stanza";
local muc_util = module:require "muc/util";
-local xmlns_hats = "xmpp:prosody.im/protocol/hats:1";
+local hats_compat = module:get_option_boolean("muc_hats_compat", true); -- COMPAT for pre-XEP namespace, TODO reconsider default for next release
+
+local xmlns_hats_legacy = "xmpp:prosody.im/protocol/hats:1";
+local xmlns_hats = "urn:xmpp:hats:0";
-- Strip any hats claimed by the client (to prevent spoofing)
muc_util.add_filtered_namespace(xmlns_hats);
@@ -19,6 +22,12 @@
hats_el = st.stanza("hats", { xmlns = xmlns_hats });
end
hats_el:tag("hat", { uri = hat_id, title = hat_data.title }):up();
+ if hats_compat then
+ if not hats_el then
+ hats_el = st.stanza("hats", { xmlns = xmlns_hats_legacy });
+ end
+ hats_el:tag("hat", { uri = hat_id, title = hat_data.title }):up();
+ end
end
end
if not hats_el then return; end