Merge pull request #608 from lenguyenthanh/improve-sri

Improve Sri and Lobby.pong
lichess-org · Oct 12, 2024 · 6ed2684 · 6ed2684
2 parents b7a58ac + 9771ea3
commit 6ed2684
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/src/main/scala/Controller.scala b/src/main/scala/Controller.scala
@@ -243,7 +243,7 @@ final class Controller(
               )
 
   def api(header: RequestHeader) =
-    val req = Req(header, Sri.random, None).copy(flag = Some(Flag.api))
+    val req = Req(header, Sri.random(), None).copy(flag = Some(Flag.api))
     Future.successful(
       endpoint(
         name = "api",

diff --git a/src/main/scala/LilaWs.scala b/src/main/scala/LilaWs.scala
@@ -64,7 +64,7 @@ final class LilaWsServer(
       Bus.publish(_.all, ipc.ClientCtrl.Broom(nowSeconds - 30))
 
     scheduler.scheduleWithFixedDelay(4.seconds, 1201.millis): () =>
-      val counters = lobby.pong.get
+      val counters = lobby.pong.get()
       lila.emit.lobby(ipc.LilaIn.Counters(counters.members, counters.rounds))
 
     scheduler.scheduleWithFixedDelay(1.seconds, 1879.millis): () =>

diff --git a/src/main/scala/Lobby.scala b/src/main/scala/Lobby.scala
@@ -17,7 +17,7 @@ final class Lobby(lila: Lila, groupedWithin: util.GroupedWithin):
 
     private var value = LobbyPong(0, 0)
 
-    def get = value
+    def get() = value
 
     def update(members: Int, rounds: Int): Unit =
       value = LobbyPong(members, rounds)

diff --git a/src/main/scala/actor/LobbyClientActor.scala b/src/main/scala/actor/LobbyClientActor.scala
@@ -50,7 +50,7 @@ object LobbyClientActor:
               case Some(s) => apply(state.copy(site = s), deps)
 
           case msg: ClientOut.Ping =>
-            clientIn(services.lobby.pong.get)
+            clientIn(services.lobby.pong.get())
             apply(state.copy(site = sitePing(state.site, deps, msg)), deps)
 
           case ClientOut.LobbyJoin(payload) =>

diff --git a/src/main/scala/model.scala b/src/main/scala/model.scala
@@ -106,8 +106,8 @@ object Racer:
 
 opaque type Sri = String
 object Sri extends OpaqueString[Sri]:
-  def random                         = Sri(SecureRandom.nextString(12))
-  def from(str: String): Option[Sri] = if str contains ' ' then None else Some(str)
+  def random()                       = Sri(SecureRandom.nextString(12))
+  def from(str: String): Option[Sri] = Option.unless(str.contains(' '))(str)
 
 opaque type Flag = String
 object Flag extends OpaqueString[Flag]: