Scala tweak

lichess-org · Jun 3, 2024 · 23cec5d · 23cec5d
1 parent d027685
commit 23cec5d
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 14 deletions.
diff --git a/modules/app/src/main/scala/http.middleware.scala b/modules/app/src/main/scala/http.middleware.scala
@@ -18,8 +18,7 @@ def ApplyMiddleware(config: HttpServerConfig)(routes: HttpRoutes[IO])(using Logg
   val middleware = autoSlash.andThen(timeout)
 
   def verboseLogger =
-    RequestLogger.httpApp[IO](true, true) andThen
-      ResponseLogger.httpApp[IO, Request[IO]](true, true)
+    RequestLogger.httpApp[IO](true, true).andThen(ResponseLogger.httpApp[IO, Request[IO]](true, true))
 
   val logger =
     if config.apiLogger then verboseLogger

diff --git a/modules/app/src/main/scala/service.search.scala b/modules/app/src/main/scala/service.search.scala
@@ -4,7 +4,6 @@ package app
 import cats.effect.*
 import lila.search.spec.*
 import org.typelevel.log4cats.Logger
-import forum.ForumQuery.*
 import io.github.arainko.ducktape.*
 import org.joda.time.DateTime
 import smithy4s.Timestamp

diff --git a/modules/core/src/main/scala/forum.scala b/modules/core/src/main/scala/forum.scala
@@ -32,10 +32,9 @@ object ForumQuery:
         search(index.name)
           .query(makeQuery(query))
           .fetchSource(false)
-          .sortBy(
-            fieldSort(Fields.date).order(SortOrder.DESC)
-          )
-          .start(from.value) size size.value
+          .sortBy(fieldSort(Fields.date).order(SortOrder.DESC))
+          .start(from.value)
+          .size(size.value)
 
     def countDef(query: Forum) = index => search(index.name).query(makeQuery(query)) size 0
 

diff --git a/modules/core/src/main/scala/game.scala b/modules/core/src/main/scala/game.scala
@@ -55,11 +55,13 @@ object GameQuery:
 
     def searchDef(query: Game)(from: From, size: Size) =
       index =>
-        (search(index.name)
+        search(index.name)
           .query(makeQuery(query))
           .fetchSource(false)
           .sortBy(query.sorting.definition)
-          .start(from.value) size size.value).timeout(timeout)
+          .start(from.value)
+          .size(size.value)
+          .timeout(timeout)
 
     def countDef(query: Game) = index => (search(index.name).query(makeQuery(query)) size 0).timeout(timeout)
 

diff --git a/modules/core/src/main/scala/study.scala b/modules/core/src/main/scala/study.scala
@@ -44,7 +44,8 @@ object StudyQuery:
             fieldSort("_score").order(SortOrder.DESC),
             fieldSort(Fields.likes).order(SortOrder.DESC)
           )
-          .start(from.value) size size.value
+          .start(from.value)
+          .size(size.value)
 
     def countDef(query: Study) = index => search(index.name).query(makeQuery(query)) size 0
 

diff --git a/modules/core/src/main/scala/team.scala b/modules/core/src/main/scala/team.scala
@@ -27,10 +27,9 @@ object TeamQuery:
         search(index.name)
           .query(makeQuery(query))
           .fetchSource(false)
-          .sortBy(
-            fieldSort(Fields.nbMembers).order(SortOrder.DESC)
-          )
-          .start(from.value) size size.value
+          .sortBy(fieldSort(Fields.nbMembers).order(SortOrder.DESC))
+          .start(from.value)
+          .size(size.value)
 
     def countDef(query: Team) = index => search(index.name).query(makeQuery(query)) size 0