remove more deps to pref

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

Hide file tree

Showing 9 changed files with 27 additions and 24 deletions.
diff --git a/app/templating/SetupHelper.scala b/app/templating/SetupHelper.scala
@@ -305,9 +305,9 @@ trait SetupHelper:
 
   def translatedInsightShareChoices(using Translate) =
     List(
-      (Pref.InsightShare.NOBODY, trans.site.withNobody.txt()),
-      (Pref.InsightShare.FRIENDS, trans.site.withFriends.txt()),
-      (Pref.InsightShare.EVERYBODY, trans.site.withEverybody.txt())
+      (lila.core.pref.InsightShare.NOBODY, trans.site.withNobody.txt()),
+      (lila.core.pref.InsightShare.FRIENDS, trans.site.withFriends.txt()),
+      (lila.core.pref.InsightShare.EVERYBODY, trans.site.withEverybody.txt())
     )
 
   def translatedBoardResizeHandleChoices(using Translate) =

diff --git a/build.sbt b/build.sbt
@@ -275,7 +275,7 @@ lazy val importer = module("importer",
 )
 
 lazy val insight = module("insight",
-  Seq(analyse, pref),
+  Seq(analyse),
   Seq(scalatags) ++ reactivemongo.bundle
 )
 
@@ -415,7 +415,7 @@ lazy val msg = module("msg",
 )
 
 lazy val forum = module("forum",
-  Seq(user, pref, pref),
+  Seq(user),
   reactivemongo.bundle
 )
 

diff --git a/modules/core/src/main/pref.scala b/modules/core/src/main/pref.scala
@@ -22,8 +22,15 @@ trait Pref:
 trait PrefApi:
   def followable(userId: UserId): Fu[Boolean]
   def getMessage(userId: UserId): Fu[Int]
+  def getInsightShare(userId: UserId): Future[Int]
+  def mentionableIds(userIds: Set[UserId]): Fu[Set[UserId]]
 
 object Message:
   val NEVER  = 1
   val FRIEND = 2
   val ALWAYS = 3
+
+object InsightShare:
+  val NOBODY    = 0
+  val FRIENDS   = 1
+  val EVERYBODY = 2
diff --git a/modules/forum/src/main/Env.scala b/modules/forum/src/main/Env.scala
@@ -6,7 +6,6 @@ import play.api.libs.ws.StandaloneWSClient
 
 import lila.common.autoconfig.{ *, given }
 import lila.core.config.*
-import lila.pref.PrefApi
 import lila.core.relation.RelationApi
 import lila.user.User
 import lila.core.forum.ForumPostMiniView
@@ -27,7 +26,7 @@ final class Env(
     shutupApi: lila.core.shutup.ShutupApi,
     notifyApi: lila.core.notify.NotifyApi,
     relationApi: RelationApi,
-    prefApi: PrefApi,
+    prefApi: lila.core.pref.PrefApi,
     modLog: lila.core.mod.LogApi,
     userRepo: lila.user.UserRepo,
     cacheApi: lila.memo.CacheApi,

diff --git a/modules/forum/src/main/MentionNotifier.scala b/modules/forum/src/main/MentionNotifier.scala
@@ -7,7 +7,7 @@ final class MentionNotifier(
     userRepo: lila.user.UserRepo,
     notifyApi: NotifyApi,
     relationApi: lila.core.relation.RelationApi,
-    prefApi: lila.pref.PrefApi
+    prefApi: lila.core.pref.PrefApi
 )(using Executor):
 
   def notifyMentionedUsers(post: ForumPost, topic: ForumTopic): Funit =

diff --git a/modules/insight/src/main/Env.scala b/modules/insight/src/main/Env.scala
@@ -11,7 +11,7 @@ final class Env(
     appConfig: Configuration,
     gameRepo: lila.game.GameRepo,
     analysisRepo: lila.analyse.AnalysisRepo,
-    prefApi: lila.pref.PrefApi,
+    prefApi: lila.core.pref.PrefApi,
     relationApi: lila.core.relation.RelationApi,
     cacheApi: lila.memo.CacheApi,
     mongo: lila.db.Env

diff --git a/modules/insight/src/main/Share.scala b/modules/insight/src/main/Share.scala
@@ -1,24 +1,22 @@
 package lila.insight
 
-import lila.pref.Pref
 import lila.core.perm.{ Granter, Grantable }
 import lila.core.user.User
 
 final class Share(
-    prefApi: lila.pref.PrefApi,
+    prefApi: lila.core.pref.PrefApi,
     relationApi: lila.core.relation.RelationApi
 )(using Executor):
 
-  def getPrefId(insighted: User) = prefApi.get(insighted.id, _.insightShare)
+  def getPrefId(insighted: User) = prefApi.getInsightShare(insighted.id)
 
   def grant(insighted: User)(using to: Option[User]): Fu[Boolean] =
     if to.soUse(Granter[User](_.SeeInsight)) then fuTrue
     else
-      getPrefId(insighted).flatMap {
-        case _ if to.contains(insighted) => fuTrue
-        case Pref.InsightShare.EVERYBODY => fuTrue
-        case Pref.InsightShare.FRIENDS =>
+      getPrefId(insighted).flatMap:
+        case _ if to.contains(insighted)           => fuTrue
+        case lila.core.pref.InsightShare.EVERYBODY => fuTrue
+        case lila.core.pref.InsightShare.FRIENDS =>
           to.so: t =>
             relationApi.fetchAreFriends(insighted.id, t.id)
-        case Pref.InsightShare.NOBODY => fuFalse
-      }
+        case lila.core.pref.InsightShare.NOBODY => fuFalse
diff --git a/modules/pref/src/main/Pref.scala b/modules/pref/src/main/Pref.scala
@@ -217,9 +217,7 @@ object Pref:
   object ConfirmResign extends BooleanPref
 
   object InsightShare:
-    val NOBODY    = 0
-    val FRIENDS   = 1
-    val EVERYBODY = 2
+    import lila.core.pref.InsightShare.*
 
     val choices = Seq(
       NOBODY    -> "With nobody",
@@ -454,7 +452,7 @@ object Pref:
     studyInvite = StudyInvite.ALWAYS,
     submitMove = SubmitMove.CORRESPONDENCE,
     confirmResign = ConfirmResign.YES,
-    insightShare = InsightShare.FRIENDS,
+    insightShare = lila.core.pref.InsightShare.FRIENDS,
     keyboardMove = KeyboardMove.NO,
     voice = None,
     zen = Zen.NO,

diff --git a/modules/pref/src/main/PrefApi.scala b/modules/pref/src/main/PrefApi.scala
@@ -71,7 +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 getMessage(userId: UserId): Future[Int]      = get(userId, _.message)
+  def getInsightShare(userId: UserId): Future[Int] = get(userId, _.insightShare)
 
   def followable(userId: UserId): Fu[Boolean] =
     coll.primitiveOne[Boolean]($id(userId), "follow").map(_ | Pref.default.follow)
@@ -115,7 +116,7 @@ final class PrefApi(
     _.copy(
       takeback = Pref.Takeback.NEVER,
       moretime = Pref.Moretime.NEVER,
-      insightShare = Pref.InsightShare.EVERYBODY
+      insightShare = lila.core.pref.InsightShare.EVERYBODY
     )
   )