delivery report tweaks

2 files changed, 26 insertions, 1 deletions

diff --git a/include/ItemObject.php b/include/ItemObject.php
index 34500efb9..512e12838 100644
--- a/include/ItemObject.php
+++ b/include/ItemObject.php
@@ -258,6 +258,15 @@ class Item extends BaseObject {
 		if ($shareable)
 			$share = array( t('Share This'), t('share'));
 
+		$dreport = '';
+
+		$keep_reports = intval(get_config('system','expire_delivery_reports'));
+		if($keep_reports === 0)
+			$keep_reports = 30;
+
+		if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC',"now - $keep_reports days")) > 0)
+			$dreport = t('Delivery Report');
+
 		if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0)
 			$indent .= ' shiny';
 
@@ -277,6 +286,10 @@ class Item extends BaseObject {
 		$comment_count_txt = sprintf( tt('%d comment','%d comments',$total_children),$total_children );
 		$list_unseen_txt = (($unseen_comments) ? sprintf('%d unseen',$unseen_comments) : '');
 		
+
+
+		
+
 		$children = $this->get_children();
 
 		$has_tags = (($body['tags'] || $body['categories'] || $body['mentions'] || $body['attachments'] || $body['folders']) ? true : false);
@@ -309,7 +322,7 @@ class Item extends BaseObject {
 			'vwall' => t('via Wall-To-Wall:'),
 			'profile_url' => $profile_link,
 			'item_photo_menu' => item_photo_menu($item),
-			'dreport' => t('Delivery Report'),
+			'dreport' => $dreport,
 			'name' => $profile_name,
 			'thumb' => $profile_avatar,
 			'osparkle' => $osparkle,
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'])