feat: notification rollups, in-app announcement broadcasts, and announcement detail modal

app/Http/Controllers/Admin/EmailController.php

@@ -5,11 +5,14 @@
 use App\Http\Controllers\Controller;
 use App\Mail\BulkAnnouncementMail;
 use App\Models\User;
+use App\Notifications\SystemAnnouncementNotification;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Mail;
+use Illuminate\Support\Facades\Notification;
 use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Str;
 use Inertia\Inertia;
 use Inertia\Response;
 
@@ -20,43 +23,32 @@ class EmailController extends Controller
      */
     public function create(): Response
     {
-        $allSubscribersCount = User::where('receive_emails', true)
-            ->whereNotNull('email')
-            ->count();
-
-        $studentsCount = User::where('receive_emails', true)
-            ->whereNotNull('email')
-            ->doesntHave('roles')
-            ->count();
-
-        $staffCount = User::where('receive_emails', true)
-            ->whereNotNull('email')
-            ->has('roles')
-            ->count();
-
         return Inertia::render('admin/EmailSend', [
-            'recipientCount' => $allSubscribersCount,
-            'studentsCount' => $studentsCount,
-            'staffCount' => $staffCount,
+            'allUsersCount' => User::count(),
+            'recipientCount' => User::where('receive_emails', true)->count(),
+            'studentsCount' => User::where('is_verified', false)->count(),
+            'staffCount' => User::where('is_verified', true)->count(),
         ]);
     }
 
     /**
-     * Fetch raw subscribed email list for importing into the editor.
+     * Fetch raw email list for importing into the editor.
      */
     public function recipients(Request $request): JsonResponse
     {
-        $type = $request->query('type', 'all');
+        $type = $request->query('type', 'subscribers');
 
-        $query = User::where('receive_emails', true)->whereNotNull('email');
+        $query = User::query();
 
-        if ($type === 'students') {
-            $query->doesntHave('roles');
+        if ($type === 'subscribers') {
+            $query->where('receive_emails', true);
+        } elseif ($type === 'students') {
+            $query->where('is_verified', false);
         } elseif ($type === 'staff') {
-            $query->has('roles');
+            $query->where('is_verified', true);
         }
 
-        $emails = $query->pluck('email')->unique()->values();
+        $emails = $query->pluck('email');
 
         return response()->json([
             'emails' => $emails,
@@ -65,7 +57,7 @@ public function recipients(Request $request): JsonResponse
     }
 
     /**
-     * Dispatch emails to a list of raw recipient emails.
+     * Dispatch emails and/or in-app announcements.
      */
     public function store(Request $request): RedirectResponse
     {
@@ -74,8 +66,20 @@ public function store(Request $request): RedirectResponse
             'subject' => ['required', 'string', 'max:255'],
             'body' => ['required', 'string'],
             'image' => ['sometimes', 'nullable', 'image', 'mimes:jpg,jpeg,png,webp', 'max:5120'],
+            'send_email' => ['sometimes', 'boolean'],
+            'send_in_app' => ['sometimes', 'boolean'],
+            'action_url' => ['sometimes', 'nullable', 'string', 'max:255'],
         ]);
 
+        $sendEmail = $request->boolean('send_email', true);
+        $sendInApp = $request->boolean('send_in_app', false);
+
+        if (! $sendEmail && ! $sendInApp) {
+            return redirect()
+                ->route('admin.emails.create')
+                ->with('error', 'Please select at least one delivery channel (Email or In-App Notification).');
+        }
+
         $subject = $validated['subject'];
         $body = $validated['body'];
 
@@ -95,7 +99,7 @@ public function store(Request $request): RedirectResponse
         if (empty($uniqueEmails)) {
             return redirect()
                 ->route('admin.emails.create')
-                ->with('error', 'No valid recipient email addresses found in the list.');
+                ->withErrors(['recipients' => 'Please provide at least one valid recipient email in the list.']);
         }
 
         $imageUrl = null;
@@ -105,29 +109,37 @@ public function store(Request $request): RedirectResponse
             $imageUrl = str_starts_with($relativeUrl, 'http') ? $relativeUrl : url($relativeUrl);
         }
 
-        // Fetch known user names in bulk for personalization
-        $usersMap = User::whereIn('email', $uniqueEmails)
-            ->pluck('name', 'email')
-            ->toArray();
-
-        foreach ($uniqueEmails as $email) {
-            $recipientName = $usersMap[$email] ?? null;
-
-            Mail::to($email)->queue(
-                new BulkAnnouncementMail(
-                    mailSubject: $subject,
-                    mailContent: $body,
-                    recipientName: $recipientName,
-                    imageUrl: $imageUrl,
-                )
-            );
+        $targetUsers = User::whereIn('email', $uniqueEmails)->get();
+
+        if ($sendEmail) {
+            $usersMap = $targetUsers->pluck('name', 'email');
+
+            foreach ($uniqueEmails as $email) {
+                Mail::to($email)->queue(
+                    new BulkAnnouncementMail(
+                        mailSubject: $subject,
+                        mailContent: $body,
+                        recipientName: $usersMap[$email] ?? null,
+                        imageUrl: $imageUrl,
+                    )
+                );
+            }
         }
 
-        $totalCount = count($uniqueEmails);
-        $emailPlural = $totalCount === 1 ? 'recipient' : 'recipients';
+        if ($sendInApp && $targetUsers->isNotEmpty()) {
+            $announcement = new SystemAnnouncementNotification(
+                title: $subject,
+                snippet: Str::limit(strip_tags($body), 120),
+                fullContent: $body,
+                imageUrl: $imageUrl,
+                url: $validated['action_url'] ?? null,
+            );
+
+            Notification::send($targetUsers, $announcement);
+        }
 
         return redirect()
             ->route('admin.emails.create')
-            ->with('success', "Email successfully queued for {$totalCount} unique {$emailPlural}.");
+            ->with('success', 'Announcement successfully dispatched.');
     }
 }

app/Http/Controllers/AuthController.php

@@ -220,7 +220,7 @@ public function completeOnboarding(Request $request)
                         ]);
 
                         $totalAppreciations = $targetUser->appreciationsReceived()->count();
-                        $targetUser->notify(new UserAppreciationNotification($user, $totalAppreciations));
+                        UserAppreciationNotification::sendTo($targetUser, $user, $totalAppreciations);
                     }
                 }
             }

app/Http/Controllers/BlogController.php

@@ -185,7 +185,7 @@ public function toggleReaction(Blog $blog)
             $blog->reactions()->create(['user_id' => $user->id]);
 
             if ($blog->user_id !== $user->id) {
-                $blog->user->notify(new BlogReactionNotification($blog, $user, $blog->reactions()->count()));
+                BlogReactionNotification::sendTo($blog->user, $blog, $user, $blog->reactions()->count());
             }
         }
 

app/Http/Controllers/ForumVoteController.php

@@ -64,7 +64,7 @@ public function votePost(Request $request, ForumPost $post): RedirectResponse
         });
 
         if ($isFirstTimeUpvote && $post->user_id !== $userId) {
-            $post->user->notify(new ForumVoteNotification($post, $user));
+            ForumVoteNotification::sendTo($post->user, $post, $user);
         }
 
         return back();
@@ -123,7 +123,7 @@ public function voteAnswer(Request $request, ForumAnswer $answer): RedirectRespo
         });
 
         if ($isFirstTimeUpvote && $answer->user_id !== $userId) {
-            $answer->user->notify(new ForumVoteNotification($answer, $user));
+            ForumVoteNotification::sendTo($answer->user, $answer, $user);
         }
 
         return back();

app/Http/Controllers/NodeController.php

@@ -109,7 +109,7 @@ public function vote(Request $request, Node $node)
         }
 
         if ($isFirstTimeUpvote && $node->user_id && $node->user_id !== $user->id) {
-            $node->user->notify(new NodeVoteNotification($node, $user));
+            NodeVoteNotification::sendTo($node->user, $node, $user);
         }
 
         return back();

app/Http/Controllers/UserProfileController.php

@@ -367,7 +367,7 @@ public function toggleAppreciate(User $user)
             ]);
 
             $totalAppreciations = $user->appreciationsReceived()->count();
-            $user->notify(new UserAppreciationNotification($currentAuthUser, $totalAppreciations));
+            UserAppreciationNotification::sendTo($user, $currentAuthUser, $totalAppreciations);
         }
 
         return back();

app/Notifications/BlogReactionNotification.php

@@ -6,8 +6,8 @@
 use App\Models\User;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Notification;
+use Illuminate\Support\Facades\Cache;
 
 class BlogReactionNotification extends Notification implements ShouldQueue
 {
@@ -19,44 +19,45 @@ public function __construct(
         public int $reactionsCount,
     ) {}
 
-    public function isMilestone(): bool
+    /**
+     * Send or roll up a blog reaction notification to the blog author.
+     */
+    public static function sendTo(User $targetUser, Blog $blog, User $reactor, int $reactionsCount): void
     {
-        $milestones = [1, 10, 25, 50, 100, 250, 500, 1000];
+        if ($targetUser->id === $reactor->id) {
+            return;
+        }
 
-        return in_array($this->reactionsCount, $milestones, true)
-            || ($this->reactionsCount > 1000 && $this->reactionsCount % 500 === 0);
-    }
+        $unread = $targetUser->unreadNotifications()
+            ->where('type', self::class)
+            ->get()
+            ->first(fn ($n) => ($n->data['blog_id'] ?? null) === $blog->id);
 
-    public function via(object $notifiable): array
-    {
-        $channels = ['database'];
+        if ($unread) {
+            $data = $unread->data;
+            $count = ($data['count'] ?? 1) + 1;
+            $others = $count - 1;
+            $othersText = $others === 1 ? '1 other person' : "{$others} other people";
 
-        if ($this->isMilestone() && ! empty($notifiable->email) && ($notifiable->receive_emails ?? true)) {
-            $channels[] = 'mail';
-        }
+            $data['count'] = $count;
+            $data['title'] = "{$reactor->name} and {$othersText} loved your blog post";
+            $data['message'] = $blog->title;
+            $data['reactions_count'] = $reactionsCount;
 
-        return $channels;
+            $unread->update([
+                'data' => $data,
+                'created_at' => now(),
+            ]);
+
+            Cache::forever("user:{$targetUser->id}:has_unread_notifs", true);
+        } else {
+            $targetUser->notify(new self($blog, $reactor, $reactionsCount));
+        }
     }
 
-    public function toMail(object $notifiable): MailMessage
+    public function via(object $notifiable): array
     {
-        $headline = $this->reactionsCount === 1
-            ? 'Your blog received its first love reaction! ❤️'
-            : "🎉 Milestone: {$this->reactionsCount} people loved your blog post!";
-
-        return (new MailMessage)
-            ->subject($headline)
-            ->view('emails.default', [
-                'subject' => $headline,
-                'greeting' => "Hello {$notifiable->name},",
-                'lines' => [
-                    "{$this->reactor->name} just loved your blog post \"{$this->blog->title}\".",
-                    "Your article has reached a milestone of {$this->reactionsCount} love reactions!",
-                    'Thank you for creating content that resonates with our community.',
-                ],
-                'actionText' => 'View Blog Post',
-                'actionUrl' => route('blogs.show', $this->blog->slug),
-            ]);
+        return ['database'];
     }
 
     public function toArray(object $notifiable): array
@@ -66,6 +67,10 @@ public function toArray(object $notifiable): array
             'title' => "{$this->reactor->name} loved your blog post",
             'message' => $this->blog->title,
             'url' => route('blogs.show', $this->blog->slug),
+            'blog_id' => $this->blog->id,
+            'reactor_id' => $this->reactor->id,
+            'reactions_count' => $this->reactionsCount,
+            'count' => 1,
         ];
     }
 }

app/Notifications/ForumAnswerNotification.php

@@ -6,7 +6,6 @@
 use App\Models\ForumPost;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Notification;
 use Illuminate\Support\Str;
 
@@ -27,36 +26,7 @@ public function __construct(
      */
     public function via(object $notifiable): array
     {
-        $channels = ['database'];
-
-        // Only send email for direct answers to questions (not sub-replies), if user is opted in
-        if (! $this->isReply && ! empty($notifiable->email) && ($notifiable->receive_emails ?? true)) {
-            $channels[] = 'mail';
-        }
-
-        return $channels;
-    }
-
-    /**
-     * Get the mail representation of the notification.
-     */
-    public function toMail(object $notifiable): MailMessage
-    {
-        $authorName = $this->answer->user?->name ?? 'A student';
-        $snippet = Str::limit(strip_tags($this->answer->body), 150);
-
-        return (new MailMessage)
-            ->subject("New answer to your question: \"{$this->post->title}\" 💬")
-            ->view('emails.default', [
-                'subject' => "New answer on \"{$this->post->title}\"",
-                'greeting' => "Hello {$notifiable->name},",
-                'lines' => [
-                    "{$authorName} just answered your question \"{$this->post->title}\":",
-                    "\"{$snippet}\"",
-                ],
-                'actionText' => 'View Answer',
-                'actionUrl' => route('forum.show', $this->post->slug),
-            ]);
+        return ['database'];
     }
 
     /**