Skip to content

Add handling of content reports #949

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rosalieper merged 22 commits into from
Jul 25, 2025
Merged

Add handling of content reports #949

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
1832331
add config vars for sending complaint mails
deer-wmde Jun 27, 2025
1d6faba
add ComplaintNotification
deer-wmde Jun 27, 2025
19ca3e9
clearer naming
deer-wmde Jun 27, 2025
00dd3ac
add ComplaintController
deer-wmde Jun 27, 2025
2a6db8f
add route
deer-wmde Jun 27, 2025
04461b5
add ExternalComplaintNotification
deer-wmde Jun 27, 2025
792f422
templating
deer-wmde Jun 27, 2025
7cf1963
switch order of notifications
deer-wmde Jun 30, 2025
fd16dca
add WIP tests
deer-wmde Jul 7, 2025
dec3ba9
restrict email validation to rfc filter
deer-wmde Jul 7, 2025
070353f
fix email validation rule condition
deer-wmde Jul 10, 2025
685d5e8
add multi mail address test case
deer-wmde Jul 10, 2025
490e277
refactored class naming
deer-wmde Jul 11, 2025
5dce2b4
WIP persist notifications in database
deer-wmde Jul 11, 2025
d76b9d5
add ComplaintRecord class
deer-wmde Jul 18, 2025
ff9704d
extend test cases
deer-wmde Jul 18, 2025
41e924f
adjust field names to UI code
deer-wmde Jul 18, 2025
73ba6e9
fix testRecordOnMailFail status code assert
deer-wmde Jul 18, 2025
07af1b7
adjust parameter names in test case
deer-wmde Jul 21, 2025
f6e6436
reduce size limit of text fields to 1000
deer-wmde Jul 22, 2025
d0917e6
fix field names in test
deer-wmde Jul 22, 2025
b24b994
remove form contents from externail mail notification
deer-wmde Jul 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions app/Http/Controllers/ComplaintController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,14 @@ public function sendMessage(Request $request): \Illuminate\Http\JsonResponse

$complaintRecord = new ComplaintRecord;
$complaintRecord->name = $validated['name'];
$complaintRecord->mail_address = $validated['mailAddress'];
$complaintRecord->reason = $validated['reason'];
$complaintRecord->offending_urls = $validated['offendingUrls'];
$complaintRecord->mail_address = $validated['email'];
$complaintRecord->reason = $validated['message'];
$complaintRecord->offending_urls = $validated['url'];
$complaintRecord->save();

if (! empty($validated['mailAddress'])) {
if (! empty($complaintRecord->mail_address)) {
Notification::route('mail', [
$validated['mailAddress'],
$complaintRecord->mail_address,
])->notify(
new ComplaintNotificationExternal(
$complaintRecord->offending_urls,
Expand Down Expand Up @@ -86,15 +86,15 @@ public function sendMessage(Request $request): \Illuminate\Http\JsonResponse
protected function validator(array $data): \Illuminate\Validation\Validator
{
$data['name'] = $data['name'] ?? '';
$data['mailAddress'] = $data['mailAddress'] ?? '';
$data['email'] = $data['email'] ?? '';

$validation = [
'recaptcha' => ['required', 'string', 'bail', $this->recaptchaValidation],
'name' => ['nullable', 'string', 'max:300'],
'reason' => ['required', 'string', 'max:10000'],
'offendingUrls' => ['required', 'string', 'max:10000'],
'message' => ['required', 'string', 'max:10000'],
Comment thread
deer-wmde marked this conversation as resolved.
Outdated
'url' => ['required', 'string', 'max:10000'],

'mailAddress' => [
'email' => [
'nullable',
'max:300',
Rule::when(
Expand Down
Loading