Add possibility to hide user's and opponent's ratings ONLY when playing

app/controllers/User.scala

@@ -177,11 +177,13 @@ 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(user.id).so(env.socket.getLagRating(user.id))
+              val ping          = env.socket.isOnline(user.id).so(env.socket.getLagRating(user.id))
+              val isUserPlaying = ctx.userId.so(env.round.playing(_))
               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"))
+                  Ok.snip(
+                    views.user.mini(user, pov, blocked, followable, relation, ping, crosstable, isUserPlaying)
+                  ).map(_.withHeaders(CACHE_CONTROL -> "max-age=5"))
                 },
                 json =
                   import lila.game.JsonView.given

app/views/game/side.scala

@@ -78,7 +78,15 @@ 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,
+                    withRating = game.finishedOrAborted || !ctx.userId.exists(
+                      game.userIds.has
+                    ) || ctx.pref.hasShowRatingsInGame
+                  )
                 ),
                 tour.flatMap(_.teamVs).map(_.teams(p.color)).map {
                   teamLink(_, withIcon = false)(cls := "team")

app/views/user/ui.scala

@@ -18,7 +18,8 @@ def mini(
     followable: Boolean,
     relation: Option[lila.relation.Relation],
     ping: Option[Int],
-    ct: Option[lila.game.Crosstable]
+    ct: Option[lila.game.Crosstable],
+    isUserPlaying: Boolean
 )(using ctx: Context) =
   val rel = views.relation.mini(u.id, blocked, followable, relation)
   def crosstable(myId: UserId) = ct
@@ -37,7 +38,11 @@ def mini(
   def userMarks = views.mod.user.userMarks(u.user, None)
   val flag      = u.profileOrDefault.flagInfo
   val perfs     = u.perfs.best8Perfs
-  show.ui.mini(u, playing, blocked, followable, ping, rel, crosstable, flag, perfs, userMarks)
+  val showRating = ctx.pref.hasShowRatingsInGame || (playingGame match
+    case Some(pov) => pov.game.finishedOrAborted || !ctx.userId.exists(pov.game.userIds.has)
+    case None      => !isUserPlaying
+  )
+  show.ui.mini(u, playing, blocked, followable, ping, rel, crosstable, flag, perfs, userMarks, showRating)
 
 val perfStat = lila.perfStat.PerfStatUi(helpers)(views.user.bits.communityMenu("ratings"))
 def perfStatPage(data: PerfStatData, ratingChart: Option[SafeJsonStr])(using

modules/core/src/main/pref.scala

@@ -8,6 +8,7 @@ trait Pref:
   val id: UserId
   val coords: Int
   val keyboardMove: Int
+  val showRatingsInGame: Int
   val voice: Option[Int]
   val rookCastle: Int
   val animation: Int
@@ -21,6 +22,7 @@ trait Pref:
 
   def hasKeyboardMove: Boolean
   def hasVoice: Boolean
+  def hasShowRatingsInGame: Boolean
   def showRatings: Boolean
   def animationMillis: Int
   def animationMillisForSpeedPuzzles: Int

modules/coreI18n/src/main/key.scala

@@ -1092,6 +1092,7 @@ object I18nKey:
     val `sayGgWpAfterLosingOrDrawing`: I18nKey = "preferences:sayGgWpAfterLosingOrDrawing"
     val `yourPreferencesHaveBeenSaved`: I18nKey = "preferences:yourPreferencesHaveBeenSaved"
     val `scrollOnTheBoardToReplayMoves`: I18nKey = "preferences:scrollOnTheBoardToReplayMoves"
+    val `showRatingsWhilePlaying`: I18nKey = "preferences:showRatingsWhilePlaying"
     val `correspondenceEmailNotification`: I18nKey = "preferences:correspondenceEmailNotification"
     val `notifyStreamStart`: I18nKey = "preferences:notifyStreamStart"
     val `notifyInboxMsg`: I18nKey = "preferences:notifyInboxMsg"

modules/game/src/main/ui/GameUi.scala

@@ -26,7 +26,9 @@ final class GameUi(helpers: Helpers):
       renderMini(
         pov,
         withLink.option(gameLink(pov.game, pov.color, ownerLink, tv)),
-        showRatings = ctx.pref.showRatings
+        showRatings = ctx.pref.showRatings && (!ctx.userId.exists(
+          pov.game.userIds.has
+        ) || ctx.pref.hasShowRatingsInGame || pov.game.finishedOrAborted)
       )
 
     def noCtx(pov: Pov, tv: Boolean = false, channelKey: Option[String] = None): Tag =

modules/pref/src/main/JsonView.scala

@@ -37,12 +37,13 @@ object JsonView:
         if lichobileCompat then Pref.SubmitMove.lichobile.serverToApp(p.submitMove)
         else p.submitMove
       },
-      "confirmResign" -> p.confirmResign,
-      "insightShare"  -> p.insightShare,
-      "keyboardMove"  -> p.keyboardMove,
-      "voiceMove"     -> p.hasVoice,
-      "zen"           -> p.zen,
-      "ratings"       -> p.ratings,
-      "moveEvent"     -> p.moveEvent,
-      "rookCastle"    -> p.rookCastle
+      "confirmResign"     -> p.confirmResign,
+      "insightShare"      -> p.insightShare,
+      "keyboardMove"      -> p.keyboardMove,
+      "voiceMove"         -> p.hasVoice,
+      "showRatingsInGame" -> p.showRatingsInGame,
+      "zen"               -> p.zen,
+      "ratings"           -> p.ratings,
+      "moveEvent"         -> p.moveEvent,
+      "rookCastle"        -> p.rookCastle
     )

modules/pref/src/main/Pref.scala

@@ -35,6 +35,7 @@ case class Pref(
     insightShare: Int,
     keyboardMove: Int,
     voice: Option[Int],
+    showRatingsInGame: Int,
     zen: Int,
     ratings: Int,
     flairs: Boolean,
@@ -98,8 +99,9 @@ case class Pref(
 
   def agree = copy(agreement = Agreement.current)
 
-  def hasKeyboardMove = keyboardMove == KeyboardMove.YES
-  def hasVoice        = voice.has(Voice.YES)
+  def hasKeyboardMove      = keyboardMove == KeyboardMove.YES
+  def hasVoice             = voice.has(Voice.YES)
+  def hasShowRatingsInGame = showRatingsInGame == ShowRatingsInGame.YES
 
   def isUsingAltSocket = usingAltSocket.has(true)
 
@@ -247,8 +249,9 @@ object Pref:
       EVERYBODY -> "With everybody"
     )
 
-  object KeyboardMove extends BooleanPref
-  object Voice        extends BooleanPref
+  object KeyboardMove      extends BooleanPref
+  object Voice             extends BooleanPref
+  object ShowRatingsInGame extends BooleanPref
 
   object RookCastle:
     val NO  = 0
@@ -474,6 +477,7 @@ object Pref:
     insightShare = lila.core.pref.InsightShare.FRIENDS,
     keyboardMove = KeyboardMove.NO,
     voice = None,
+    showRatingsInGame = ShowRatingsInGame.YES,
     zen = Zen.NO,
     ratings = Ratings.YES,
     flairs = true,

modules/pref/src/main/PrefForm.scala

@@ -36,22 +36,23 @@ object PrefForm:
       "URL must use https",
       url => url.isBlank || url.startsWith("https://") || url.startsWith("//")
     )
-    val is3d          = "is3d"          -> tolerantBoolean
-    val zen           = "zen"           -> checkedNumber(Pref.Zen.choices)
-    val voice         = "voice"         -> booleanNumber
-    val keyboardMove  = "keyboardMove"  -> booleanNumber
-    val autoQueen     = "autoQueen"     -> checkedNumber(Pref.AutoQueen.choices)
-    val premove       = "premove"       -> booleanNumber
-    val takeback      = "takeback"      -> checkedNumber(Pref.Takeback.choices)
-    val autoThreefold = "autoThreefold" -> checkedNumber(Pref.AutoThreefold.choices)
-    val submitMove    = "submitMove"    -> bitCheckedNumber(Pref.SubmitMove.choices)
-    val confirmResign = "confirmResign" -> checkedNumber(Pref.ConfirmResign.choices)
-    val moretime      = "moretime"      -> checkedNumber(Pref.Moretime.choices)
-    val clockSound    = "clockSound"    -> booleanNumber
-    val pieceNotation = "pieceNotation" -> booleanNumber
-    val ratings       = "ratings"       -> booleanNumber
-    val flairs        = "flairs"        -> boolean
-    val follow        = "follow"        -> booleanNumber
+    val is3d              = "is3d"              -> tolerantBoolean
+    val zen               = "zen"               -> checkedNumber(Pref.Zen.choices)
+    val voice             = "voice"             -> booleanNumber
+    val keyboardMove      = "keyboardMove"      -> booleanNumber
+    val showRatingsInGame = "showRatingsInGame" -> booleanNumber
+    val autoQueen         = "autoQueen"         -> checkedNumber(Pref.AutoQueen.choices)
+    val premove           = "premove"           -> booleanNumber
+    val takeback          = "takeback"          -> checkedNumber(Pref.Takeback.choices)
+    val autoThreefold     = "autoThreefold"     -> checkedNumber(Pref.AutoThreefold.choices)
+    val submitMove        = "submitMove"        -> bitCheckedNumber(Pref.SubmitMove.choices)
+    val confirmResign     = "confirmResign"     -> checkedNumber(Pref.ConfirmResign.choices)
+    val moretime          = "moretime"          -> checkedNumber(Pref.Moretime.choices)
+    val clockSound        = "clockSound"        -> booleanNumber
+    val pieceNotation     = "pieceNotation"     -> booleanNumber
+    val ratings           = "ratings"           -> booleanNumber
+    val flairs            = "flairs"            -> boolean
+    val follow            = "follow"            -> booleanNumber
     object board:
       val brightness = "boardBrightness" -> number(0, 150)
       val opacity    = "boardOpacity"    -> number(0, 100)
@@ -84,6 +85,7 @@ object PrefForm:
         fields.confirmResign,
         fields.keyboardMove.map2(optional),
         fields.voice.map2(optional),
+        fields.showRatingsInGame.map2(optional),
         "rookCastle" -> optional(booleanNumber)
       )(BehaviorData.apply)(unapply),
       "clock" -> mapping(
@@ -124,6 +126,7 @@ object PrefForm:
       confirmResign: Int,
       keyboardMove: Option[Int],
       voice: Option[Int],
+      showRatingsInGame: Option[Int],
       rookCastle: Option[Int]
   )
 
@@ -172,6 +175,7 @@ object PrefForm:
         captured = display.captured == 1,
         keyboardMove = behavior.keyboardMove | pref.keyboardMove,
         voice = if pref.voice.isEmpty && !behavior.voice.contains(1) then None else behavior.voice,
+        showRatingsInGame = behavior.showRatingsInGame | pref.showRatingsInGame,
         zen = display.zen | pref.zen,
         ratings = ratings | pref.ratings,
         flairs = flairs | pref.flairs,
@@ -205,6 +209,7 @@ object PrefForm:
           confirmResign = pref.confirmResign,
           keyboardMove = pref.keyboardMove.some,
           voice = pref.voice.getOrElse(0).some,
+          showRatingsInGame = pref.showRatingsInGame.some,
           rookCastle = pref.rookCastle.some
         ),
         clock = ClockData(

modules/pref/src/main/PrefHandlers.scala

@@ -45,6 +45,7 @@ private object PrefHandlers:
         insightShare = r.getD("insightShare", Pref.default.insightShare),
         keyboardMove = r.getD("keyboardMove", Pref.default.keyboardMove),
         voice = r.getO("voice"),
+        showRatingsInGame = r.getD("showRatingsInGame", Pref.default.showRatingsInGame),
         zen = r.getD("zen", Pref.default.zen),
         ratings = r.getD("ratings", Pref.default.ratings),
         flairs = r.getD("flairs", Pref.default.flairs),
@@ -60,47 +61,48 @@ private object PrefHandlers:
 
     def writes(w: BSON.Writer, o: Pref) =
       $doc(
-        "_id"            -> o.id,
-        "bg"             -> o.bg,
-        "bgImg"          -> o.bgImg,
-        "is3d"           -> o.is3d,
-        "theme"          -> o.theme,
-        "pieceSet"       -> o.pieceSet,
-        "theme3d"        -> o.theme3d,
-        "pieceSet3d"     -> o.pieceSet3d,
-        "soundSet"       -> SoundSet.name2key(o.soundSet),
-        "autoQueen"      -> o.autoQueen,
-        "autoThreefold"  -> o.autoThreefold,
-        "takeback"       -> o.takeback,
-        "moretime"       -> o.moretime,
-        "clockTenths"    -> o.clockTenths,
-        "clockBar"       -> o.clockBar,
-        "clockSound"     -> o.clockSound,
-        "premove"        -> o.premove,
-        "animation"      -> o.animation,
-        "captured"       -> o.captured,
-        "follow"         -> o.follow,
-        "highlight"      -> o.highlight,
-        "destination"    -> o.destination,
-        "coords"         -> o.coords,
-        "replay"         -> o.replay,
-        "challenge"      -> o.challenge,
-        "message"        -> o.message,
-        "studyInvite"    -> o.studyInvite,
-        "submitMove"     -> o.submitMove,
-        "confirmResign"  -> o.confirmResign,
-        "insightShare"   -> o.insightShare,
-        "keyboardMove"   -> o.keyboardMove,
-        "voice"          -> o.voice,
-        "zen"            -> o.zen,
-        "ratings"        -> o.ratings,
-        "flairs"         -> o.flairs,
-        "rookCastle"     -> o.rookCastle,
-        "moveEvent"      -> o.moveEvent,
-        "pieceNotation"  -> o.pieceNotation,
-        "resizeHandle"   -> o.resizeHandle,
-        "agreement"      -> o.agreement,
-        "usingAltSocket" -> o.usingAltSocket,
-        "board"          -> o.board,
-        "tags"           -> o.tags
+        "_id"               -> o.id,
+        "bg"                -> o.bg,
+        "bgImg"             -> o.bgImg,
+        "is3d"              -> o.is3d,
+        "theme"             -> o.theme,
+        "pieceSet"          -> o.pieceSet,
+        "theme3d"           -> o.theme3d,
+        "pieceSet3d"        -> o.pieceSet3d,
+        "soundSet"          -> SoundSet.name2key(o.soundSet),
+        "autoQueen"         -> o.autoQueen,
+        "autoThreefold"     -> o.autoThreefold,
+        "takeback"          -> o.takeback,
+        "moretime"          -> o.moretime,
+        "clockTenths"       -> o.clockTenths,
+        "clockBar"          -> o.clockBar,
+        "clockSound"        -> o.clockSound,
+        "premove"           -> o.premove,
+        "animation"         -> o.animation,
+        "captured"          -> o.captured,
+        "follow"            -> o.follow,
+        "highlight"         -> o.highlight,
+        "destination"       -> o.destination,
+        "coords"            -> o.coords,
+        "replay"            -> o.replay,
+        "challenge"         -> o.challenge,
+        "message"           -> o.message,
+        "studyInvite"       -> o.studyInvite,
+        "submitMove"        -> o.submitMove,
+        "confirmResign"     -> o.confirmResign,
+        "insightShare"      -> o.insightShare,
+        "keyboardMove"      -> o.keyboardMove,
+        "showRatingsInGame" -> o.showRatingsInGame,
+        "voice"             -> o.voice,
+        "zen"               -> o.zen,
+        "ratings"           -> o.ratings,
+        "flairs"            -> o.flairs,
+        "rookCastle"        -> o.rookCastle,
+        "moveEvent"         -> o.moveEvent,
+        "pieceNotation"     -> o.pieceNotation,
+        "resizeHandle"      -> o.resizeHandle,
+        "agreement"         -> o.agreement,
+        "usingAltSocket"    -> o.usingAltSocket,
+        "board"             -> o.board,
+        "tags"              -> o.tags
       )

modules/pref/src/main/PrefSingleChange.scala

@@ -37,6 +37,8 @@ object PrefSingleChange:
       _.copy(voice = v.some),
     changing(_.keyboardMove): v =>
       _.copy(keyboardMove = v | Pref.KeyboardMove.NO),
+    changing(_.showRatingsInGame): v =>
+      _.copy(showRatingsInGame = v | Pref.ShowRatingsInGame.YES),
     changing(_.autoQueen): v =>
       _.copy(autoQueen = v),
     changing(_.premove): v =>

modules/pref/src/main/ui/AccountPref.scala

@@ -186,6 +186,11 @@ final class AccountPref(helpers: Helpers, helper: PrefHelper, bits: AccountUi):
               trp.scrollOnTheBoardToReplayMoves(),
               radios(form("behavior.scrollMoves"), booleanChoices),
               "scrollOnTheBoardToReplayMoves"
+            ),
+            setting(
+              trp.showRatingsWhilePlaying(),
+              radios(form("behavior.showRatingsInGame"), booleanChoices),
+              "showRatingsWhilePlaying"
             )
           ),
           categFieldset(PrefCateg.Privacy, categ)(

modules/round/src/main/JsonView.scala

@@ -116,6 +116,7 @@ final class JsonView(
             .add("confirmResign" -> (!flags.nvui && pref.confirmResign == Pref.ConfirmResign.YES))
             .add("keyboardMove" -> (!flags.nvui && pref.hasKeyboardMove))
             .add("voiceMove" -> (!flags.nvui && pref.hasVoice))
+            .add("showRatingsInGame" -> (!flags.nvui && pref.hasShowRatingsInGame))
             .add("rookCastle" -> (pref.rookCastle == Pref.RookCastle.YES))
             .add("highlight" -> pref.highlight)
             .add("destination" -> pref.destination)

modules/user/src/main/ui/UserShow.scala

@@ -33,7 +33,8 @@ final class UserShow(helpers: Helpers, bits: UserBits):
       crosstable: UserId => Option[Frag],
       flag: Option[Flag],
       best8Perfs: List[PerfKey],
-      userMarks: => Frag
+      userMarks: => Frag,
+      showRating: Boolean = true
   )(using ctx: Context) =
     frag(
       div(cls := "upt__info")(
@@ -55,7 +56,7 @@ final class UserShow(helpers: Helpers, bits: UserBits):
         if u.lame && ctx.isnt(u) && !Granter.opt(_.UserModView)
         then div(cls := "upt__info__warning")(trans.site.thisAccountViolatedTos())
         else
-          ctx.pref.showRatings.option:
+          (ctx.pref.showRatings && showRating).option:
             div(cls := "upt__info__ratings")(best8Perfs.map(showPerfRating(u.perfs, _)))
       ),
       ctx.userId.map: myId =>

translation/source/preferences.xml

@@ -53,6 +53,7 @@
   <string name="sayGgWpAfterLosingOrDrawing" comment="sayGgWpAfterLosingOrDrawing&#10;&#10;When enabled, this setting will automatically send 'Good game, well played' to your opponent if you are lose or draw the game. It's meant as a courtesy message.&#10;&#10;The message will be sent in ENGLISH.&#10;&#10;It is up to you how to deal with this. For example, you may want to put '(message will be sent in English)' in your translated text as one example. Or you can leave the actual English text and put a brief translation in your own language.">Say "Good game, well played" upon defeat or draw</string>
   <string name="yourPreferencesHaveBeenSaved">Your preferences have been saved.</string>
   <string name="scrollOnTheBoardToReplayMoves">Scroll on the board to replay moves</string>
+  <string name="showRatingsWhilePlaying">Show ratings while playing your games</string>
   <string name="correspondenceEmailNotification">Daily email listing your correspondence games</string>
   <string name="notifyStreamStart">Streamer goes live</string>
   <string name="notifyInboxMsg">New inbox message</string>

ui/round/src/interfaces.ts

@@ -188,6 +188,7 @@ export interface Pref {
   highlight: boolean;
   is3d: boolean;
   keyboardMove: boolean;
+  showRatingsInGame: boolean;
   voiceMove: boolean;
   moveEvent: Prefs.MoveEvent;
   ratings: boolean;