Fix for when adding our address to path for outgoing echomails - introduced in 5fc6906

app/Classes/FTN/Message.php

@@ -152,6 +152,7 @@ class Message extends FTNBase
 	 *
 	 * @param Echomail|Netmail $o
 	 * @return self
+	 * @throws \Exception
 	 */
 	public static function packMessage(Echomail|Netmail $o): self
 	{
@@ -571,11 +572,28 @@ class Message extends FTNBase
 		} else {
 			// FTS-0004.001/FSC-0068.001 The message SEEN-BY lines
 			// FTS-0004.001/FSC-0068.001 The message PATH lines
-			// @todo we need to include our rogue_seenbys
-			// @todo make sure a point is NOT in the seenby/path when exporting
-			// @todo automatically include our address in the seenby/path
-			$return .= $this->aka_trim($this->mo->seenby,'SEEN-BY:')."\r";
-			$return .= "\x01".$this->aka_trim($this->mo->path,'PATH:')."\r";
+
+			// @todo This unique() function here shouldnt be required, but is while system generated messages are storing path/seenby
+			$path = $this->mo->path->push($this->us)->unique('ftn')->filter(fn($item)=>($item->point_id === 0));
+
+			// Create our rogue seenby objects
+			$seenby = $this->mo->seenby;
+
+			if ($this->mo->rogue_seenby->count()) {
+				$do = $this->mo->echoarea->domain;
+
+				foreach ($this->mo->rogue_seenby as $item)
+					$seenby->push(Address::newFTN(sprintf('%s@%s',$item,$do->name)));
+			}
+
+			$seenby = $seenby
+				->push($this->us)
+				->filter(fn($item)=>($item->point_id === 0))
+				->unique('ftn')
+				->sortBy(function($item) { return sprintf('%05d%05d',$item->host_id,$item->node_id);});
+
+			$return .= $this->aka_trim($seenby,'SEEN-BY:')."\r";
+			$return .= "\x01".$this->aka_trim($path,'PATH:')."\r";
 		}
 
 		$return .= "\00";

app/Classes/File/Mail.php

@@ -16,6 +16,7 @@ final class Mail extends Send
 
 	/** @var int Our internal position counter */
 	private int $readpos;
+	private ?string $content;
 
 	/**
 	 * @throws \Exception
@@ -84,6 +85,8 @@ final class Mail extends Send
 						'sent_at'=>Carbon::now(),
 						'sent_pkt'=>$this->name,
 					]);
+
+			$this->content = NULL;
 		}
 	}
 
@@ -94,12 +97,13 @@ final class Mail extends Send
 
 	public function open(string $compress=''): bool
 	{
+		$this->content = (string)$this->f;
 		return TRUE;
 	}
 
 	public function read(int $length): string
 	{
-		$result = substr((string)$this->f,$this->readpos,$length);
+		$result = substr($this->content,$this->readpos,$length);
 		$this->readpos += strlen($result);
 
 		return $result;

app/Console/Commands/PacketSystem.php

@@ -26,21 +26,31 @@ class PacketSystem extends Command
 	/**
 	 * Execute the console command.
 	 *
-	 * @return mixed
-	 * @throws \App\Exceptions\InvalidPacketException
+	 * @return int
+	 * @throws \Exception
 	 */
 	public function handle()
 	{
 		$ao = Address::findFTN($this->argument('ftn'));
 
-		foreach ($ao->system->addresses as $o) {
+		foreach ($ao->system->addresses->where('validated',TRUE) as $o) {
 			$pkt = $o->getEchomail();
-			$this->info(sprintf('System address [%s] has [%d] messages.',$ao->ftn,$pkt?->count()));
+			$this->info(sprintf('System address [%s] has [%d] echomail messages.',$o->ftn,$pkt?->count()));
+
+			if ($pkt) {
+				foreach ($pkt as $msg)
+					$this->warn(sprintf('- %s (%s)',$msg->msgid,$msg->id));
+			}
+
+			$pkt = $o->getNetmail();
+			$this->info(sprintf('System address [%s] has [%d] netmail messages.',$o->ftn,$pkt?->count()));
 
 			if ($pkt) {
 				foreach ($pkt as $msg)
 					$this->warn(sprintf('- %s (%s)',$msg->msgid,$msg->id));
 			}
 		}
+
+		return self::SUCCESS;
 	}
 }

app/Models/Address.php

@@ -242,6 +242,22 @@ class Address extends Model
 		return ($o && $o->system->active) ? $o : NULL;
 	}
 
+	public static function newFTN(string $address): self
+	{
+		$ftn = self::parseFTN($address);
+		$o = new self;
+
+		$zo = Zone::where('zone_id',$ftn['z'])->single();
+
+		$o->zone_id = $zo?->id;
+		$o->region_id = $ftn['r'];
+		$o->host_id = $ftn['n'];
+		$o->node_id = $ftn['f'];
+		$o->point_id = $ftn['p'];
+
+		return $o;
+	}
+
 	/**
 	 * This is to find an address for a domain (like fidonet), which is technically 2D even though it uses multiple zones.
 	 *
@@ -324,7 +340,7 @@ class Address extends Model
 			$zone_id = $parent?->zone->zone_id;
 
 			// For flattened domains
-			if ($zo->domain->flatten && is_null($zone_id))
+			if ($zo?->domain->flatten && is_null($zone_id))
 				foreach ($zo->domain->zones as $zoo) {
 					$o->zone_id = $zoo->id;
 					$parent = $o->parent();

app/Models/Echomail.php

@@ -222,7 +222,8 @@ final class Echomail extends Model implements Packet
 	public function path()
 	{
 		return $this->belongsToMany(Address::class,'echomail_path')
-			->withPivot(['id','parent_id','recv_pkt','recv_at']);
+			->withPivot(['id','parent_id','recv_pkt','recv_at'])
+			->orderBy('id','DESC');
 	}
 
 	/* ATTRIBUTES */

app/Models/Netmail.php

@@ -179,6 +179,7 @@ final class Netmail extends Model implements Packet
 	{
 		return $this->belongsToMany(Address::class,'netmail_path')
 			->withPivot(['id','parent_id','datetime','program','recv_pkt','recv_id'])
+			->orderBy('netmail_path.id')
 			->using(ViaPivot::class);
 	}
 

app/Traits/MessageAttributes.php

@@ -167,7 +167,7 @@ trait MessageAttributes
 	 */
 	public function packet(Address $ao): Message
 	{
-		Log::debug(sprintf('%s:+ Bundling [%s]',self::LOGKEY,$this->id),['type'=>get_class($this)]);
+		Log::debug(sprintf('%s:+ Bundling [%s] for [%s]',self::LOGKEY,$this->id,$ao->ftn),['type'=>get_class($this)]);
 
 		// For netmails, our tftn is the next hop
 		$this->tftn = $ao;