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

Updates now that we have updated our_address() to differentiate public/mailer advertised addresses with all our addresses
All checks were successful
Create Docker Image / Build Docker Image (x86_64) (push) Successful in 33s
Details
Create Docker Image / Build Docker Image (arm64) (push) Successful in 1m35s
Details
Create Docker Image / Final Docker Image Manifest (push) Successful in 9s
Details

Browse Source
This commit is contained in:
Deon George
2025-04-15 09:35:35 +10:00
parent b59317871a
commit c49daadc5f
8 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Models/Echomail.php
View File

@@ -184,12 +184,14 @@ final class Echomail extends Model implements Packet
Log::debug(sprintf('%s:^ Message [%d] from point address is [%d]',self::LOGKEY,$model->id,$model->fftn->point_id));
// Make sure our sender is first in the path
// @todo we need to capture the path for mail directly from points so we dont re-export to it.
if (($model->fftn->point_id === 0) && (! $model->isFlagSet(Message::FLAG_LOCAL)) && (! $path->contains($model->fftn_id))) {
Log::alert(sprintf('%s:? Echomail adding sender to start of PATH [%s].',self::LOGKEY,$model->fftn_id));
$path->prepend($model->fftn_id);
}
// Make sure our pktsrc is last in the path
// @todo mail directly from points may have a blank path, so we need to make one up.
if ($model->set->has('set_sender') && (! $path->contains($model->set->get('set_sender')->id)) && ($model->set->get('set_sender')->point_id === 0)) {
Log::alert(sprintf('%s:? Echomail adding pktsrc to end of PATH [%s].',self::LOGKEY,$model->set->get('set_sender')->ftn));
$path->push($model->set->get('set_sender')->id);
@@ -257,7 +259,7 @@ final class Echomail extends Model implements Packet
->addresses
->filter(function($item) use ($model) { return $model->echoarea->can_read($item->security); })
->pluck('id')
->diff(our_address($model->fftn->zone->domain)->pluck('id'))
->diff(our_address($model->fftn->zone->domain,FALSE)->pluck('id'))
->diff($seenby);
if ($exportto->count()) {