diff options
| author | Kim Alvefur <zash@zash.se> | 2025-03-23 20:19:09 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2025-03-23 20:19:09 +0100 |
| commit | 3d5416fa91f3d9ad645d9f5d68fb8fcec6918412 (patch) | |
| tree | 890c4bcbfb1b0ee02ce8e8c7a88ab23a8949781e /plugins | |
| parent | d3899c1e16cb15638278ada79279bd10d4aefbb6 (diff) | |
| parent | be51e54c680fd94303a5e8681fd5340503976f0b (diff) | |
| download | prosody-3d5416fa91f3d9ad645d9f5d68fb8fcec6918412.tar.gz prosody-3d5416fa91f3d9ad645d9f5d68fb8fcec6918412.zip | |
Merge 13.0->trunk
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/mod_mam/mod_mam.lua | 2 | ||||
| -rw-r--r-- | plugins/muc/history.lib.lua | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/plugins/mod_mam/mod_mam.lua b/plugins/mod_mam/mod_mam.lua index b57fc030..4eb49819 100644 --- a/plugins/mod_mam/mod_mam.lua +++ b/plugins/mod_mam/mod_mam.lua @@ -341,7 +341,6 @@ local function should_store(stanza) --> boolean, reason: string 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 @@ local function should_store(stanza) --> boolean, reason: string 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 --git a/plugins/muc/history.lib.lua b/plugins/muc/history.lib.lua index 005bd1d8..f85decfb 100644 --- a/plugins/muc/history.lib.lua +++ b/plugins/muc/history.lib.lua @@ -204,7 +204,6 @@ module:hook("muc-message-is-historic", function (event) 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 @@ module:hook("muc-message-is-historic", function (event) return true, "encrypted"; end if stanza:get_child(nil, "urn:xmpp:chat-markers:0") then - -- XXX Experimental XEP return true, "marker"; end end, -1); |