aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Hoelz <rob@hoelz.ro>2010-12-09 12:28:05 -0600
committerRobert Hoelz <rob@hoelz.ro>2010-12-09 12:28:05 -0600
commit32c092ae0eb8551cd8fb8f124c0ae723672705f5 (patch)
tree830f6ec0d41fe98c6590b9f28838613d57888b52
parentde4b6ceb3376974f56d80129848d5fd0c0009bd7 (diff)
downloadprosody-32c092ae0eb8551cd8fb8f124c0ae723672705f5.tar.gz
prosody-32c092ae0eb8551cd8fb8f124c0ae723672705f5.zip
mod_presence, mod_offline: Merge message/offline/delete with message/offline/broadcast.
-rw-r--r--plugins/mod_offline.lua8
-rw-r--r--plugins/mod_presence.lua1
2 files changed, 1 insertions, 8 deletions
diff --git a/plugins/mod_offline.lua b/plugins/mod_offline.lua
index a3ca21d0..f44d16af 100644
--- a/plugins/mod_offline.lua
+++ b/plugins/mod_offline.lua
@@ -47,13 +47,7 @@ module:hook("message/offline/broadcast", function(event)
stanza.attr.stamp, stanza.attr.stamp_legacy = nil, nil;
origin.send(stanza);
end
+ datamanager.list_store(node, host, "offline", nil);
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);
-end);
diff --git a/plugins/mod_presence.lua b/plugins/mod_presence.lua
index 933aac62..61239c9a 100644
--- a/plugins/mod_presence.lua
+++ b/plugins/mod_presence.lua
@@ -117,7 +117,6 @@ function handle_normal_presence(origin, stanza)
if priority >= 0 then
local event = { origin = origin }
module:fire_event('message/offline/broadcast', event);
- module:fire_event('message/offline/delete', event);
end
end
if stanza.attr.type == "unavailable" then