diff options
| author | Kim Alvefur <zash@zash.se> | 2019-09-21 16:50:29 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2019-09-21 16:50:29 +0200 |
| commit | 43151af52950b10e777bb20954cedee2a75b9794 (patch) | |
| tree | 40b22469e78321dfd44d5528ccc33d3eeb115019 /plugins | |
| parent | d248f67c60fed92db726da4f2bc5b4d4a3895c7c (diff) | |
| parent | e180b392eb66201d7d5e8e55ff0b475551d7f9d2 (diff) | |
| download | prosody-43151af52950b10e777bb20954cedee2a75b9794.tar.gz prosody-43151af52950b10e777bb20954cedee2a75b9794.zip | |
Merge 0.11->trunk
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/mod_vcard_legacy.lua | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/plugins/mod_vcard_legacy.lua b/plugins/mod_vcard_legacy.lua index 91497493..6bae3ee5 100644 --- a/plugins/mod_vcard_legacy.lua +++ b/plugins/mod_vcard_legacy.lua @@ -321,13 +321,19 @@ local function inject_xep153(event) if stanza.attr.type then return end local pep_service = mod_pep.get_pep_service(username); - stanza:remove_children("x", "vcard-temp:x:update"); - local x_update = st.stanza("x", { xmlns = "vcard-temp:x:update" }); + local x_update = stanza:get_child("x", "vcard-temp:x:update"); + if not x_update then + x_update = st.stanza("x", { xmlns = "vcard-temp:x:update" }):tag("photo"); + stanza:add_direct_child(x_update); + elseif x_update:get_child("photo") then + return; -- XEP implies that these should be left alone + else + x_update:tag("photo"); + end local ok, avatar_hash = pep_service:get_last_item("urn:xmpp:avatar:metadata", true); if ok and avatar_hash then - x_update:text_tag("photo", avatar_hash); + x_update:text(avatar_hash); end - stanza:add_direct_child(x_update); end module:hook("pre-presence/full", inject_xep153, 1); |