From 43c99881a20f692902c13e4054bc33bd808e544d Mon Sep 17 00:00:00 2001 From: Jonathan Gamble Date: Wed, 8 Nov 2023 13:50:04 -0600 Subject: [PATCH 1/2] make lila-fishnet work again --- app/AppLoader.scala | 12 +++++++----- build.sbt | 1 - conf/routes | 2 -- project/build.properties | 2 +- project/plugins.sbt | 2 +- 5 files changed, 9 insertions(+), 10 deletions(-) delete mode 100644 conf/routes diff --git a/app/AppLoader.scala b/app/AppLoader.scala index dfd04bd..9f098f9 100644 --- a/app/AppLoader.scala +++ b/app/AppLoader.scala @@ -2,8 +2,8 @@ package lila.app import play.api._ import scala.annotation.nowarn -import play.api.routing.Router -import router.Routes +import play.api.routing.{ Router, SimpleRouter } +import play.api.routing.sird._ final class AppLoader extends ApplicationLoader { def load(ctx: ApplicationLoader.Context): Application = new LilaComponents(ctx).application @@ -32,9 +32,11 @@ final class LilaComponents(ctx: ApplicationLoader.Context) extends BuiltInCompon lazy val controller = new FishnetController(configuration, redis, moveDb, controllerComponents) // eagerly wire up all controllers - val router: Router = { - @nowarn val prefix: String = "/" - new Routes(httpErrorHandler, controller) + val router: Router = new SimpleRouter { + def routes: Router.Routes = { + case POST(p"/fishnet/acquire") => controller.acquire + case POST(p"/fishnet/move/$workId") => controller.move(workId) + } } if (configuration.get[Boolean]("kamon.enabled")) { diff --git a/build.sbt b/build.sbt index ae2ab8c..0f5a8a7 100644 --- a/build.sbt +++ b/build.sbt @@ -6,7 +6,6 @@ maintainer := "lichess.org" lazy val root = Project("lila-fishnet", file(".")) .enablePlugins(PlayScala, PlayNettyServer) - .disablePlugins(PlayAkkaHttpServer) scalaVersion := "2.13.12" Compile / resourceDirectory := baseDirectory.value / "conf" diff --git a/conf/routes b/conf/routes deleted file mode 100644 index f3b11be..0000000 --- a/conf/routes +++ /dev/null @@ -1,2 +0,0 @@ -POST /fishnet/acquire controllers.FishnetController.acquire -POST /fishnet/move/:workId controllers.FishnetController.move(workId: String) diff --git a/project/build.properties b/project/build.properties index 563a014..e8a1e24 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.7.2 +sbt.version=1.9.7 diff --git a/project/plugins.sbt b/project/plugins.sbt index 02ec024..0a4d179 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,5 +2,5 @@ resolvers += Resolver.url( "lila-maven-sbt", url("https://raw.githubusercontent.com/ornicar/lila-maven/master") )(Resolver.ivyStylePatterns) -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.18") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.18-lila_1.21") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6") From 2ee82ce8cad7065065f1b572a4af44dd93773f5c Mon Sep 17 00:00:00 2001 From: Trevor Fitzgerald Date: Wed, 8 Nov 2023 22:33:04 +0000 Subject: [PATCH 2/2] fix warnings --- .gitignore | 4 ++++ app/AppLoader.scala | 4 ++-- app/JsonApi.scala | 18 +++++++++--------- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 768db1c..3e0087b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,8 @@ +.bloop/ +.metals/ logs/ +project/metals.sbt +project/project/ target/ RUNNING_PID # docker sbt diff --git a/app/AppLoader.scala b/app/AppLoader.scala index 9f098f9..5f401b0 100644 --- a/app/AppLoader.scala +++ b/app/AppLoader.scala @@ -1,9 +1,9 @@ package lila.app import play.api._ -import scala.annotation.nowarn import play.api.routing.{ Router, SimpleRouter } import play.api.routing.sird._ +import akka.actor.ActorSystem final class AppLoader extends ApplicationLoader { def load(ctx: ApplicationLoader.Context): Application = new LilaComponents(ctx).application @@ -25,7 +25,7 @@ final class LilaComponents(ctx: ApplicationLoader.Context) extends BuiltInCompon import _root_.controllers._ - implicit def system = actorSystem + implicit def system: ActorSystem = actorSystem lazy val moveDb = new lila.fishnet.MoveDb lazy val redis = new lila.fishnet.Lila(moveDb, configuration) diff --git a/app/JsonApi.scala b/app/JsonApi.scala index 55d6b85..4b42936 100644 --- a/app/JsonApi.scala +++ b/app/JsonApi.scala @@ -57,20 +57,20 @@ object JsonApi { def moveFromWork(m: Work.Move) = Move(m.id.value, m.level, fromGame(m.game), m.clock) object readers { - implicit val ClientKeyReads = Reads.of[String].map(new ClientKey(_)) - implicit val FishnetReads = Json.reads[Request.Fishnet] - implicit val AcquireReads = Json.reads[Request.Acquire] - implicit val MoveResultReads = Json.reads[Request.MoveResult] - implicit val PostMoveReads = Json.reads[Request.PostMove] + implicit val ClientKeyReads: Reads[ClientKey] = Reads.of[String].map(new ClientKey(_)) + implicit val FishnetReads: Reads[Request.Fishnet] = Json.reads[Request.Fishnet] + implicit val AcquireReads: Reads[Request.Acquire] = Json.reads[Request.Acquire] + implicit val MoveResultReads: Reads[Request.MoveResult] = Json.reads[Request.MoveResult] + implicit val PostMoveReads: Reads[Request.PostMove] = Json.reads[Request.PostMove] } object writers { - implicit val VariantWrites = Writes[Variant] { v => JsString(v.key) } - implicit val FENWrites = Writes[FEN] { fen => JsString(fen.value) } + implicit val VariantWrites: Writes[Variant] = Writes[Variant] { v => JsString(v.key) } + implicit val FENWrites: Writes[FEN] = Writes[FEN] { fen => JsString(fen.value) } implicit val GameWrites: Writes[Game] = Json.writes[Game] implicit val ClockWrites: Writes[Work.Clock] = Json.writes[Work.Clock] - implicit val WorkIdWrites = Writes[Work.Id] { id => JsString(id.value) } - implicit val WorkWrites = OWrites[Work] { work => + implicit val WorkIdWrites: Writes[Work.Id] = Writes[Work.Id] { id => JsString(id.value) } + implicit val WorkWrites: OWrites[Work] = OWrites[Work] { work => (work match { case m: Move => Json.obj(