aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_presence.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_presence.lua
parent92d6725339ce0233dffd2ecde606d684d05d4c93 (diff)
parent6aa575f09b858fef93101afbc7c776f138aca380 (diff)
downloadprosody-8a965123f5c38071e14ee2f43fd203706ab56f95.tar.gz
prosody-8a965123f5c38071e14ee2f43fd203706ab56f95.zip
Merge 0.9->trunk
Diffstat (limited to 'plugins/mod_presence.lua')
-rw-r--r--plugins/mod_presence.lua10
1 files changed, 6 insertions, 4 deletions
diff --git a/plugins/mod_presence.lua b/plugins/mod_presence.lua
index 6d039d83..09a6f9f2 100644
--- a/plugins/mod_presence.lua
+++ b/plugins/mod_presence.lua
@@ -352,13 +352,15 @@ module:hook("resource-unbind", function(event)
-- Send unavailable presence
if session.presence then
local pres = st.presence{ type = "unavailable" };
- if not(err) or err == "closed" then err = "connection closed"; end
- pres:tag("status"):text("Disconnected: "..err):up();
+ if err then
+ pres:tag("status"):text("Disconnected: "..err):up();
+ end
session:dispatch_stanza(pres);
elseif session.directed then
local pres = st.presence{ type = "unavailable", from = session.full_jid };
- if not(err) or err == "closed" then err = "connection closed"; end
- pres:tag("status"):text("Disconnected: "..err):up();
+ if err then
+ pres:tag("status"):text("Disconnected: "..err):up();
+ end
for jid in pairs(session.directed) do
pres.attr.to = jid;
core_post_stanza(session, pres, true);