diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-23 14:16:14 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-23 14:16:14 +0100 |
| commit | 7338649fa54a109122deecc743079eab6b9c1251 (patch) | |
| tree | fcce0bb728f3d7204201ee7f5f182a57cfd5d2c6 /include/zot.php | |
| parent | e60f527cb09dacf7b81af37a15c890c6dfbe1bb0 (diff) | |
| parent | ae1103c5a3f3f76a0269cbb5de11a7cb96496ad3 (diff) | |
| download | volse-hubzilla-7338649fa54a109122deecc743079eab6b9c1251.tar.gz volse-hubzilla-7338649fa54a109122deecc743079eab6b9c1251.tar.bz2 volse-hubzilla-7338649fa54a109122deecc743079eab6b9c1251.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/zot.php')
| -rw-r--r-- | include/zot.php | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/zot.php b/include/zot.php index 23fb9c4ad..2366c1d2d 100644 --- a/include/zot.php +++ b/include/zot.php @@ -3950,6 +3950,10 @@ function delivery_report_is_storable($dr) { if(! $c) return false; + + + + // is the recipient one of our connections, or do we want to store every report? $r = explode(' ', $dr['recipient']); @@ -3958,6 +3962,14 @@ function delivery_report_is_storable($dr) { if($pcf) return true; + // We always add ourself as a recipient to private and relayed posts + // So if a remote site says they can't find us, that's no big surprise + // and just creates a lot of extra report noise + + if(($dr['location'] !== z_root()) && ($dr['sender'] === $rxchan) && ($dr['status'] === 'recipient_not_found')) + return false; + + $r = q("select abook_id from abook where abook_xchan = '%s' and abook_channel = %d limit 1", dbesc($rxchan), intval($c[0]['channel_id']) |