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

Add option to not process bots during import

Browse Source
This commit is contained in:
Deon George 2021-09-11 00:38:11 +10:00
parent e8a9508391
commit 72bc9790d1
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Console/Commands/PacketProcess.php
View File

@ -16,7 +16,10 @@ class PacketProcess extends Command
* *
* @var string * @var string
*/ */
protected $signature = 'packet:process {pkt : Packet to process} {zone? : Zone the packet is from}'; protected $signature = 'packet:process'
.' {pkt : Packet to process}'
.' {--N|nobot : Dont process bots}'
.' {zone? : Zone the packet is from}';
/** /**
* The console command description. * The console command description.
@ -41,7 +44,7 @@ class PacketProcess extends Command
// @todo validate that the packet's zone is in the domain. // @todo validate that the packet's zone is in the domain.
// Dispatch job. // Dispatch job.
Job::dispatchSync($msg); Job::dispatchSync($msg,$this->option('nobot'));
} }
} }
} }

22
app/Jobs/MessageProcess.php
View File

@ -19,11 +19,13 @@ class MessageProcess implements ShouldQueue
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
private Message $msg; private Message $msg;
private bool $skipbot;
public function __construct(Message $msg) public function __construct(Message $msg,bool $skipbot=FALSE)
{ {
// Some checks // Some checks
$this->msg = $msg; $this->msg = $msg;
$this->skipbot = $skipbot;
} }
/** /**
@ -48,11 +50,12 @@ class MessageProcess implements ShouldQueue
$processed = FALSE; $processed = FALSE;
// If the message is to a bot, we'll process it // If the message is to a bot, we'll process it
foreach (config('process.robots') as $class) { if (! $this->skipbot)
if ($processed = $class::handle($this->msg)) { foreach (config('process.robots') as $class) {
break; if ($processed = $class::handle($this->msg)) {
break;
}
} }
}
// We'll ignore messages from *fix users // We'll ignore messages from *fix users
if (in_array(strtolower($this->msg->user_from),['filefix','areafix'])) { if (in_array(strtolower($this->msg->user_from),['filefix','areafix'])) {
@ -218,11 +221,12 @@ class MessageProcess implements ShouldQueue
)); ));
// If the message is to a bot, we'll process it // If the message is to a bot, we'll process it
foreach (config('process.echomail') as $class) { if (! $this->skipbot)
if ($class::handle($this->msg)) { foreach (config('process.echomail') as $class) {
break; if ($class::handle($this->msg)) {
break;
}
} }
}
} }
} }
} }