bbs/clrghouz
1
0
Fork 0
Code Issues6 Pull Requests Actions Packages Projects1 Releases Wiki Activity

Fix finding echomail origin AKA by including the domain name

Browse Source
This commit is contained in:
Deon George 2024-06-05 21:26:09 +10:00
parent 2509aa99e1
commit 6b1cb8cd78
1 changed files with 1 additions and 1 deletions

2
app/Models/Echomail.php

@ -133,7 +133,7 @@ final class Echomail extends Model implements Packet
// Make sure our origin contains our FTN // Make sure our origin contains our FTN
$m = []; $m = [];
if ((preg_match('#^(.*)\s+\(([0-9]+:[0-9]+/[0-9]+.*)\)+\s*$#',$model->set_origin,$m)) if ((preg_match('#^(.*)\s+\(([0-9]+:[0-9]+/[0-9]+.*)\)+\s*$#',$model->set_origin,$m))
&& (Address::findFTN($m[2])->id === $model->fftn_id)) && (Address::findFTN(sprintf('%s@%s',$m[2],$model->fftn->domain->name))?->id === $model->fftn_id))
$model->origin_id = Origin::firstOrCreate(['value'=>$m[1]])->id; $model->origin_id = Origin::firstOrCreate(['value'=>$m[1]])->id;
} }