Merge branch 'master' into api-bots-players-redesign

Author: ornicar

.git-blame-ignore-revs

@@ -99,3 +99,6 @@ e2478dfc217e5bf034a810a5449494b76d471282
 
 # Scala Steward: Reformat with scalafmt 3.10.2
 94063c367bc120efdbb548e3692a4c260f4ef662
+
+# Scala Steward: Reformat with scalafmt 3.10.4
+0b0545e15ad527e7fc99c5b854123727ac5f6b5e

.github/copilot-instructions.md

@@ -79,7 +79,7 @@ pnpm test
 # Watch mode for tests
 pnpm test:watch
 
-# Check code formatting (Prettier)
+# Check code formatting (Oxfmt)
 pnpm check-format
 
 # Auto-format code
@@ -187,7 +187,8 @@ pnpm lint [path]
 - **pnpm-workspace.yaml**: Defines workspace packages
 - **ui/.build/**: Custom frontend build system
 - **.scalafmt.conf**: Scala formatting rules
-- **ui/.prettierrc.json**: TypeScript/CSS formatting rules
+- **ui/.oxlint.json**: TypeScript formatting rules (Oxlint)
+- **ui/.oxfmt.json**: TypeScript/CSS/JSON/MD formatting rules (Oxfmt)
 - **conf/routes**: HTTP route definitions
 - **conf/application.conf.default**: Main application configuration template
 

.github/workflows/server.yml

@@ -35,7 +35,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java-version: [21, 25]
+        java-version: [21]
     steps:
       - uses: actions/checkout@v6
       - uses: actions/setup-java@v5

.gitignore

@@ -60,8 +60,5 @@ instance.lock
 /docker-compose.yml
 /?
 
-# eslint cache
-/ui/.eslintcache
-
 # deploy bearer
 .lila-cli

.oxfmtrc.json

@@ -0,0 +1,5 @@
+{
+  "$schema": "./node_modules/oxfmt/configuration_schema.json",
+  "singleQuote": true,
+  "printWidth": 110
+}

.scalafmt.conf

@@ -1,4 +1,4 @@
-version = "3.10.3"
+version = "3.10.4"
 runner.dialect = scala3
 
 align.preset = none

COPYING.md

@@ -74,6 +74,8 @@ public/sounds/sfx | [Enigmahack](https://github.com/Enigmahack) | AGPLv3+
 public/sounds/lisp | [EdinburghCollective](http://lichess.org/@/EdinburghCollective) | [CC BY-NC-SA 4.0](https://creativecommons.org/licenses/by-nc-sa/4.0/)
 SVG in ui/learn/src/apple.ts | [Sensa](https://www.svgrepo.com/svg/434273/star) | [CC0 1.0](https://creativecommons.org/publicdomain/zero/1.0/deed.en)
 public/flair/img/symbols.neovim-mark.webp | Jason Long | [CC BY 3.0](https://creativecommons.org/licenses/by/3.0/) (Modified by converting to webp and resizing)
+public/images/practice/* [game-icons.net](https://game-icons.net/about.html) [CC BY 3.0](http://creativecommons.org/licenses/by/3.0/)
+public/images/puzzle-themes/* [game-icons.net](https://game-icons.net/about.html) [CC BY 3.0](http://creativecommons.org/licenses/by/3.0/)
 translation/source/puzzleTheme.xml | the lila authors and contributors | [CC0 1.0](https://creativecommons.org/publicdomain/zero/1.0/)
 ## Exceptions (non-free)
 

app/Lila.scala

@@ -86,11 +86,7 @@ final class LilaComponents(
     c.result
 
   val httpFilters = Seq(
-    lila.web.HttpFilter(
-      env.net,
-      env.web.settings.sitewideCoepCredentiallessHeader.get,
-      lila.security.Mobile.LichessMobileUa.parse
-    )
+    lila.web.HttpFilter(env.net, lila.security.Mobile.LichessMobileUa.parse)
   )
 
   override lazy val httpErrorHandler =

app/controllers/Analyse.scala

@@ -67,7 +67,6 @@ final class Analyse(
                   movetimes = true,
                   clocks = true,
                   division = true,
-                  opening = true,
                   rating = ctx.pref.showRatings,
                   lichobileCompat = HTTPRequest.isLichobile(ctx.req),
                   puzzles = true

app/controllers/Clas.scala

@@ -71,7 +71,7 @@ final class Clas(env: Env, authC: Auth) extends LilaController(env):
                   .verify()
                   .flatMap: captcha =>
                     if captcha.ok
-                    then env.clas.api.clas.create(data, me.value).map(redirectTo)
+                    then env.clas.api.clas.create(data, me).map(redirectTo)
                     else BadRequest.async(renderCreate(data.some))
             )
   }
@@ -301,7 +301,7 @@ final class Clas(env: Env, authC: Auth) extends LilaController(env):
 
   def archive(id: ClasId, v: Boolean) = SecureBody(_.Teacher) { _ ?=> me ?=>
     WithClass(id): clas =>
-      env.clas.api.clas.archive(clas, me.value, v).inject(redirectTo(clas).flashSuccess)
+      env.clas.api.clas.archive(clas, me, v).inject(redirectTo(clas).flashSuccess)
   }
 
   def studentForm(id: ClasId) = Secure(_.Teacher) { ctx ?=> me ?=>
@@ -340,7 +340,7 @@ final class Clas(env: Env, authC: Auth) extends LilaController(env):
                   }
               ,
               data =>
-                env.clas.api.student.create(clas, data, me.value).map { s =>
+                env.clas.api.student.create(clas, data, me).map { s =>
                   Redirect(routes.Clas.studentForm(clas.id))
                     .flashing("created" -> s"${s.student.userId} ${s.password.value}")
                 }
@@ -378,7 +378,7 @@ final class Clas(env: Env, authC: Auth) extends LilaController(env):
               bindForm(env.clas.forms.student.manyCreate(lila.clas.Clas.maxStudents - nbStudents))(
                 err => BadRequest.page(views.clas.student.manyForm(clas, students, err, nbStudents, Nil)),
                 data =>
-                  env.clas.api.student.manyCreate(clas, data, me.value).flatMap { many =>
+                  env.clas.api.student.manyCreate(clas, data, me).flatMap { many =>
                     env.user.lightUserApi
                       .preloadMany(many.map(_.student.userId))
                       .inject(