From 071b8171943e6c688a047068790ab2f782c29ca0 Mon Sep 17 00:00:00 2001 From: Deon George Date: Sun, 22 Aug 2021 16:44:41 +1000 Subject: [PATCH] Fix processing msgid with @domain --- app/Classes/FTN/Message.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Classes/FTN/Message.php b/app/Classes/FTN/Message.php index 35085f5..795c1a1 100644 --- a/app/Classes/FTN/Message.php +++ b/app/Classes/FTN/Message.php @@ -741,8 +741,8 @@ class Message extends FTNBase // http://ftsc.org/docs/fsc-0068.001 // MSGID should be the basis of the source, we'll overrite our src from origin if we have it $m = []; - if ($this->msgid && preg_match('#([0-9]+:[0-9]+/[0-9]+)?\.?([0-9]+)?(@%s)?\ +#',$this->msgid,$m)) { - $this->src = Address::parseFTN($m[1].(isset($m[2]) ? '.'.$m[2] : '')); + if ($this->msgid && preg_match('#([0-9]+:[0-9]+/[0-9]+)?\.?([0-9]+)?@?([A-Za-z-_~]+)?\ +#',$this->msgid,$m)) { + $this->src = Address::parseFTN($m[1].(isset($m[2]) ? '.'.$m[2] : '').(isset($m[3]) ? '@'.$m[3] : '')); } // Parse SEEN-BY