scala tweaks

lichess-org · Feb 12, 2025 · 3e5ac24 · 3e5ac24
1 parent f79efb6
commit 3e5ac24
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 10 deletions.
diff --git a/modules/api/src/main/Env.scala b/modules/api/src/main/Env.scala
@@ -57,7 +57,7 @@ final class Env(
     cacheApi: lila.memo.CacheApi,
     webConfig: lila.web.WebConfig,
     realPlayerApi: lila.web.RealPlayerApi,
-    bookmarkExists: lila.core.bookmark.BookmarkExists,
+    bookmarkExists: lila.core.misc.BookmarkExists,
     manifest: lila.web.AssetManifest,
     tokenApi: lila.oauth.AccessTokenApi
 )(using val mode: Mode, scheduler: Scheduler)(using

diff --git a/modules/bookmark/src/main/Env.scala b/modules/bookmark/src/main/Env.scala
@@ -17,7 +17,7 @@ final class Env(
 
   lazy val api = wire[BookmarkApi]
 
-  def exists: lila.core.bookmark.BookmarkExists = api.exists
+  def exists: lila.core.misc.BookmarkExists = api.exists
 
   lila.common.Bus.subscribeFun("roundUnplayed"):
     case lila.core.round.DeleteUnplayed(gameId) => api.removeByGameId(gameId)
diff --git a/modules/core/src/main/bookmark.scala b/modules/core/src/main/bookmark.scala
diff --git a/modules/core/src/main/misc.scala b/modules/core/src/main/misc.scala
@@ -70,3 +70,5 @@ trait PicfitUrl:
   def thumbnail(id: lila.core.id.ImageId, width: Int, height: Int): String
   def resize(id: lila.core.id.ImageId, size: Either[Int, Int]): String
   def raw(id: lila.core.id.ImageId): String
+
+type BookmarkExists = (game.Game, Option[userId.UserId]) => Fu[Boolean]
diff --git a/modules/game/src/test/EventTest.scala b/modules/game/src/test/EventTest.scala
@@ -1,6 +1,5 @@
 package lila.game
 
-import cats.syntax.all.*
 import chess.*
 import chess.bitboard.Bitboard
 import chess.variant.Crazyhouse

diff --git a/modules/plan/src/main/PlanApi.scala b/modules/plan/src/main/PlanApi.scala
@@ -2,7 +2,6 @@ package lila.plan
 
 import play.api.i18n.Lang
 import reactivemongo.api.*
-import cats.syntax.all.*
 
 import lila.common.Bus
 import lila.core.config.Secret

diff --git a/modules/round/src/main/Env.scala b/modules/round/src/main/Env.scala
@@ -45,7 +45,7 @@ final class Env(
     socketKit: lila.core.socket.ParallelSocketKit,
     userLagPut: lila.core.socket.userLag.Put,
     lightUserApi: lila.user.LightUserApi,
-    bookmarkExists: lila.core.bookmark.BookmarkExists,
+    bookmarkExists: lila.core.misc.BookmarkExists,
     simulApiCircularDep: => lila.core.simul.SimulApi,
     settingStore: lila.memo.SettingStore.Builder,
     shutdown: akka.actor.CoordinatedShutdown

diff --git a/modules/round/src/main/RoundMobile.scala b/modules/round/src/main/RoundMobile.scala
@@ -34,7 +34,7 @@ final class RoundMobile(
     moretimer: Moretimer,
     isOfferingRematch: lila.core.round.IsOfferingRematch,
     chatApi: lila.chat.ChatApi,
-    bookmarkExists: lila.core.bookmark.BookmarkExists
+    bookmarkExists: lila.core.misc.BookmarkExists
 )(using Executor, lila.core.user.FlairGetMap):
 
   import RoundMobile.*