Software `/` code `/` prosody

Annotate

util/stanza.lua @ 562:04ee161d936b

Comment out debug logging for now

author	Matthew Wild <mwild1@gmail.com>
date	Fri, 05 Dec 2008 19:22:34 +0000
parent	519:cccd610a0ef9
child	613:6c09127b50fb
child	626:cf1d26fd4d6f

rev	line source
519 cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 373 diff changeset	1 -- Prosody IM v0.1
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 373 diff changeset	2 -- Copyright (C) 2008 Matthew Wild
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 373 diff changeset	3 -- Copyright (C) 2008 Waqas Hussain
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 373 diff changeset	4 --
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 373 diff changeset	5 -- This program is free software; you can redistribute it and/or
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 373 diff changeset	6 -- modify it under the terms of the GNU General Public License
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 373 diff changeset	7 -- as published by the Free Software Foundation; either version 2
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 373 diff changeset	8 -- of the License, or (at your option) any later version.
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 373 diff changeset	9 --
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 373 diff changeset	10 -- This program is distributed in the hope that it will be useful,
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 373 diff changeset	11 -- but WITHOUT ANY WARRANTY; without even the implied warranty of
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 373 diff changeset	12 -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 373 diff changeset	13 -- GNU General Public License for more details.
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 373 diff changeset	14 --
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 373 diff changeset	15 -- You should have received a copy of the GNU General Public License
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 373 diff changeset	16 -- along with this program; if not, write to the Free Software
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 373 diff changeset	17 -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 373 diff changeset	18 --
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 373 diff changeset	19
cccd610a0ef9 Insert copyright/license headers Matthew Wild <mwild1@gmail.com> parents: 373 diff changeset	20
1 b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	21 local t_insert = table.insert;
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	22 local t_remove = table.remove;
23 236375777f8c Some docs written by Thorns. Need reviewing. bt@silverblade parents: 6 diff changeset	23 local s_format = string.format;
1 b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	24 local tostring = tostring;
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	25 local setmetatable = setmetatable;
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	26 local pairs = pairs;
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	27 local ipairs = ipairs;
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	28 local type = type;
145 fbb3a4ff9cf1 dialback keys now verified Matthew Wild <mwild1@gmail.com> parents: 91 diff changeset	29 local next = next;
fbb3a4ff9cf1 dialback keys now verified Matthew Wild <mwild1@gmail.com> parents: 91 diff changeset	30 local print = print;
90 da468ed49a7b Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these. Matthew Wild <mwild1@gmail.com> parents: 70 diff changeset	31 local unpack = unpack;
4 09c3845ed442 Presence unavailable on disconnect matthew parents: 2 diff changeset	32 local s_gsub = string.gsub;
262 8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	33 local os = os;
145 fbb3a4ff9cf1 dialback keys now verified Matthew Wild <mwild1@gmail.com> parents: 91 diff changeset	34
262 8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	35 local do_pretty_printing = not os.getenv("WINDIR");
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	36 local getstyle, getstring = require "util.termcolours".getstyle, require "util.termcolours".getstring;
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	37
145 fbb3a4ff9cf1 dialback keys now verified Matthew Wild <mwild1@gmail.com> parents: 91 diff changeset	38 local log = require "util.logger".init("stanza");
fbb3a4ff9cf1 dialback keys now verified Matthew Wild <mwild1@gmail.com> parents: 91 diff changeset	39
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	40 module "stanza"
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	41
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	42 stanza_mt = {};
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	43 stanza_mt.__index = stanza_mt;
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	44
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	45 function stanza(name, attr)
1 b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	46 local stanza = { name = name, attr = attr or {}, tags = {}, last_add = {}};
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	47 return setmetatable(stanza, stanza_mt);
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	48 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	49
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	50 function stanza_mt:query(xmlns)
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	51 return self:tag("query", { xmlns = xmlns });
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	52 end
373 dd0345edeaf4 Add helper function for adding message bodies to stanzas Matthew Wild <mwild1@gmail.com> parents: 338 diff changeset	53
dd0345edeaf4 Add helper function for adding message bodies to stanzas Matthew Wild <mwild1@gmail.com> parents: 338 diff changeset	54 function stanza_mt:body(text, attr)
dd0345edeaf4 Add helper function for adding message bodies to stanzas Matthew Wild <mwild1@gmail.com> parents: 338 diff changeset	55 return self:tag("body", attr):text(text);
dd0345edeaf4 Add helper function for adding message bodies to stanzas Matthew Wild <mwild1@gmail.com> parents: 338 diff changeset	56 end
dd0345edeaf4 Add helper function for adding message bodies to stanzas Matthew Wild <mwild1@gmail.com> parents: 338 diff changeset	57
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	58 function stanza_mt:tag(name, attrs)
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	59 local s = stanza(name, attrs);
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	60 (self.last_add[#self.last_add] or self):add_direct_child(s);
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	61 t_insert(self.last_add, s);
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	62 return self;
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	63 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	64
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	65 function stanza_mt:text(text)
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	66 (self.last_add[#self.last_add] or self):add_direct_child(text);
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	67 return self;
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	68 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	69
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	70 function stanza_mt:up()
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	71 t_remove(self.last_add);
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	72 return self;
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	73 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	74
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	75 function stanza_mt:add_direct_child(child)
1 b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	76 if type(child) == "table" then
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	77 t_insert(self.tags, child);
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	78 end
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	79 t_insert(self, child);
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	80 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	81
180 d8b9a19d70eb Make add_child() behave as expected. Old add_child() is now add_direct_child() Matthew Wild <mwild1@gmail.com> parents: 145 diff changeset	82 function stanza_mt:add_child(child)
d8b9a19d70eb Make add_child() behave as expected. Old add_child() is now add_direct_child() Matthew Wild <mwild1@gmail.com> parents: 145 diff changeset	83 (self.last_add[#self.last_add] or self):add_direct_child(child);
d8b9a19d70eb Make add_child() behave as expected. Old add_child() is now add_direct_child() Matthew Wild <mwild1@gmail.com> parents: 145 diff changeset	84 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	85 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	86
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	87 function stanza_mt:child_with_name(name)
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	88 for _, child in ipairs(self) do
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	89 if child.name == name then return child; end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	90 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	91 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	92
1 b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	93 function stanza_mt:children()
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	94 local i = 0;
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	95 return function (a)
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	96 i = i + 1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	97 local v = a[i]
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	98 if v then return v; end
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	99 end, self, i;
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	100
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	101 end
2 9bb397205f26 Working presence! matthew parents: 1 diff changeset	102 function stanza_mt:childtags()
9bb397205f26 Working presence! matthew parents: 1 diff changeset	103 local i = 0;
9bb397205f26 Working presence! matthew parents: 1 diff changeset	104 return function (a)
9bb397205f26 Working presence! matthew parents: 1 diff changeset	105 i = i + 1
9bb397205f26 Working presence! matthew parents: 1 diff changeset	106 local v = self.tags[i]
9bb397205f26 Working presence! matthew parents: 1 diff changeset	107 if v then return v; end
9bb397205f26 Working presence! matthew parents: 1 diff changeset	108 end, self.tags[1], i;
9bb397205f26 Working presence! matthew parents: 1 diff changeset	109
9bb397205f26 Working presence! matthew parents: 1 diff changeset	110 end
1 b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	111
4 09c3845ed442 Presence unavailable on disconnect matthew parents: 2 diff changeset	112 do
09c3845ed442 Presence unavailable on disconnect matthew parents: 2 diff changeset	113 local xml_entities = { ["'"] = "'", ["\""] = """, ["<"] = "<", [">"] = ">", ["&"] = "&" };
09c3845ed442 Presence unavailable on disconnect matthew parents: 2 diff changeset	114 function xml_escape(s) return s_gsub(s, "['&<>\"]", xml_entities); end
09c3845ed442 Presence unavailable on disconnect matthew parents: 2 diff changeset	115 end
09c3845ed442 Presence unavailable on disconnect matthew parents: 2 diff changeset	116
09c3845ed442 Presence unavailable on disconnect matthew parents: 2 diff changeset	117 local xml_escape = xml_escape;
09c3845ed442 Presence unavailable on disconnect matthew parents: 2 diff changeset	118
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	119 function stanza_mt.__tostring(t)
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	120 local children_text = "";
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	121 for n, child in ipairs(t) do
4 09c3845ed442 Presence unavailable on disconnect matthew parents: 2 diff changeset	122 if type(child) == "string" then
09c3845ed442 Presence unavailable on disconnect matthew parents: 2 diff changeset	123 children_text = children_text .. xml_escape(child);
09c3845ed442 Presence unavailable on disconnect matthew parents: 2 diff changeset	124 else
09c3845ed442 Presence unavailable on disconnect matthew parents: 2 diff changeset	125 children_text = children_text .. tostring(child);
09c3845ed442 Presence unavailable on disconnect matthew parents: 2 diff changeset	126 end
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	127 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	128
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	129 local attr_string = "";
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	130 if t.attr then
338 804f5e62a41f Don't forget to escape XML in attributes. Thanks to the Postgres Q&A room on conference.jabber.org :) Matthew Wild <mwild1@gmail.com> parents: 262 diff changeset	131 for k, v in pairs(t.attr) do if type(k) == "string" then attr_string = attr_string .. s_format(" %s='%s'", k, xml_escape(tostring(v))); end end
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	132 end
23 236375777f8c Some docs written by Thorns. Need reviewing. bt@silverblade parents: 6 diff changeset	133 return s_format("<%s%s>%s</%s>", t.name, attr_string, children_text, t.name);
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	134 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	135
242 f15afbcbc55c Add new top_tag() method to stanzas Matthew Wild <mwild1@gmail.com> parents: 209 diff changeset	136 function stanza_mt.top_tag(t)
f15afbcbc55c Add new top_tag() method to stanzas Matthew Wild <mwild1@gmail.com> parents: 209 diff changeset	137 local attr_string = "";
f15afbcbc55c Add new top_tag() method to stanzas Matthew Wild <mwild1@gmail.com> parents: 209 diff changeset	138 if t.attr then
338 804f5e62a41f Don't forget to escape XML in attributes. Thanks to the Postgres Q&A room on conference.jabber.org :) Matthew Wild <mwild1@gmail.com> parents: 262 diff changeset	139 for k, v in pairs(t.attr) do if type(k) == "string" then attr_string = attr_string .. s_format(" %s='%s'", k, xml_escape(tostring(v))); end end
242 f15afbcbc55c Add new top_tag() method to stanzas Matthew Wild <mwild1@gmail.com> parents: 209 diff changeset	140 end
f15afbcbc55c Add new top_tag() method to stanzas Matthew Wild <mwild1@gmail.com> parents: 209 diff changeset	141 return s_format("<%s%s>", t.name, attr_string);
f15afbcbc55c Add new top_tag() method to stanzas Matthew Wild <mwild1@gmail.com> parents: 209 diff changeset	142 end
f15afbcbc55c Add new top_tag() method to stanzas Matthew Wild <mwild1@gmail.com> parents: 209 diff changeset	143
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	144 function stanza_mt.__add(s1, s2)
180 d8b9a19d70eb Make add_child() behave as expected. Old add_child() is now add_direct_child() Matthew Wild <mwild1@gmail.com> parents: 145 diff changeset	145 return s1:add_direct_child(s2);
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	146 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	147
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	148
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	149 do
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	150 local id = 0;
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	151 function new_id()
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	152 id = id + 1;
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	153 return "lx"..id;
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	154 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	155 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	156
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	157 function preserialize(stanza)
da468ed49a7b Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these. Matthew Wild <mwild1@gmail.com> parents: 70 diff changeset	158 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	159 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	160 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	161 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	162 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	163 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	164 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	165 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	166 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	167 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	168
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	169 function deserialize(stanza)
da468ed49a7b Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these. Matthew Wild <mwild1@gmail.com> parents: 70 diff changeset	170 -- Set metatable
91 6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	171 if stanza then
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	172 setmetatable(stanza, stanza_mt);
90 da468ed49a7b Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these. Matthew Wild <mwild1@gmail.com> parents: 70 diff changeset	173 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	174 if type(child) == "table" then
91 6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	175 deserialize(child);
90 da468ed49a7b Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these. Matthew Wild <mwild1@gmail.com> parents: 70 diff changeset	176 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	177 end
91 6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	178 if not stanza.tags then
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	179 -- Rebuild tags
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	180 local tags = {};
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	181 for _, child in ipairs(stanza) do
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	182 if type(child) == "table" then
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	183 t_insert(tags, child);
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	184 end
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	185 end
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	186 stanza.tags = tags;
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	187 end
90 da468ed49a7b Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these. Matthew Wild <mwild1@gmail.com> parents: 70 diff changeset	188 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	189
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	190 return stanza;
da468ed49a7b Stanza preserialize/deserialize helpers, to strip and restore stanzas respectively. Fixed mod_vcard to use these. Matthew Wild <mwild1@gmail.com> parents: 70 diff changeset	191 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	192
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	193 function message(attr, body)
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	194 if not body then
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	195 return stanza("message", attr);
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	196 else
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	197 return stanza("message", attr):tag("body"):text(body);
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	198 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	199 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	200 function iq(attr)
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	201 if attr and not attr.id then attr.id = new_id(); end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	202 return stanza("iq", attr or { id = new_id() });
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	203 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	204
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	205 function reply(orig)
209 e9de0803676d Part one of internal component support Matthew Wild <mwild1@gmail.com> parents: 181 diff changeset	206 return stanza(orig.name, orig.attr and { to = orig.attr.from, from = orig.attr.to, id = orig.attr.id, type = ((orig.name == "iq" and "result") or orig.attr.type) });
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	207 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	208
60 44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: 30 diff changeset	209 function error_reply(orig, type, condition, message, clone)
70 a6c00467a3f8 Fixed typo in variable name Waqas Hussain <waqas20@gmail.com> parents: 62 diff changeset	210 local t = reply(orig);
60 44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: 30 diff changeset	211 t.attr.type = "error";
44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: 30 diff changeset	212 -- TODO use clone
44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: 30 diff changeset	213 t:tag("error", {type = type})
44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: 30 diff changeset	214 :tag(condition, {xmlns = "urn:ietf:params:xml:ns:xmpp-stanzas"}):up();
44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: 30 diff changeset	215 if (message) then t:tag("text"):text(message):up(); end
44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: 30 diff changeset	216 return t; -- stanza ready for adding app-specific errors
44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: 30 diff changeset	217 end
44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: 30 diff changeset	218
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	219 function presence(attr)
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	220 return stanza("presence", attr);
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	221 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	222
262 8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	223 if do_pretty_printing then
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	224 local style_attrk = getstyle("yellow");
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	225 local style_attrv = getstyle("red");
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	226 local style_tagname = getstyle("red");
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	227 local style_punc = getstyle("magenta");
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	228
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	229 local attr_format = " "..getstring(style_attrk, "%s")..getstring(style_punc, "=")..getstring(style_attrv, "'%s'");
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	230 local top_tag_format = getstring(style_punc, "<")..getstring(style_tagname, "%s").."%s"..getstring(style_punc, ">");
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	231 --local tag_format = getstring(style_punc, "<")..getstring(style_tagname, "%s").."%s"..getstring(style_punc, ">").."%s"..getstring(style_punc, "</")..getstring(style_tagname, "%s")..getstring(style_punc, ">");
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	232 local tag_format = top_tag_format.."%s"..getstring(style_punc, "</")..getstring(style_tagname, "%s")..getstring(style_punc, ">");
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	233 function stanza_mt.pretty_print(t)
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	234 local children_text = "";
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	235 for n, child in ipairs(t) do
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	236 if type(child) == "string" then
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	237 children_text = children_text .. xml_escape(child);
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	238 else
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	239 children_text = children_text .. child:pretty_print();
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	240 end
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	241 end
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	242
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	243 local attr_string = "";
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	244 if t.attr then
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	245 for k, v in pairs(t.attr) do if type(k) == "string" then attr_string = attr_string .. s_format(attr_format, k, tostring(v)); end end
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	246 end
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	247 return s_format(tag_format, t.name, attr_string, children_text, t.name);
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	248 end
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	249
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	250 function stanza_mt.pretty_top_tag(t)
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	251 local attr_string = "";
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	252 if t.attr then
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	253 for k, v in pairs(t.attr) do if type(k) == "string" then attr_string = attr_string .. s_format(attr_format, k, tostring(v)); end end
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	254 end
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	255 return s_format(top_tag_format, t.name, attr_string);
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	256 end
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	257 else
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	258 -- Sorry, fresh out of colours for you guys ;)
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	259 stanza_mt.pretty_print = stanza_mt.__tostring;
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	260 stanza_mt.pretty_top_tag = stanza_mt.top_tag;
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	261 end
8c73fb2ff4a2 A treat for Linux users ;) Matthew Wild <mwild1@gmail.com> parents: 251 diff changeset	262
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	263 return _M;

prosody

04ee161d936b

util/stanza.lua

Software / code / prosody

Annotate

util/stanza.lua @ 562:04ee161d936b

Software `/` code `/` prosody