diff options
| author | Kim Alvefur <zash@zash.se> | 2024-03-28 15:26:57 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2024-03-28 15:26:57 +0100 |
| commit | 8cdc5fb3a27464294e66e190a2b58ad91defadba (patch) | |
| tree | 5cdc81275449faff1a55663d422953f1d533304f | |
| parent | e311f13c4342a2dfc059fd15fe87e51375b95398 (diff) | |
| download | prosody-8cdc5fb3a27464294e66e190a2b58ad91defadba.tar.gz prosody-8cdc5fb3a27464294e66e190a2b58ad91defadba.zip | |
MUC: Switch to official XEP-0317 namespace for Hats (including compat) (thanks nicoco)
| -rw-r--r-- | doc/doap.xml | 4 | ||||
| -rw-r--r-- | plugins/muc/hats.lib.lua | 11 |
2 files changed, 12 insertions, 3 deletions
diff --git a/doc/doap.xml b/doc/doap.xml index c5501be2..62e4063c 100644 --- a/doc/doap.xml +++ b/doc/doap.xml @@ -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> diff --git a/plugins/muc/hats.lib.lua b/plugins/muc/hats.lib.lua index e1587974..47667d7b 100644 --- a/plugins/muc/hats.lib.lua +++ b/plugins/muc/hats.lib.lua @@ -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 @@ module:hook("muc-build-occupant-presence", function (event) 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 |