Sun, 30 Nov 2008 19:58:22 +0000
Change sed usage back into one sed script for incompetent versions of sed
185
a67c88ce1c6a
Added support for XEP-0049: Private XML Storage (mod_private)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
1 | |
a67c88ce1c6a
Added support for XEP-0049: Private XML Storage (mod_private)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
2 | local st = require "util.stanza" |
a67c88ce1c6a
Added support for XEP-0049: Private XML Storage (mod_private)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
3 | |
a67c88ce1c6a
Added support for XEP-0049: Private XML Storage (mod_private)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
4 | local jid_split = require "util.jid".split; |
a67c88ce1c6a
Added support for XEP-0049: Private XML Storage (mod_private)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
5 | local datamanager = require "util.datamanager" |
a67c88ce1c6a
Added support for XEP-0049: Private XML Storage (mod_private)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
6 | |
421
63be85693710
Modules now sending disco replies
Waqas Hussain <waqas20@gmail.com>
parents:
310
diff
changeset
|
7 | require "core.discomanager".set("private", "jabber:iq:private"); |
63be85693710
Modules now sending disco replies
Waqas Hussain <waqas20@gmail.com>
parents:
310
diff
changeset
|
8 | |
438
193f9dd64f17
Bumper commit for the new modulemanager API \o/ Updates all the modules, though some more changes may be in store.
Matthew Wild <mwild1@gmail.com>
parents:
421
diff
changeset
|
9 | module:add_iq_handler("c2s", "jabber:iq:private", |
185
a67c88ce1c6a
Added support for XEP-0049: Private XML Storage (mod_private)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
10 | function (session, stanza) |
a67c88ce1c6a
Added support for XEP-0049: Private XML Storage (mod_private)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
11 | local type = stanza.attr.type; |
a67c88ce1c6a
Added support for XEP-0049: Private XML Storage (mod_private)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
12 | local query = stanza.tags[1]; |
a67c88ce1c6a
Added support for XEP-0049: Private XML Storage (mod_private)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
13 | if (type == "get" or type == "set") and query.name == "query" then |
a67c88ce1c6a
Added support for XEP-0049: Private XML Storage (mod_private)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
14 | local node, host = jid_split(stanza.attr.to); |
a67c88ce1c6a
Added support for XEP-0049: Private XML Storage (mod_private)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
15 | if not(node or host) or (node == session.username and host == session.host) then |
a67c88ce1c6a
Added support for XEP-0049: Private XML Storage (mod_private)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
16 | node, host = session.username, session.host; |
a67c88ce1c6a
Added support for XEP-0049: Private XML Storage (mod_private)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
17 | if #query.tags == 1 then |
a67c88ce1c6a
Added support for XEP-0049: Private XML Storage (mod_private)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
18 | local tag = query.tags[1]; |
a67c88ce1c6a
Added support for XEP-0049: Private XML Storage (mod_private)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
19 | local key = tag.name..":"..tag.attr.xmlns; |
a67c88ce1c6a
Added support for XEP-0049: Private XML Storage (mod_private)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
20 | local data = datamanager.load(node, host, "private"); |
a67c88ce1c6a
Added support for XEP-0049: Private XML Storage (mod_private)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
21 | if stanza.attr.type == "get" then |
a67c88ce1c6a
Added support for XEP-0049: Private XML Storage (mod_private)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
22 | if data and data[key] then |
310
b28b51746fe7
Fixed mod_private to use session.send for sending stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
185
diff
changeset
|
23 | session.send(st.reply(stanza):tag("query", {xmlns = "jabber:iq:private"}):add_child(st.deserialize(data[key]))); |
185
a67c88ce1c6a
Added support for XEP-0049: Private XML Storage (mod_private)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
24 | else |
310
b28b51746fe7
Fixed mod_private to use session.send for sending stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
185
diff
changeset
|
25 | session.send(st.reply(stanza):add_child(stanza.tags[1])); |
185
a67c88ce1c6a
Added support for XEP-0049: Private XML Storage (mod_private)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
26 | end |
a67c88ce1c6a
Added support for XEP-0049: Private XML Storage (mod_private)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
27 | else -- set |
a67c88ce1c6a
Added support for XEP-0049: Private XML Storage (mod_private)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
28 | if not data then data = {}; end; |
a67c88ce1c6a
Added support for XEP-0049: Private XML Storage (mod_private)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
29 | if #tag == 0 then |
a67c88ce1c6a
Added support for XEP-0049: Private XML Storage (mod_private)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
30 | data[key] = nil; |
a67c88ce1c6a
Added support for XEP-0049: Private XML Storage (mod_private)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
31 | else |
a67c88ce1c6a
Added support for XEP-0049: Private XML Storage (mod_private)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
32 | data[key] = st.preserialize(tag); |
a67c88ce1c6a
Added support for XEP-0049: Private XML Storage (mod_private)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
33 | end |
a67c88ce1c6a
Added support for XEP-0049: Private XML Storage (mod_private)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
34 | -- TODO delete datastore if empty |
a67c88ce1c6a
Added support for XEP-0049: Private XML Storage (mod_private)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
35 | if datamanager.store(node, host, "private", data) then |
310
b28b51746fe7
Fixed mod_private to use session.send for sending stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
185
diff
changeset
|
36 | session.send(st.reply(stanza)); |
185
a67c88ce1c6a
Added support for XEP-0049: Private XML Storage (mod_private)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
37 | else |
310
b28b51746fe7
Fixed mod_private to use session.send for sending stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
185
diff
changeset
|
38 | session.send(st.error_reply(stanza, "wait", "internal-server-error")); |
185
a67c88ce1c6a
Added support for XEP-0049: Private XML Storage (mod_private)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
39 | end |
a67c88ce1c6a
Added support for XEP-0049: Private XML Storage (mod_private)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
40 | end |
a67c88ce1c6a
Added support for XEP-0049: Private XML Storage (mod_private)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
41 | else |
310
b28b51746fe7
Fixed mod_private to use session.send for sending stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
185
diff
changeset
|
42 | session.send(st.error_reply(stanza, "modify", "bad-format")); |
185
a67c88ce1c6a
Added support for XEP-0049: Private XML Storage (mod_private)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
43 | end |
a67c88ce1c6a
Added support for XEP-0049: Private XML Storage (mod_private)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
44 | else |
310
b28b51746fe7
Fixed mod_private to use session.send for sending stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
185
diff
changeset
|
45 | session.send(st.error_reply(stanza, "cancel", "forbidden")); |
185
a67c88ce1c6a
Added support for XEP-0049: Private XML Storage (mod_private)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
46 | end |
a67c88ce1c6a
Added support for XEP-0049: Private XML Storage (mod_private)
Waqas Hussain <waqas20@gmail.com>
parents:
diff
changeset
|
47 | end |
310
b28b51746fe7
Fixed mod_private to use session.send for sending stanzas
Waqas Hussain <waqas20@gmail.com>
parents:
185
diff
changeset
|
48 | end); |