apitech
/
prosody
mirror of https://github.com/bjc/prosody
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

util.datamapper: Add logic for "boolean" tags here the presence means true

Browse Source
pull/26/head
Kim Alvefur 5 years ago
parent d20ea9b87e
commit 7cd2803161
3 changed files with 24 additions and 6 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 6
      spec/util_datamapper_spec.lua
  2. 12
      teal-src/util/datamapper.tl
  3. 12
      util/datamapper.lua

6
spec/util_datamapper_spec.lua
Unescape View File

@ -31,6 +31,10 @@ describe("util.datampper", function()
type = "string";
xml = {x_name_is_value = true; namespace = "http://jabber.org/protocol/chatstates"};
};
fallback = {
type = "boolean";
xml = {x_name_is_value = true; name = "fallback"; namespace = "urn:xmpp:fallback:0"};
};
};
};
@ -39,6 +43,7 @@ describe("util.datampper", function()
<body>Hello</body>
<delay xmlns='urn:xmpp:delay' from='test' stamp='2021-03-07T15:59:08+00:00'>Becasue</delay>
<active xmlns='http://jabber.org/protocol/chatstates'/>
<fallback xmlns='urn:xmpp:fallback:0'/>
</message>
]];
@ -51,6 +56,7 @@ describe("util.datampper", function()
body = "Hello";
delay = {from = "test"; stamp = "2021-03-07T15:59:08+00:00"; reason = "Becasue"};
state = "active";
fallback = true;
};
end);

12
teal-src/util/datamapper.tl
Unescape View File

@ -49,8 +49,10 @@ local function parse_object (schema : js.schema_t, s : st.stanza_t) : table
if name_is_value then
local c = s:get_child(nil, namespace);
if c then
if c and proptype == "string" then
out[prop] = c.name;
elseif proptype == "boolean" and c then
out[prop] = true;
end
elseif is_attribute then
local attr = name
@ -183,8 +185,12 @@ local function unparse ( schema : js.schema_t, t : table, current_name : string,
if namespace ~= current_ns then
propattr = { xmlns = namespace }
end
if name_is_value and v is string then
out:tag(v, propattr):up();
if name_is_value then
if proptype == "string" and v is string then
out:tag(v, propattr):up();
elseif proptype == "boolean" and v == true then
out:tag(name, propattr):up();
end
elseif proptype == "string" and v is string then
out:text_tag(name, v, propattr)
elseif proptype == "number" and v is number then

12
util/datamapper.lua
Unescape View File

@ -48,8 +48,10 @@ local function parse_object(schema, s)
if name_is_value then
local c = s:get_child(nil, namespace);
if c then
if c and proptype == "string" then
out[prop] = c.name;
elseif proptype == "boolean" and c then
out[prop] = true;
end
elseif is_attribute then
local attr = name
@ -182,8 +184,12 @@ local function unparse(schema, t, current_name, current_ns)
if namespace ~= current_ns then
propattr = {xmlns = namespace}
end
if name_is_value and type(v) == "string" then
out:tag(v, propattr):up();
if name_is_value then
if proptype == "string" and type(v) == "string" then
out:tag(v, propattr):up();
elseif proptype == "boolean" and v == true then
out:tag(name, propattr):up();
end
elseif proptype == "string" and type(v) == "string" then
out:text_tag(name, v, propattr)
elseif proptype == "number" and type(v) == "number" then

Write Preview
Loading…
Cancel
Save