From c6ca6547a45af2b009f5d0845de04a0c1b03e002 Mon Sep 17 00:00:00 2001
From: Thomas Daniels <daniels.thomas@pm.me>
Date: Mon, 20 Apr 2020 21:27:21 +0200
Subject: [PATCH] Update streamer form for Twitch URLs and names with 25 chars

---
 app/views/streamer/edit.scala                | 2 +-
 modules/streamer/src/main/Streamer.scala     | 4 ++--
 modules/streamer/src/main/StreamerForm.scala | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/streamer/edit.scala b/app/views/streamer/edit.scala
index 0fe7153ef5..a32476dee6 100644
--- a/app/views/streamer/edit.scala
+++ b/app/views/streamer/edit.scala
@@ -176,7 +176,7 @@ object edit extends Context.ToLang {
                   form3.group(
                     form("name"),
                     streamerName(),
-                    help = keepItShort(20).some,
+                    help = keepItShort(25).some,
                     half = true
                   )(form3.input(_)),
                   form3.checkbox(
diff --git a/modules/streamer/src/main/Streamer.scala b/modules/streamer/src/main/Streamer.scala
index 7d1c17c748..15f7aff420 100644
--- a/modules/streamer/src/main/Streamer.scala
+++ b/modules/streamer/src/main/Streamer.scala
@@ -80,8 +80,8 @@ object Streamer {
     def minUrl  = s"twitch.tv/$userId"
   }
   object Twitch {
-    private val UserIdRegex = """([\w-]{2,24}+)""".r
-    private val UrlRegex    = """twitch\.tv/([\w-]{2,24}+)""".r.unanchored
+    private val UserIdRegex = """([\w-]{2,25}+)""".r
+    private val UrlRegex    = """twitch\.tv/([\w-]{2,25}+)""".r.unanchored
     // https://www.twitch.tv/chessnetwork
     def parseUserId(str: String): Option[String] = str match {
       case UserIdRegex(u) => u.some
diff --git a/modules/streamer/src/main/StreamerForm.scala b/modules/streamer/src/main/StreamerForm.scala
index a3dc947019..11509dc998 100644
--- a/modules/streamer/src/main/StreamerForm.scala
+++ b/modules/streamer/src/main/StreamerForm.scala
@@ -20,7 +20,7 @@ object StreamerForm {
         text
           .verifying(
             Constraints.minLength(2),
-            Constraints.maxLength(24)
+            Constraints.maxLength(47)
           )
           .verifying("Invalid Twitch username", s => Streamer.Twitch.parseUserId(s).isDefined)
       ),
@@ -111,6 +111,6 @@ object StreamerForm {
   implicit private val nameFormat        = formatter.stringFormatter[Name](_.value, Name.apply)
   private def nameField = of[Name].verifying(
     constraint.minLength[Name](_.value)(3),
-    constraint.maxLength[Name](_.value)(20)
+    constraint.maxLength[Name](_.value)(25)
   )
 }