Merge branch 'master' of https://github.com/lichess-org/lila

lichess-org · Jul 15, 2024 · 8c77337 · 8c77337
2 parents c7b9780 + 660d913
commit 8c77337
Show file tree

Hide file tree

Showing 913 changed files with 2,278 additions and 2,499 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,14 +14,15 @@ project/metals.sbt
 project/project
 project/target
 public/compiled
+public/hashed
 public/npm
 public/lifat
 public/css/
+public/json
 target
 data/
 dist/
 node_modules/
-local/
 ui/common/css/theme/gen/*.scss
 ui/common/**/*.js
 ui/common/**/*.d.ts

diff --git a/app/Env.scala b/app/Env.scala
@@ -4,12 +4,9 @@ import akka.actor.*
 import com.softwaremill.macwire.*
 import play.api.libs.ws.StandaloneWSClient
 import play.api.mvc.{ ControllerComponents, SessionCookieBaker }
-import play.api.{ Configuration, Environment, Mode, ConfigLoader }
+import play.api.{ ConfigLoader, Configuration, Environment, Mode }
 
 import lila.core.config.*
-import lila.common.config.given
-import lila.common.autoconfig.{ *, given }
-import lila.core.data.{ Strings, UserIds }
 import lila.core.i18n.Translator
 
 final class Env(

diff --git a/app/Lila.scala b/app/Lila.scala
@@ -1,7 +1,7 @@
 package lila.app
 
-import play.api.inject.DefaultApplicationLifecycle
 import play.api.Configuration
+import play.api.inject.DefaultApplicationLifecycle
 
 // The program entry point.
 // To run with bloop:

diff --git a/app/controllers/Account.scala b/app/controllers/Account.scala
@@ -3,13 +3,12 @@ package controllers
 import play.api.data.Form
 import play.api.libs.json.*
 import play.api.mvc.*
-import scalatags.Text.Frag
+import views.account.pages
 
-import lila.web.AnnounceApi
 import lila.app.{ *, given }
 import lila.common.HTTPRequest
 import lila.security.SecurityForm.Reopen
-import views.account.pages
+import lila.web.AnnounceApi
 
 final class Account(
     env: Env,

diff --git a/app/controllers/Analyse.scala b/app/controllers/Analyse.scala
@@ -6,10 +6,10 @@ import play.api.mvc.*
 
 import lila.app.{ *, given }
 import lila.common.HTTPRequest
-import lila.game.{ PgnDump, Pov }
+import lila.core.misc.lpv.LpvEmbed
+import lila.game.PgnDump
 import lila.oauth.AccessToken
 import lila.tree.ExportOptions
-import lila.core.misc.lpv.LpvEmbed
 
 final class Analyse(
     env: Env,

diff --git a/app/controllers/Api.scala b/app/controllers/Api.scala
@@ -8,12 +8,11 @@ import lila.api.GameApiV2
 import lila.app.{ *, given }
 import lila.common.HTTPRequest
 import lila.common.Json.given
-import lila.core.LightUser
-import lila.core.net.IpAddress
 import lila.core.chess.MultiPv
+import lila.core.net.IpAddress
+import lila.core.{ LightUser, id }
 import lila.gathering.Condition.GetMyTeamIds
 import lila.security.Mobile
-import lila.core.id
 
 final class Api(
     env: Env,
@@ -187,7 +186,6 @@ final class Api(
   def tournamentResults(id: TourId) = Anon:
     val csv = HTTPRequest.acceptsCsv(req) || get("as").has("csv")
     env.tournament.tournamentRepo.byId(id).orNotFound { tour =>
-      import lila.tournament.JsonView.playerResultWrites
       val withSheet = getBool("sheet")
       val perSecond = MaxPerSecond:
         if withSheet

diff --git a/app/controllers/Auth.scala b/app/controllers/Auth.scala
@@ -6,12 +6,12 @@ import play.api.mvc.*
 import lila.app.{ *, given }
 import lila.common.HTTPRequest
 import lila.common.Json.given
-import lila.security.SecurityForm.{ MagicLink, PasswordReset }
-import lila.security.{ FingerPrint, Signup }
+import lila.core.email.{ UserIdOrEmail, UserStrOrEmail }
 import lila.core.net.IpAddress
-import lila.core.email.{ UserStrOrEmail, UserIdOrEmail }
 import lila.core.security.ClearPassword
 import lila.memo.RateLimit
+import lila.security.SecurityForm.{ MagicLink, PasswordReset }
+import lila.security.{ FingerPrint, Signup }
 
 final class Auth(
     env: Env,

diff --git a/app/controllers/BulkPairing.scala b/app/controllers/BulkPairing.scala
@@ -2,10 +2,10 @@ package controllers
 
 import play.api.libs.json.*
 
+import lila.api.GameApiV2
 import lila.app.*
-import lila.common.Json.given
 import lila.challenge.ChallengeBulkSetup
-import lila.api.GameApiV2
+import lila.common.Json.given
 
 final class BulkPairing(gameC: => Game, apiC: => Api, env: Env) extends LilaController(env):
 

diff --git a/app/controllers/Challenge.scala b/app/controllers/Challenge.scala
@@ -4,15 +4,13 @@ import play.api.libs.json.Json
 import play.api.mvc.{ RequestHeader, Result }
 
 import lila.app.{ *, given }
-import lila.challenge.Challenge as ChallengeModel
-import lila.core.net.{ Bearer, IpAddress }
+import lila.challenge.{ Challenge as ChallengeModel, Direction }
 import lila.core.id.ChallengeId
-import lila.game.{ AnonCookie }
+import lila.core.net.Bearer
+import lila.core.socket.SocketVersion
+import lila.game.AnonCookie
 import lila.oauth.{ EndpointScopes, OAuthScope, OAuthServer }
 import lila.setup.ApiConfig
-import lila.core.socket.SocketVersion
-import lila.challenge.Direction
-import lila.common.Json.given
 
 final class Challenge(
     env: Env,
@@ -359,7 +357,6 @@ final class Challenge(
       config =>
         limit
           .challenge(req.ipAddress, rateLimited):
-            import lila.challenge.Challenge.*
             env.challenge.api
               .createOpen(config)
               .map: challenge =>

diff --git a/app/controllers/Clas.scala b/app/controllers/Clas.scala
@@ -2,14 +2,14 @@ package controllers
 package clas
 
 import akka.stream.scaladsl.*
-import play.api.mvc.*
 import play.api.data.Form
+import play.api.mvc.*
 
 import lila.app.{ *, given }
 import lila.clas.ClasForm.ClasData
 import lila.clas.ClasInvite
-import lila.core.security.ClearPassword
 import lila.core.id.{ ClasId, ClasInviteId }
+import lila.core.security.ClearPassword
 
 final class Clas(env: Env, authC: Auth) extends LilaController(env):
 

diff --git a/app/controllers/Dasher.scala b/app/controllers/Dasher.scala
@@ -5,9 +5,8 @@ import play.api.libs.ws.JsonBodyReadables.*
 import play.api.libs.ws.StandaloneWSClient
 
 import lila.app.{ *, given }
-import lila.common.Json.lightUserWrites
 import lila.core.i18n.{ I18nKey as trans, defaultLang }
-import lila.i18n.{ LangPicker, LangList }
+import lila.i18n.{ LangList, LangPicker }
 import lila.pref.ui.DasherJson
 
 final class Dasher(env: Env)(using ws: StandaloneWSClient) extends LilaController(env):

diff --git a/app/controllers/Export.scala b/app/controllers/Export.scala
@@ -2,15 +2,13 @@ package controllers
 
 import akka.stream.scaladsl.*
 import akka.util.ByteString
-
 import chess.format.{ Fen, Uci }
 import chess.variant.Variant
 import play.api.mvc.Result
 
 import lila.app.*
-import lila.core.net.IpAddress
-import lila.pref.{ PieceSet, Theme }
 import lila.core.id.PuzzleId
+import lila.pref.{ PieceSet, Theme }
 
 final class Export(env: Env) extends LilaController(env):
 

diff --git a/app/controllers/Fishnet.scala b/app/controllers/Fishnet.scala
@@ -1,9 +1,9 @@
 package controllers
 
+import monocle.syntax.all.*
 import play.api.libs.json.*
 import play.api.mvc.*
 
-import monocle.syntax.all.*
 import scala.util.{ Failure, Success }
 
 import lila.app.*

diff --git a/app/controllers/ForumCateg.scala b/app/controllers/ForumCateg.scala
@@ -1,10 +1,8 @@
 package controllers
 
 import lila.app.{ *, given }
-import lila.core.config
-import lila.core.id.{ ForumCategId, ForumTopicId }
+import lila.core.id.ForumCategId
 import lila.forum.ForumCateg.{ diagnosticId, ublogId }
-import lila.team.Team
 
 final class ForumCateg(env: Env) extends LilaController(env) with ForumController:
 

diff --git a/app/controllers/ForumController.scala b/app/controllers/ForumController.scala
@@ -3,8 +3,8 @@ package controllers
 import play.api.mvc.*
 
 import lila.app.{ *, given }
-import lila.forum.ForumTopic
 import lila.core.id.{ ForumCategId, ForumTopicId }
+import lila.forum.ForumTopic
 
 private[controllers] trait ForumController:
   self: LilaController =>

diff --git a/app/controllers/ForumPost.scala b/app/controllers/ForumPost.scala
@@ -1,9 +1,8 @@
 package controllers
 
 import lila.app.{ *, given }
-import lila.core.net.IpAddress
 import lila.core.i18n.I18nKey as trans
-import lila.core.id.{ ForumCategId, ForumTopicId }
+import lila.core.id.ForumCategId
 import lila.msg.MsgPreset
 
 final class ForumPost(env: Env) extends LilaController(env) with ForumController:

diff --git a/app/controllers/ForumTopic.scala b/app/controllers/ForumTopic.scala
@@ -3,10 +3,9 @@ package controllers
 import play.api.libs.json.*
 
 import lila.app.{ *, given }
-import lila.core.net.IpAddress
-import lila.forum.ForumCateg.diagnosticId
 import lila.common.Json.given
 import lila.core.id.{ ForumCategId, ForumTopicId }
+import lila.forum.ForumCateg.diagnosticId
 
 final class ForumTopic(env: Env) extends LilaController(env) with ForumController:
 

diff --git a/app/controllers/Game.scala b/app/controllers/Game.scala
@@ -7,14 +7,12 @@ import java.time.format.DateTimeFormatter
 import lila.api.GameApiV2
 import lila.app.{ *, given }
 import lila.common.HTTPRequest
-
-import lila.rating.PerfType
 import lila.core.id.GameAnyId
 
 final class Game(env: Env, apiC: => Api) extends LilaController(env):
 
-  def bookmark(gameId: GameId) = Auth { _ ?=> me ?=>
-    env.bookmark.api.toggle(gameId, me).inject(NoContent)
+  def bookmark(gameId: GameId) = AuthOrScopedBody(_.Web.Mobile) { _ ?=> me ?=>
+    env.bookmark.api.toggle(gameId, me, getBoolOpt("v")).inject(NoContent)
   }
 
   def delete(gameId: GameId) = Auth { _ ?=> me ?=>

diff --git a/app/controllers/GameMod.scala b/app/controllers/GameMod.scala
@@ -1,10 +1,6 @@
 package controllers
-
-import play.api.data.*
-
 import lila.api.GameApiV2
 import lila.app.{ *, given }
-import lila.core.config
 
 final class GameMod(env: Env)(using akka.stream.Materializer) extends LilaController(env):
 

diff --git a/app/controllers/Github.scala b/app/controllers/Github.scala
@@ -3,7 +3,7 @@ package controllers
 import play.api.libs.json.*
 import play.api.mvc.*
 
-import lila.app.{ *, given }
+import lila.app.*
 
 final class Github(env: Env) extends LilaController(env):
 

diff --git a/app/controllers/Importer.scala b/app/controllers/Importer.scala
@@ -1,16 +1,14 @@
 package controllers
 
-import scala.util.{ Either, Left, Right }
-import chess.ErrorStr
 import chess.format.pgn.PgnStr
 import play.api.libs.json.Json
 import play.api.mvc.*
 
+import scala.util.{ Either, Left, Right }
+
 import lila.app.{ *, given }
 import lila.common.HTTPRequest
 import lila.common.Json.given
-import lila.core.net.IpAddress
-import lila.game.GameExt.analysable
 
 final class Importer(env: Env) extends LilaController(env):
 

diff --git a/app/controllers/Insight.scala b/app/controllers/Insight.scala
@@ -1,12 +1,10 @@
 package controllers
-
-import play.api.i18n.Lang
 import play.api.libs.json.{ JsValue, Json }
 import play.api.mvc.*
 
 import lila.app.{ *, given }
-import lila.insight.{ InsightDimension, InsightMetric }
 import lila.core.i18n.Translate
+import lila.insight.{ InsightDimension, InsightMetric }
 
 final class Insight(env: Env) extends LilaController(env):
 

diff --git a/app/controllers/LilaController.scala b/app/controllers/LilaController.scala
@@ -2,17 +2,16 @@ package controllers
 
 import play.api.data.{ Form, FormBinding }
 import play.api.http.*
-import play.api.i18n.Lang
 import play.api.libs.json.Writes
 import play.api.mvc.*
 
 import lila.app.{ *, given }
-import lila.common.{ HTTPRequest, config }
-import lila.i18n.LangPicker
+import lila.common.HTTPRequest
 import lila.core.i18n.Language
-import lila.oauth.{ EndpointScopes, OAuthScope, OAuthScopes, OAuthServer, TokenScopes }
-import lila.core.perm.Permission
 import lila.core.perf.UserWithPerfs
+import lila.core.perm.Permission
+import lila.i18n.LangPicker
+import lila.oauth.{ EndpointScopes, OAuthScope, OAuthScopes, OAuthServer, TokenScopes }
 import lila.ui.{ Page, Snippet }
 
 abstract private[controllers] class LilaController(val env: Env)

diff --git a/app/controllers/Main.scala b/app/controllers/Main.scala
@@ -1,15 +1,11 @@
 package controllers
-
-import play.api.data.*
 import play.api.libs.json.*
 import play.api.mvc.*
 
 import lila.app.{ *, given }
 import lila.common.HTTPRequest
 import lila.core.id.GameFullId
-
-import lila.core.net.Bearer
-import lila.web.{ WebForms, StaticContent }
+import lila.web.{ StaticContent, WebForms }
 
 final class Main(
     env: Env,

diff --git a/app/controllers/Mod.scala b/app/controllers/Mod.scala
@@ -8,12 +8,12 @@ import scala.annotation.nowarn
 
 import lila.app.{ *, given }
 import lila.common.HTTPRequest
+import lila.core.net.IpAddress
 import lila.core.perm.Permission
-import lila.mod.ModUserSearch
-import lila.report.{ Mod as AsMod, Suspect }
 import lila.core.security.FingerHash
-import lila.core.net.IpAddress
 import lila.core.userId.ModId
+import lila.mod.ModUserSearch
+import lila.report.{ Mod as AsMod, Suspect }
 
 final class Mod(
     env: Env,

diff --git a/app/controllers/OAuth.scala b/app/controllers/OAuth.scala
@@ -1,17 +1,17 @@
 package controllers
 
-import scalalib.ThreadLocalRandom
 import play.api.libs.json.{ JsNull, JsObject, JsValue, Json }
 import play.api.mvc.*
+import scalalib.ThreadLocalRandom
 import scalatags.Text.all.stringFrag
 
 import lila.app.*
+import lila.common.HTTPRequest
 import lila.common.Json.given
-import lila.core.net.{ Bearer, IpAddress }
+import lila.core.net.Bearer
 import lila.oauth.{ AccessTokenRequest, AuthorizationRequest, OAuthScopes }
 
 import Api.ApiResult
-import lila.common.HTTPRequest
 
 final class OAuth(env: Env, apiC: => Api) extends LilaController(env):