Compare commits

..

1 Commits

Author SHA1 Message Date
f0c294230a Fix sorting of seenby/path items in echomail/netmail. Add rogue_seenby to seenby in echomail
All checks were successful
Create Docker Image / Build Docker Image (x86_64) (push) Successful in 37s
Create Docker Image / Build Docker Image (arm64) (push) Successful in 1m42s
Create Docker Image / Final Docker Image Manifest (push) Successful in 11s
2024-05-23 15:16:47 +10:00
5 changed files with 11 additions and 31 deletions

View File

@ -152,7 +152,6 @@ class Message extends FTNBase
* *
* @param Echomail|Netmail $o * @param Echomail|Netmail $o
* @return self * @return self
* @throws \Exception
*/ */
public static function packMessage(Echomail|Netmail $o): self public static function packMessage(Echomail|Netmail $o): self
{ {
@ -573,18 +572,13 @@ class Message extends FTNBase
// FTS-0004.001/FSC-0068.001 The message SEEN-BY lines // FTS-0004.001/FSC-0068.001 The message SEEN-BY lines
// FTS-0004.001/FSC-0068.001 The message PATH lines // FTS-0004.001/FSC-0068.001 The message PATH lines
// @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)->filter(fn($item)=>($item->point_id === 0));
$path = $this->mo->path->push($this->us)->unique('ftn')->filter(fn($item)=>($item->point_id === 0));
// Create our rogue seenby objects // Create our rogue seenby objects
$seenby = $this->mo->seenby; $seenby = $this->mo->seenby;
if ($this->mo->rogue_seenby->count()) { foreach ($this->mo->rogue_seenby as $item)
$do = $this->mo->echoarea->domain; $seenby->push(Address::newFTN($item));
foreach ($this->mo->rogue_seenby as $item)
$seenby->push(Address::newFTN(sprintf('%s@%s',$item,$do->name)));
}
$seenby = $seenby $seenby = $seenby
->push($this->us) ->push($this->us)

View File

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

View File

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

View File

@ -340,7 +340,7 @@ class Address extends Model
$zone_id = $parent?->zone->zone_id; $zone_id = $parent?->zone->zone_id;
// For flattened domains // 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) { foreach ($zo->domain->zones as $zoo) {
$o->zone_id = $zoo->id; $o->zone_id = $zoo->id;
$parent = $o->parent(); $parent = $o->parent();

View File

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