fix common.Icon usage

lichess-org · Apr 11, 2024 · 70144d2 · 70144d2
1 parent 15a7d91
commit 70144d2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/app/templating/UserHelper.scala b/app/templating/UserHelper.scala
@@ -315,4 +315,4 @@ trait UserHelper extends HasEnv:
   private def lineIcon(user: Option[LightUser])(using Translate): Frag = lineIcon(user.exists(_.isPatron))
   def lineIcon(user: LightUser)(using Translate): Frag                 = lineIcon(user.isPatron)
   def lineIcon(user: User)(using Translate): Frag                      = lineIcon(user.isPatron)
-  def lineIconChar(user: User): Frag = if user.isPatron then patronIconChar else lineIconChar
+  def lineIconChar(user: User): Icon = if user.isPatron then patronIconChar else lineIconChar
diff --git a/app/ui/scalatags.scala b/app/ui/scalatags.scala
@@ -120,6 +120,8 @@ object ScalatagsTemplate extends ScalatagsTemplate
 // generic extensions
 trait ScalatagsExtensions:
 
+  given Render[Icon] = _.value
+
   given [A](using Render[A]): Conversion[A, scalatags.Text.Frag] = a => StringFrag(a.render)
 
   given opaqueIntFrag[A](using r: IntRuntime[A]): Conversion[A, Frag] = a => intFrag(r(a))

diff --git a/modules/db/src/main/Handlers.scala b/modules/db/src/main/Handlers.scala
@@ -10,6 +10,7 @@ import lila.common.Iso.{ *, given }
 import lila.core.email.NormalizedEmailAddress
 import lila.core.net.IpAddress
 import lila.core.data.Percent
+import lila.common.Icon
 
 trait Handlers:
 
@@ -164,6 +165,8 @@ trait Handlers:
 
   given BSONHandler[chess.Mode] = BSONBooleanHandler.as[chess.Mode](chess.Mode.apply, _.rated)
 
+  given BSONHandler[Icon] = BSONStringHandler.as[Icon](Icon(_), _.value)
+
   given [T: BSONHandler]: BSONHandler[(T, T)] = tryHandler[(T, T)](
     { case arr: BSONArray => for a <- arr.getAsTry[T](0); b <- arr.getAsTry[T](1) yield (a, b) },
     { case (a, b) => BSONArray(a, b) }

diff --git a/modules/tournament/src/main/Spotlight.scala b/modules/tournament/src/main/Spotlight.scala
@@ -4,7 +4,6 @@ import scalalib.HeapSort.topN
 import lila.common.Icon
 import lila.rating.Perf
 import lila.user.{ Me, User }
-import lila.common.Icon
 import lila.core.LightUser
 
 case class Spotlight(