aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-03-31 17:50:19 +0200
committerKim Alvefur <zash@zash.se>2017-03-31 17:50:19 +0200
commitdc72d25c39c545357197cc8c6f8ed0ecee329c07 (patch)
tree6ed588a01b0e0f28dbc6df84a1267bf6226ecf05
parent52cff8b4905e24bfeabcc088d82c08c09e347f5e (diff)
downloadprosody-dc72d25c39c545357197cc8c6f8ed0ecee329c07.tar.gz
prosody-dc72d25c39c545357197cc8c6f8ed0ecee329c07.zip
mod_offline: Switch to using archive store via the storagemanager API
-rw-r--r--plugins/mod_offline.lua28
1 files changed, 10 insertions, 18 deletions
diff --git a/plugins/mod_offline.lua b/plugins/mod_offline.lua
index 08ab8490..fe4df573 100644
--- a/plugins/mod_offline.lua
+++ b/plugins/mod_offline.lua
@@ -7,29 +7,24 @@
--
-local datamanager = require "util.datamanager";
-local st = require "util.stanza";
local datetime = require "util.datetime";
-local ipairs = ipairs;
local jid_split = require "util.jid".split;
+local offline_messages = module:open_store("offline", "archive");
+
module:add_feature("msgoffline");
module:hook("message/offline/handle", function(event)
local origin, stanza = event.origin, event.stanza;
local to = stanza.attr.to;
- local node, host;
+ local node;
if to then
- node, host = jid_split(to)
+ node = jid_split(to)
else
- node, host = origin.username, origin.host;
+ node = origin.username;
end
- stanza.attr.stamp, stanza.attr.stamp_legacy = datetime.datetime(), datetime.legacy();
- local result = datamanager.list_append(node, host, "offline", st.preserialize(stanza));
- stanza.attr.stamp, stanza.attr.stamp_legacy = nil, nil;
-
- return result;
+ return offline_messages:append(node, nil, stanza);
end, -1);
module:hook("message/offline/broadcast", function(event)
@@ -37,15 +32,12 @@ module:hook("message/offline/broadcast", function(event)
local node, host = origin.username, origin.host;
- local data = datamanager.list_load(node, host, "offline");
+ local data = offline_messages:find(node);
if not data then return true; end
- for _, stanza in ipairs(data) do
- stanza = st.deserialize(stanza);
- stanza:tag("delay", {xmlns = "urn:xmpp:delay", from = host, stamp = stanza.attr.stamp}):up(); -- XEP-0203
- stanza:tag("x", {xmlns = "jabber:x:delay", from = host, stamp = stanza.attr.stamp_legacy}):up(); -- XEP-0091 (deprecated)
- stanza.attr.stamp, stanza.attr.stamp_legacy = nil, nil;
+ for _, stanza, when in data do
+ stanza:tag("delay", {xmlns = "urn:xmpp:delay", from = host, stamp = datetime.datetime(when)}):up(); -- XEP-0203
origin.send(stanza);
end
- datamanager.list_store(node, host, "offline", nil);
+ offline_messages:delete(node);
return true;
end, -1);