Software / code / prosody
Comparison
plugins/mod_pep.lua @ 5805:11b6157ee274
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 24 Aug 2013 23:16:08 +0100 |
| parent | 5776:bd0ff8ae98a8 |
| parent | 5804:bb27ba619932 |
| child | 6544:2f709bc35575 |
comparison
equal
deleted
inserted
replaced
| 5802:5b79710dd5a1 | 5805:11b6157ee274 |
|---|---|
| 133 publish_all(user, recipient, origin); | 133 publish_all(user, recipient, origin); |
| 134 else | 134 else |
| 135 recipients[user][recipient] = hash; | 135 recipients[user][recipient] = hash; |
| 136 local from_bare = origin.type == "c2s" and origin.username.."@"..origin.host; | 136 local from_bare = origin.type == "c2s" and origin.username.."@"..origin.host; |
| 137 if self or origin.type ~= "c2s" or (recipients[from_bare] and recipients[from_bare][origin.full_jid]) ~= hash then | 137 if self or origin.type ~= "c2s" or (recipients[from_bare] and recipients[from_bare][origin.full_jid]) ~= hash then |
| 138 -- COMPAT from ~= stanza.attr.to because OneTeam can't deal with missing from attribute | 138 -- COMPAT from ~= stanza.attr.to because OneTeam and Asterisk 1.8 can't deal with missing from attribute |
| 139 origin.send( | 139 origin.send( |
| 140 st.stanza("iq", {from=user, to=stanza.attr.from, id="disco", type="get"}) | 140 st.stanza("iq", {from=user, to=stanza.attr.from, id="disco", type="get"}) |
| 141 :query("http://jabber.org/protocol/disco#info") | 141 :query("http://jabber.org/protocol/disco#info") |
| 142 ); | 142 ); |
| 143 end | 143 end |