Merge branch 'master' into insufficient-material-draw-claims

app/controllers/Account.scala

@@ -142,13 +142,12 @@ final class Account(
             refreshSessionId(Redirect(routes.Account.passwd).flashSuccess)
   }
 
-  private def refreshSessionId(result: Result)(using ctx: Context, me: Me): Fu[Result] =
-    (env.security.store.closeAllSessionsOf(me) >>
-      env.push.webSubscriptionApi.unsubscribeByUser(me) >>
-      env.push.unregisterDevices(me) >>
-      env.security.api.saveAuthentication(me, ctx.mobileApiVersion)).map { sessionId =>
-      result.withCookies(env.security.lilaCookie.session(env.security.api.sessionIdKey, sessionId))
-    }
+  private def refreshSessionId(result: Result)(using ctx: Context, me: Me): Fu[Result] = for
+    _         <- env.security.store.closeAllSessionsOf(me)
+    _         <- env.push.webSubscriptionApi.unsubscribeByUser(me)
+    _         <- env.push.unregisterDevices(me)
+    sessionId <- env.security.api.saveAuthentication(me, ctx.mobileApiVersion)
+  yield result.withCookies(env.security.lilaCookie.session(env.security.api.sessionIdKey, sessionId))
 
   private def emailForm(using me: Me) =
     env.user.repo.email(me).flatMap(env.security.forms.changeEmail)
@@ -181,15 +180,17 @@ final class Account(
 
   def emailConfirm(token: String) = Open:
     Found(env.security.emailChange.confirm(token)): (user, prevEmail) =>
-      (prevEmail.exists(_.isNoReply).so(env.clas.api.student.release(user))) >>
-        auth.authenticateUser(
+      for
+        _ <- prevEmail.exists(_.isNoReply).so(env.clas.api.student.release(user))
+        res <- auth.authenticateUser(
           user,
           remember = true,
           result =
             if prevEmail.exists(_.isNoReply)
             then Some(_ => Redirect(routes.User.show(user.username)).flashSuccess)
             else Some(_ => Redirect(routes.Account.email).flashSuccess)
         )
+      yield res
 
   def emailConfirmHelp = OpenBody:
     import lila.security.EmailConfirm.Help.*
@@ -329,8 +330,10 @@ final class Account(
     if sessionId == "all"
     then refreshSessionId(Redirect(routes.Account.security).flashSuccess)
     else
-      (env.security.store.closeUserAndSessionId(me, sessionId) >>
-        env.push.webSubscriptionApi.unsubscribeBySession(sessionId)).inject(NoContent)
+      for
+        _ <- env.security.store.closeUserAndSessionId(me, sessionId)
+        _ <- env.push.webSubscriptionApi.unsubscribeBySession(sessionId)
+      yield NoContent
   }
 
   private def renderReopen(form: Option[Form[Reopen]], msg: Option[String])(using Context) =

app/controllers/Auth.scala

@@ -286,13 +286,12 @@ final class Auth(
   private def redirectNewUser(user: UserModel)(using Context) =
     api
       .saveAuthentication(user.id, ctx.mobileApiVersion)
-      .flatMap { sessionId =>
+      .flatMap: sessionId =>
         negotiate(
           Redirect(getReferrerOption | routes.User.show(user.username).url)
             .flashSuccess("Welcome! Your account is now active."),
           mobileUserOk(user, sessionId)
         ).map(authenticateCookie(sessionId, remember = true))
-      }
       .recoverWith(authRecovery)
 
   def setFingerPrint(fp: String, ms: Int) = Auth { ctx ?=> me ?=>

modules/common/src/main/HTTPRequest.scala

@@ -67,7 +67,7 @@ object HTTPRequest:
 
   private val crawlerMatcher = UaMatcher:
     // spiders/crawlers
-    """Googlebot|GoogleOther|AdsBot|Google-Read-Aloud|bingbot|BingPreview|facebookexternalhit|meta-externalagent|SemrushBot|AhrefsBot|PetalBot|Applebot|YandexBot|YandexAdNet|YandexImages|Twitterbot|Baiduspider|Amazonbot|Bytespider|yacybot|ImagesiftBot|ChatGLM-Spider|YisouSpider|Yeti/""" +
+    """Googlebot|GoogleOther|AdsBot|Google-Read-Aloud|bingbot|BingPreview|facebookexternalhit|meta-externalagent|Discordbot|SemrushBot|AhrefsBot|PetalBot|Applebot|YandexBot|YandexAdNet|YandexImages|Twitterbot|Baiduspider|Amazonbot|Bytespider|yacybot|ImagesiftBot|ChatGLM-Spider|YisouSpider|Yeti/""" +
       // http libs
       """|HeadlessChrome|okhttp|axios|undici|wget|curl|python-requests|aiohttp|commons-httpclient|python-urllib|python-httpx|Nessus|imroc/req"""
 

modules/security/src/main/SecurityApi.scala

@@ -113,20 +113,20 @@ final class SecurityApi(
     userRepo.mustConfirmEmail(userId).flatMap {
       if _ then fufail(SecurityApi.MustConfirmEmail(userId))
       else
-        ip2proxy(HTTPRequest.ipAddress(req)).flatMap: proxy =>
-          val sessionId = SecureRandom.nextString(22)
-          proxy.name.foreach: p =>
-            logger.info(s"Proxy login $p $userId")
-          store
-            .save(sessionId, userId, req, apiVersion, up = true, fp = none, proxy = proxy)
-            .inject(sessionId)
+        for
+          proxy <- ip2proxy(HTTPRequest.ipAddress(req))
+          _ = proxy.name.foreach(p => logger.info(s"Proxy login $p $userId ${HTTPRequest.print(req)}"))
+          sessionId = SecureRandom.nextString(22)
+          _ <- store.save(sessionId, userId, req, apiVersion, up = true, fp = none, proxy = proxy)
+        yield sessionId
     }
 
   def saveSignup(userId: UserId, apiVersion: Option[ApiVersion], fp: Option[FingerPrint])(using
       req: RequestHeader
   ): Funit =
     val sessionId = SecureRandom.nextString(22)
-    store.save(s"SIG-$sessionId", userId, req, apiVersion, up = false, fp = fp)
+    ip2proxy(HTTPRequest.ipAddress(req)).flatMap: proxy =>
+      store.save(s"SIG-$sessionId", userId, req, apiVersion, up = false, fp = fp, proxy = proxy)
 
   private type AppealOrUser = Either[AppealUser, FingerPrintedUser]
   def restoreUser(req: RequestHeader): Fu[Option[AppealOrUser]] =

modules/security/src/main/Store.scala

@@ -94,30 +94,6 @@ final class Store(val coll: Coll, cacheApi: lila.memo.CacheApi)(using Executor):
       )
       .void
 
-  private[security] def save(
-      sessionId: String,
-      userId: UserId,
-      req: RequestHeader,
-      apiVersion: Option[ApiVersion],
-      up: Boolean,
-      fp: Option[FingerPrint],
-      sri: Option[Sri] = None
-  ): Funit =
-    coll.insert
-      .one:
-        $doc(
-          "_id"  -> sessionId,
-          "user" -> userId,
-          "ip"   -> HTTPRequest.ipAddress(req),
-          "ua"   -> HTTPRequest.userAgent(req).fold("?")(_.value),
-          "date" -> nowInstant,
-          "up"   -> up,
-          "api"  -> apiVersion,
-          "fp"   -> fp.flatMap(lila.security.FingerHash.from).map(_.value).orElse(sri.map(_.value)),
-          "sri"  -> sri
-        )
-      .void
-
   def delete(sessionId: String): Funit =
     for _ <- coll.update.one($id(sessionId), $set("up" -> false))
     yield uncache(sessionId)

ui/.build/src/tscWorker.ts

@@ -52,6 +52,7 @@ function watchEvent(err: ts.Diagnostic) {
 }
 
 function diagnostic(err: ts.Diagnostic) {
+  const text = typeof err.messageText === 'string' ? err.messageText : err.messageText.messageText;
   let file, line, col;
   if (err.file) {
     file = err.file.fileName;
@@ -64,6 +65,6 @@ function diagnostic(err: ts.Diagnostic) {
   parentPort?.postMessage({
     type: 'error',
     index,
-    data: { code: err.code, text: err.messageText, file, line, col },
+    data: { code: err.code, text, file, line, col },
   });
 }

ui/chat/src/discussion.ts

@@ -15,10 +15,10 @@ const whisperRegex = /^\/[wW](?:hisper)?\s/;
 
 export default function (ctrl: ChatCtrl): Array<VNode | undefined> {
   if (!ctrl.vm.enabled) return [];
-  const scrollCb = (vnode: VNode) => {
+  const scrollCb = (vnode: VNode, insert: boolean) => {
       const el = vnode.elm as HTMLElement;
       if (ctrl.data.lines.length > 5) {
-        const autoScroll = el.scrollTop > el.scrollHeight - el.clientHeight - 50;
+        const autoScroll = insert || el.scrollTop > el.scrollHeight - el.clientHeight - 100;
         if (autoScroll) {
           el.scrollTop = 999999;
           setTimeout((_: any) => (el.scrollTop = 999999), 300);
@@ -44,9 +44,9 @@ export default function (ctrl: ChatCtrl): Array<VNode | undefined> {
               $el.on('click', '.flag', (e: Event) =>
                 report(ctrl, (e.target as HTMLElement).parentNode as HTMLElement),
               );
-            scrollCb(vnode);
+            scrollCb(vnode, true);
           },
-          postpatch: (_, vnode) => scrollCb(vnode),
+          postpatch: (_, vnode) => scrollCb(vnode, false),
         },
       },
       selectLines(ctrl).map(line => renderLine(ctrl, line)),