annotate mod_mam_archive/mod_mam_archive.lua @ 1484:53a3a19d6093

mod_mam: Update to version 0.3 of XEP-0313
author Kim Alvefur <zash@zash.se>
date Fri, 15 Aug 2014 17:43:23 +0200
parents db870913e1cf
children e82592ed744b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1471
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
1 -- Prosody IM
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
2 --
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
3 -- This project is MIT/X11 licensed. Please see the
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
4 -- COPYING file in the source package for more information.
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
5 --
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
6 local get_prefs = module:require"mod_mam/mamprefs".get;
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
7 local set_prefs = module:require"mod_mam/mamprefs".set;
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
8 local rsm = module:require "mod_mam/rsm";
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
9 local jid_bare = require "util.jid".bare;
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
10 local jid_prep = require "util.jid".prep;
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
11 local date_parse = require "util.datetime".parse;
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
12
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
13 local st = require "util.stanza";
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
14 local archive_store = "archive2";
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
15 local archive = module:open_store(archive_store, "archive");
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
16 local global_default_policy = module:get_option("default_archive_policy", false);
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
17 local default_max_items, max_max_items = 20, module:get_option_number("max_archive_query_results", 50);
1476
08ca6dd36e39 mod_mam_archive: Fixing issues noted in code review for 153df603f73d3b69c434f2790cff0270de14bb75
syn@syn.im
parents: 1471
diff changeset
18 local conversation_interval = tonumber(module:get_option_number("archive_conversation_interval", 86400));
1471
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
19
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
20 -- Feature discovery
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
21 local xmlns_archive = "urn:xmpp:archive"
1476
08ca6dd36e39 mod_mam_archive: Fixing issues noted in code review for 153df603f73d3b69c434f2790cff0270de14bb75
syn@syn.im
parents: 1471
diff changeset
22 local feature_archive = st.stanza("feature", {xmlns=xmlns_archive}):tag("optional");
1471
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
23 if(global_default_policy) then
1476
08ca6dd36e39 mod_mam_archive: Fixing issues noted in code review for 153df603f73d3b69c434f2790cff0270de14bb75
syn@syn.im
parents: 1471
diff changeset
24 feature_archive:tag("default");
1471
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
25 end
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
26 module:add_extension(feature_archive);
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
27 module:add_feature("urn:xmpp:archive:auto");
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
28 module:add_feature("urn:xmpp:archive:manage");
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
29 module:add_feature("urn:xmpp:archive:pref");
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
30 module:add_feature("http://jabber.org/protocol/rsm");
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
31 -- --------------------------------------------------
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
32
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
33 local function date_format(s)
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
34 return os.date("%Y-%m-%dT%H:%M:%SZ", s);
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
35 end
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
36
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
37 local function prefs_to_stanza(prefs)
1476
08ca6dd36e39 mod_mam_archive: Fixing issues noted in code review for 153df603f73d3b69c434f2790cff0270de14bb75
syn@syn.im
parents: 1471
diff changeset
38 local prefstanza = st.stanza("pref", { xmlns="urn:xmpp:archive" });
1471
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
39 local default = prefs[false] ~= nil and prefs[false] or global_default_policy;
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
40
1476
08ca6dd36e39 mod_mam_archive: Fixing issues noted in code review for 153df603f73d3b69c434f2790cff0270de14bb75
syn@syn.im
parents: 1471
diff changeset
41 prefstanza:tag("default", {otr="oppose", save=default and "true" or "false"}):up();
08ca6dd36e39 mod_mam_archive: Fixing issues noted in code review for 153df603f73d3b69c434f2790cff0270de14bb75
syn@syn.im
parents: 1471
diff changeset
42 prefstanza:tag("method", {type="auto", use="concede"}):up();
08ca6dd36e39 mod_mam_archive: Fixing issues noted in code review for 153df603f73d3b69c434f2790cff0270de14bb75
syn@syn.im
parents: 1471
diff changeset
43 prefstanza:tag("method", {type="local", use="concede"}):up();
08ca6dd36e39 mod_mam_archive: Fixing issues noted in code review for 153df603f73d3b69c434f2790cff0270de14bb75
syn@syn.im
parents: 1471
diff changeset
44 prefstanza:tag("method", {type="manual", use="concede"}):up();
1471
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
45
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
46 for jid, choice in pairs(prefs) do
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
47 if jid then
1476
08ca6dd36e39 mod_mam_archive: Fixing issues noted in code review for 153df603f73d3b69c434f2790cff0270de14bb75
syn@syn.im
parents: 1471
diff changeset
48 prefstanza:tag("item", {jid=jid, otr="prefer", save=choice and "message" or "false" }):up()
1471
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
49 end
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
50 end
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
51
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
52 return prefstanza;
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
53 end
1476
08ca6dd36e39 mod_mam_archive: Fixing issues noted in code review for 153df603f73d3b69c434f2790cff0270de14bb75
syn@syn.im
parents: 1471
diff changeset
54 local function prefs_from_stanza(stanza, username)
08ca6dd36e39 mod_mam_archive: Fixing issues noted in code review for 153df603f73d3b69c434f2790cff0270de14bb75
syn@syn.im
parents: 1471
diff changeset
55 local current_prefs = get_prefs(username);
1471
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
56
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
57 -- "default" | "item" | "session" | "method"
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
58 for elem in stanza:children() do
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
59 if elem.name == "default" then
1476
08ca6dd36e39 mod_mam_archive: Fixing issues noted in code review for 153df603f73d3b69c434f2790cff0270de14bb75
syn@syn.im
parents: 1471
diff changeset
60 current_prefs[false] = elem.attr["save"] == "true";
1471
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
61 elseif elem.name == "item" then
1476
08ca6dd36e39 mod_mam_archive: Fixing issues noted in code review for 153df603f73d3b69c434f2790cff0270de14bb75
syn@syn.im
parents: 1471
diff changeset
62 current_prefs[elem.attr["jid"]] = not elem.attr["save"] == "false";
1471
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
63 elseif elem.name == "session" then
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
64 module:log("info", "element is not supported: " .. tostring(elem));
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
65 -- local found = false;
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
66 -- for child in data:children() do
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
67 -- if child.name == elem.name and child.attr["thread"] == elem.attr["thread"] then
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
68 -- for k, v in pairs(elem.attr) do
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
69 -- child.attr[k] = v;
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
70 -- end
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
71 -- found = true;
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
72 -- break;
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
73 -- end
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
74 -- end
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
75 -- if not found then
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
76 -- data:tag(elem.name, elem.attr):up();
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
77 -- end
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
78 elseif elem.name == "method" then
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
79 module:log("info", "element is not supported: " .. tostring(elem));
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
80 -- local newpref = stanza.tags[1]; -- iq:pref
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
81 -- for _, e in ipairs(newpref.tags) do
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
82 -- -- if e.name ~= "method" then continue end
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
83 -- local found = false;
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
84 -- for child in data:children() do
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
85 -- if child.name == "method" and child.attr["type"] == e.attr["type"] then
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
86 -- child.attr["use"] = e.attr["use"];
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
87 -- found = true;
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
88 -- break;
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
89 -- end
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
90 -- end
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
91 -- if not found then
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
92 -- data:tag(e.name, e.attr):up();
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
93 -- end
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
94 -- end
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
95 end
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
96 end
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
97 end
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
98
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
99 ------------------------------------------------------------
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
100 -- Preferences
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
101 ------------------------------------------------------------
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
102 local function preferences_handler(event)
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
103 local origin, stanza = event.origin, event.stanza;
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
104 local user = origin.username;
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
105 local reply = st.reply(stanza);
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
106
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
107 if stanza.attr.type == "get" then
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
108 reply:add_child(prefs_to_stanza(get_prefs(user)));
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
109 end
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
110 if stanza.attr.type == "set" then
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
111 local new_prefs = stanza:get_child("pref", xmlns_archive);
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
112 if not new_prefs then return false; end
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
113
1476
08ca6dd36e39 mod_mam_archive: Fixing issues noted in code review for 153df603f73d3b69c434f2790cff0270de14bb75
syn@syn.im
parents: 1471
diff changeset
114 local prefs = prefs_from_stanza(stanza, origin.username);
1471
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
115 local ok, err = set_prefs(user, prefs);
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
116
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
117 if not ok then
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
118 return origin.send(st.error_reply(stanza, "cancel", "internal-server-error", "Error storing preferences: "..tostring(err)));
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
119 end
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
120 end
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
121 return origin.send(reply);
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
122 end
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
123 local function auto_handler(event)
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
124 local origin, stanza = event.origin, event.stanza;
1476
08ca6dd36e39 mod_mam_archive: Fixing issues noted in code review for 153df603f73d3b69c434f2790cff0270de14bb75
syn@syn.im
parents: 1471
diff changeset
125 if not stanza.attr["type"] == "set" then return false; end
1471
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
126
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
127 local user = origin.username;
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
128 local prefs = get_prefs(user);
1476
08ca6dd36e39 mod_mam_archive: Fixing issues noted in code review for 153df603f73d3b69c434f2790cff0270de14bb75
syn@syn.im
parents: 1471
diff changeset
129 local auto = stanza:get_child("auto", xmlns_archive);
1471
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
130
1476
08ca6dd36e39 mod_mam_archive: Fixing issues noted in code review for 153df603f73d3b69c434f2790cff0270de14bb75
syn@syn.im
parents: 1471
diff changeset
131 prefs[false] = auto.attr["save"] ~= nil and auto.attr["save"] == "true" or false;
1471
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
132 set_prefs(user, prefs);
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
133
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
134 return origin.send(st.reply(stanza));
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
135 end
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
136
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
137 -- excerpt from mod_storage_sql2
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
138 local function get_db()
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
139 local mod_sql = module:require("sql");
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
140 local params = module:get_option("sql");
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
141 local engine;
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
142
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
143 params = params or { driver = "SQLite3" };
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
144 if params.driver == "SQLite3" then
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
145 params.database = resolve_relative_path(prosody.paths.data or ".", params.database or "prosody.sqlite");
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
146 end
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
147
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
148 assert(params.driver and params.database, "Both the SQL driver and the database need to be specified");
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
149 engine = mod_sql:create_engine(params);
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
150 engine:set_encoding();
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
151
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
152 return engine;
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
153 end
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
154
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
155 ------------------------------------------------------------
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
156 -- Collections. In our case there is one conversation with each contact for the whole day for simplicity
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
157 ------------------------------------------------------------
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
158 local function list_stanza_to_query(origin, list_el)
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
159 local sql = "SELECT `with`, `when` / ".. conversation_interval .." as `day`, COUNT(0) FROM `prosodyarchive` WHERE `host`=? AND `user`=? AND `store`=? ";
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
160 local args = {origin.host, origin.username, archive_store};
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
161
1476
08ca6dd36e39 mod_mam_archive: Fixing issues noted in code review for 153df603f73d3b69c434f2790cff0270de14bb75
syn@syn.im
parents: 1471
diff changeset
162 local with = list_el.attr["with"];
1471
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
163 if with ~= nil then
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
164 sql = sql .. "AND `with` = ? ";
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
165 table.insert(args, jid_bare(with));
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
166 end
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
167
1476
08ca6dd36e39 mod_mam_archive: Fixing issues noted in code review for 153df603f73d3b69c434f2790cff0270de14bb75
syn@syn.im
parents: 1471
diff changeset
168 local after = list_el.attr["start"];
1471
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
169 if after ~= nil then
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
170 sql = sql .. "AND `when` >= ?";
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
171 table.insert(args, date_parse(after));
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
172 end
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
173
1476
08ca6dd36e39 mod_mam_archive: Fixing issues noted in code review for 153df603f73d3b69c434f2790cff0270de14bb75
syn@syn.im
parents: 1471
diff changeset
174 local before = list_el.attr["end"];
1471
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
175 if before ~= nil then
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
176 sql = sql .. "AND `when` <= ? ";
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
177 table.insert(args, date_parse(before));
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
178 end
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
179
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
180 sql = sql .. "GROUP BY `with`, `when` / ".. conversation_interval .." ORDER BY `when` / ".. conversation_interval .." ASC ";
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
181
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
182 local qset = rsm.get(list_el);
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
183 local limit = math.min(qset and qset.max or default_max_items, max_max_items);
1476
08ca6dd36e39 mod_mam_archive: Fixing issues noted in code review for 153df603f73d3b69c434f2790cff0270de14bb75
syn@syn.im
parents: 1471
diff changeset
184 sql = sql.."LIMIT ?";
1471
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
185 table.insert(args, limit);
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
186
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
187 table.insert(args, 1, sql);
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
188 return args;
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
189 end
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
190 local function list_handler(event)
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
191 local db = get_db();
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
192 local origin, stanza = event.origin, event.stanza;
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
193 local reply = st.reply(stanza);
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
194
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
195 local query = list_stanza_to_query(origin, stanza.tags[1]);
1476
08ca6dd36e39 mod_mam_archive: Fixing issues noted in code review for 153df603f73d3b69c434f2790cff0270de14bb75
syn@syn.im
parents: 1471
diff changeset
196 local list = reply:tag("list", {xmlns=xmlns_archive});
1471
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
197
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
198 for row in db:select(unpack(query)) do
1476
08ca6dd36e39 mod_mam_archive: Fixing issues noted in code review for 153df603f73d3b69c434f2790cff0270de14bb75
syn@syn.im
parents: 1471
diff changeset
199 list:tag("chat", {
1471
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
200 xmlns=xmlns_archive,
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
201 with=row[1],
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
202 start=date_format(row[2] * conversation_interval),
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
203 version=row[3]
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
204 }):up();
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
205 end
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
206
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
207 origin.send(reply);
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
208 return true;
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
209 end
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
210
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
211 ------------------------------------------------------------
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
212 -- Message archive retrieval
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
213 ------------------------------------------------------------
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
214
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
215 local function retrieve_handler(event)
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
216 local origin, stanza = event.origin, event.stanza;
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
217 local reply = st.reply(stanza);
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
218
1476
08ca6dd36e39 mod_mam_archive: Fixing issues noted in code review for 153df603f73d3b69c434f2790cff0270de14bb75
syn@syn.im
parents: 1471
diff changeset
219 local retrieve = stanza:get_child("retrieve", xmlns_archive);
1471
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
220
1476
08ca6dd36e39 mod_mam_archive: Fixing issues noted in code review for 153df603f73d3b69c434f2790cff0270de14bb75
syn@syn.im
parents: 1471
diff changeset
221 local qwith = retrieve.attr["with"];
08ca6dd36e39 mod_mam_archive: Fixing issues noted in code review for 153df603f73d3b69c434f2790cff0270de14bb75
syn@syn.im
parents: 1471
diff changeset
222 local qstart = retrieve.attr["start"];
1471
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
223
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
224 module:log("debug", "Archive query, with %s from %s)",
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
225 qwith or "anyone", qstart or "the dawn of time");
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
226
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
227 if qstart then -- Validate timestamps
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
228 local vstart = (qstart and date_parse(qstart));
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
229 if (qstart and not vstart) then
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
230 origin.send(st.error_reply(stanza, "modify", "bad-request", "Invalid timestamp"))
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
231 return true
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
232 end
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
233 qstart = vstart;
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
234 end
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
235
1476
08ca6dd36e39 mod_mam_archive: Fixing issues noted in code review for 153df603f73d3b69c434f2790cff0270de14bb75
syn@syn.im
parents: 1471
diff changeset
236 if qwith then -- Validate the "with" jid
1471
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
237 local pwith = qwith and jid_prep(qwith);
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
238 if pwith and not qwith then -- it failed prepping
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
239 origin.send(st.error_reply(stanza, "modify", "bad-request", "Invalid JID"))
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
240 return true
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
241 end
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
242 qwith = jid_bare(pwith);
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
243 end
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
244
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
245 -- RSM stuff
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
246 local qset = rsm.get(retrieve);
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
247 local qmax = math.min(qset and qset.max or default_max_items, max_max_items);
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
248 local reverse = qset and qset.before or false;
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
249 local before, after = qset and qset.before, qset and qset.after;
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
250 if type(before) ~= "string" then before = nil; end
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
251
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
252 -- Load all the data!
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
253 local data, err = archive:find(origin.username, {
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
254 start = qstart; ["end"] = qstart + conversation_interval;
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
255 with = qwith;
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
256 limit = qmax;
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
257 before = before; after = after;
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
258 reverse = reverse;
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
259 total = true;
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
260 });
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
261
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
262 if not data then
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
263 return origin.send(st.error_reply(stanza, "cancel", "internal-server-error", err));
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
264 end
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
265 local count = err;
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
266
1476
08ca6dd36e39 mod_mam_archive: Fixing issues noted in code review for 153df603f73d3b69c434f2790cff0270de14bb75
syn@syn.im
parents: 1471
diff changeset
267 local chat = reply:tag("chat", {xmlns=xmlns_archive, with=qwith, start=date_format(qstart), version=count});
1471
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
268
1476
08ca6dd36e39 mod_mam_archive: Fixing issues noted in code review for 153df603f73d3b69c434f2790cff0270de14bb75
syn@syn.im
parents: 1471
diff changeset
269 module:log("debug", "Count "..count);
1471
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
270 for id, item, when in data do
1477
db870913e1cf mod_mam_archive: Doing stanza deserialization after mod_storage the right way
syn@syn.im
parents: 1476
diff changeset
271 if not getmetatable(item) == st.stanza_mt then
db870913e1cf mod_mam_archive: Doing stanza deserialization after mod_storage the right way
syn@syn.im
parents: 1476
diff changeset
272 item = st.deserialize(item);
db870913e1cf mod_mam_archive: Doing stanza deserialization after mod_storage the right way
syn@syn.im
parents: 1476
diff changeset
273 end
db870913e1cf mod_mam_archive: Doing stanza deserialization after mod_storage the right way
syn@syn.im
parents: 1476
diff changeset
274 module:log("debug", tostring(item));
db870913e1cf mod_mam_archive: Doing stanza deserialization after mod_storage the right way
syn@syn.im
parents: 1476
diff changeset
275
db870913e1cf mod_mam_archive: Doing stanza deserialization after mod_storage the right way
syn@syn.im
parents: 1476
diff changeset
276 local tag = jid_bare(item.attr["from"]) == jid_bare(origin.full_jid) and "from" or "to";
1471
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
277 tag = chat:tag(tag, {secs = when - qstart});
1477
db870913e1cf mod_mam_archive: Doing stanza deserialization after mod_storage the right way
syn@syn.im
parents: 1476
diff changeset
278 tag:add_child(item:get_child("body")):up();
1471
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
279 end
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
280
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
281 origin.send(reply);
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
282 return true;
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
283 end
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
284
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
285 local function not_implemented(event)
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
286 local origin, stanza = event.origin, event.stanza;
1476
08ca6dd36e39 mod_mam_archive: Fixing issues noted in code review for 153df603f73d3b69c434f2790cff0270de14bb75
syn@syn.im
parents: 1471
diff changeset
287 local reply = st.reply(stanza):tag("error", {type="cancel"});
08ca6dd36e39 mod_mam_archive: Fixing issues noted in code review for 153df603f73d3b69c434f2790cff0270de14bb75
syn@syn.im
parents: 1471
diff changeset
288 reply:tag("feature-not-implemented", {xmlns="urn:ietf:params:xml:ns:xmpp-stanzas"}):up();
1471
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
289 origin.send(reply);
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
290 end
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
291
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
292 -- Preferences
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
293 module:hook("iq/self/urn:xmpp:archive:pref", preferences_handler);
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
294 module:hook("iq/self/urn:xmpp:archive:auto", auto_handler);
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
295 module:hook("iq/self/urn:xmpp:archive:itemremove", not_implemented);
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
296 module:hook("iq/self/urn:xmpp:archive:sessionremove", not_implemented);
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
297
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
298 -- Message Archive Management
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
299 module:hook("iq/self/urn:xmpp:archive:list", list_handler);
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
300 module:hook("iq/self/urn:xmpp:archive:retrieve", retrieve_handler);
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
301 module:hook("iq/self/urn:xmpp:archive:remove", not_implemented);
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
302
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
303 -- manual archiving
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
304 module:hook("iq/self/urn:xmpp:archive:save", not_implemented);
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
305 -- replication
153df603f73d mod_mam_archive: Initial commit
syn@syn.im
parents:
diff changeset
306 module:hook("iq/self/urn:xmpp:archive:modified", not_implemented);