mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Presence unavailable on disconnect

Browse source
This commit is contained in:
matthew 2008-08-24 14:52:02 +00:00
parent 86ea5e7911
commit dfe21804fe
4 changed files with 25 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TODO
View file

@ -4,3 +4,5 @@
Further down the line:
- Clustering
- Pubsub/PEP
- Plugins!

2
core/stanza_dispatch.lua
View file

@ -106,7 +106,7 @@ function init_stanza_dispatcher(session)
--local probe = st.presence { from = broadcast.attr.from, type = "probe" };
for child in stanza:childtags() do
broadcast:text(tostring(child));
broadcast:add_child(child);
end
for contact_jid in pairs(session.roster) do
broadcast.attr.to = contact_jid;

11
main.lua
View file

@ -132,6 +132,12 @@ function handler(conn, data, err)
session.parser = lxp.new(session.xml_handlers, ":");
function session.disconnect(err)
if session.last_presence.attr.type ~= "unavailable" then
local pres = st.presence{ type = "unavailable" };
if err == "closed" then err = "connection closed"; end
pres:tag("status"):text("Disconnected: "..err);
session.stanza_dispatch(pres);
end
hosts[session.host].sessions[session.username] = nil;
session = nil;
print("Disconnected: "..err);
@ -154,8 +160,9 @@ setmetatable(_G, { __index = function (t, k) print("WARNING: ATTEMPT TO READ A N
local protected_handler = function (...) local success, ret = pcall(handler, ...); if not success then print("ERROR on "..tostring((select(1, ...)))..": "..ret); end end;
local protected_disconnect = function (...) local success, ret = pcall(disconnect, ...); if not success then print("ERROR on "..tostring((select(1, ...))).." disconnect: "..ret); end end;
print( server.add( { listener = protected_handler, disconnect = disconnect }, 5222, "*", 1, nil ) ) -- server.add will send a status message
print( server.add( { listener = protected_handler, disconnect = disconnect }, 5223, "*", 1, ssl_ctx ) ) -- server.add will send a status message
print( server.add( { listener = protected_handler, disconnect = protected_disconnect }, 5222, "*", 1, nil ) ) -- server.add will send a status message
print( server.add( { listener = protected_handler, disconnect = protected_disconnect }, 5223, "*", 1, ssl_ctx ) ) -- server.add will send a status message
server.loop();

15
util/stanza.lua
View file

@ -6,7 +6,7 @@ local setmetatable = setmetatable;
local pairs = pairs;
local ipairs = ipairs;
local type = type;
local s_gsub = string.gsub;
module "stanza"
stanza_mt = {};
@ -78,10 +78,21 @@ function stanza_mt:childtags()
end
do
local xml_entities = { ["'"] = "&apos;", ["\""] = "&quot;", ["<"] = "&lt;", [">"] = "&gt;", ["&"] = "&amp;" };
function xml_escape(s) return s_gsub(s, "['&<>\"]", xml_entities); end
end
local xml_escape = xml_escape;
function stanza_mt.__tostring(t)
local children_text = "";
for n, child in ipairs(t) do
children_text = children_text .. tostring(child);
if type(child) == "string" then
children_text = children_text .. xml_escape(child);
else
children_text = children_text .. tostring(child);
end
end
local attr_string = "";