prosody
32881d0c359f
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 @ 12671:32881d0c359f

mod_auth_insecure: Store creation and update timestamps on account This ensures that the store is not empty in case no password is provided, so the underlying data storage won't consider the store empty.
author Kim Alvefur <zash@zash.se>
date Thu, 18 Aug 2022 18:10:44 +0200
parent 12636:e8934ce6ea0f
child 12687:5b69ecaf3427
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
8626
20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents: 8599
diff changeset
10 local error = error;
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
11 local t_insert = table.insert;
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
12 local t_remove = table.remove;
613
6c09127b50fb New, faster, stanza serialization
Matthew Wild <mwild1@gmail.com>
parents: 519
diff changeset
13 local t_concat = table.concat;
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;
7750
e58524240b30 util.stanza: Add an is_stanza() function to check if an object is a stanza
Kim Alvefur <zash@zash.se>
parents: 7253
diff changeset
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
09c3845ed442 Presence unavailable on disconnect
matthew
parents: 2
diff changeset
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;
12406
a3ddf3f42212 util.stanza: Use table.move in clone
Kim Alvefur <zash@zash.se>
parents: 12140
diff changeset
24 local t_move = table.move or require "util.table".move;
12407
b6b01724e04f util.stanza: Create tables with correct size to avoid reallocations
Kim Alvefur <zash@zash.se>
parents: 12406
diff changeset
25 local t_create = require"util.table".create;
145
fbb3a4ff9cf1 dialback keys now verified
Matthew Wild <mwild1@gmail.com>
parents: 91
diff changeset
26
8599
62bfc85a53c8 util.stanza: Add stricter validation for data passed to stanza builder API
Matthew Wild <mwild1@gmail.com>
parents: 8555
diff changeset
27 local valid_utf8 = require "util.encodings".utf8.valid;
62bfc85a53c8 util.stanza: Add stricter validation for data passed to stanza builder API
Matthew Wild <mwild1@gmail.com>
parents: 8555
diff changeset
28
11639
ad39528e647d util.stanza: Remove Windows "support" (disabling ANSI color pretty printing)
Kim Alvefur <zash@zash.se>
parents: 11574
diff changeset
29 local do_pretty_printing, termcolours = pcall(require, "util.termcolours");
262
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
30
2955
f807dc244a5b util.stanza: Fixed a nil global access.
Waqas Hussain <waqas20@gmail.com>
parents: 2923
diff changeset
31 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
32
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
33 local _ENV = nil;
8555
4f0f5b49bb03 vairious: Add annotation when an empty environment is set [luacheck]
Kim Alvefur <zash@zash.se>
parents: 8520
diff changeset
34 -- luacheck: std none
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
35
8520
e959bc51de75 util.stanza: Change __type to __name as this is used by Lua 5.3 in some error reporting functions
Kim Alvefur <zash@zash.se>
parents: 8382
diff changeset
36 local stanza_mt = { __name = "stanza" };
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
37 stanza_mt.__index = stanza_mt;
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
38
11205
9d1e21c23784 util.stanza: Reject ASCII control characters (fixes #1606)
Kim Alvefur <zash@zash.se>
parents: 9674
diff changeset
39 local function valid_xml_cdata(str, attr)
9d1e21c23784 util.stanza: Reject ASCII control characters (fixes #1606)
Kim Alvefur <zash@zash.se>
parents: 9674
diff changeset
40 return not s_find(str, attr and "[^\1\9\10\13\20-~\128-\247]" or "[^\9\10\13\20-~\128-\247]");
9d1e21c23784 util.stanza: Reject ASCII control characters (fixes #1606)
Kim Alvefur <zash@zash.se>
parents: 9674
diff changeset
41 end
9d1e21c23784 util.stanza: Reject ASCII control characters (fixes #1606)
Kim Alvefur <zash@zash.se>
parents: 9674
diff changeset
42
8626
20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents: 8599
diff changeset
43 local function check_name(name, name_type)
20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents: 8599
diff changeset
44 if type(name) ~= "string" then
20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents: 8599
diff changeset
45 error("invalid "..name_type.." name: expected string, got "..type(name));
20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents: 8599
diff changeset
46 elseif #name == 0 then
20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents: 8599
diff changeset
47 error("invalid "..name_type.." name: empty string");
20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents: 8599
diff changeset
48 elseif s_find(name, "[<>& '\"]") then
20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents: 8599
diff changeset
49 error("invalid "..name_type.." name: contains invalid characters");
11205
9d1e21c23784 util.stanza: Reject ASCII control characters (fixes #1606)
Kim Alvefur <zash@zash.se>
parents: 9674
diff changeset
50 elseif not valid_xml_cdata(name, name_type == "attribute") then
9d1e21c23784 util.stanza: Reject ASCII control characters (fixes #1606)
Kim Alvefur <zash@zash.se>
parents: 9674
diff changeset
51 error("invalid "..name_type.." name: contains control characters");
8626
20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents: 8599
diff changeset
52 elseif not valid_utf8(name) then
20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents: 8599
diff changeset
53 error("invalid "..name_type.." name: contains invalid utf8");
20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents: 8599
diff changeset
54 end
8599
62bfc85a53c8 util.stanza: Add stricter validation for data passed to stanza builder API
Matthew Wild <mwild1@gmail.com>
parents: 8555
diff changeset
55 end
8626
20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents: 8599
diff changeset
56
20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents: 8599
diff changeset
57 local function check_text(text, text_type)
20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents: 8599
diff changeset
58 if type(text) ~= "string" then
20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents: 8599
diff changeset
59 error("invalid "..text_type.." value: expected string, got "..type(text));
11261
be38ae8fdfa5 util.stanza: Move misplaced argument to correct place
Kim Alvefur <zash@zash.se>
parents: 11205
diff changeset
60 elseif not valid_xml_cdata(text, false) then
11205
9d1e21c23784 util.stanza: Reject ASCII control characters (fixes #1606)
Kim Alvefur <zash@zash.se>
parents: 9674
diff changeset
61 error("invalid "..text_type.." value: contains control characters");
11261
be38ae8fdfa5 util.stanza: Move misplaced argument to correct place
Kim Alvefur <zash@zash.se>
parents: 11205
diff changeset
62 elseif not valid_utf8(text) then
8626
20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents: 8599
diff changeset
63 error("invalid "..text_type.." value: contains invalid utf8");
20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents: 8599
diff changeset
64 end
20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents: 8599
diff changeset
65 end
20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents: 8599
diff changeset
66
8599
62bfc85a53c8 util.stanza: Add stricter validation for data passed to stanza builder API
Matthew Wild <mwild1@gmail.com>
parents: 8555
diff changeset
67 local function check_attr(attr)
62bfc85a53c8 util.stanza: Add stricter validation for data passed to stanza builder API
Matthew Wild <mwild1@gmail.com>
parents: 8555
diff changeset
68 if attr ~= nil then
8626
20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents: 8599
diff changeset
69 if type(attr) ~= "table" then
12138
644ca3583837 util.stanza: Make type error message consistent with others
Kim Alvefur <zash@zash.se>
parents: 11960
diff changeset
70 error("invalid attributes: expected table, got "..type(attr));
8626
20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents: 8599
diff changeset
71 end
8599
62bfc85a53c8 util.stanza: Add stricter validation for data passed to stanza builder API
Matthew Wild <mwild1@gmail.com>
parents: 8555
diff changeset
72 for k, v in pairs(attr) do
8626
20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents: 8599
diff changeset
73 check_name(k, "attribute");
20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents: 8599
diff changeset
74 check_text(v, "attribute");
8599
62bfc85a53c8 util.stanza: Add stricter validation for data passed to stanza builder API
Matthew Wild <mwild1@gmail.com>
parents: 8555
diff changeset
75 end
62bfc85a53c8 util.stanza: Add stricter validation for data passed to stanza builder API
Matthew Wild <mwild1@gmail.com>
parents: 8555
diff changeset
76 end
62bfc85a53c8 util.stanza: Add stricter validation for data passed to stanza builder API
Matthew Wild <mwild1@gmail.com>
parents: 8555
diff changeset
77 end
62bfc85a53c8 util.stanza: Add stricter validation for data passed to stanza builder API
Matthew Wild <mwild1@gmail.com>
parents: 8555
diff changeset
78
7256
9fbb9fbf7e52 Merge 0.10->trunk
Matthew Wild <mwild1@gmail.com>
parents: 6978 7253
diff changeset
79 local function new_stanza(name, attr, namespaces)
8626
20532f191f8d util.stanza: Switch from asserts to if's, improve performance, errors and tests
Matthew Wild <mwild1@gmail.com>
parents: 8599
diff changeset
80 check_name(name, "tag");
8599
62bfc85a53c8 util.stanza: Add stricter validation for data passed to stanza builder API
Matthew Wild <mwild1@gmail.com>
parents: 8555
diff changeset
81 check_attr(attr);
6978
30c96a5db360 util.stanza, util.xml, util.xmppstream: Add support for tracking defined namespaces and their prefix (stanza.namespaces), knowing/preserving prefix names is required for some applications (thanks daurnimator)
Matthew Wild <mwild1@gmail.com>
parents: 6821
diff changeset
82 local stanza = { name = name, attr = attr or {}, namespaces = namespaces, tags = {} };
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
83 return setmetatable(stanza, stanza_mt);
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
84 end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
85
7750
e58524240b30 util.stanza: Add an is_stanza() function to check if an object is a stanza
Kim Alvefur <zash@zash.se>
parents: 7253
diff changeset
86 local function is_stanza(s)
e58524240b30 util.stanza: Add an is_stanza() function to check if an object is a stanza
Kim Alvefur <zash@zash.se>
parents: 7253
diff changeset
87 return getmetatable(s) == stanza_mt;
e58524240b30 util.stanza: Add an is_stanza() function to check if an object is a stanza
Kim Alvefur <zash@zash.se>
parents: 7253
diff changeset
88 end
e58524240b30 util.stanza: Add an is_stanza() function to check if an object is a stanza
Kim Alvefur <zash@zash.se>
parents: 7253
diff changeset
89
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
90 function stanza_mt:query(xmlns)
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
91 return self:tag("query", { xmlns = xmlns });
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
92 end
373
dd0345edeaf4 Add helper function for adding message bodies to stanzas
Matthew Wild <mwild1@gmail.com>
parents: 338
diff changeset
93
dd0345edeaf4 Add helper function for adding message bodies to stanzas
Matthew Wild <mwild1@gmail.com>
parents: 338
diff changeset
94 function stanza_mt:body(text, attr)
10116
4807535b8673 util.stanza: Use :text_tag internally everywhere
Kim Alvefur <zash@zash.se>
parents: 9924
diff changeset
95 return self:text_tag("body", text, attr);
373
dd0345edeaf4 Add helper function for adding message bodies to stanzas
Matthew Wild <mwild1@gmail.com>
parents: 338
diff changeset
96 end
dd0345edeaf4 Add helper function for adding message bodies to stanzas
Matthew Wild <mwild1@gmail.com>
parents: 338
diff changeset
97
8645
06c73b010488 util.stanza: Add :text_tag(), a shortcut for adding nodes with text
Kim Alvefur <zash@zash.se>
parents: 8640
diff changeset
98 function stanza_mt:text_tag(name, text, attr, namespaces)
06c73b010488 util.stanza: Add :text_tag(), a shortcut for adding nodes with text
Kim Alvefur <zash@zash.se>
parents: 8640
diff changeset
99 return self:tag(name, attr, namespaces):text(text):up();
06c73b010488 util.stanza: Add :text_tag(), a shortcut for adding nodes with text
Kim Alvefur <zash@zash.se>
parents: 8640
diff changeset
100 end
06c73b010488 util.stanza: Add :text_tag(), a shortcut for adding nodes with text
Kim Alvefur <zash@zash.se>
parents: 8640
diff changeset
101
6978
30c96a5db360 util.stanza, util.xml, util.xmppstream: Add support for tracking defined namespaces and their prefix (stanza.namespaces), knowing/preserving prefix names is required for some applications (thanks daurnimator)
Matthew Wild <mwild1@gmail.com>
parents: 6821
diff changeset
102 function stanza_mt:tag(name, attr, namespaces)
7256
9fbb9fbf7e52 Merge 0.10->trunk
Matthew Wild <mwild1@gmail.com>
parents: 6978 7253
diff changeset
103 local s = new_stanza(name, attr, namespaces);
3638
6f58a3063c14 util.stanza, util.xmppstream, core.xmlhandlers: Allow stanza.last_add to be nil, and set it nil by default. Saves a table allocation per-element. 20% faster stanza building.
Waqas Hussain <waqas20@gmail.com>
parents: 3502
diff changeset
104 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
105 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
106 (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
107 t_insert(last_add, s);
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
108 return self;
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
109 end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
110
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
111 function stanza_mt:text(text)
8640
8f13ec2ceb06 util.stanza: Allow :text(nil) and :text("") as harmless nops
Matthew Wild <mwild1@gmail.com>
parents: 8626
diff changeset
112 if text ~= nil and text ~= "" then
8f13ec2ceb06 util.stanza: Allow :text(nil) and :text("") as harmless nops
Matthew Wild <mwild1@gmail.com>
parents: 8626
diff changeset
113 local last_add = self.last_add;
8f13ec2ceb06 util.stanza: Allow :text(nil) and :text("") as harmless nops
Matthew Wild <mwild1@gmail.com>
parents: 8626
diff changeset
114 (last_add and last_add[#last_add] or self):add_direct_child(text);
8f13ec2ceb06 util.stanza: Allow :text(nil) and :text("") as harmless nops
Matthew Wild <mwild1@gmail.com>
parents: 8626
diff changeset
115 end
2482
a1570e371258 util.stanza: Trailing whitespace
Matthew Wild <mwild1@gmail.com>
parents: 2264
diff changeset
116 return self;
0
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
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
119 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
120 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
121 if last_add then t_remove(last_add); end
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
122 return self;
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
123 end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
124
11574
21217f7e82b9 util.stanza: add at_top helper
Jonas Schäfer <jonas@wielicki.name>
parents: 11264
diff changeset
125 function stanza_mt:at_top()
21217f7e82b9 util.stanza: add at_top helper
Jonas Schäfer <jonas@wielicki.name>
parents: 11264
diff changeset
126 return self.last_add == nil or #self.last_add == 0
21217f7e82b9 util.stanza: add at_top helper
Jonas Schäfer <jonas@wielicki.name>
parents: 11264
diff changeset
127 end
21217f7e82b9 util.stanza: add at_top helper
Jonas Schäfer <jonas@wielicki.name>
parents: 11264
diff changeset
128
964
3296db2ad4a0 util.stanza: stanza:reset() method to reset building state
Matthew Wild <mwild1@gmail.com>
parents: 896
diff changeset
129 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
130 self.last_add = nil;
964
3296db2ad4a0 util.stanza: stanza:reset() method to reset building state
Matthew Wild <mwild1@gmail.com>
parents: 896
diff changeset
131 return self;
3296db2ad4a0 util.stanza: stanza:reset() method to reset building state
Matthew Wild <mwild1@gmail.com>
parents: 896
diff changeset
132 end
3296db2ad4a0 util.stanza: stanza:reset() method to reset building state
Matthew Wild <mwild1@gmail.com>
parents: 896
diff changeset
133
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
134 function stanza_mt:add_direct_child(child)
8889
c4e430c69f88 util.stanza: Verify that child tags added are really stanzas (closes #1165)
Kim Alvefur <zash@zash.se>
parents: 8645
diff changeset
135 if is_stanza(child) then
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
136 t_insert(self.tags, child);
8890
3490bc478804 util.stanza: Verify that other objects added as children are valid strings
Kim Alvefur <zash@zash.se>
parents: 8889
diff changeset
137 t_insert(self, child);
3490bc478804 util.stanza: Verify that other objects added as children are valid strings
Kim Alvefur <zash@zash.se>
parents: 8889
diff changeset
138 else
3490bc478804 util.stanza: Verify that other objects added as children are valid strings
Kim Alvefur <zash@zash.se>
parents: 8889
diff changeset
139 check_text(child, "text");
3490bc478804 util.stanza: Verify that other objects added as children are valid strings
Kim Alvefur <zash@zash.se>
parents: 8889
diff changeset
140 t_insert(self, child);
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
141 end
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
142 end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
143
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
144 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
145 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
146 (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
147 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
148 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
149
8998
6bddc90eeb27 util.stanza: Add method for removing all children with a specific name, xmlns
Kim Alvefur <zash@zash.se>
parents: 7750
diff changeset
150 function stanza_mt:remove_children(name, xmlns)
6bddc90eeb27 util.stanza: Add method for removing all children with a specific name, xmlns
Kim Alvefur <zash@zash.se>
parents: 7750
diff changeset
151 xmlns = xmlns or self.attr.xmlns;
6bddc90eeb27 util.stanza: Add method for removing all children with a specific name, xmlns
Kim Alvefur <zash@zash.se>
parents: 7750
diff changeset
152 return self:maptags(function (tag)
6bddc90eeb27 util.stanza: Add method for removing all children with a specific name, xmlns
Kim Alvefur <zash@zash.se>
parents: 7750
diff changeset
153 if (not name or tag.name == name) and tag.attr.xmlns == xmlns then
6bddc90eeb27 util.stanza: Add method for removing all children with a specific name, xmlns
Kim Alvefur <zash@zash.se>
parents: 7750
diff changeset
154 return nil;
6bddc90eeb27 util.stanza: Add method for removing all children with a specific name, xmlns
Kim Alvefur <zash@zash.se>
parents: 7750
diff changeset
155 end
6bddc90eeb27 util.stanza: Add method for removing all children with a specific name, xmlns
Kim Alvefur <zash@zash.se>
parents: 7750
diff changeset
156 return tag;
6bddc90eeb27 util.stanza: Add method for removing all children with a specific name, xmlns
Kim Alvefur <zash@zash.se>
parents: 7750
diff changeset
157 end);
6bddc90eeb27 util.stanza: Add method for removing all children with a specific name, xmlns
Kim Alvefur <zash@zash.se>
parents: 7750
diff changeset
158 end
6bddc90eeb27 util.stanza: Add method for removing all children with a specific name, xmlns
Kim Alvefur <zash@zash.se>
parents: 7750
diff changeset
159
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
160 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
161 for _, child in ipairs(self.tags) do
2482
a1570e371258 util.stanza: Trailing whitespace
Matthew Wild <mwild1@gmail.com>
parents: 2264
diff changeset
162 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
163 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
164 or child.attr.xmlns == xmlns) then
5776
bd0ff8ae98a8 Remove all trailing whitespace
Florian Zeitz <florob@babelmonkeys.de>
parents: 5435
diff changeset
165
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
166 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
167 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
168 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
169 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
170
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
171 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
172 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
173 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
174 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
175 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
176 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
177 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
178
12636
e8934ce6ea0f util.stanza: Add method for extracting a single attribute value
Kim Alvefur <zash@zash.se>
parents: 12407
diff changeset
179 function stanza_mt:get_child_attr(name, xmlns, attr)
e8934ce6ea0f util.stanza: Add method for extracting a single attribute value
Kim Alvefur <zash@zash.se>
parents: 12407
diff changeset
180 local tag = self:get_child(name, xmlns);
e8934ce6ea0f util.stanza: Add method for extracting a single attribute value
Kim Alvefur <zash@zash.se>
parents: 12407
diff changeset
181 if tag then
e8934ce6ea0f util.stanza: Add method for extracting a single attribute value
Kim Alvefur <zash@zash.se>
parents: 12407
diff changeset
182 return tag.attr[attr];
e8934ce6ea0f util.stanza: Add method for extracting a single attribute value
Kim Alvefur <zash@zash.se>
parents: 12407
diff changeset
183 end
e8934ce6ea0f util.stanza: Add method for extracting a single attribute value
Kim Alvefur <zash@zash.se>
parents: 12407
diff changeset
184 return nil;
e8934ce6ea0f util.stanza: Add method for extracting a single attribute value
Kim Alvefur <zash@zash.se>
parents: 12407
diff changeset
185 end
e8934ce6ea0f util.stanza: Add method for extracting a single attribute value
Kim Alvefur <zash@zash.se>
parents: 12407
diff changeset
186
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
187 function stanza_mt:child_with_name(name)
2482
a1570e371258 util.stanza: Trailing whitespace
Matthew Wild <mwild1@gmail.com>
parents: 2264
diff changeset
188 for _, child in ipairs(self.tags) do
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
189 if child.name == name then return child; end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
190 end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
191 end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
192
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
193 function stanza_mt:child_with_ns(ns)
2482
a1570e371258 util.stanza: Trailing whitespace
Matthew Wild <mwild1@gmail.com>
parents: 2264
diff changeset
194 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
195 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
196 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
197 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
198
11786
39164ea2ab9e util.stanza: Add :get_child_with_attr() + tests
Matthew Wild <mwild1@gmail.com>
parents: 11642
diff changeset
199 function stanza_mt:get_child_with_attr(name, xmlns, attr_name, attr_value, normalize)
39164ea2ab9e util.stanza: Add :get_child_with_attr() + tests
Matthew Wild <mwild1@gmail.com>
parents: 11642
diff changeset
200 for tag in self:childtags(name, xmlns) do
39164ea2ab9e util.stanza: Add :get_child_with_attr() + tests
Matthew Wild <mwild1@gmail.com>
parents: 11642
diff changeset
201 if (normalize and normalize(tag.attr[attr_name]) or tag.attr[attr_name]) == attr_value then
39164ea2ab9e util.stanza: Add :get_child_with_attr() + tests
Matthew Wild <mwild1@gmail.com>
parents: 11642
diff changeset
202 return tag;
39164ea2ab9e util.stanza: Add :get_child_with_attr() + tests
Matthew Wild <mwild1@gmail.com>
parents: 11642
diff changeset
203 end
39164ea2ab9e util.stanza: Add :get_child_with_attr() + tests
Matthew Wild <mwild1@gmail.com>
parents: 11642
diff changeset
204 end
39164ea2ab9e util.stanza: Add :get_child_with_attr() + tests
Matthew Wild <mwild1@gmail.com>
parents: 11642
diff changeset
205 end
39164ea2ab9e util.stanza: Add :get_child_with_attr() + tests
Matthew Wild <mwild1@gmail.com>
parents: 11642
diff changeset
206
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
207 function stanza_mt:children()
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
208 local i = 0;
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
209 return function (a)
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
210 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
211 return a[i];
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
212 end, self, i;
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
213 end
3474
730876bbe4e6 util.stanza: Add stanza:matched_children(name, xmlns) [name suggestions welcome]
Matthew Wild <mwild1@gmail.com>
parents: 2961
diff changeset
214
4168
4919831b5b56 util.stanza: Clean up matching_tags() and replace :childtags() with it
Matthew Wild <mwild1@gmail.com>
parents: 4136
diff changeset
215 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
216 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
217 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
218 return function ()
4168
4919831b5b56 util.stanza: Clean up matching_tags() and replace :childtags() with it
Matthew Wild <mwild1@gmail.com>
parents: 4136
diff changeset
219 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
220 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
221 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
222 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
223 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
224 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
225 return v;
3474
730876bbe4e6 util.stanza: Add stanza:matched_children(name, xmlns) [name suggestions welcome]
Matthew Wild <mwild1@gmail.com>
parents: 2961
diff changeset
226 end
4168
4919831b5b56 util.stanza: Clean up matching_tags() and replace :childtags() with it
Matthew Wild <mwild1@gmail.com>
parents: 4136
diff changeset
227 end
4919831b5b56 util.stanza: Clean up matching_tags() and replace :childtags() with it
Matthew Wild <mwild1@gmail.com>
parents: 4136
diff changeset
228 end;
2
9bb397205f26 Working presence!
matthew
parents: 1
diff changeset
229 end
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
230
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
231 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
232 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
233 local n_children, n_tags = #self, #tags;
9217
7df29c5fbb9b util.stanza + tests: Bail out of loop if we are iterating too far, fixes #981
Matthew Wild <mwild1@gmail.com>
parents: 8999
diff changeset
234 local max_iterations = n_children + 1;
5776
bd0ff8ae98a8 Remove all trailing whitespace
Florian Zeitz <florob@babelmonkeys.de>
parents: 5435
diff changeset
235
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
236 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
237 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
238 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
239 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
240 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
241 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
242 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
243 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
244 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
245 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
246 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
247 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
248 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
249 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
250 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
251 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
252 end
5414
efec29eb4cdd util.stanza: :maptags(): Fixes to make loop more robust on item removal
Matthew Wild <mwild1@gmail.com>
parents: 5090
diff changeset
253 i = i + 1;
9217
7df29c5fbb9b util.stanza + tests: Bail out of loop if we are iterating too far, fixes #981
Matthew Wild <mwild1@gmail.com>
parents: 8999
diff changeset
254 if i > max_iterations then
7df29c5fbb9b util.stanza + tests: Bail out of loop if we are iterating too far, fixes #981
Matthew Wild <mwild1@gmail.com>
parents: 8999
diff changeset
255 -- COMPAT: Hopefully temporary guard against #981 while we
7df29c5fbb9b util.stanza + tests: Bail out of loop if we are iterating too far, fixes #981
Matthew Wild <mwild1@gmail.com>
parents: 8999
diff changeset
256 -- figure out the root cause
7df29c5fbb9b util.stanza + tests: Bail out of loop if we are iterating too far, fixes #981
Matthew Wild <mwild1@gmail.com>
parents: 8999
diff changeset
257 error("Invalid stanza state! Please report this error.");
7df29c5fbb9b util.stanza + tests: Bail out of loop if we are iterating too far, fixes #981
Matthew Wild <mwild1@gmail.com>
parents: 8999
diff changeset
258 end
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
259 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
260 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
261 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
262
5424
7318527c6dea util.stanza: Add stanza:find(), a light weight XPath-like method
Kim Alvefur <zash@zash.se>
parents: 5414
diff changeset
263 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
264 local pos = 1;
7318527c6dea util.stanza: Add stanza:find(), a light weight XPath-like method
Kim Alvefur <zash@zash.se>
parents: 5414
diff changeset
265 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
266
7318527c6dea util.stanza: Add stanza:find(), a light weight XPath-like method
Kim Alvefur <zash@zash.se>
parents: 5414
diff changeset
267 repeat
7318527c6dea util.stanza: Add stanza:find(), a light weight XPath-like method
Kim Alvefur <zash@zash.se>
parents: 5414
diff changeset
268 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
269 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
270 if char == "@" then
7318527c6dea util.stanza: Add stanza:find(), a light weight XPath-like method
Kim Alvefur <zash@zash.se>
parents: 5414
diff changeset
271 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
272 elseif char == "{" then
7318527c6dea util.stanza: Add stanza:find(), a light weight XPath-like method
Kim Alvefur <zash@zash.se>
parents: 5414
diff changeset
273 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
274 end
7318527c6dea util.stanza: Add stanza:find(), a light weight XPath-like method
Kim Alvefur <zash@zash.se>
parents: 5414
diff changeset
275 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
276 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
277 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
278 if text == "#" then
7318527c6dea util.stanza: Add stanza:find(), a light weight XPath-like method
Kim Alvefur <zash@zash.se>
parents: 5414
diff changeset
279 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
280 end
7318527c6dea util.stanza: Add stanza:find(), a light weight XPath-like method
Kim Alvefur <zash@zash.se>
parents: 5414
diff changeset
281 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
282 end
7318527c6dea util.stanza: Add stanza:find(), a light weight XPath-like method
Kim Alvefur <zash@zash.se>
parents: 5414
diff changeset
283 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
284 until not self
7318527c6dea util.stanza: Add stanza:find(), a light weight XPath-like method
Kim Alvefur <zash@zash.se>
parents: 5414
diff changeset
285 end
7318527c6dea util.stanza: Add stanza:find(), a light weight XPath-like method
Kim Alvefur <zash@zash.se>
parents: 5414
diff changeset
286
9924
5a2e53bef031 util.stanza: Fix :top_tag() handling of namespaced attributes
Matthew Wild <mwild1@gmail.com>
parents: 9732
diff changeset
287 local function _clone(stanza, only_top)
12407
b6b01724e04f util.stanza: Create tables with correct size to avoid reallocations
Kim Alvefur <zash@zash.se>
parents: 12406
diff changeset
288 local attr = {};
9924
5a2e53bef031 util.stanza: Fix :top_tag() handling of namespaced attributes
Matthew Wild <mwild1@gmail.com>
parents: 9732
diff changeset
289 for k,v in pairs(stanza.attr) do attr[k] = v; end
5a2e53bef031 util.stanza: Fix :top_tag() handling of namespaced attributes
Matthew Wild <mwild1@gmail.com>
parents: 9732
diff changeset
290 local old_namespaces, namespaces = stanza.namespaces;
5a2e53bef031 util.stanza: Fix :top_tag() handling of namespaced attributes
Matthew Wild <mwild1@gmail.com>
parents: 9732
diff changeset
291 if old_namespaces then
5a2e53bef031 util.stanza: Fix :top_tag() handling of namespaced attributes
Matthew Wild <mwild1@gmail.com>
parents: 9732
diff changeset
292 namespaces = {};
5a2e53bef031 util.stanza: Fix :top_tag() handling of namespaced attributes
Matthew Wild <mwild1@gmail.com>
parents: 9732
diff changeset
293 for k,v in pairs(old_namespaces) do namespaces[k] = v; end
5a2e53bef031 util.stanza: Fix :top_tag() handling of namespaced attributes
Matthew Wild <mwild1@gmail.com>
parents: 9732
diff changeset
294 end
12407
b6b01724e04f util.stanza: Create tables with correct size to avoid reallocations
Kim Alvefur <zash@zash.se>
parents: 12406
diff changeset
295 local tags, new;
b6b01724e04f util.stanza: Create tables with correct size to avoid reallocations
Kim Alvefur <zash@zash.se>
parents: 12406
diff changeset
296 if only_top then
b6b01724e04f util.stanza: Create tables with correct size to avoid reallocations
Kim Alvefur <zash@zash.se>
parents: 12406
diff changeset
297 tags = {};
b6b01724e04f util.stanza: Create tables with correct size to avoid reallocations
Kim Alvefur <zash@zash.se>
parents: 12406
diff changeset
298 new = { name = stanza.name, attr = attr, namespaces = namespaces, tags = tags };
b6b01724e04f util.stanza: Create tables with correct size to avoid reallocations
Kim Alvefur <zash@zash.se>
parents: 12406
diff changeset
299 else
b6b01724e04f util.stanza: Create tables with correct size to avoid reallocations
Kim Alvefur <zash@zash.se>
parents: 12406
diff changeset
300 tags = t_create(#stanza.tags, 0);
b6b01724e04f util.stanza: Create tables with correct size to avoid reallocations
Kim Alvefur <zash@zash.se>
parents: 12406
diff changeset
301 new = t_create(#stanza, 4);
b6b01724e04f util.stanza: Create tables with correct size to avoid reallocations
Kim Alvefur <zash@zash.se>
parents: 12406
diff changeset
302 new.name = stanza.name;
b6b01724e04f util.stanza: Create tables with correct size to avoid reallocations
Kim Alvefur <zash@zash.se>
parents: 12406
diff changeset
303 new.attr = attr;
b6b01724e04f util.stanza: Create tables with correct size to avoid reallocations
Kim Alvefur <zash@zash.se>
parents: 12406
diff changeset
304 new.namespaces = namespaces;
b6b01724e04f util.stanza: Create tables with correct size to avoid reallocations
Kim Alvefur <zash@zash.se>
parents: 12406
diff changeset
305 new.tags = tags;
b6b01724e04f util.stanza: Create tables with correct size to avoid reallocations
Kim Alvefur <zash@zash.se>
parents: 12406
diff changeset
306 end
b6b01724e04f util.stanza: Create tables with correct size to avoid reallocations
Kim Alvefur <zash@zash.se>
parents: 12406
diff changeset
307
12406
a3ddf3f42212 util.stanza: Use table.move in clone
Kim Alvefur <zash@zash.se>
parents: 12140
diff changeset
308 setmetatable(new, stanza_mt);
9924
5a2e53bef031 util.stanza: Fix :top_tag() handling of namespaced attributes
Matthew Wild <mwild1@gmail.com>
parents: 9732
diff changeset
309 if not only_top then
12406
a3ddf3f42212 util.stanza: Use table.move in clone
Kim Alvefur <zash@zash.se>
parents: 12140
diff changeset
310 t_move(stanza, 1, #stanza, 1, new);
a3ddf3f42212 util.stanza: Use table.move in clone
Kim Alvefur <zash@zash.se>
parents: 12140
diff changeset
311 t_move(stanza.tags, 1, #stanza.tags, 1, tags);
a3ddf3f42212 util.stanza: Use table.move in clone
Kim Alvefur <zash@zash.se>
parents: 12140
diff changeset
312 new:maptags(_clone);
9924
5a2e53bef031 util.stanza: Fix :top_tag() handling of namespaced attributes
Matthew Wild <mwild1@gmail.com>
parents: 9732
diff changeset
313 end
12406
a3ddf3f42212 util.stanza: Use table.move in clone
Kim Alvefur <zash@zash.se>
parents: 12140
diff changeset
314 return new;
9924
5a2e53bef031 util.stanza: Fix :top_tag() handling of namespaced attributes
Matthew Wild <mwild1@gmail.com>
parents: 9732
diff changeset
315 end
5a2e53bef031 util.stanza: Fix :top_tag() handling of namespaced attributes
Matthew Wild <mwild1@gmail.com>
parents: 9732
diff changeset
316
5a2e53bef031 util.stanza: Fix :top_tag() handling of namespaced attributes
Matthew Wild <mwild1@gmail.com>
parents: 9732
diff changeset
317 local function clone(stanza, only_top)
5a2e53bef031 util.stanza: Fix :top_tag() handling of namespaced attributes
Matthew Wild <mwild1@gmail.com>
parents: 9732
diff changeset
318 if not is_stanza(stanza) then
5a2e53bef031 util.stanza: Fix :top_tag() handling of namespaced attributes
Matthew Wild <mwild1@gmail.com>
parents: 9732
diff changeset
319 error("bad argument to clone: expected stanza, got "..type(stanza));
5a2e53bef031 util.stanza: Fix :top_tag() handling of namespaced attributes
Matthew Wild <mwild1@gmail.com>
parents: 9732
diff changeset
320 end
5a2e53bef031 util.stanza: Fix :top_tag() handling of namespaced attributes
Matthew Wild <mwild1@gmail.com>
parents: 9732
diff changeset
321 return _clone(stanza, only_top);
5a2e53bef031 util.stanza: Fix :top_tag() handling of namespaced attributes
Matthew Wild <mwild1@gmail.com>
parents: 9732
diff changeset
322 end
5424
7318527c6dea util.stanza: Add stanza:find(), a light weight XPath-like method
Kim Alvefur <zash@zash.se>
parents: 5414
diff changeset
323
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
324 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
325 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
326
7253
f4e71242556a util.stanza: Some code cleanup [luacheck]
Matthew Wild <mwild1@gmail.com>
parents: 6821
diff changeset
327 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
328 local nsid = 0;
9fe9ba693f4a util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents: 1420
diff changeset
329 local name = t.name
9fe9ba693f4a util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents: 1420
diff changeset
330 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
331 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
332 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
333 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
334 nsid = nsid + 1;
7253
f4e71242556a util.stanza: Some code cleanup [luacheck]
Matthew Wild <mwild1@gmail.com>
parents: 6821
diff changeset
335 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
336 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
337 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
338 end
1416
f916f0ff90e5 util.stanza: Rewrote stanza_mt.__tostring. 20-30% faster stanza serialization. - #optimization
Waqas Hussain <waqas20@gmail.com>
parents: 1415
diff changeset
339 end
1431
9fe9ba693f4a util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents: 1420
diff changeset
340 local len = #t;
9fe9ba693f4a util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents: 1420
diff changeset
341 if len == 0 then
9fe9ba693f4a util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents: 1420
diff changeset
342 t_insert(buf, "/>");
9fe9ba693f4a util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents: 1420
diff changeset
343 else
9fe9ba693f4a util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents: 1420
diff changeset
344 t_insert(buf, ">");
9fe9ba693f4a util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents: 1420
diff changeset
345 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
346 local child = t[n];
9fe9ba693f4a util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents: 1420
diff changeset
347 if child.name then
7253
f4e71242556a util.stanza: Some code cleanup [luacheck]
Matthew Wild <mwild1@gmail.com>
parents: 6821
diff changeset
348 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
349 else
7253
f4e71242556a util.stanza: Some code cleanup [luacheck]
Matthew Wild <mwild1@gmail.com>
parents: 6821
diff changeset
350 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
351 end
4
09c3845ed442 Presence unavailable on disconnect
matthew
parents: 2
diff changeset
352 end
1431
9fe9ba693f4a util.stanza: Serializer optimizations, and nicer output for empty elements
Waqas Hussain <waqas20@gmail.com>
parents: 1420
diff changeset
353 t_insert(buf, "</"..name..">");
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
354 end
626
cf1d26fd4d6f Optimized stanza_mt.__tostring (called when doing tostring(stanza))
Waqas Hussain <waqas20@gmail.com>
parents: 519
diff changeset
355 end
cf1d26fd4d6f Optimized stanza_mt.__tostring (called when doing tostring(stanza))
Waqas Hussain <waqas20@gmail.com>
parents: 519
diff changeset
356 function stanza_mt.__tostring(t)
cf1d26fd4d6f Optimized stanza_mt.__tostring (called when doing tostring(stanza))
Waqas Hussain <waqas20@gmail.com>
parents: 519
diff changeset
357 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
358 _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
359 return t_concat(buf);
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
360 end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
361
242
f15afbcbc55c Add new top_tag() method to stanzas
Matthew Wild <mwild1@gmail.com>
parents: 209
diff changeset
362 function stanza_mt.top_tag(t)
9924
5a2e53bef031 util.stanza: Fix :top_tag() handling of namespaced attributes
Matthew Wild <mwild1@gmail.com>
parents: 9732
diff changeset
363 local top_tag_clone = clone(t, true);
5a2e53bef031 util.stanza: Fix :top_tag() handling of namespaced attributes
Matthew Wild <mwild1@gmail.com>
parents: 9732
diff changeset
364 return tostring(top_tag_clone):sub(1,-3)..">";
242
f15afbcbc55c Add new top_tag() method to stanzas
Matthew Wild <mwild1@gmail.com>
parents: 209
diff changeset
365 end
f15afbcbc55c Add new top_tag() method to stanzas
Matthew Wild <mwild1@gmail.com>
parents: 209
diff changeset
366
1420
1576a5aa52f8 util.stanza: Add stanza:get_text() to retrieve all child text nodes #api
Matthew Wild <mwild1@gmail.com>
parents: 1416
diff changeset
367 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
368 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
369 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
370 end
1576a5aa52f8 util.stanza: Add stanza:get_text() to retrieve all child text nodes #api
Matthew Wild <mwild1@gmail.com>
parents: 1416
diff changeset
371 end
1576a5aa52f8 util.stanza: Add stanza:get_text() to retrieve all child text nodes #api
Matthew Wild <mwild1@gmail.com>
parents: 1416
diff changeset
372
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
373 function stanza_mt.get_error(stanza)
11088
1f84d0e4d0c4 util.stanza: Extract Application-Specific Condition from errors
Kim Alvefur <zash@zash.se>
parents: 11086
diff changeset
374 local error_type, condition, text, extra_tag;
5776
bd0ff8ae98a8 Remove all trailing whitespace
Florian Zeitz <florob@babelmonkeys.de>
parents: 5435
diff changeset
375
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
376 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
377 if not error_tag then
11088
1f84d0e4d0c4 util.stanza: Extract Application-Specific Condition from errors
Kim Alvefur <zash@zash.se>
parents: 11086
diff changeset
378 return nil, nil, nil, nil;
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
379 end
7253
f4e71242556a util.stanza: Some code cleanup [luacheck]
Matthew Wild <mwild1@gmail.com>
parents: 6821
diff changeset
380 error_type = error_tag.attr.type;
5776
bd0ff8ae98a8 Remove all trailing whitespace
Florian Zeitz <florob@babelmonkeys.de>
parents: 5435
diff changeset
381
5090
61c7c53c06d5 util.stanza: Use ipairs instead of childtags (behavior changed in 92c86e11fd44)
Kim Alvefur <zash@zash.se>
parents: 4936
diff changeset
382 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
383 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
384 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
385 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
386 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
387 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
388 end
11088
1f84d0e4d0c4 util.stanza: Extract Application-Specific Condition from errors
Kim Alvefur <zash@zash.se>
parents: 11086
diff changeset
389 else
1f84d0e4d0c4 util.stanza: Extract Application-Specific Condition from errors
Kim Alvefur <zash@zash.se>
parents: 11086
diff changeset
390 extra_tag = child;
1f84d0e4d0c4 util.stanza: Extract Application-Specific Condition from errors
Kim Alvefur <zash@zash.se>
parents: 11086
diff changeset
391 end
1f84d0e4d0c4 util.stanza: Extract Application-Specific Condition from errors
Kim Alvefur <zash@zash.se>
parents: 11086
diff changeset
392 if condition and text and extra_tag then
1f84d0e4d0c4 util.stanza: Extract Application-Specific Condition from errors
Kim Alvefur <zash@zash.se>
parents: 11086
diff changeset
393 break;
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
394 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
395 end
11088
1f84d0e4d0c4 util.stanza: Extract Application-Specific Condition from errors
Kim Alvefur <zash@zash.se>
parents: 11086
diff changeset
396 return error_type, condition or "undefined-condition", text, extra_tag;
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
397 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
398
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
399 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
400 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
401 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
402 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
403 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
404 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
405 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
406 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
407 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
408 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
409 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
410
9489
09b873ac7eb8 util.stanza: Set preserialize as freeze metamethod
Kim Alvefur <zash@zash.se>
parents: 9307
diff changeset
411 stanza_mt.__freeze = preserialize;
09b873ac7eb8 util.stanza: Set preserialize as freeze metamethod
Kim Alvefur <zash@zash.se>
parents: 9307
diff changeset
412
9674
6f97acc4583b util.stanza: Deserialize stanza without mutating input (fixes #711)
Kim Alvefur <zash@zash.se>
parents: 9630
diff changeset
413 local function deserialize(serialized)
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
414 -- Set metatable
9674
6f97acc4583b util.stanza: Deserialize stanza without mutating input (fixes #711)
Kim Alvefur <zash@zash.se>
parents: 9630
diff changeset
415 if serialized then
6f97acc4583b util.stanza: Deserialize stanza without mutating input (fixes #711)
Kim Alvefur <zash@zash.se>
parents: 9630
diff changeset
416 local attr = serialized.attr;
2077
e33658f6052c Changed separator between attribute names and prefixes from '|' to '\1' (optimization and cleanup).
Waqas Hussain <waqas20@gmail.com>
parents: 1984
diff changeset
417 local attrx = {};
9674
6f97acc4583b util.stanza: Deserialize stanza without mutating input (fixes #711)
Kim Alvefur <zash@zash.se>
parents: 9630
diff changeset
418 for att, val in pairs(attr) do
6f97acc4583b util.stanza: Deserialize stanza without mutating input (fixes #711)
Kim Alvefur <zash@zash.se>
parents: 9630
diff changeset
419 if type(att) == "string" then
6f97acc4583b util.stanza: Deserialize stanza without mutating input (fixes #711)
Kim Alvefur <zash@zash.se>
parents: 9630
diff changeset
420 if s_find(att, "|", 1, true) and not s_find(att, "\1", 1, true) then
6f97acc4583b util.stanza: Deserialize stanza without mutating input (fixes #711)
Kim Alvefur <zash@zash.se>
parents: 9630
diff changeset
421 local ns,na = s_match(att, "^([^|]+)|(.+)$");
6f97acc4583b util.stanza: Deserialize stanza without mutating input (fixes #711)
Kim Alvefur <zash@zash.se>
parents: 9630
diff changeset
422 attrx[ns.."\1"..na] = val;
6f97acc4583b util.stanza: Deserialize stanza without mutating input (fixes #711)
Kim Alvefur <zash@zash.se>
parents: 9630
diff changeset
423 else
6f97acc4583b util.stanza: Deserialize stanza without mutating input (fixes #711)
Kim Alvefur <zash@zash.se>
parents: 9630
diff changeset
424 attrx[att] = val;
6f97acc4583b util.stanza: Deserialize stanza without mutating input (fixes #711)
Kim Alvefur <zash@zash.se>
parents: 9630
diff changeset
425 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
426 end
e33658f6052c Changed separator between attribute names and prefixes from '|' to '\1' (optimization and cleanup).
Waqas Hussain <waqas20@gmail.com>
parents: 1984
diff changeset
427 end
9674
6f97acc4583b util.stanza: Deserialize stanza without mutating input (fixes #711)
Kim Alvefur <zash@zash.se>
parents: 9630
diff changeset
428 local stanza = new_stanza(serialized.name, attrx);
6f97acc4583b util.stanza: Deserialize stanza without mutating input (fixes #711)
Kim Alvefur <zash@zash.se>
parents: 9630
diff changeset
429 for _, child in ipairs(serialized) do
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
430 if type(child) == "table" then
9674
6f97acc4583b util.stanza: Deserialize stanza without mutating input (fixes #711)
Kim Alvefur <zash@zash.se>
parents: 9630
diff changeset
431 stanza:add_direct_child(deserialize(child));
6f97acc4583b util.stanza: Deserialize stanza without mutating input (fixes #711)
Kim Alvefur <zash@zash.se>
parents: 9630
diff changeset
432 elseif type(child) == "string" then
6f97acc4583b util.stanza: Deserialize stanza without mutating input (fixes #711)
Kim Alvefur <zash@zash.se>
parents: 9630
diff changeset
433 stanza:add_direct_child(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
434 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
435 end
9674
6f97acc4583b util.stanza: Deserialize stanza without mutating input (fixes #711)
Kim Alvefur <zash@zash.se>
parents: 9630
diff changeset
436 return 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
437 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
438 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
439
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
440 local function message(attr, body)
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
441 if not body then
7253
f4e71242556a util.stanza: Some code cleanup [luacheck]
Matthew Wild <mwild1@gmail.com>
parents: 6821
diff changeset
442 return new_stanza("message", attr);
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
443 else
10116
4807535b8673 util.stanza: Use :text_tag internally everywhere
Kim Alvefur <zash@zash.se>
parents: 9924
diff changeset
444 return new_stanza("message", attr):text_tag("body", body);
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
445 end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
446 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
447 local function iq(attr)
9732
51583ea2b4fd util.stanza: Require a type attribute for iq stanzas
Kim Alvefur <zash@zash.se>
parents: 9674
diff changeset
448 if not attr then
51583ea2b4fd util.stanza: Require a type attribute for iq stanzas
Kim Alvefur <zash@zash.se>
parents: 9674
diff changeset
449 error("iq stanzas require id and type attributes");
51583ea2b4fd util.stanza: Require a type attribute for iq stanzas
Kim Alvefur <zash@zash.se>
parents: 9674
diff changeset
450 end
51583ea2b4fd util.stanza: Require a type attribute for iq stanzas
Kim Alvefur <zash@zash.se>
parents: 9674
diff changeset
451 if not attr.id then
9307
feaef6215bb8 util.stanza: Don't automatically generate ids for iq stanzas
Matthew Wild <mwild1@gmail.com>
parents: 9217
diff changeset
452 error("iq stanzas require an id attribute");
feaef6215bb8 util.stanza: Don't automatically generate ids for iq stanzas
Matthew Wild <mwild1@gmail.com>
parents: 9217
diff changeset
453 end
9732
51583ea2b4fd util.stanza: Require a type attribute for iq stanzas
Kim Alvefur <zash@zash.se>
parents: 9674
diff changeset
454 if not attr.type then
51583ea2b4fd util.stanza: Require a type attribute for iq stanzas
Kim Alvefur <zash@zash.se>
parents: 9674
diff changeset
455 error("iq stanzas require a type attribute");
51583ea2b4fd util.stanza: Require a type attribute for iq stanzas
Kim Alvefur <zash@zash.se>
parents: 9674
diff changeset
456 end
9307
feaef6215bb8 util.stanza: Don't automatically generate ids for iq stanzas
Matthew Wild <mwild1@gmail.com>
parents: 9217
diff changeset
457 return new_stanza("iq", attr);
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
458 end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
459
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
460 local function reply(orig)
10442
22db763c510c util.stanza: Check that argument to reply is a stanza
Kim Alvefur <zash@zash.se>
parents: 10116
diff changeset
461 if not is_stanza(orig) then
22db763c510c util.stanza: Check that argument to reply is a stanza
Kim Alvefur <zash@zash.se>
parents: 10116
diff changeset
462 error("bad argument to reply: expected stanza, got "..type(orig));
22db763c510c util.stanza: Check that argument to reply is a stanza
Kim Alvefur <zash@zash.se>
parents: 10116
diff changeset
463 end
8382
e5d00bf4a4d5 util: Various minor changes to please [luacheck]
Kim Alvefur <zash@zash.se>
parents: 7758
diff changeset
464 return new_stanza(orig.name,
10443
f28718f46196 util.stanza: Remove redundant check for attrs
Kim Alvefur <zash@zash.se>
parents: 10442
diff changeset
465 {
8382
e5d00bf4a4d5 util: Various minor changes to please [luacheck]
Kim Alvefur <zash@zash.se>
parents: 7758
diff changeset
466 to = orig.attr.from,
e5d00bf4a4d5 util: Various minor changes to please [luacheck]
Kim Alvefur <zash@zash.se>
parents: 7758
diff changeset
467 from = orig.attr.to,
e5d00bf4a4d5 util: Various minor changes to please [luacheck]
Kim Alvefur <zash@zash.se>
parents: 7758
diff changeset
468 id = orig.attr.id,
e5d00bf4a4d5 util: Various minor changes to please [luacheck]
Kim Alvefur <zash@zash.se>
parents: 7758
diff changeset
469 type = ((orig.name == "iq" and "result") or orig.attr.type)
e5d00bf4a4d5 util: Various minor changes to please [luacheck]
Kim Alvefur <zash@zash.se>
parents: 7758
diff changeset
470 });
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
471 end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
472
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
473 local xmpp_stanzas_attr = { xmlns = xmlns_stanzas };
10446
5c2d1b13537c util.stanza: Support the 'by' attribute on errors
Kim Alvefur <zash@zash.se>
parents: 10445
diff changeset
474 local function error_reply(orig, error_type, condition, error_message, error_by)
10444
4eab1f5a4f3b util.stanza: Check that argument to error_reply is a stanza
Kim Alvefur <zash@zash.se>
parents: 10443
diff changeset
475 if not is_stanza(orig) then
4eab1f5a4f3b util.stanza: Check that argument to error_reply is a stanza
Kim Alvefur <zash@zash.se>
parents: 10443
diff changeset
476 error("bad argument to error_reply: expected stanza, got "..type(orig));
10445
f53c03ab4357 util.stanza: Check that argument to error_reply is NOT a stanza of type error
Kim Alvefur <zash@zash.se>
parents: 10444
diff changeset
477 elseif orig.attr.type == "error" then
f53c03ab4357 util.stanza: Check that argument to error_reply is NOT a stanza of type error
Kim Alvefur <zash@zash.se>
parents: 10444
diff changeset
478 error("bad argument to error_reply: got stanza of type error which must not be replied to");
10444
4eab1f5a4f3b util.stanza: Check that argument to error_reply is a stanza
Kim Alvefur <zash@zash.se>
parents: 10443
diff changeset
479 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
480 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
481 t.attr.type = "error";
11084
5e09a3389adb util.stanza: Support inclusion of <gone> URI from util.error object
Kim Alvefur <zash@zash.se>
parents: 11083
diff changeset
482 local extra;
11082
c26599a78fae util.stanza: Reorder code to prepare for extracting 'by' from util.error
Kim Alvefur <zash@zash.se>
parents: 10717
diff changeset
483 if type(error_type) == "table" then -- an util.error or similar object
11083
4d12a6785531 util.stanza: Support getting 'by' from util.error object
Kim Alvefur <zash@zash.se>
parents: 11082
diff changeset
484 if type(error_type.extra) == "table" then
11084
5e09a3389adb util.stanza: Support inclusion of <gone> URI from util.error object
Kim Alvefur <zash@zash.se>
parents: 11083
diff changeset
485 extra = error_type.extra;
11083
4d12a6785531 util.stanza: Support getting 'by' from util.error object
Kim Alvefur <zash@zash.se>
parents: 11082
diff changeset
486 end
11085
5705d151ea11 util.stanza: Get 'by' from context instead
Kim Alvefur <zash@zash.se>
parents: 11084
diff changeset
487 if type(error_type.context) == "table" and type(error_type.context.by) == "string" then error_by = error_type.context.by; end
11082
c26599a78fae util.stanza: Reorder code to prepare for extracting 'by' from util.error
Kim Alvefur <zash@zash.se>
parents: 10717
diff changeset
488 error_type, condition, error_message = error_type.type, error_type.condition, error_type.text;
c26599a78fae util.stanza: Reorder code to prepare for extracting 'by' from util.error
Kim Alvefur <zash@zash.se>
parents: 10717
diff changeset
489 end
10446
5c2d1b13537c util.stanza: Support the 'by' attribute on errors
Kim Alvefur <zash@zash.se>
parents: 10445
diff changeset
490 if t.attr.from == error_by then
5c2d1b13537c util.stanza: Support the 'by' attribute on errors
Kim Alvefur <zash@zash.se>
parents: 10445
diff changeset
491 error_by = nil;
5c2d1b13537c util.stanza: Support the 'by' attribute on errors
Kim Alvefur <zash@zash.se>
parents: 10445
diff changeset
492 end
5c2d1b13537c util.stanza: Support the 'by' attribute on errors
Kim Alvefur <zash@zash.se>
parents: 10445
diff changeset
493 t:tag("error", {type = error_type, by = error_by}) --COMPAT: Some day xmlns:stanzas goes here
11084
5e09a3389adb util.stanza: Support inclusion of <gone> URI from util.error object
Kim Alvefur <zash@zash.se>
parents: 11083
diff changeset
494 :tag(condition, xmpp_stanzas_attr);
5e09a3389adb util.stanza: Support inclusion of <gone> URI from util.error object
Kim Alvefur <zash@zash.se>
parents: 11083
diff changeset
495 if extra and condition == "gone" and type(extra.uri) == "string" then
5e09a3389adb util.stanza: Support inclusion of <gone> URI from util.error object
Kim Alvefur <zash@zash.se>
parents: 11083
diff changeset
496 t:text(extra.uri);
5e09a3389adb util.stanza: Support inclusion of <gone> URI from util.error object
Kim Alvefur <zash@zash.se>
parents: 11083
diff changeset
497 end
5e09a3389adb util.stanza: Support inclusion of <gone> URI from util.error object
Kim Alvefur <zash@zash.se>
parents: 11083
diff changeset
498 t:up();
10116
4807535b8673 util.stanza: Use :text_tag internally everywhere
Kim Alvefur <zash@zash.se>
parents: 9924
diff changeset
499 if error_message then t:text_tag("text", error_message, xmpp_stanzas_attr); end
11086
2846b6226a8e util.stanza: Support Application-Specific Conditions in util.error
Kim Alvefur <zash@zash.se>
parents: 11085
diff changeset
500 if extra and is_stanza(extra.tag) then
2846b6226a8e util.stanza: Support Application-Specific Conditions in util.error
Kim Alvefur <zash@zash.se>
parents: 11085
diff changeset
501 t:add_child(extra.tag);
2846b6226a8e util.stanza: Support Application-Specific Conditions in util.error
Kim Alvefur <zash@zash.se>
parents: 11085
diff changeset
502 elseif extra and extra.namespace and extra.condition then
2846b6226a8e util.stanza: Support Application-Specific Conditions in util.error
Kim Alvefur <zash@zash.se>
parents: 11085
diff changeset
503 t:tag(extra.condition, { xmlns = extra.namespace }):up();
2846b6226a8e util.stanza: Support Application-Specific Conditions in util.error
Kim Alvefur <zash@zash.se>
parents: 11085
diff changeset
504 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
505 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
506 end
44800be871f5 User registration, etc (jabber:iq:register)
Waqas Hussain <waqas20@gmail.com>
parents: 30
diff changeset
507
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
508 local function presence(attr)
7253
f4e71242556a util.stanza: Some code cleanup [luacheck]
Matthew Wild <mwild1@gmail.com>
parents: 6821
diff changeset
509 return new_stanza("presence", attr);
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
510 end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
511
11642
7f2dee4249aa util.stanza: Export pretty printing function
Kim Alvefur <zash@zash.se>
parents: 11640
diff changeset
512 local pretty;
262
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
513 if do_pretty_printing then
11639
ad39528e647d util.stanza: Remove Windows "support" (disabling ANSI color pretty printing)
Kim Alvefur <zash@zash.se>
parents: 11574
diff changeset
514 local getstyle, getstring = termcolours.getstyle, termcolours.getstring;
11640
51598e46e136 util.stanza: Simplify and make pretty-printing look nicer
Kim Alvefur <zash@zash.se>
parents: 11639
diff changeset
515
51598e46e136 util.stanza: Simplify and make pretty-printing look nicer
Kim Alvefur <zash@zash.se>
parents: 11639
diff changeset
516 local blue1 = getstyle("1b3967");
51598e46e136 util.stanza: Simplify and make pretty-printing look nicer
Kim Alvefur <zash@zash.se>
parents: 11639
diff changeset
517 local blue2 = getstyle("13b5ea");
51598e46e136 util.stanza: Simplify and make pretty-printing look nicer
Kim Alvefur <zash@zash.se>
parents: 11639
diff changeset
518 local green1 = getstyle("439639");
51598e46e136 util.stanza: Simplify and make pretty-printing look nicer
Kim Alvefur <zash@zash.se>
parents: 11639
diff changeset
519 local green2 = getstyle("a0ce67");
51598e46e136 util.stanza: Simplify and make pretty-printing look nicer
Kim Alvefur <zash@zash.se>
parents: 11639
diff changeset
520 local orange1 = getstyle("d9541e");
51598e46e136 util.stanza: Simplify and make pretty-printing look nicer
Kim Alvefur <zash@zash.se>
parents: 11639
diff changeset
521 local orange2 = getstyle("e96d1f");
51598e46e136 util.stanza: Simplify and make pretty-printing look nicer
Kim Alvefur <zash@zash.se>
parents: 11639
diff changeset
522
51598e46e136 util.stanza: Simplify and make pretty-printing look nicer
Kim Alvefur <zash@zash.se>
parents: 11639
diff changeset
523 local attr_replace = (
51598e46e136 util.stanza: Simplify and make pretty-printing look nicer
Kim Alvefur <zash@zash.se>
parents: 11639
diff changeset
524 getstring(green2, "%1") .. -- attr name
51598e46e136 util.stanza: Simplify and make pretty-printing look nicer
Kim Alvefur <zash@zash.se>
parents: 11639
diff changeset
525 getstring(green1, "%2") .. -- equal
51598e46e136 util.stanza: Simplify and make pretty-printing look nicer
Kim Alvefur <zash@zash.se>
parents: 11639
diff changeset
526 getstring(orange1, "%3") .. -- quote
51598e46e136 util.stanza: Simplify and make pretty-printing look nicer
Kim Alvefur <zash@zash.se>
parents: 11639
diff changeset
527 getstring(orange2, "%4") .. -- attr value
51598e46e136 util.stanza: Simplify and make pretty-printing look nicer
Kim Alvefur <zash@zash.se>
parents: 11639
diff changeset
528 getstring(orange1, "%5") -- quote
51598e46e136 util.stanza: Simplify and make pretty-printing look nicer
Kim Alvefur <zash@zash.se>
parents: 11639
diff changeset
529 );
5776
bd0ff8ae98a8 Remove all trailing whitespace
Florian Zeitz <florob@babelmonkeys.de>
parents: 5435
diff changeset
530
11640
51598e46e136 util.stanza: Simplify and make pretty-printing look nicer
Kim Alvefur <zash@zash.se>
parents: 11639
diff changeset
531 local text_replace = (
51598e46e136 util.stanza: Simplify and make pretty-printing look nicer
Kim Alvefur <zash@zash.se>
parents: 11639
diff changeset
532 getstring(green1, "%1") .. -- &
51598e46e136 util.stanza: Simplify and make pretty-printing look nicer
Kim Alvefur <zash@zash.se>
parents: 11639
diff changeset
533 getstring(green2, "%2") .. -- amp
51598e46e136 util.stanza: Simplify and make pretty-printing look nicer
Kim Alvefur <zash@zash.se>
parents: 11639
diff changeset
534 getstring(green1, "%3") -- ;
51598e46e136 util.stanza: Simplify and make pretty-printing look nicer
Kim Alvefur <zash@zash.se>
parents: 11639
diff changeset
535 );
51598e46e136 util.stanza: Simplify and make pretty-printing look nicer
Kim Alvefur <zash@zash.se>
parents: 11639
diff changeset
536
11642
7f2dee4249aa util.stanza: Export pretty printing function
Kim Alvefur <zash@zash.se>
parents: 11640
diff changeset
537 function pretty(s)
11640
51598e46e136 util.stanza: Simplify and make pretty-printing look nicer
Kim Alvefur <zash@zash.se>
parents: 11639
diff changeset
538 -- Tag soup color
51598e46e136 util.stanza: Simplify and make pretty-printing look nicer
Kim Alvefur <zash@zash.se>
parents: 11639
diff changeset
539 -- Outer gsub call takes each <tag>, applies colour to the brackets, the
51598e46e136 util.stanza: Simplify and make pretty-printing look nicer
Kim Alvefur <zash@zash.se>
parents: 11639
diff changeset
540 -- tag name, then applies one inner gsub call to colour the attributes and
51598e46e136 util.stanza: Simplify and make pretty-printing look nicer
Kim Alvefur <zash@zash.se>
parents: 11639
diff changeset
541 -- another for any text content.
11960
12a3c05aa12d util.stanza: Adjust pretty printing for symmetry
Kim Alvefur <zash@zash.se>
parents: 11786
diff changeset
542 return (s:gsub("(<[?/]?)([^ >/?]*)(.-)([?/]?>)([^<]*)", function(opening_bracket, tag_name, attrs, closing_bracket, content)
11640
51598e46e136 util.stanza: Simplify and make pretty-printing look nicer
Kim Alvefur <zash@zash.se>
parents: 11639
diff changeset
543 return getstring(blue1, opening_bracket)..getstring(blue2, tag_name)..
51598e46e136 util.stanza: Simplify and make pretty-printing look nicer
Kim Alvefur <zash@zash.se>
parents: 11639
diff changeset
544 attrs:gsub("([^=]+)(=)([\"'])(.-)([\"'])", attr_replace) ..
51598e46e136 util.stanza: Simplify and make pretty-printing look nicer
Kim Alvefur <zash@zash.se>
parents: 11639
diff changeset
545 getstring(blue1, closing_bracket) ..
51598e46e136 util.stanza: Simplify and make pretty-printing look nicer
Kim Alvefur <zash@zash.se>
parents: 11639
diff changeset
546 content:gsub("(&#?)(%w+)(;)", text_replace);
51598e46e136 util.stanza: Simplify and make pretty-printing look nicer
Kim Alvefur <zash@zash.se>
parents: 11639
diff changeset
547 end, 100));
51598e46e136 util.stanza: Simplify and make pretty-printing look nicer
Kim Alvefur <zash@zash.se>
parents: 11639
diff changeset
548 end
51598e46e136 util.stanza: Simplify and make pretty-printing look nicer
Kim Alvefur <zash@zash.se>
parents: 11639
diff changeset
549
262
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
550 function stanza_mt.pretty_print(t)
11640
51598e46e136 util.stanza: Simplify and make pretty-printing look nicer
Kim Alvefur <zash@zash.se>
parents: 11639
diff changeset
551 return pretty(tostring(t));
262
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
552 end
5776
bd0ff8ae98a8 Remove all trailing whitespace
Florian Zeitz <florob@babelmonkeys.de>
parents: 5435
diff changeset
553
262
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
554 function stanza_mt.pretty_top_tag(t)
11640
51598e46e136 util.stanza: Simplify and make pretty-printing look nicer
Kim Alvefur <zash@zash.se>
parents: 11639
diff changeset
555 return pretty(t:top_tag());
262
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
556 end
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
557 else
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
558 -- Sorry, fresh out of colours for you guys ;)
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
559 stanza_mt.pretty_print = stanza_mt.__tostring;
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
560 stanza_mt.pretty_top_tag = stanza_mt.top_tag;
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
561 end
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
562
10717
05e4645fc9b3 util.stanza: Add method returning stanza with added indentation
Kim Alvefur <zash@zash.se>
parents: 10503
diff changeset
563 function stanza_mt.indent(t, level, indent)
05e4645fc9b3 util.stanza: Add method returning stanza with added indentation
Kim Alvefur <zash@zash.se>
parents: 10503
diff changeset
564 if #t == 0 or (#t == 1 and type(t[1]) == "string") then
05e4645fc9b3 util.stanza: Add method returning stanza with added indentation
Kim Alvefur <zash@zash.se>
parents: 10503
diff changeset
565 -- Empty nodes wouldn't have any indentation
05e4645fc9b3 util.stanza: Add method returning stanza with added indentation
Kim Alvefur <zash@zash.se>
parents: 10503
diff changeset
566 -- Text-only nodes are preserved as to not alter the text content
05e4645fc9b3 util.stanza: Add method returning stanza with added indentation
Kim Alvefur <zash@zash.se>
parents: 10503
diff changeset
567 -- Optimization: Skip clone of these since we don't alter them
05e4645fc9b3 util.stanza: Add method returning stanza with added indentation
Kim Alvefur <zash@zash.se>
parents: 10503
diff changeset
568 return t;
05e4645fc9b3 util.stanza: Add method returning stanza with added indentation
Kim Alvefur <zash@zash.se>
parents: 10503
diff changeset
569 end
05e4645fc9b3 util.stanza: Add method returning stanza with added indentation
Kim Alvefur <zash@zash.se>
parents: 10503
diff changeset
570
05e4645fc9b3 util.stanza: Add method returning stanza with added indentation
Kim Alvefur <zash@zash.se>
parents: 10503
diff changeset
571 indent = indent or "\t";
05e4645fc9b3 util.stanza: Add method returning stanza with added indentation
Kim Alvefur <zash@zash.se>
parents: 10503
diff changeset
572 level = level or 1;
05e4645fc9b3 util.stanza: Add method returning stanza with added indentation
Kim Alvefur <zash@zash.se>
parents: 10503
diff changeset
573 local tag = clone(t, true);
05e4645fc9b3 util.stanza: Add method returning stanza with added indentation
Kim Alvefur <zash@zash.se>
parents: 10503
diff changeset
574
05e4645fc9b3 util.stanza: Add method returning stanza with added indentation
Kim Alvefur <zash@zash.se>
parents: 10503
diff changeset
575 for child in t:children() do
05e4645fc9b3 util.stanza: Add method returning stanza with added indentation
Kim Alvefur <zash@zash.se>
parents: 10503
diff changeset
576 if type(child) == "string" then
05e4645fc9b3 util.stanza: Add method returning stanza with added indentation
Kim Alvefur <zash@zash.se>
parents: 10503
diff changeset
577 -- Already indented text would look weird but let's ignore that for now.
05e4645fc9b3 util.stanza: Add method returning stanza with added indentation
Kim Alvefur <zash@zash.se>
parents: 10503
diff changeset
578 if child:find("%S") then
05e4645fc9b3 util.stanza: Add method returning stanza with added indentation
Kim Alvefur <zash@zash.se>
parents: 10503
diff changeset
579 tag:text("\n" .. indent:rep(level));
05e4645fc9b3 util.stanza: Add method returning stanza with added indentation
Kim Alvefur <zash@zash.se>
parents: 10503
diff changeset
580 tag:text(child);
05e4645fc9b3 util.stanza: Add method returning stanza with added indentation
Kim Alvefur <zash@zash.se>
parents: 10503
diff changeset
581 end
05e4645fc9b3 util.stanza: Add method returning stanza with added indentation
Kim Alvefur <zash@zash.se>
parents: 10503
diff changeset
582 elseif is_stanza(child) then
05e4645fc9b3 util.stanza: Add method returning stanza with added indentation
Kim Alvefur <zash@zash.se>
parents: 10503
diff changeset
583 tag:text("\n" .. indent:rep(level));
05e4645fc9b3 util.stanza: Add method returning stanza with added indentation
Kim Alvefur <zash@zash.se>
parents: 10503
diff changeset
584 tag:add_direct_child(child:indent(level+1, indent));
05e4645fc9b3 util.stanza: Add method returning stanza with added indentation
Kim Alvefur <zash@zash.se>
parents: 10503
diff changeset
585 end
05e4645fc9b3 util.stanza: Add method returning stanza with added indentation
Kim Alvefur <zash@zash.se>
parents: 10503
diff changeset
586 end
05e4645fc9b3 util.stanza: Add method returning stanza with added indentation
Kim Alvefur <zash@zash.se>
parents: 10503
diff changeset
587 -- before the closing tag
05e4645fc9b3 util.stanza: Add method returning stanza with added indentation
Kim Alvefur <zash@zash.se>
parents: 10503
diff changeset
588 tag:text("\n" .. indent:rep((level-1)));
05e4645fc9b3 util.stanza: Add method returning stanza with added indentation
Kim Alvefur <zash@zash.se>
parents: 10503
diff changeset
589
05e4645fc9b3 util.stanza: Add method returning stanza with added indentation
Kim Alvefur <zash@zash.se>
parents: 10503
diff changeset
590 return tag;
05e4645fc9b3 util.stanza: Add method returning stanza with added indentation
Kim Alvefur <zash@zash.se>
parents: 10503
diff changeset
591 end
05e4645fc9b3 util.stanza: Add method returning stanza with added indentation
Kim Alvefur <zash@zash.se>
parents: 10503
diff changeset
592
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
593 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
594 stanza_mt = stanza_mt;
7253
f4e71242556a util.stanza: Some code cleanup [luacheck]
Matthew Wild <mwild1@gmail.com>
parents: 6821
diff changeset
595 stanza = new_stanza;
7750
e58524240b30 util.stanza: Add an is_stanza() function to check if an object is a stanza
Kim Alvefur <zash@zash.se>
parents: 7253
diff changeset
596 is_stanza = is_stanza;
6777
5de6b93d0190 util.*: Remove use of module() function, make all module functions local and return them in a table at the end
Kim Alvefur <zash@zash.se>
parents: 6501
diff changeset
597 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
598 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
599 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
600 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
601 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
602 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
603 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
604 presence = presence;
6821
5de30376bf98 util.stanza: Export xml_escape (missed during removal of module() calls)
Kim Alvefur <zash@zash.se>
parents: 6777
diff changeset
605 xml_escape = xml_escape;
11642
7f2dee4249aa util.stanza: Export pretty printing function
Kim Alvefur <zash@zash.se>
parents: 11640
diff changeset
606 pretty_print = pretty;
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
607 };