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