Mercurial > prosody-hg
changeset 13942:bf49d1136235
Merge 13.0->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 08 Sep 2025 13:25:53 +0200 |
| parents | b1e7d3f571b1 (current diff) f4e16e6265e6 (diff) |
| children | b609c777956a |
| files | |
| diffstat | 3 files changed, 6 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/doap.xml Sun Aug 31 00:47:25 2025 +0200 +++ b/doc/doap.xml Mon Sep 08 13:25:53 2025 +0200 @@ -518,7 +518,7 @@ <implements> <xmpp:SupportedXep> <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0198.html"/> - <xmpp:version>1.6.2</xmpp:version> + <xmpp:version>1.6.3</xmpp:version> <xmpp:status>complete</xmpp:status> <xmpp:since>0.12.0</xmpp:since> <xmpp:note>mod_smacks</xmpp:note>
--- a/plugins/mod_smacks.lua Sun Aug 31 00:47:25 2025 +0200 +++ b/plugins/mod_smacks.lua Mon Sep 08 13:25:53 2025 +0200 @@ -152,16 +152,16 @@ module:hook("stream-features", function (event) if can_do_smacks(event.origin, true) then - event.features:tag("sm", sm2_attr):tag("optional"):up():up(); - event.features:tag("sm", sm3_attr):tag("optional"):up():up(); + event.features:tag("sm", sm2_attr):up(); + event.features:tag("sm", sm3_attr):up(); end end); module:hook("s2s-stream-features", function (event) if can_do_smacks(event.origin, true) then - event.features:tag("sm", sm2_attr):tag("optional"):up():up(); - event.features:tag("sm", sm3_attr):tag("optional"):up():up(); + event.features:tag("sm", sm2_attr):up(); + event.features:tag("sm", sm3_attr):up(); end end);
--- a/plugins/muc/vcard.lib.lua Sun Aug 31 00:47:25 2025 +0200 +++ b/plugins/muc/vcard.lib.lua Mon Sep 08 13:25:53 2025 +0200 @@ -10,13 +10,8 @@ --luacheck: ignore 113/get_room_from_jid local function get_avatar_hash(room) - if room.avatar_hash then return room.avatar_hash; end - local room_node = jid.split(room.jid); - local hash = mod_vcard.get_avatar_hash(room_node); - room.avatar_hash = hash; - - return hash; + return mod_vcard.get_avatar_hash(room_node); end local function send_avatar_hash(room, to)