Prep for Steroids refactor

app/controllers/Coach.scala

@@ -107,7 +107,7 @@ object Coach extends LilaController {
     OptionFuResult(api findOrInit me) { c =>
       ctx.body.body.file("picture") match {
         case Some(pic) => api.uploadPicture(c, pic) recover {
-          case e: lila.common.LilaException => BadRequest(html.coach.picture(c, e.message.some))
+          case e: lila.base.LilaException => BadRequest(html.coach.picture(c, e.message.some))
         } inject Redirect(routes.Coach.edit)
         case None => fuccess(Redirect(routes.Coach.edit))
       }

app/package.scala

@@ -1,3 +1,3 @@
 package lila
 
-package object app extends PackageObject with WithPlay with socket.WithSocket
+package object app extends PackageObject with socket.WithSocket

app/views/activity/ActivityHtml.scala

@@ -8,7 +8,7 @@ import lila.api.Context
 import lila.i18n.{ I18nKey, I18nKeys => trans }
 import lila.app.templating.Environment._
 
-object ActivityHtml extends lila.Steroids {
+object ActivityHtml extends lila.Lilaisms {
 
   def scoreHtml(s: Score)(implicit ctx: Context) = Html {
     s"""<score>${scorePart("win", s.win, trans.nbWins)}${scorePart("draw", s.draw, trans.nbDraws)}${scorePart("loss", s.loss, trans.nbLosses)}</score>"""

app/views/board/JsData.scala

@@ -8,7 +8,7 @@ import lila.api.Context
 import lila.app.templating.Environment._
 import lila.i18n.I18nKeys
 
-object JsData extends lila.Steroids {
+object JsData extends lila.Lilaisms {
 
   def apply(
     sit: chess.Situation,

modules/activity/src/main/package.scala

@@ -1,6 +1,6 @@
 package lila
 
-package object activity extends PackageObject with WithPlay {
+package object activity extends PackageObject {
 
   private[activity] val logger = lila.log("activity")
 }

modules/analyse/src/main/Env.scala

@@ -3,8 +3,6 @@ package lila.analyse
 import akka.actor._
 import com.typesafe.config.Config
 
-import lila.common.PimpedConfig._
-
 final class Env(
     config: Config,
     db: lila.db.Env,

modules/analyse/src/main/package.scala

@@ -1,6 +1,6 @@
 package lila
 
-package object analyse extends PackageObject with WithPlay {
+package object analyse extends PackageObject {
 
   type InfoAdvices = List[(Info, Option[Advice])]
 

modules/api/src/main/Env.scala

@@ -2,7 +2,7 @@ package lila.api
 
 import akka.actor._
 import com.typesafe.config.Config
-import lila.common.PimpedConfig._
+
 import lila.simul.Simul
 
 final class Env(

modules/api/src/main/package.scala

@@ -1,3 +1,3 @@
 package lila
 
-package object api extends PackageObject with WithPlay
+package object api extends PackageObject

modules/blog/src/main/Env.scala

@@ -2,8 +2,6 @@ package lila.blog
 
 import com.typesafe.config.Config
 
-import lila.common.PimpedConfig._
-
 final class Env(
     config: Config,
     scheduler: lila.common.Scheduler,

modules/blog/src/main/package.scala

@@ -1,6 +1,6 @@
 package lila
 
-package object blog extends PackageObject with WithPlay {
+package object blog extends PackageObject {
 
   private[blog] def logger = lila.log("blog")
 }

modules/bookmark/src/main/package.scala

@@ -1,3 +1,3 @@
 package lila
 
-package object bookmark extends PackageObject with WithPlay
+package object bookmark extends PackageObject

modules/challenge/src/main/Env.scala

@@ -5,7 +5,6 @@ import akka.pattern.ask
 import com.typesafe.config.Config
 import scala.concurrent.duration._
 
-import lila.common.PimpedConfig._
 import lila.user.User
 import lila.hub.actorApi.map.Ask
 import lila.socket.actorApi.GetVersion

modules/challenge/src/main/package.scala

@@ -4,7 +4,7 @@ import org.joda.time.DateTime
 
 import lila.socket.WithSocket
 
-package object challenge extends PackageObject with WithPlay with WithSocket {
+package object challenge extends PackageObject with WithSocket {
 
   type EitherChallenger = Either[Challenge.Anonymous, Challenge.Registered]
 

modules/chat/src/main/Env.scala

@@ -3,8 +3,6 @@ package lila.chat
 import akka.actor.{ ActorSystem, Props, ActorSelection }
 import com.typesafe.config.Config
 
-import lila.common.PimpedConfig._
-
 final class Env(
     config: Config,
     db: lila.db.Env,

modules/chat/src/main/package.scala

@@ -1,6 +1,6 @@
 package lila
 
-package object chat extends PackageObject with WithPlay {
+package object chat extends PackageObject {
 
   private[chat] val systemUserId = "lichess"
 }

modules/coach/src/main/package.scala

@@ -1,6 +1,6 @@
 package lila
 
-package object coach extends PackageObject with WithPlay {
+package object coach extends PackageObject {
 
   private[coach] def logger = lila.log("coach")
 }

modules/common/src/main/Steroids.scala → modules/common/src/main/Lilaisms.scala

@@ -5,7 +5,7 @@ import ornicar.scalalib
 import ornicar.scalalib.Zero
 import scala.util.Try
 
-trait Steroids
+trait Lilaisms
 
   extends scalalib.Validation
   with scalalib.Common

modules/common/src/main/PackageObject.scala

@@ -6,7 +6,7 @@ import scala.concurrent.Future
 import ornicar.scalalib
 import scalaz.{ Monad, Monoid, OptionT, ~> }
 
-trait PackageObject extends Steroids with WithFuture {
+trait PackageObject extends Lilaisms with WithFuture {
 
   // case object Key(value: String) extends AnyVal with StringValue
   trait StringValue extends Any {
@@ -86,21 +86,6 @@ trait PackageObject extends Steroids with WithFuture {
 
   def doubleBox(in: Range.Inclusive)(v: Double): Double =
     math.max(in.start, math.min(v, in.end))
-}
-
-trait WithFuture extends scalalib.Validation {
-
-  type Fu[+A] = Future[A]
-  type Funit = Fu[Unit]
-
-  def fuccess[A](a: A) = Future successful a
-  def fufail[A <: Throwable, B](a: A): Fu[B] = Future failed a
-  def fufail[A](a: String): Fu[A] = fufail(common.LilaException(a))
-  def fufail[A](a: Failures): Fu[A] = fufail(common.LilaException(a))
-  val funit = fuccess(())
-}
-
-trait WithPlay { self: PackageObject =>
 
   import play.api.libs.json._
   import scalalib.Zero
@@ -134,13 +119,15 @@ trait WithPlay { self: PackageObject =>
       Future sequence t
   }
 
+  implicit def toPimpedConfig(c: com.typesafe.config.Config) = new common.LilaPimpedConfig(c)
+
   implicit def LilaPimpedFuture[A](fua: Fu[A]): PimpedFuture.LilaPimpedFuture[A] =
     new PimpedFuture.LilaPimpedFuture(fua)
 
   implicit final class LilaPimpedFutureZero[A: Zero](fua: Fu[A]) {
 
     def nevermind: Fu[A] = fua recover {
-      case e: lila.common.LilaException => zero[A]
+      case e: lila.base.LilaException => zero[A]
       case e: java.util.concurrent.TimeoutException => zero[A]
       case e: Exception =>
         lila.log("common").warn("Future.nevermind", e)
@@ -219,3 +206,15 @@ trait WithPlay { self: PackageObject =>
     def minutes(m: Int): Timeout = Timeout(m.minutes)
   }
 }
+
+trait WithFuture extends scalalib.Validation {
+
+  type Fu[+A] = Future[A]
+  type Funit = Fu[Unit]
+
+  def fuccess[A](a: A) = Future successful a
+  def fufail[A <: Throwable, B](a: A): Fu[B] = Future failed a
+  def fufail[A](a: String): Fu[A] = fufail(base.LilaException(a))
+  def fufail[A](a: Failures): Fu[A] = fufail(base.LilaException(a))
+  val funit = fuccess(())
+}

modules/common/src/main/PimpedConfig.scala

@@ -5,12 +5,9 @@ import java.util.concurrent.TimeUnit
 
 import com.typesafe.config.Config
 
-object PimpedConfig {
+final class LilaPimpedConfig(val config: Config) extends AnyVal {
 
-  implicit final class LilaPimpedConfig(val config: Config) extends AnyVal {
-
-    def millis(name: String): Int = config.getDuration(name, TimeUnit.MILLISECONDS).toInt
-    def seconds(name: String): Int = config.getDuration(name, TimeUnit.SECONDS).toInt
-    def duration(name: String): FiniteDuration = millis(name).millis
-  }
+  def millis(name: String): Int = config.getDuration(name, TimeUnit.MILLISECONDS).toInt
+  def seconds(name: String): Int = config.getDuration(name, TimeUnit.SECONDS).toInt
+  def duration(name: String): FiniteDuration = millis(name).millis
 }

modules/common/src/main/PimpedFuture.scala

@@ -82,7 +82,7 @@ object PimpedFuture {
     }
 
     def prefixFailure(p: => String) = mapFailure { e =>
-      common.LilaException(s"$p ${e.getMessage}")
+      base.LilaException(s"$p ${e.getMessage}")
     }
 
     def thenPp: Fu[A] = {

modules/common/src/main/base/LilaException.scala

@@ -0,0 +1,20 @@
+package lila.base
+
+import ornicar.scalalib
+
+trait LilaException extends Exception {
+  val message: String
+
+  override def getMessage = message
+  override def toString = message
+}
+
+object LilaException extends scalalib.Validation
+  with scalaz.syntax.ToShowOps {
+
+  def apply(msg: String): LilaException = new LilaException {
+    val message = msg
+  }
+
+  def apply(msg: Failures): LilaException = apply(msg.shows)
+}

modules/common/src/main/package.scala

@@ -1,3 +1,3 @@
 package lila
 
-package object common extends PackageObject with WithPlay
+package object common extends PackageObject

modules/coordinate/src/main/package.scala

@@ -1,3 +1,3 @@
 package lila
 
-package object coordinate extends PackageObject with WithPlay
+package object coordinate extends PackageObject

modules/db/src/main/package.scala

@@ -2,7 +2,7 @@ package lila
 
 import reactivemongo.api.commands.WriteResult
 
-package object db extends PackageObject with WithPlay {
+package object db extends PackageObject {
 
   def recoverDuplicateKey[A](f: WriteResult => A): PartialFunction[Throwable, A] = {
     case e: WriteResult if e.code.contains(11000) => f(e)

modules/evalCache/src/main/package.scala

@@ -1,6 +1,6 @@
 package lila
 
-package object evalCache extends PackageObject with WithPlay {
+package object evalCache extends PackageObject {
 
   private[evalCache] val logger = lila.log("evalCache")
 }

modules/evaluation/src/main/package.scala

@@ -1,3 +1,3 @@
 package lila
 
-package object evaluation extends PackageObject with WithPlay
+package object evaluation extends PackageObject

modules/event/src/main/package.scala

@@ -1,3 +1,3 @@
 package lila
 
-package object event extends PackageObject with WithPlay
+package object event extends PackageObject

modules/explorer/src/main/package.scala

@@ -1,6 +1,6 @@
 package lila
 
-package object explorer extends PackageObject with WithPlay {
+package object explorer extends PackageObject {
 
   val maxPlies = 50
 }

modules/fishnet/src/main/AnalysisBuilder.scala

@@ -72,7 +72,7 @@ private object AnalysisBuilder {
       case ((_, _), index) => Info(index + 1 + startedAtPly, Eval.empty)
     }
 
-  case class GameIsGone(id: String) extends lila.common.LilaException {
+  case class GameIsGone(id: String) extends lila.base.LilaException {
     val message = s"Analysis $id game is gone?!"
   }
 }

modules/fishnet/src/main/FishnetApi.scala

@@ -171,7 +171,7 @@ final class FishnetApi(
 
 object FishnetApi {
 
-  import lila.common.LilaException
+  import lila.base.LilaException
 
   case object WeakAnalysis extends LilaException {
     val message = "Analysis nodes per move is too low"

modules/fishnet/src/main/UciToPgn.scala

@@ -7,7 +7,7 @@ import scalaz.Validation.success
 import scalaz.Validation.FlatMap._
 
 import lila.analyse.{ Analysis, Info, PgnMove }
-import lila.common.LilaException
+import lila.base.LilaException
 
 // convert variations from UCI to PGN.
 // also drops extra variations

modules/fishnet/src/main/package.scala

@@ -1,6 +1,6 @@
 package lila
 
-package object fishnet extends PackageObject with WithPlay {
+package object fishnet extends PackageObject {
 
   private[fishnet] def logger = lila.log("fishnet")
 }

modules/forum/src/main/Env.scala

@@ -4,7 +4,7 @@ import akka.actor._
 import com.typesafe.config.Config
 
 import lila.common.DetectLanguage
-import lila.common.PimpedConfig._
+
 import lila.hub.actorApi.team.CreateTeam
 import lila.mod.ModlogApi
 import lila.notify.NotifyApi

modules/forum/src/main/package.scala

@@ -1,6 +1,6 @@
 package lila
 
-package object forum extends PackageObject with WithPlay {
+package object forum extends PackageObject {
 
   private[forum] def teamSlug(id: String) = s"team-$id"
 

modules/forumSearch/src/main/package.scala

@@ -1,6 +1,6 @@
 package lila
 
-package object forumSearch extends PackageObject with WithPlay {
+package object forumSearch extends PackageObject {
 
   private[forumSearch] val logger = lila.log("forumSearch")
 }