From c1ab14f2e6f41b56a349cb5a67160bdc7a88a204 Mon Sep 17 00:00:00 2001 From: Deon George Date: Sun, 1 Jan 2023 14:30:15 +1100 Subject: [PATCH] Fix echoarea display with the oldest message --- app/Classes/FTN/Packet.php | 2 ++ app/Jobs/MessageProcess.php | 2 +- resources/views/echoarea/addedit.blade.php | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/Classes/FTN/Packet.php b/app/Classes/FTN/Packet.php index 68cd208..64b727b 100644 --- a/app/Classes/FTN/Packet.php +++ b/app/Classes/FTN/Packet.php @@ -446,6 +446,7 @@ class Packet extends FTNBase implements \Iterator, \Countable $e = NULL; try { + // @todo Need to work out the correct region for the host_id Address::unguard(); $ao = Address::firstOrNew([ 'zone_id' => $msg->tzone->id, @@ -488,6 +489,7 @@ class Packet extends FTNBase implements \Iterator, \Countable $e = NULL; try { + // @todo Need to work out the correct region for the host_id Address::unguard(); $ao = Address::firstOrNew([ 'zone_id' => $msg->fzone->id, diff --git a/app/Jobs/MessageProcess.php b/app/Jobs/MessageProcess.php index 8412963..d89cb36 100644 --- a/app/Jobs/MessageProcess.php +++ b/app/Jobs/MessageProcess.php @@ -139,7 +139,7 @@ class MessageProcess implements ShouldQueue // Else we are echomail } else { - Log::debug(sprintf('%s:! Looking for echomail area [%s] for mail from [%s]',self::LOGKEY,$this->msg->echoarea,$this->msg->fboss)); + Log::debug(sprintf('%s: - Looking for echomail area [%s] for mail from [%s]',self::LOGKEY,$this->msg->echoarea,$this->msg->fboss)); if (! $this->msg->fboss_o) { Log::error(sprintf('%s:! Cannot process message for echomail area [%s] for mail from [%s] with msgid [%s] - no boss object?',self::LOGKEY,$this->msg->echoarea,$this->msg->fboss,$this->msg->msgid)); diff --git a/resources/views/echoarea/addedit.blade.php b/resources/views/echoarea/addedit.blade.php index 687e714..fe3181d 100644 --- a/resources/views/echoarea/addedit.blade.php +++ b/resources/views/echoarea/addedit.blade.php @@ -115,7 +115,8 @@

Info

-

There are {{ number_format($o->echomail->count()) }} messages in this area, and the oldest message in this area is {{ $o->last_message ? $o->last_message->format('Y-m-d H:i:s') : 'None' }}.

+

There are {{ number_format($o->echomail->count()) }} messages in this area, and the oldest message in this area is {{ ($x=$o->echomail->min('datetime')) ? $x->format('Y-m-d H:i:s') : 'None' }}. + The most recent is {{ ($x=$o->echomail->max('datetime')) ? $x->format('Y-m-d H:i:s') : 'None' }}.