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

util.stanza: Add method for extracting a single attribute value

Browse source 
Sometimes you only care about a single attribute, but the child tag
itself may be optional, leading to needing `tag and tag.attr.foo` or
`stanza:find("tag@foo")`.

The `:find()` method is fairly complex, so avoiding it for this kind of
simpler use case is a win.
This commit is contained in:
Kim Alvefur 2022-08-17 19:04:30 +02:00
parent 2294d8b8e0
commit 8959868a28
3 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
plugins/mod_pubsub/pubsub.lib.lua
View file

@ -678,8 +678,7 @@ end
function handlers.set_retract(origin, stanza, retract, service)
local node, notify = retract.attr.node, retract.attr.notify;
notify = (notify == "1") or (notify == "true");
local item = retract:get_child("item");
local id = item and item.attr.id
local id = retract:get_child_attr("item", nil, "id");
if not (node and id) then
origin.send(pubsub_error_reply(stanza, node and "item-not-found" or "nodeid-required"));
return true;

2
spec/util_dataforms_spec.lua
View file

@ -130,7 +130,7 @@ describe("util.dataforms", function ()
assert.truthy(st.is_stanza(xform));
assert.equal("x", xform.name);
assert.equal("jabber:x:data", xform.attr.xmlns);
assert.equal("FORM_TYPE", xform:find("field@var"));
assert.equal("FORM_TYPE", xform:get_child_attr("field", nil, "var"));
assert.equal("xmpp:prosody.im/spec/util.dataforms#1", xform:find("field/value#"));
local allowed_direct_children = {
title = true,

8
util/stanza.lua
View file

@ -176,6 +176,14 @@ function stanza_mt:get_child_text(name, xmlns)
return nil;
end
function stanza_mt:get_child_attr(name, xmlns, attr)
local tag = self:get_child(name, xmlns);
if tag then
return tag.attr[attr];
end
return nil;
end
function stanza_mt:child_with_name(name)
for _, child in ipairs(self.tags) do
if child.name == name then return child; end