Some gentle touches regarding solution comments email helper

Author: Neloop

app/V1Module/presenters/CommentsPresenter.php

@@ -123,10 +123,12 @@ public function actionAddComment(string $id) {
     $this->comments->flush();
 
     // send email to all participants in comment thread
-    if ($solution = $this->assignmentSolutions->get($id)) {
-      $this->solutionCommentsEmailsSender->assignmentSolutionComment($solution, $comment);
-    } else if ($solution = $this->referenceExerciseSolutions->get($id)) {
-      $this->solutionCommentsEmailsSender->referenceSolutionComment($solution, $comment);
+    $assignmentSolution = $this->assignmentSolutions->get($id);
+    $referenceSolution = $this->referenceExerciseSolutions->get($id);
+    if ($assignmentSolution) {
+      $this->solutionCommentsEmailsSender->assignmentSolutionComment($assignmentSolution, $comment);
+    } else if ($referenceSolution) {
+      $this->solutionCommentsEmailsSender->referenceSolutionComment($referenceSolution, $comment);
     } else {
       // Nothing to do here...
     }

app/helpers/Emails/NotificationsHelper/Comments/SolutionCommentsEmailsSender.php

@@ -49,22 +49,19 @@ private function sendSolutionComment($solution, Comment $comment): bool {
 
     $baseSolution = $solution->getSolution();
     $subject = $this->assignmentSolutionCommentPrefix . $baseSolution->getAuthor()->getName();
-    $recipients = [$baseSolution->getAuthor()->getEmail()];
+
+    $recipients = [];
+    $recipients[$baseSolution->getAuthor()->getEmail()] = $baseSolution->getAuthor();
     foreach ($comment->getThread()->findAllPublic() as $pComment) {
       $user = $pComment->getUser();
       if (!$user->getSettings()->getSolutionCommentsEmails()) {
         continue;
       }
-      $recipients[] = $user->getEmail();
+      $recipients[$user->getEmail()] = $user;
     }
 
-    // make user emails unique, so the emails won't be multiplied
-    $recipients = array_unique($recipients);
-
     // filter out the author of the comment, it is pointless to send email to that user
-    $recipients = array_filter($recipients, function (string $email) use ($comment) {
-      return $email !== $comment->getUser()->getEmail();
-    });
+    unset($recipients[$comment->getUser()->getEmail()]);
 
     if (count($recipients) === 0) {
       return true;
@@ -82,7 +79,7 @@ private function sendSolutionComment($solution, Comment $comment): bool {
       [],
       $subject,
       $body,
-      $recipients
+      array_keys($recipients)
     );
   }