Merge 0.10->trunk

[prosody.git] / plugins / mod_offline.lua

diff --git a/plugins/mod_offline.lua b/plugins/mod_offline.lua
index d1370b4187522eea10b4a19e25220a76bf7c75e0..08ab8490bbc90a8743b1c91cf068a4466ccb49f1 100644 (file)
--- a/plugins/mod_offline.lua
+++ b/plugins/mod_offline.lua
@@ -1,7 +1,7 @@
 -- Prosody IM
 -- Copyright (C) 2008-2009 Matthew Wild
 -- Copyright (C) 2008-2009 Waqas Hussain
--- 
+--
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
 --
@@ -15,7 +15,7 @@ local jid_split = require "util.jid".split;
 
 module:add_feature("msgoffline");
 
-module:hook("message/offline/store", function(event)
+module:hook("message/offline/handle", function(event)
        local origin, stanza = event.origin, event.stanza;
        local to = stanza.attr.to;
        local node, host;
@@ -24,30 +24,28 @@ module:hook("message/offline/store", function(event)
        else
                node, host = origin.username, origin.host;
        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;
-end);
+end, -1);
 
 module:hook("message/offline/broadcast", function(event)
        local origin = event.origin;
 
-       if origin.priority >= 0 then
-               local node, host = origin.username, origin.host;
-
-               local data = datamanager.list_load(node, host, "offline");
-               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;
-                       origin.send(stanza);
-               end
-               datamanager.list_store(node, host, "offline", nil);
-               return true;
+       local node, host = origin.username, origin.host;
+
+       local data = datamanager.list_load(node, host, "offline");
+       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;
+               origin.send(stanza);
        end
-end);
+       datamanager.list_store(node, host, "offline", nil);
+       return true;
+end, -1);