bbs/clrghouz
1
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Fix echoarea display with the oldest message

Browse Source
This commit is contained in:
Deon George 2023-01-01 14:30:15 +11:00
parent d825f71a15
commit c1ab14f2e6
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Classes/FTN/Packet.php
View File

@ -446,6 +446,7 @@ class Packet extends FTNBase implements \Iterator, \Countable
$e = NULL; $e = NULL;
try { try {
// @todo Need to work out the correct region for the host_id
Address::unguard(); Address::unguard();
$ao = Address::firstOrNew([ $ao = Address::firstOrNew([
'zone_id' => $msg->tzone->id, 'zone_id' => $msg->tzone->id,
@ -488,6 +489,7 @@ class Packet extends FTNBase implements \Iterator, \Countable
$e = NULL; $e = NULL;
try { try {
// @todo Need to work out the correct region for the host_id
Address::unguard(); Address::unguard();
$ao = Address::firstOrNew([ $ao = Address::firstOrNew([
'zone_id' => $msg->fzone->id, 'zone_id' => $msg->fzone->id,

2
app/Jobs/MessageProcess.php
View File

@ -139,7 +139,7 @@ class MessageProcess implements ShouldQueue
// Else we are echomail // Else we are echomail
} else { } 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) { 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)); 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));

3
resources/views/echoarea/addedit.blade.php
View File

@ -115,7 +115,8 @@
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
<h4>Info</h4> <h4>Info</h4>
<p>There are <strong class="highlight">{{ number_format($o->echomail->count()) }}</strong> messages in this area, and the oldest message in this area is <strong class="highlight">{{ $o->last_message ? $o->last_message->format('Y-m-d H:i:s') : 'None' }}</strong>.</p> <p>There are <strong class="highlight">{{ number_format($o->echomail->count()) }}</strong> messages in this area, and the oldest message in this area is <strong class="highlight">{{ ($x=$o->echomail->min('datetime')) ? $x->format('Y-m-d H:i:s') : 'None' }}</strong>.
The most recent is <strong class="highlight">{{ ($x=$o->echomail->max('datetime')) ? $x->format('Y-m-d H:i:s') : 'None' }}</strong>.</p>
</div> </div>
</div> </div>