From 70b5195b4fd077010c5b3a0e523e978cf2914310 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Tue, 22 Apr 2014 23:14:53 +0200 Subject: tools/jabberd14sql2prosody: Fix package.path (thanks daurnimator) --- tools/jabberd14sql2prosody.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/jabberd14sql2prosody.lua b/tools/jabberd14sql2prosody.lua index d6a6753f..386bdcf0 100644 --- a/tools/jabberd14sql2prosody.lua +++ b/tools/jabberd14sql2prosody.lua @@ -428,7 +428,7 @@ end end -- import modules -package.path = package.path.."..\?.lua;"; +package.path = package.path..";../?.lua;"; local my_name = arg[0]; if my_name:match("[/\\]") then -- cgit v1.2.3 From ef460cbd97a813669486cbd8b23a5a4a012cac70 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Tue, 22 Apr 2014 23:36:26 +0200 Subject: util.dataforms: Add support for XEP-0221: Data Forms Media Element --- util/dataforms.lua | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/util/dataforms.lua b/util/dataforms.lua index 52924841..01a8eef3 100644 --- a/util/dataforms.lua +++ b/util/dataforms.lua @@ -93,6 +93,15 @@ function form_t.form(layout, data, formtype) end end end + + local media = field.media; + if media then + form:tag("media", { xmlns = "urn:xmpp:media-element", height = media.height, width = media.width }); + for _, val in ipairs(media) do + form:tag("uri", { type = val.type }):text(val.uri):up() + end + form:up(); + end if field.required then form:tag("required"):up(); -- cgit v1.2.3