From db9c6fb7f2ef207a7ab5af9149f10e9311f56185 Mon Sep 17 00:00:00 2001
From: Michael Vasseur <14887731+vmcj@users.noreply.github.com>
Date: Sat, 8 Nov 2025 18:24:30 +0100
Subject: [PATCH 1/3] Don't display future clarifications to teams

Only time where this can ever happen is a replay of a contest but change
is trivial enough.
---
 webapp/src/Controller/Team/MiscController.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/webapp/src/Controller/Team/MiscController.php b/webapp/src/Controller/Team/MiscController.php
index 1ad3d4e7a1..b21252c448 100644
--- a/webapp/src/Controller/Team/MiscController.php
+++ b/webapp/src/Controller/Team/MiscController.php
@@ -92,8 +92,7 @@ public function homeAction(Request $request): Response
                 paginated: false
             )[0];
 
-            /** @var Clarification[] $clarifications */
-            $clarifications = $this->em->createQueryBuilder()
+            $qb = $this->em->createQueryBuilder()
                 ->from(Clarification::class, 'c')
                 ->leftJoin('c.problem', 'p')
                 ->leftJoin('c.sender', 's')
@@ -105,9 +104,14 @@ public function homeAction(Request $request): Response
                 ->setParameter('contest', $contest)
                 ->setParameter('team', $team)
                 ->addOrderBy('c.submittime', 'DESC')
-                ->addOrderBy('c.clarid', 'DESC')
-                ->getQuery()
-                ->getResult();
+                ->addOrderBy('c.clarid', 'DESC');
+            if (!$this->dj->checkrole('jury')) {
+                $qb->andWhere('c.submittime <= :time')
+                   ->setparameter('time', time());
+            }
+
+            /** @var Clarification[] $clarifications */
+            $clarifications = $qb->getQuery()->getResult();
 
             /** @var Clarification[] $clarificationRequests */
             $clarificationRequests = $this->em->createQueryBuilder()

From 052c8429bb2717275ca9a06bb65fe39b986b6ab2 Mon Sep 17 00:00:00 2001
From: Michael Vasseur <14887731+vmcj@users.noreply.github.com>
Date: Tue, 11 Nov 2025 19:45:36 +0100
Subject: [PATCH 2/3] Implement Nicky his feedback

---
 webapp/src/Controller/Team/MiscController.php | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/webapp/src/Controller/Team/MiscController.php b/webapp/src/Controller/Team/MiscController.php
index b21252c448..7b7241efba 100644
--- a/webapp/src/Controller/Team/MiscController.php
+++ b/webapp/src/Controller/Team/MiscController.php
@@ -92,7 +92,8 @@ public function homeAction(Request $request): Response
                 paginated: false
             )[0];
 
-            $qb = $this->em->createQueryBuilder()
+            /** @var Clarification[] $clarifications */
+            $clarifications = $this->em->createQueryBuilder()
                 ->from(Clarification::class, 'c')
                 ->leftJoin('c.problem', 'p')
                 ->leftJoin('c.sender', 's')
@@ -101,17 +102,14 @@ public function homeAction(Request $request): Response
                 ->andWhere('c.contest = :contest')
                 ->andWhere('c.sender IS NULL')
                 ->andWhere('c.recipient = :team OR c.recipient IS NULL')
+                ->andWhere('c.submittime <= :time')
                 ->setParameter('contest', $contest)
                 ->setParameter('team', $team)
+                ->setparameter('time', time())
                 ->addOrderBy('c.submittime', 'DESC')
                 ->addOrderBy('c.clarid', 'DESC');
-            if (!$this->dj->checkrole('jury')) {
-                $qb->andWhere('c.submittime <= :time')
-                   ->setparameter('time', time());
-            }
-
-            /** @var Clarification[] $clarifications */
-            $clarifications = $qb->getQuery()->getResult();
+                ->getQuery()
+                ->getResult();
 
             /** @var Clarification[] $clarificationRequests */
             $clarificationRequests = $this->em->createQueryBuilder()

From f14a3f05eb74a2d5f52e4ce18784ad3800305313 Mon Sep 17 00:00:00 2001
From: Michael Vasseur <14887731+vmcj@users.noreply.github.com>
Date: Tue, 11 Nov 2025 20:53:42 +0100
Subject: [PATCH 3/3] Fix syntax error

---
 webapp/src/Controller/Team/MiscController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/src/Controller/Team/MiscController.php b/webapp/src/Controller/Team/MiscController.php
index 7b7241efba..7da4f1ded0 100644
--- a/webapp/src/Controller/Team/MiscController.php
+++ b/webapp/src/Controller/Team/MiscController.php
@@ -107,7 +107,7 @@ public function homeAction(Request $request): Response
                 ->setParameter('team', $team)
                 ->setparameter('time', time())
                 ->addOrderBy('c.submittime', 'DESC')
-                ->addOrderBy('c.clarid', 'DESC');
+                ->addOrderBy('c.clarid', 'DESC')
                 ->getQuery()
                 ->getResult();