Merge branch 'master' into relay-vertical-resizer-fix

Author: ornicar

app/controllers/Streamer.scala

@@ -229,7 +229,7 @@ final class Streamer(env: Env, apiC: => Api) extends LilaController(env):
   def oauthLinkYoutube = Auth { _ ?=> _ ?=>
     Found(myStreamer): _ =>
       val state = oauth.makeState()
-      val redirectUri = routeUrl(routes.Streamer.oauthYoutubeRedirect).pp
+      val redirectUri = routeUrl(routes.Streamer.oauthYoutubeRedirect)
       val url = oauth.authorizeUrl.youtube(redirectUri, state, getBool("force_verify"))
       Redirect(url).withCookies(oauthMakeCookie("youtube", state))
   }

build.sbt

@@ -205,7 +205,7 @@ lazy val history = module("history",
 )
 
 lazy val search = module("search",
-  Seq(common),
+  Seq(memo),
   Seq(playWs.ahc, lilaSearch)
 )
 

modules/common/src/main/MarkdownRender.scala

@@ -93,8 +93,11 @@ final class MarkdownRender(
 
   // https://github.com/vsch/flexmark-java/issues/496
   private val tooManyUnderscoreRegex = """(_{6,})""".r
-  private def preventStackOverflow(text: Markdown) = Markdown:
-    tooManyUnderscoreRegex.replaceAllIn(text.value, "_" * 3)
+  private val tooManyQuotes = """^[>\s*]{5,}""".r
+  private def preventStackOverflow(text: Markdown) =
+    text.map:
+      _.pipe(tooManyUnderscoreRegex.replaceAllIn(_, "_" * 3))
+        .pipe(tooManyQuotes.replaceAllIn(_, ">" * 4))
 
   def apply(key: MarkdownRender.Key)(text: Markdown): Html = Html:
     Chronometer

modules/coreI18n/src/main/i18n.scala

@@ -59,6 +59,10 @@ trait LangPicker:
   def preferedLanguages(req: RequestHeader, prefLang: Lang): List[Language]
   def byStrOrDefault(str: Option[String]): Lang
 
+// play's req.acceptLanguages can throw exceptions if request headers are malformed
+def playAcceptLanguages(req: RequestHeader): Seq[Lang] =
+  scala.util.Try(req.acceptLanguages).toOption.getOrElse(Seq.empty)
+
 trait JsDump:
   def keysToObject(keys: Seq[I18nKey])(using Translate): play.api.libs.json.JsObject
 

modules/i18n/src/main/LangPicker.scala

@@ -4,7 +4,13 @@ import play.api.i18n.Lang
 import play.api.mvc.RequestHeader
 import scalalib.model.{ Language, LangTag }
 
-import lila.core.i18n.{ toLanguage, defaultLang, defaultLanguage, fixJavaLanguage }
+import lila.core.i18n.{
+  toLanguage,
+  defaultLang,
+  defaultLanguage,
+  fixJavaLanguage,
+  playAcceptLanguages as acceptLanguages
+}
 
 object LangPicker extends lila.core.i18n.LangPicker:
 
@@ -17,11 +23,11 @@ object LangPicker extends lila.core.i18n.LangPicker:
       .getOrElse(defaultLang)
 
   def bestFromRequestHeaders(req: RequestHeader): Option[Lang] =
-    req.acceptLanguages.collectFirstSome(findCloser)
+    acceptLanguages(req).collectFirstSome(findCloser)
 
   def allFromRequestHeaders(req: RequestHeader): List[Lang] = {
-    req.acceptLanguages.flatMap(findCloser) ++
-      req.acceptLanguages.flatMap(lang => ~byCountry.get(lang.country))
+    acceptLanguages(req).flatMap(findCloser) ++
+      acceptLanguages(req).flatMap(lang => ~byCountry.get(lang.country))
   }.distinct.toList
 
   def byStr(str: String): Option[Lang] =
@@ -35,7 +41,7 @@ object LangPicker extends lila.core.i18n.LangPicker:
     langs.sortBy { mine.getOrElse(_, Int.MaxValue) }
 
   def preferedLanguages(req: RequestHeader, prefLang: Lang): List[Language] = {
-    toLanguage(prefLang) +: req.acceptLanguages.map(toLanguage)
+    toLanguage(prefLang) +: acceptLanguages(req).map(toLanguage)
   }.distinct.view.filter(LangList.popularLanguages.contains).toList
 
   def pickBestOf(
@@ -46,7 +52,7 @@ object LangPicker extends lila.core.i18n.LangPicker:
       .map(toLanguage)
       .filter(candidates.contains)
       .orElse:
-        req.acceptLanguages
+        acceptLanguages(req)
           .map(toLanguage)
           .collectFirst:
             case l if candidates.contains(l) => l
@@ -66,9 +72,10 @@ object LangPicker extends lila.core.i18n.LangPicker:
     else defaultByLanguage.get(to.language).orElse(lichessCodes.get(to.language))
 
   def byHref(language: Language, req: RequestHeader): ByHref =
+    val accepted = acceptLanguages(req)
     Lang.get(language.value).flatMap(findCloser) match
       case Some(lang) if fixJavaLanguage(lang) == language =>
-        if req.acceptLanguages.isEmpty || req.acceptLanguages.exists(_.language == lang.language)
+        if accepted.isEmpty || accepted.exists(_.language == lang.language)
         then ByHref.Found(lang)
         else ByHref.Refused(lang)
       case Some(lang) => ByHref.Redir(fixJavaLanguage(lang))

modules/recap/src/main/ui/RecapUi.scala

@@ -28,6 +28,6 @@ final class RecapUi(helpers: Helpers):
       main(cls := "page-small box box-pad page")(
         h1(cls := "box__top")(s"Lichess Recap $year will be available soon."),
         div(
-          p("Check back later!")
+          p("Check back at the end of the year!")
         )
       )

modules/relay/src/main/RelayHome.scala

@@ -14,7 +14,7 @@ final class RelayHomeApi(listing: RelayListing, pager: RelayPager, jsonView: Rel
     active <- listing.active
     past <- pager.inactive(1)
     (recent, reallyPast) = stealRecentFromPast(past.currentPageResults)
-  yield RelayHome(active, recent.pp, past.withCurrentPageResults(reallyPast))
+  yield RelayHome(active, recent, past.withCurrentPageResults(reallyPast))
 
   def get(page: Int): Fu[RelayHome | Paginator[WithLastRound]] =
     if page == 1 then home

modules/search/src/main/Env.scala

@@ -13,12 +13,13 @@ private class SearchConfig(val enabled: Boolean, val endpoint: String)
 @Module
 final class Env(
     appConfig: Configuration,
-    ws: StandaloneWSClient
+    ws: StandaloneWSClient,
+    cacheApi: lila.memo.CacheApi
 )(using Executor):
 
   private val config = appConfig.get[SearchConfig]("search")(using AutoConfig.loader)
 
   val client: SearchClient =
     val _client =
       if config.enabled then SearchClient.play(ws, s"${config.endpoint}/api") else SearchClient.noop
-    LilaSearchClient(_client)
+    LilaSearchClient(_client, cacheApi)

modules/search/src/main/LilaSearchClient.scala

@@ -3,16 +3,21 @@ package lila.search
 import lila.search.client.SearchClient
 import lila.search.spec.*
 
-class LilaSearchClient(client: SearchClient)(using Executor) extends SearchClient:
+class LilaSearchClient(client: SearchClient, cacheApi: lila.memo.CacheApi)(using Executor)
+    extends SearchClient:
+
+  private val cache = cacheApi[Query, CountOutput](1024, "search.count"):
+    _.expireAfterWrite(2.minutes).buildAsyncFuture: query =>
+      monitor("count", query.index):
+        client
+          .count(query)
+          .handleError:
+            case e =>
+              logger.info(s"Count error: query={$query}", e)
+              CountOutput(0)
 
   override def count(query: Query): Future[CountOutput] =
-    monitor("count", query.index):
-      client
-        .count(query)
-        .handleError:
-          case e =>
-            logger.info(s"Count error: query={$query}", e)
-            CountOutput(0)
+    cache.get(query)
 
   override def search(query: Query, from: From, size: Size): Future[SearchOutput] =
     monitor("search", query.index):

modules/study/src/main/ui/ListUi.scala

@@ -108,7 +108,7 @@ final class ListUi(helpers: Helpers, bits: StudyBits):
               bits.orderSelect(order, "search", url = o => routes.Study.search(text, 1, o.some)),
               bits.newForm()
             ),
-            paginate(pag, routes.Study.search(text, pag.currentPage, order.some))
+            paginate(pag, routes.Study.search(text, 1, order.some))
           )
         )