aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_message.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-07-22 17:08:09 +0100
committerMatthew Wild <mwild1@gmail.com>2012-07-22 17:08:09 +0100
commit8a965123f5c38071e14ee2f43fd203706ab56f95 (patch)
tree2593981ba2580f7c824501dc13223411d34fab49 /plugins/mod_message.lua
parent92d6725339ce0233dffd2ecde606d684d05d4c93 (diff)
parent6aa575f09b858fef93101afbc7c776f138aca380 (diff)
downloadprosody-8a965123f5c38071e14ee2f43fd203706ab56f95.tar.gz
prosody-8a965123f5c38071e14ee2f43fd203706ab56f95.zip
Merge 0.9->trunk
Diffstat (limited to 'plugins/mod_message.lua')
-rw-r--r--plugins/mod_message.lua11
1 files changed, 6 insertions, 5 deletions
diff --git a/plugins/mod_message.lua b/plugins/mod_message.lua
index ebff2fe7..0b0ad8e4 100644
--- a/plugins/mod_message.lua
+++ b/plugins/mod_message.lua
@@ -35,10 +35,13 @@ local function process_to_bare(bare, origin, stanza)
if user then -- some resources are connected
local recipients = user.top_resources;
if recipients then
+ local sent;
for i=1,#recipients do
- recipients[i].send(stanza);
+ sent = recipients[i].send(stanza) or sent;
+ end
+ if sent then
+ return true;
end
- return true;
end
end
-- no resources are online
@@ -65,9 +68,7 @@ module:hook("message/full", function(data)
local origin, stanza = data.origin, data.stanza;
local session = full_sessions[stanza.attr.to];
- if session then
- -- TODO fire post processing event
- session.send(stanza);
+ if session and session.send(stanza) then
return true;
else -- resource not online
return process_to_bare(jid_bare(stanza.attr.to), origin, stanza);