Show system name on AbsentNodes echomail

app/Classes/Dynamic/HubStats.php

@@ -76,9 +76,27 @@ class HubStats extends Dynamic
 		$output .= "| FTN          | ECHO | NET |FILES| LAST SESSION     |  MODE |AUTOHLD|\r\n";
 		$output .= "+--------------+------+-----+-----+------------------+-------+-------+\r\n";
 
+		$havedown = FALSE;
+		$havehold = FALSE;
+
 		foreach($r->get() as $o) {
+			if ($o->uncollected_echomail > 10000)
+				$o->uncollected_echomail = 9999;
+
+			if ($o->uncollected_netmail > 10000)
+				$o->uncollected_netmail = 9999;
+
+			if ($o->uncollected_files > 10000)
+				$o->uncollected_files = 9999;
+
+			if ((! $havedown) && $o->is_down)
+				$havedown = TRUE;
+
+			if ((! $havehold) && $o->is_hold)
+				$havehold = TRUE;
+
 			$output .= sprintf($header,
-				$o->ftn4d,
+				sprintf('%s %s',$o->ftn4d,$o->is_down ? 'd' : ($o->is_hold ? 'h' : ' ')),
 				$o->uncollected_echomail ?? 0,
 				$o->uncollected_netmail ?? 0,
 				$o->uncollected_files ?? 0,
@@ -89,6 +107,14 @@ class HubStats extends Dynamic
 
 		$output .= "+--------------+------+-----+-----+------------------+-------+-------+\r\n";
 
+		$output .= "\r\n";
+
+		if ($havehold)
+			$output .= "(h) Node is on HOLD status.\r\n";
+
+		if ($havedown)
+			$output .= "(d) Node is on DOWN status.\r\n";
+
 		return $output;
 	}
 

app/Notifications/Echomails/AbsentNodes.php

@@ -60,19 +60,37 @@ class AbsentNodes extends Echomails
 		$msg->addText("The following nodes have had their status changed, because they are absent from the network.\r\r");
 
 		// Nodes marked HOLD - will be marked down ...
-		foreach ($this->aos->filter(fn($item)=>$item->role & Address::NODE_HOLD) as $ao)
-			$msg->addText(sprintf('* %s marked HOLD, last seen %d days ago',$ao->ftn4d,$ao->system->last_session->diffInDays($now)).($ao->contacted ? '': ' ^')."\r");
+		if (($x=$this->aos->filter(fn($item)=>$item->role & Address::NODE_HOLD))->count()) {
+			$msg->addText("The following nodes have been marked HOLD:\r");
+
+			foreach ($x as $ao)
+				$msg->addText(sprintf('* %s (%s), last seen %d days ago',$ao->ftn4d,$ao->system->name,$ao->system->last_session->diffInDays($now)).($ao->contacted ? '': ' ^')."\r");
+
+			$msg->addText("\r");
+		}
 
 		// Nodes marked DOWN - will be delisted on...
-		foreach ($this->aos->filter(fn($item)=>$item->role & Address::NODE_DOWN) as $ao)
-			$msg->addText(sprintf('* %s marked DOWN, last seen %d days ago',$ao->ftn4d,$ao->system->last_session->diffInDays($now)).($ao->contacted ? '': ' ^')."\r");
+		if (($x=$this->aos->filter(fn($item)=>$item->role & Address::NODE_DOWN))->count()) {
+			$msg->addText("The following nodes have been marked DOWN:\r");
+
+			foreach ($x as $ao)
+				$msg->addText(sprintf('* %s (%s), last seen %d days ago',$ao->ftn4d,$ao->system->name,$ao->system->last_session->diffInDays($now)).($ao->contacted ? '': ' ^')."\r");
+
+			$msg->addText("\r");
+		}
 
 		// Nodes DELISTED
-		foreach ($this->aos->filter(fn($item)=>! $item->active) as $ao)
-			$msg->addText(sprintf('* %s DE-LISTED, last seen %d days ago',$ao->ftn4d,$ao->system->last_session->diffInDays($now)).($ao->contacted ? '': ' ^')."\r");
+		if (($x=$this->aos->filter(fn($item)=>! $item->active))->count()) {
+			$msg->addText("The following nodes have been DE-LISTED:\r");
+
+			foreach ($x as $ao)
+				$msg->addText(sprintf('* %s (%s), last seen %d days ago',$ao->ftn4d,$ao->system->name,$ao->system->last_session->diffInDays($now)).($ao->contacted ? '': ' ^')."\r");
+
+			$msg->addText("\r");
+		}
 
 		if ($this->aos->filter(fn($item)=>(! $item->contacted))->count())
-			$msg->addText("\r^ Unable to contact these nodes.\r");
+			$msg->addText("^ Unable to contact these nodes.\r");
 
 		$msg->addText("\rEmails and/or Netmails have been sent to these nodes. If you can help let them know that they have outstanding mail on the Hub, that would be helpful :)");