Software / code / prosody
Changeset
1627:6b2109012688
Merge with 0.5
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 03 Aug 2009 17:52:17 +0100 |
| parents | 1623:099364ec1ab2 (current diff) 1626:7f17d0d00fbb (diff) |
| children | 1631:fa49cbfff0e6 |
| files | |
| diffstat | 3 files changed, 3 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Fri Jul 31 17:19:05 2009 +0100 +++ b/.hgtags Mon Aug 03 17:52:17 2009 +0100 @@ -26,3 +26,4 @@ b1b42ce4f0f6a8f587c2925724694c0e8b437dce 0.4.2 6b91a2b39680f0f7195fec561a3ce3d660ea0c20 0.4.2 06030af44faddd7d3c20e7d380bb55b92b079c5f 0.5.0 +a63ff2fbba8d0a29503e7552a29fc7c831faa23c 0.5.1
--- a/plugins/mod_pep.lua Fri Jul 31 17:19:05 2009 +0100 +++ b/plugins/mod_pep.lua Mon Aug 03 17:52:17 2009 +0100 @@ -134,6 +134,7 @@ payload = payload.tags[1]; if payload then -- <item> publish(session, node, payload); + session.send(st.reply(stanza)); return true; end end
--- a/plugins/mod_presence.lua Fri Jul 31 17:19:05 2009 +0100 +++ b/plugins/mod_presence.lua Mon Aug 03 17:52:17 2009 +0100 @@ -165,6 +165,7 @@ function handle_outbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare, core_route_stanza) local node, host = jid_split(from_bare); + if node == origin.username and host == origin.host then return; end -- No self contacts local st_from, st_to = stanza.attr.from, stanza.attr.to; stanza.attr.from, stanza.attr.to = from_bare, to_bare; log("debug", "outbound presence "..stanza.attr.type.." from "..from_bare.." for "..to_bare);
