Software `/` code `/` prosody

Annotate

util/stanza.lua @ 4432:cbc3224ed3c2

util.ip: Fix in IP range calculation for 172.16.0.0/12

author	Matthew Wild <mwild1@gmail.com>
date	Wed, 30 Nov 2011 17:20:16 +0000
parent	4200:fb487ee690ea
child	4462:2ee422bdafbe

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
519 cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 373 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
1 b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	10 local t_insert = table.insert;
626 cf1d26fd4d6f Optimized stanza_mt.__tostring (called when doing tostring(stanza)) Waqas Hussain <waqas20@gmail.com> parents: 519 diff changeset	11 local t_concat = table.concat;
1 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;
829 b01fd698495e util/stanza: Added clone function Waqas Hussain <waqas20@gmail.com> parents: 776 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;
145 fbb3a4ff9cf1 dialback keys now verified Matthew Wild <mwild1@gmail.com> parents: 91 diff changeset	22 local next = next;
626 cf1d26fd4d6f Optimized stanza_mt.__tostring (called when doing tostring(stanza)) Waqas Hussain <waqas20@gmail.com> parents: 519 diff changeset	23 local print = print;
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	24 local unpack = unpack;
4 09c3845ed442 Presence unavailable on disconnect matthew parents: 2 diff changeset	25 local s_gsub = string.gsub;
1416 f916f0ff90e5 util.stanza: Rewrote stanza_mt.__tostring. 20-30% faster stanza serialization. - #optimization Waqas Hussain <waqas20@gmail.com> parents: 1415 diff changeset	26 local s_char = string.char;
1431 9fe9ba693f4a util.stanza: Serializer optimizations, and nicer output for empty elements Waqas Hussain <waqas20@gmail.com> parents: 1420 diff changeset	27 local s_find = string.find;
613 6c09127b50fb New, faster, stanza serialization Matthew Wild <mwild1@gmail.com> parents: 519 diff changeset	28 local os = os;
145 fbb3a4ff9cf1 dialback keys now verified Matthew Wild <mwild1@gmail.com> parents: 91 diff changeset	29
262 8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	30 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	31 local getstyle, getstring;
af8cdbb63b13 util.stanza: Soften dependency on util.termcolours Matthew Wild <mwild1@gmail.com> parents: 1931 diff changeset	32 if do_pretty_printing then
af8cdbb63b13 util.stanza: Soften dependency on util.termcolours Matthew Wild <mwild1@gmail.com> parents: 1931 diff changeset	33 local ok, termcolours = pcall(require, "util.termcolours");
af8cdbb63b13 util.stanza: Soften dependency on util.termcolours Matthew Wild <mwild1@gmail.com> parents: 1931 diff changeset	34 if ok then
af8cdbb63b13 util.stanza: Soften dependency on util.termcolours Matthew Wild <mwild1@gmail.com> parents: 1931 diff changeset	35 getstyle, getstring = termcolours.getstyle, termcolours.getstring;
af8cdbb63b13 util.stanza: Soften dependency on util.termcolours Matthew Wild <mwild1@gmail.com> parents: 1931 diff changeset	36 else
af8cdbb63b13 util.stanza: Soften dependency on util.termcolours Matthew Wild <mwild1@gmail.com> parents: 1931 diff changeset	37 do_pretty_printing = nil;
af8cdbb63b13 util.stanza: Soften dependency on util.termcolours Matthew Wild <mwild1@gmail.com> parents: 1931 diff changeset	38 end
af8cdbb63b13 util.stanza: Soften dependency on util.termcolours Matthew Wild <mwild1@gmail.com> parents: 1931 diff changeset	39 end
262 8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	40
2955 f807dc244a5b util.stanza: Fixed a nil global access. Waqas Hussain <waqas20@gmail.com> parents: 2923 diff changeset	41 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	42
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	43 module "stanza"
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	44
1874 262ea889016f util.stanza: Add __type to metatable Matthew Wild <mwild1@gmail.com> parents: 1523 diff changeset	45 stanza_mt = { __type = "stanza" };
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	46 stanza_mt.__index = stanza_mt;
4136 19f2830fbe02 util.stanza: Make some globals local, so they don't clutter the global checking script's output. It's also a minor optimization ;) Waqas Hussain <waqas20@gmail.com> parents: 4132 diff changeset	47 local stanza_mt = stanza_mt;
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	48
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	49 function stanza(name, attr)
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	50 local stanza = { name = name, attr = attr or {}, tags = {} };
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	51 return setmetatable(stanza, stanza_mt);
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	52 end
4136 19f2830fbe02 util.stanza: Make some globals local, so they don't clutter the global checking script's output. It's also a minor optimization ;) Waqas Hussain <waqas20@gmail.com> parents: 4132 diff changeset	53 local stanza = stanza;
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	54
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	55 function stanza_mt:query(xmlns)
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	56 return self:tag("query", { xmlns = xmlns });
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	57 end
373 dd0345edeaf4 Add helper function for adding message bodies to stanzas Matthew Wild <mwild1@gmail.com> parents: 338 diff changeset	58
dd0345edeaf4 Add helper function for adding message bodies to stanzas Matthew Wild <mwild1@gmail.com> parents: 338 diff changeset	59 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	60 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	61 end
dd0345edeaf4 Add helper function for adding message bodies to stanzas Matthew Wild <mwild1@gmail.com> parents: 338 diff changeset	62
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	63 function stanza_mt:tag(name, attrs)
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	64 local s = stanza(name, attrs);
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	65 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	66 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	67 (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	68 t_insert(last_add, s);
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	69 return self;
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	70 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	71
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	72 function stanza_mt:text(text)
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	73 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	74 (last_add and last_add[#last_add] or self):add_direct_child(text);
2482 a1570e371258 util.stanza: Trailing whitespace Matthew Wild <mwild1@gmail.com> parents: 2264 diff changeset	75 return self;
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	76 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	77
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	78 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	79 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	80 if last_add then t_remove(last_add); end
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	81 return self;
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	82 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	83
964 3296db2ad4a0 util.stanza: stanza:reset() method to reset building state Matthew Wild <mwild1@gmail.com> parents: 896 diff changeset	84 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	85 self.last_add = nil;
964 3296db2ad4a0 util.stanza: stanza:reset() method to reset building state Matthew Wild <mwild1@gmail.com> parents: 896 diff changeset	86 return self;
3296db2ad4a0 util.stanza: stanza:reset() method to reset building state Matthew Wild <mwild1@gmail.com> parents: 896 diff changeset	87 end
3296db2ad4a0 util.stanza: stanza:reset() method to reset building state Matthew Wild <mwild1@gmail.com> parents: 896 diff changeset	88
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	89 function stanza_mt:add_direct_child(child)
1 b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	90 if type(child) == "table" then
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	91 t_insert(self.tags, child);
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	92 end
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	93 t_insert(self, child);
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	94 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	95
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	96 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	97 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	98 (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	99 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	100 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	101
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	102 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	103 for _, child in ipairs(self.tags) do
2482 a1570e371258 util.stanza: Trailing whitespace Matthew Wild <mwild1@gmail.com> parents: 2264 diff changeset	104 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	105 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	106 or child.attr.xmlns == xmlns) then
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	107
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	108 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	109 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	110 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	111 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	112
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	113 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	114 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	115 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	116 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	117 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	118 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	119 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	120
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	121 function stanza_mt:child_with_name(name)
2482 a1570e371258 util.stanza: Trailing whitespace Matthew Wild <mwild1@gmail.com> parents: 2264 diff changeset	122 for _, child in ipairs(self.tags) do
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	123 if child.name == name then return child; end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	124 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	125 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	126
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	127 function stanza_mt:child_with_ns(ns)
2482 a1570e371258 util.stanza: Trailing whitespace Matthew Wild <mwild1@gmail.com> parents: 2264 diff changeset	128 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	129 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	130 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	131 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	132
1 b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	133 function stanza_mt:children()
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	134 local i = 0;
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	135 return function (a)
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	136 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	137 return a[i];
1 b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	138 end, self, i;
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	139 end
3474 730876bbe4e6 util.stanza: Add stanza:matched_children(name, xmlns) [name suggestions welcome] Matthew Wild <mwild1@gmail.com> parents: 2961 diff changeset	140
4168 4919831b5b56 util.stanza: Clean up matching_tags() and replace :childtags() with it Matthew Wild <mwild1@gmail.com> parents: 4136 diff changeset	141 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	142 xmlns = xmlns or self.attr.xmlns;
730876bbe4e6 util.stanza: Add stanza:matched_children(name, xmlns) [name suggestions welcome] Matthew Wild <mwild1@gmail.com> parents: 2961 diff changeset	143 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	144 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	145 return function ()
4168 4919831b5b56 util.stanza: Clean up matching_tags() and replace :childtags() with it Matthew Wild <mwild1@gmail.com> parents: 4136 diff changeset	146 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	147 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	148 if (not name or v.name == name)
4919831b5b56 util.stanza: Clean up matching_tags() and replace :childtags() with it Matthew Wild <mwild1@gmail.com> parents: 4136 diff changeset	149 and (not xmlns or xmlns == v.attr.xmlns) then
4919831b5b56 util.stanza: Clean up matching_tags() and replace :childtags() with it Matthew Wild <mwild1@gmail.com> parents: 4136 diff changeset	150 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	151 return v;
3474 730876bbe4e6 util.stanza: Add stanza:matched_children(name, xmlns) [name suggestions welcome] Matthew Wild <mwild1@gmail.com> parents: 2961 diff changeset	152 end
4168 4919831b5b56 util.stanza: Clean up matching_tags() and replace :childtags() with it Matthew Wild <mwild1@gmail.com> parents: 4136 diff changeset	153 end
4919831b5b56 util.stanza: Clean up matching_tags() and replace :childtags() with it Matthew Wild <mwild1@gmail.com> parents: 4136 diff changeset	154 end;
2 9bb397205f26 Working presence! matthew parents: 1 diff changeset	155 end
1 b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	156
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	157 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	158 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	159 local n_children, n_tags = #self, #tags;
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	160
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	161 local i = 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	162 while curr_tag <= n_tags do
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	163 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	164 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	165 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	166 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	167 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	168 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	169 n_tags = n_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	170 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	171 self[i] = ret;
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	172 tags[i] = ret;
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	173 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	174 i = i + 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	175 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	176 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	177 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	178 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	179 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	180
1931 f203330eb82e util.stanza: Make xml_escape publicly accessible Matthew Wild <mwild1@gmail.com> parents: 1874 diff changeset	181 local xml_escape
f203330eb82e util.stanza: Make xml_escape publicly accessible Matthew Wild <mwild1@gmail.com> parents: 1874 diff changeset	182 do
1416 f916f0ff90e5 util.stanza: Rewrote stanza_mt.__tostring. 20-30% faster stanza serialization. - #optimization Waqas Hussain <waqas20@gmail.com> parents: 1415 diff changeset	183 local escape_table = { ["'"] = "'", ["\""] = """, ["<"] = "<", [">"] = ">", ["&"] = "&" };
1931 f203330eb82e util.stanza: Make xml_escape publicly accessible Matthew Wild <mwild1@gmail.com> parents: 1874 diff changeset	184 function xml_escape(str) return (s_gsub(str, "['&<>\"]", escape_table)); end
f203330eb82e util.stanza: Make xml_escape publicly accessible Matthew Wild <mwild1@gmail.com> parents: 1874 diff changeset	185 _M.xml_escape = xml_escape;
f203330eb82e util.stanza: Make xml_escape publicly accessible Matthew Wild <mwild1@gmail.com> parents: 1874 diff changeset	186 end
f203330eb82e util.stanza: Make xml_escape publicly accessible Matthew Wild <mwild1@gmail.com> parents: 1874 diff changeset	187
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	188 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	189 local nsid = 0;
9fe9ba693f4a util.stanza: Serializer optimizations, and nicer output for empty elements Waqas Hussain <waqas20@gmail.com> parents: 1420 diff changeset	190 local name = t.name
9fe9ba693f4a util.stanza: Serializer optimizations, and nicer output for empty elements Waqas Hussain <waqas20@gmail.com> parents: 1420 diff changeset	191 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	192 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	193 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	194 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	195 nsid = nsid + 1;
f916f0ff90e5 util.stanza: Rewrote stanza_mt.__tostring. 20-30% faster stanza serialization. - #optimization Waqas Hussain <waqas20@gmail.com> parents: 1415 diff changeset	196 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	197 elseif not(k == "xmlns" and v == parentns) then
1416 f916f0ff90e5 util.stanza: Rewrote stanza_mt.__tostring. 20-30% faster stanza serialization. - #optimization Waqas Hussain <waqas20@gmail.com> parents: 1415 diff changeset	198 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	199 end
1416 f916f0ff90e5 util.stanza: Rewrote stanza_mt.__tostring. 20-30% faster stanza serialization. - #optimization Waqas Hussain <waqas20@gmail.com> parents: 1415 diff changeset	200 end
1431 9fe9ba693f4a util.stanza: Serializer optimizations, and nicer output for empty elements Waqas Hussain <waqas20@gmail.com> parents: 1420 diff changeset	201 local len = #t;
9fe9ba693f4a util.stanza: Serializer optimizations, and nicer output for empty elements Waqas Hussain <waqas20@gmail.com> parents: 1420 diff changeset	202 if len == 0 then
9fe9ba693f4a util.stanza: Serializer optimizations, and nicer output for empty elements Waqas Hussain <waqas20@gmail.com> parents: 1420 diff changeset	203 t_insert(buf, "/>");
9fe9ba693f4a util.stanza: Serializer optimizations, and nicer output for empty elements Waqas Hussain <waqas20@gmail.com> parents: 1420 diff changeset	204 else
9fe9ba693f4a util.stanza: Serializer optimizations, and nicer output for empty elements Waqas Hussain <waqas20@gmail.com> parents: 1420 diff changeset	205 t_insert(buf, ">");
9fe9ba693f4a util.stanza: Serializer optimizations, and nicer output for empty elements Waqas Hussain <waqas20@gmail.com> parents: 1420 diff changeset	206 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	207 local child = t[n];
9fe9ba693f4a util.stanza: Serializer optimizations, and nicer output for empty elements Waqas Hussain <waqas20@gmail.com> parents: 1420 diff changeset	208 if child.name then
2077 e33658f6052c Changed separator between attribute names and prefixes from '\|' to '\1' (optimization and cleanup). Waqas Hussain <waqas20@gmail.com> parents: 1984 diff changeset	209 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	210 else
9fe9ba693f4a util.stanza: Serializer optimizations, and nicer output for empty elements Waqas Hussain <waqas20@gmail.com> parents: 1420 diff changeset	211 t_insert(buf, xml_escape(child));
9fe9ba693f4a util.stanza: Serializer optimizations, and nicer output for empty elements Waqas Hussain <waqas20@gmail.com> parents: 1420 diff changeset	212 end
4 09c3845ed442 Presence unavailable on disconnect matthew parents: 2 diff changeset	213 end
1431 9fe9ba693f4a util.stanza: Serializer optimizations, and nicer output for empty elements Waqas Hussain <waqas20@gmail.com> parents: 1420 diff changeset	214 t_insert(buf, "</"..name..">");
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	215 end
626 cf1d26fd4d6f Optimized stanza_mt.__tostring (called when doing tostring(stanza)) Waqas Hussain <waqas20@gmail.com> parents: 519 diff changeset	216 end
cf1d26fd4d6f Optimized stanza_mt.__tostring (called when doing tostring(stanza)) Waqas Hussain <waqas20@gmail.com> parents: 519 diff changeset	217 function stanza_mt.__tostring(t)
cf1d26fd4d6f Optimized stanza_mt.__tostring (called when doing tostring(stanza)) Waqas Hussain <waqas20@gmail.com> parents: 519 diff changeset	218 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	219 _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	220 return t_concat(buf);
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	221 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	222
242 f15afbcbc55c Add new top_tag() method to stanzas Matthew Wild <mwild1@gmail.com> parents: 209 diff changeset	223 function stanza_mt.top_tag(t)
f15afbcbc55c Add new top_tag() method to stanzas Matthew Wild <mwild1@gmail.com> parents: 209 diff changeset	224 local attr_string = "";
f15afbcbc55c Add new top_tag() method to stanzas Matthew Wild <mwild1@gmail.com> parents: 209 diff changeset	225 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	226 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	227 end
f15afbcbc55c Add new top_tag() method to stanzas Matthew Wild <mwild1@gmail.com> parents: 209 diff changeset	228 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	229 end
f15afbcbc55c Add new top_tag() method to stanzas Matthew Wild <mwild1@gmail.com> parents: 209 diff changeset	230
1420 1576a5aa52f8 util.stanza: Add stanza:get_text() to retrieve all child text nodes #api Matthew Wild <mwild1@gmail.com> parents: 1416 diff changeset	231 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	232 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	233 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	234 end
1576a5aa52f8 util.stanza: Add stanza:get_text() to retrieve all child text nodes #api Matthew Wild <mwild1@gmail.com> parents: 1416 diff changeset	235 end
1576a5aa52f8 util.stanza: Add stanza:get_text() to retrieve all child text nodes #api Matthew Wild <mwild1@gmail.com> parents: 1416 diff changeset	236
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	237 function stanza_mt.get_error(stanza)
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	238 local type, condition, 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	239
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	240 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	241 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	242 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	243 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	244 type = error_tag.attr.type;
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	245
3766 0d7137fee360 util.stanza: Iterate on childtags instead of all childs. Kim Alvefur <zash@zash.se> parents: 3726 diff changeset	246 for child in error_tag:childtags() 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	247 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	248 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	249 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	250 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	251 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	252 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	253 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	254 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	255 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	256 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	257 end
3726 fa516dc2c2de util.stanza: Change get_error() to return nil rather than '' for no text Matthew Wild <mwild1@gmail.com> parents: 3638 diff changeset	258 return 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	259 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	260
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	261 function stanza_mt.__add(s1, s2)
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	262 return s1:add_direct_child(s2);
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	263 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	264
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	265
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	266 do
1517 22be7637a64d util.stanza: Convert spaces to tabs Matthew Wild <mwild1@gmail.com> parents: 1431 diff changeset	267 local id = 0;
22be7637a64d util.stanza: Convert spaces to tabs Matthew Wild <mwild1@gmail.com> parents: 1431 diff changeset	268 function new_id()
22be7637a64d util.stanza: Convert spaces to tabs Matthew Wild <mwild1@gmail.com> parents: 1431 diff changeset	269 id = id + 1;
22be7637a64d util.stanza: Convert spaces to tabs Matthew Wild <mwild1@gmail.com> parents: 1431 diff changeset	270 return "lx"..id;
22be7637a64d util.stanza: Convert spaces to tabs Matthew Wild <mwild1@gmail.com> parents: 1431 diff changeset	271 end
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	272 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	273
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	274 function preserialize(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	275 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	276 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	277 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	278 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	279 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	280 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	281 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	282 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	283 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	284 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	285
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	286 function deserialize(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	287 -- Set metatable
91 6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	288 if stanza then
1415 957a81b72cb2 util.stanza: Remove numeric attributes while deserializing Waqas Hussain <waqas20@gmail.com> parents: 1151 diff changeset	289 local attr = stanza.attr;
957a81b72cb2 util.stanza: Remove numeric attributes while deserializing Waqas Hussain <waqas20@gmail.com> parents: 1151 diff changeset	290 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	291 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	292 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	293 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	294 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	295 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	296 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	297 end
e33658f6052c Changed separator between attribute names and prefixes from '\|' to '\1' (optimization and cleanup). Waqas Hussain <waqas20@gmail.com> parents: 1984 diff changeset	298 end
e33658f6052c Changed separator between attribute names and prefixes from '\|' to '\1' (optimization and cleanup). Waqas Hussain <waqas20@gmail.com> parents: 1984 diff changeset	299 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	300 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	301 end
91 6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	302 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	303 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	304 if type(child) == "table" then
91 6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	305 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	306 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	307 end
91 6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	308 if not stanza.tags then
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	309 -- Rebuild tags
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	310 local tags = {};
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	311 for _, child in ipairs(stanza) do
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	312 if type(child) == "table" then
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	313 t_insert(tags, child);
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	314 end
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	315 end
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	316 stanza.tags = tags;
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	317 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	318 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	319
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	320 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	321 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	322
4179 aa07a381e5a6 util.stanza: Rewrite clone() to be more optimized. Waqas Hussain <waqas20@gmail.com> parents: 4168 diff changeset	323 local function _clone(stanza)
aa07a381e5a6 util.stanza: Rewrite clone() to be more optimized. Waqas Hussain <waqas20@gmail.com> parents: 4168 diff changeset	324 local attr, tags = {}, {};
aa07a381e5a6 util.stanza: Rewrite clone() to be more optimized. Waqas Hussain <waqas20@gmail.com> parents: 4168 diff changeset	325 for k,v in pairs(stanza.attr) do attr[k] = v; end
aa07a381e5a6 util.stanza: Rewrite clone() to be more optimized. Waqas Hussain <waqas20@gmail.com> parents: 4168 diff changeset	326 local new = { name = stanza.name, attr = attr, tags = tags };
aa07a381e5a6 util.stanza: Rewrite clone() to be more optimized. Waqas Hussain <waqas20@gmail.com> parents: 4168 diff changeset	327 for i=1,#stanza do
aa07a381e5a6 util.stanza: Rewrite clone() to be more optimized. Waqas Hussain <waqas20@gmail.com> parents: 4168 diff changeset	328 local child = stanza[i];
aa07a381e5a6 util.stanza: Rewrite clone() to be more optimized. Waqas Hussain <waqas20@gmail.com> parents: 4168 diff changeset	329 if child.name then
aa07a381e5a6 util.stanza: Rewrite clone() to be more optimized. Waqas Hussain <waqas20@gmail.com> parents: 4168 diff changeset	330 child = _clone(child);
aa07a381e5a6 util.stanza: Rewrite clone() to be more optimized. Waqas Hussain <waqas20@gmail.com> parents: 4168 diff changeset	331 t_insert(tags, child);
1517 22be7637a64d util.stanza: Convert spaces to tabs Matthew Wild <mwild1@gmail.com> parents: 1431 diff changeset	332 end
4179 aa07a381e5a6 util.stanza: Rewrite clone() to be more optimized. Waqas Hussain <waqas20@gmail.com> parents: 4168 diff changeset	333 t_insert(new, child);
1517 22be7637a64d util.stanza: Convert spaces to tabs Matthew Wild <mwild1@gmail.com> parents: 1431 diff changeset	334 end
4179 aa07a381e5a6 util.stanza: Rewrite clone() to be more optimized. Waqas Hussain <waqas20@gmail.com> parents: 4168 diff changeset	335 return setmetatable(new, stanza_mt);
829 b01fd698495e util/stanza: Added clone function Waqas Hussain <waqas20@gmail.com> parents: 776 diff changeset	336 end
4179 aa07a381e5a6 util.stanza: Rewrite clone() to be more optimized. Waqas Hussain <waqas20@gmail.com> parents: 4168 diff changeset	337 clone = _clone;
829 b01fd698495e util/stanza: Added clone function Waqas Hussain <waqas20@gmail.com> parents: 776 diff changeset	338
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	339 function message(attr, body)
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	340 if not body then
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	341 return stanza("message", attr);
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	342 else
3502 28887137bb1b util.stanza: Make the current element <message> instead of <body> when body text is passed to st.message(). Waqas Hussain <waqas20@gmail.com> parents: 3478 diff changeset	343 return stanza("message", attr):tag("body"):text(body):up();
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	344 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	345 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	346 function iq(attr)
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	347 if attr and not attr.id then attr.id = new_id(); end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	348 return stanza("iq", attr or { id = new_id() });
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	349 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	350
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	351 function reply(orig)
209 e9de0803676d Part one of internal component support Matthew Wild <mwild1@gmail.com> parents: 181 diff changeset	352 return stanza(orig.name, orig.attr and { to = orig.attr.from, from = orig.attr.to, id = orig.attr.id, type = ((orig.name == "iq" and "result") or orig.attr.type) });
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	353 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	354
2848 b2f367f16eb8 util.stanza: stanza.error_reply(): Fix to put the correct namespace on <text> Matthew Wild <mwild1@gmail.com> parents: 2264 diff changeset	355 do
b2f367f16eb8 util.stanza: stanza.error_reply(): Fix to put the correct namespace on <text> Matthew Wild <mwild1@gmail.com> parents: 2264 diff changeset	356 local xmpp_stanzas_attr = { xmlns = xmlns_stanzas };
b2f367f16eb8 util.stanza: stanza.error_reply(): Fix to put the correct namespace on <text> Matthew Wild <mwild1@gmail.com> parents: 2264 diff changeset	357 function error_reply(orig, type, condition, message)
b2f367f16eb8 util.stanza: stanza.error_reply(): Fix to put the correct namespace on <text> Matthew Wild <mwild1@gmail.com> parents: 2264 diff changeset	358 local t = reply(orig);
b2f367f16eb8 util.stanza: stanza.error_reply(): Fix to put the correct namespace on <text> Matthew Wild <mwild1@gmail.com> parents: 2264 diff changeset	359 t.attr.type = "error";
b2f367f16eb8 util.stanza: stanza.error_reply(): Fix to put the correct namespace on <text> Matthew Wild <mwild1@gmail.com> parents: 2264 diff changeset	360 t:tag("error", {type = type}) --COMPAT: Some day xmlns:stanzas goes here
b2f367f16eb8 util.stanza: stanza.error_reply(): Fix to put the correct namespace on <text> Matthew Wild <mwild1@gmail.com> parents: 2264 diff changeset	361 :tag(condition, xmpp_stanzas_attr):up();
b2f367f16eb8 util.stanza: stanza.error_reply(): Fix to put the correct namespace on <text> Matthew Wild <mwild1@gmail.com> parents: 2264 diff changeset	362 if (message) then t:tag("text", xmpp_stanzas_attr):text(message):up(); end
b2f367f16eb8 util.stanza: stanza.error_reply(): Fix to put the correct namespace on <text> Matthew Wild <mwild1@gmail.com> parents: 2264 diff changeset	363 return t; -- stanza ready for adding app-specific errors
b2f367f16eb8 util.stanza: stanza.error_reply(): Fix to put the correct namespace on <text> Matthew Wild <mwild1@gmail.com> parents: 2264 diff changeset	364 end
60 44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: 30 diff changeset	365 end
44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: 30 diff changeset	366
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	367 function presence(attr)
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	368 return stanza("presence", attr);
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	369 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	370
262 8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	371 if do_pretty_printing then
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	372 local style_attrk = getstyle("yellow");
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	373 local style_attrv = getstyle("red");
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	374 local style_tagname = getstyle("red");
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	375 local style_punc = getstyle("magenta");
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	376
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	377 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	378 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	379 --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	380 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	381 function stanza_mt.pretty_print(t)
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	382 local children_text = "";
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	383 for n, child in ipairs(t) do
2482 a1570e371258 util.stanza: Trailing whitespace Matthew Wild <mwild1@gmail.com> parents: 2264 diff changeset	384 if type(child) == "string" then
262 8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	385 children_text = children_text .. xml_escape(child);
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	386 else
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	387 children_text = children_text .. child:pretty_print();
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	388 end
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	389 end
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	390
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	391 local attr_string = "";
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	392 if t.attr then
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	393 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	394 end
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	395 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	396 end
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	397
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	398 function stanza_mt.pretty_top_tag(t)
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	399 local attr_string = "";
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	400 if t.attr then
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	401 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	402 end
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	403 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	404 end
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	405 else
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	406 -- Sorry, fresh out of colours for you guys ;)
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	407 stanza_mt.pretty_print = stanza_mt.__tostring;
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	408 stanza_mt.pretty_top_tag = stanza_mt.top_tag;
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	409 end
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	410
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	411 return _M;

prosody

cbc3224ed3c2

util/stanza.lua

Software / code / prosody

Annotate

util/stanza.lua @ 4432:cbc3224ed3c2

Software `/` code `/` prosody