prosody-modules: mod_rest/jsonmap.lib.lua annotate

annotate mod_rest/jsonmap.lib.lua @ 3954:7a2998e48545

mod_auth_ldap: Fix broken link to LuaLDAP

author	Kim Alvefur <zash@zash.se>
date	Wed, 25 Mar 2020 19:42:18 +0100
parents	2c6d5734ae04
children	1925d63eec6b

rev	line source
3813 aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	1 local array = require "util.array";
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	2 local jid = require "util.jid";
3823 31b1797a78e1 mod_rest: Add support for XEP-XXXX: User-defined Data Transfer Kim Alvefur <zash@zash.se> parents: 3822 diff changeset	3 local json = require "util.json";
3813 aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	4 local st = require "util.stanza";
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	5 local xml = require "util.xml";
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	6
3922 ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	7 local field_mappings; -- in scope for "func" mappings
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	8 field_mappings = {
3886 b64b08b7bf8e mod_rest: Ignore already handled top-level stanza attr fields Kim Alvefur <zash@zash.se> parents: 3885 diff changeset	9 -- top level stanza attributes
b64b08b7bf8e mod_rest: Ignore already handled top-level stanza attr fields Kim Alvefur <zash@zash.se> parents: 3885 diff changeset	10 -- needed here to mark them as known fields
b64b08b7bf8e mod_rest: Ignore already handled top-level stanza attr fields Kim Alvefur <zash@zash.se> parents: 3885 diff changeset	11 kind = "attr",
b64b08b7bf8e mod_rest: Ignore already handled top-level stanza attr fields Kim Alvefur <zash@zash.se> parents: 3885 diff changeset	12 type = "attr",
b64b08b7bf8e mod_rest: Ignore already handled top-level stanza attr fields Kim Alvefur <zash@zash.se> parents: 3885 diff changeset	13 to = "attr",
b64b08b7bf8e mod_rest: Ignore already handled top-level stanza attr fields Kim Alvefur <zash@zash.se> parents: 3885 diff changeset	14 from = "attr",
b64b08b7bf8e mod_rest: Ignore already handled top-level stanza attr fields Kim Alvefur <zash@zash.se> parents: 3885 diff changeset	15 id = "attr",
b64b08b7bf8e mod_rest: Ignore already handled top-level stanza attr fields Kim Alvefur <zash@zash.se> parents: 3885 diff changeset	16
3813 aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	17 -- basic message
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	18 body = "text_tag",
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	19 subject = "text_tag",
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	20 thread = "text_tag",
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	21
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	22 -- basic presence
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	23 show = "text_tag",
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	24 status = "text_tag",
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	25 priority = "text_tag",
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	26
3896 987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	27 state = { type = "name", xmlns = "http://jabber.org/protocol/chatstates" },
987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	28 nick = { type = "text_tag", xmlns = "http://jabber.org/protocol/nick", tagname = "nick" },
987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	29 delay = { type = "attr", xmlns = "urn:xmpp:delay", tagname = "delay", attr = "stamp" },
987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	30 replace = { type = "attr", xmlns = "urn:xmpp:message-correct:0", tagname = "replace", attr = "id" },
3813 aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	31
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	32 -- XEP-0045 MUC
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	33 -- TODO history, password, ???
3896 987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	34 join = { type = "bool_tag", xmlns = "http://jabber.org/protocol/muc", tagname = "x" },
3813 aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	35
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	36 -- XEP-0071
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	37 html = {
3896 987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	38 type = "func", xmlns = "http://jabber.org/protocol/xhtml-im", tagname = "html",
987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	39 st2json = function (s) --> json string
987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	40 return (tostring(s:get_child("body", "http://www.w3.org/1999/xhtml")):gsub(" xmlns='[^']*'", "", 1));
3813 aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	41 end;
3896 987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	42 json2st = function (s) --> xml
3817 937f8c463be6 mod_rest: Stricter type checks in JSON mapping Kim Alvefur <zash@zash.se> parents: 3813 diff changeset	43 if type(s) == "string" then
3896 987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	44 return assert(xml.parse("<x:html xmlns:x='http://jabber.org/protocol/xhtml-im' xmlns='http://www.w3.org/1999/xhtml'>" .. s .. "</x:html>"));
3817 937f8c463be6 mod_rest: Stricter type checks in JSON mapping Kim Alvefur <zash@zash.se> parents: 3813 diff changeset	45 end
3813 aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	46 end;
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	47 };
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	48
3855 0e1e900577c4 mod_rest: Improve some comments Kim Alvefur <zash@zash.se> parents: 3854 diff changeset	49 -- XEP-0199: XMPP Ping
3896 987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	50 ping = { type = "bool_tag", xmlns = "urn:xmpp:ping", tagname = "ping" },
3813 aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	51
3854 25c34c9f755c mod_rest: Add mapping of XEP-0092: Software Version Kim Alvefur <zash@zash.se> parents: 3852 diff changeset	52 -- XEP-0092: Software Version
3896 987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	53 version = { type = "func", xmlns = "jabber:iq:version", tagname = "query",
987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	54 st2json = function (s)
3854 25c34c9f755c mod_rest: Add mapping of XEP-0092: Software Version Kim Alvefur <zash@zash.se> parents: 3852 diff changeset	55 return {
25c34c9f755c mod_rest: Add mapping of XEP-0092: Software Version Kim Alvefur <zash@zash.se> parents: 3852 diff changeset	56 name = s:get_child_text("name");
25c34c9f755c mod_rest: Add mapping of XEP-0092: Software Version Kim Alvefur <zash@zash.se> parents: 3852 diff changeset	57 version = s:get_child_text("version");
25c34c9f755c mod_rest: Add mapping of XEP-0092: Software Version Kim Alvefur <zash@zash.se> parents: 3852 diff changeset	58 os = s:get_child_text("os");
25c34c9f755c mod_rest: Add mapping of XEP-0092: Software Version Kim Alvefur <zash@zash.se> parents: 3852 diff changeset	59 }
25c34c9f755c mod_rest: Add mapping of XEP-0092: Software Version Kim Alvefur <zash@zash.se> parents: 3852 diff changeset	60 end,
3896 987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	61 json2st = function (s)
3854 25c34c9f755c mod_rest: Add mapping of XEP-0092: Software Version Kim Alvefur <zash@zash.se> parents: 3852 diff changeset	62 local v = st.stanza("query", { xmlns = "jabber:iq:version" });
25c34c9f755c mod_rest: Add mapping of XEP-0092: Software Version Kim Alvefur <zash@zash.se> parents: 3852 diff changeset	63 if type(s) == "table" then
25c34c9f755c mod_rest: Add mapping of XEP-0092: Software Version Kim Alvefur <zash@zash.se> parents: 3852 diff changeset	64 v:text_tag("name", s.name);
25c34c9f755c mod_rest: Add mapping of XEP-0092: Software Version Kim Alvefur <zash@zash.se> parents: 3852 diff changeset	65 v:text_tag("version", s.version);
25c34c9f755c mod_rest: Add mapping of XEP-0092: Software Version Kim Alvefur <zash@zash.se> parents: 3852 diff changeset	66 if s.os then
25c34c9f755c mod_rest: Add mapping of XEP-0092: Software Version Kim Alvefur <zash@zash.se> parents: 3852 diff changeset	67 v:text_tag("os", s.os);
25c34c9f755c mod_rest: Add mapping of XEP-0092: Software Version Kim Alvefur <zash@zash.se> parents: 3852 diff changeset	68 end
25c34c9f755c mod_rest: Add mapping of XEP-0092: Software Version Kim Alvefur <zash@zash.se> parents: 3852 diff changeset	69 end
25c34c9f755c mod_rest: Add mapping of XEP-0092: Software Version Kim Alvefur <zash@zash.se> parents: 3852 diff changeset	70 return v;
25c34c9f755c mod_rest: Add mapping of XEP-0092: Software Version Kim Alvefur <zash@zash.se> parents: 3852 diff changeset	71 end
25c34c9f755c mod_rest: Add mapping of XEP-0092: Software Version Kim Alvefur <zash@zash.se> parents: 3852 diff changeset	72 };
25c34c9f755c mod_rest: Add mapping of XEP-0092: Software Version Kim Alvefur <zash@zash.se> parents: 3852 diff changeset	73
3813 aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	74 -- XEP-0030
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	75 disco = {
3896 987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	76 type = "func", xmlns = "http://jabber.org/protocol/disco#info", tagname = "query",
987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	77 st2json = function (s) --> array of features
3953 2c6d5734ae04 mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions Kim Alvefur <zash@zash.se> parents: 3932 diff changeset	78 local identities, features, extensions = array(), array(), {};
3813 aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	79 for tag in s:childtags() do
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	80 if tag.name == "identity" and tag.attr.category and tag.attr.type then
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	81 identities:push({ category = tag.attr.category, type = tag.attr.type, name = tag.attr.name });
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	82 elseif tag.name == "feature" and tag.attr.var then
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	83 features:push(tag.attr.var);
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	84 end
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	85 end
3953 2c6d5734ae04 mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions Kim Alvefur <zash@zash.se> parents: 3932 diff changeset	86 for form in s:childtags("x", "jabber:x:data") do
2c6d5734ae04 mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions Kim Alvefur <zash@zash.se> parents: 3932 diff changeset	87 local jform = field_mappings.formdata.st2json(form);
2c6d5734ae04 mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions Kim Alvefur <zash@zash.se> parents: 3932 diff changeset	88 local form_type = jform["FORM_TYPE"];
2c6d5734ae04 mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions Kim Alvefur <zash@zash.se> parents: 3932 diff changeset	89 if jform then
2c6d5734ae04 mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions Kim Alvefur <zash@zash.se> parents: 3932 diff changeset	90 jform["FORM_TYPE"] = nil;
2c6d5734ae04 mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions Kim Alvefur <zash@zash.se> parents: 3932 diff changeset	91 extensions[form_type] = jform;
2c6d5734ae04 mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions Kim Alvefur <zash@zash.se> parents: 3932 diff changeset	92 end
2c6d5734ae04 mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions Kim Alvefur <zash@zash.se> parents: 3932 diff changeset	93 end
2c6d5734ae04 mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions Kim Alvefur <zash@zash.se> parents: 3932 diff changeset	94 if next(extensions) == nil then extensions = nil; end
2c6d5734ae04 mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions Kim Alvefur <zash@zash.se> parents: 3932 diff changeset	95 return { node = s.attr.node, identities = identities, features = features, extensions = extensions };
3813 aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	96 end;
3896 987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	97 json2st = function (s)
3860 9752a6f1b9f3 mod_rest: Avoid treating special json.null value as any other table Kim Alvefur <zash@zash.se> parents: 3859 diff changeset	98 if type(s) == "table" and s ~= json.null then
3859 da3a0f055526 mod_rest: Fix handling of 'node' attribute in disco#info Kim Alvefur <zash@zash.se> parents: 3856 diff changeset	99 local disco = st.stanza("query", { xmlns = "http://jabber.org/protocol/disco#info", node = s.node });
3813 aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	100 if s.identities then
3848 1b9834500123 mod_rest: Fix iteration over disco#info identities Kim Alvefur <zash@zash.se> parents: 3823 diff changeset	101 for _, identity in ipairs(s.identities) do
3850 8d13b9c9ba75 mod_rest: Fix disco#info identities data mapping Kim Alvefur <zash@zash.se> parents: 3849 diff changeset	102 disco:tag("identity", { category = identity.category, type = identity.type, name = identity.name }):up();
3813 aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	103 end
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	104 end
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	105 if s.features then
3849 11c34e97fe1a mod_rest: Fix iteration over disco#info features Kim Alvefur <zash@zash.se> parents: 3848 diff changeset	106 for _, feature in ipairs(s.features) do
3813 aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	107 disco:tag("feature", { var = feature }):up();
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	108 end
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	109 end
3953 2c6d5734ae04 mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions Kim Alvefur <zash@zash.se> parents: 3932 diff changeset	110 if s.extensions then
2c6d5734ae04 mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions Kim Alvefur <zash@zash.se> parents: 3932 diff changeset	111 for form_type, extension in pairs(s.extensions) do
2c6d5734ae04 mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions Kim Alvefur <zash@zash.se> parents: 3932 diff changeset	112 extension["FORM_TYPE"] = form_type;
2c6d5734ae04 mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions Kim Alvefur <zash@zash.se> parents: 3932 diff changeset	113 disco:add_child(field_mappings.formdata.json2st(extension));
2c6d5734ae04 mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions Kim Alvefur <zash@zash.se> parents: 3932 diff changeset	114 end
2c6d5734ae04 mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions Kim Alvefur <zash@zash.se> parents: 3932 diff changeset	115 end
3859 da3a0f055526 mod_rest: Fix handling of 'node' attribute in disco#info Kim Alvefur <zash@zash.se> parents: 3856 diff changeset	116 return disco;
da3a0f055526 mod_rest: Fix handling of 'node' attribute in disco#info Kim Alvefur <zash@zash.se> parents: 3856 diff changeset	117 else
3870 3261a82884bb mod_rest: Fix missing return Kim Alvefur <zash@zash.se> parents: 3860 diff changeset	118 return st.stanza("query", { xmlns = "http://jabber.org/protocol/disco#info", });
3813 aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	119 end
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	120 end;
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	121 };
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	122
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	123 items = {
3896 987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	124 type = "func", xmlns = "http://jabber.org/protocol/disco#items", tagname = "query",
987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	125 st2json = function (s) --> array of features \| map with node
3875 93f71ab6cb00 mod_rest: Support passing 'node' attr in disco#items queries Kim Alvefur <zash@zash.se> parents: 3871 diff changeset	126 if s.attr.node and s.tags[1] == nil then
3896 987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	127 return { node = s.attr.node };
3875 93f71ab6cb00 mod_rest: Support passing 'node' attr in disco#items queries Kim Alvefur <zash@zash.se> parents: 3871 diff changeset	128 end
93f71ab6cb00 mod_rest: Support passing 'node' attr in disco#items queries Kim Alvefur <zash@zash.se> parents: 3871 diff changeset	129
3813 aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	130 local items = array();
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	131 for item in s:childtags("item") do
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	132 items:push({ jid = item.attr.jid, node = item.attr.node, name = item.attr.name });
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	133 end
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	134 return items;
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	135 end;
3896 987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	136 json2st = function (s)
3860 9752a6f1b9f3 mod_rest: Avoid treating special json.null value as any other table Kim Alvefur <zash@zash.se> parents: 3859 diff changeset	137 if type(s) == "table" and s ~= json.null then
3875 93f71ab6cb00 mod_rest: Support passing 'node' attr in disco#items queries Kim Alvefur <zash@zash.se> parents: 3871 diff changeset	138 local disco = st.stanza("query", { xmlns = "http://jabber.org/protocol/disco#items", node = s.node });
3813 aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	139 for _, item in ipairs(s) do
3852 66f96b98d219 mod_rest: Allow returning an array of JID strings as disco#items Kim Alvefur <zash@zash.se> parents: 3851 diff changeset	140 if type(item) == "string" then
66f96b98d219 mod_rest: Allow returning an array of JID strings as disco#items Kim Alvefur <zash@zash.se> parents: 3851 diff changeset	141 disco:tag("item", { jid = item });
66f96b98d219 mod_rest: Allow returning an array of JID strings as disco#items Kim Alvefur <zash@zash.se> parents: 3851 diff changeset	142 elseif type(item) == "table" then
66f96b98d219 mod_rest: Allow returning an array of JID strings as disco#items Kim Alvefur <zash@zash.se> parents: 3851 diff changeset	143 disco:tag("item", { jid = item.jid, node = item.node, name = item.name });
66f96b98d219 mod_rest: Allow returning an array of JID strings as disco#items Kim Alvefur <zash@zash.se> parents: 3851 diff changeset	144 end
3813 aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	145 end
3875 93f71ab6cb00 mod_rest: Support passing 'node' attr in disco#items queries Kim Alvefur <zash@zash.se> parents: 3871 diff changeset	146 return disco;
93f71ab6cb00 mod_rest: Support passing 'node' attr in disco#items queries Kim Alvefur <zash@zash.se> parents: 3871 diff changeset	147 else
93f71ab6cb00 mod_rest: Support passing 'node' attr in disco#items queries Kim Alvefur <zash@zash.se> parents: 3871 diff changeset	148 return st.stanza("query", { xmlns = "http://jabber.org/protocol/disco#items", });
3813 aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	149 end
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	150 end;
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	151 };
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	152
3877 562b34050561 mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms) Kim Alvefur <zash@zash.se> parents: 3875 diff changeset	153 -- XEP-0050: Ad-Hoc Commands
3896 987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	154 command = { type = "func", xmlns = "http://jabber.org/protocol/commands", tagname = "command",
987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	155 st2json = function (s)
3877 562b34050561 mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms) Kim Alvefur <zash@zash.se> parents: 3875 diff changeset	156 local cmd = {
562b34050561 mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms) Kim Alvefur <zash@zash.se> parents: 3875 diff changeset	157 action = s.attr.action,
562b34050561 mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms) Kim Alvefur <zash@zash.se> parents: 3875 diff changeset	158 node = s.attr.node,
562b34050561 mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms) Kim Alvefur <zash@zash.se> parents: 3875 diff changeset	159 sessionid = s.attr.sessionid,
562b34050561 mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms) Kim Alvefur <zash@zash.se> parents: 3875 diff changeset	160 status = s.attr.status,
562b34050561 mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms) Kim Alvefur <zash@zash.se> parents: 3875 diff changeset	161 };
562b34050561 mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms) Kim Alvefur <zash@zash.se> parents: 3875 diff changeset	162 local actions = s:get_child("actions");
562b34050561 mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms) Kim Alvefur <zash@zash.se> parents: 3875 diff changeset	163 local note = s:get_child("note");
3878 9a3dfe0bf9fd mod_rest: Add JSON mapping for dataform (XEP-0004) Kim Alvefur <zash@zash.se> parents: 3877 diff changeset	164 local form = s:get_child("x", "jabber:x:data");
3877 562b34050561 mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms) Kim Alvefur <zash@zash.se> parents: 3875 diff changeset	165 if actions then
562b34050561 mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms) Kim Alvefur <zash@zash.se> parents: 3875 diff changeset	166 cmd.actions = {
562b34050561 mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms) Kim Alvefur <zash@zash.se> parents: 3875 diff changeset	167 execute = actions.attr.execute,
562b34050561 mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms) Kim Alvefur <zash@zash.se> parents: 3875 diff changeset	168 };
562b34050561 mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms) Kim Alvefur <zash@zash.se> parents: 3875 diff changeset	169 for action in actions:childtags() do
562b34050561 mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms) Kim Alvefur <zash@zash.se> parents: 3875 diff changeset	170 cmd.actions[action.name] = true
562b34050561 mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms) Kim Alvefur <zash@zash.se> parents: 3875 diff changeset	171 end
562b34050561 mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms) Kim Alvefur <zash@zash.se> parents: 3875 diff changeset	172 elseif note then
562b34050561 mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms) Kim Alvefur <zash@zash.se> parents: 3875 diff changeset	173 cmd.note = {
562b34050561 mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms) Kim Alvefur <zash@zash.se> parents: 3875 diff changeset	174 type = note.attr.type;
562b34050561 mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms) Kim Alvefur <zash@zash.se> parents: 3875 diff changeset	175 text = note:get_text();
562b34050561 mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms) Kim Alvefur <zash@zash.se> parents: 3875 diff changeset	176 };
562b34050561 mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms) Kim Alvefur <zash@zash.se> parents: 3875 diff changeset	177 end
3878 9a3dfe0bf9fd mod_rest: Add JSON mapping for dataform (XEP-0004) Kim Alvefur <zash@zash.se> parents: 3877 diff changeset	178 if form then
3922 ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	179 cmd.form = field_mappings.dataform.st2json(form);
3878 9a3dfe0bf9fd mod_rest: Add JSON mapping for dataform (XEP-0004) Kim Alvefur <zash@zash.se> parents: 3877 diff changeset	180 end
3877 562b34050561 mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms) Kim Alvefur <zash@zash.se> parents: 3875 diff changeset	181 return cmd;
562b34050561 mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms) Kim Alvefur <zash@zash.se> parents: 3875 diff changeset	182 end;
3896 987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	183 json2st = function (s)
3877 562b34050561 mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms) Kim Alvefur <zash@zash.se> parents: 3875 diff changeset	184 if type(s) == "table" and s ~= json.null then
562b34050561 mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms) Kim Alvefur <zash@zash.se> parents: 3875 diff changeset	185 local cmd = st.stanza("command", {
3896 987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	186 xmlns = "http://jabber.org/protocol/commands",
987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	187 action = s.action,
987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	188 node = s.node,
987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	189 sessionid = s.sessionid,
987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	190 status = s.status,
987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	191 });
3881 5d7df207dc2b mod_rest: Add final pieces of XEP-0050 (actions, note, form) Kim Alvefur <zash@zash.se> parents: 3880 diff changeset	192 if type(s.actions) == "table" then
5d7df207dc2b mod_rest: Add final pieces of XEP-0050 (actions, note, form) Kim Alvefur <zash@zash.se> parents: 3880 diff changeset	193 cmd:tag("actions", { execute = s.actions.execute });
5d7df207dc2b mod_rest: Add final pieces of XEP-0050 (actions, note, form) Kim Alvefur <zash@zash.se> parents: 3880 diff changeset	194 do
5d7df207dc2b mod_rest: Add final pieces of XEP-0050 (actions, note, form) Kim Alvefur <zash@zash.se> parents: 3880 diff changeset	195 if s.actions.next == true then
5d7df207dc2b mod_rest: Add final pieces of XEP-0050 (actions, note, form) Kim Alvefur <zash@zash.se> parents: 3880 diff changeset	196 cmd:tag("next"):up();
5d7df207dc2b mod_rest: Add final pieces of XEP-0050 (actions, note, form) Kim Alvefur <zash@zash.se> parents: 3880 diff changeset	197 end
5d7df207dc2b mod_rest: Add final pieces of XEP-0050 (actions, note, form) Kim Alvefur <zash@zash.se> parents: 3880 diff changeset	198 if s.actions.prev == true then
5d7df207dc2b mod_rest: Add final pieces of XEP-0050 (actions, note, form) Kim Alvefur <zash@zash.se> parents: 3880 diff changeset	199 cmd:tag("prev"):up();
5d7df207dc2b mod_rest: Add final pieces of XEP-0050 (actions, note, form) Kim Alvefur <zash@zash.se> parents: 3880 diff changeset	200 end
5d7df207dc2b mod_rest: Add final pieces of XEP-0050 (actions, note, form) Kim Alvefur <zash@zash.se> parents: 3880 diff changeset	201 if s.actions.complete == true then
5d7df207dc2b mod_rest: Add final pieces of XEP-0050 (actions, note, form) Kim Alvefur <zash@zash.se> parents: 3880 diff changeset	202 cmd:tag("complete"):up();
5d7df207dc2b mod_rest: Add final pieces of XEP-0050 (actions, note, form) Kim Alvefur <zash@zash.se> parents: 3880 diff changeset	203 end
5d7df207dc2b mod_rest: Add final pieces of XEP-0050 (actions, note, form) Kim Alvefur <zash@zash.se> parents: 3880 diff changeset	204 end
5d7df207dc2b mod_rest: Add final pieces of XEP-0050 (actions, note, form) Kim Alvefur <zash@zash.se> parents: 3880 diff changeset	205 cmd:up();
5d7df207dc2b mod_rest: Add final pieces of XEP-0050 (actions, note, form) Kim Alvefur <zash@zash.se> parents: 3880 diff changeset	206 elseif type(s.note) == "table" then
5d7df207dc2b mod_rest: Add final pieces of XEP-0050 (actions, note, form) Kim Alvefur <zash@zash.se> parents: 3880 diff changeset	207 cmd:text_tag("note", s.note.text, { type = s.note.type });
5d7df207dc2b mod_rest: Add final pieces of XEP-0050 (actions, note, form) Kim Alvefur <zash@zash.se> parents: 3880 diff changeset	208 end
5d7df207dc2b mod_rest: Add final pieces of XEP-0050 (actions, note, form) Kim Alvefur <zash@zash.se> parents: 3880 diff changeset	209 if s.form then
3922 ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	210 cmd:add_child(field_mappings.dataform.json2st(s.form));
3888 04ea96a0488d mod_rest: Allow passing form data in a more compact format Kim Alvefur <zash@zash.se> parents: 3886 diff changeset	211 elseif s.data then
3922 ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	212 cmd:add_child(field_mappings.formdata.json2st(s.data));
3881 5d7df207dc2b mod_rest: Add final pieces of XEP-0050 (actions, note, form) Kim Alvefur <zash@zash.se> parents: 3880 diff changeset	213 end
3877 562b34050561 mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms) Kim Alvefur <zash@zash.se> parents: 3875 diff changeset	214 return cmd;
562b34050561 mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms) Kim Alvefur <zash@zash.se> parents: 3875 diff changeset	215 elseif type(s) == "string" then -- assume node
3896 987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	216 return st.stanza("command", { xmlns = "http://jabber.org/protocol/commands", node = s });
3877 562b34050561 mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms) Kim Alvefur <zash@zash.se> parents: 3875 diff changeset	217 end
562b34050561 mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms) Kim Alvefur <zash@zash.se> parents: 3875 diff changeset	218 -- else .. missing required attribute
562b34050561 mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms) Kim Alvefur <zash@zash.se> parents: 3875 diff changeset	219 end;
562b34050561 mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms) Kim Alvefur <zash@zash.se> parents: 3875 diff changeset	220 };
562b34050561 mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms) Kim Alvefur <zash@zash.se> parents: 3875 diff changeset	221
3855 0e1e900577c4 mod_rest: Improve some comments Kim Alvefur <zash@zash.se> parents: 3854 diff changeset	222 -- XEP-0066: Out of Band Data
3896 987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	223 oob_url = { type = "func", xmlns = "jabber:iq:oob", tagname = "query",
987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	224 st2json = function (s)
3813 aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	225 return s:get_child_text("url");
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	226 end;
3896 987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	227 json2st = function (s)
3817 937f8c463be6 mod_rest: Stricter type checks in JSON mapping Kim Alvefur <zash@zash.se> parents: 3813 diff changeset	228 if type(s) == "string" then
937f8c463be6 mod_rest: Stricter type checks in JSON mapping Kim Alvefur <zash@zash.se> parents: 3813 diff changeset	229 return st.stanza("query", { xmlns = "jabber:iq:oob" }):text_tag("url", s);
937f8c463be6 mod_rest: Stricter type checks in JSON mapping Kim Alvefur <zash@zash.se> parents: 3813 diff changeset	230 end
3813 aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	231 end;
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	232 };
3823 31b1797a78e1 mod_rest: Add support for XEP-XXXX: User-defined Data Transfer Kim Alvefur <zash@zash.se> parents: 3822 diff changeset	233
3907 d5ecb9b9cb3b mod_rest: Update with namespace and name of XEP-0432 Kim Alvefur <zash@zash.se> parents: 3906 diff changeset	234 -- XEP-0432: Simple JSON Messaging
d5ecb9b9cb3b mod_rest: Update with namespace and name of XEP-0432 Kim Alvefur <zash@zash.se> parents: 3906 diff changeset	235 payload = { type = "func", xmlns = "urn:xmpp:json-msg:0", tagname = "payload",
3896 987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	236 st2json = function (s)
3823 31b1797a78e1 mod_rest: Add support for XEP-XXXX: User-defined Data Transfer Kim Alvefur <zash@zash.se> parents: 3822 diff changeset	237 local rawjson = s:get_child_text("json", "urn:xmpp:json:0");
31b1797a78e1 mod_rest: Add support for XEP-XXXX: User-defined Data Transfer Kim Alvefur <zash@zash.se> parents: 3822 diff changeset	238 if not rawjson then return nil, "missing-json-payload"; end
31b1797a78e1 mod_rest: Add support for XEP-XXXX: User-defined Data Transfer Kim Alvefur <zash@zash.se> parents: 3822 diff changeset	239 local parsed, err = json.decode(rawjson);
31b1797a78e1 mod_rest: Add support for XEP-XXXX: User-defined Data Transfer Kim Alvefur <zash@zash.se> parents: 3822 diff changeset	240 if not parsed then return nil, err; end
31b1797a78e1 mod_rest: Add support for XEP-XXXX: User-defined Data Transfer Kim Alvefur <zash@zash.se> parents: 3822 diff changeset	241 return {
31b1797a78e1 mod_rest: Add support for XEP-XXXX: User-defined Data Transfer Kim Alvefur <zash@zash.se> parents: 3822 diff changeset	242 datatype = s.attr.datatype;
31b1797a78e1 mod_rest: Add support for XEP-XXXX: User-defined Data Transfer Kim Alvefur <zash@zash.se> parents: 3822 diff changeset	243 data = parsed;
31b1797a78e1 mod_rest: Add support for XEP-XXXX: User-defined Data Transfer Kim Alvefur <zash@zash.se> parents: 3822 diff changeset	244 };
31b1797a78e1 mod_rest: Add support for XEP-XXXX: User-defined Data Transfer Kim Alvefur <zash@zash.se> parents: 3822 diff changeset	245 end;
3896 987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	246 json2st = function (s)
3823 31b1797a78e1 mod_rest: Add support for XEP-XXXX: User-defined Data Transfer Kim Alvefur <zash@zash.se> parents: 3822 diff changeset	247 if type(s) == "table" then
3907 d5ecb9b9cb3b mod_rest: Update with namespace and name of XEP-0432 Kim Alvefur <zash@zash.se> parents: 3906 diff changeset	248 return st.stanza("payload", { xmlns = "urn:xmpp:json-msg:0", datatype = s.datatype })
3896 987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	249 :tag("json", { xmlns = "urn:xmpp:json:0" }):text(json.encode(s.data));
3823 31b1797a78e1 mod_rest: Add support for XEP-XXXX: User-defined Data Transfer Kim Alvefur <zash@zash.se> parents: 3822 diff changeset	250 end;
31b1797a78e1 mod_rest: Add support for XEP-XXXX: User-defined Data Transfer Kim Alvefur <zash@zash.se> parents: 3822 diff changeset	251 end
31b1797a78e1 mod_rest: Add support for XEP-XXXX: User-defined Data Transfer Kim Alvefur <zash@zash.se> parents: 3822 diff changeset	252 };
31b1797a78e1 mod_rest: Add support for XEP-XXXX: User-defined Data Transfer Kim Alvefur <zash@zash.se> parents: 3822 diff changeset	253
3889 59765d1bb6dc mod_rest: Support mapping XEP-0004 Data Forms directly Kim Alvefur <zash@zash.se> parents: 3888 diff changeset	254 -- XEP-0004: Data Forms
3922 ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	255 dataform = {
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	256 -- Generic and complete dataforms mapping
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	257 type = "func", xmlns = "jabber:x:data", tagname = "x",
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	258 st2json = function (s)
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	259 local fields = array();
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	260 local form = {
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	261 type = s.attr.type;
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	262 title = s:get_child_text("title");
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	263 instructions = s:get_child_text("instructions");
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	264 fields = fields;
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	265 };
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	266 for field in s:childtags("field") do
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	267 local i = {
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	268 var = field.attr.var;
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	269 type = field.attr.type;
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	270 label = field.attr.label;
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	271 desc = field:get_child_text("desc");
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	272 required = field:get_child("required") and true or nil;
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	273 value = field:get_child_text("value");
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	274 };
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	275 if field.attr.type == "jid-multi" or field.attr.type == "list-multi" or field.attr.type == "text-multi" then
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	276 local value = array();
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	277 for v in field:childtags("value") do
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	278 value:push(v:get_text());
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	279 end
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	280 if field.attr.type == "text-multi" then
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	281 i.value = value:concat("\n");
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	282 else
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	283 i.value = value;
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	284 end
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	285 end
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	286 if field.attr.type == "list-single" or field.attr.type == "list-multi" then
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	287 local options = array();
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	288 for o in field:childtags("option") do
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	289 options:push({ label = o.attr.label, value = o:get_child_text("value") });
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	290 end
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	291 i.options = options;
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	292 end
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	293 fields:push(i);
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	294 end
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	295 return form;
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	296 end;
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	297 json2st = function (x)
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	298 if type(x) == "table" and x ~= json.null then
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	299 local form = st.stanza("x", { xmlns = "jabber:x:data", type = x.type });
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	300 if x.title then
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	301 form:text_tag("title", x.title);
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	302 end
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	303 if x.instructions then
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	304 form:text_tag("instructions", x.instructions);
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	305 end
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	306 if type(x.fields) == "table" then
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	307 for _, f in ipairs(x.fields) do
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	308 if type(f) == "table" then
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	309 form:tag("field", { var = f.var, type = f.type, label = f.label });
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	310 if f.desc then
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	311 form:text_tag("desc", f.desc);
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	312 end
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	313 if f.required == true then
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	314 form:tag("required"):up();
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	315 end
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	316 if type(f.value) == "string" then
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	317 form:text_tag("value", f.value);
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	318 elseif type(f.value) == "table" then
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	319 for _, v in ipairs(f.value) do
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	320 form:text_tag("value", v);
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	321 end
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	322 end
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	323 if type(f.options) == "table" then
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	324 for _, o in ipairs(f.value) do
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	325 if type(o) == "table" then
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	326 form:tag("option", { label = o.label });
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	327 form:text_tag("value", o.value);
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	328 form:up();
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	329 end
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	330 end
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	331 end
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	332 end
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	333 end
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	334 end
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	335 return form;
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	336 end
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	337 end;
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	338 };
3889 59765d1bb6dc mod_rest: Support mapping XEP-0004 Data Forms directly Kim Alvefur <zash@zash.se> parents: 3888 diff changeset	339
3922 ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	340 -- Simpler mapping of dataform from JSON map
3896 987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	341 formdata = { type = "func", xmlns = "jabber:x:data", tagname = "",
3953 2c6d5734ae04 mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions Kim Alvefur <zash@zash.se> parents: 3932 diff changeset	342 st2json = function (s)
2c6d5734ae04 mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions Kim Alvefur <zash@zash.se> parents: 3932 diff changeset	343 local r = {};
2c6d5734ae04 mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions Kim Alvefur <zash@zash.se> parents: 3932 diff changeset	344 for field in s:childtags("field") do
2c6d5734ae04 mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions Kim Alvefur <zash@zash.se> parents: 3932 diff changeset	345 if field.attr.var then
2c6d5734ae04 mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions Kim Alvefur <zash@zash.se> parents: 3932 diff changeset	346 local values = array();
2c6d5734ae04 mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions Kim Alvefur <zash@zash.se> parents: 3932 diff changeset	347 for value in field:childtags("value") do
2c6d5734ae04 mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions Kim Alvefur <zash@zash.se> parents: 3932 diff changeset	348 values:push(value:get_text());
2c6d5734ae04 mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions Kim Alvefur <zash@zash.se> parents: 3932 diff changeset	349 end
2c6d5734ae04 mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions Kim Alvefur <zash@zash.se> parents: 3932 diff changeset	350 if field.attr.type == "list-single" or field.attr.type == "list-multi" then
2c6d5734ae04 mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions Kim Alvefur <zash@zash.se> parents: 3932 diff changeset	351 r[field.attr.var] = values;
2c6d5734ae04 mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions Kim Alvefur <zash@zash.se> parents: 3932 diff changeset	352 elseif field.attr.type == "text-multi" then
2c6d5734ae04 mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions Kim Alvefur <zash@zash.se> parents: 3932 diff changeset	353 r[field.attr.var] = values:concat("\n");
2c6d5734ae04 mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions Kim Alvefur <zash@zash.se> parents: 3932 diff changeset	354 elseif field.attr.type == "boolean" then
2c6d5734ae04 mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions Kim Alvefur <zash@zash.se> parents: 3932 diff changeset	355 r[field.attr.var] = values[1] == "1" or values[1] == "true";
2c6d5734ae04 mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions Kim Alvefur <zash@zash.se> parents: 3932 diff changeset	356 elseif field.attr.type then
2c6d5734ae04 mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions Kim Alvefur <zash@zash.se> parents: 3932 diff changeset	357 r[field.attr.var] = values[1] or json.null;
2c6d5734ae04 mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions Kim Alvefur <zash@zash.se> parents: 3932 diff changeset	358 else -- type is optional, no way to know if multiple or single value is expected
2c6d5734ae04 mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions Kim Alvefur <zash@zash.se> parents: 3932 diff changeset	359 r[field.attr.var] = values;
2c6d5734ae04 mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions Kim Alvefur <zash@zash.se> parents: 3932 diff changeset	360 end
2c6d5734ae04 mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions Kim Alvefur <zash@zash.se> parents: 3932 diff changeset	361 end
2c6d5734ae04 mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions Kim Alvefur <zash@zash.se> parents: 3932 diff changeset	362 end
2c6d5734ae04 mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions Kim Alvefur <zash@zash.se> parents: 3932 diff changeset	363 return r;
3889 59765d1bb6dc mod_rest: Support mapping XEP-0004 Data Forms directly Kim Alvefur <zash@zash.se> parents: 3888 diff changeset	364 end,
3922 ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	365 json2st = function (s, t)
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	366 local form = st.stanza("x", { xmlns = "jabber:x:data", type = t });
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	367 for k, v in pairs(s) do
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	368 form:tag("field", { var = k });
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	369 if type(v) == "string" then
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	370 form:text_tag("value", v);
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	371 elseif type(v) == "table" then
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	372 for _, v_ in ipairs(v) do
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	373 form:text_tag("value", v_);
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	374 end
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	375 end
3932 8b34222216f4 mod_rest: Fix encoding of simple dataforms Kim Alvefur <zash@zash.se> parents: 3923 diff changeset	376 form:up();
3922 ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	377 end
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	378 return form;
ea59c9455f93 mod_rest: Move dataforms into structure for more logical code order Kim Alvefur <zash@zash.se> parents: 3912 diff changeset	379 end
3889 59765d1bb6dc mod_rest: Support mapping XEP-0004 Data Forms directly Kim Alvefur <zash@zash.se> parents: 3888 diff changeset	380 };
3923 3c3d216c6f6d mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering Kim Alvefur <zash@zash.se> parents: 3922 diff changeset	381
3c3d216c6f6d mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering Kim Alvefur <zash@zash.se> parents: 3922 diff changeset	382 -- XEP-0039: Statistics Gathering
3c3d216c6f6d mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering Kim Alvefur <zash@zash.se> parents: 3922 diff changeset	383 stats = { type = "func", xmlns = "http://jabber.org/protocol/stats", tagname = "query",
3c3d216c6f6d mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering Kim Alvefur <zash@zash.se> parents: 3922 diff changeset	384 st2json = function (s)
3c3d216c6f6d mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering Kim Alvefur <zash@zash.se> parents: 3922 diff changeset	385 local o = array();
3c3d216c6f6d mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering Kim Alvefur <zash@zash.se> parents: 3922 diff changeset	386 for stat in s:childtags("stat") do
3c3d216c6f6d mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering Kim Alvefur <zash@zash.se> parents: 3922 diff changeset	387 o:push({
3c3d216c6f6d mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering Kim Alvefur <zash@zash.se> parents: 3922 diff changeset	388 name = stat.attr.name;
3c3d216c6f6d mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering Kim Alvefur <zash@zash.se> parents: 3922 diff changeset	389 unit = stat.attr.unit;
3c3d216c6f6d mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering Kim Alvefur <zash@zash.se> parents: 3922 diff changeset	390 value = stat.attr.value;
3c3d216c6f6d mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering Kim Alvefur <zash@zash.se> parents: 3922 diff changeset	391 });
3c3d216c6f6d mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering Kim Alvefur <zash@zash.se> parents: 3922 diff changeset	392 end
3c3d216c6f6d mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering Kim Alvefur <zash@zash.se> parents: 3922 diff changeset	393 return o;
3c3d216c6f6d mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering Kim Alvefur <zash@zash.se> parents: 3922 diff changeset	394 end;
3c3d216c6f6d mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering Kim Alvefur <zash@zash.se> parents: 3922 diff changeset	395 json2st = function (j)
3c3d216c6f6d mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering Kim Alvefur <zash@zash.se> parents: 3922 diff changeset	396 local stats = st.stanza("query", { xmlns = "http://jabber.org/protocol/stats" });
3c3d216c6f6d mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering Kim Alvefur <zash@zash.se> parents: 3922 diff changeset	397 if type(j) == "table" then
3c3d216c6f6d mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering Kim Alvefur <zash@zash.se> parents: 3922 diff changeset	398 for _, stat in ipairs(j) do
3c3d216c6f6d mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering Kim Alvefur <zash@zash.se> parents: 3922 diff changeset	399 stats:tag("stat", { name = stat.name, unit = stat.unit, value = stat.value }):up();
3c3d216c6f6d mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering Kim Alvefur <zash@zash.se> parents: 3922 diff changeset	400 end
3c3d216c6f6d mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering Kim Alvefur <zash@zash.se> parents: 3922 diff changeset	401 end
3c3d216c6f6d mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering Kim Alvefur <zash@zash.se> parents: 3922 diff changeset	402 return stats;
3c3d216c6f6d mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering Kim Alvefur <zash@zash.se> parents: 3922 diff changeset	403 end;
3c3d216c6f6d mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering Kim Alvefur <zash@zash.se> parents: 3922 diff changeset	404 };
3c3d216c6f6d mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering Kim Alvefur <zash@zash.se> parents: 3922 diff changeset	405
3813 aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	406 };
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	407
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	408 local implied_kinds = {
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	409 disco = "iq",
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	410 items = "iq",
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	411 ping = "iq",
3854 25c34c9f755c mod_rest: Add mapping of XEP-0092: Software Version Kim Alvefur <zash@zash.se> parents: 3852 diff changeset	412 version = "iq",
3877 562b34050561 mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms) Kim Alvefur <zash@zash.se> parents: 3875 diff changeset	413 command = "iq",
3813 aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	414
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	415 body = "message",
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	416 html = "message",
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	417 replace = "message",
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	418 state = "message",
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	419 subject = "message",
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	420 thread = "message",
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	421
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	422 join = "presence",
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	423 priority = "presence",
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	424 show = "presence",
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	425 status = "presence",
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	426 }
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	427
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	428 local kind_by_type = {
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	429 get = "iq", set = "iq", result = "iq",
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	430 normal = "message", chat = "message", headline = "message", groupchat = "message",
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	431 available = "presence", unavailable = "presence",
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	432 subscribe = "presence", unsubscribe = "presence",
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	433 subscribed = "presence", unsubscribed = "presence",
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	434 }
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	435
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	436 local function st2json(s)
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	437 local t = {
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	438 kind = s.name,
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	439 type = s.attr.type,
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	440 to = s.attr.to,
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	441 from = s.attr.from,
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	442 id = s.attr.id,
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	443 };
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	444 if s.name == "presence" and not s.attr.type then
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	445 t.type = "available";
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	446 end
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	447
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	448 if t.to then
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	449 t.to = jid.prep(t.to);
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	450 if not t.to then return nil, "invalid-jid-to"; end
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	451 end
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	452 if t.from then
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	453 t.from = jid.prep(t.from);
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	454 if not t.from then return nil, "invalid-jid-from"; end
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	455 end
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	456
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	457 if t.type == "error" then
3871 e5d08bb58155 mod_rest: Map the error@by attribute Kim Alvefur <zash@zash.se> parents: 3870 diff changeset	458 local error = s:get_child("error");
3813 aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	459 local err_typ, err_condition, err_text = s:get_error();
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	460 t.error = {
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	461 type = err_typ,
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	462 condition = err_condition,
3871 e5d08bb58155 mod_rest: Map the error@by attribute Kim Alvefur <zash@zash.se> parents: 3870 diff changeset	463 text = err_text,
e5d08bb58155 mod_rest: Map the error@by attribute Kim Alvefur <zash@zash.se> parents: 3870 diff changeset	464 by = error.attr.by,
3813 aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	465 };
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	466 return t;
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	467 end
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	468
3895 25a3ad36ef3e mod_rest: Rename loop variable for improved clarity Kim Alvefur <zash@zash.se> parents: 3894 diff changeset	469 for k, mapping in pairs(field_mappings) do
25a3ad36ef3e mod_rest: Rename loop variable for improved clarity Kim Alvefur <zash@zash.se> parents: 3894 diff changeset	470 if mapping == "text_tag" then
3813 aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	471 t[k] = s:get_child_text(k);
3896 987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	472 elseif mapping.type == "text_tag" then
987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	473 t[k] = s:get_child_text(mapping.tagname, mapping.xmlns);
987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	474 elseif mapping.type == "name" then
987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	475 local child = s:get_child(nil, mapping.xmlns);
3813 aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	476 if child then
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	477 t[k] = child.name;
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	478 end
3896 987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	479 elseif mapping.type == "attr" then
987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	480 local child = s:get_child(mapping.tagname, mapping.xmlns);
3813 aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	481 if child then
3896 987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	482 t[k] = child.attr[mapping.attr];
3813 aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	483 end
3896 987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	484 elseif mapping.type == "bool_tag" then
987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	485 if s:get_child(mapping.tagname, mapping.xmlns) then
3813 aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	486 t[k] = true;
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	487 end
3896 987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	488 elseif mapping.type == "func" and mapping.st2json then
987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	489 local child = s:get_child(mapping.tagname, mapping.xmlns or k);
3813 aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	490 -- TODO handle err
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	491 if child then
3896 987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	492 t[k] = mapping.st2json(child);
3813 aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	493 end
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	494 end
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	495 end
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	496
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	497 return t;
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	498 end
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	499
3817 937f8c463be6 mod_rest: Stricter type checks in JSON mapping Kim Alvefur <zash@zash.se> parents: 3813 diff changeset	500 local function str(s)
937f8c463be6 mod_rest: Stricter type checks in JSON mapping Kim Alvefur <zash@zash.se> parents: 3813 diff changeset	501 if type(s) == "string" then
937f8c463be6 mod_rest: Stricter type checks in JSON mapping Kim Alvefur <zash@zash.se> parents: 3813 diff changeset	502 return s;
937f8c463be6 mod_rest: Stricter type checks in JSON mapping Kim Alvefur <zash@zash.se> parents: 3813 diff changeset	503 end
937f8c463be6 mod_rest: Stricter type checks in JSON mapping Kim Alvefur <zash@zash.se> parents: 3813 diff changeset	504 end
937f8c463be6 mod_rest: Stricter type checks in JSON mapping Kim Alvefur <zash@zash.se> parents: 3813 diff changeset	505
3813 aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	506 local function json2st(t)
3817 937f8c463be6 mod_rest: Stricter type checks in JSON mapping Kim Alvefur <zash@zash.se> parents: 3813 diff changeset	507 if type(t) ~= "table" or not str(next(t)) then
937f8c463be6 mod_rest: Stricter type checks in JSON mapping Kim Alvefur <zash@zash.se> parents: 3813 diff changeset	508 return nil, "invalid-json";
937f8c463be6 mod_rest: Stricter type checks in JSON mapping Kim Alvefur <zash@zash.se> parents: 3813 diff changeset	509 end
937f8c463be6 mod_rest: Stricter type checks in JSON mapping Kim Alvefur <zash@zash.se> parents: 3813 diff changeset	510 local kind = str(t.kind) or kind_by_type[str(t.type)];
3813 aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	511 if not kind then
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	512 for k, implied in pairs(implied_kinds) do
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	513 if t[k] then
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	514 kind = implied;
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	515 break
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	516 end
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	517 end
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	518 end
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	519
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	520 local s = st.stanza(kind or "message", {
3817 937f8c463be6 mod_rest: Stricter type checks in JSON mapping Kim Alvefur <zash@zash.se> parents: 3813 diff changeset	521 type = t.type ~= "available" and str(t.type) or nil,
937f8c463be6 mod_rest: Stricter type checks in JSON mapping Kim Alvefur <zash@zash.se> parents: 3813 diff changeset	522 to = str(t.to) and jid.prep(t.to);
937f8c463be6 mod_rest: Stricter type checks in JSON mapping Kim Alvefur <zash@zash.se> parents: 3813 diff changeset	523 from = str(t.to) and jid.prep(t.from);
937f8c463be6 mod_rest: Stricter type checks in JSON mapping Kim Alvefur <zash@zash.se> parents: 3813 diff changeset	524 id = str(t.id),
3813 aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	525 });
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	526
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	527 if t.to and not s.attr.to then
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	528 return nil, "invalid-jid-to";
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	529 end
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	530 if t.from and not s.attr.from then
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	531 return nil, "invalid-jid-from";
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	532 end
3819 1bab6f67eb5f mod_rest: Fix previous commit Kim Alvefur <zash@zash.se> parents: 3818 diff changeset	533 if kind == "iq" and not s.attr.type then
1bab6f67eb5f mod_rest: Fix previous commit Kim Alvefur <zash@zash.se> parents: 3818 diff changeset	534 s.attr.type = "get";
3818 a607c69d0804 mod_rest: Guess 'get' as default type for 'iq' stanzas in JSON mapping Kim Alvefur <zash@zash.se> parents: 3817 diff changeset	535 end
3813 aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	536
3817 937f8c463be6 mod_rest: Stricter type checks in JSON mapping Kim Alvefur <zash@zash.se> parents: 3813 diff changeset	537 if type(t.error) == "table" then
3871 e5d08bb58155 mod_rest: Map the error@by attribute Kim Alvefur <zash@zash.se> parents: 3870 diff changeset	538 return st.error_reply(st.reply(s), str(t.error.type), str(t.error.condition), str(t.error.text), str(t.error.by));
3813 aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	539 elseif t.type == "error" then
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	540 s:text_tag("error", t.body, { code = t.error_code and tostring(t.error_code) });
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	541 return s;
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	542 end
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	543
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	544 for k, v in pairs(t) do
3895 25a3ad36ef3e mod_rest: Rename loop variable for improved clarity Kim Alvefur <zash@zash.se> parents: 3894 diff changeset	545 local mapping = field_mappings[k];
25a3ad36ef3e mod_rest: Rename loop variable for improved clarity Kim Alvefur <zash@zash.se> parents: 3894 diff changeset	546 if mapping then
25a3ad36ef3e mod_rest: Rename loop variable for improved clarity Kim Alvefur <zash@zash.se> parents: 3894 diff changeset	547 if mapping == "text_tag" then
3813 aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	548 s:text_tag(k, v);
3895 25a3ad36ef3e mod_rest: Rename loop variable for improved clarity Kim Alvefur <zash@zash.se> parents: 3894 diff changeset	549 elseif mapping == "attr" then -- luacheck: ignore 542
3886 b64b08b7bf8e mod_rest: Ignore already handled top-level stanza attr fields Kim Alvefur <zash@zash.se> parents: 3885 diff changeset	550 -- handled already
3896 987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	551 elseif mapping.type == "text_tag" then
987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	552 s:text_tag(mapping.tagname or k, v, mapping.xmlns and { xmlns = mapping.xmlns });
987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	553 elseif mapping.type == "name" then
987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	554 s:tag(v, { xmlns = mapping.xmlns }):up();
987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	555 elseif mapping.type == "attr" then
987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	556 s:tag(mapping.tagname or k, { xmlns = mapping.xmlns, [mapping.attr or k] = v }):up();
987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	557 elseif mapping.type == "bool_tag" then
987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	558 s:tag(mapping.tagname or k, { xmlns = mapping.xmlns }):up();
987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	559 elseif mapping.type == "func" and mapping.json2st then
987b203bb091 mod_rest: Restructure JSON / Stanza mapping definitions Kim Alvefur <zash@zash.se> parents: 3895 diff changeset	560 s:add_child(mapping.json2st(v)):up();
3813 aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	561 end
3885 1ec45dbc7db5 mod_rest: Return an error for unknown fields in JSON input Kim Alvefur <zash@zash.se> parents: 3881 diff changeset	562 else
1ec45dbc7db5 mod_rest: Return an error for unknown fields in JSON input Kim Alvefur <zash@zash.se> parents: 3881 diff changeset	563 return nil, "unknown-field";
3813 aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	564 end
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	565 end
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	566
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	567 s:reset();
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	568
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	569 return s;
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	570 end
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	571
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	572 return {
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	573 st2json = st2json;
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	574 json2st = json2st;
aa1ad69c7c10 mod_rest: Add JSON support Kim Alvefur <zash@zash.se> parents: diff changeset	575 };

Mercurial > prosody-modules

annotate mod_rest/jsonmap.lib.lua @ 3954:7a2998e48545