projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 0.10->trunk
[prosody.git]
/
plugins
/
mod_message.lua
diff --git
a/plugins/mod_message.lua
b/plugins/mod_message.lua
index ebff2fe775984e0d4d3dd6511b2a0aac7a6ee44e..fc337db09d62a30a57d0f674898e211cde291466 100644
(file)
--- a/
plugins/mod_message.lua
+++ b/
plugins/mod_message.lua
@@
-1,14
+1,14
@@
-- Prosody IM
-- Copyright (C) 2008-2010 Matthew Wild
-- Copyright (C) 2008-2010 Waqas Hussain
-- Prosody IM
-- Copyright (C) 2008-2010 Matthew Wild
-- Copyright (C) 2008-2010 Waqas Hussain
---
+--
-- This project is MIT/X11 licensed. Please see the
-- COPYING file in the source package for more information.
--
-- This project is MIT/X11 licensed. Please see the
-- COPYING file in the source package for more information.
--
-local full_sessions = full_sessions;
-local bare_sessions = bare_sessions;
+local full_sessions =
prosody.
full_sessions;
+local bare_sessions =
prosody.
bare_sessions;
local st = require "util.stanza";
local jid_bare = require "util.jid".bare;
local st = require "util.stanza";
local jid_bare = require "util.jid".bare;
@@
-17,7
+17,7
@@
local user_exists = require "core.usermanager".user_exists;
local function process_to_bare(bare, origin, stanza)
local user = bare_sessions[bare];
local function process_to_bare(bare, origin, stanza)
local user = bare_sessions[bare];
-
+
local t = stanza.attr.type;
if t == "error" then
-- discard
local t = stanza.attr.type;
if t == "error" then
-- discard
@@
-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
if user then -- some resources are connected
local recipients = user.top_resources;
if recipients then
+ local sent;
for i=1,#recipients do
for i=1,#recipients do
- recipients[i].send(stanza);
+ sent = recipients[i].send(stanza) or sent;
+ end
+ if sent then
+ return true;
end
end
- return true;
end
end
-- no resources are online
end
end
-- no resources are online
@@
-63,11
+66,9
@@
end
module:hook("message/full", function(data)
-- message to full JID recieved
local origin, stanza = data.origin, data.stanza;
module:hook("message/full", function(data)
-- message to full JID recieved
local origin, stanza = data.origin, data.stanza;
-
+
local session = full_sessions[stanza.attr.to];
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);
return true;
else -- resource not online
return process_to_bare(jid_bare(stanza.attr.to), origin, stanza);