Mercurial > prosody-modules
comparison mod_bookmarks2/mod_bookmarks2.lua @ 4738:5aee8d86629a
mod_bookmarks2: Fix handling of nick and password elements
This form of child retrieval fails when the stanza elements internally
don't have an 'xmlns' attribute, which can happen sometimes for some
reason, including when they have been constructed via the stanza builder
API. When that is the case then the explicit namespace arguemnt does not
match the nil value of the internal attribute. Calling `:get_child()`
without the namespace argument does the right thing here, with both nil
and the parent namespace as valid values for the internal attribute.
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 03 Nov 2021 21:11:55 +0100 |
| parents | 5a06c711649c |
| children | fdd9e5d89d73 |
comparison
equal
deleted
inserted
replaced
| 4737:2bc5a0c0d8c3 | 4738:5aee8d86629a |
|---|---|
| 65 local conference = st.stanza("conference"); | 65 local conference = st.stanza("conference"); |
| 66 conference.attr.jid = item.attr.id; | 66 conference.attr.jid = item.attr.id; |
| 67 local bookmark = item:get_child("conference", namespace); | 67 local bookmark = item:get_child("conference", namespace); |
| 68 conference.attr.name = bookmark.attr.name; | 68 conference.attr.name = bookmark.attr.name; |
| 69 conference.attr.autojoin = bookmark.attr.autojoin; | 69 conference.attr.autojoin = bookmark.attr.autojoin; |
| 70 local nick = bookmark:get_child_text("nick", namespace); | 70 local nick = bookmark:get_child_text("nick"); |
| 71 if nick ~= nil then | 71 if nick ~= nil then |
| 72 conference:text_tag("nick", nick, { xmlns = "storage:bookmarks" }):up(); | 72 conference:text_tag("nick", nick, { xmlns = "storage:bookmarks" }):up(); |
| 73 end | 73 end |
| 74 local password = bookmark:get_child_text("password", namespace); | 74 local password = bookmark:get_child_text("password"); |
| 75 if password ~= nil then | 75 if password ~= nil then |
| 76 conference:text_tag("password", password):up(); | 76 conference:text_tag("password", password):up(); |
| 77 end | 77 end |
| 78 storage:add_child(conference); | 78 storage:add_child(conference); |
| 79 end | 79 end |