Check whether rule is enabled

RikudouSage · Mar 4, 2024 · aa04fb4 · aa04fb4
1 parent 7514eec
commit aa04fb4
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 9 deletions.
diff --git a/src/Automod/ModAction/BanUser/AbstractBanUserModAction.php b/src/Automod/ModAction/BanUser/AbstractBanUserModAction.php
@@ -123,7 +123,9 @@ private function findMatchingRegexRule(?string $content): ?InstanceBanRegex
             return null;
         }
 
-        $regexes = $this->banRegexRepository->findAll();
+        $regexes = $this->banRegexRepository->findBy([
+            'enabled' => true,
+        ]);
         foreach ($regexes as $regexEntity) {
             $regex = str_replace('@', '\\@', $regexEntity->getRegex());
             $regex = "@{$regex}@i";
@@ -143,7 +145,9 @@ private function findMatchingUsernameRule(?string $content): ?BannedUsername
             return null;
         }
 
-        $bannedUsernames = $this->usernameRepository->findAll();
+        $bannedUsernames = $this->usernameRepository->findBy([
+            'enabled' => true,
+        ]);
         foreach ($bannedUsernames as $bannedUsername) {
             $regex = str_replace('@', '\\@', $bannedUsername->getUsername());
             $regex = "@{$regex}@i";

diff --git a/src/Automod/ModAction/BanUser/BanUserForEmailAction.php b/src/Automod/ModAction/BanUser/BanUserForEmailAction.php
@@ -35,7 +35,7 @@ public function shouldRun(object $object): bool
 
     private function findMatchingEmailRegex(string $email): ?BannedEmail
     {
-        foreach ($this->bannedEmailRepository->findAll() as $regexEntity) {
+        foreach ($this->bannedEmailRepository->findBy(['enabled' => true]) as $regexEntity) {
             $regex = str_replace('@', '\\@', $regexEntity->getRegex());
             $regex = "@{$regex}@i";
             if (!preg_match($regex, $email)) {

diff --git a/src/Automod/ModAction/BanUser/BanUserForImageAction.php b/src/Automod/ModAction/BanUser/BanUserForImageAction.php
@@ -49,7 +49,7 @@ public function shouldRun(object $object): bool
         if (!preg_match($regex, $object->post->url)) {
             return false;
         }
-        if (!count($this->imageRepository->findAll())) {
+        if (!count($this->imageRepository->findBy(['enabled' => true]))) {
             return false;
         }
 
@@ -70,7 +70,7 @@ public function takeAction(object $object, Context $context = new Context()): Fu
         if ($hash === null) {
             return FurtherAction::CanContinue;
         }
-        foreach ($this->imageRepository->findAll() as $image) {
+        foreach ($this->imageRepository->findBy(['enabled' => true]) as $image) {
             $similarity = $this->imageComparator->compareHashStrings($hash, $image->getImageHash());
             if ($similarity < $image->getSimilarityPercent()) {
                 continue;

diff --git a/src/Automod/ModAction/RegistrationApplication/AutoApprovalModAction.php b/src/Automod/ModAction/RegistrationApplication/AutoApprovalModAction.php
@@ -23,7 +23,7 @@ public function shouldRun(object $object): bool
         if (!$object instanceof RegistrationApplicationView) {
             return false;
         }
-        $regexes = $this->autoApprovalRegexRepository->findAll();
+        $regexes = $this->autoApprovalRegexRepository->findBy(['enabled' => true]);
         if (!count($regexes)) {
             return false;
         }

diff --git a/src/Automod/ModAction/Report/AbstractReportAction.php b/src/Automod/ModAction/Report/AbstractReportAction.php
@@ -80,7 +80,7 @@ private function findMatchingRule(?string $content): ?ReportRegex
             return null;
         }
 
-        $regexes = $this->repository->findAll();
+        $regexes = $this->repository->findBy(['enabled' => true]);
         foreach ($regexes as $regexEntity) {
             $regex = str_replace('@', '\\@', $regexEntity->getRegex());
             $regex = "@{$regex}@";

diff --git a/src/Automod/ModAction/UserReport/RemoveReportedFromTrustedUserModAction.php b/src/Automod/ModAction/UserReport/RemoveReportedFromTrustedUserModAction.php
@@ -53,7 +53,7 @@ public function shouldRun(object $object): bool
             }
 
             throw new LogicException('The user must either have an ID or username and instance');
-        }, $this->trustedUserRepository->findAll());
+        }, $this->trustedUserRepository->findBy(['enabled' => true]));
 
         return in_array($object->creator->id, $trustedIds, true);
     }

diff --git a/src/Service/IgnoredUserManager.php b/src/Service/IgnoredUserManager.php
@@ -35,7 +35,7 @@ private function getIgnoredUserIds(): array
                 }
 
                 return $id;
-            }, $this->repository->findAll());
+            }, $this->repository->findBy(['enabled' => true]));
         } finally {
             $this->entityManager->flush();
         }