Software / code / prosody-modules
Annotate
mod_rest/jsonmap.lib.lua @ 4913:47d03db2fca8
mod_conversejs: Remove plugin installer dependency on mod_bookmarks
It's available with Prosody 0.12+ already, 0.11 has no installer.
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 04 Apr 2022 17:48:34 +0200 |
| parent | 4841:f69c5a443156 |
| child | 4915:1d231fb827d3 |
| rev | line source |
|---|---|
| 3813 | 1 local array = require "util.array"; |
| 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 | 4 local st = require "util.stanza"; |
| 5 local xml = require "util.xml"; | |
|
4518
073f5397c1d2
mod_rest: Replace most mappings by using util.datamapper
Kim Alvefur <zash@zash.se>
parents:
4501
diff
changeset
|
6 local map = require "util.datamapper"; |
| 3813 | 7 |
|
4518
073f5397c1d2
mod_rest: Replace most mappings by using util.datamapper
Kim Alvefur <zash@zash.se>
parents:
4501
diff
changeset
|
8 local schema do |
|
073f5397c1d2
mod_rest: Replace most mappings by using util.datamapper
Kim Alvefur <zash@zash.se>
parents:
4501
diff
changeset
|
9 local f = assert(module:load_resource("res/schema-xmpp.json")); |
|
073f5397c1d2
mod_rest: Replace most mappings by using util.datamapper
Kim Alvefur <zash@zash.se>
parents:
4501
diff
changeset
|
10 schema = json.decode(f:read("*a")) |
|
073f5397c1d2
mod_rest: Replace most mappings by using util.datamapper
Kim Alvefur <zash@zash.se>
parents:
4501
diff
changeset
|
11 f:close(); |
|
073f5397c1d2
mod_rest: Replace most mappings by using util.datamapper
Kim Alvefur <zash@zash.se>
parents:
4501
diff
changeset
|
12 -- Copy common properties to all stanza kinds |
|
073f5397c1d2
mod_rest: Replace most mappings by using util.datamapper
Kim Alvefur <zash@zash.se>
parents:
4501
diff
changeset
|
13 if schema._common then |
|
073f5397c1d2
mod_rest: Replace most mappings by using util.datamapper
Kim Alvefur <zash@zash.se>
parents:
4501
diff
changeset
|
14 for key, prop in pairs(schema._common) do |
|
073f5397c1d2
mod_rest: Replace most mappings by using util.datamapper
Kim Alvefur <zash@zash.se>
parents:
4501
diff
changeset
|
15 for _, copyto in pairs(schema.properties) do |
|
073f5397c1d2
mod_rest: Replace most mappings by using util.datamapper
Kim Alvefur <zash@zash.se>
parents:
4501
diff
changeset
|
16 copyto.properties[key] = prop; |
|
073f5397c1d2
mod_rest: Replace most mappings by using util.datamapper
Kim Alvefur <zash@zash.se>
parents:
4501
diff
changeset
|
17 end |
|
073f5397c1d2
mod_rest: Replace most mappings by using util.datamapper
Kim Alvefur <zash@zash.se>
parents:
4501
diff
changeset
|
18 end |
|
4733
755dd83e9214
mod_rest: Add JSON mapping of XEP-0313 archive result container
Kim Alvefur <zash@zash.se>
parents:
4732
diff
changeset
|
19 schema.properties.message.properties.archive.properties.forward = schema.properties.message.properties.forwarded; |
|
4732
607cac9b9393
mod_rest: Add recursive properties of XEP-0297 forwarded container
Kim Alvefur <zash@zash.se>
parents:
4731
diff
changeset
|
20 schema.properties.message.properties.forwarded.properties.delay = schema._common.delay; |
|
4841
f69c5a443156
mod_rest: Fix nested message stanzas in XEP-0297 containers
Kim Alvefur <zash@zash.se>
parents:
4803
diff
changeset
|
21 schema.properties.message.properties.forwarded.properties.message = schema.properties.message; |
|
4742
b7df2c61a144
mod_rest: Add support for mapping of XEP-0313 query iqs
Kim Alvefur <zash@zash.se>
parents:
4733
diff
changeset
|
22 schema.properties.iq.properties.archive.properties.form = schema._common.dataform; |
|
b7df2c61a144
mod_rest: Add support for mapping of XEP-0313 query iqs
Kim Alvefur <zash@zash.se>
parents:
4733
diff
changeset
|
23 schema.properties.iq.properties.archive.properties.page = schema._common.rsm; |
|
4747
566e54a07f54
mod_rest: Map the XEP-0313 <fin> element to make paging work
Kim Alvefur <zash@zash.se>
parents:
4746
diff
changeset
|
24 schema.properties.iq.properties.result.properties.page = schema._common.rsm; |
|
4518
073f5397c1d2
mod_rest: Replace most mappings by using util.datamapper
Kim Alvefur <zash@zash.se>
parents:
4501
diff
changeset
|
25 schema._common = nil; |
|
073f5397c1d2
mod_rest: Replace most mappings by using util.datamapper
Kim Alvefur <zash@zash.se>
parents:
4501
diff
changeset
|
26 end |
|
073f5397c1d2
mod_rest: Replace most mappings by using util.datamapper
Kim Alvefur <zash@zash.se>
parents:
4501
diff
changeset
|
27 end |
|
073f5397c1d2
mod_rest: Replace most mappings by using util.datamapper
Kim Alvefur <zash@zash.se>
parents:
4501
diff
changeset
|
28 |
|
073f5397c1d2
mod_rest: Replace most mappings by using util.datamapper
Kim Alvefur <zash@zash.se>
parents:
4501
diff
changeset
|
29 -- Some mappings that are still hard to do in a nice way with util.datamapper |
|
3922
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3912
diff
changeset
|
30 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
|
31 field_mappings = { |
| 3813 | 32 -- XEP-0071 |
| 33 html = { | |
|
3896
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3895
diff
changeset
|
34 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
|
35 st2json = function (s) --> json string |
|
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3895
diff
changeset
|
36 return (tostring(s:get_child("body", "http://www.w3.org/1999/xhtml")):gsub(" xmlns='[^']*'", "", 1)); |
| 3813 | 37 end; |
|
3896
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3895
diff
changeset
|
38 json2st = function (s) --> xml |
|
3817
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3813
diff
changeset
|
39 if type(s) == "string" then |
|
3896
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3895
diff
changeset
|
40 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
|
41 end |
| 3813 | 42 end; |
| 43 }; | |
| 44 | |
| 45 -- XEP-0030 | |
| 46 disco = { | |
|
3896
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3895
diff
changeset
|
47 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
|
48 st2json = function (s) --> array of features |
|
4473
3b50a9a75fb6
mod_rest: Roundtrip disco and items when string or boolean is used
Kim Alvefur <zash@zash.se>
parents:
4372
diff
changeset
|
49 if s.tags[1] == nil then |
|
3b50a9a75fb6
mod_rest: Roundtrip disco and items when string or boolean is used
Kim Alvefur <zash@zash.se>
parents:
4372
diff
changeset
|
50 return s.attr.node or true; |
|
3b50a9a75fb6
mod_rest: Roundtrip disco and items when string or boolean is used
Kim Alvefur <zash@zash.se>
parents:
4372
diff
changeset
|
51 end |
|
3953
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3932
diff
changeset
|
52 local identities, features, extensions = array(), array(), {}; |
| 3813 | 53 for tag in s:childtags() do |
| 54 if tag.name == "identity" and tag.attr.category and tag.attr.type then | |
| 55 identities:push({ category = tag.attr.category, type = tag.attr.type, name = tag.attr.name }); | |
| 56 elseif tag.name == "feature" and tag.attr.var then | |
| 57 features:push(tag.attr.var); | |
| 58 end | |
| 59 end | |
|
3953
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3932
diff
changeset
|
60 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
|
61 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
|
62 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
|
63 if jform then |
|
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3932
diff
changeset
|
64 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
|
65 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
|
66 end |
|
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3932
diff
changeset
|
67 end |
|
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3932
diff
changeset
|
68 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
|
69 return { node = s.attr.node, identities = identities, features = features, extensions = extensions }; |
| 3813 | 70 end; |
|
3896
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3895
diff
changeset
|
71 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
|
72 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
|
73 local disco = st.stanza("query", { xmlns = "http://jabber.org/protocol/disco#info", node = s.node }); |
| 3813 | 74 if s.identities then |
|
3848
1b9834500123
mod_rest: Fix iteration over disco#info identities
Kim Alvefur <zash@zash.se>
parents:
3823
diff
changeset
|
75 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
|
76 disco:tag("identity", { category = identity.category, type = identity.type, name = identity.name }):up(); |
| 3813 | 77 end |
| 78 end | |
| 79 if s.features then | |
|
3849
11c34e97fe1a
mod_rest: Fix iteration over disco#info features
Kim Alvefur <zash@zash.se>
parents:
3848
diff
changeset
|
80 for _, feature in ipairs(s.features) do |
| 3813 | 81 disco:tag("feature", { var = feature }):up(); |
| 82 end | |
| 83 end | |
|
3953
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3932
diff
changeset
|
84 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
|
85 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
|
86 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
|
87 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
|
88 end |
|
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3932
diff
changeset
|
89 end |
|
3859
da3a0f055526
mod_rest: Fix handling of 'node' attribute in disco#info
Kim Alvefur <zash@zash.se>
parents:
3856
diff
changeset
|
90 return disco; |
|
4473
3b50a9a75fb6
mod_rest: Roundtrip disco and items when string or boolean is used
Kim Alvefur <zash@zash.se>
parents:
4372
diff
changeset
|
91 elseif type(s) == "string" then |
|
3b50a9a75fb6
mod_rest: Roundtrip disco and items when string or boolean is used
Kim Alvefur <zash@zash.se>
parents:
4372
diff
changeset
|
92 return st.stanza("query", { xmlns = "http://jabber.org/protocol/disco#info", node = s }); |
|
3859
da3a0f055526
mod_rest: Fix handling of 'node' attribute in disco#info
Kim Alvefur <zash@zash.se>
parents:
3856
diff
changeset
|
93 else |
| 3870 | 94 return st.stanza("query", { xmlns = "http://jabber.org/protocol/disco#info", }); |
| 3813 | 95 end |
| 96 end; | |
| 97 }; | |
| 98 | |
| 99 items = { | |
|
3896
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3895
diff
changeset
|
100 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
|
101 st2json = function (s) --> array of features | map with node |
|
4473
3b50a9a75fb6
mod_rest: Roundtrip disco and items when string or boolean is used
Kim Alvefur <zash@zash.se>
parents:
4372
diff
changeset
|
102 if s.tags[1] == nil then |
|
3b50a9a75fb6
mod_rest: Roundtrip disco and items when string or boolean is used
Kim Alvefur <zash@zash.se>
parents:
4372
diff
changeset
|
103 return s.attr.node or true; |
|
3875
93f71ab6cb00
mod_rest: Support passing 'node' attr in disco#items queries
Kim Alvefur <zash@zash.se>
parents:
3871
diff
changeset
|
104 end |
|
93f71ab6cb00
mod_rest: Support passing 'node' attr in disco#items queries
Kim Alvefur <zash@zash.se>
parents:
3871
diff
changeset
|
105 |
| 3813 | 106 local items = array(); |
| 107 for item in s:childtags("item") do | |
| 108 items:push({ jid = item.attr.jid, node = item.attr.node, name = item.attr.name }); | |
| 109 end | |
| 110 return items; | |
| 111 end; | |
|
3896
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3895
diff
changeset
|
112 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
|
113 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
|
114 local disco = st.stanza("query", { xmlns = "http://jabber.org/protocol/disco#items", node = s.node }); |
| 3813 | 115 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
|
116 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
|
117 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
|
118 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
|
119 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
|
120 end |
| 3813 | 121 end |
|
3875
93f71ab6cb00
mod_rest: Support passing 'node' attr in disco#items queries
Kim Alvefur <zash@zash.se>
parents:
3871
diff
changeset
|
122 return disco; |
|
4473
3b50a9a75fb6
mod_rest: Roundtrip disco and items when string or boolean is used
Kim Alvefur <zash@zash.se>
parents:
4372
diff
changeset
|
123 elseif type(s) == "string" then |
|
3b50a9a75fb6
mod_rest: Roundtrip disco and items when string or boolean is used
Kim Alvefur <zash@zash.se>
parents:
4372
diff
changeset
|
124 return st.stanza("query", { xmlns = "http://jabber.org/protocol/disco#items", node = s }); |
|
3875
93f71ab6cb00
mod_rest: Support passing 'node' attr in disco#items queries
Kim Alvefur <zash@zash.se>
parents:
3871
diff
changeset
|
125 else |
|
93f71ab6cb00
mod_rest: Support passing 'node' attr in disco#items queries
Kim Alvefur <zash@zash.se>
parents:
3871
diff
changeset
|
126 return st.stanza("query", { xmlns = "http://jabber.org/protocol/disco#items", }); |
| 3813 | 127 end |
| 128 end; | |
| 129 }; | |
| 130 | |
|
3877
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
131 -- XEP-0050: Ad-Hoc Commands |
|
3896
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3895
diff
changeset
|
132 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
|
133 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
|
134 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
|
135 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
|
136 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
|
137 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
|
138 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
|
139 }; |
|
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
140 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
|
141 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
|
142 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
|
143 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
|
144 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
|
145 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
|
146 }; |
|
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
147 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
|
148 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
|
149 end |
|
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
150 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
|
151 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
|
152 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
|
153 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
|
154 }; |
|
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
155 end |
|
3878
9a3dfe0bf9fd
mod_rest: Add JSON mapping for dataform (XEP-0004)
Kim Alvefur <zash@zash.se>
parents:
3877
diff
changeset
|
156 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
|
157 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
|
158 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
|
159 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
|
160 end; |
|
3896
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3895
diff
changeset
|
161 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
|
162 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
|
163 local cmd = st.stanza("command", { |
|
3896
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3895
diff
changeset
|
164 xmlns = "http://jabber.org/protocol/commands", |
|
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3895
diff
changeset
|
165 action = s.action, |
|
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3895
diff
changeset
|
166 node = s.node, |
|
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3895
diff
changeset
|
167 sessionid = s.sessionid, |
|
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3895
diff
changeset
|
168 status = s.status, |
|
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3895
diff
changeset
|
169 }); |
|
3881
5d7df207dc2b
mod_rest: Add final pieces of XEP-0050 (actions, note, form)
Kim Alvefur <zash@zash.se>
parents:
3880
diff
changeset
|
170 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
|
171 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
|
172 do |
|
5d7df207dc2b
mod_rest: Add final pieces of XEP-0050 (actions, note, form)
Kim Alvefur <zash@zash.se>
parents:
3880
diff
changeset
|
173 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
|
174 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
|
175 end |
|
5d7df207dc2b
mod_rest: Add final pieces of XEP-0050 (actions, note, form)
Kim Alvefur <zash@zash.se>
parents:
3880
diff
changeset
|
176 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
|
177 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
|
178 end |
|
5d7df207dc2b
mod_rest: Add final pieces of XEP-0050 (actions, note, form)
Kim Alvefur <zash@zash.se>
parents:
3880
diff
changeset
|
179 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
|
180 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
|
181 end |
|
5d7df207dc2b
mod_rest: Add final pieces of XEP-0050 (actions, note, form)
Kim Alvefur <zash@zash.se>
parents:
3880
diff
changeset
|
182 end |
|
5d7df207dc2b
mod_rest: Add final pieces of XEP-0050 (actions, note, form)
Kim Alvefur <zash@zash.se>
parents:
3880
diff
changeset
|
183 cmd:up(); |
|
5d7df207dc2b
mod_rest: Add final pieces of XEP-0050 (actions, note, form)
Kim Alvefur <zash@zash.se>
parents:
3880
diff
changeset
|
184 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
|
185 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
|
186 end |
|
5d7df207dc2b
mod_rest: Add final pieces of XEP-0050 (actions, note, form)
Kim Alvefur <zash@zash.se>
parents:
3880
diff
changeset
|
187 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
|
188 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
|
189 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
|
190 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
|
191 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
|
192 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
|
193 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
|
194 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
|
195 end |
|
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
196 -- 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
|
197 end; |
|
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
198 }; |
|
562b34050561
mod_rest: Add basic support for XEP-0050: Ad-Hoc commands (no forms)
Kim Alvefur <zash@zash.se>
parents:
3875
diff
changeset
|
199 |
|
3855
0e1e900577c4
mod_rest: Improve some comments
Kim Alvefur <zash@zash.se>
parents:
3854
diff
changeset
|
200 -- XEP-0066: Out of Band Data |
|
4518
073f5397c1d2
mod_rest: Replace most mappings by using util.datamapper
Kim Alvefur <zash@zash.se>
parents:
4501
diff
changeset
|
201 -- TODO Replace by oob.url in datamapper schema |
|
4501
42f43f1383db
mod_rest: Fix tag name in parsing of OOB payloads
Kim Alvefur <zash@zash.se>
parents:
4500
diff
changeset
|
202 oob_url = { type = "func", xmlns = "jabber:x:oob", tagname = "x", |
|
4499
8e644bf36627
mod_rest: Change OOB namespace to the one used in messages
Kim Alvefur <zash@zash.se>
parents:
4473
diff
changeset
|
203 -- XXX namespace depends on whether it's in an iq or message stanza |
|
3896
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3895
diff
changeset
|
204 st2json = function (s) |
| 3813 | 205 return s:get_child_text("url"); |
| 206 end; | |
|
3896
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3895
diff
changeset
|
207 json2st = function (s) |
|
3817
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3813
diff
changeset
|
208 if type(s) == "string" then |
|
4500
34c0f760f34a
mod_rest: Fix the OOB tag name which also differs in messages
Kim Alvefur <zash@zash.se>
parents:
4499
diff
changeset
|
209 return st.stanza("x", { xmlns = "jabber:x:oob" }):text_tag("url", s); |
|
3817
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3813
diff
changeset
|
210 end |
| 3813 | 211 end; |
| 212 }; | |
|
3823
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3822
diff
changeset
|
213 |
|
3907
d5ecb9b9cb3b
mod_rest: Update with namespace and name of XEP-0432
Kim Alvefur <zash@zash.se>
parents:
3906
diff
changeset
|
214 -- 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
|
215 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
|
216 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
|
217 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
|
218 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
|
219 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
|
220 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
|
221 return { |
|
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3822
diff
changeset
|
222 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
|
223 data = parsed; |
|
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3822
diff
changeset
|
224 }; |
|
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3822
diff
changeset
|
225 end; |
|
3896
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3895
diff
changeset
|
226 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
|
227 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
|
228 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
|
229 :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
|
230 end; |
|
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3822
diff
changeset
|
231 end |
|
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3822
diff
changeset
|
232 }; |
|
31b1797a78e1
mod_rest: Add support for XEP-XXXX: User-defined Data Transfer
Kim Alvefur <zash@zash.se>
parents:
3822
diff
changeset
|
233 |
|
3889
59765d1bb6dc
mod_rest: Support mapping XEP-0004 Data Forms directly
Kim Alvefur <zash@zash.se>
parents:
3888
diff
changeset
|
234 -- 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
|
235 dataform = { |
|
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3912
diff
changeset
|
236 -- 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
|
237 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
|
238 st2json = function (s) |
|
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3912
diff
changeset
|
239 local fields = array(); |
|
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3912
diff
changeset
|
240 local form = { |
|
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3912
diff
changeset
|
241 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
|
242 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
|
243 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
|
244 fields = fields; |
|
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3912
diff
changeset
|
245 }; |
|
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3912
diff
changeset
|
246 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
|
247 local i = { |
|
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3912
diff
changeset
|
248 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
|
249 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
|
250 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
|
251 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
|
252 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
|
253 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
|
254 }; |
|
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3912
diff
changeset
|
255 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
|
256 local value = array(); |
|
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3912
diff
changeset
|
257 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
|
258 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
|
259 end |
|
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3912
diff
changeset
|
260 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
|
261 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
|
262 else |
|
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3912
diff
changeset
|
263 i.value = value; |
|
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3912
diff
changeset
|
264 end |
|
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3912
diff
changeset
|
265 end |
|
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3912
diff
changeset
|
266 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
|
267 local options = array(); |
|
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3912
diff
changeset
|
268 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
|
269 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
|
270 end |
|
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3912
diff
changeset
|
271 i.options = options; |
|
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3912
diff
changeset
|
272 end |
|
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3912
diff
changeset
|
273 fields:push(i); |
|
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3912
diff
changeset
|
274 end |
|
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3912
diff
changeset
|
275 return form; |
|
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3912
diff
changeset
|
276 end; |
|
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3912
diff
changeset
|
277 json2st = function (x) |
|
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3912
diff
changeset
|
278 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
|
279 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
|
280 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
|
281 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
|
282 end |
|
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3912
diff
changeset
|
283 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
|
284 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
|
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 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
|
287 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
|
288 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
|
289 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
|
290 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
|
291 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
|
292 end |
|
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3912
diff
changeset
|
293 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
|
294 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
|
295 end |
|
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3912
diff
changeset
|
296 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
|
297 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
|
298 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
|
299 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
|
300 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
|
301 end |
|
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 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
|
304 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
|
305 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
|
306 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
|
307 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
|
308 form:up(); |
|
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3912
diff
changeset
|
309 end |
|
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3912
diff
changeset
|
310 end |
|
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3912
diff
changeset
|
311 end |
|
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 end |
|
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3912
diff
changeset
|
314 end |
|
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3912
diff
changeset
|
315 return form; |
|
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3912
diff
changeset
|
316 end |
|
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3912
diff
changeset
|
317 end; |
|
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3912
diff
changeset
|
318 }; |
|
3889
59765d1bb6dc
mod_rest: Support mapping XEP-0004 Data Forms directly
Kim Alvefur <zash@zash.se>
parents:
3888
diff
changeset
|
319 |
|
3922
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3912
diff
changeset
|
320 -- 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
|
321 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
|
322 st2json = function (s) |
|
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3932
diff
changeset
|
323 local r = {}; |
|
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3932
diff
changeset
|
324 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
|
325 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
|
326 local values = array(); |
|
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3932
diff
changeset
|
327 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
|
328 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
|
329 end |
|
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3932
diff
changeset
|
330 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
|
331 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
|
332 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
|
333 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
|
334 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
|
335 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
|
336 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
|
337 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
|
338 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
|
339 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
|
340 end |
|
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3932
diff
changeset
|
341 end |
|
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3932
diff
changeset
|
342 end |
|
2c6d5734ae04
mod_rest: Add JSON mapping of XEP-0128: Service Discovery Extensions
Kim Alvefur <zash@zash.se>
parents:
3932
diff
changeset
|
343 return r; |
|
3889
59765d1bb6dc
mod_rest: Support mapping XEP-0004 Data Forms directly
Kim Alvefur <zash@zash.se>
parents:
3888
diff
changeset
|
344 end, |
|
3922
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3912
diff
changeset
|
345 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
|
346 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
|
347 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
|
348 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
|
349 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
|
350 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
|
351 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
|
352 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
|
353 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
|
354 end |
|
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3912
diff
changeset
|
355 end |
|
3932
8b34222216f4
mod_rest: Fix encoding of simple dataforms
Kim Alvefur <zash@zash.se>
parents:
3923
diff
changeset
|
356 form:up(); |
|
3922
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3912
diff
changeset
|
357 end |
|
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3912
diff
changeset
|
358 return form; |
|
ea59c9455f93
mod_rest: Move dataforms into structure for more logical code order
Kim Alvefur <zash@zash.se>
parents:
3912
diff
changeset
|
359 end |
|
3889
59765d1bb6dc
mod_rest: Support mapping XEP-0004 Data Forms directly
Kim Alvefur <zash@zash.se>
parents:
3888
diff
changeset
|
360 }; |
|
3923
3c3d216c6f6d
mod_rest: Add JSON mapping of XEP-0039: Statistics Gathering
Kim Alvefur <zash@zash.se>
parents:
3922
diff
changeset
|
361 |
| 3813 | 362 }; |
| 363 | |
|
4309
e8b9228b5265
mod_rest: Optimize stanza to JSON mapping
Kim Alvefur <zash@zash.se>
parents:
4251
diff
changeset
|
364 local byxmlname = {}; |
|
e8b9228b5265
mod_rest: Optimize stanza to JSON mapping
Kim Alvefur <zash@zash.se>
parents:
4251
diff
changeset
|
365 for k, spec in pairs(field_mappings) do |
|
4518
073f5397c1d2
mod_rest: Replace most mappings by using util.datamapper
Kim Alvefur <zash@zash.se>
parents:
4501
diff
changeset
|
366 for _, replace in pairs(schema.properties) do |
|
073f5397c1d2
mod_rest: Replace most mappings by using util.datamapper
Kim Alvefur <zash@zash.se>
parents:
4501
diff
changeset
|
367 replace.properties[k] = nil |
|
073f5397c1d2
mod_rest: Replace most mappings by using util.datamapper
Kim Alvefur <zash@zash.se>
parents:
4501
diff
changeset
|
368 end |
|
073f5397c1d2
mod_rest: Replace most mappings by using util.datamapper
Kim Alvefur <zash@zash.se>
parents:
4501
diff
changeset
|
369 |
|
4309
e8b9228b5265
mod_rest: Optimize stanza to JSON mapping
Kim Alvefur <zash@zash.se>
parents:
4251
diff
changeset
|
370 if type(spec) == "table" then |
|
e8b9228b5265
mod_rest: Optimize stanza to JSON mapping
Kim Alvefur <zash@zash.se>
parents:
4251
diff
changeset
|
371 spec.key = k; |
|
e8b9228b5265
mod_rest: Optimize stanza to JSON mapping
Kim Alvefur <zash@zash.se>
parents:
4251
diff
changeset
|
372 if spec.xmlns and spec.tagname then |
|
e8b9228b5265
mod_rest: Optimize stanza to JSON mapping
Kim Alvefur <zash@zash.se>
parents:
4251
diff
changeset
|
373 byxmlname["{" .. spec.xmlns .. "}" .. spec.tagname] = spec; |
|
e8b9228b5265
mod_rest: Optimize stanza to JSON mapping
Kim Alvefur <zash@zash.se>
parents:
4251
diff
changeset
|
374 elseif spec.type == "name" then |
|
e8b9228b5265
mod_rest: Optimize stanza to JSON mapping
Kim Alvefur <zash@zash.se>
parents:
4251
diff
changeset
|
375 byxmlname["{" .. spec.xmlns .. "}"] = spec; |
|
e8b9228b5265
mod_rest: Optimize stanza to JSON mapping
Kim Alvefur <zash@zash.se>
parents:
4251
diff
changeset
|
376 end |
|
e8b9228b5265
mod_rest: Optimize stanza to JSON mapping
Kim Alvefur <zash@zash.se>
parents:
4251
diff
changeset
|
377 elseif type(spec) == "string" then |
|
e8b9228b5265
mod_rest: Optimize stanza to JSON mapping
Kim Alvefur <zash@zash.se>
parents:
4251
diff
changeset
|
378 byxmlname["{jabber:client}" .. k] = {key = k; type = spec}; |
|
e8b9228b5265
mod_rest: Optimize stanza to JSON mapping
Kim Alvefur <zash@zash.se>
parents:
4251
diff
changeset
|
379 end |
|
e8b9228b5265
mod_rest: Optimize stanza to JSON mapping
Kim Alvefur <zash@zash.se>
parents:
4251
diff
changeset
|
380 end |
|
e8b9228b5265
mod_rest: Optimize stanza to JSON mapping
Kim Alvefur <zash@zash.se>
parents:
4251
diff
changeset
|
381 |
| 3813 | 382 local implied_kinds = { |
| 383 disco = "iq", | |
| 384 items = "iq", | |
| 385 ping = "iq", | |
|
3854
25c34c9f755c
mod_rest: Add mapping of XEP-0092: Software Version
Kim Alvefur <zash@zash.se>
parents:
3852
diff
changeset
|
386 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
|
387 command = "iq", |
|
4743
0a501df823fd
mod_rest: Add some convenience mapping to make MAM queries easier
Kim Alvefur <zash@zash.se>
parents:
4742
diff
changeset
|
388 archive = "iq", |
| 3813 | 389 |
| 390 body = "message", | |
| 391 html = "message", | |
| 392 replace = "message", | |
| 393 state = "message", | |
| 394 subject = "message", | |
| 395 thread = "message", | |
| 396 | |
| 397 join = "presence", | |
| 398 priority = "presence", | |
| 399 show = "presence", | |
| 400 status = "presence", | |
| 401 } | |
| 402 | |
|
4021
1925d63eec6b
mod_rest/jsonmap: Derive stanza @type from certain payloads
Kim Alvefur <zash@zash.se>
parents:
3953
diff
changeset
|
403 local implied_types = { |
|
1925d63eec6b
mod_rest/jsonmap: Derive stanza @type from certain payloads
Kim Alvefur <zash@zash.se>
parents:
3953
diff
changeset
|
404 command = "set", |
|
4746
88f5e12c8351
mod_rest: Imply type=set for archive queries
Kim Alvefur <zash@zash.se>
parents:
4744
diff
changeset
|
405 archive = "set", |
|
4021
1925d63eec6b
mod_rest/jsonmap: Derive stanza @type from certain payloads
Kim Alvefur <zash@zash.se>
parents:
3953
diff
changeset
|
406 } |
|
1925d63eec6b
mod_rest/jsonmap: Derive stanza @type from certain payloads
Kim Alvefur <zash@zash.se>
parents:
3953
diff
changeset
|
407 |
| 3813 | 408 local kind_by_type = { |
| 409 get = "iq", set = "iq", result = "iq", | |
| 410 normal = "message", chat = "message", headline = "message", groupchat = "message", | |
| 411 available = "presence", unavailable = "presence", | |
| 412 subscribe = "presence", unsubscribe = "presence", | |
| 413 subscribed = "presence", unsubscribed = "presence", | |
| 414 } | |
| 415 | |
| 416 local function st2json(s) | |
|
4731
d71beacaec3b
mod_rest: Apply JSON mapping to items in <xmpp> container (e.g. MAM results etc)
Kim Alvefur <zash@zash.se>
parents:
4525
diff
changeset
|
417 if s.name == "xmpp" then |
|
d71beacaec3b
mod_rest: Apply JSON mapping to items in <xmpp> container (e.g. MAM results etc)
Kim Alvefur <zash@zash.se>
parents:
4525
diff
changeset
|
418 local result = array(); |
|
d71beacaec3b
mod_rest: Apply JSON mapping to items in <xmpp> container (e.g. MAM results etc)
Kim Alvefur <zash@zash.se>
parents:
4525
diff
changeset
|
419 for child in s:childtags() do |
|
d71beacaec3b
mod_rest: Apply JSON mapping to items in <xmpp> container (e.g. MAM results etc)
Kim Alvefur <zash@zash.se>
parents:
4525
diff
changeset
|
420 result:push(st2json(child)); |
|
d71beacaec3b
mod_rest: Apply JSON mapping to items in <xmpp> container (e.g. MAM results etc)
Kim Alvefur <zash@zash.se>
parents:
4525
diff
changeset
|
421 end |
|
d71beacaec3b
mod_rest: Apply JSON mapping to items in <xmpp> container (e.g. MAM results etc)
Kim Alvefur <zash@zash.se>
parents:
4525
diff
changeset
|
422 return { xmpp = result }; |
|
d71beacaec3b
mod_rest: Apply JSON mapping to items in <xmpp> container (e.g. MAM results etc)
Kim Alvefur <zash@zash.se>
parents:
4525
diff
changeset
|
423 end |
|
4518
073f5397c1d2
mod_rest: Replace most mappings by using util.datamapper
Kim Alvefur <zash@zash.se>
parents:
4501
diff
changeset
|
424 local t = map.parse(schema.properties[s.name], s); |
|
073f5397c1d2
mod_rest: Replace most mappings by using util.datamapper
Kim Alvefur <zash@zash.se>
parents:
4501
diff
changeset
|
425 |
|
4525
b68b801ddc50
mod_rest: Restore 'kind' property in JSON-mapped objects
Kim Alvefur <zash@zash.se>
parents:
4519
diff
changeset
|
426 t.kind = s.name; |
|
b68b801ddc50
mod_rest: Restore 'kind' property in JSON-mapped objects
Kim Alvefur <zash@zash.se>
parents:
4519
diff
changeset
|
427 |
| 3813 | 428 if s.name == "presence" and not s.attr.type then |
| 429 t.type = "available"; | |
| 430 end | |
| 431 | |
| 432 if t.to then | |
| 433 t.to = jid.prep(t.to); | |
| 434 if not t.to then return nil, "invalid-jid-to"; end | |
| 435 end | |
| 436 if t.from then | |
| 437 t.from = jid.prep(t.from); | |
| 438 if not t.from then return nil, "invalid-jid-from"; end | |
| 439 end | |
| 440 | |
| 441 if t.type == "error" then | |
|
3871
e5d08bb58155
mod_rest: Map the error@by attribute
Kim Alvefur <zash@zash.se>
parents:
3870
diff
changeset
|
442 local error = s:get_child("error"); |
| 3813 | 443 local err_typ, err_condition, err_text = s:get_error(); |
| 444 t.error = { | |
| 445 type = err_typ, | |
| 446 condition = err_condition, | |
|
3871
e5d08bb58155
mod_rest: Map the error@by attribute
Kim Alvefur <zash@zash.se>
parents:
3870
diff
changeset
|
447 text = err_text, |
|
4251
d33b480befcb
mod_rest: Fix attempt at indexing nil if an error stanza is missing <error>
Kim Alvefur <zash@zash.se>
parents:
4035
diff
changeset
|
448 by = error and error.attr.by or nil, |
| 3813 | 449 }; |
| 450 return t; | |
| 451 end | |
| 452 | |
|
4372
78de3c7acf58
mod_rest: Fix json-mapping stanzas with text or whitespace between tags
Kim Alvefur <zash@zash.se>
parents:
4309
diff
changeset
|
453 for _, tag in ipairs(s.tags) do |
|
4309
e8b9228b5265
mod_rest: Optimize stanza to JSON mapping
Kim Alvefur <zash@zash.se>
parents:
4251
diff
changeset
|
454 local prefix = "{" .. (tag.attr.xmlns or "jabber:client") .. "}"; |
|
e8b9228b5265
mod_rest: Optimize stanza to JSON mapping
Kim Alvefur <zash@zash.se>
parents:
4251
diff
changeset
|
455 local mapping = byxmlname[prefix .. tag.name]; |
|
e8b9228b5265
mod_rest: Optimize stanza to JSON mapping
Kim Alvefur <zash@zash.se>
parents:
4251
diff
changeset
|
456 if not mapping then |
|
e8b9228b5265
mod_rest: Optimize stanza to JSON mapping
Kim Alvefur <zash@zash.se>
parents:
4251
diff
changeset
|
457 mapping = byxmlname[prefix]; |
|
e8b9228b5265
mod_rest: Optimize stanza to JSON mapping
Kim Alvefur <zash@zash.se>
parents:
4251
diff
changeset
|
458 end |
|
e8b9228b5265
mod_rest: Optimize stanza to JSON mapping
Kim Alvefur <zash@zash.se>
parents:
4251
diff
changeset
|
459 |
|
4518
073f5397c1d2
mod_rest: Replace most mappings by using util.datamapper
Kim Alvefur <zash@zash.se>
parents:
4501
diff
changeset
|
460 if mapping and mapping.type == "func" and mapping.st2json then |
|
4309
e8b9228b5265
mod_rest: Optimize stanza to JSON mapping
Kim Alvefur <zash@zash.se>
parents:
4251
diff
changeset
|
461 t[mapping.key] = mapping.st2json(tag); |
| 3813 | 462 end |
| 463 end | |
| 464 | |
| 465 return t; | |
| 466 end | |
| 467 | |
|
3817
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3813
diff
changeset
|
468 local function str(s) |
|
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3813
diff
changeset
|
469 if type(s) == "string" then |
|
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3813
diff
changeset
|
470 return s; |
|
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3813
diff
changeset
|
471 end |
|
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3813
diff
changeset
|
472 end |
|
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3813
diff
changeset
|
473 |
| 3813 | 474 local function json2st(t) |
|
3817
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3813
diff
changeset
|
475 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
|
476 return nil, "invalid-json"; |
|
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3813
diff
changeset
|
477 end |
|
4021
1925d63eec6b
mod_rest/jsonmap: Derive stanza @type from certain payloads
Kim Alvefur <zash@zash.se>
parents:
3953
diff
changeset
|
478 local t_type = str(t.type); |
|
1925d63eec6b
mod_rest/jsonmap: Derive stanza @type from certain payloads
Kim Alvefur <zash@zash.se>
parents:
3953
diff
changeset
|
479 if t_type == nil then |
|
1925d63eec6b
mod_rest/jsonmap: Derive stanza @type from certain payloads
Kim Alvefur <zash@zash.se>
parents:
3953
diff
changeset
|
480 for k, implied in pairs(implied_types) do |
|
1925d63eec6b
mod_rest/jsonmap: Derive stanza @type from certain payloads
Kim Alvefur <zash@zash.se>
parents:
3953
diff
changeset
|
481 if t[k] then |
|
1925d63eec6b
mod_rest/jsonmap: Derive stanza @type from certain payloads
Kim Alvefur <zash@zash.se>
parents:
3953
diff
changeset
|
482 t_type = implied; |
|
4744
f478855f4565
mod_rest: Stop search when an implied type is determined
Kim Alvefur <zash@zash.se>
parents:
4743
diff
changeset
|
483 break; |
|
4021
1925d63eec6b
mod_rest/jsonmap: Derive stanza @type from certain payloads
Kim Alvefur <zash@zash.se>
parents:
3953
diff
changeset
|
484 end |
|
1925d63eec6b
mod_rest/jsonmap: Derive stanza @type from certain payloads
Kim Alvefur <zash@zash.se>
parents:
3953
diff
changeset
|
485 end |
|
1925d63eec6b
mod_rest/jsonmap: Derive stanza @type from certain payloads
Kim Alvefur <zash@zash.se>
parents:
3953
diff
changeset
|
486 end |
|
1925d63eec6b
mod_rest/jsonmap: Derive stanza @type from certain payloads
Kim Alvefur <zash@zash.se>
parents:
3953
diff
changeset
|
487 local kind = str(t.kind) or kind_by_type[t_type]; |
| 3813 | 488 if not kind then |
| 489 for k, implied in pairs(implied_kinds) do | |
| 490 if t[k] then | |
| 491 kind = implied; | |
| 492 break | |
| 493 end | |
| 494 end | |
| 495 end | |
| 496 | |
|
4518
073f5397c1d2
mod_rest: Replace most mappings by using util.datamapper
Kim Alvefur <zash@zash.se>
parents:
4501
diff
changeset
|
497 if kind == "presence" and t_type == "available" then |
|
4021
1925d63eec6b
mod_rest/jsonmap: Derive stanza @type from certain payloads
Kim Alvefur <zash@zash.se>
parents:
3953
diff
changeset
|
498 t_type = nil; |
|
4518
073f5397c1d2
mod_rest: Replace most mappings by using util.datamapper
Kim Alvefur <zash@zash.se>
parents:
4501
diff
changeset
|
499 elseif kind == "iq" and not t_type then |
|
073f5397c1d2
mod_rest: Replace most mappings by using util.datamapper
Kim Alvefur <zash@zash.se>
parents:
4501
diff
changeset
|
500 t_type = "get"; |
|
4021
1925d63eec6b
mod_rest/jsonmap: Derive stanza @type from certain payloads
Kim Alvefur <zash@zash.se>
parents:
3953
diff
changeset
|
501 end |
|
4803
f74c7c518bb2
mod_rest: Handle unknown 'kind' values
Kim Alvefur <zash@zash.se>
parents:
4747
diff
changeset
|
502 if not schema.properties[kind or "message"] then |
|
f74c7c518bb2
mod_rest: Handle unknown 'kind' values
Kim Alvefur <zash@zash.se>
parents:
4747
diff
changeset
|
503 return nil, "unknown-kind"; |
|
f74c7c518bb2
mod_rest: Handle unknown 'kind' values
Kim Alvefur <zash@zash.se>
parents:
4747
diff
changeset
|
504 end |
|
4021
1925d63eec6b
mod_rest/jsonmap: Derive stanza @type from certain payloads
Kim Alvefur <zash@zash.se>
parents:
3953
diff
changeset
|
505 |
|
4743
0a501df823fd
mod_rest: Add some convenience mapping to make MAM queries easier
Kim Alvefur <zash@zash.se>
parents:
4742
diff
changeset
|
506 -- XEP-0313 conveninece mapping |
|
0a501df823fd
mod_rest: Add some convenience mapping to make MAM queries easier
Kim Alvefur <zash@zash.se>
parents:
4742
diff
changeset
|
507 if kind == "iq" and t_type == "set" and type(t.archive) == "table" and not t.archive.form then |
|
0a501df823fd
mod_rest: Add some convenience mapping to make MAM queries easier
Kim Alvefur <zash@zash.se>
parents:
4742
diff
changeset
|
508 local archive = t.archive; |
|
0a501df823fd
mod_rest: Add some convenience mapping to make MAM queries easier
Kim Alvefur <zash@zash.se>
parents:
4742
diff
changeset
|
509 if archive["with"] or archive["start"] or archive["end"] or archive["before-id"] or archive["after-id"] |
|
0a501df823fd
mod_rest: Add some convenience mapping to make MAM queries easier
Kim Alvefur <zash@zash.se>
parents:
4742
diff
changeset
|
510 or archive["ids"] then |
|
0a501df823fd
mod_rest: Add some convenience mapping to make MAM queries easier
Kim Alvefur <zash@zash.se>
parents:
4742
diff
changeset
|
511 archive.form = { |
|
0a501df823fd
mod_rest: Add some convenience mapping to make MAM queries easier
Kim Alvefur <zash@zash.se>
parents:
4742
diff
changeset
|
512 type = "submit"; |
|
0a501df823fd
mod_rest: Add some convenience mapping to make MAM queries easier
Kim Alvefur <zash@zash.se>
parents:
4742
diff
changeset
|
513 fields = { |
|
0a501df823fd
mod_rest: Add some convenience mapping to make MAM queries easier
Kim Alvefur <zash@zash.se>
parents:
4742
diff
changeset
|
514 { var = "FORM_TYPE"; values = { "urn:xmpp:mam:2" } }; |
|
0a501df823fd
mod_rest: Add some convenience mapping to make MAM queries easier
Kim Alvefur <zash@zash.se>
parents:
4742
diff
changeset
|
515 { var = "with"; values = { archive["with"] } }; |
|
0a501df823fd
mod_rest: Add some convenience mapping to make MAM queries easier
Kim Alvefur <zash@zash.se>
parents:
4742
diff
changeset
|
516 { var = "start"; values = { archive["start"] } }; |
|
0a501df823fd
mod_rest: Add some convenience mapping to make MAM queries easier
Kim Alvefur <zash@zash.se>
parents:
4742
diff
changeset
|
517 { var = "end"; values = { archive["end"] } }; |
|
0a501df823fd
mod_rest: Add some convenience mapping to make MAM queries easier
Kim Alvefur <zash@zash.se>
parents:
4742
diff
changeset
|
518 { var = "before-id"; values = { archive["before-id"] } }; |
|
0a501df823fd
mod_rest: Add some convenience mapping to make MAM queries easier
Kim Alvefur <zash@zash.se>
parents:
4742
diff
changeset
|
519 { var = "after-id"; values = { archive["after-id"] } }; |
|
0a501df823fd
mod_rest: Add some convenience mapping to make MAM queries easier
Kim Alvefur <zash@zash.se>
parents:
4742
diff
changeset
|
520 { var = "ids"; values = archive["ids"] }; |
|
0a501df823fd
mod_rest: Add some convenience mapping to make MAM queries easier
Kim Alvefur <zash@zash.se>
parents:
4742
diff
changeset
|
521 }; |
|
0a501df823fd
mod_rest: Add some convenience mapping to make MAM queries easier
Kim Alvefur <zash@zash.se>
parents:
4742
diff
changeset
|
522 }; |
|
0a501df823fd
mod_rest: Add some convenience mapping to make MAM queries easier
Kim Alvefur <zash@zash.se>
parents:
4742
diff
changeset
|
523 archive["with"] = nil; |
|
0a501df823fd
mod_rest: Add some convenience mapping to make MAM queries easier
Kim Alvefur <zash@zash.se>
parents:
4742
diff
changeset
|
524 archive["start"] = nil; |
|
0a501df823fd
mod_rest: Add some convenience mapping to make MAM queries easier
Kim Alvefur <zash@zash.se>
parents:
4742
diff
changeset
|
525 archive["end"] = nil; |
|
0a501df823fd
mod_rest: Add some convenience mapping to make MAM queries easier
Kim Alvefur <zash@zash.se>
parents:
4742
diff
changeset
|
526 archive["before-id"] = nil; |
|
0a501df823fd
mod_rest: Add some convenience mapping to make MAM queries easier
Kim Alvefur <zash@zash.se>
parents:
4742
diff
changeset
|
527 archive["after-id"] = nil; |
|
0a501df823fd
mod_rest: Add some convenience mapping to make MAM queries easier
Kim Alvefur <zash@zash.se>
parents:
4742
diff
changeset
|
528 archive["ids"] = nil; |
|
0a501df823fd
mod_rest: Add some convenience mapping to make MAM queries easier
Kim Alvefur <zash@zash.se>
parents:
4742
diff
changeset
|
529 end |
|
0a501df823fd
mod_rest: Add some convenience mapping to make MAM queries easier
Kim Alvefur <zash@zash.se>
parents:
4742
diff
changeset
|
530 |
|
0a501df823fd
mod_rest: Add some convenience mapping to make MAM queries easier
Kim Alvefur <zash@zash.se>
parents:
4742
diff
changeset
|
531 if archive["after"] or archive["before"] or archive["max"] then |
|
0a501df823fd
mod_rest: Add some convenience mapping to make MAM queries easier
Kim Alvefur <zash@zash.se>
parents:
4742
diff
changeset
|
532 archive.page = { after = archive["after"]; before = archive["before"]; max = tonumber(archive["max"]) } |
|
0a501df823fd
mod_rest: Add some convenience mapping to make MAM queries easier
Kim Alvefur <zash@zash.se>
parents:
4742
diff
changeset
|
533 archive["after"] = nil; |
|
0a501df823fd
mod_rest: Add some convenience mapping to make MAM queries easier
Kim Alvefur <zash@zash.se>
parents:
4742
diff
changeset
|
534 archive["before"] = nil; |
|
0a501df823fd
mod_rest: Add some convenience mapping to make MAM queries easier
Kim Alvefur <zash@zash.se>
parents:
4742
diff
changeset
|
535 archive["max"] = nil; |
|
0a501df823fd
mod_rest: Add some convenience mapping to make MAM queries easier
Kim Alvefur <zash@zash.se>
parents:
4742
diff
changeset
|
536 end |
|
0a501df823fd
mod_rest: Add some convenience mapping to make MAM queries easier
Kim Alvefur <zash@zash.se>
parents:
4742
diff
changeset
|
537 end |
|
0a501df823fd
mod_rest: Add some convenience mapping to make MAM queries easier
Kim Alvefur <zash@zash.se>
parents:
4742
diff
changeset
|
538 |
|
4841
f69c5a443156
mod_rest: Fix nested message stanzas in XEP-0297 containers
Kim Alvefur <zash@zash.se>
parents:
4803
diff
changeset
|
539 local s = map.unparse(schema, { [kind or "message"] = t }).tags[1]; |
| 3813 | 540 |
|
4518
073f5397c1d2
mod_rest: Replace most mappings by using util.datamapper
Kim Alvefur <zash@zash.se>
parents:
4501
diff
changeset
|
541 s.attr.type = t_type; |
|
073f5397c1d2
mod_rest: Replace most mappings by using util.datamapper
Kim Alvefur <zash@zash.se>
parents:
4501
diff
changeset
|
542 s.attr.to = str(t.to) and jid.prep(t.to); |
|
073f5397c1d2
mod_rest: Replace most mappings by using util.datamapper
Kim Alvefur <zash@zash.se>
parents:
4501
diff
changeset
|
543 s.attr.from = str(t.to) and jid.prep(t.from); |
| 3813 | 544 |
|
3817
937f8c463be6
mod_rest: Stricter type checks in JSON mapping
Kim Alvefur <zash@zash.se>
parents:
3813
diff
changeset
|
545 if type(t.error) == "table" then |
|
3871
e5d08bb58155
mod_rest: Map the error@by attribute
Kim Alvefur <zash@zash.se>
parents:
3870
diff
changeset
|
546 return st.error_reply(st.reply(s), str(t.error.type), str(t.error.condition), str(t.error.text), str(t.error.by)); |
| 3813 | 547 elseif t.type == "error" then |
| 548 s:text_tag("error", t.body, { code = t.error_code and tostring(t.error_code) }); | |
| 549 return s; | |
| 550 end | |
| 551 | |
| 552 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
|
553 local mapping = field_mappings[k]; |
|
4518
073f5397c1d2
mod_rest: Replace most mappings by using util.datamapper
Kim Alvefur <zash@zash.se>
parents:
4501
diff
changeset
|
554 if mapping and mapping.type == "func" and mapping.json2st then |
|
3896
987b203bb091
mod_rest: Restructure JSON / Stanza mapping definitions
Kim Alvefur <zash@zash.se>
parents:
3895
diff
changeset
|
555 s:add_child(mapping.json2st(v)):up(); |
| 3813 | 556 end |
| 557 end | |
| 558 | |
| 559 s:reset(); | |
| 560 | |
| 561 return s; | |
| 562 end | |
| 563 | |
| 564 return { | |
| 565 st2json = st2json; | |
| 566 json2st = json2st; | |
| 567 }; |
