lichess-org · ornicar · Dec 18, 2024 · Oct 12, 2024 · Oct 12, 2024 · Oct 13, 2024
diff --git a/app/controllers/User.scala b/app/controllers/User.scala
@@ -44,10 +44,9 @@ final class User(
     env.game.cached
       .lastPlayedPlayingId(username.id)
       .orElse(env.game.gameRepo.quickLastPlayedId(username.id))
-      .flatMap {
+      .flatMap:
         case None         => NotFound("No ongoing game")
         case Some(gameId) => gameC.exportGame(gameId)
-      }
 
   private def apiGames(u: UserModel, filter: String, page: Int)(using BodyContext[?]) =
     userGames(u, filter, page).flatMap(env.game.userGameApi.jsPaginator).map { res =>
@@ -177,11 +176,12 @@ final class User(
               ctx.userId.soFu(env.game.crosstableApi(user.id, _)),
               ctx.isAuth.so(env.pref.api.followable(user.id))
             ).flatMapN: (blocked, crosstable, followable) =>
-              val ping = env.socket.isOnline.exec(user.id).so(env.socket.getLagRating(user.id))
               negotiate(
-                html = (ctx.isnt(user)).so(currentlyPlaying(user.user)).flatMap { pov =>
-                  Ok.snip(views.user.mini(user, pov, blocked, followable, relation, ping, crosstable))
-                    .map(_.withHeaders(CACHE_CONTROL -> "max-age=5"))
+                html = ctx.isnt(user).so(currentlyPlaying(user.user)).flatMap { pov =>
+                  val ping = env.socket.isOnline.exec(user.id).so(env.socket.getLagRating(user.id))
+                  Ok.snip(
+                    views.user.mini(user, pov, blocked, followable, relation, ping, crosstable)
+                  ).map(_.withHeaders(CACHE_CONTROL -> "max-age=5"))
                 },
                 json =
                   import lila.game.JsonView.given

diff --git a/app/views/base/page.scala b/app/views/base/page.scala
@@ -101,7 +101,7 @@ object page:
               "kid"                  -> ctx.kid.yes,
               "mobile"               -> lila.common.HTTPRequest.isMobileBrowser(ctx.req),
               "playing fixed-scroll" -> p.playing,
-              "no-rating"            -> !pref.showRatings,
+              "no-rating"            -> (!pref.showRatings || (p.playing && pref.hideRatingsInGame)),
               "no-flair"             -> !pref.flairs,
               "zen"                  -> (pref.isZen || (p.playing && pref.isZenAuto)),
               "zenable"              -> p.zenable,

diff --git a/app/views/game/side.scala b/app/views/game/side.scala
@@ -78,7 +78,12 @@ object side:
             game.players.mapList: p =>
               frag(
                 div(cls := s"player color-icon is ${p.color.name} text")(
-                  playerLink(p, withOnline = false, withDiff = true, withBerserk = true)
+                  playerLink(
+                    p,
+                    withOnline = false,
+                    withDiff = true,
+                    withBerserk = true
+                  )
                 ),
                 tour.flatMap(_.teamVs).map(_.teams(p.color)).map {
                   teamLink(_, withIcon = false)(cls := "team")

diff --git a/modules/api/src/main/Context.scala b/modules/api/src/main/Context.scala
@@ -20,7 +20,6 @@ final class LoginContext(
     val oauth: Option[TokenScopes]
 ):
   export me.{ isDefined as isAuth, isEmpty as isAnon }
-  def myId: Option[MyId]         = me.map(_.myId)
   def user: Option[User]         = Me.raw(me)
   def userId: Option[UserId]     = user.map(_.id)
   def username: Option[UserName] = user.map(_.username)

diff --git a/modules/core/src/main/pref.scala b/modules/core/src/main/pref.scala
@@ -2,7 +2,8 @@ package lila.core
 package pref
 
 import lila.core.user.User
-import lila.core.userId.UserId
+import lila.core.userId.{ MyId, UserId }
+import lila.core.game.Game
 
 trait Pref:
   val id: UserId
@@ -22,6 +23,7 @@ trait Pref:
 
   def hasKeyboardMove: Boolean
   def hasVoice: Boolean
+  def hideRatingsInGame: Boolean
   def showRatings: Boolean
   def animationMillis: Int
   def animationMillisForSpeedPuzzles: Int

diff --git a/modules/coreI18n/src/main/key.scala b/modules/coreI18n/src/main/key.scala
@@ -1088,6 +1088,7 @@ object I18nKey:
     val `displayBoardResizeHandle`: I18nKey = "preferences:displayBoardResizeHandle"
     val `onlyOnInitialPosition`: I18nKey = "preferences:onlyOnInitialPosition"
     val `inGameOnly`: I18nKey = "preferences:inGameOnly"
+    val `exceptInGame`: I18nKey = "preferences:exceptInGame"
     val `chessClock`: I18nKey = "preferences:chessClock"
     val `tenthsOfSeconds`: I18nKey = "preferences:tenthsOfSeconds"
     val `whenTimeRemainingLessThanTenSeconds`: I18nKey = "preferences:whenTimeRemainingLessThanTenSeconds"

diff --git a/modules/game/src/main/ui/GameUi.scala b/modules/game/src/main/ui/GameUi.scala
@@ -20,7 +20,12 @@ final class GameUi(helpers: Helpers):
     private val dataTimeControl = attr("data-tc")
     val cgWrap                  = span(cls := "cg-wrap")(cgWrapContent)
 
-    def apply(pov: Pov, ownerLink: Boolean = false, tv: Boolean = false, withLink: Boolean = true)(using
+    def apply(
+        pov: Pov,
+        ownerLink: Boolean = false,
+        tv: Boolean = false,
+        withLink: Boolean = true
+    )(using
         ctx: Context
     ): Tag =
       renderMini(

diff --git a/modules/pref/src/main/Pref.scala b/modules/pref/src/main/Pref.scala
@@ -92,7 +92,8 @@ case class Pref(
   def isZen     = zen == Zen.YES
   def isZenAuto = zen == Zen.GAME_AUTO
 
-  val showRatings = ratings == Ratings.YES
+  def showRatings       = ratings != Ratings.NO
+  def hideRatingsInGame = ratings == Ratings.EXCEPT_GAME
 
   def is2d = !is3d
 
@@ -427,7 +428,16 @@ object Pref:
       GAME_AUTO -> "In-game only"
     )
 
-  object Ratings extends BooleanPref
+  object Ratings:
+    val NO          = 0
+    val YES         = 1
+    val EXCEPT_GAME = 2
+
+    val choices = Seq(
+      NO          -> "No",
+      YES         -> "Yes",
+      EXCEPT_GAME -> "Except in-game"
+    )
 
   val darkByDefaultSince   = instantOf(2021, 11, 7, 8, 0)
   val systemByDefaultSince = instantOf(2022, 12, 23, 8, 0)

diff --git a/modules/pref/src/main/PrefForm.scala b/modules/pref/src/main/PrefForm.scala
@@ -49,7 +49,7 @@ object PrefForm:
     val moretime      = "moretime"      -> checkedNumber(Pref.Moretime.choices)
     val clockSound    = "clockSound"    -> booleanNumber
     val pieceNotation = "pieceNotation" -> booleanNumber
-    val ratings       = "ratings"       -> booleanNumber
+    val ratings       = "ratings"       -> checkedNumber(Pref.Ratings.choices)
     val flairs        = "flairs"        -> boolean
     val follow        = "follow"        -> booleanNumber
     val challenge     = "challenge"     -> checkedNumber(Pref.Challenge.choices)

diff --git a/modules/pref/src/main/ui/AccountPref.scala b/modules/pref/src/main/ui/AccountPref.scala
@@ -77,7 +77,7 @@ final class AccountPref(helpers: Helpers, helper: PrefHelper, bits: AccountUi):
             setting(
               trp.showPlayerRatings(),
               frag(
-                radios(form("ratings"), booleanChoices),
+                radios(form("ratings"), translatedRatingsChoices),
                 div(cls := "help text shy", dataIcon := Icon.InfoCircle)(trp.explainShowPlayerRatings())
               ),
               "showRatings"

diff --git a/modules/pref/src/main/ui/PrefHelper.scala b/modules/pref/src/main/ui/PrefHelper.scala
@@ -20,6 +20,13 @@ trait PrefHelper:
       (Pref.Zen.GAME_AUTO, trans.preferences.inGameOnly.txt())
     )
 
+  def translatedRatingsChoices(using Translate) =
+    List(
+      (Pref.Ratings.NO, trans.site.no.txt()),
+      (Pref.Ratings.YES, trans.site.yes.txt()),
+      (Pref.Ratings.EXCEPT_GAME, trans.preferences.exceptInGame.txt())
+    )
+
   def translatedBoardCoordinateChoices(using Translate) =
     List(
       (Pref.Coords.NONE, trans.site.no.txt()),

diff --git a/modules/ui/src/main/Context.scala b/modules/ui/src/main/Context.scala
@@ -28,6 +28,7 @@ trait Context:
 
   def is[U: UserIdOf](u: U): Boolean      = me.exists(_.is(u))
   def isnt[U: UserIdOf](u: U): Boolean    = !is(u)
+  def myId: Option[MyId]                  = me.map(_.myId)
   def noBlind                             = !blind
   def flash(name: String): Option[String] = req.flash.get(name)
   inline def noBot                        = !isBot

diff --git a/modules/ui/src/main/helper/GameHelper.scala b/modules/ui/src/main/helper/GameHelper.scala
@@ -48,7 +48,7 @@ trait GameHelper:
             user.name,
             user.flair.map(userFlair),
             withRating.option(
-              frag(
+              span(cls := "rating")(
                 " (",
                 player.rating.fold(frag("?")): rating =>
                   if player.provisional.yes then

diff --git a/translation/source/preferences.xml b/translation/source/preferences.xml
@@ -20,6 +20,7 @@
   <string name="displayBoardResizeHandle">Show board resize handle</string>
   <string name="onlyOnInitialPosition">Only on initial position</string>
   <string name="inGameOnly">In-game only</string>
+  <string name="exceptInGame">Except in-game</string>
   <string name="chessClock">Chess clock</string>
   <string name="tenthsOfSeconds">Tenths of seconds</string>
   <string name="whenTimeRemainingLessThanTenSeconds" comment="whenTimeRemainingLessThanTenSeconds&#10;&#10;The &amp;lt; symbol is not required (you can write it as a word), just do NOT use &lt; in its place.&#10;&#10;Technical information: &lt; is a reserved character in HTML, which is why it cannot be used.">When time remaining &lt; 10 seconds</string>

diff --git a/ui/@types/lichess/i18n.d.ts b/ui/@types/lichess/i18n.d.ts
@@ -2103,6 +2103,8 @@ interface I18n {
     displayBoardResizeHandle: string;
     /** Drag a piece */
     dragPiece: string;
+    /** Except in-game */
+    exceptInGame: string;
     /** Can be disabled during a game with the board menu */
     explainCanThenBeTemporarilyDisabled: string;
     /** Hold the <ctrl> key while promoting to temporarily disable auto-promotion */

diff --git a/ui/common/css/component/_mini-game.scss b/ui/common/css/component/_mini-game.scss
@@ -44,6 +44,9 @@
 
     margin-inline-start: 1ch;
     font-size: 0.9em;
+    body.no-rating & {
+      display: none;
+    }
   }
 
   &__clock {

diff --git a/ui/common/css/component/_power-tip.scss b/ui/common/css/component/_power-tip.scss
@@ -67,6 +67,9 @@
         padding: 2px 3px;
         text-align: left;
       }
+      body.no-rating & {
+        display: none;
+      }
     }
 
     &__warning {

diff --git a/ui/common/css/component/_user-link.scss b/ui/common/css/component/_user-link.scss
@@ -47,6 +47,11 @@
       content: $licon-Agent;
     }
   }
+  .rating {
+    body.no-rating & {
+      display: none;
+    }
+  }
 }
 
 a.user-link:hover {

diff --git a/ui/round/css/_user.scss b/ui/round/css/_user.scss
@@ -26,6 +26,9 @@
     margin: 0 0.25em 0 0.3em;
     color: $c-font-dim;
     letter-spacing: -0.5px;
+    body.no-rating & {
+      display: none;
+    }
   }
 
   .line {