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

util.dataforms: Convert media element sizes to avoid error on Lua 5.3

Browse source 
The stanza API does not accept number values and threw an error due to
the height and width attributes of the media element (XEP-0221).

This part had no test coverage previously, explaining why it was not
discovered until now.
This commit is contained in:
Kim Alvefur 2020-08-16 12:55:55 +02:00
parent 120c93c789
commit 5b16babafb
2 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
spec/util_dataforms_spec.lua
View file

@ -106,6 +106,21 @@ describe("util.dataforms", function ()
name = "text-single-field",
value = "text-single-value",
},
{
-- XEP-0221
-- TODO Validate the XML produced by this.
type = "text-single",
label = "text-single-with-media-label",
name = "text-single-with-media-field",
media = {
height = 24,
width = 32,
{
type = "image/png",
uri = "data:",
},
},
},
});
xform = some_form:form();
end);

2
util/dataforms.lua
View file

@ -136,7 +136,7 @@ function form_t.form(layout, data, formtype)
local media = field.media;
if media then
form:tag("media", { xmlns = "urn:xmpp:media-element", height = media.height, width = media.width });
form:tag("media", { xmlns = "urn:xmpp:media-element", height = ("%g"):format(media.height), width = ("%g"):format(media.width) });
for _, val in ipairs(media) do
form:tag("uri", { type = val.type }):text(val.uri):up()
end