prosody
726b088f9408
util/stanza.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Annotate

util/stanza.lua @ 7460:726b088f9408

Merge 0.9->0.10
author Kim Alvefur <zash@zash.se>
date Fri, 24 Jun 2016 15:11:06 +0200
parent 7253:f4e71242556a
child 7256:9fbb9fbf7e52
child 7750:e58524240b30
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
10 local t_insert = table.insert;
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
11 local t_remove = table.remove;
613
6c09127b50fb New, faster, stanza serialization
Matthew Wild <mwild1@gmail.com>
parents: 519
diff changeset
12 local t_concat = table.concat;
23
236375777f8c Some docs written by Thorns. Need reviewing.
bt@silverblade
parents: 6
diff changeset
13 local s_format = string.format;
829
b01fd698495e util/stanza: Added clone function
Waqas Hussain <waqas20@gmail.com>
parents: 776
diff changeset
14 local s_match = string.match;
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
15 local tostring = tostring;
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
16 local setmetatable = setmetatable;
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
17 local pairs = pairs;
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
18 local ipairs = ipairs;
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
19 local type = type;
4
09c3845ed442 Presence unavailable on disconnect
matthew
parents: 2
diff changeset
20 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
21 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
22 local s_find = string.find;
613
6c09127b50fb New, faster, stanza serialization
Matthew Wild <mwild1@gmail.com>
parents: 519
diff changeset
23 local os = os;
145
fbb3a4ff9cf1 dialback keys now verified
Matthew Wild <mwild1@gmail.com>
parents: 91
diff changeset
24
262
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
25 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
26 local getstyle, getstring;
af8cdbb63b13 util.stanza: Soften dependency on util.termcolours
Matthew Wild <mwild1@gmail.com>
parents: 1931
diff changeset
27 if do_pretty_printing then
af8cdbb63b13 util.stanza: Soften dependency on util.termcolours
Matthew Wild <mwild1@gmail.com>
parents: 1931
diff changeset
28 local ok, termcolours = pcall(require, "util.termcolours");
af8cdbb63b13 util.stanza: Soften dependency on util.termcolours
Matthew Wild <mwild1@gmail.com>
parents: 1931
diff changeset
29 if ok then
af8cdbb63b13 util.stanza: Soften dependency on util.termcolours
Matthew Wild <mwild1@gmail.com>
parents: 1931
diff changeset
30 getstyle, getstring = termcolours.getstyle, termcolours.getstring;
af8cdbb63b13 util.stanza: Soften dependency on util.termcolours
Matthew Wild <mwild1@gmail.com>
parents: 1931
diff changeset
31 else
af8cdbb63b13 util.stanza: Soften dependency on util.termcolours
Matthew Wild <mwild1@gmail.com>
parents: 1931
diff changeset
32 do_pretty_printing = nil;
af8cdbb63b13 util.stanza: Soften dependency on util.termcolours
Matthew Wild <mwild1@gmail.com>
parents: 1931
diff changeset
33 end
af8cdbb63b13 util.stanza: Soften dependency on util.termcolours
Matthew Wild <mwild1@gmail.com>
parents: 1931
diff changeset
34 end
262
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
35
2955
f807dc244a5b util.stanza: Fixed a nil global access.
Waqas Hussain <waqas20@gmail.com>
parents: 2923
diff changeset
36 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
37
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
38 local _ENV = nil;
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
39
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
40 local stanza_mt = { __type = "stanza" };
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
41 stanza_mt.__index = stanza_mt;
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
42
7253
f4e71242556a util.stanza: Some code cleanup [luacheck]
Matthew Wild <mwild1@gmail.com>
parents: 6821
diff changeset
43 local function new_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
44 local stanza = { name = name, attr = attr or {}, tags = {} };
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
45 return setmetatable(stanza, stanza_mt);
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
46 end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
47
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
48 function stanza_mt:query(xmlns)
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
49 return self:tag("query", { xmlns = xmlns });
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
50 end
373
dd0345edeaf4 Add helper function for adding message bodies to stanzas
Matthew Wild <mwild1@gmail.com>
parents: 338
diff changeset
51
dd0345edeaf4 Add helper function for adding message bodies to stanzas
Matthew Wild <mwild1@gmail.com>
parents: 338
diff changeset
52 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
53 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
54 end
dd0345edeaf4 Add helper function for adding message bodies to stanzas
Matthew Wild <mwild1@gmail.com>
parents: 338
diff changeset
55
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
56 function stanza_mt:tag(name, attrs)
7253
f4e71242556a util.stanza: Some code cleanup [luacheck]
Matthew Wild <mwild1@gmail.com>
parents: 6821
diff changeset
57 local s = new_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
58 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
59 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
60 (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
61 t_insert(last_add, s);
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
62 return self;
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
63 end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
64
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
65 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
66 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
67 (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
68 return self;
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
69 end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
70
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
71 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
72 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
73 if last_add then t_remove(last_add); end
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
74 return self;
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
75 end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
76
964
3296db2ad4a0 util.stanza: stanza:reset() method to reset building state
Matthew Wild <mwild1@gmail.com>
parents: 896
diff changeset
77 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
78 self.last_add = nil;
964
3296db2ad4a0 util.stanza: stanza:reset() method to reset building state
Matthew Wild <mwild1@gmail.com>
parents: 896
diff changeset
79 return self;
3296db2ad4a0 util.stanza: stanza:reset() method to reset building state
Matthew Wild <mwild1@gmail.com>
parents: 896
diff changeset
80 end
3296db2ad4a0 util.stanza: stanza:reset() method to reset building state
Matthew Wild <mwild1@gmail.com>
parents: 896
diff changeset
81
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
82 function stanza_mt:add_direct_child(child)
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
83 if type(child) == "table" then
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
84 t_insert(self.tags, child);
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
85 end
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
86 t_insert(self, child);
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
87 end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
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_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
90 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
91 (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
92 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
93 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
94
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
95 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
96 for _, child in ipairs(self.tags) do
2482
a1570e371258 util.stanza: Trailing whitespace
Matthew Wild <mwild1@gmail.com>
parents: 2264
diff changeset
97 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
98 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
99 or child.attr.xmlns == xmlns) then
5776
bd0ff8ae98a8 Remove all trailing whitespace
Florian Zeitz <florob@babelmonkeys.de>
parents: 5435
diff changeset
100
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
101 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
102 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
103 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
104 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
105
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
106 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
107 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
108 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
109 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
110 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
111 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
112 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
113
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
114 function stanza_mt:child_with_name(name)
2482
a1570e371258 util.stanza: Trailing whitespace
Matthew Wild <mwild1@gmail.com>
parents: 2264
diff changeset
115 for _, child in ipairs(self.tags) do
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
116 if child.name == name then return child; end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
117 end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
118 end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
119
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
120 function stanza_mt:child_with_ns(ns)
2482
a1570e371258 util.stanza: Trailing whitespace
Matthew Wild <mwild1@gmail.com>
parents: 2264
diff changeset
121 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
122 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
123 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
124 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
125
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
126 function stanza_mt:children()
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
127 local i = 0;
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
128 return function (a)
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
129 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
130 return a[i];
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
131 end, self, i;
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
132 end
3474
730876bbe4e6 util.stanza: Add stanza:matched_children(name, xmlns) [name suggestions welcome]
Matthew Wild <mwild1@gmail.com>
parents: 2961
diff changeset
133
4168
4919831b5b56 util.stanza: Clean up matching_tags() and replace :childtags() with it
Matthew Wild <mwild1@gmail.com>
parents: 4136
diff changeset
134 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
135 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
136 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
137 return function ()
4168
4919831b5b56 util.stanza: Clean up matching_tags() and replace :childtags() with it
Matthew Wild <mwild1@gmail.com>
parents: 4136
diff changeset
138 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
139 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
140 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
141 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
142 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
143 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
144 return v;
3474
730876bbe4e6 util.stanza: Add stanza:matched_children(name, xmlns) [name suggestions welcome]
Matthew Wild <mwild1@gmail.com>
parents: 2961
diff changeset
145 end
4168
4919831b5b56 util.stanza: Clean up matching_tags() and replace :childtags() with it
Matthew Wild <mwild1@gmail.com>
parents: 4136
diff changeset
146 end
4919831b5b56 util.stanza: Clean up matching_tags() and replace :childtags() with it
Matthew Wild <mwild1@gmail.com>
parents: 4136
diff changeset
147 end;
2
9bb397205f26 Working presence!
matthew
parents: 1
diff changeset
148 end
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
149
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
150 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
151 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
152 local n_children, n_tags = #self, #tags;
5776
bd0ff8ae98a8 Remove all trailing whitespace
Florian Zeitz <florob@babelmonkeys.de>
parents: 5435
diff changeset
153
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
154 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
155 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
156 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
157 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
158 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
159 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
160 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
161 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
162 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
163 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
164 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
165 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
166 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
167 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
168 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
169 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
170 end
5414
efec29eb4cdd util.stanza: :maptags(): Fixes to make loop more robust on item removal
Matthew Wild <mwild1@gmail.com>
parents: 5090
diff changeset
171 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
172 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
173 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
174 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
175
5424
7318527c6dea util.stanza: Add stanza:find(), a light weight XPath-like method
Kim Alvefur <zash@zash.se>
parents: 5414
diff changeset
176 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
177 local pos = 1;
7318527c6dea util.stanza: Add stanza:find(), a light weight XPath-like method
Kim Alvefur <zash@zash.se>
parents: 5414
diff changeset
178 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
179
7318527c6dea util.stanza: Add stanza:find(), a light weight XPath-like method
Kim Alvefur <zash@zash.se>
parents: 5414
diff changeset
180 repeat
7318527c6dea util.stanza: Add stanza:find(), a light weight XPath-like method
Kim Alvefur <zash@zash.se>
parents: 5414
diff changeset
181 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
182 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
183 if char == "@" then
7318527c6dea util.stanza: Add stanza:find(), a light weight XPath-like method
Kim Alvefur <zash@zash.se>
parents: 5414
diff changeset
184 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
185 elseif char == "{" then
7318527c6dea util.stanza: Add stanza:find(), a light weight XPath-like method
Kim Alvefur <zash@zash.se>
parents: 5414
diff changeset
186 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
187 end
7318527c6dea util.stanza: Add stanza:find(), a light weight XPath-like method
Kim Alvefur <zash@zash.se>
parents: 5414
diff changeset
188 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
189 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
190 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
191 if text == "#" then
7318527c6dea util.stanza: Add stanza:find(), a light weight XPath-like method
Kim Alvefur <zash@zash.se>
parents: 5414
diff changeset
192 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
193 end
7318527c6dea util.stanza: Add stanza:find(), a light weight XPath-like method
Kim Alvefur <zash@zash.se>
parents: 5414
diff changeset
194 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
195 end
7318527c6dea util.stanza: Add stanza:find(), a light weight XPath-like method
Kim Alvefur <zash@zash.se>
parents: 5414
diff changeset
196 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
197 until not self
7318527c6dea util.stanza: Add stanza:find(), a light weight XPath-like method
Kim Alvefur <zash@zash.se>
parents: 5414
diff changeset
198 end
7318527c6dea util.stanza: Add stanza:find(), a light weight XPath-like method
Kim Alvefur <zash@zash.se>
parents: 5414
diff changeset
199
7318527c6dea util.stanza: Add stanza:find(), a light weight XPath-like method
Kim Alvefur <zash@zash.se>
parents: 5414
diff changeset
200
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
201 local escape_table = { ["'"] = "&apos;", ["\""] = "&quot;", ["<"] = "&lt;", [">"] = "&gt;", ["&"] = "&amp;" };
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
202 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
203
7253
f4e71242556a util.stanza: Some code cleanup [luacheck]
Matthew Wild <mwild1@gmail.com>
parents: 6821
diff changeset
204 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
205 local nsid = 0;
9fe9ba693f4a util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents: 1420
diff changeset
206 local name = t.name
9fe9ba693f4a util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents: 1420
diff changeset
207 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
208 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
209 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
210 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
211 nsid = nsid + 1;
7253
f4e71242556a util.stanza: Some code cleanup [luacheck]
Matthew Wild <mwild1@gmail.com>
parents: 6821
diff changeset
212 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
213 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
214 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
215 end
1416
f916f0ff90e5 util.stanza: Rewrote stanza_mt.__tostring. 20-30% faster stanza serialization. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents: 1415
diff changeset
216 end
1431
9fe9ba693f4a util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents: 1420
diff changeset
217 local len = #t;
9fe9ba693f4a util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents: 1420
diff changeset
218 if len == 0 then
9fe9ba693f4a util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents: 1420
diff changeset
219 t_insert(buf, "/>");
9fe9ba693f4a util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents: 1420
diff changeset
220 else
9fe9ba693f4a util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents: 1420
diff changeset
221 t_insert(buf, ">");
9fe9ba693f4a util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents: 1420
diff changeset
222 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
223 local child = t[n];
9fe9ba693f4a util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents: 1420
diff changeset
224 if child.name then
7253
f4e71242556a util.stanza: Some code cleanup [luacheck]
Matthew Wild <mwild1@gmail.com>
parents: 6821
diff changeset
225 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
226 else
7253
f4e71242556a util.stanza: Some code cleanup [luacheck]
Matthew Wild <mwild1@gmail.com>
parents: 6821
diff changeset
227 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
228 end
4
09c3845ed442 Presence unavailable on disconnect
matthew
parents: 2
diff changeset
229 end
1431
9fe9ba693f4a util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents: 1420
diff changeset
230 t_insert(buf, "</"..name..">");
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
231 end
626
cf1d26fd4d6f Optimized stanza_mt.__tostring (called when doing tostring(stanza))
Waqas Hussain <waqas20@gmail.com>
parents: 519
diff changeset
232 end
cf1d26fd4d6f Optimized stanza_mt.__tostring (called when doing tostring(stanza))
Waqas Hussain <waqas20@gmail.com>
parents: 519
diff changeset
233 function stanza_mt.__tostring(t)
cf1d26fd4d6f Optimized stanza_mt.__tostring (called when doing tostring(stanza))
Waqas Hussain <waqas20@gmail.com>
parents: 519
diff changeset
234 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
235 _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
236 return t_concat(buf);
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
237 end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
238
242
f15afbcbc55c Add new top_tag() method to stanzas
Matthew Wild <mwild1@gmail.com>
parents: 209
diff changeset
239 function stanza_mt.top_tag(t)
f15afbcbc55c Add new top_tag() method to stanzas
Matthew Wild <mwild1@gmail.com>
parents: 209
diff changeset
240 local attr_string = "";
f15afbcbc55c Add new top_tag() method to stanzas
Matthew Wild <mwild1@gmail.com>
parents: 209
diff changeset
241 if t.attr then
338
804f5e62a41f Don't forget to escape XML in attributes. Thanks to the Postgres Q&amp;A room on conference.jabber.org :)
Matthew Wild <mwild1@gmail.com>
parents: 262
diff changeset
242 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
243 end
f15afbcbc55c Add new top_tag() method to stanzas
Matthew Wild <mwild1@gmail.com>
parents: 209
diff changeset
244 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
245 end
f15afbcbc55c Add new top_tag() method to stanzas
Matthew Wild <mwild1@gmail.com>
parents: 209
diff changeset
246
1420
1576a5aa52f8 util.stanza: Add stanza:get_text() to retrieve all child text nodes #api
Matthew Wild <mwild1@gmail.com>
parents: 1416
diff changeset
247 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
248 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
249 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
250 end
1576a5aa52f8 util.stanza: Add stanza:get_text() to retrieve all child text nodes #api
Matthew Wild <mwild1@gmail.com>
parents: 1416
diff changeset
251 end
1576a5aa52f8 util.stanza: Add stanza:get_text() to retrieve all child text nodes #api
Matthew Wild <mwild1@gmail.com>
parents: 1416
diff changeset
252
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
253 function stanza_mt.get_error(stanza)
7253
f4e71242556a util.stanza: Some code cleanup [luacheck]
Matthew Wild <mwild1@gmail.com>
parents: 6821
diff changeset
254 local error_type, condition, text;
5776
bd0ff8ae98a8 Remove all trailing whitespace
Florian Zeitz <florob@babelmonkeys.de>
parents: 5435
diff changeset
255
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
256 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
257 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
258 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
259 end
7253
f4e71242556a util.stanza: Some code cleanup [luacheck]
Matthew Wild <mwild1@gmail.com>
parents: 6821
diff changeset
260 error_type = error_tag.attr.type;
5776
bd0ff8ae98a8 Remove all trailing whitespace
Florian Zeitz <florob@babelmonkeys.de>
parents: 5435
diff changeset
261
5090
61c7c53c06d5 util.stanza: Use ipairs instead of childtags (behavior changed in 92c86e11fd44)
Kim Alvefur <zash@zash.se>
parents: 4936
diff changeset
262 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
263 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
264 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
265 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
266 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
267 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
268 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
269 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
270 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
271 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
272 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
273 end
7253
f4e71242556a util.stanza: Some code cleanup [luacheck]
Matthew Wild <mwild1@gmail.com>
parents: 6821
diff changeset
274 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
275 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
276
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
277 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
278 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
279 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
280 return "lx"..id;
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
281 end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
282
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
283 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
284 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
285 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
286 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
287 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
288 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
289 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
290 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
291 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
292 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
293 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
294
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
295 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
296 -- Set metatable
91
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents: 90
diff changeset
297 if stanza then
1415
957a81b72cb2 util.stanza: Remove numeric attributes while deserializing
Waqas Hussain <waqas20@gmail.com>
parents: 1151
diff changeset
298 local attr = stanza.attr;
957a81b72cb2 util.stanza: Remove numeric attributes while deserializing
Waqas Hussain <waqas20@gmail.com>
parents: 1151
diff changeset
299 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
300 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
301 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
302 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
303 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
304 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
305 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
306 end
e33658f6052c Changed separator between attribute names and prefixes from '|' to '\1' (optimization and cleanup).
Waqas Hussain <waqas20@gmail.com>
parents: 1984
diff changeset
307 end
e33658f6052c Changed separator between attribute names and prefixes from '|' to '\1' (optimization and cleanup).
Waqas Hussain <waqas20@gmail.com>
parents: 1984
diff changeset
308 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
309 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
310 end
91
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents: 90
diff changeset
311 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
312 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
313 if type(child) == "table" then
91
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents: 90
diff changeset
314 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
315 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
316 end
91
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents: 90
diff changeset
317 if not stanza.tags then
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents: 90
diff changeset
318 -- Rebuild tags
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents: 90
diff changeset
319 local tags = {};
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents: 90
diff changeset
320 for _, child in ipairs(stanza) do
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents: 90
diff changeset
321 if type(child) == "table" then
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents: 90
diff changeset
322 t_insert(tags, child);
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents: 90
diff changeset
323 end
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents: 90
diff changeset
324 end
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents: 90
diff changeset
325 stanza.tags = tags;
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents: 90
diff changeset
326 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
327 end
5776
bd0ff8ae98a8 Remove all trailing whitespace
Florian Zeitz <florob@babelmonkeys.de>
parents: 5435
diff changeset
328
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
329 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
330 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
331
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
332 local function clone(stanza)
4179
aa07a381e5a6 util.stanza: Rewrite clone() to be more optimized.
Waqas Hussain <waqas20@gmail.com>
parents: 4168
diff changeset
333 local attr, tags = {}, {};
aa07a381e5a6 util.stanza: Rewrite clone() to be more optimized.
Waqas Hussain <waqas20@gmail.com>
parents: 4168
diff changeset
334 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
335 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
336 for i=1,#stanza do
aa07a381e5a6 util.stanza: Rewrite clone() to be more optimized.
Waqas Hussain <waqas20@gmail.com>
parents: 4168
diff changeset
337 local child = stanza[i];
aa07a381e5a6 util.stanza: Rewrite clone() to be more optimized.
Waqas Hussain <waqas20@gmail.com>
parents: 4168
diff changeset
338 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
339 child = clone(child);
4179
aa07a381e5a6 util.stanza: Rewrite clone() to be more optimized.
Waqas Hussain <waqas20@gmail.com>
parents: 4168
diff changeset
340 t_insert(tags, child);
1517
22be7637a64d util.stanza: Convert spaces to tabs
Matthew Wild <mwild1@gmail.com>
parents: 1431
diff changeset
341 end
4179
aa07a381e5a6 util.stanza: Rewrite clone() to be more optimized.
Waqas Hussain <waqas20@gmail.com>
parents: 4168
diff changeset
342 t_insert(new, child);
1517
22be7637a64d util.stanza: Convert spaces to tabs
Matthew Wild <mwild1@gmail.com>
parents: 1431
diff changeset
343 end
4179
aa07a381e5a6 util.stanza: Rewrite clone() to be more optimized.
Waqas Hussain <waqas20@gmail.com>
parents: 4168
diff changeset
344 return setmetatable(new, stanza_mt);
829
b01fd698495e util/stanza: Added clone function
Waqas Hussain <waqas20@gmail.com>
parents: 776
diff changeset
345 end
b01fd698495e util/stanza: Added clone function
Waqas Hussain <waqas20@gmail.com>
parents: 776
diff changeset
346
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
347 local function message(attr, body)
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
348 if not body then
7253
f4e71242556a util.stanza: Some code cleanup [luacheck]
Matthew Wild <mwild1@gmail.com>
parents: 6821
diff changeset
349 return new_stanza("message", attr);
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
350 else
7253
f4e71242556a util.stanza: Some code cleanup [luacheck]
Matthew Wild <mwild1@gmail.com>
parents: 6821
diff changeset
351 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
352 end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
353 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
354 local function iq(attr)
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
355 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
356 return new_stanza("iq", attr or { id = new_id() });
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
357 end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
358
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
359 local function reply(orig)
7253
f4e71242556a util.stanza: Some code cleanup [luacheck]
Matthew Wild <mwild1@gmail.com>
parents: 6821
diff changeset
360 return new_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
361 end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
362
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
363 local xmpp_stanzas_attr = { xmlns = xmlns_stanzas };
7253
f4e71242556a util.stanza: Some code cleanup [luacheck]
Matthew Wild <mwild1@gmail.com>
parents: 6821
diff changeset
364 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
365 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
366 t.attr.type = "error";
7253
f4e71242556a util.stanza: Some code cleanup [luacheck]
Matthew Wild <mwild1@gmail.com>
parents: 6821
diff changeset
367 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
368 :tag(condition, xmpp_stanzas_attr):up();
7253
f4e71242556a util.stanza: Some code cleanup [luacheck]
Matthew Wild <mwild1@gmail.com>
parents: 6821
diff changeset
369 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
370 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
371 end
44800be871f5 User registration, etc (jabber:iq:register)
Waqas Hussain <waqas20@gmail.com>
parents: 30
diff changeset
372
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
373 local function presence(attr)
7253
f4e71242556a util.stanza: Some code cleanup [luacheck]
Matthew Wild <mwild1@gmail.com>
parents: 6821
diff changeset
374 return new_stanza("presence", attr);
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
375 end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
376
262
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
377 if do_pretty_printing then
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
378 local style_attrk = getstyle("yellow");
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
379 local style_attrv = getstyle("red");
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
380 local style_tagname = getstyle("red");
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
381 local style_punc = getstyle("magenta");
5776
bd0ff8ae98a8 Remove all trailing whitespace
Florian Zeitz <florob@babelmonkeys.de>
parents: 5435
diff changeset
382
262
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
383 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
384 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
385 --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
386 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
387 function stanza_mt.pretty_print(t)
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
388 local children_text = "";
7253
f4e71242556a util.stanza: Some code cleanup [luacheck]
Matthew Wild <mwild1@gmail.com>
parents: 6821
diff changeset
389 for _, child in ipairs(t) do
2482
a1570e371258 util.stanza: Trailing whitespace
Matthew Wild <mwild1@gmail.com>
parents: 2264
diff changeset
390 if type(child) == "string" then
262
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
391 children_text = children_text .. xml_escape(child);
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
392 else
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
393 children_text = children_text .. child:pretty_print();
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 end
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
396
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
397 local attr_string = "";
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
398 if t.attr then
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
399 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
400 end
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
401 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
402 end
5776
bd0ff8ae98a8 Remove all trailing whitespace
Florian Zeitz <florob@babelmonkeys.de>
parents: 5435
diff changeset
403
262
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
404 function stanza_mt.pretty_top_tag(t)
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
405 local attr_string = "";
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
406 if t.attr then
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
407 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
408 end
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
409 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
410 end
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
411 else
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
412 -- Sorry, fresh out of colours for you guys ;)
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
413 stanza_mt.pretty_print = stanza_mt.__tostring;
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
414 stanza_mt.pretty_top_tag = stanza_mt.top_tag;
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
415 end
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
416
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
417 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
418 stanza_mt = stanza_mt;
7253
f4e71242556a util.stanza: Some code cleanup [luacheck]
Matthew Wild <mwild1@gmail.com>
parents: 6821
diff changeset
419 stanza = new_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
420 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
421 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
422 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
423 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
424 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
425 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
426 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
427 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
428 presence = presence;
6821
5de30376bf98 util.stanza: Export xml_escape (missed during removal of module() calls)
Kim Alvefur <zash@zash.se>
parents: 6777
diff changeset
429 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
430 };