mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-01 20:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 13.0->trunk

Browse source
This commit is contained in:
Kim Alvefur 2025-03-23 20:19:09 +01:00
commit 3d5416fa91
3 changed files with 27 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

27
doc/doap.xml
View file

@ -379,6 +379,15 @@
<xmpp:note>via XEP-0398</xmpp:note> <xmpp:note>via XEP-0398</xmpp:note>
</xmpp:SupportedXep> </xmpp:SupportedXep>
</implements> </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> <implements>
<xmpp:SupportedXep> <xmpp:SupportedXep>
<xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0157.html"/> <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0157.html"/>
@ -715,6 +724,24 @@
<xmpp:note>refers to inclusion of delay stamp in presence</xmpp:note> <xmpp:note>refers to inclusion of delay stamp in presence</xmpp:note>
</xmpp:SupportedXep> </xmpp:SupportedXep>
</implements> </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> <implements>
<xmpp:SupportedXep> <xmpp:SupportedXep>
<xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0352.html"/> <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0352.html"/>

2
plugins/mod_mam/mod_mam.lua
View file

@ -341,7 +341,6 @@ local function should_store(stanza) --> boolean, reason: string
end end
if stanza:get_child("no-store", "urn:xmpp:hints") if stanza:get_child("no-store", "urn:xmpp:hints")
or stanza:get_child("no-permanent-store", "urn:xmpp:hints") then or stanza:get_child("no-permanent-store", "urn:xmpp:hints") then
-- XXX Experimental XEP
return false, "hint"; return false, "hint";
end end
if stanza:get_child("store", "urn:xmpp:hints") then if stanza:get_child("store", "urn:xmpp:hints") then
@ -365,7 +364,6 @@ local function should_store(stanza) --> boolean, reason: string
return true, "receipt"; return true, "receipt";
end end
if stanza:get_child(nil, "urn:xmpp:chat-markers:0") then if stanza:get_child(nil, "urn:xmpp:chat-markers:0") then
-- XXX Experimental XEP
return true, "marker"; return true, "marker";
end end
if stanza:get_child("x", "jabber:x:conference") if stanza:get_child("x", "jabber:x:conference")

2
plugins/muc/history.lib.lua
View file

@ -204,7 +204,6 @@ module:hook("muc-message-is-historic", function (event)
local stanza = event.stanza; local stanza = event.stanza;
if stanza:get_child("no-store", "urn:xmpp:hints") if stanza:get_child("no-store", "urn:xmpp:hints")
or stanza:get_child("no-permanent-store", "urn:xmpp:hints") then or stanza:get_child("no-permanent-store", "urn:xmpp:hints") then
-- XXX Experimental XEP
return false, "hint"; return false, "hint";
end end
if stanza:get_child("store", "urn:xmpp:hints") then if stanza:get_child("store", "urn:xmpp:hints") then
@ -219,7 +218,6 @@ module:hook("muc-message-is-historic", function (event)
return true, "encrypted"; return true, "encrypted";
end end
if stanza:get_child(nil, "urn:xmpp:chat-markers:0") then if stanza:get_child(nil, "urn:xmpp:chat-markers:0") then
-- XXX Experimental XEP
return true, "marker"; return true, "marker";
end end
end, -1); end, -1);