Software / code / prosody
Changeset
2058:77244fd4ca99
Merge with trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 26 Oct 2009 23:30:15 +0000 |
| parents | 2057:ee2929e620bb (current diff) 2056:c781a949661d (diff) |
| children | 2059:d4fb80b60c65 |
| files | |
| diffstat | 5 files changed, 15 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/net/xmppserver_listener.lua Mon Oct 26 23:29:04 2009 +0000 +++ b/net/xmppserver_listener.lua Mon Oct 26 23:30:15 2009 +0000 @@ -61,8 +61,8 @@ function session.data(conn, data) local ok, err = parser:parse(data); if ok then return; end - (log or session.log)("warn", "Received invalid XML: %s", data); - (log or session.log)("warn", "Problem was: %s", err); + (session.log or log)("warn", "Received invalid XML: %s", data); + (session.log or log)("warn", "Problem was: %s", err); session:close("xml-not-well-formed"); end
--- a/plugins/mod_console.lua Mon Oct 26 23:29:04 2009 +0000 +++ b/plugins/mod_console.lua Mon Oct 26 23:30:15 2009 +0000 @@ -127,7 +127,11 @@ end function console_listener.disconnect(conn, err) - + local session = sessions[conn]; + if session then + session.disconnect(); + sessions[conn] = nil; + end end connlisteners_register('console', console_listener);
--- a/plugins/mod_welcome.lua Mon Oct 26 23:29:04 2009 +0000 +++ b/plugins/mod_welcome.lua Mon Oct 26 23:30:15 2009 +0000 @@ -7,7 +7,7 @@ -- local host = module:get_host(); -local welcome_text = module:get_option("welcome_message") or "Hello $user, welcome to the $host IM server!"; +local welcome_text = module:get_option("welcome_message") or "Hello $username, welcome to the $host IM server!"; local st = require "util.stanza";
--- a/plugins/muc/muc.lib.lua Mon Oct 26 23:29:04 2009 +0000 +++ b/plugins/muc/muc.lib.lua Mon Oct 26 23:30:15 2009 +0000 @@ -115,7 +115,7 @@ stanza = get_filtered_presence(stanza); local occupant = self._occupants[stanza.attr.from]; stanza:tag("x", {xmlns='http://jabber.org/protocol/muc#user'}) - :tag("item", {affiliation=occupant.affiliation, role=occupant.role, nick=nick}):up(); + :tag("item", {affiliation=occupant.affiliation or "none", role=occupant.role or "none", nick=nick}):up(); if code then stanza:tag("status", {code=code}):up(); end @@ -162,7 +162,7 @@ local pres = get_filtered_presence(o_data.sessions[o_data.jid]); pres.attr.to, pres.attr.from = to, occupant; pres:tag("x", {xmlns='http://jabber.org/protocol/muc#user'}) - :tag("item", {affiliation=o_data.affiliation, role=o_data.role}):up(); + :tag("item", {affiliation=o_data.affiliation or "none", role=o_data.role or "none"}):up(); self:route_stanza(pres); end end @@ -232,13 +232,14 @@ occupant.sessions[from] = nil; pr.attr.to = from; pr:tag("x", {xmlns='http://jabber.org/protocol/muc#user'}) - :tag("item", {affiliation=occupant.affiliation, role='none'}):up() + :tag("item", {affiliation=occupant.affiliation or "none", role='none'}):up() :tag("status", {code='110'}); self:route_stanza(pr); if jid ~= new_jid then pr = st.clone(occupant.sessions[new_jid]) :tag("x", {xmlns='http://jabber.org/protocol/muc#user'}) - :tag("item", {affiliation=occupant.affiliation, role=occupant.role}); + :tag("item", {affiliation=occupant.affiliation or "none", role=occupant.role or "none"}); + pr.attr.from = current_nick; self:broadcast_except_nick(pr, current_nick); end else @@ -322,7 +323,7 @@ else pr.attr.to = from; self:route_stanza(pr:tag("x", {xmlns='http://jabber.org/protocol/muc#user'}) - :tag("item", {affiliation=affiliation, role=role}):up() + :tag("item", {affiliation=affiliation or "none", role=role or "none"}):up() :tag("status", {code='110'})); end self:send_history(from);
--- a/prosody Mon Oct 26 23:29:04 2009 +0000 +++ b/prosody Mon Oct 26 23:30:15 2009 +0000 @@ -282,7 +282,7 @@ function loop() -- Error handler for errors that make it this far local function catch_uncaught_error(err) - if err:match("%d*: interrupted!$") then + if type(err) == "string" and err:match("%d*: interrupted!$") then return "quitting"; end
