Merge branch 'release/v1.2.0' into main

Author: itinerare

CHANGELOG.md

@@ -4,6 +4,33 @@
 All notable changes to this project will be documented in this file.
 <!--- END HEADER -->
 
+## [1.2.0](https://github.com/itinerare/Alcyone/compare/v1.1.1...v1.2.0) (2023-11-12)
+
+### Features
+
+
+##### Reports
+
+* Add opt-in email notifications for new reports, tests ([81d28e](https://github.com/itinerare/Alcyone/commit/81d28eac8fece0b2e582ca81287a8ab039342580))
+
+##### Users
+
+* Add admin notification preference, tests ([3ce088](https://github.com/itinerare/Alcyone/commit/3ce088750f4754479c3b13c81e02a08715353cc8))
+
+### Bug Fixes
+
+
+##### Admin
+
+* Fix rank page verbiage ([48f972](https://github.com/itinerare/Alcyone/commit/48f97269cbb6ac0a8e91e7338b111d4a7b8972ad))
+
+##### Tests
+
+* Tweak report notif test conditions ([f4a793](https://github.com/itinerare/Alcyone/commit/f4a793aa73d7e22fdfb8974896d9f85798dbd8ca))
+
+
+---
+
 ## [1.1.1](https://github.com/itinerare/Alcyone/compare/v1.1.0...v1.1.1) (2023-11-05)
 
 ### Bug Fixes

app/Http/Controllers/AccountController.php

@@ -110,6 +110,31 @@ public function postEmail(Request $request, UserService $service) {
         return redirect()->back();
     }
 
+    /**
+     * Changes the user's admin notification setting.
+     *
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function postAdminNotifs(Request $request) {
+        $request->validate([
+            'receive_admin_notifs' => 'required|boolean',
+        ]);
+
+        if (!Auth::user()->isMod) {
+            Auth::user()->update([
+                'receive_admin_notifs' => 0,
+            ]);
+            abort(404);
+        }
+
+        Auth::user()->update([
+            'receive_admin_notifs' => $request->get('receive_admin_notifs'),
+        ]);
+        flash('Admin notification preference updated successfully.')->success();
+
+        return redirect()->back();
+    }
+
     /**
      * Enables the user's two factor auth.
      *

app/Mail/ReportSubmitted.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace App\Mail;
+
+use App\Models\Report\Report;
+use Illuminate\Bus\Queueable;
+use Illuminate\Mail\Mailable;
+use Illuminate\Mail\Mailables\Content;
+use Illuminate\Mail\Mailables\Envelope;
+use Illuminate\Queue\SerializesModels;
+
+class ReportSubmitted extends Mailable {
+    use Queueable, SerializesModels;
+
+    /**
+     * The report instance.
+     *
+     * @var \App\Models\Report\Report
+     */
+    public $report;
+
+    /**
+     * The image upload instance.
+     *
+     * @var \App\Models\ImageUpload
+     */
+    public $image;
+
+    /**
+     * Create a new message instance.
+     */
+    public function __construct(Report $report) {
+        $this->afterCommit();
+        $this->report = $report;
+        $this->image = $report->image;
+    }
+
+    /**
+     * Get the message envelope.
+     */
+    public function envelope(): Envelope {
+        return new Envelope(
+            subject: 'New Content Report Submitted',
+        );
+    }
+
+    /**
+     * Get the message content definition.
+     */
+    public function content(): Content {
+        return new Content(
+            markdown: 'mail.report-submitted',
+        );
+    }
+
+    /**
+     * Get the attachments for the message.
+     *
+     * @return array<int, \Illuminate\Mail\Mailables\Attachment>
+     */
+    public function attachments(): array {
+        return [];
+    }
+}

app/Models/User/User.php

@@ -20,7 +20,7 @@ class User extends Authenticatable implements MustVerifyEmail {
      */
     protected $fillable = [
         'name', 'email', 'password', 'rank_id', 'theme',
-        'is_banned', 'ban_reason', 'banned_at',
+        'is_banned', 'ban_reason', 'banned_at', 'receive_admin_notifs',
     ];
 
     /**

app/Services/ReportManager.php

@@ -4,9 +4,11 @@
 
 use App\Mail\ReportAccepted;
 use App\Mail\ReportCancelled;
+use App\Mail\ReportSubmitted;
 use App\Models\ImageUpload;
 use App\Models\Report\Report;
 use App\Models\Report\Reporter;
+use App\Models\User\User;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Mail;
@@ -71,6 +73,13 @@ public function createReport($data) {
             $report->key = $report->id.$report->key;
             $report->save();
 
+            // Send an email notification to relevant users
+            foreach (User::where('receive_admin_notifs', 1)->get() as $user) {
+                if ($user->isMod) {
+                    Mail::to($user->email)->send(new ReportSubmitted($report));
+                }
+            }
+
             return $this->commitReturn($report);
         } catch (\Exception $e) {
             $this->setError('error', $e->getMessage());

composer.json

@@ -88,5 +88,5 @@
     },
     "minimum-stability": "stable",
     "prefer-stable": true,
-    "version": "1.1.1"
+    "version": "1.2.0"
 }