Diff

plugins/mod_pep.lua @ 3765:0731e5432baa

Merge Tobias->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 17 Dec 2010 13:50:33 +0000
parent 3738:ae2ac97b23b1
child 4207:06eb75d071ec
line wrap: on
line diff
--- a/plugins/mod_pep.lua	Tue Dec 14 18:54:55 2010 +0100
+++ b/plugins/mod_pep.lua	Fri Dec 17 13:50:33 2010 +0000
@@ -134,7 +134,8 @@
 					publish_all(user, recipient, origin);
 				else
 					recipients[user][recipient] = hash;
-					if self or origin.type ~= "c2s" then
+					local from_bare = origin.type == "c2s" and origin.username.."@"..origin.host;
+					if self or origin.type ~= "c2s" or (recipients[from_bare] and recipients[from_bare][origin.full_jid]) ~= hash then
 						origin.send(
 							st.stanza("iq", {from=stanza.attr.to, to=stanza.attr.from, id="disco", type="get"})
 								:query("http://jabber.org/protocol/disco#info")