X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_offline.lua;h=c168711b65d381606d6ed6e6be72f2f5ac782039;hb=378103202c2a00fa5e93036dae13d99c5ee21b62;hp=a3ca21d0ebab2f58d5a963075b428effa488c5d1;hpb=c72eea870ae98d356e03636a40f6cff16c2f6da1;p=prosody.git

diff --git a/plugins/mod_offline.lua b/plugins/mod_offline.lua
index a3ca21d0..c168711b 100644
--- 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,36 +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 true;
+
+	return result;
 end);
 
 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
-		return true;
-	end
-end);
-
-module:hook("message/offline/delete", function(event)
-	local origin = event.origin;
 	local node, host = origin.username, origin.host;
 
-	return datamanager.list_store(node, host, "offline", nil);
+	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;
 end);