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

Dont launch bot processing for rescanned messages

Browse Source
This commit is contained in:
Deon George 2021-09-13 23:02:39 +10:00
parent 79e613a811
commit 2cd6db2060
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Classes/FTN/Message.php
View File

@ -109,6 +109,7 @@ class Message extends FTNBase
private array $src; // Address the message is from private array $src; // Address the message is from
private array $dst; // Address the message is to 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 $path; // FTS-0004.001 The message PATH lines
private Collection $pathaddress; // Collection of Addresses after parsing seenby private Collection $pathaddress; // Collection of Addresses after parsing seenby
private Collection $rogue_path; // Collection of FTNs in the Seen-by that are not defined 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->dst = [];
$this->point = []; $this->point = [];
$this->rescanned = collect();
$this->path = collect(); $this->path = collect();
$this->seenby = collect(); $this->seenby = collect();
$this->seenaddress = collect(); $this->seenaddress = collect();
@ -370,6 +372,7 @@ class Message extends FTNBase
case 'origin': case 'origin':
case 'kludge': case 'kludge':
case 'rescanned':
case 'path': case 'path':
case 'seenby': case 'seenby':
case 'pathaddress': case 'pathaddress':
@ -765,6 +768,9 @@ class Message extends FTNBase
elseif ($t = $this->kludge('PATH: ',$v)) elseif ($t = $this->kludge('PATH: ',$v))
$this->path->push($t); $this->path->push($t);
elseif ($t = $this->kludge('RESCANNED ',$v))
$this->rescanned->push($t);
elseif ($t = $this->kludge('SEEN-BY: ',$v)) elseif ($t = $this->kludge('SEEN-BY: ',$v))
$this->seenby->push($t); $this->seenby->push($t);

4
app/Jobs/MessageProcess.php
View File

@ -193,8 +193,8 @@ class MessageProcess implements ShouldQueue
$o->id, $o->id,
)); ));
// If the message is to a bot, we'll process it // If the message is to a bot, but not rescanned, or purposely skipbot set, we'll process it
if (! $this->skipbot) if ((! $this->skipbot) && (! $this->msg->rescanned->count()))
foreach (config('process.echomail') as $class) { foreach (config('process.echomail') as $class) {
if ($class::handle($this->msg)) { if ($class::handle($this->msg)) {
break; break;