Software / code / prosody
Changeset
1622:1ca7a247d04f
Merge with 0.5
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 29 Jul 2009 18:11:37 +0100 |
| parents | 1618:ba2a92230b77 (current diff) 1621:a63ff2fbba8d (diff) |
| children | 1623:099364ec1ab2 |
| files | prosody |
| diffstat | 3 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_pep.lua Tue Jul 28 19:17:09 2009 +0100 +++ b/plugins/mod_pep.lua Wed Jul 29 18:11:37 2009 +0100 @@ -30,6 +30,7 @@ local function publish(session, node, item) local disable = #item.tags ~= 1 or #item.tags[1].tags == 0; + if #item.tags == 0 then item.name = "retract"; end local bare = session.username..'@'..session.host; local stanza = st.message({from=bare, type='headline'}) :tag('event', {xmlns='http://jabber.org/protocol/pubsub#event'}) @@ -128,7 +129,7 @@ local payload = stanza.tags[1]; if payload.name == 'pubsub' then -- <pubsub xmlns='http://jabber.org/protocol/pubsub'> payload = payload.tags[1]; - if payload and payload.name == 'publish' and payload.attr.node then -- <publish node='http://jabber.org/protocol/tune'> + if payload and (payload.name == 'publish' or payload.name == 'retract') and payload.attr.node then -- <publish node='http://jabber.org/protocol/tune'> local node = payload.attr.node; payload = payload.tags[1]; if payload then -- <item>
--- a/prosody Tue Jul 28 19:17:09 2009 +0100 +++ b/prosody Wed Jul 29 18:11:37 2009 +0100 @@ -9,9 +9,9 @@ -- Will be modified by configure script if run -- -CFG_SOURCEDIR=nil; +CFG_SOURCEDIR=os.getenv("PROSODY_SRCDIR"); CFG_CONFIGDIR=os.getenv("PROSODY_CFGDIR"); -CFG_PLUGINDIR=nil; +CFG_PLUGINDIR=os.getenv("PROSODY_PLUGINDIR"); CFG_DATADIR=os.getenv("PROSODY_DATADIR"); -- -- -- -- -- -- -- ---- -- -- -- -- -- -- -- --
--- a/util/muc.lua Tue Jul 28 19:17:09 2009 +0100 +++ b/util/muc.lua Wed Jul 29 18:11:37 2009 +0100 @@ -209,7 +209,7 @@ else -- change nick if self._participants[to] then log("debug", "%s couldn't change nick", current_nick); - origin.send(st.error_reply(stanza, "cancel", "conflict")); + origin.send(st.error_reply(stanza, "cancel", "conflict"):tag("x", {xmlns = "http://jabber.org/protocol/muc"})); else local data = self._participants[current_nick]; local to_nick = select(3, jid_split(to)); @@ -240,7 +240,7 @@ end if not new_nick then log("debug", "%s couldn't join due to nick conflict: %s", from, to); - origin.send(st.error_reply(stanza, "cancel", "conflict")); + origin.send(st.error_reply(stanza, "cancel", "conflict"):tag("x", {xmlns = "http://jabber.org/protocol/muc"})); else log("debug", "%s joining as %s", from, to); local data;
