Software `/` code `/` prosody

Annotate

util/stanza.lua @ 267:6303b7454ad0

Some bugs fixed

author	Waqas Hussain <waqas20@gmail.com>
date	Sat, 15 Nov 2008 05:33:14 +0500
parent	251:5b6dec537914
child	262:8c73fb2ff4a2

rev	line source
1 b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	1 local t_insert = table.insert;
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	2 local t_remove = table.remove;
23 236375777f8c Some docs written by Thorns. Need reviewing. bt@silverblade parents: 6 diff changeset	3 local s_format = string.format;
1 b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	4 local tostring = tostring;
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	5 local setmetatable = setmetatable;
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	6 local pairs = pairs;
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	7 local ipairs = ipairs;
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	8 local type = type;
145 fbb3a4ff9cf1 dialback keys now verified Matthew Wild <mwild1@gmail.com> parents: 91 diff changeset	9 local next = next;
fbb3a4ff9cf1 dialback keys now verified Matthew Wild <mwild1@gmail.com> parents: 91 diff changeset	10 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	11 local unpack = unpack;
4 09c3845ed442 Presence unavailable on disconnect matthew parents: 2 diff changeset	12 local s_gsub = string.gsub;
145 fbb3a4ff9cf1 dialback keys now verified Matthew Wild <mwild1@gmail.com> parents: 91 diff changeset	13
fbb3a4ff9cf1 dialback keys now verified Matthew Wild <mwild1@gmail.com> parents: 91 diff changeset	14 local debug = debug;
fbb3a4ff9cf1 dialback keys now verified Matthew Wild <mwild1@gmail.com> parents: 91 diff changeset	15 local log = require "util.logger".init("stanza");
fbb3a4ff9cf1 dialback keys now verified Matthew Wild <mwild1@gmail.com> parents: 91 diff changeset	16
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	17 module "stanza"
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	18
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	19 stanza_mt = {};
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	20 stanza_mt.__index = stanza_mt;
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	21
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	22 function stanza(name, attr)
1 b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	23 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	24 return setmetatable(stanza, stanza_mt);
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	25 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	26
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	27 function stanza_mt:query(xmlns)
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	28 return self:tag("query", { xmlns = xmlns });
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	29 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	30 function stanza_mt:tag(name, attrs)
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	31 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	32 (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	33 t_insert(self.last_add, s);
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	34 return self;
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	35 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	36
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	37 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	38 (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	39 return self;
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	40 end
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 function stanza_mt:up()
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	43 t_remove(self.last_add);
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	44 return self;
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	45 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	46
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	47 function stanza_mt:add_direct_child(child)
1 b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	48 if type(child) == "table" then
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	49 t_insert(self.tags, child);
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	50 end
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	51 t_insert(self, child);
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	52 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	53
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	54 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	55 (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	56 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	57 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	58
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	59 function stanza_mt:child_with_name(name)
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	60 for _, child in ipairs(self) do
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	61 if child.name == name then return child; end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	62 end
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
1 b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	65 function stanza_mt:children()
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	66 local i = 0;
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	67 return function (a)
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	68 i = i + 1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	69 local v = a[i]
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	70 if v then return v; end
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	71 end, self, i;
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	72
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	73 end
2 9bb397205f26 Working presence! matthew parents: 1 diff changeset	74 function stanza_mt:childtags()
9bb397205f26 Working presence! matthew parents: 1 diff changeset	75 local i = 0;
9bb397205f26 Working presence! matthew parents: 1 diff changeset	76 return function (a)
9bb397205f26 Working presence! matthew parents: 1 diff changeset	77 i = i + 1
9bb397205f26 Working presence! matthew parents: 1 diff changeset	78 local v = self.tags[i]
9bb397205f26 Working presence! matthew parents: 1 diff changeset	79 if v then return v; end
9bb397205f26 Working presence! matthew parents: 1 diff changeset	80 end, self.tags[1], i;
9bb397205f26 Working presence! matthew parents: 1 diff changeset	81
9bb397205f26 Working presence! matthew parents: 1 diff changeset	82 end
1 b8787e859fd2 Switched to new connection framework, courtesy of the luadch project matthew parents: 0 diff changeset	83
4 09c3845ed442 Presence unavailable on disconnect matthew parents: 2 diff changeset	84 do
09c3845ed442 Presence unavailable on disconnect matthew parents: 2 diff changeset	85 local xml_entities = { ["'"] = "'", ["\""] = """, ["<"] = "<", [">"] = ">", ["&"] = "&" };
09c3845ed442 Presence unavailable on disconnect matthew parents: 2 diff changeset	86 function xml_escape(s) return s_gsub(s, "['&<>\"]", xml_entities); end
09c3845ed442 Presence unavailable on disconnect matthew parents: 2 diff changeset	87 end
09c3845ed442 Presence unavailable on disconnect matthew parents: 2 diff changeset	88
09c3845ed442 Presence unavailable on disconnect matthew parents: 2 diff changeset	89 local xml_escape = xml_escape;
09c3845ed442 Presence unavailable on disconnect matthew parents: 2 diff changeset	90
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	91 function stanza_mt.__tostring(t)
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	92 local children_text = "";
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	93 for n, child in ipairs(t) do
4 09c3845ed442 Presence unavailable on disconnect matthew parents: 2 diff changeset	94 if type(child) == "string" then
09c3845ed442 Presence unavailable on disconnect matthew parents: 2 diff changeset	95 children_text = children_text .. xml_escape(child);
09c3845ed442 Presence unavailable on disconnect matthew parents: 2 diff changeset	96 else
09c3845ed442 Presence unavailable on disconnect matthew parents: 2 diff changeset	97 children_text = children_text .. tostring(child);
09c3845ed442 Presence unavailable on disconnect matthew parents: 2 diff changeset	98 end
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	99 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	100
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	101 local attr_string = "";
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	102 if t.attr then
23 236375777f8c Some docs written by Thorns. Need reviewing. bt@silverblade parents: 6 diff changeset	103 for k, v in pairs(t.attr) do if type(k) == "string" then attr_string = attr_string .. s_format(" %s='%s'", k, tostring(v)); end end
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	104 end
23 236375777f8c Some docs written by Thorns. Need reviewing. bt@silverblade parents: 6 diff changeset	105 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	106 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	107
242 f15afbcbc55c Add new top_tag() method to stanzas Matthew Wild <mwild1@gmail.com> parents: 209 diff changeset	108 function stanza_mt.top_tag(t)
f15afbcbc55c Add new top_tag() method to stanzas Matthew Wild <mwild1@gmail.com> parents: 209 diff changeset	109 local attr_string = "";
f15afbcbc55c Add new top_tag() method to stanzas Matthew Wild <mwild1@gmail.com> parents: 209 diff changeset	110 if t.attr then
f15afbcbc55c Add new top_tag() method to stanzas Matthew Wild <mwild1@gmail.com> parents: 209 diff changeset	111 for k, v in pairs(t.attr) do if type(k) == "string" then attr_string = attr_string .. s_format(" %s='%s'", k, tostring(v)); end end
f15afbcbc55c Add new top_tag() method to stanzas Matthew Wild <mwild1@gmail.com> parents: 209 diff changeset	112 end
f15afbcbc55c Add new top_tag() method to stanzas Matthew Wild <mwild1@gmail.com> parents: 209 diff changeset	113 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	114 end
f15afbcbc55c Add new top_tag() method to stanzas Matthew Wild <mwild1@gmail.com> parents: 209 diff changeset	115
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	116 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	117 return s1:add_direct_child(s2);
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	118 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	119
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	120
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	121 do
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	122 local id = 0;
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	123 function new_id()
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	124 id = id + 1;
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	125 return "lx"..id;
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	126 end
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
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	129 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	130 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	131 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	132 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	133 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	134 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	135 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	136 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	137 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	138 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	139 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	140
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	141 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	142 -- Set metatable
91 6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	143 if stanza then
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	144 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	145 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	146 if type(child) == "table" then
91 6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	147 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	148 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	149 end
91 6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	150 if not stanza.tags then
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	151 -- Rebuild tags
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	152 local tags = {};
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	153 for _, child in ipairs(stanza) do
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	154 if type(child) == "table" then
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	155 t_insert(tags, child);
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	156 end
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	157 end
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	158 stanza.tags = tags;
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas Waqas Hussain <waqas20@gmail.com> parents: 90 diff changeset	159 end
246 0904fd197cbe Fixed stanza deserialization Waqas Hussain <waqas20@gmail.com> parents: 209 diff changeset	160 if not stanza.last_add then
0904fd197cbe Fixed stanza deserialization Waqas Hussain <waqas20@gmail.com> parents: 209 diff changeset	161 stanza.last_add = {};
0904fd197cbe Fixed stanza deserialization Waqas Hussain <waqas20@gmail.com> parents: 209 diff changeset	162 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	163 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	164
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 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	166 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	167
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	168 function message(attr, body)
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	169 if not body then
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	170 return stanza("message", attr);
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	171 else
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	172 return stanza("message", attr):tag("body"):text(body);
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	173 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	174 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	175 function iq(attr)
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	176 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	177 return stanza("iq", attr or { id = new_id() });
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	178 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	179
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	180 function reply(orig)
209 e9de0803676d Part one of internal component support Matthew Wild <mwild1@gmail.com> parents: 181 diff changeset	181 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	182 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	183
60 44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: 30 diff changeset	184 function error_reply(orig, type, condition, message, clone)
70 a6c00467a3f8 Fixed typo in variable name Waqas Hussain <waqas20@gmail.com> parents: 62 diff changeset	185 local t = reply(orig);
60 44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: 30 diff changeset	186 t.attr.type = "error";
44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: 30 diff changeset	187 -- TODO use clone
44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: 30 diff changeset	188 t:tag("error", {type = type})
44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: 30 diff changeset	189 :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	190 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	191 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	192 end
44800be871f5 User registration, etc (jabber:iq:register) Waqas Hussain <waqas20@gmail.com> parents: 30 diff changeset	193
0 3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	194 function presence(attr)
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	195 return stanza("presence", attr);
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	196 end
3e3171b59028 First commit, where do you want to go tomorrow? matthew parents: diff changeset	197
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	198 return _M;

prosody

6303b7454ad0

util/stanza.lua

Software / code / prosody

Annotate

util/stanza.lua @ 267:6303b7454ad0

Software `/` code `/` prosody