form dates can be up to 11 years in the future

lichess-org · Nov 26, 2024 · 7a3d81e · 7a3d81e
1 parent 4853a7c
commit 7a3d81e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/modules/common/src/main/Form.scala b/modules/common/src/main/Form.scala
@@ -309,8 +309,14 @@ object Form:
       formatter
         .stringFormatter[List[String]](_.mkString(sep), _.split(sep).map(_.trim).toList.filter(_.nonEmpty))
 
-  def inTheFuture(m: Mapping[Instant]) =
-    m.verifying("The date must be set in the future", _.isAfterNow)
+  private val dateHumanFormatter =
+    import java.time.format.*
+    DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM)
+
+  def inTheFuture(m: Mapping[Instant], max: Instant = nowInstant.plusYears(11)) =
+    m
+      .verifying("The date must be set in the future", _.isAfterNow)
+      .verifying(s"The date must be set before ${dateHumanFormatter.print(max)}", _.isBefore(max))
 
   object ISODate:
     val pattern                      = "yyyy-MM-dd"

diff --git a/modules/swiss/src/main/SwissForm.scala b/modules/swiss/src/main/SwissForm.scala
@@ -95,12 +95,9 @@ final class SwissForm(using mode: play.api.Mode):
       )
     )
 
-  def nextRound =
-    Form(
-      single(
-        "date" -> inTheFuture(ISOInstantOrTimestamp.mapping)
-      )
-    )
+  def nextRound = Form:
+    single:
+      "date" -> inTheFuture(ISOInstantOrTimestamp.mapping)
 
 object SwissForm: