projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net.http.server: Properly handle persistent connections
[prosody.git]
/
plugins
/
mod_message.lua
diff --git
a/plugins/mod_message.lua
b/plugins/mod_message.lua
index b56aef0a80977933c33e5e271b98d80885fecf48..0b0ad8e4985a2a5d4d057081a208b8bd98325b60 100644
(file)
--- a/
plugins/mod_message.lua
+++ b/
plugins/mod_message.lua
@@
-1,3
+1,11
@@
+-- 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.
+--
+
local full_sessions = full_sessions;
local bare_sessions = bare_sessions;
local full_sessions = full_sessions;
local bare_sessions = bare_sessions;
@@
-6,8
+14,6
@@
local st = require "util.stanza";
local jid_bare = require "util.jid".bare;
local jid_split = require "util.jid".split;
local user_exists = require "core.usermanager".user_exists;
local jid_bare = require "util.jid".bare;
local jid_split = require "util.jid".split;
local user_exists = require "core.usermanager".user_exists;
-local offlinemanager = require "core.offlinemanager";
-local t_insert = table.insert;
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];
@@
-18,7
+24,7
@@
local function process_to_bare(bare, origin, stanza)
elseif t == "groupchat" then
origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
elseif t == "headline" then
elseif t == "groupchat" then
origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
elseif t == "headline" then
- if user then
+ if user
and stanza.attr.to == bare
then
for _, session in pairs(user.sessions) do
if session.presence and session.priority >= 0 then
session.send(stanza);
for _, session in pairs(user.sessions) do
if session.presence and session.priority >= 0 then
session.send(stanza);
@@
-29,18
+35,28
@@
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
local node, host = jid_split(bare);
end
end
-- no resources are online
local node, host = jid_split(bare);
+ local ok
if user_exists(node, host) then
-- TODO apply the default privacy list
if user_exists(node, host) then
-- TODO apply the default privacy list
- offlinemanager.store(node, host, stanza);
- else
+
+ ok = module:fire_event('message/offline/handle', {
+ origin = origin,
+ stanza = stanza,
+ });
+ end
+
+ if not ok then
origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
end
end
origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
end
end
@@
-52,9
+68,7
@@
module:hook("message/full", function(data)
local origin, stanza = data.origin, data.stanza;
local session = full_sessions[stanza.attr.to];
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);
return true;
else -- resource not online
return process_to_bare(jid_bare(stanza.attr.to), origin, stanza);