From 6b1cb8cd785e1cb22fff0c13bd91370818620908 Mon Sep 17 00:00:00 2001 From: Deon George Date: Wed, 5 Jun 2024 21:26:09 +1000 Subject: [PATCH] Fix finding echomail origin AKA by including the domain name --- app/Models/Echomail.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Models/Echomail.php b/app/Models/Echomail.php index 364bbec..f8e9d30 100644 --- a/app/Models/Echomail.php +++ b/app/Models/Echomail.php @@ -133,7 +133,7 @@ final class Echomail extends Model implements Packet // Make sure our origin contains our FTN $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; }