util/stanza.lua
author Matthew Wild <mwild1@gmail.com>
Sun, 26 Oct 2008 14:27:10 +0000
changeset 180 d8b9a19d70eb
parent 145 fbb3a4ff9cf1
child 181 d952eae776dc
permissions -rw-r--r--
Make add_child() behave as expected. Old add_child() is now add_direct_child()
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
	t_insert(self.last_add, s);
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
	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
    58
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
    59
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
    60
function stanza_mt:child_with_name(name)
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
    61
	for _, child in ipairs(self) do	
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
    62
		if child.name == name then return child; 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
end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
    65
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
    66
function stanza_mt:children()
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
    67
	local i = 0;
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
    68
	return function (a)
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
    69
			i = i + 1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
    70
			local v = a[i]
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
    71
			if v then return v; end
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
    72
		end, self, i;
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
    73
	                                    
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
    74
end
2
9bb397205f26 Working presence!
matthew
parents: 1
diff changeset
    75
function stanza_mt:childtags()
9bb397205f26 Working presence!
matthew
parents: 1
diff changeset
    76
	local i = 0;
9bb397205f26 Working presence!
matthew
parents: 1
diff changeset
    77
	return function (a)
9bb397205f26 Working presence!
matthew
parents: 1
diff changeset
    78
			i = i + 1
9bb397205f26 Working presence!
matthew
parents: 1
diff changeset
    79
			local v = self.tags[i]
9bb397205f26 Working presence!
matthew
parents: 1
diff changeset
    80
			if v then return v; end
9bb397205f26 Working presence!
matthew
parents: 1
diff changeset
    81
		end, self.tags[1], i;
9bb397205f26 Working presence!
matthew
parents: 1
diff changeset
    82
	                                    
9bb397205f26 Working presence!
matthew
parents: 1
diff changeset
    83
end
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
    84
4
09c3845ed442 Presence unavailable on disconnect
matthew
parents: 2
diff changeset
    85
do
09c3845ed442 Presence unavailable on disconnect
matthew
parents: 2
diff changeset
    86
	local xml_entities = { ["'"] = "&apos;", ["\""] = "&quot;", ["<"] = "&lt;", [">"] = "&gt;", ["&"] = "&amp;" };
09c3845ed442 Presence unavailable on disconnect
matthew
parents: 2
diff changeset
    87
	function xml_escape(s) return s_gsub(s, "['&<>\"]", xml_entities); end
09c3845ed442 Presence unavailable on disconnect
matthew
parents: 2
diff changeset
    88
end
09c3845ed442 Presence unavailable on disconnect
matthew
parents: 2
diff changeset
    89
09c3845ed442 Presence unavailable on disconnect
matthew
parents: 2
diff changeset
    90
local xml_escape = xml_escape;
09c3845ed442 Presence unavailable on disconnect
matthew
parents: 2
diff changeset
    91
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
    92
function stanza_mt.__tostring(t)
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
    93
	local children_text = "";
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
    94
	for n, child in ipairs(t) do
4
09c3845ed442 Presence unavailable on disconnect
matthew
parents: 2
diff changeset
    95
		if type(child) == "string" then	
09c3845ed442 Presence unavailable on disconnect
matthew
parents: 2
diff changeset
    96
			children_text = children_text .. xml_escape(child);
09c3845ed442 Presence unavailable on disconnect
matthew
parents: 2
diff changeset
    97
		else
09c3845ed442 Presence unavailable on disconnect
matthew
parents: 2
diff changeset
    98
			children_text = children_text .. tostring(child);
09c3845ed442 Presence unavailable on disconnect
matthew
parents: 2
diff changeset
    99
		end
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   100
	end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   101
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   102
	local attr_string = "";
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   103
	if t.attr then
23
236375777f8c Some docs written by Thorns. Need reviewing.
bt@silverblade
parents: 6
diff changeset
   104
		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
   105
	end
23
236375777f8c Some docs written by Thorns. Need reviewing.
bt@silverblade
parents: 6
diff changeset
   106
	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
   107
end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   108
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   109
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
   110
	return s1:add_direct_child(s2);
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   111
end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   112
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   113
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   114
do
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   115
        local id = 0;
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   116
        function new_id()
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   117
                id = id + 1;
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   118
                return "lx"..id;
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   119
        end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   120
end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   121
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
   122
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
   123
	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
   124
	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
   125
		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
   126
			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
   127
		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
   128
			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
   129
		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
   130
	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
   131
	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
   132
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
   133
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
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
   135
	-- Set metatable
91
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents: 90
diff changeset
   136
	if stanza then
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents: 90
diff changeset
   137
		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
   138
		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
   139
			if type(child) == "table" then
91
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents: 90
diff changeset
   140
				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
   141
			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
   142
		end
91
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents: 90
diff changeset
   143
		if not stanza.tags then
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents: 90
diff changeset
   144
			-- Rebuild tags
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents: 90
diff changeset
   145
			local tags = {};
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents: 90
diff changeset
   146
			for _, child in ipairs(stanza) do
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents: 90
diff changeset
   147
				if type(child) == "table" then
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents: 90
diff changeset
   148
					t_insert(tags, child);
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents: 90
diff changeset
   149
				end
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents: 90
diff changeset
   150
			end
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents: 90
diff changeset
   151
			stanza.tags = tags;
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents: 90
diff changeset
   152
		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
   153
	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
   154
	
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
   155
	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
   156
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
   157
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   158
function message(attr, body)
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   159
	if not body then
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   160
		return stanza("message", attr);
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   161
	else
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   162
		return stanza("message", attr):tag("body"):text(body);
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   163
	end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   164
end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   165
function iq(attr)
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   166
	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
   167
	return stanza("iq", attr or { id = new_id() });
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   168
end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   169
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   170
function reply(orig)
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   171
	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 nil) });
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   172
end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   173
60
44800be871f5 User registration, etc (jabber:iq:register)
Waqas Hussain <waqas20@gmail.com>
parents: 30
diff changeset
   174
function error_reply(orig, type, condition, message, clone)
70
a6c00467a3f8 Fixed typo in variable name
Waqas Hussain <waqas20@gmail.com>
parents: 62
diff changeset
   175
	local t = reply(orig);
60
44800be871f5 User registration, etc (jabber:iq:register)
Waqas Hussain <waqas20@gmail.com>
parents: 30
diff changeset
   176
	t.attr.type = "error";
44800be871f5 User registration, etc (jabber:iq:register)
Waqas Hussain <waqas20@gmail.com>
parents: 30
diff changeset
   177
	-- TODO use clone
44800be871f5 User registration, etc (jabber:iq:register)
Waqas Hussain <waqas20@gmail.com>
parents: 30
diff changeset
   178
	t:tag("error", {type = type})
44800be871f5 User registration, etc (jabber:iq:register)
Waqas Hussain <waqas20@gmail.com>
parents: 30
diff changeset
   179
		: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
   180
	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
   181
	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
   182
end
44800be871f5 User registration, etc (jabber:iq:register)
Waqas Hussain <waqas20@gmail.com>
parents: 30
diff changeset
   183
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   184
function presence(attr)
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   185
	return stanza("presence", attr);
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   186
end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   187
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
return _M;