diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-12-17 13:50:33 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-12-17 13:50:33 +0000 |
| commit | 8ee0fb71fcba10a54760d4a047a4a91e2ab97ad1 (patch) | |
| tree | 08ff2f81be281c7d1f399e2e3ff5b74f1671b77b /plugins/mod_pep.lua | |
| parent | c1efda1ffd82e6988ab20b4be5f75ecf31fb551e (diff) | |
| parent | 07e945631dc2abe7a2afe204919a72d25398c687 (diff) | |
| download | prosody-8ee0fb71fcba10a54760d4a047a4a91e2ab97ad1.tar.gz prosody-8ee0fb71fcba10a54760d4a047a4a91e2ab97ad1.zip | |
Merge Tobias->trunk
Diffstat (limited to 'plugins/mod_pep.lua')
| -rw-r--r-- | plugins/mod_pep.lua | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/mod_pep.lua b/plugins/mod_pep.lua index 28c31294..9ff6cac2 100644 --- a/plugins/mod_pep.lua +++ b/plugins/mod_pep.lua @@ -134,7 +134,8 @@ module:hook("presence/bare", function(event) 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") |