Merge with 0.5

2 files changed, 2 insertions, 0 deletions

diff --git a/plugins/mod_pep.lua b/plugins/mod_pep.lua
index 768d4a4a..e07759f0 100644
--- a/plugins/mod_pep.lua
+++ b/plugins/mod_pep.lua
@@ -134,6 +134,7 @@ module:hook("iq/bare/http://jabber.org/protocol/pubsub:pubsub", function(event)
 				payload = payload.tags[1];
 				if payload then -- <item>
 					publish(session, node, payload);
+					session.send(st.reply(stanza));
 					return true;
 				end
 			end
diff --git a/plugins/mod_presence.lua b/plugins/mod_presence.lua
index a077d7bd..02ec6f79 100644
--- a/plugins/mod_presence.lua
+++ b/plugins/mod_presence.lua
@@ -165,6 +165,7 @@ end
 
 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);