diff --git a/app/Classes/FTN/Message.php b/app/Classes/FTN/Message.php index e8d5ab9..c8998e3 100644 --- a/app/Classes/FTN/Message.php +++ b/app/Classes/FTN/Message.php @@ -109,6 +109,7 @@ class Message extends FTNBase private array $src; // Address the message is from private array $dst; // Address the message is to + private Collection $rescanned; // Message was created as a result of a rescan private Collection $path; // FTS-0004.001 The message PATH lines private Collection $pathaddress; // Collection of Addresses after parsing seenby private Collection $rogue_path; // Collection of FTNs in the Seen-by that are not defined @@ -189,6 +190,7 @@ class Message extends FTNBase $this->dst = []; $this->point = []; + $this->rescanned = collect(); $this->path = collect(); $this->seenby = collect(); $this->seenaddress = collect(); @@ -370,6 +372,7 @@ class Message extends FTNBase case 'origin': case 'kludge': + case 'rescanned': case 'path': case 'seenby': case 'pathaddress': @@ -765,6 +768,9 @@ class Message extends FTNBase elseif ($t = $this->kludge('PATH: ',$v)) $this->path->push($t); + elseif ($t = $this->kludge('RESCANNED ',$v)) + $this->rescanned->push($t); + elseif ($t = $this->kludge('SEEN-BY: ',$v)) $this->seenby->push($t); diff --git a/app/Jobs/MessageProcess.php b/app/Jobs/MessageProcess.php index 4b74bae..775b4c8 100644 --- a/app/Jobs/MessageProcess.php +++ b/app/Jobs/MessageProcess.php @@ -193,8 +193,8 @@ class MessageProcess implements ShouldQueue $o->id, )); - // If the message is to a bot, we'll process it - if (! $this->skipbot) + // If the message is to a bot, but not rescanned, or purposely skipbot set, we'll process it + if ((! $this->skipbot) && (! $this->msg->rescanned->count())) foreach (config('process.echomail') as $class) { if ($class::handle($this->msg)) { break;