Merge branch 'master' into scroll-to-selected-chapter

Author: johndoknjas

.envrc

@@ -1,8 +1,8 @@
 /lila       text eol=lf
 /ui/build   text eol=lf
-public/lifat/nnue/*.nnue filter=lfs diff=lfs merge=lfs -text
-public/lifat/vosk/*.tar.gz filter=lfs diff=lfs merge=lfs -text
-public/lifat/bots/net/*.pb filter=lfs diff=lfs merge=lfs -text
-public/lifat/bots/book/*.bin filter=lfs diff=lfs merge=lfs -text
-public/lifat/bots/book/*.png filter=lfs diff=lfs merge=lfs -text
-public/lifat/background/gallery/*.webp filter=lfs diff=lfs merge=lfs -text
+/public/lifat/nnue/*.nnue filter=lfs diff=lfs merge=lfs -text
+/public/lifat/vosk/*.tar.gz filter=lfs diff=lfs merge=lfs -text
+/public/lifat/bots/net/*.pb filter=lfs diff=lfs merge=lfs -text
+/public/lifat/bots/book/*.bin filter=lfs diff=lfs merge=lfs -text
+/public/lifat/bots/book/*.png filter=lfs diff=lfs merge=lfs -text
+/public/lifat/background/gallery/*.webp filter=lfs diff=lfs merge=lfs -text

.gitattributes

@@ -8,26 +8,35 @@ on:
     paths-ignore:
       - 'translation/dest/**'
 
+permissions:
+  actions: read
+  contents: read
+  security-events: write
+
 jobs:
   lint:
     runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
+    strategy:
+      fail-fast: false
+      matrix:
+        script:
+          - lint
+          - check-format
     steps:
       - uses: actions/checkout@v5
       - uses: pnpm/action-setup@v4
-        with:
-          run_install: false
       - uses: actions/setup-node@v5
         with:
           node-version-file: .node-version
-          cache: 'pnpm'
+          cache: pnpm
+      - run: pnpm install
+      - run: pnpm run ${{ matrix.script }}
+
+  codeql:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v5
       - uses: github/codeql-action/init@v3
         with:
           languages: javascript
       - uses: github/codeql-action/analyze@v3
-      - run: pnpm install
-      - run: pnpm run lint
-      - run: pnpm run check-format

.github/workflows/lint.yml

@@ -0,0 +1,3 @@
+# git-lfs repo config
+#
+# The presence of this file speeds up git-lfs.

.lfsconfig

@@ -24,6 +24,7 @@ object UiEnv
 
   def netConfig = env.net
   def picfitUrl = env.memo.picfitUrl
+  def imageGetOrigin = env.memo.imageGetOrigin
 
   given lila.core.config.NetDomain = env.net.domain
   given (using ctx: PageContext): Option[Nonce] = ctx.nonce

app/UiEnv.scala

@@ -89,7 +89,7 @@ final class Clas(env: Env, authC: Auth) extends LilaController(env):
     WithClassAny(id)(
       forTeacher = WithClass(id): clas =>
         for
-          _ <- env.msg.twoFactorReminder(me)
+          _ <- env.msg.systemMsg.twoFactorReminder(me)
           students <- env.clas.api.student.activeWithUsers(clas)
           _ = preloadStudentUsers(students)
           students <- env.clas.api.student.withPerfs(students)

app/controllers/Clas.scala

@@ -46,7 +46,7 @@ final class Coach(env: Env) extends LilaController(env):
 
   def edit = Secure(_.Coach) { ctx ?=> me ?=>
     FoundPage(api.findOrInit): c =>
-      env.msg.twoFactorReminder(me).inject(views.coach.edit(c, CoachProfileForm.edit(c.coach)))
+      env.msg.systemMsg.twoFactorReminder(me).inject(views.coach.edit(c, CoachProfileForm.edit(c.coach)))
     .map(_.hasPersonalData)
   }
 

app/controllers/Coach.scala

@@ -36,10 +36,12 @@ final class Dev(env: Env) extends LilaController(env):
     env.relay.proxyDomainRegex,
     env.relay.proxyHostPort,
     env.relay.proxyCredentials,
-    env.report.api.modelSetting,
-    env.report.api.promptSetting,
-    env.ublog.automod.modelSetting,
-    env.ublog.automod.promptSetting
+    env.report.automod.imageModelSetting,
+    env.report.automod.imagePromptSetting,
+    env.report.api.commsModelSetting,
+    env.report.api.commsPromptSetting,
+    env.ublog.ublogAutomod.modelSetting,
+    env.ublog.ublogAutomod.promptSetting
   )
 
   def settings = Secure(_.Settings) { _ ?=> _ ?=>

app/controllers/Dev.scala

@@ -98,14 +98,15 @@ final class ForumTopic(env: Env) extends LilaController(env) with ForumControlle
       val slug = problemReportSlug(me.userId)
       bindForm(env.forum.forms.diagnostic)(
         err => jsonFormError(err),
-        text =>
+        data =>
           env.forum.topicRepo
             .existsByTree(diagnosticId, slug)
             .flatMap:
-              if _ then showDiagnostic(slug, text)
+              if _ then showDiagnostic(slug, data.text, ~data.plaintext)
               else
                 FoundPage(env.forum.categRepo.byId(diagnosticId)): categ =>
-                  views.forum.topic.makeDiagnostic(categ, forms.topic(false), anyCaptcha, text)
+                  views.forum.topic
+                    .makeDiagnostic(categ, forms.topic(false), anyCaptcha, data.text, ~data.plaintext)
       )
   }
 
@@ -114,7 +115,7 @@ final class ForumTopic(env: Env) extends LilaController(env) with ForumControlle
     else env.forum.topicApi.removeTopic(diagnosticId, slug).inject(Redirect(routes.ForumCateg.index))
   }
 
-  private def showDiagnostic(slug: ForumTopicSlug, formText: String)(using Context, Me) =
+  private def showDiagnostic(slug: ForumTopicSlug, formText: String, plaintext: Boolean)(using Context, Me) =
     FoundPage(topicApi.showLastPage(diagnosticId, slug)): (categ, topic, posts) =>
       val form = forms.postWithCaptcha(false).some
-      views.forum.topic.show(categ, topic, posts, form, None, true, formText.some)
+      views.forum.topic.show(categ, topic, posts, form, None, true, formText.some, plaintext = plaintext)

app/controllers/ForumTopic.scala

@@ -52,7 +52,7 @@ final class JsBot(env: Env) extends LilaController(env):
       .validate[JsObject]
       .fold(
         err => BadRequest(jsonError(err.toString)),
-        bot => env.jsBot.repo.putBot(BotJson(bot), me.userId).map(JsonOk)
+        bot => JsonOk(env.jsBot.api.put(BotJson(bot)))
       )
   }