remove deps to pref

lichess-org · Apr 11, 2024 · 80eff3b · 80eff3b
1 parent 3699422
commit 80eff3b
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 20 deletions.
diff --git a/app/templating/SetupHelper.scala b/app/templating/SetupHelper.scala
@@ -289,9 +289,9 @@ trait SetupHelper:
 
   def translatedMessageChoices(using Translate) =
     List(
-      (Pref.Message.NEVER, trans.site.onlyExistingConversations.txt()),
-      (Pref.Message.FRIEND, trans.site.onlyFriends.txt()),
-      (Pref.Message.ALWAYS, trans.site.always.txt())
+      (lila.core.pref.Message.NEVER, trans.site.onlyExistingConversations.txt()),
+      (lila.core.pref.Message.FRIEND, trans.site.onlyFriends.txt()),
+      (lila.core.pref.Message.ALWAYS, trans.site.always.txt())
     )
 
   def translatedStudyInviteChoices(using Translate) = privacyBaseChoices

diff --git a/build.sbt b/build.sbt
@@ -150,7 +150,7 @@ lazy val coach = module("coach",
 )
 
 lazy val streamer = module("streamer",
-  Seq(user, pref),
+  Seq(user),
   reactivemongo.bundle
 )
 
@@ -400,7 +400,7 @@ lazy val plan = module("plan",
 )
 
 lazy val relation = module("relation",
-  Seq(pref),
+  Seq(user),
   reactivemongo.bundle
 )
 

diff --git a/modules/core/src/main/pref.scala b/modules/core/src/main/pref.scala
@@ -18,3 +18,12 @@ trait Pref:
   def showRatings: Boolean
   def animationMillis: Int
   def animationMillisForSpeedPuzzles: Int
+
+trait PrefApi:
+  def followable(userId: UserId): Fu[Boolean]
+  def getMessage(userId: UserId): Fu[Int]
+
+object Message:
+  val NEVER  = 1
+  val FRIEND = 2
+  val ALWAYS = 3
diff --git a/modules/msg/src/main/Env.scala b/modules/msg/src/main/Env.scala
@@ -17,7 +17,7 @@ final class Env(
     userRepo: lila.user.UserRepo,
     userCache: lila.user.Cached,
     relationApi: lila.core.relation.RelationApi,
-    prefApi: lila.pref.PrefApi,
+    prefApi: lila.core.pref.PrefApi,
     notifyApi: lila.core.notify.NotifyApi,
     cacheApi: lila.memo.CacheApi,
     reportApi: lila.core.report.ReportApi,

diff --git a/modules/msg/src/main/MsgSecurity.scala b/modules/msg/src/main/MsgSecurity.scala
@@ -12,7 +12,7 @@ import lila.core.report.SuspectId
 
 final private class MsgSecurity(
     colls: MsgColls,
-    prefApi: lila.pref.PrefApi,
+    prefApi: lila.core.pref.PrefApi,
     userRepo: lila.user.UserRepo,
     getBotUserIds: lila.user.GetBotIds,
     relationApi: lila.core.relation.RelationApi,
@@ -152,10 +152,10 @@ final private class MsgSecurity(
       }
 
     private def create(contacts: User.Contacts): Fu[Boolean] =
-      prefApi.get(contacts.dest.id, _.message).flatMap {
-        case lila.pref.Pref.Message.NEVER  => fuccess(false)
-        case lila.pref.Pref.Message.FRIEND => relationApi.fetchFollows(contacts.dest.id, contacts.orig.id)
-        case lila.pref.Pref.Message.ALWAYS => fuccess(true)
+      prefApi.getMessage(contacts.dest.id).flatMap {
+        case lila.core.pref.Message.NEVER  => fuccess(false)
+        case lila.core.pref.Message.FRIEND => relationApi.fetchFollows(contacts.dest.id, contacts.orig.id)
+        case lila.core.pref.Message.ALWAYS => fuccess(true)
       }
 
     // Even if the dest prefs disallow it,

diff --git a/modules/pref/src/main/Pref.scala b/modules/pref/src/main/Pref.scala
@@ -362,9 +362,7 @@ object Pref:
     )
 
   object Message:
-    val NEVER  = 1
-    val FRIEND = 2
-    val ALWAYS = 3
+    import lila.core.pref.Message.*
 
     val choices = Seq(
       NEVER  -> "Only existing conversations",
@@ -452,7 +450,7 @@ object Pref:
     replay = Replay.ALWAYS,
     clockTenths = ClockTenths.LOWTIME,
     challenge = Challenge.REGISTERED,
-    message = Message.ALWAYS,
+    message = lila.core.pref.Message.ALWAYS,
     studyInvite = StudyInvite.ALWAYS,
     submitMove = SubmitMove.CORRESPONDENCE,
     confirmResign = ConfirmResign.YES,

diff --git a/modules/pref/src/main/PrefApi.scala b/modules/pref/src/main/PrefApi.scala
@@ -7,11 +7,13 @@ import reactivemongo.api.bson.*
 import lila.db.dsl.{ *, given }
 import lila.memo.CacheApi.*
 import lila.core.user.User
+import lila.core.userId
 
 final class PrefApi(
     val coll: Coll,
     cacheApi: lila.memo.CacheApi
-)(using Executor):
+)(using Executor)
+    extends lila.core.pref.PrefApi:
 
   import PrefHandlers.given
 
@@ -69,6 +71,8 @@ final class PrefApi(
       .map: opponent =>
         myPov.fold(ByColor(myPref, opponent), ByColor(opponent, myPref))
 
+  def getMessage(userId: UserId): Future[Int] = get(userId, _.message)
+
   def followable(userId: UserId): Fu[Boolean] =
     coll.primitiveOne[Boolean]($id(userId), "follow").map(_ | Pref.default.follow)
 

diff --git a/modules/relation/src/main/Env.scala b/modules/relation/src/main/Env.scala
@@ -22,8 +22,8 @@ final class Env(
     appConfig: Configuration,
     db: lila.db.Db,
     userRepo: lila.core.user.UserRepo,
-    userAPi: lila.core.user.UserApi,
-    prefApi: lila.pref.PrefApi,
+    userApi: lila.core.user.UserApi,
+    prefApi: lila.core.pref.PrefApi,
     cacheApi: lila.memo.CacheApi
 )(using Executor, ActorSystem, akka.stream.Materializer):
 

diff --git a/modules/relation/src/main/RelationApi.scala b/modules/relation/src/main/RelationApi.scala
@@ -17,7 +17,7 @@ import lila.core.userId.UserSearch
 
 final class RelationApi(
     repo: RelationRepo,
-    prefApi: lila.pref.PrefApi,
+    prefApi: lila.core.pref.PrefApi,
     cacheApi: lila.memo.CacheApi,
     userApi: UserApi,
     config: RelationConfig

diff --git a/modules/streamer/src/main/Env.scala b/modules/streamer/src/main/Env.scala
@@ -32,7 +32,6 @@ final class Env(
     perfsRepo: lila.user.UserPerfsRepo,
     userApi: lila.user.UserApi,
     subsRepo: lila.core.relation.SubscriptionRepo,
-    prefApi: lila.pref.PrefApi,
     db: lila.db.Db,
     net: lila.core.config.NetConfig
 )(using scheduler: Scheduler)(using Executor, akka.stream.Materializer):