Mercurial > prosody-modules
changeset 2150:c1ecc3bc88fa
mod_pep_vcard_avatar: Replace PHOTO and NICKNAME tags instead of modifying them in-place
author | Kim Alvefur <zash@zash.se> |
---|---|
date | Sun, 03 Apr 2016 00:19:51 +0200 (2016-04-02) |
parents | d9e91240a2dd |
children | 96aca307964b |
files | mod_pep_vcard_avatar/mod_pep_vcard_avatar.lua |
diffstat | 1 files changed, 26 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/mod_pep_vcard_avatar/mod_pep_vcard_avatar.lua Sun Apr 03 00:19:11 2016 +0200 +++ b/mod_pep_vcard_avatar/mod_pep_vcard_avatar.lua Sun Apr 03 00:19:51 2016 +0200 @@ -29,6 +29,24 @@ return vcard, err; end +local function replace_tag(s, replacement) + local once = false; + s:maptags(function (tag) + if tag.name == replacement.name and tag.attr.xmlns == replacement.attr.xmlns then + if not once then + once = true; + return replacement; + else + return nil; + end + end + return tag; + end); + if not once then + s:add_child(replacement); + end +end + local function set_vcard(username, vcard) if vcard then vcard = st.preserialize(st.clone(vcard)); @@ -95,13 +113,11 @@ return; end -- Publishing in the wrong order? local vcard = get_vcard(username); - local old_photo = vcard:get_child("PHOTO"); - if old_photo then - local photo_type = old_photo:get_child("TYPE"); - photo_type[1] = metadata.attr.type; - local photo_b64 = old_photo:get_child("BINVAL"); - photo_b64[1] = pep_photo:get_child_text("data", "urn:xmpp:avatar:data"); - end + local new_photo = st.stanza("PHOTO", { xmlns = "vcard-temp" }) + :tag("TYPE"):text(metadat.attr.type):up() + :tag("BINVAL"):text(pep_photo:get_child_text("data", "urn:xmpp:avatar:data")); + + replace_tag(vcard, new_photo); set_vcard(username, vcard); end @@ -109,15 +125,9 @@ local function on_publish_nick(event) local username = event.session.username; local vcard = get_vcard(username); - local new_nick = event.item:get_child_text("nick", "http://jabber.org/protocol/nick"); - local old_nick = vcard:get_child("NICKNAME"); - if not old_nick then - vcard:tag("NICKNAME"):text(new_nick); - elseif old_nick[1] ~= new_nick then - old_nick[1] = new_nick; - else - return -- no change - end + local new_nick = st.stanza("NICKNAME", { xmlns = "vcard-temp" }) + :text(event.item:get_child_text("nick", "http://jabber.org/protocol/nick")); + replace_tag(vcard, new_nick); set_vcard(username, vcard); end