Software `/` code `/` prosody

Annotate

util/stanza.lua @ 8942:ecb5e13d97bb

MUC: Remove 'affiliation notify' config option, as it's irrelevant to room owners, always notify instead

author	Matthew Wild <mwild1@gmail.com>
date	Wed, 27 Jun 2018 15:25:35 +0100
parent	8894:7273fb6af831
child	8999:a2a4c225a3f8

rev	line source
1523 841d61be198f Remove version number from copyright headers Matthew Wild <mwild1@gmail.com> parents: 1517 diff changeset	1 -- Prosody IM
2923 b7049746bd29 Update copyright headers for 2010 Matthew Wild <mwild1@gmail.com> parents: 2848 diff changeset	2 -- Copyright (C) 2008-2010 Matthew Wild
b7049746bd29 Update copyright headers for 2010 Matthew Wild <mwild1@gmail.com> parents: 2848 diff changeset	3 -- Copyright (C) 2008-2010 Waqas Hussain
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5435 diff changeset	4 --
758 b1885732e979 GPL->MIT! Matthew Wild <mwild1@gmail.com> parents: 689 diff changeset	5 -- This project is MIT/X11 licensed. Please see the
b1885732e979 GPL->MIT! Matthew Wild <mwild1@gmail.com> parents: 689 diff changeset	6 -- COPYING file in the source package for more information.
4199 43cf7d96956f util.stanza: Whitespace fix after merge (complicated) Matthew Wild <mwild1@gmail.com> parents: 4184 diff changeset	7 --
519 cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 373 diff changeset	8
1984 f2b1f89e1d7c util.stanza: Don't add xmlns to tags when serializing if same as the parent tag's xmlns. Should hopefully shut up Gajim once and for all :) Matthew Wild <mwild1@gmail.com> parents: 1935 diff changeset	9
8626 20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests Matthew Wild <mwild1@gmail.com> parents: 8599 diff changeset	10 local error = error;
1 b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	11 local t_insert = table.insert;
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	12 local t_remove = table.remove;
613 6c09127b50fb New, faster, stanza serialization Matthew Wild <mwild1@gmail.com> parents: 519 diff changeset	13 local t_concat = table.concat;
23 236375777f8c Some docs written by Thorns. Need reviewing. bt@silverblade parents: 6 diff changeset	14 local s_format = string.format;
829 b01fd698495e util/stanza: Added clone function Waqas Hussain <waqas20@gmail.com> parents: 776 diff changeset	15 local s_match = string.match;
1 b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	16 local tostring = tostring;
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	17 local setmetatable = setmetatable;
7750 e58524240b30 util.stanza: Add an is_stanza() function to check if an object is a stanza Kim Alvefur <zash@zash.se> parents: 7253 diff changeset	18 local getmetatable = getmetatable;
1 b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	19 local pairs = pairs;
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	20 local ipairs = ipairs;
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	21 local type = type;
4 09c3845ed442 Presence unavailable on disconnect matthew parents: 2 diff changeset	22 local s_gsub = string.gsub;
5424 7318527c6dea util.stanza: Add stanza:find(), a light weight XPath-like method Kim Alvefur <zash@zash.se> parents: 5414 diff changeset	23 local s_sub = string.sub;
1431 9fe9ba693f4a util.stanza: Serializer optimizations, and nicer output for empty elements Waqas Hussain <waqas20@gmail.com> parents: 1420 diff changeset	24 local s_find = string.find;
613 6c09127b50fb New, faster, stanza serialization Matthew Wild <mwild1@gmail.com> parents: 519 diff changeset	25 local os = os;
145 fbb3a4ff9cf1 dialback keys now verified Matthew Wild <mwild1@gmail.com> parents: 91 diff changeset	26
8599 62bfc85a53c8 util.stanza: Add stricter validation for data passed to stanza builder API Matthew Wild <mwild1@gmail.com> parents: 8555 diff changeset	27 local valid_utf8 = require "util.encodings".utf8.valid;
62bfc85a53c8 util.stanza: Add stricter validation for data passed to stanza builder API Matthew Wild <mwild1@gmail.com> parents: 8555 diff changeset	28
262 8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	29 local do_pretty_printing = not os.getenv("WINDIR");
1932 af8cdbb63b13 util.stanza: Soften dependency on util.termcolours Matthew Wild <mwild1@gmail.com> parents: 1931 diff changeset	30 local getstyle, getstring;
af8cdbb63b13 util.stanza: Soften dependency on util.termcolours Matthew Wild <mwild1@gmail.com> parents: 1931 diff changeset	31 if do_pretty_printing then
af8cdbb63b13 util.stanza: Soften dependency on util.termcolours Matthew Wild <mwild1@gmail.com> parents: 1931 diff changeset	32 local ok, termcolours = pcall(require, "util.termcolours");
af8cdbb63b13 util.stanza: Soften dependency on util.termcolours Matthew Wild <mwild1@gmail.com> parents: 1931 diff changeset	33 if ok then
af8cdbb63b13 util.stanza: Soften dependency on util.termcolours Matthew Wild <mwild1@gmail.com> parents: 1931 diff changeset	34 getstyle, getstring = termcolours.getstyle, termcolours.getstring;
af8cdbb63b13 util.stanza: Soften dependency on util.termcolours Matthew Wild <mwild1@gmail.com> parents: 1931 diff changeset	35 else
af8cdbb63b13 util.stanza: Soften dependency on util.termcolours Matthew Wild <mwild1@gmail.com> parents: 1931 diff changeset	36 do_pretty_printing = nil;
af8cdbb63b13 util.stanza: Soften dependency on util.termcolours Matthew Wild <mwild1@gmail.com> parents: 1931 diff changeset	37 end
af8cdbb63b13 util.stanza: Soften dependency on util.termcolours Matthew Wild <mwild1@gmail.com> parents: 1931 diff changeset	38 end
262 8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	39
2955 f807dc244a5b util.stanza: Fixed a nil global access. Waqas Hussain <waqas20@gmail.com> parents: 2923 diff changeset	40 local xmlns_stanzas = "urn:ietf:params:xml:ns:xmpp-stanzas";
f807dc244a5b util.stanza: Fixed a nil global access. Waqas Hussain <waqas20@gmail.com> parents: 2923 diff changeset	41
6777 5de6b93d0190 util.: Remove use of module() function, make all module functions local and return them in a table at the end Kim Alvefur <zash@zash.se>* parents: 6501 diff changeset	42 local _ENV = nil;
8555 4f0f5b49bb03 vairious: Add annotation when an empty environment is set [luacheck] Kim Alvefur <zash@zash.se> parents: 8520 diff changeset	43 -- luacheck: std none
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	44
8520 e959bc51de75 util.stanza: Change __type to __name as this is used by Lua 5.3 in some error reporting functions Kim Alvefur <zash@zash.se> parents: 8382 diff changeset	45 local stanza_mt = { __name = "stanza" };
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	46 stanza_mt.__index = stanza_mt;
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	47
8626 20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests Matthew Wild <mwild1@gmail.com> parents: 8599 diff changeset	48 local function check_name(name, name_type)
20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests Matthew Wild <mwild1@gmail.com> parents: 8599 diff changeset	49 if type(name) ~= "string" then
20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests Matthew Wild <mwild1@gmail.com> parents: 8599 diff changeset	50 error("invalid "..name_type.." name: expected string, got "..type(name));
20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests Matthew Wild <mwild1@gmail.com> parents: 8599 diff changeset	51 elseif #name == 0 then
20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests Matthew Wild <mwild1@gmail.com> parents: 8599 diff changeset	52 error("invalid "..name_type.." name: empty string");
20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests Matthew Wild <mwild1@gmail.com> parents: 8599 diff changeset	53 elseif s_find(name, "[<>& '\"]") then
20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests Matthew Wild <mwild1@gmail.com> parents: 8599 diff changeset	54 error("invalid "..name_type.." name: contains invalid characters");
20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests Matthew Wild <mwild1@gmail.com> parents: 8599 diff changeset	55 elseif not valid_utf8(name) then
20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests Matthew Wild <mwild1@gmail.com> parents: 8599 diff changeset	56 error("invalid "..name_type.." name: contains invalid utf8");
20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests Matthew Wild <mwild1@gmail.com> parents: 8599 diff changeset	57 end
8599 62bfc85a53c8 util.stanza: Add stricter validation for data passed to stanza builder API Matthew Wild <mwild1@gmail.com> parents: 8555 diff changeset	58 end
8626 20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests Matthew Wild <mwild1@gmail.com> parents: 8599 diff changeset	59
20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests Matthew Wild <mwild1@gmail.com> parents: 8599 diff changeset	60 local function check_text(text, text_type)
20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests Matthew Wild <mwild1@gmail.com> parents: 8599 diff changeset	61 if type(text) ~= "string" then
20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests Matthew Wild <mwild1@gmail.com> parents: 8599 diff changeset	62 error("invalid "..text_type.." value: expected string, got "..type(text));
20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests Matthew Wild <mwild1@gmail.com> parents: 8599 diff changeset	63 elseif not valid_utf8(text) then
20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests Matthew Wild <mwild1@gmail.com> parents: 8599 diff changeset	64 error("invalid "..text_type.." value: contains invalid utf8");
20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests Matthew Wild <mwild1@gmail.com> parents: 8599 diff changeset	65 end
20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests Matthew Wild <mwild1@gmail.com> parents: 8599 diff changeset	66 end
20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests Matthew Wild <mwild1@gmail.com> parents: 8599 diff changeset	67
8599 62bfc85a53c8 util.stanza: Add stricter validation for data passed to stanza builder API Matthew Wild <mwild1@gmail.com> parents: 8555 diff changeset	68 local function check_attr(attr)
62bfc85a53c8 util.stanza: Add stricter validation for data passed to stanza builder API Matthew Wild <mwild1@gmail.com> parents: 8555 diff changeset	69 if attr ~= nil then
8626 20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests Matthew Wild <mwild1@gmail.com> parents: 8599 diff changeset	70 if type(attr) ~= "table" then
20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests Matthew Wild <mwild1@gmail.com> parents: 8599 diff changeset	71 error("invalid attributes, expected table got "..type(attr));
20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests Matthew Wild <mwild1@gmail.com> parents: 8599 diff changeset	72 end
8599 62bfc85a53c8 util.stanza: Add stricter validation for data passed to stanza builder API Matthew Wild <mwild1@gmail.com> parents: 8555 diff changeset	73 for k, v in pairs(attr) do
8626 20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests Matthew Wild <mwild1@gmail.com> parents: 8599 diff changeset	74 check_name(k, "attribute");
20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests Matthew Wild <mwild1@gmail.com> parents: 8599 diff changeset	75 check_text(v, "attribute");
20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests Matthew Wild <mwild1@gmail.com> parents: 8599 diff changeset	76 if type(v) ~= "string" then
20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests Matthew Wild <mwild1@gmail.com> parents: 8599 diff changeset	77 error("invalid attribute value for '"..k.."': expected string, got "..type(v));
20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests Matthew Wild <mwild1@gmail.com> parents: 8599 diff changeset	78 elseif not valid_utf8(v) then
20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests Matthew Wild <mwild1@gmail.com> parents: 8599 diff changeset	79 error("invalid attribute value for '"..k.."': contains invalid utf8");
20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests Matthew Wild <mwild1@gmail.com> parents: 8599 diff changeset	80 end
8599 62bfc85a53c8 util.stanza: Add stricter validation for data passed to stanza builder API Matthew Wild <mwild1@gmail.com> parents: 8555 diff changeset	81 end
62bfc85a53c8 util.stanza: Add stricter validation for data passed to stanza builder API Matthew Wild <mwild1@gmail.com> parents: 8555 diff changeset	82 end
62bfc85a53c8 util.stanza: Add stricter validation for data passed to stanza builder API Matthew Wild <mwild1@gmail.com> parents: 8555 diff changeset	83 end
62bfc85a53c8 util.stanza: Add stricter validation for data passed to stanza builder API Matthew Wild <mwild1@gmail.com> parents: 8555 diff changeset	84
7256 9fbb9fbf7e52 Merge 0.10->trunk Matthew Wild <mwild1@gmail.com> parents: 6978 7253 diff changeset	85 local function new_stanza(name, attr, namespaces)
8626 20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests Matthew Wild <mwild1@gmail.com> parents: 8599 diff changeset	86 check_name(name, "tag");
8599 62bfc85a53c8 util.stanza: Add stricter validation for data passed to stanza builder API Matthew Wild <mwild1@gmail.com> parents: 8555 diff changeset	87 check_attr(attr);
6978 30c96a5db360 util.stanza, util.xml, util.xmppstream: Add support for tracking defined namespaces and their prefix (stanza.namespaces), knowing/preserving prefix names is required for some applications (thanks daurnimator) Matthew Wild <mwild1@gmail.com> parents: 6821 diff changeset	88 local stanza = { name = name, attr = attr or {}, namespaces = namespaces, tags = {} };
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	89 return setmetatable(stanza, stanza_mt);
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	90 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	91
7750 e58524240b30 util.stanza: Add an is_stanza() function to check if an object is a stanza Kim Alvefur <zash@zash.se> parents: 7253 diff changeset	92 local function is_stanza(s)
e58524240b30 util.stanza: Add an is_stanza() function to check if an object is a stanza Kim Alvefur <zash@zash.se> parents: 7253 diff changeset	93 return getmetatable(s) == stanza_mt;
e58524240b30 util.stanza: Add an is_stanza() function to check if an object is a stanza Kim Alvefur <zash@zash.se> parents: 7253 diff changeset	94 end
e58524240b30 util.stanza: Add an is_stanza() function to check if an object is a stanza Kim Alvefur <zash@zash.se> parents: 7253 diff changeset	95
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	96 function stanza_mt:query(xmlns)
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	97 return self:tag("query", { xmlns = xmlns });
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	98 end
373 dd0345edeaf4 Add helper function for adding message bodies to stanzas Matthew Wild <mwild1@gmail.com> parents: 338 diff changeset	99
dd0345edeaf4 Add helper function for adding message bodies to stanzas Matthew Wild <mwild1@gmail.com> parents: 338 diff changeset	100 function stanza_mt:body(text, attr)
dd0345edeaf4 Add helper function for adding message bodies to stanzas Matthew Wild <mwild1@gmail.com> parents: 338 diff changeset	101 return self:tag("body", attr):text(text);
dd0345edeaf4 Add helper function for adding message bodies to stanzas Matthew Wild <mwild1@gmail.com> parents: 338 diff changeset	102 end
dd0345edeaf4 Add helper function for adding message bodies to stanzas Matthew Wild <mwild1@gmail.com> parents: 338 diff changeset	103
8645 06c73b010488 util.stanza: Add :text_tag(), a shortcut for adding nodes with text Kim Alvefur <zash@zash.se> parents: 8640 diff changeset	104 function stanza_mt:text_tag(name, text, attr, namespaces)
06c73b010488 util.stanza: Add :text_tag(), a shortcut for adding nodes with text Kim Alvefur <zash@zash.se> parents: 8640 diff changeset	105 return self:tag(name, attr, namespaces):text(text):up();
06c73b010488 util.stanza: Add :text_tag(), a shortcut for adding nodes with text Kim Alvefur <zash@zash.se> parents: 8640 diff changeset	106 end
06c73b010488 util.stanza: Add :text_tag(), a shortcut for adding nodes with text Kim Alvefur <zash@zash.se> parents: 8640 diff changeset	107
6978 30c96a5db360 util.stanza, util.xml, util.xmppstream: Add support for tracking defined namespaces and their prefix (stanza.namespaces), knowing/preserving prefix names is required for some applications (thanks daurnimator) Matthew Wild <mwild1@gmail.com> parents: 6821 diff changeset	108 function stanza_mt:tag(name, attr, namespaces)
7256 9fbb9fbf7e52 Merge 0.10->trunk Matthew Wild <mwild1@gmail.com> parents: 6978 7253 diff changeset	109 local s = new_stanza(name, attr, namespaces);
3638 6f58a3063c14 util.stanza, util.xmppstream, core.xmlhandlers: Allow stanza.last_add to be nil, and set it nil by default. Saves a table allocation per-element. 20% faster stanza building. Waqas Hussain <waqas20@gmail.com> parents: 3502 diff changeset	110 local last_add = self.last_add;
6f58a3063c14 util.stanza, util.xmppstream, core.xmlhandlers: Allow stanza.last_add to be nil, and set it nil by default. Saves a table allocation per-element. 20% faster stanza building. Waqas Hussain <waqas20@gmail.com> parents: 3502 diff changeset	111 if not last_add then last_add = {}; self.last_add = last_add; end
6f58a3063c14 util.stanza, util.xmppstream, core.xmlhandlers: Allow stanza.last_add to be nil, and set it nil by default. Saves a table allocation per-element. 20% faster stanza building. Waqas Hussain <waqas20@gmail.com> parents: 3502 diff changeset	112 (last_add[#last_add] or self):add_direct_child(s);
6f58a3063c14 util.stanza, util.xmppstream, core.xmlhandlers: Allow stanza.last_add to be nil, and set it nil by default. Saves a table allocation per-element. 20% faster stanza building. Waqas Hussain <waqas20@gmail.com> parents: 3502 diff changeset	113 t_insert(last_add, s);
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	114 return self;
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	115 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	116
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	117 function stanza_mt:text(text)
8640 8f13ec2ceb06 util.stanza: Allow :text(nil) and :text("") as harmless nops Matthew Wild <mwild1@gmail.com> parents: 8626 diff changeset	118 if text ~= nil and text ~= "" then
8f13ec2ceb06 util.stanza: Allow :text(nil) and :text("") as harmless nops Matthew Wild <mwild1@gmail.com> parents: 8626 diff changeset	119 local last_add = self.last_add;
8f13ec2ceb06 util.stanza: Allow :text(nil) and :text("") as harmless nops Matthew Wild <mwild1@gmail.com> parents: 8626 diff changeset	120 (last_add and last_add[#last_add] or self):add_direct_child(text);
8f13ec2ceb06 util.stanza: Allow :text(nil) and :text("") as harmless nops Matthew Wild <mwild1@gmail.com> parents: 8626 diff changeset	121 end
2482 a1570e371258 util.stanza: Trailing whitespace Matthew Wild <mwild1@gmail.com> parents: 2264 diff changeset	122 return self;
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	123 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	124
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	125 function stanza_mt:up()
3638 6f58a3063c14 util.stanza, util.xmppstream, core.xmlhandlers: Allow stanza.last_add to be nil, and set it nil by default. Saves a table allocation per-element. 20% faster stanza building. Waqas Hussain <waqas20@gmail.com> parents: 3502 diff changeset	126 local last_add = self.last_add;
6f58a3063c14 util.stanza, util.xmppstream, core.xmlhandlers: Allow stanza.last_add to be nil, and set it nil by default. Saves a table allocation per-element. 20% faster stanza building. Waqas Hussain <waqas20@gmail.com> parents: 3502 diff changeset	127 if last_add then t_remove(last_add); end
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	128 return self;
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	129 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	130
964 3296db2ad4a0 util.stanza: stanza:reset() method to reset building state Matthew Wild <mwild1@gmail.com> parents: 896 diff changeset	131 function stanza_mt:reset()
3638 6f58a3063c14 util.stanza, util.xmppstream, core.xmlhandlers: Allow stanza.last_add to be nil, and set it nil by default. Saves a table allocation per-element. 20% faster stanza building. Waqas Hussain <waqas20@gmail.com> parents: 3502 diff changeset	132 self.last_add = nil;
964 3296db2ad4a0 util.stanza: stanza:reset() method to reset building state Matthew Wild <mwild1@gmail.com> parents: 896 diff changeset	133 return self;
3296db2ad4a0 util.stanza: stanza:reset() method to reset building state Matthew Wild <mwild1@gmail.com> parents: 896 diff changeset	134 end
3296db2ad4a0 util.stanza: stanza:reset() method to reset building state Matthew Wild <mwild1@gmail.com> parents: 896 diff changeset	135
180 d8b9a19d70eb Make add_child() behave as expected. Old add_child() is now add_direct_child() Matthew Wild <mwild1@gmail.com> parents: 145 diff changeset	136 function stanza_mt:add_direct_child(child)
8889 c4e430c69f88 util.stanza: Verify that child tags added are really stanzas (closes #1165) Kim Alvefur <zash@zash.se> parents: 8645 diff changeset	137 if is_stanza(child) then
1 b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	138 t_insert(self.tags, child);
8890 3490bc478804 util.stanza: Verify that other objects added as children are valid strings Kim Alvefur <zash@zash.se> parents: 8889 diff changeset	139 t_insert(self, child);
3490bc478804 util.stanza: Verify that other objects added as children are valid strings Kim Alvefur <zash@zash.se> parents: 8889 diff changeset	140 else
3490bc478804 util.stanza: Verify that other objects added as children are valid strings Kim Alvefur <zash@zash.se> parents: 8889 diff changeset	141 check_text(child, "text");
3490bc478804 util.stanza: Verify that other objects added as children are valid strings Kim Alvefur <zash@zash.se> parents: 8889 diff changeset	142 t_insert(self, child);
1 b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	143 end
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	144 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	145
180 d8b9a19d70eb Make add_child() behave as expected. Old add_child() is now add_direct_child() Matthew Wild <mwild1@gmail.com> parents: 145 diff changeset	146 function stanza_mt:add_child(child)
3638 6f58a3063c14 util.stanza, util.xmppstream, core.xmlhandlers: Allow stanza.last_add to be nil, and set it nil by default. Saves a table allocation per-element. 20% faster stanza building. Waqas Hussain <waqas20@gmail.com> parents: 3502 diff changeset	147 local last_add = self.last_add;
6f58a3063c14 util.stanza, util.xmppstream, core.xmlhandlers: Allow stanza.last_add to be nil, and set it nil by default. Saves a table allocation per-element. 20% faster stanza building. Waqas Hussain <waqas20@gmail.com> parents: 3502 diff changeset	148 (last_add and last_add[#last_add] or self):add_direct_child(child);
180 d8b9a19d70eb Make add_child() behave as expected. Old add_child() is now add_direct_child() Matthew Wild <mwild1@gmail.com> parents: 145 diff changeset	149 return self;
d8b9a19d70eb Make add_child() behave as expected. Old add_child() is now add_direct_child() Matthew Wild <mwild1@gmail.com> parents: 145 diff changeset	150 end
d8b9a19d70eb Make add_child() behave as expected. Old add_child() is now add_direct_child() Matthew Wild <mwild1@gmail.com> parents: 145 diff changeset	151
2264 49580a13f71e util.stanza: Add stanza:get_child(name, xmlns) to find a child tag given a name/xmlns Matthew Wild <mwild1@gmail.com> parents: 2077 diff changeset	152 function stanza_mt:get_child(name, xmlns)
49580a13f71e util.stanza: Add stanza:get_child(name, xmlns) to find a child tag given a name/xmlns Matthew Wild <mwild1@gmail.com> parents: 2077 diff changeset	153 for _, child in ipairs(self.tags) do
2482 a1570e371258 util.stanza: Trailing whitespace Matthew Wild <mwild1@gmail.com> parents: 2264 diff changeset	154 if (not name or child.name == name)
2264 49580a13f71e util.stanza: Add stanza:get_child(name, xmlns) to find a child tag given a name/xmlns Matthew Wild <mwild1@gmail.com> parents: 2077 diff changeset	155 and ((not xmlns and self.attr.xmlns == child.attr.xmlns)
49580a13f71e util.stanza: Add stanza:get_child(name, xmlns) to find a child tag given a name/xmlns Matthew Wild <mwild1@gmail.com> parents: 2077 diff changeset	156 or child.attr.xmlns == xmlns) then
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5435 diff changeset	157
2264 49580a13f71e util.stanza: Add stanza:get_child(name, xmlns) to find a child tag given a name/xmlns Matthew Wild <mwild1@gmail.com> parents: 2077 diff changeset	158 return child;
49580a13f71e util.stanza: Add stanza:get_child(name, xmlns) to find a child tag given a name/xmlns Matthew Wild <mwild1@gmail.com> parents: 2077 diff changeset	159 end
49580a13f71e util.stanza: Add stanza:get_child(name, xmlns) to find a child tag given a name/xmlns Matthew Wild <mwild1@gmail.com> parents: 2077 diff changeset	160 end
49580a13f71e util.stanza: Add stanza:get_child(name, xmlns) to find a child tag given a name/xmlns Matthew Wild <mwild1@gmail.com> parents: 2077 diff changeset	161 end
49580a13f71e util.stanza: Add stanza:get_child(name, xmlns) to find a child tag given a name/xmlns Matthew Wild <mwild1@gmail.com> parents: 2077 diff changeset	162
4132 ccc16434dbe2 util.stanza: Add get_child_text() method to get the text of the specified child element (get_child() + get_text() rolled into one step) Matthew Wild <mwild1@gmail.com> parents: 3766 diff changeset	163 function stanza_mt:get_child_text(name, xmlns)
ccc16434dbe2 util.stanza: Add get_child_text() method to get the text of the specified child element (get_child() + get_text() rolled into one step) Matthew Wild <mwild1@gmail.com> parents: 3766 diff changeset	164 local tag = self:get_child(name, xmlns);
ccc16434dbe2 util.stanza: Add get_child_text() method to get the text of the specified child element (get_child() + get_text() rolled into one step) Matthew Wild <mwild1@gmail.com> parents: 3766 diff changeset	165 if tag then
ccc16434dbe2 util.stanza: Add get_child_text() method to get the text of the specified child element (get_child() + get_text() rolled into one step) Matthew Wild <mwild1@gmail.com> parents: 3766 diff changeset	166 return tag:get_text();
ccc16434dbe2 util.stanza: Add get_child_text() method to get the text of the specified child element (get_child() + get_text() rolled into one step) Matthew Wild <mwild1@gmail.com> parents: 3766 diff changeset	167 end
ccc16434dbe2 util.stanza: Add get_child_text() method to get the text of the specified child element (get_child() + get_text() rolled into one step) Matthew Wild <mwild1@gmail.com> parents: 3766 diff changeset	168 return nil;
ccc16434dbe2 util.stanza: Add get_child_text() method to get the text of the specified child element (get_child() + get_text() rolled into one step) Matthew Wild <mwild1@gmail.com> parents: 3766 diff changeset	169 end
ccc16434dbe2 util.stanza: Add get_child_text() method to get the text of the specified child element (get_child() + get_text() rolled into one step) Matthew Wild <mwild1@gmail.com> parents: 3766 diff changeset	170
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	171 function stanza_mt:child_with_name(name)
2482 a1570e371258 util.stanza: Trailing whitespace Matthew Wild <mwild1@gmail.com> parents: 2264 diff changeset	172 for _, child in ipairs(self.tags) do
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	173 if child.name == name then return child; end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	174 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	175 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	176
689 94b043fbaf33 Add child_with_ns() method to stanza elements, and fix child_with_name() to iterate tags rather than all children Matthew Wild <mwild1@gmail.com> parents: 680 diff changeset	177 function stanza_mt:child_with_ns(ns)
2482 a1570e371258 util.stanza: Trailing whitespace Matthew Wild <mwild1@gmail.com> parents: 2264 diff changeset	178 for _, child in ipairs(self.tags) do
689 94b043fbaf33 Add child_with_ns() method to stanza elements, and fix child_with_name() to iterate tags rather than all children Matthew Wild <mwild1@gmail.com> parents: 680 diff changeset	179 if child.attr.xmlns == ns then return child; end
94b043fbaf33 Add child_with_ns() method to stanza elements, and fix child_with_name() to iterate tags rather than all children Matthew Wild <mwild1@gmail.com> parents: 680 diff changeset	180 end
94b043fbaf33 Add child_with_ns() method to stanza elements, and fix child_with_name() to iterate tags rather than all children Matthew Wild <mwild1@gmail.com> parents: 680 diff changeset	181 end
94b043fbaf33 Add child_with_ns() method to stanza elements, and fix child_with_name() to iterate tags rather than all children Matthew Wild <mwild1@gmail.com> parents: 680 diff changeset	182
1 b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	183 function stanza_mt:children()
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	184 local i = 0;
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	185 return function (a)
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	186 i = i + 1
3475 0307a3ac3885 util.stanza: Optimisation, remove useless if...then in stanza:children() iterator Matthew Wild <mwild1@gmail.com> parents: 3474 diff changeset	187 return a[i];
1 b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	188 end, self, i;
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	189 end
3474 730876bbe4e6 util.stanza: Add stanza:matched_children(name, xmlns) [name suggestions welcome] Matthew Wild <mwild1@gmail.com> parents: 2961 diff changeset	190
4168 4919831b5b56 util.stanza: Clean up matching_tags() and replace :childtags() with it Matthew Wild <mwild1@gmail.com> parents: 4136 diff changeset	191 function stanza_mt:childtags(name, xmlns)
3474 730876bbe4e6 util.stanza: Add stanza:matched_children(name, xmlns) [name suggestions welcome] Matthew Wild <mwild1@gmail.com> parents: 2961 diff changeset	192 local tags = self.tags;
730876bbe4e6 util.stanza: Add stanza:matched_children(name, xmlns) [name suggestions welcome] Matthew Wild <mwild1@gmail.com> parents: 2961 diff changeset	193 local start_i, max_i = 1, #tags;
730876bbe4e6 util.stanza: Add stanza:matched_children(name, xmlns) [name suggestions welcome] Matthew Wild <mwild1@gmail.com> parents: 2961 diff changeset	194 return function ()
4168 4919831b5b56 util.stanza: Clean up matching_tags() and replace :childtags() with it Matthew Wild <mwild1@gmail.com> parents: 4136 diff changeset	195 for i = start_i, max_i do
4919831b5b56 util.stanza: Clean up matching_tags() and replace :childtags() with it Matthew Wild <mwild1@gmail.com> parents: 4136 diff changeset	196 local v = tags[i];
4919831b5b56 util.stanza: Clean up matching_tags() and replace :childtags() with it Matthew Wild <mwild1@gmail.com> parents: 4136 diff changeset	197 if (not name or v.name == name)
4936 92c86e11fd44 util.stanza: Make stanza:childtags() behave like :get_child() Kim Alvefur <zash@zash.se> parents: 4749 diff changeset	198 and ((not xmlns and self.attr.xmlns == v.attr.xmlns)
92c86e11fd44 util.stanza: Make stanza:childtags() behave like :get_child() Kim Alvefur <zash@zash.se> parents: 4749 diff changeset	199 or v.attr.xmlns == xmlns) then
4168 4919831b5b56 util.stanza: Clean up matching_tags() and replace :childtags() with it Matthew Wild <mwild1@gmail.com> parents: 4136 diff changeset	200 start_i = i+1;
4919831b5b56 util.stanza: Clean up matching_tags() and replace :childtags() with it Matthew Wild <mwild1@gmail.com> parents: 4136 diff changeset	201 return v;
3474 730876bbe4e6 util.stanza: Add stanza:matched_children(name, xmlns) [name suggestions welcome] Matthew Wild <mwild1@gmail.com> parents: 2961 diff changeset	202 end
4168 4919831b5b56 util.stanza: Clean up matching_tags() and replace :childtags() with it Matthew Wild <mwild1@gmail.com> parents: 4136 diff changeset	203 end
4919831b5b56 util.stanza: Clean up matching_tags() and replace :childtags() with it Matthew Wild <mwild1@gmail.com> parents: 4136 diff changeset	204 end;
2 9bb397205f26 Working presence! matthew parents: 1 diff changeset	205 end
1 b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	206
3477 6350b114e0e4 util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza) Matthew Wild <mwild1@gmail.com> parents: 3475 diff changeset	207 function stanza_mt:maptags(callback)
6350b114e0e4 util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza) Matthew Wild <mwild1@gmail.com> parents: 3475 diff changeset	208 local tags, curr_tag = self.tags, 1;
6350b114e0e4 util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza) Matthew Wild <mwild1@gmail.com> parents: 3475 diff changeset	209 local n_children, n_tags = #self, #tags;
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5435 diff changeset	210
3477 6350b114e0e4 util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza) Matthew Wild <mwild1@gmail.com> parents: 3475 diff changeset	211 local i = 1;
5414 efec29eb4cdd util.stanza: :maptags(): Fixes to make loop more robust on item removal Matthew Wild <mwild1@gmail.com> parents: 5090 diff changeset	212 while curr_tag <= n_tags and n_tags > 0 do
3477 6350b114e0e4 util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza) Matthew Wild <mwild1@gmail.com> parents: 3475 diff changeset	213 if self[i] == tags[curr_tag] then
6350b114e0e4 util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza) Matthew Wild <mwild1@gmail.com> parents: 3475 diff changeset	214 local ret = callback(self[i]);
6350b114e0e4 util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza) Matthew Wild <mwild1@gmail.com> parents: 3475 diff changeset	215 if ret == nil then
6350b114e0e4 util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza) Matthew Wild <mwild1@gmail.com> parents: 3475 diff changeset	216 t_remove(self, i);
6350b114e0e4 util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza) Matthew Wild <mwild1@gmail.com> parents: 3475 diff changeset	217 t_remove(tags, curr_tag);
6350b114e0e4 util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza) Matthew Wild <mwild1@gmail.com> parents: 3475 diff changeset	218 n_children = n_children - 1;
6350b114e0e4 util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza) Matthew Wild <mwild1@gmail.com> parents: 3475 diff changeset	219 n_tags = n_tags - 1;
5414 efec29eb4cdd util.stanza: :maptags(): Fixes to make loop more robust on item removal Matthew Wild <mwild1@gmail.com> parents: 5090 diff changeset	220 i = i - 1;
efec29eb4cdd util.stanza: :maptags(): Fixes to make loop more robust on item removal Matthew Wild <mwild1@gmail.com> parents: 5090 diff changeset	221 curr_tag = curr_tag - 1;
3477 6350b114e0e4 util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza) Matthew Wild <mwild1@gmail.com> parents: 3475 diff changeset	222 else
6350b114e0e4 util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza) Matthew Wild <mwild1@gmail.com> parents: 3475 diff changeset	223 self[i] = ret;
5435 f56e449a63e3 util.stanza: Use correct index when replacing the tag in .tags (thanks daurnimator) Matthew Wild <mwild1@gmail.com> parents: 5424 diff changeset	224 tags[curr_tag] = ret;
3477 6350b114e0e4 util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza) Matthew Wild <mwild1@gmail.com> parents: 3475 diff changeset	225 end
6350b114e0e4 util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza) Matthew Wild <mwild1@gmail.com> parents: 3475 diff changeset	226 curr_tag = curr_tag + 1;
6350b114e0e4 util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza) Matthew Wild <mwild1@gmail.com> parents: 3475 diff changeset	227 end
5414 efec29eb4cdd util.stanza: :maptags(): Fixes to make loop more robust on item removal Matthew Wild <mwild1@gmail.com> parents: 5090 diff changeset	228 i = i + 1;
3477 6350b114e0e4 util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza) Matthew Wild <mwild1@gmail.com> parents: 3475 diff changeset	229 end
6350b114e0e4 util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza) Matthew Wild <mwild1@gmail.com> parents: 3475 diff changeset	230 return self;
6350b114e0e4 util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza) Matthew Wild <mwild1@gmail.com> parents: 3475 diff changeset	231 end
6350b114e0e4 util.stanza: Add stanza:maptags() to apply a function over child tags (return nil to remove tag from stanza) Matthew Wild <mwild1@gmail.com> parents: 3475 diff changeset	232
5424 7318527c6dea util.stanza: Add stanza:find(), a light weight XPath-like method Kim Alvefur <zash@zash.se> parents: 5414 diff changeset	233 function stanza_mt:find(path)
7318527c6dea util.stanza: Add stanza:find(), a light weight XPath-like method Kim Alvefur <zash@zash.se> parents: 5414 diff changeset	234 local pos = 1;
7318527c6dea util.stanza: Add stanza:find(), a light weight XPath-like method Kim Alvefur <zash@zash.se> parents: 5414 diff changeset	235 local len = #path + 1;
7318527c6dea util.stanza: Add stanza:find(), a light weight XPath-like method Kim Alvefur <zash@zash.se> parents: 5414 diff changeset	236
7318527c6dea util.stanza: Add stanza:find(), a light weight XPath-like method Kim Alvefur <zash@zash.se> parents: 5414 diff changeset	237 repeat
7318527c6dea util.stanza: Add stanza:find(), a light weight XPath-like method Kim Alvefur <zash@zash.se> parents: 5414 diff changeset	238 local xmlns, name, text;
7318527c6dea util.stanza: Add stanza:find(), a light weight XPath-like method Kim Alvefur <zash@zash.se> parents: 5414 diff changeset	239 local char = s_sub(path, pos, pos);
7318527c6dea util.stanza: Add stanza:find(), a light weight XPath-like method Kim Alvefur <zash@zash.se> parents: 5414 diff changeset	240 if char == "@" then
7318527c6dea util.stanza: Add stanza:find(), a light weight XPath-like method Kim Alvefur <zash@zash.se> parents: 5414 diff changeset	241 return self.attr[s_sub(path, pos + 1)];
7318527c6dea util.stanza: Add stanza:find(), a light weight XPath-like method Kim Alvefur <zash@zash.se> parents: 5414 diff changeset	242 elseif char == "{" then
7318527c6dea util.stanza: Add stanza:find(), a light weight XPath-like method Kim Alvefur <zash@zash.se> parents: 5414 diff changeset	243 xmlns, pos = s_match(path, "^([^}]+)}()", pos + 1);
7318527c6dea util.stanza: Add stanza:find(), a light weight XPath-like method Kim Alvefur <zash@zash.se> parents: 5414 diff changeset	244 end
7318527c6dea util.stanza: Add stanza:find(), a light weight XPath-like method Kim Alvefur <zash@zash.se> parents: 5414 diff changeset	245 name, text, pos = s_match(path, "^([^@/#]*)([/#]?)()", pos);
7318527c6dea util.stanza: Add stanza:find(), a light weight XPath-like method Kim Alvefur <zash@zash.se> parents: 5414 diff changeset	246 name = name ~= "" and name or nil;
7318527c6dea util.stanza: Add stanza:find(), a light weight XPath-like method Kim Alvefur <zash@zash.se> parents: 5414 diff changeset	247 if pos == len then
7318527c6dea util.stanza: Add stanza:find(), a light weight XPath-like method Kim Alvefur <zash@zash.se> parents: 5414 diff changeset	248 if text == "#" then
7318527c6dea util.stanza: Add stanza:find(), a light weight XPath-like method Kim Alvefur <zash@zash.se> parents: 5414 diff changeset	249 return self:get_child_text(name, xmlns);
7318527c6dea util.stanza: Add stanza:find(), a light weight XPath-like method Kim Alvefur <zash@zash.se> parents: 5414 diff changeset	250 end
7318527c6dea util.stanza: Add stanza:find(), a light weight XPath-like method Kim Alvefur <zash@zash.se> parents: 5414 diff changeset	251 return self:get_child(name, xmlns);
7318527c6dea util.stanza: Add stanza:find(), a light weight XPath-like method Kim Alvefur <zash@zash.se> parents: 5414 diff changeset	252 end
7318527c6dea util.stanza: Add stanza:find(), a light weight XPath-like method Kim Alvefur <zash@zash.se> parents: 5414 diff changeset	253 self = self:get_child(name, xmlns);
7318527c6dea util.stanza: Add stanza:find(), a light weight XPath-like method Kim Alvefur <zash@zash.se> parents: 5414 diff changeset	254 until not self
7318527c6dea util.stanza: Add stanza:find(), a light weight XPath-like method Kim Alvefur <zash@zash.se> parents: 5414 diff changeset	255 end
7318527c6dea util.stanza: Add stanza:find(), a light weight XPath-like method Kim Alvefur <zash@zash.se> parents: 5414 diff changeset	256
7318527c6dea util.stanza: Add stanza:find(), a light weight XPath-like method Kim Alvefur <zash@zash.se> parents: 5414 diff changeset	257
6777 5de6b93d0190 util.: Remove use of module() function, make all module functions local and return them in a table at the end Kim Alvefur <zash@zash.se>* parents: 6501 diff changeset	258 local escape_table = { ["'"] = "'", ["\""] = """, ["<"] = "<", [">"] = ">", ["&"] = "&" };
5de6b93d0190 util.: Remove use of module() function, make all module functions local and return them in a table at the end Kim Alvefur <zash@zash.se>* parents: 6501 diff changeset	259 local function xml_escape(str) return (s_gsub(str, "['&<>\"]", escape_table)); end
1931 f203330eb82e util.stanza: Make xml_escape publicly accessible Matthew Wild <mwild1@gmail.com> parents: 1874 diff changeset	260
7253 f4e71242556a util.stanza: Some code cleanup [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6821 diff changeset	261 local function _dostring(t, buf, self, _xml_escape, parentns)
1431 9fe9ba693f4a util.stanza: Serializer optimizations, and nicer output for empty elements Waqas Hussain <waqas20@gmail.com> parents: 1420 diff changeset	262 local nsid = 0;
9fe9ba693f4a util.stanza: Serializer optimizations, and nicer output for empty elements Waqas Hussain <waqas20@gmail.com> parents: 1420 diff changeset	263 local name = t.name
9fe9ba693f4a util.stanza: Serializer optimizations, and nicer output for empty elements Waqas Hussain <waqas20@gmail.com> parents: 1420 diff changeset	264 t_insert(buf, "<"..name);
1416 f916f0ff90e5 util.stanza: Rewrote stanza_mt.__tostring. 20-30% faster stanza serialization. - #optimization Waqas Hussain <waqas20@gmail.com> parents: 1415 diff changeset	265 for k, v in pairs(t.attr) do
2077 e33658f6052c Changed separator between attribute names and prefixes from '\|' to '\1' (optimization and cleanup). Waqas Hussain <waqas20@gmail.com> parents: 1984 diff changeset	266 if s_find(k, "\1", 1, true) then
e33658f6052c Changed separator between attribute names and prefixes from '\|' to '\1' (optimization and cleanup). Waqas Hussain <waqas20@gmail.com> parents: 1984 diff changeset	267 local ns, attrk = s_match(k, "^([^\1])\1?(.)$");
1416 f916f0ff90e5 util.stanza: Rewrote stanza_mt.__tostring. 20-30% faster stanza serialization. - #optimization Waqas Hussain <waqas20@gmail.com> parents: 1415 diff changeset	268 nsid = nsid + 1;
7253 f4e71242556a util.stanza: Some code cleanup [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6821 diff changeset	269 t_insert(buf, " xmlns:ns"..nsid.."='".._xml_escape(ns).."' ".."ns"..nsid..":"..attrk.."='".._xml_escape(v).."'");
2077 e33658f6052c Changed separator between attribute names and prefixes from '\|' to '\1' (optimization and cleanup). Waqas Hussain <waqas20@gmail.com> parents: 1984 diff changeset	270 elseif not(k == "xmlns" and v == parentns) then
7253 f4e71242556a util.stanza: Some code cleanup [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6821 diff changeset	271 t_insert(buf, " "..k.."='".._xml_escape(v).."'");
776 89eb9f59993c util.stanza: Temporary fix for serializing attributes with namespaces Matthew Wild <mwild1@gmail.com> parents: 760 diff changeset	272 end
1416 f916f0ff90e5 util.stanza: Rewrote stanza_mt.__tostring. 20-30% faster stanza serialization. - #optimization Waqas Hussain <waqas20@gmail.com> parents: 1415 diff changeset	273 end
1431 9fe9ba693f4a util.stanza: Serializer optimizations, and nicer output for empty elements Waqas Hussain <waqas20@gmail.com> parents: 1420 diff changeset	274 local len = #t;
9fe9ba693f4a util.stanza: Serializer optimizations, and nicer output for empty elements Waqas Hussain <waqas20@gmail.com> parents: 1420 diff changeset	275 if len == 0 then
9fe9ba693f4a util.stanza: Serializer optimizations, and nicer output for empty elements Waqas Hussain <waqas20@gmail.com> parents: 1420 diff changeset	276 t_insert(buf, "/>");
9fe9ba693f4a util.stanza: Serializer optimizations, and nicer output for empty elements Waqas Hussain <waqas20@gmail.com> parents: 1420 diff changeset	277 else
9fe9ba693f4a util.stanza: Serializer optimizations, and nicer output for empty elements Waqas Hussain <waqas20@gmail.com> parents: 1420 diff changeset	278 t_insert(buf, ">");
9fe9ba693f4a util.stanza: Serializer optimizations, and nicer output for empty elements Waqas Hussain <waqas20@gmail.com> parents: 1420 diff changeset	279 for n=1,len do
9fe9ba693f4a util.stanza: Serializer optimizations, and nicer output for empty elements Waqas Hussain <waqas20@gmail.com> parents: 1420 diff changeset	280 local child = t[n];
9fe9ba693f4a util.stanza: Serializer optimizations, and nicer output for empty elements Waqas Hussain <waqas20@gmail.com> parents: 1420 diff changeset	281 if child.name then
7253 f4e71242556a util.stanza: Some code cleanup [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6821 diff changeset	282 self(child, buf, self, _xml_escape, t.attr.xmlns);
1431 9fe9ba693f4a util.stanza: Serializer optimizations, and nicer output for empty elements Waqas Hussain <waqas20@gmail.com> parents: 1420 diff changeset	283 else
7253 f4e71242556a util.stanza: Some code cleanup [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6821 diff changeset	284 t_insert(buf, _xml_escape(child));
1431 9fe9ba693f4a util.stanza: Serializer optimizations, and nicer output for empty elements Waqas Hussain <waqas20@gmail.com> parents: 1420 diff changeset	285 end
4 09c3845ed442 Presence unavailable on disconnect matthew parents: 2 diff changeset	286 end
1431 9fe9ba693f4a util.stanza: Serializer optimizations, and nicer output for empty elements Waqas Hussain <waqas20@gmail.com> parents: 1420 diff changeset	287 t_insert(buf, "</"..name..">");
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	288 end
626 cf1d26fd4d6f Optimized stanza_mt.__tostring (called when doing tostring(stanza)) Waqas Hussain <waqas20@gmail.com> parents: 519 diff changeset	289 end
cf1d26fd4d6f Optimized stanza_mt.__tostring (called when doing tostring(stanza)) Waqas Hussain <waqas20@gmail.com> parents: 519 diff changeset	290 function stanza_mt.__tostring(t)
cf1d26fd4d6f Optimized stanza_mt.__tostring (called when doing tostring(stanza)) Waqas Hussain <waqas20@gmail.com> parents: 519 diff changeset	291 local buf = {};
2077 e33658f6052c Changed separator between attribute names and prefixes from '\|' to '\1' (optimization and cleanup). Waqas Hussain <waqas20@gmail.com> parents: 1984 diff changeset	292 _dostring(t, buf, _dostring, xml_escape, nil);
626 cf1d26fd4d6f Optimized stanza_mt.__tostring (called when doing tostring(stanza)) Waqas Hussain <waqas20@gmail.com> parents: 519 diff changeset	293 return t_concat(buf);
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	294 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	295
242 f15afbcbc55c Add new top_tag() method to stanzas Matthew Wild <mwild1@gmail.com> parents: 209 diff changeset	296 function stanza_mt.top_tag(t)
f15afbcbc55c Add new top_tag() method to stanzas Matthew Wild <mwild1@gmail.com> parents: 209 diff changeset	297 local attr_string = "";
f15afbcbc55c Add new top_tag() method to stanzas Matthew Wild <mwild1@gmail.com> parents: 209 diff changeset	298 if t.attr then
338 804f5e62a41f Don't forget to escape XML in attributes. Thanks to the Postgres Q&A room on conference.jabber.org :) Matthew Wild <mwild1@gmail.com> parents: 262 diff changeset	299 for k, v in pairs(t.attr) do if type(k) == "string" then attr_string = attr_string .. s_format(" %s='%s'", k, xml_escape(tostring(v))); end end
242 f15afbcbc55c Add new top_tag() method to stanzas Matthew Wild <mwild1@gmail.com> parents: 209 diff changeset	300 end
f15afbcbc55c Add new top_tag() method to stanzas Matthew Wild <mwild1@gmail.com> parents: 209 diff changeset	301 return s_format("<%s%s>", t.name, attr_string);
f15afbcbc55c Add new top_tag() method to stanzas Matthew Wild <mwild1@gmail.com> parents: 209 diff changeset	302 end
f15afbcbc55c Add new top_tag() method to stanzas Matthew Wild <mwild1@gmail.com> parents: 209 diff changeset	303
1420 1576a5aa52f8 util.stanza: Add stanza:get_text() to retrieve all child text nodes #api Matthew Wild <mwild1@gmail.com> parents: 1416 diff changeset	304 function stanza_mt.get_text(t)
1576a5aa52f8 util.stanza: Add stanza:get_text() to retrieve all child text nodes #api Matthew Wild <mwild1@gmail.com> parents: 1416 diff changeset	305 if #t.tags == 0 then
1576a5aa52f8 util.stanza: Add stanza:get_text() to retrieve all child text nodes #api Matthew Wild <mwild1@gmail.com> parents: 1416 diff changeset	306 return t_concat(t);
1576a5aa52f8 util.stanza: Add stanza:get_text() to retrieve all child text nodes #api Matthew Wild <mwild1@gmail.com> parents: 1416 diff changeset	307 end
1576a5aa52f8 util.stanza: Add stanza:get_text() to retrieve all child text nodes #api Matthew Wild <mwild1@gmail.com> parents: 1416 diff changeset	308 end
1576a5aa52f8 util.stanza: Add stanza:get_text() to retrieve all child text nodes #api Matthew Wild <mwild1@gmail.com> parents: 1416 diff changeset	309
2526 401ff68413a1 util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error Matthew Wild <mwild1@gmail.com> parents: 2482 diff changeset	310 function stanza_mt.get_error(stanza)
7253 f4e71242556a util.stanza: Some code cleanup [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6821 diff changeset	311 local error_type, condition, text;
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5435 diff changeset	312
2526 401ff68413a1 util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error Matthew Wild <mwild1@gmail.com> parents: 2482 diff changeset	313 local error_tag = stanza:get_child("error");
401ff68413a1 util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error Matthew Wild <mwild1@gmail.com> parents: 2482 diff changeset	314 if not error_tag then
401ff68413a1 util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error Matthew Wild <mwild1@gmail.com> parents: 2482 diff changeset	315 return nil, nil, nil;
401ff68413a1 util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error Matthew Wild <mwild1@gmail.com> parents: 2482 diff changeset	316 end
7253 f4e71242556a util.stanza: Some code cleanup [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6821 diff changeset	317 error_type = error_tag.attr.type;
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5435 diff changeset	318
5090 61c7c53c06d5 util.stanza: Use ipairs instead of childtags (behavior changed in 92c86e11fd44) Kim Alvefur <zash@zash.se> parents: 4936 diff changeset	319 for _, child in ipairs(error_tag.tags) do
2526 401ff68413a1 util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error Matthew Wild <mwild1@gmail.com> parents: 2482 diff changeset	320 if child.attr.xmlns == xmlns_stanzas then
401ff68413a1 util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error Matthew Wild <mwild1@gmail.com> parents: 2482 diff changeset	321 if not text and child.name == "text" then
401ff68413a1 util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error Matthew Wild <mwild1@gmail.com> parents: 2482 diff changeset	322 text = child:get_text();
401ff68413a1 util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error Matthew Wild <mwild1@gmail.com> parents: 2482 diff changeset	323 elseif not condition then
401ff68413a1 util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error Matthew Wild <mwild1@gmail.com> parents: 2482 diff changeset	324 condition = child.name;
401ff68413a1 util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error Matthew Wild <mwild1@gmail.com> parents: 2482 diff changeset	325 end
401ff68413a1 util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error Matthew Wild <mwild1@gmail.com> parents: 2482 diff changeset	326 if condition and text then
401ff68413a1 util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error Matthew Wild <mwild1@gmail.com> parents: 2482 diff changeset	327 break;
401ff68413a1 util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error Matthew Wild <mwild1@gmail.com> parents: 2482 diff changeset	328 end
401ff68413a1 util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error Matthew Wild <mwild1@gmail.com> parents: 2482 diff changeset	329 end
401ff68413a1 util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error Matthew Wild <mwild1@gmail.com> parents: 2482 diff changeset	330 end
7253 f4e71242556a util.stanza: Some code cleanup [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6821 diff changeset	331 return error_type, condition or "undefined-condition", text;
2526 401ff68413a1 util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error Matthew Wild <mwild1@gmail.com> parents: 2482 diff changeset	332 end
401ff68413a1 util.stanza: Add stanza:get_error() to return type, condition and text of a stanza error Matthew Wild <mwild1@gmail.com> parents: 2482 diff changeset	333
6777 5de6b93d0190 util.: Remove use of module() function, make all module functions local and return them in a table at the end Kim Alvefur <zash@zash.se>* parents: 6501 diff changeset	334 local id = 0;
5de6b93d0190 util.: Remove use of module() function, make all module functions local and return them in a table at the end Kim Alvefur <zash@zash.se>* parents: 6501 diff changeset	335 local function new_id()
5de6b93d0190 util.: Remove use of module() function, make all module functions local and return them in a table at the end Kim Alvefur <zash@zash.se>* parents: 6501 diff changeset	336 id = id + 1;
5de6b93d0190 util.: Remove use of module() function, make all module functions local and return them in a table at the end Kim Alvefur <zash@zash.se>* parents: 6501 diff changeset	337 return "lx"..id;
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	338 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	339
6777 5de6b93d0190 util.: Remove use of module() function, make all module functions local and return them in a table at the end Kim Alvefur <zash@zash.se>* parents: 6501 diff changeset	340 local function preserialize(stanza)
90 da468ed49a7b Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these. Matthew Wild <mwild1@gmail.com> parents: 70 diff changeset	341 local s = { name = stanza.name, attr = stanza.attr };
da468ed49a7b Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these. Matthew Wild <mwild1@gmail.com> parents: 70 diff changeset	342 for _, child in ipairs(stanza) do
da468ed49a7b Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these. Matthew Wild <mwild1@gmail.com> parents: 70 diff changeset	343 if type(child) == "table" then
da468ed49a7b Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these. Matthew Wild <mwild1@gmail.com> parents: 70 diff changeset	344 t_insert(s, preserialize(child));
da468ed49a7b Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these. Matthew Wild <mwild1@gmail.com> parents: 70 diff changeset	345 else
da468ed49a7b Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these. Matthew Wild <mwild1@gmail.com> parents: 70 diff changeset	346 t_insert(s, child);
da468ed49a7b Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these. Matthew Wild <mwild1@gmail.com> parents: 70 diff changeset	347 end
da468ed49a7b Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these. Matthew Wild <mwild1@gmail.com> parents: 70 diff changeset	348 end
da468ed49a7b Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these. Matthew Wild <mwild1@gmail.com> parents: 70 diff changeset	349 return s;
da468ed49a7b Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these. Matthew Wild <mwild1@gmail.com> parents: 70 diff changeset	350 end
da468ed49a7b Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these. Matthew Wild <mwild1@gmail.com> parents: 70 diff changeset	351
6777 5de6b93d0190 util.: Remove use of module() function, make all module functions local and return them in a table at the end Kim Alvefur <zash@zash.se>* parents: 6501 diff changeset	352 local function deserialize(stanza)
90 da468ed49a7b Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these. Matthew Wild <mwild1@gmail.com> parents: 70 diff changeset	353 -- Set metatable
91 6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	354 if stanza then
1415 957a81b72cb2 util.stanza: Remove numeric attributes while deserializing Waqas Hussain <waqas20@gmail.com> parents: 1151 diff changeset	355 local attr = stanza.attr;
957a81b72cb2 util.stanza: Remove numeric attributes while deserializing Waqas Hussain <waqas20@gmail.com> parents: 1151 diff changeset	356 for i=1,#attr do attr[i] = nil; end
2077 e33658f6052c Changed separator between attribute names and prefixes from '\|' to '\1' (optimization and cleanup). Waqas Hussain <waqas20@gmail.com> parents: 1984 diff changeset	357 local attrx = {};
e33658f6052c Changed separator between attribute names and prefixes from '\|' to '\1' (optimization and cleanup). Waqas Hussain <waqas20@gmail.com> parents: 1984 diff changeset	358 for att in pairs(attr) do
2956 15a145a67044 util.stanza: Fixed some more nil global accesses. Waqas Hussain <waqas20@gmail.com> parents: 2955 diff changeset	359 if s_find(att, "\|", 1, true) and not s_find(att, "\1", 1, true) then
15a145a67044 util.stanza: Fixed some more nil global accesses. Waqas Hussain <waqas20@gmail.com> parents: 2955 diff changeset	360 local ns,na = s_match(att, "^([^\|]+)\|(.+)$");
2077 e33658f6052c Changed separator between attribute names and prefixes from '\|' to '\1' (optimization and cleanup). Waqas Hussain <waqas20@gmail.com> parents: 1984 diff changeset	361 attrx[ns.."\1"..na] = attr[att];
e33658f6052c Changed separator between attribute names and prefixes from '\|' to '\1' (optimization and cleanup). Waqas Hussain <waqas20@gmail.com> parents: 1984 diff changeset	362 attr[att] = nil;
e33658f6052c Changed separator between attribute names and prefixes from '\|' to '\1' (optimization and cleanup). Waqas Hussain <waqas20@gmail.com> parents: 1984 diff changeset	363 end
e33658f6052c Changed separator between attribute names and prefixes from '\|' to '\1' (optimization and cleanup). Waqas Hussain <waqas20@gmail.com> parents: 1984 diff changeset	364 end
e33658f6052c Changed separator between attribute names and prefixes from '\|' to '\1' (optimization and cleanup). Waqas Hussain <waqas20@gmail.com> parents: 1984 diff changeset	365 for a,v in pairs(attrx) do
2956 15a145a67044 util.stanza: Fixed some more nil global accesses. Waqas Hussain <waqas20@gmail.com> parents: 2955 diff changeset	366 attr[a] = v;
2077 e33658f6052c Changed separator between attribute names and prefixes from '\|' to '\1' (optimization and cleanup). Waqas Hussain <waqas20@gmail.com> parents: 1984 diff changeset	367 end
91 6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	368 setmetatable(stanza, stanza_mt);
90 da468ed49a7b Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these. Matthew Wild <mwild1@gmail.com> parents: 70 diff changeset	369 for _, child in ipairs(stanza) do
da468ed49a7b Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these. Matthew Wild <mwild1@gmail.com> parents: 70 diff changeset	370 if type(child) == "table" then
91 6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	371 deserialize(child);
90 da468ed49a7b Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these. Matthew Wild <mwild1@gmail.com> parents: 70 diff changeset	372 end
da468ed49a7b Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these. Matthew Wild <mwild1@gmail.com> parents: 70 diff changeset	373 end
91 6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	374 if not stanza.tags then
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	375 -- Rebuild tags
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	376 local tags = {};
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	377 for _, child in ipairs(stanza) do
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	378 if type(child) == "table" then
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	379 t_insert(tags, child);
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	380 end
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	381 end
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	382 stanza.tags = tags;
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	383 end
90 da468ed49a7b Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these. Matthew Wild <mwild1@gmail.com> parents: 70 diff changeset	384 end
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5435 diff changeset	385
90 da468ed49a7b Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these. Matthew Wild <mwild1@gmail.com> parents: 70 diff changeset	386 return stanza;
da468ed49a7b Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these. Matthew Wild <mwild1@gmail.com> parents: 70 diff changeset	387 end
da468ed49a7b Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these. Matthew Wild <mwild1@gmail.com> parents: 70 diff changeset	388
6777 5de6b93d0190 util.: Remove use of module() function, make all module functions local and return them in a table at the end Kim Alvefur <zash@zash.se>* parents: 6501 diff changeset	389 local function clone(stanza)
4179 aa07a381e5a6 util.stanza: Rewrite clone() to be more optimized. Waqas Hussain <waqas20@gmail.com> parents: 4168 diff changeset	390 local attr, tags = {}, {};
aa07a381e5a6 util.stanza: Rewrite clone() to be more optimized. Waqas Hussain <waqas20@gmail.com> parents: 4168 diff changeset	391 for k,v in pairs(stanza.attr) do attr[k] = v; end
6978 30c96a5db360 util.stanza, util.xml, util.xmppstream: Add support for tracking defined namespaces and their prefix (stanza.namespaces), knowing/preserving prefix names is required for some applications (thanks daurnimator) Matthew Wild <mwild1@gmail.com> parents: 6821 diff changeset	392 local old_namespaces, namespaces = stanza.namespaces;
30c96a5db360 util.stanza, util.xml, util.xmppstream: Add support for tracking defined namespaces and their prefix (stanza.namespaces), knowing/preserving prefix names is required for some applications (thanks daurnimator) Matthew Wild <mwild1@gmail.com> parents: 6821 diff changeset	393 if old_namespaces then
30c96a5db360 util.stanza, util.xml, util.xmppstream: Add support for tracking defined namespaces and their prefix (stanza.namespaces), knowing/preserving prefix names is required for some applications (thanks daurnimator) Matthew Wild <mwild1@gmail.com> parents: 6821 diff changeset	394 namespaces = {};
30c96a5db360 util.stanza, util.xml, util.xmppstream: Add support for tracking defined namespaces and their prefix (stanza.namespaces), knowing/preserving prefix names is required for some applications (thanks daurnimator) Matthew Wild <mwild1@gmail.com> parents: 6821 diff changeset	395 for k,v in pairs(old_namespaces) do namespaces[k] = v; end
30c96a5db360 util.stanza, util.xml, util.xmppstream: Add support for tracking defined namespaces and their prefix (stanza.namespaces), knowing/preserving prefix names is required for some applications (thanks daurnimator) Matthew Wild <mwild1@gmail.com> parents: 6821 diff changeset	396 end
30c96a5db360 util.stanza, util.xml, util.xmppstream: Add support for tracking defined namespaces and their prefix (stanza.namespaces), knowing/preserving prefix names is required for some applications (thanks daurnimator) Matthew Wild <mwild1@gmail.com> parents: 6821 diff changeset	397 local new = { name = stanza.name, attr = attr, namespaces = namespaces, tags = tags };
4179 aa07a381e5a6 util.stanza: Rewrite clone() to be more optimized. Waqas Hussain <waqas20@gmail.com> parents: 4168 diff changeset	398 for i=1,#stanza do
aa07a381e5a6 util.stanza: Rewrite clone() to be more optimized. Waqas Hussain <waqas20@gmail.com> parents: 4168 diff changeset	399 local child = stanza[i];
aa07a381e5a6 util.stanza: Rewrite clone() to be more optimized. Waqas Hussain <waqas20@gmail.com> parents: 4168 diff changeset	400 if child.name then
6777 5de6b93d0190 util.: Remove use of module() function, make all module functions local and return them in a table at the end Kim Alvefur <zash@zash.se>* parents: 6501 diff changeset	401 child = clone(child);
4179 aa07a381e5a6 util.stanza: Rewrite clone() to be more optimized. Waqas Hussain <waqas20@gmail.com> parents: 4168 diff changeset	402 t_insert(tags, child);
1517 22be7637a64d util.stanza: Convert spaces to tabs Matthew Wild <mwild1@gmail.com> parents: 1431 diff changeset	403 end
4179 aa07a381e5a6 util.stanza: Rewrite clone() to be more optimized. Waqas Hussain <waqas20@gmail.com> parents: 4168 diff changeset	404 t_insert(new, child);
1517 22be7637a64d util.stanza: Convert spaces to tabs Matthew Wild <mwild1@gmail.com> parents: 1431 diff changeset	405 end
4179 aa07a381e5a6 util.stanza: Rewrite clone() to be more optimized. Waqas Hussain <waqas20@gmail.com> parents: 4168 diff changeset	406 return setmetatable(new, stanza_mt);
829 b01fd698495e util/stanza: Added clone function Waqas Hussain <waqas20@gmail.com> parents: 776 diff changeset	407 end
b01fd698495e util/stanza: Added clone function Waqas Hussain <waqas20@gmail.com> parents: 776 diff changeset	408
6777 5de6b93d0190 util.: Remove use of module() function, make all module functions local and return them in a table at the end Kim Alvefur <zash@zash.se>* parents: 6501 diff changeset	409 local function message(attr, body)
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	410 if not body then
7253 f4e71242556a util.stanza: Some code cleanup [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6821 diff changeset	411 return new_stanza("message", attr);
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	412 else
7253 f4e71242556a util.stanza: Some code cleanup [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6821 diff changeset	413 return new_stanza("message", attr):tag("body"):text(body):up();
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	414 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	415 end
6777 5de6b93d0190 util.: Remove use of module() function, make all module functions local and return them in a table at the end Kim Alvefur <zash@zash.se>* parents: 6501 diff changeset	416 local function iq(attr)
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	417 if attr and not attr.id then attr.id = new_id(); end
7253 f4e71242556a util.stanza: Some code cleanup [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6821 diff changeset	418 return new_stanza("iq", attr or { id = new_id() });
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	419 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	420
6777 5de6b93d0190 util.: Remove use of module() function, make all module functions local and return them in a table at the end Kim Alvefur <zash@zash.se>* parents: 6501 diff changeset	421 local function reply(orig)
8382 e5d00bf4a4d5 util: Various minor changes to please [luacheck] Kim Alvefur <zash@zash.se> parents: 7758 diff changeset	422 return new_stanza(orig.name,
e5d00bf4a4d5 util: Various minor changes to please [luacheck] Kim Alvefur <zash@zash.se> parents: 7758 diff changeset	423 orig.attr and {
e5d00bf4a4d5 util: Various minor changes to please [luacheck] Kim Alvefur <zash@zash.se> parents: 7758 diff changeset	424 to = orig.attr.from,
e5d00bf4a4d5 util: Various minor changes to please [luacheck] Kim Alvefur <zash@zash.se> parents: 7758 diff changeset	425 from = orig.attr.to,
e5d00bf4a4d5 util: Various minor changes to please [luacheck] Kim Alvefur <zash@zash.se> parents: 7758 diff changeset	426 id = orig.attr.id,
e5d00bf4a4d5 util: Various minor changes to please [luacheck] Kim Alvefur <zash@zash.se> parents: 7758 diff changeset	427 type = ((orig.name == "iq" and "result") or orig.attr.type)
e5d00bf4a4d5 util: Various minor changes to please [luacheck] Kim Alvefur <zash@zash.se> parents: 7758 diff changeset	428 });
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	429 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	430
6777 5de6b93d0190 util.: Remove use of module() function, make all module functions local and return them in a table at the end Kim Alvefur <zash@zash.se>* parents: 6501 diff changeset	431 local xmpp_stanzas_attr = { xmlns = xmlns_stanzas };
7253 f4e71242556a util.stanza: Some code cleanup [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6821 diff changeset	432 local function error_reply(orig, error_type, condition, error_message)
6777 5de6b93d0190 util.: Remove use of module() function, make all module functions local and return them in a table at the end Kim Alvefur <zash@zash.se>* parents: 6501 diff changeset	433 local t = reply(orig);
5de6b93d0190 util.: Remove use of module() function, make all module functions local and return them in a table at the end Kim Alvefur <zash@zash.se>* parents: 6501 diff changeset	434 t.attr.type = "error";
7253 f4e71242556a util.stanza: Some code cleanup [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6821 diff changeset	435 t:tag("error", {type = error_type}) --COMPAT: Some day xmlns:stanzas goes here
6777 5de6b93d0190 util.: Remove use of module() function, make all module functions local and return them in a table at the end Kim Alvefur <zash@zash.se>* parents: 6501 diff changeset	436 :tag(condition, xmpp_stanzas_attr):up();
7253 f4e71242556a util.stanza: Some code cleanup [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6821 diff changeset	437 if error_message then t:tag("text", xmpp_stanzas_attr):text(error_message):up(); end
6777 5de6b93d0190 util.: Remove use of module() function, make all module functions local and return them in a table at the end Kim Alvefur <zash@zash.se>* parents: 6501 diff changeset	438 return t; -- stanza ready for adding app-specific errors
60 44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: 30 diff changeset	439 end
44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: 30 diff changeset	440
6777 5de6b93d0190 util.: Remove use of module() function, make all module functions local and return them in a table at the end Kim Alvefur <zash@zash.se>* parents: 6501 diff changeset	441 local function presence(attr)
7253 f4e71242556a util.stanza: Some code cleanup [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6821 diff changeset	442 return new_stanza("presence", attr);
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	443 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	444
262 8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	445 if do_pretty_printing then
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	446 local style_attrk = getstyle("yellow");
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	447 local style_attrv = getstyle("red");
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	448 local style_tagname = getstyle("red");
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	449 local style_punc = getstyle("magenta");
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5435 diff changeset	450
262 8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	451 local attr_format = " "..getstring(style_attrk, "%s")..getstring(style_punc, "=")..getstring(style_attrv, "'%s'");
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	452 local top_tag_format = getstring(style_punc, "<")..getstring(style_tagname, "%s").."%s"..getstring(style_punc, ">");
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	453 --local tag_format = getstring(style_punc, "<")..getstring(style_tagname, "%s").."%s"..getstring(style_punc, ">").."%s"..getstring(style_punc, "</")..getstring(style_tagname, "%s")..getstring(style_punc, ">");
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	454 local tag_format = top_tag_format.."%s"..getstring(style_punc, "</")..getstring(style_tagname, "%s")..getstring(style_punc, ">");
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	455 function stanza_mt.pretty_print(t)
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	456 local children_text = "";
7253 f4e71242556a util.stanza: Some code cleanup [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6821 diff changeset	457 for _, child in ipairs(t) do
2482 a1570e371258 util.stanza: Trailing whitespace Matthew Wild <mwild1@gmail.com> parents: 2264 diff changeset	458 if type(child) == "string" then
262 8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	459 children_text = children_text .. xml_escape(child);
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	460 else
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	461 children_text = children_text .. child:pretty_print();
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	462 end
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	463 end
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	464
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	465 local attr_string = "";
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	466 if t.attr then
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	467 for k, v in pairs(t.attr) do if type(k) == "string" then attr_string = attr_string .. s_format(attr_format, k, tostring(v)); end end
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	468 end
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	469 return s_format(tag_format, t.name, attr_string, children_text, t.name);
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	470 end
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5435 diff changeset	471
262 8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	472 function stanza_mt.pretty_top_tag(t)
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	473 local attr_string = "";
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	474 if t.attr then
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	475 for k, v in pairs(t.attr) do if type(k) == "string" then attr_string = attr_string .. s_format(attr_format, k, tostring(v)); end end
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	476 end
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	477 return s_format(top_tag_format, t.name, attr_string);
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	478 end
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	479 else
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	480 -- Sorry, fresh out of colours for you guys ;)
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	481 stanza_mt.pretty_print = stanza_mt.__tostring;
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	482 stanza_mt.pretty_top_tag = stanza_mt.top_tag;
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	483 end
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	484
6777 5de6b93d0190 util.: Remove use of module() function, make all module functions local and return them in a table at the end Kim Alvefur <zash@zash.se>* parents: 6501 diff changeset	485 return {
5de6b93d0190 util.: Remove use of module() function, make all module functions local and return them in a table at the end Kim Alvefur <zash@zash.se>* parents: 6501 diff changeset	486 stanza_mt = stanza_mt;
7253 f4e71242556a util.stanza: Some code cleanup [luacheck] Matthew Wild <mwild1@gmail.com> parents: 6821 diff changeset	487 stanza = new_stanza;
7750 e58524240b30 util.stanza: Add an is_stanza() function to check if an object is a stanza Kim Alvefur <zash@zash.se> parents: 7253 diff changeset	488 is_stanza = is_stanza;
6777 5de6b93d0190 util.: Remove use of module() function, make all module functions local and return them in a table at the end Kim Alvefur <zash@zash.se>* parents: 6501 diff changeset	489 new_id = new_id;
5de6b93d0190 util.: Remove use of module() function, make all module functions local and return them in a table at the end Kim Alvefur <zash@zash.se>* parents: 6501 diff changeset	490 preserialize = preserialize;
5de6b93d0190 util.: Remove use of module() function, make all module functions local and return them in a table at the end Kim Alvefur <zash@zash.se>* parents: 6501 diff changeset	491 deserialize = deserialize;
5de6b93d0190 util.: Remove use of module() function, make all module functions local and return them in a table at the end Kim Alvefur <zash@zash.se>* parents: 6501 diff changeset	492 clone = clone;
5de6b93d0190 util.: Remove use of module() function, make all module functions local and return them in a table at the end Kim Alvefur <zash@zash.se>* parents: 6501 diff changeset	493 message = message;
5de6b93d0190 util.: Remove use of module() function, make all module functions local and return them in a table at the end Kim Alvefur <zash@zash.se>* parents: 6501 diff changeset	494 iq = iq;
5de6b93d0190 util.: Remove use of module() function, make all module functions local and return them in a table at the end Kim Alvefur <zash@zash.se>* parents: 6501 diff changeset	495 reply = reply;
5de6b93d0190 util.: Remove use of module() function, make all module functions local and return them in a table at the end Kim Alvefur <zash@zash.se>* parents: 6501 diff changeset	496 error_reply = error_reply;
5de6b93d0190 util.: Remove use of module() function, make all module functions local and return them in a table at the end Kim Alvefur <zash@zash.se>* parents: 6501 diff changeset	497 presence = presence;
6821 5de30376bf98 util.stanza: Export xml_escape (missed during removal of module() calls) Kim Alvefur <zash@zash.se> parents: 6777 diff changeset	498 xml_escape = xml_escape;
6777 5de6b93d0190 util.: Remove use of module() function, make all module functions local and return them in a table at the end Kim Alvefur <zash@zash.se>* parents: 6501 diff changeset	499 };

prosody

ecb5e13d97bb

util/stanza.lua

Software / code / prosody

Annotate

util/stanza.lua @ 8942:ecb5e13d97bb

Software `/` code `/` prosody