Merge branch 'master' into puzzle-ui

* master:
  inc assets version
  nb "Norsk bokmål" translation #17030. Author: hmalmedal.
  fix #2444
  try to make less com autoreports
  monitor pool wave candidates
  only skip autopairing half the time for now
  update stream fixtures
  hide streams in unsupported language

README.md

@@ -14,7 +14,7 @@ It features a [search engine](https://lichess.org/games/search),
 [tactic trainer](https://lichess.org/training),
 [opening trainer](https://lichess.org/training/opening),
 a [mobile app](https://lichess.org/mobile),
-and a [network world map](https://lichess.org/network).
+and a [shared analysis board](https://lichess.org/study).
 The UI is available in more than [80 languages](https://lichess.org/translation/contribute) thanks to the community.
 
 Lichess is written in [Scala 2.11](https://www.scala-lang.org/),

conf/base.conf

@@ -10,7 +10,7 @@ net {
   ip = "5.196.91.160"
   asset {
     domain = ${net.domain}
-    version = 1266
+    version = 1268
   }
   email = "contact@lichess.org"
   crawlable = false

modules/common/src/main/mon.scala

@@ -87,6 +87,7 @@ object mon {
       object wave {
         def scheduled(id: String) = inc(s"lobby.pool.$id.wave.scheduled")
         def full(id: String) = inc(s"lobby.pool.$id.wave.full")
+        def candidates(id: String) = rec(s"lobby.pool.$id.wave.candidates")
         def paired(id: String) = rec(s"lobby.pool.$id.wave.paired")
         def missed(id: String) = rec(s"lobby.pool.$id.wave.missed")
         def wait(id: String) = rec(s"lobby.pool.$id.wave.wait")

modules/i18n/messages/messages.nb

@@ -193,7 +193,7 @@ apply=Bruk
 leaderboard=Ledertabell
 pasteTheFenStringHere=Lim inn FEN-strengen her
 pasteThePgnStringHere=Lim inn PGN-strengen her
-fromPosition=Fra posisjon
+fromPosition=Fra stilling
 continueFromHere=Fortsett herfra
 importGame=Importer parti
 nbImportedGames=%s Importerte partier
@@ -244,10 +244,10 @@ createdBy=Lagd av
 tournamentIsStarting=Turneringen begynner
 membersOnly=Kun for medlemmer
 boardEditor=Oppsett
-startPosition=Startposisjon
+startPosition=Utgangsstilling
 clearBoard=Tøm brett
-savePosition=Lagre posisjon
-loadPosition=Last posisjon
+savePosition=Lagre stilling
+loadPosition=Last stilling
 isPrivate=Privat
 reportXToModerators=Rapporter %s til moderatorer
 profile=Profil

modules/lobby/src/main/Lobby.scala

@@ -28,7 +28,7 @@ private[lobby] final class Lobby(
       if (hook.realVariant.standard) lila.mon.lobby.hook.standardColor(hook.realMode.name, hook.color)()
       HookRepo byUid hook.uid foreach remove
       hook.sid ?? { sid => HookRepo bySid sid foreach remove }
-      if (!hook.compatibleWithPools) findCompatible(hook) foreach {
+      if (scala.util.Random.nextBoolean || !hook.compatibleWithPools) findCompatible(hook) foreach {
         case Some(h) => self ! BiteHook(h.id, hook.uid, hook.user)
         case None    => self ! SaveHook(msg)
       }

modules/pool/src/main/PoolActor.scala

@@ -65,8 +65,10 @@ private final class PoolActor(
 
       monitor.wave.withRange(monId)(members.count(_.hasRange))
 
+      val candidates = members ++ hooks.map(_.member)
+
       val pairings = lila.mon.measure(_.lobby.pool.matchMaking.duration(monId)) {
-        MatchMaking(members ++ hooks.map(_.member))
+        MatchMaking(candidates)
       }
 
       val pairedMembers = pairings.flatMap(_.members)
@@ -82,6 +84,7 @@ private final class PoolActor(
 
       logger.debug(s"${config.id.value} wave: ${pairings.size} pairings, ${members.size} missed")
 
+      monitor.wave.candidates(monId)(candidates.size)
       monitor.wave.paired(monId)(pairedMembers.size)
       monitor.wave.missed(monId)(members.size)
       pairedMembers.foreach { m =>

modules/shutup/src/main/model.scala

@@ -47,7 +47,7 @@ case class TextReport(textType: TextType, ratios: List[Double]) {
 
   def minRatios = textType.rotation / 15
   def nbBad = ratios.count(_ > TextReport.unacceptableRatio)
-  def tolerableNb = (ratios.size / 10) max 3
+  def tolerableNb = (ratios.size / 10) atLeast 4
 
   def unacceptable = (ratios.size >= minRatios) && (nbBad > tolerableNb)
 }