Skip to content

Beautiful Open-Source Form Builder

Refactor form spam handling and improve logging in UserActionService

Julien Nahumeac09656cbaa
diff --git a/api/app/Jobs/Form/CheckFormForSpam.php b/api/app/Jobs/Form/CheckFormForSpam.php
deleted file mode 100644
index c43a14eb9..000000000
--- a/api/app/Jobs/Form/CheckFormForSpam.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-namespace App\Jobs\Form;
-
-use App\Models\Forms\Form;
-use App\Service\Forms\FormSpamService;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-
-class CheckFormForSpam implements ShouldQueue
-{
- use Dispatchable;
- use InteractsWithQueue;
- use Queueable;
- use SerializesModels;
-
- public function __construct(public Form $form)
- {
- }
-
- public function handle(FormSpamService $formSpamService): void
- {
- $formSpamService->checkForm($this->form);
- }
-}
diff --git a/api/app/Listeners/Forms/FormSpamCheckListener.php b/api/app/Listeners/Forms/FormSpamCheckListener.php
index 75ed0064c..648027022 100644
--- a/api/app/Listeners/Forms/FormSpamCheckListener.php
+++ b/api/app/Listeners/Forms/FormSpamCheckListener.php
@@ -3,17 +3,25 @@
namespace App\Listeners\Forms;
use App\Events\Forms\FormSaved;
-use App\Jobs\Form\CheckFormForSpam;
+use App\Service\Forms\FormSpamService;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Support\Facades\App;
-class FormSpamCheckListener
+class FormSpamCheckListener implements ShouldQueue
{
+ use InteractsWithQueue;
+
+ public function __construct(protected FormSpamService $formSpamService)
+ {
+ }
+
public function handle(FormSaved $event): void
{
if (App::environment('testing')) {
return;
}
- CheckFormForSpam::dispatch($event->form);
+ $this->formSpamService->checkForm($event->form);
}
}
diff --git a/api/app/Service/AI/Prompts/Form/CheckSpamFormPrompt.php b/api/app/Service/AI/Prompts/Form/CheckSpamFormPrompt.php
index 3910588c3..49968043e 100644
--- a/api/app/Service/AI/Prompts/Form/CheckSpamFormPrompt.php
+++ b/api/app/Service/AI/Prompts/Form/CheckSpamFormPrompt.php
@@ -51,7 +51,7 @@ class CheckSpamFormPrompt extends Prompt
protected ?array $jsonSchema = [
'type' => 'object',
- 'required' => ['is_spam', 'reason'],
+ 'required' => ['is_spam', 'needs_admin_review', 'reason'],
'additionalProperties' => false,
'properties' => [
'is_spam' => [
diff --git a/api/app/Service/Forms/FormSpamService.php b/api/app/Service/Forms/FormSpamService.php
index 3f892224d..333c62e9c 100644
--- a/api/app/Service/Forms/FormSpamService.php
+++ b/api/app/Service/Forms/FormSpamService.php
@@ -77,7 +77,7 @@ class FormSpamService
private function logAdminReview(Form $form, string $reason): void
{
- Log::channel('slack_alerts')->info('Form flagged for admin review 🚨', [
+ Log::channel('slack_alerts')->info('🚨 Form flagged for admin review 🚨', [
'form_id' => $form->id,
'form_title' => $form->title,
'user_id' => $form->creator->id,
diff --git a/api/app/Service/UserActionService.php b/api/app/Service/UserActionService.php
index 320be2b99..4405410b1 100644
--- a/api/app/Service/UserActionService.php
+++ b/api/app/Service/UserActionService.php
@@ -7,7 +7,6 @@ use App\Mail\UserBlockedEmail;
use App\Mail\UserUnblockedEmail;
use App\Models\User;
use Illuminate\Support\Facades\Mail;
-use Illuminate\Support\Facades\Log;
class UserActionService
{
@@ -17,24 +16,15 @@ class UserActionService
$user->forms()->update(['visibility' => 'draft']);
- AdminController::log('User blocked', [
- 'user_id' => $user->id,
+ AdminController::log('User blocked 🚫', [
+ 'user' => $user->email . ' (' . $user->id . ')',
'reason' => $reason,
+ 'moderator_id' => $moderatorId,
+ 'actions' => [
+ 'Admin Panel' => front_url('/admin?user_id=' . $user->id),
+ ]
]);
- // Log to Slack
- if (app()->environment() !== 'testing') {
- Log::channel('slack_admin')->info('User blocked 🚫', [
- 'user_id' => $user->id,
- 'email' => $user->email,
- 'reason' => $reason,
- 'moderator_id' => $moderatorId,
- 'actions' => [
- 'Admin Panel' => front_url('/admin?user_id=' . $user->id),
- ]
- ]);
- }
-
Mail::to($user)->send(new UserBlockedEmail($user, $reason));
return $user->fresh();
@@ -44,24 +34,15 @@ class UserActionService
{
$user->unblockUser($reason, $moderatorId);
- AdminController::log('User unblocked', [
- 'user_id' => $user->id,
+ AdminController::log('User unblocked πŸ”“', [
+ 'user' => $user->email . ' (' . $user->id . ')',
'reason' => $reason,
+ 'moderator_id' => $moderatorId,
+ 'actions' => [
+ 'Admin Panel' => front_url('/admin?user_id=' . $user->id),
+ ]
]);
- // Log to Slack
- if (app()->environment() !== 'testing') {
- Log::channel('slack_admin')->info('User unblocked πŸ”“', [
- 'user_id' => $user->id,
- 'email' => $user->email,
- 'reason' => $reason,
- 'moderator_id' => $moderatorId,
- 'actions' => [
- 'Admin Panel' => front_url('/admin?user_id=' . $user->id),
- ]
- ]);
- }
-
Mail::to($user)->send(new UserUnblockedEmail($user, $reason));
return $user->fresh();