From 581bf5a7f94684a4e194bac86b346825f6200514 Mon Sep 17 00:00:00 2001 From: Isaac Levy Date: Sun, 15 Oct 2017 17:58:17 -0400 Subject: [PATCH 1/7] scalachess 6.23 And update estimate error to avoid negatives --- modules/common/src/main/mon.scala | 3 ++- modules/round/src/main/Round.scala | 2 +- project/Dependencies.scala | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/common/src/main/mon.scala b/modules/common/src/main/mon.scala index d200e4a27c..cb00b99e2f 100644 --- a/modules/common/src/main/mon.scala +++ b/modules/common/src/main/mon.scala @@ -161,7 +161,8 @@ object mon { } object lag { val avgReported = rec("round.move.lag.avg_reported") - val estimateError = rec("round.move.lag.estimate_error") + private val estErrorRec = rec("round.move.lag.estimate_error_1000") + def estimateError(e: Int) = estErrorRec(e + 1000) val compDeviation = rec("round.move.lag.comp_deviation") def uncomped(key: String) = rec(s"round.move.lag.uncomped.$key") val uncompedAll = rec(s"round.move.lag.uncomped.all") diff --git a/modules/round/src/main/Round.scala b/modules/round/src/main/Round.scala index b462de90f5..c582ce9dac 100644 --- a/modules/round/src/main/Round.scala +++ b/modules/round/src/main/Round.scala @@ -253,7 +253,7 @@ private[round] final class Round( avgComp <- lt.avgLagComp uncomp <- (lt.totalLag - lt.totalComp) / lt.lagSteps } { - lRec.estimateError((avgComp - lowEst).centis + 100) + lRec.estimateError((avgComp - lowEst).centis) lRec.uncomped(f"${lt.quotaGain.roundTenths}%02d")(uncomp.centis) lRec.uncompedAll(uncomp.centis) } diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 7e383e357f..2b63d01b65 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -28,7 +28,7 @@ object Dependencies { val findbugs = "com.google.code.findbugs" % "jsr305" % "3.0.1" val hasher = "com.roundeights" %% "hasher" % "1.2.0" val jodaTime = "joda-time" % "joda-time" % "2.9.9" - val chess = "org.lichess" %% "scalachess" % "6.22" + val chess = "org.lichess" %% "scalachess" % "6.23" val maxmind = "com.sanoma.cda" %% "maxmind-geoip2-scala" % "1.2.3-THIB" val prismic = "io.prismic" %% "scala-kit" % "1.2.11-THIB" val java8compat = "org.scala-lang.modules" %% "scala-java8-compat" % "0.8.0" From 3c496d20b5d80925f9a13cf45c4f240652be7c52 Mon Sep 17 00:00:00 2001 From: Thibault Duplessis Date: Sun, 15 Oct 2017 19:57:29 -0500 Subject: [PATCH 2/7] simplify relay fetch a bit --- modules/relay/src/main/RelayFetch.scala | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/relay/src/main/RelayFetch.scala b/modules/relay/src/main/RelayFetch.scala index 648a1c2c55..5b234b37ae 100644 --- a/modules/relay/src/main/RelayFetch.scala +++ b/modules/relay/src/main/RelayFetch.scala @@ -65,15 +65,15 @@ private final class RelayFetch( { lila.mon.relay.sync.result(result.toString.toLowerCase)() if (r.sync.until exists (_ isBefore DateTime.now)) fuccess(r.withSync(_.stop)) - else ((r.sync.until, r.sync.nextAt, result) match { - case (Some(until), Some(nextAt), SyncResult.Ok(nbMoves, games)) => + else (r.sync.nextAt, result) match { + case (Some(nextAt), SyncResult.Ok(nbMoves, games)) => lila.mon.relay.moves(nbMoves) if (r.finished && nbMoves == 0) fuccess(r.withSync(_.stop)) else finishRelay(r, nbMoves, games) getOrElse continueRelay(r) - case (_, _, SyncResult.Timeout) => continueRelay(r) - case (_, _, SyncResult.Error(_)) => continueRelay(r) + case (_, SyncResult.Timeout) => continueRelay(r) + case (_, SyncResult.Error(_)) => continueRelay(r) case _ => fuccess(r.withSync(_.stop)) - }) + } } flatMap { newRelay => (newRelay != r) ?? api.update(newRelay, from = r.some) } From 157e52cf573747bf953dfbd586249523c082edb5 Mon Sep 17 00:00:00 2001 From: Thibault Duplessis Date: Sun, 15 Oct 2017 21:20:27 -0500 Subject: [PATCH 3/7] set relay as unfinished when manually triggering sync that's wrong though --- modules/relay/src/main/RelayApi.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/relay/src/main/RelayApi.scala b/modules/relay/src/main/RelayApi.scala index b9c27b0aad..294e7a0b4d 100644 --- a/modules/relay/src/main/RelayApi.scala +++ b/modules/relay/src/main/RelayApi.scala @@ -83,7 +83,7 @@ final class RelayApi( def setSync(id: Relay.Id, user: User, v: Boolean): Funit = byId(id) flatMap { _ ?? { r => - val relay = if (v) r.withSync(_.start) else r.withSync(_.stop) + val relay = if (v) r.withSync(_.start).setUnFinished else r.withSync(_.stop) coll.update($id(relay.id.value), relay).void >> publishRelay(relay) } } From 298889d237ae04af60fe04660cedb3e7b700b0c4 Mon Sep 17 00:00:00 2001 From: Isaac Levy Date: Mon, 16 Oct 2017 02:34:50 -0400 Subject: [PATCH 4/7] Hide mod username when thread is closed Probably should remove Thread.otherUserId, it's dangerous. --- app/views/message/thread.scala.html | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/views/message/thread.scala.html b/app/views/message/thread.scala.html index f17b102b47..4a35919760 100644 --- a/app/views/message/thread.scala.html +++ b/app/views/message/thread.scala.html @@ -24,12 +24,14 @@ title = thread.name) {
@if(blocks) { -

@userIdLink(thread.otherUserId(me).some) blocks you. You cannot answer.

+

@userIdLink(thread.visibleOtherUserId(me).some) blocks you. You cannot answer.

} else { @if(!thread.isVisibleByOther(me) && !me.troll) {

- @userIdLink(thread.otherUserId(me).some) has closed this thread. - Create a new one + @userIdLink(thread.visibleOtherUserId(me).some) has closed this thread. + @if(!thread.asMod){ + Create a new one + }

} else { @form.map { f => From 7001d79b048af915c459917a54322ec9cc365658 Mon Sep 17 00:00:00 2001 From: Seung-Zin Nam Date: Mon, 16 Oct 2017 11:18:12 +0200 Subject: [PATCH 5/7] upgrade PLAY to 2.4.11 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 4a5c5d07cb..c3cd9f9289 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/" -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.4.6") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.4.11") addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.0") From c116d677458f835967982b3d13b094b1b5582f8c Mon Sep 17 00:00:00 2001 From: Thibault Duplessis Date: Mon, 16 Oct 2017 10:41:56 -0500 Subject: [PATCH 6/7] mention IBAN & bitcoin on /patron --- app/views/plan/index.scala.html | 7 ++- public/doc/iban_LICHESS_ORG_00022031601.pdf | Bin 0 -> 6192 bytes public/stylesheets/plan.css | 52 +++++++++++--------- 3 files changed, 34 insertions(+), 25 deletions(-) create mode 100644 public/doc/iban_LICHESS_ORG_00022031601.pdf diff --git a/app/views/plan/index.scala.html b/app/views/plan/index.scala.html index e968607a5a..0d70b9ae65 100644 --- a/app/views/plan/index.scala.html +++ b/app/views/plan/index.scala.html @@ -30,7 +30,7 @@ openGraph = lila.app.ui.OpenGraph( title = title, url = s"$netBaseUrl${routes.Plan.index.url}", description = "Free chess for everyone, forever!").some) { -
+
@patron.ifTrue(ctx.me.??(_.isPatron)).map { p =>