diff --git a/app/AppLoader.scala b/app/AppLoader.scala index 2d3b18e2c8..424d00a0f3 100644 --- a/app/AppLoader.scala +++ b/app/AppLoader.scala @@ -28,7 +28,7 @@ final class LilaComponents(ctx: ApplicationLoader.Context) val mem = Runtime.getRuntime().maxMemory() / 1024 / 1024 val appVersionCommit = ~configuration.getOptional[String]("app.version.commit") val appVersionDate = ~configuration.getOptional[String]("app.version.date") - s"lila $appVersionCommit $appVersionDate / java ${java}, memory: ${mem}MB" + s"lila ${ctx.environment.mode} $appVersionCommit $appVersionDate / java ${java}, memory: ${mem}MB" } import _root_.controllers._ diff --git a/app/Env.scala b/app/Env.scala index 3b2d76362c..2390f96f28 100644 --- a/app/Env.scala +++ b/app/Env.scala @@ -158,7 +158,7 @@ final class Env( _ <- coach.api.remove(u.id) reports <- report.api.processAndGetBySuspect(lila.report.Suspect(u)) _ <- self ?? mod.logApi.selfCloseAccount(u.id, reports) - _ <- u.marks.troll ?? relation.api.fetchFollowing(u.id) flatMap { + _ <- u.marks.troll ?? relation.api.fetchFollowing(u.id).flatMap { activity.write.unfollowAll(u, _) } } yield Bus.publish(lila.hub.actorApi.security.CloseAccount(u.id), "accountClose") diff --git a/build.sbt b/build.sbt index 019197e975..5da554c795 100644 --- a/build.sbt +++ b/build.sbt @@ -10,7 +10,6 @@ lazy val root = Project("lila", file(".")) .aggregate(api) .settings(buildSettings) -PlayKeys.playDefaultPort := 9663 // shorter prod classpath scriptClasspath := Seq("*") maintainer := "contact@lichess.org" diff --git a/conf/base.conf b/conf/base.conf index d28b3ad4f2..4442127a21 100644 --- a/conf/base.conf +++ b/conf/base.conf @@ -1,4 +1,5 @@ http.port = 9663 +https.port = disabled mongodb { uri = "mongodb://127.0.0.1:27017" mongo-async-driver = ${akka} diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 490e535d52..04f3aa995f 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -50,7 +50,7 @@ object Dependencies { } object play { - val version = "2.8.2-lila_0.6" + val version = "2.8.2-lila_0.7" val api = "com.typesafe.play" %% "play" % version val json = "com.typesafe.play" %% "play-json" % "2.9.0" } diff --git a/project/plugins.sbt b/project/plugins.sbt index d3a25f4e19..b932dc0ba8 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ resolvers += Resolver.url("lila-maven-sbt", url("https://raw.githubusercontent.com/ornicar/lila-maven/master"))(Resolver.ivyStylePatterns) -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.2-lila_0.6") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.2-lila_0.7") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2") addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.4.3")