util/stanza.lua
author Matthew Wild <mwild1@gmail.com>
Sat, 22 Nov 2008 19:07:41 +0000
changeset 373 dd0345edeaf4
parent 338 804f5e62a41f
child 519 cccd610a0ef9
permissions -rw-r--r--
Add helper function for adding message bodies to stanzas
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;
262
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
    13
local os = os;
145
fbb3a4ff9cf1 dialback keys now verified
Matthew Wild <mwild1@gmail.com>
parents: 91
diff changeset
    14
262
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
    15
local do_pretty_printing = not os.getenv("WINDIR");
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
    16
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
    17
145
fbb3a4ff9cf1 dialback keys now verified
Matthew Wild <mwild1@gmail.com>
parents: 91
diff changeset
    18
local log = require "util.logger".init("stanza");
fbb3a4ff9cf1 dialback keys now verified
Matthew Wild <mwild1@gmail.com>
parents: 91
diff changeset
    19
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
    20
module "stanza"
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
stanza_mt = {};
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
    23
stanza_mt.__index = stanza_mt;
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
    24
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
    25
function stanza(name, attr)
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
    26
	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
    27
	return setmetatable(stanza, stanza_mt);
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
    28
end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
    29
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
    30
function stanza_mt:query(xmlns)
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
    31
	return self:tag("query", { xmlns = xmlns });
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
    32
end
373
dd0345edeaf4 Add helper function for adding message bodies to stanzas
Matthew Wild <mwild1@gmail.com>
parents: 338
diff changeset
    33
dd0345edeaf4 Add helper function for adding message bodies to stanzas
Matthew Wild <mwild1@gmail.com>
parents: 338
diff changeset
    34
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
    35
	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
    36
end
dd0345edeaf4 Add helper function for adding message bodies to stanzas
Matthew Wild <mwild1@gmail.com>
parents: 338
diff changeset
    37
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
    38
function stanza_mt:tag(name, attrs)
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
    39
	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
    40
	(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
    41
	t_insert(self.last_add, s);
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
    42
	return self;
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
    43
end
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_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
    46
	(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
    47
	return self; 
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:up()
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
    51
	t_remove(self.last_add);
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
    52
	return self;
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
    53
end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
    54
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
    55
function stanza_mt:add_direct_child(child)
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
    56
	if type(child) == "table" then
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
    57
		t_insert(self.tags, child);
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
    58
	end
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
    59
	t_insert(self, child);
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
    60
end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
    61
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
    62
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
    63
	(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
    64
	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
    65
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
    66
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
    67
function stanza_mt:child_with_name(name)
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
    68
	for _, child in ipairs(self) do	
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
    69
		if child.name == name then return child; end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
    70
	end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
    71
end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
    72
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
    73
function stanza_mt:children()
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
    74
	local i = 0;
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
    75
	return function (a)
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
    76
			i = i + 1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
    77
			local v = a[i]
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
    78
			if v then return v; end
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
    79
		end, self, i;
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
    80
	                                    
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
    81
end
2
9bb397205f26 Working presence!
matthew
parents: 1
diff changeset
    82
function stanza_mt:childtags()
9bb397205f26 Working presence!
matthew
parents: 1
diff changeset
    83
	local i = 0;
9bb397205f26 Working presence!
matthew
parents: 1
diff changeset
    84
	return function (a)
9bb397205f26 Working presence!
matthew
parents: 1
diff changeset
    85
			i = i + 1
9bb397205f26 Working presence!
matthew
parents: 1
diff changeset
    86
			local v = self.tags[i]
9bb397205f26 Working presence!
matthew
parents: 1
diff changeset
    87
			if v then return v; end
9bb397205f26 Working presence!
matthew
parents: 1
diff changeset
    88
		end, self.tags[1], i;
9bb397205f26 Working presence!
matthew
parents: 1
diff changeset
    89
	                                    
9bb397205f26 Working presence!
matthew
parents: 1
diff changeset
    90
end
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
    91
4
09c3845ed442 Presence unavailable on disconnect
matthew
parents: 2
diff changeset
    92
do
09c3845ed442 Presence unavailable on disconnect
matthew
parents: 2
diff changeset
    93
	local xml_entities = { ["'"] = "&apos;", ["\""] = "&quot;", ["<"] = "&lt;", [">"] = "&gt;", ["&"] = "&amp;" };
09c3845ed442 Presence unavailable on disconnect
matthew
parents: 2
diff changeset
    94
	function xml_escape(s) return s_gsub(s, "['&<>\"]", xml_entities); end
09c3845ed442 Presence unavailable on disconnect
matthew
parents: 2
diff changeset
    95
end
09c3845ed442 Presence unavailable on disconnect
matthew
parents: 2
diff changeset
    96
09c3845ed442 Presence unavailable on disconnect
matthew
parents: 2
diff changeset
    97
local xml_escape = xml_escape;
09c3845ed442 Presence unavailable on disconnect
matthew
parents: 2
diff changeset
    98
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
    99
function stanza_mt.__tostring(t)
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   100
	local children_text = "";
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   101
	for n, child in ipairs(t) do
4
09c3845ed442 Presence unavailable on disconnect
matthew
parents: 2
diff changeset
   102
		if type(child) == "string" then	
09c3845ed442 Presence unavailable on disconnect
matthew
parents: 2
diff changeset
   103
			children_text = children_text .. xml_escape(child);
09c3845ed442 Presence unavailable on disconnect
matthew
parents: 2
diff changeset
   104
		else
09c3845ed442 Presence unavailable on disconnect
matthew
parents: 2
diff changeset
   105
			children_text = children_text .. tostring(child);
09c3845ed442 Presence unavailable on disconnect
matthew
parents: 2
diff changeset
   106
		end
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
	local attr_string = "";
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   110
	if t.attr then
338
804f5e62a41f Don't forget to escape XML in attributes. Thanks to the Postgres Q&amp;A room on conference.jabber.org :)
Matthew Wild <mwild1@gmail.com>
parents: 262
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, xml_escape(tostring(v))); end end
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   112
	end
23
236375777f8c Some docs written by Thorns. Need reviewing.
bt@silverblade
parents: 6
diff changeset
   113
	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
   114
end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   115
242
f15afbcbc55c Add new top_tag() method to stanzas
Matthew Wild <mwild1@gmail.com>
parents: 209
diff changeset
   116
function stanza_mt.top_tag(t)
f15afbcbc55c Add new top_tag() method to stanzas
Matthew Wild <mwild1@gmail.com>
parents: 209
diff changeset
   117
	local attr_string = "";
f15afbcbc55c Add new top_tag() method to stanzas
Matthew Wild <mwild1@gmail.com>
parents: 209
diff changeset
   118
	if t.attr then
338
804f5e62a41f Don't forget to escape XML in attributes. Thanks to the Postgres Q&amp;A room on conference.jabber.org :)
Matthew Wild <mwild1@gmail.com>
parents: 262
diff changeset
   119
		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
   120
	end
f15afbcbc55c Add new top_tag() method to stanzas
Matthew Wild <mwild1@gmail.com>
parents: 209
diff changeset
   121
	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
   122
end
f15afbcbc55c Add new top_tag() method to stanzas
Matthew Wild <mwild1@gmail.com>
parents: 209
diff changeset
   123
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   124
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
   125
	return s1:add_direct_child(s2);
0
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
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
do
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   130
        local id = 0;
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   131
        function new_id()
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   132
                id = id + 1;
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   133
                return "lx"..id;
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
end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   136
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
   137
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
   138
	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
   139
	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
   140
		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
   141
			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
   142
		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
   143
			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
   144
		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
   145
	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
   146
	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
   147
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
   148
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
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
   150
	-- Set metatable
91
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents: 90
diff changeset
   151
	if stanza then
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents: 90
diff changeset
   152
		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
   153
		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
   154
			if type(child) == "table" then
91
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents: 90
diff changeset
   155
				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
   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
		end
91
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents: 90
diff changeset
   158
		if not stanza.tags then
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents: 90
diff changeset
   159
			-- Rebuild tags
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents: 90
diff changeset
   160
			local tags = {};
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents: 90
diff changeset
   161
			for _, child in ipairs(stanza) do
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents: 90
diff changeset
   162
				if type(child) == "table" then
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents: 90
diff changeset
   163
					t_insert(tags, child);
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents: 90
diff changeset
   164
				end
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents: 90
diff changeset
   165
			end
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents: 90
diff changeset
   166
			stanza.tags = tags;
6d66eb6b24cb Fixed: util.stanza.deserialize now handles nil stanzas
Waqas Hussain <waqas20@gmail.com>
parents: 90
diff changeset
   167
		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
   168
	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
   169
	
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
	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
   171
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
   172
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   173
function message(attr, body)
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   174
	if not body then
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   175
		return stanza("message", attr);
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   176
	else
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   177
		return stanza("message", attr):tag("body"):text(body);
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
end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   180
function iq(attr)
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   181
	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
   182
	return stanza("iq", attr or { id = new_id() });
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   183
end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   184
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   185
function reply(orig)
209
e9de0803676d Part one of internal component support
Matthew Wild <mwild1@gmail.com>
parents: 181
diff changeset
   186
	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
   187
end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   188
60
44800be871f5 User registration, etc (jabber:iq:register)
Waqas Hussain <waqas20@gmail.com>
parents: 30
diff changeset
   189
function error_reply(orig, type, condition, message, clone)
70
a6c00467a3f8 Fixed typo in variable name
Waqas Hussain <waqas20@gmail.com>
parents: 62
diff changeset
   190
	local t = reply(orig);
60
44800be871f5 User registration, etc (jabber:iq:register)
Waqas Hussain <waqas20@gmail.com>
parents: 30
diff changeset
   191
	t.attr.type = "error";
44800be871f5 User registration, etc (jabber:iq:register)
Waqas Hussain <waqas20@gmail.com>
parents: 30
diff changeset
   192
	-- TODO use clone
44800be871f5 User registration, etc (jabber:iq:register)
Waqas Hussain <waqas20@gmail.com>
parents: 30
diff changeset
   193
	t:tag("error", {type = type})
44800be871f5 User registration, etc (jabber:iq:register)
Waqas Hussain <waqas20@gmail.com>
parents: 30
diff changeset
   194
		: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
   195
	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
   196
	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
   197
end
44800be871f5 User registration, etc (jabber:iq:register)
Waqas Hussain <waqas20@gmail.com>
parents: 30
diff changeset
   198
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   199
function presence(attr)
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   200
	return stanza("presence", attr);
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   201
end
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
   202
262
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
   203
if do_pretty_printing then
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
   204
	local style_attrk = getstyle("yellow");
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
   205
	local style_attrv = getstyle("red");
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
   206
	local style_tagname = getstyle("red");
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
   207
	local style_punc = getstyle("magenta");
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
   208
	
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
   209
	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
   210
	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
   211
	--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
   212
	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
   213
	function stanza_mt.pretty_print(t)
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
   214
		local children_text = "";
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
   215
		for n, child in ipairs(t) do
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
   216
			if type(child) == "string" then	
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
   217
				children_text = children_text .. xml_escape(child);
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
   218
			else
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
   219
				children_text = children_text .. child:pretty_print();
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
   220
			end
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
   221
		end
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
   222
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
   223
		local attr_string = "";
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
   224
		if t.attr then
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
   225
			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
   226
		end
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
   227
		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
   228
	end
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
   229
	
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
   230
	function stanza_mt.pretty_top_tag(t)
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
   231
		local attr_string = "";
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
   232
		if t.attr then
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
   233
			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
   234
		end
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
   235
		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
   236
	end
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
   237
else
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
   238
	-- Sorry, fresh out of colours for you guys ;)
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
   239
	stanza_mt.pretty_print = stanza_mt.__tostring;
8c73fb2ff4a2 A treat for Linux users ;)
Matthew Wild <mwild1@gmail.com>
parents: 251
diff changeset
   240
	stanza_mt.pretty_top_tag = stanza_mt.top_tag;
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
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
   243
return _M;