Merge branch 'master' into update/kamon-core-2.1.0

.github/workflows/server.yml

@@ -29,7 +29,7 @@ jobs:
     - uses: actions/checkout@v2
     - run: echo "autoformat=false" > ~/.scalariform.conf
     - name: Work around OverlappingFileLockException
-      run: mount && mkdir -p /tmp/.sbt && ln -s /tmp/.sbt ~/.sbt
+      run: mkdir -p ~/.sbt && sudo mount -t tmpfs -o size=1536m tmpfs ~/.sbt && mount
     - uses: actions/cache@v1
       with:
         path: ~/.ivy2/cache

.gitignore

@@ -6,6 +6,9 @@ logs
 project/project
 project/target
 public/compiled
+public/vendor/bar-rating
+public/vendor/highcharts-4.2.5
+public/vendor/hopscotch
 public/vendor/stockfish.wasm
 public/vendor/stockfish-mv.wasm
 public/vendor/stockfish.js

.gitmodules

@@ -4,12 +4,6 @@
 [submodule "public/vendor/multiple-select"]
 	path = public/vendor/multiple-select
 	url = https://github.com/ornicar/multiple-select
-[submodule "public/vendor/hopscotch"]
-	path = public/vendor/hopscotch
-	url = https://github.com/linkedin/hopscotch
 [submodule "public/vendor/shepherd"]
 	path = public/vendor/shepherd
 	url = https://github.com/HubSpot/shepherd
-[submodule "public/vendor/bar-rating"]
-	path = public/vendor/bar-rating
-	url = https://github.com/antennaio/jquery-bar-rating

app/controllers/Main.scala

@@ -129,6 +129,9 @@ Allow: /
 Disallow: /game/export/
 Disallow: /games/export/
 Allow: /game/export/gif/thumbnail/
+
+User-agent: Twitterbot
+Allow: /
 """
       else "User-agent: *\nDisallow: /"
     }

app/controllers/Simul.scala

@@ -121,7 +121,7 @@ final class Simul(
   def form = Auth { implicit ctx => me =>
     NoLameOrBot {
       apiC.teamsIBelongTo(me) map { teams =>
-        Ok(html.simul.form(forms.create, teams))
+        Ok(html.simul.form(forms.create(me), teams))
       }
     }
   }
@@ -129,16 +129,19 @@ final class Simul(
   def create = AuthBody { implicit ctx => implicit me =>
     NoLameOrBot {
       implicit val req = ctx.body
-      forms.create.bindFromRequest.fold(
+      forms
-        err =>
+        .create(me)
-          apiC.teamsIBelongTo(me) map { teams =>
+        .bindFromRequest
-            BadRequest(html.simul.form(err, teams))
+        .fold(
-          },
+          err =>
-        setup =>
+            apiC.teamsIBelongTo(me) map { teams =>
-          env.simul.api.create(setup, me) map { simul =>
+              BadRequest(html.simul.form(err, teams))
-            Redirect(routes.Simul.show(simul.id))
+            },
-          }
+          setup =>
-      )
+            env.simul.api.create(setup, me) map { simul =>
+              Redirect(routes.Simul.show(simul.id))
+            }
+        )
     }
   }
 

app/controllers/UserAnalysis.scala

@@ -78,12 +78,19 @@ final class UserAnalysis(
         negotiate(
           html =
             if (game.replayable) Redirect(routes.Round.watcher(game.id, color)).fuccess
-            else
+            else {
+              val owner = isMyPov(pov)
               for {
                 initialFen <- env.game.gameRepo initialFen game.id
                 data <- env.api.roundApi
-                  .userAnalysisJson(pov, ctx.pref, initialFen, pov.color, owner = isMyPov(pov), me = ctx.me)
+                  .userAnalysisJson(pov, ctx.pref, initialFen, pov.color, owner = owner, me = ctx.me)
-              } yield NoCache(Ok(html.board.userAnalysis(data, pov))),
+              } yield NoCache(
+                Ok(
+                  html.board
+                    .userAnalysis(data, pov, withForecast = owner && !pov.game.synthetic && pov.game.playable)
+                )
+              )
+            },
           api = apiVersion => mobileAnalysis(pov, apiVersion)
         )
       }

app/views/board/userAnalysis.scala

@@ -14,15 +14,13 @@ import controllers.routes
 
 object userAnalysis {
 
-  def apply(data: JsObject, pov: lila.game.Pov)(implicit ctx: Context) =
+  def apply(data: JsObject, pov: lila.game.Pov, withForecast: Boolean = false)(implicit ctx: Context) =
     views.html.base.layout(
       title = trans.analysis.txt(),
       moreCss = frag(
         cssTag("analyse.free"),
         pov.game.variant == Crazyhouse option cssTag("analyse.zh"),
-        !pov.game.synthetic && pov.game.playable && ctx.me.flatMap(pov.game.player).isDefined option cssTag(
+        withForecast option cssTag("analyse.forecast"),
-          "analyse.forecast"
-        ),
         ctx.blind option cssTag("round.nvui")
       ),
       moreJs = frag(
@@ -31,11 +29,7 @@ object userAnalysis {
         embedJsUnsafe(s"""lichess=lichess||{};lichess.user_analysis=${safeJsonValue(
           Json.obj(
             "data" -> data,
-            "i18n" -> userAnalysisI18n(
+            "i18n" -> userAnalysisI18n(withForecast = withForecast),
-              withForecast = !pov.game.synthetic && pov.game.playable && ctx.me
-                .flatMap(pov.game.player)
-                .isDefined
-            ),
             "explorer" -> Json.obj(
               "endpoint"          -> explorerEndpoint,
               "tablebaseEndpoint" -> tablebaseEndpoint

app/views/setup/filter.scala

@@ -34,7 +34,7 @@ object filter {
             td(trans.timeControl()),
             td(renderCheckboxes(form, "speed", filter.speed.map(_.id.toString), translatedSpeedChoices))
           ),
-          tr(
+          tr(cls := "inline")(
             td(trans.increment()),
             td(
               renderCheckboxes(
@@ -47,7 +47,7 @@ object filter {
               )
             )
           ),
-          ctx.isAuth option tr(
+          ctx.isAuth option tr(cls := "inline")(
             td(trans.mode()),
             td(renderCheckboxes(form, "mode", filter.mode.map(_.id.toString), translatedModeChoices))
           ),

app/views/simul/form.scala

@@ -23,12 +23,19 @@ object form {
       main(cls := "box box-pad page-small simul-form")(
         h1(trans.hostANewSimul()),
         postForm(cls := "form3", action := routes.Simul.create())(
-          br,
           br,
           p(trans.whenCreateSimul()),
           br,
           br,
           globalError(form),
+          form3.group(form("name"), trans.name()) { f =>
+            div(
+              form3.input(f),
+              " Simul",
+              br,
+              small(cls := "form-help")(trans.inappropriateNameWarning())
+            )
+          },
           form3.group(form("variant"), trans.simulVariantsHint()) { _ =>
             div(cls := "variants")(
               views.html.setup.filter.renderCheckboxes(

modules/lobby/src/main/Hook.scala

@@ -34,7 +34,7 @@ case class Hook(
 
   val isAuth = user.nonEmpty
 
-  val hasIncrement = if (clock.incrementSeconds > 0) 0 else 1
+  val hasIncrement = if (clock.incrementSeconds > 0) 1 else 0
 
   def compatibleWith(h: Hook) =
     isAuth == h.isAuth &&

modules/simul/src/main/Simul.scala

@@ -142,12 +142,9 @@ object Simul {
 
   case class OnStart(simul: Simul)
 
-  private def makeName(host: User) =
-    if (host.title.isDefined) host.titleUsername
-    else RandomName()
-
   def make(
       host: User,
+      name: String,
       clock: SimulClock,
       variants: List[Variant],
       position: Option[StartingPosition],
@@ -156,7 +153,7 @@ object Simul {
       team: Option[String]
   ): Simul = Simul(
     _id = Random nextString 8,
-    name = makeName(host),
+    name = name,
     status = SimulStatus.Created,
     clock = clock,
     hostId = host.id,

modules/simul/src/main/SimulApi.scala

@@ -44,6 +44,7 @@ final class SimulApi(
 
   def create(setup: SimulForm.Setup, me: User): Fu[Simul] = {
     val simul = Simul.make(
+      name = setup.name,
       clock = SimulClock(
         config = chess.Clock.Config(setup.clockTime * 60, setup.clockIncrement),
         hostExtraTime = setup.clockExtra * 60

modules/simul/src/main/SimulForm.scala

@@ -2,6 +2,8 @@ package lila.simul
 
 import play.api.data._
 import play.api.data.Forms._
+import play.api.data.validation.{ Constraint, Constraints }
+import lila.user.User
 
 import chess.StartingPosition
 import lila.common.Form._
@@ -28,9 +30,24 @@ object SimulForm {
   )
   val colorDefault = "white"
 
-  def create =
+  private val nameType = text.verifying(
+    Constraints minLength 2,
+    Constraints maxLength 40,
+    Constraints.pattern(
+      regex = """[\p{L}\p{N}-\s:,;]+""".r,
+      error = "error.unknown"
+    ),
+    Constraint[String] { (t: String) =>
+      if (t.toLowerCase contains "lichess")
+        validation.Invalid(validation.ValidationError("Must not contain \"lichess\""))
+      else validation.Valid
+    }
+  )
+
+  def create(host: User) =
     Form(
       mapping(
+        "name"           -> nameType,
         "clockTime"      -> numberIn(clockTimeChoices),
         "clockIncrement" -> numberIn(clockIncrementChoices),
         "clockExtra"     -> numberIn(clockExtraChoices),
@@ -55,6 +72,7 @@ object SimulForm {
         "team"     -> optional(nonEmptyText)
       )(Setup.apply)(Setup.unapply)
     ) fill Setup(
+      name = host.titleUsername,
       clockTime = clockTimeDefault,
       clockIncrement = clockIncrementDefault,
       clockExtra = clockExtraDefault,
@@ -77,6 +95,7 @@ object SimulForm {
   def setText = Form(single("text" -> text))
 
   case class Setup(
+      name: String,
       clockTime: Int,
       clockIncrement: Int,
       clockExtra: Int,

modules/simul/src/main/package.scala

@@ -2,133 +2,6 @@ package lila
 
 package object simul extends PackageObject {
 
-  private[simul] object RandomName {
-
-    private val names = IndexedSeq(
-      "Actinium",
-      "Aluminium",
-      "Americium",
-      "Antimony",
-      "Argon",
-      "Arsenic",
-      "Astatine",
-      "Barium",
-      "Berkelium",
-      "Beryllium",
-      "Bismuth",
-      "Bohrium",
-      "Boron",
-      "Bromine",
-      "Cadmium",
-      "Caesium",
-      "Calcium",
-      "Californium",
-      "Carbon",
-      "Cerium",
-      "Chlorine",
-      "Chromium",
-      "Cobalt",
-      "Copernicium",
-      "Copper",
-      "Curium",
-      "Darmstadtium",
-      "Dubnium",
-      "Dysprosium",
-      "Einsteinium",
-      "Erbium",
-      "Europium",
-      "Fermium",
-      "Flerovium",
-      "Fluorine",
-      "Francium",
-      "Gadolinium",
-      "Gallium",
-      "Germanium",
-      "Gold",
-      "Hafnium",
-      "Hassium",
-      "Helium",
-      "Holmium",
-      "Hydrogen",
-      "Indium",
-      "Iodine",
-      "Iridium",
-      "Iron",
-      "Krypton",
-      "Lanthanum",
-      "Lawrencium",
-      "Lead",
-      "Lithium",
-      "Livermorium",
-      "Lutetium",
-      "Magnesium",
-      "Manganese",
-      "Meitnerium",
-      "Mendelevium",
-      "Mercury",
-      "Molybdenum",
-      "Moscovium",
-      "Neodymium",
-      "Neon",
-      "Neptunium",
-      "Nickel",
-      "Nihonium",
-      "Niobium",
-      "Nitrogen",
-      "Nobelium",
-      "Oganesson",
-      "Osmium",
-      "Oxygen",
-      "Palladium",
-      "Phosphorus",
-      "Platinum",
-      "Plutonium",
-      "Polonium",
-      "Potassium",
-      "Praseodymium",
-      "Promethium",
-      "Protactinium",
-      "Radium",
-      "Radon",
-      "Rhenium",
-      "Rhodium",
-      "Roentgenium",
-      "Rubidium",
-      "Ruthenium",
-      "Rutherfordium",
-      "Samarium",
-      "Scandium",
-      "Seaborgium",
-      "Selenium",
-      "Silicon",
-      "Silver",
-      "Sodium",
-      "Strontium",
-      "Sulfur",
-      "Tantalum",
-      "Technetium",
-      "Tellurium",
-      "Tennessine",
-      "Terbium",
-      "Thallium",
-      "Thorium",
-      "Thulium",
-      "Tin",
-      "Titanium",
-      "Tungsten",
-      "Uranium",
-      "Vanadium",
-      "Xenon",
-      "Ytterbium",
-      "Yttrium",
-      "Zinc",
-      "Zirconium"
-    )
-    private val size = names.size
-
-    def apply(): String = names(scala.util.Random nextInt size)
-  }
-
   private[simul] val logger = lila.log("simul")
 
 }

project/Dependencies.scala

@@ -61,9 +61,9 @@ object Dependencies {
   }
   object kamon {
     val core       = "io.kamon" %% "kamon-core"           % "2.1.0"
-    val influxdb   = "io.kamon" %% "kamon-influxdb"       % "2.0.1-LILA"
+    val influxdb   = "io.kamon" %% "kamon-influxdb"       % "2.1.0"
-    val metrics    = "io.kamon" %% "kamon-system-metrics" % "2.0.2"
+    val metrics    = "io.kamon" %% "kamon-system-metrics" % "2.1.0"
-    val prometheus = "io.kamon" %% "kamon-prometheus"     % "2.0.1"
+    val prometheus = "io.kamon" %% "kamon-prometheus"     % "2.1.0"
   }
 
   object silencer {