reorder imports

modules/ai/src/main/Env.scala

@@ -1,11 +1,11 @@
 package lila.ai
 
-import lila.common.PimpedConfig._
-
 import akka.actor._
 import akka.pattern.pipe
 import com.typesafe.config.Config
 
+import lila.common.PimpedConfig._
+
 final class Env(
     config: Config,
     system: ActorSystem,

modules/ai/src/main/stockfish/ActorFSM.scala

@@ -1,11 +1,10 @@
 package lila.ai
 package stockfish
 
+import akka.actor.{ Props, Actor, ActorRef, Status, FSM ⇒ AkkaFSM, LoggingFSM }
 import model._
 import model.analyse._
 
-import akka.actor.{ Props, Actor, ActorRef, Status, FSM ⇒ AkkaFSM, LoggingFSM }
-
 final class ActorFSM(
   processBuilder: Process.Builder,
   config: Config)

modules/ai/src/main/stockfish/AnalyseParser.scala

@@ -1,9 +1,10 @@
 package lila.ai
 package stockfish
 
-import lila.analyse.Info
 import java.util.regex.Matcher.quoteReplacement
 
+import lila.analyse.Info
+
 object AnalyseParser {
 
   // info depth 4 seldepth 5 score cp -3309 nodes 1665 nps 43815 time 38 multipv 1 pv f2e3 d4c5 c1d1 c5g5 d1d2 g5g2 d2c1 e8e3

modules/ai/src/main/stockfish/Client.scala

@@ -1,14 +1,15 @@
 package lila.ai
 package stockfish
 
-import chess.{ Game, Move }
-import chess.format.UciMove
-import lila.analyse.{ Analysis, AnalysisMaker }
-
 import scala.concurrent.duration._
-import play.api.Play.current
+
 import play.api.libs.concurrent._
 import play.api.libs.ws.WS
+import play.api.Play.current
+
+import chess.format.UciMove
+import chess.{ Game, Move }
+import lila.analyse.{ Analysis, AnalysisMaker }
 
 final class Client(
     val playUrl: String,

modules/ai/src/main/stockfish/Process.scala

@@ -2,8 +2,8 @@ package lila.ai
 package stockfish
 
 import java.io.OutputStream
-import scala.sys.process.{ Process ⇒ SProcess, ProcessBuilder, ProcessIO }
 import scala.io.Source.fromInputStream
+import scala.sys.process.{ Process ⇒ SProcess, ProcessBuilder, ProcessIO }
 
 private [stockfish] final class Process(
     builder: ProcessBuilder,

modules/ai/src/main/stockfish/Server.scala

@@ -1,18 +1,19 @@
 package lila.ai
 package stockfish
 
-import chess.Rook
-import chess.format.UciDump
-import chess.format.Forsyth
-import lila.analyse.Analysis
-import model.{ GetQueueSize, QueueSize }
-import model.play.BestMove
-
 import scala.concurrent.duration._
+
 import akka.actor.{ Props, Actor, ActorRef, Kill }
 import akka.pattern.{ ask, AskTimeoutException }
-import play.api.Play.current
+import model.play.BestMove
+import model.{ GetQueueSize, QueueSize }
 import play.api.libs.concurrent.Akka.system
+import play.api.Play.current
+
+import chess.format.Forsyth
+import chess.format.UciDump
+import chess.Rook
+import lila.analyse.Analysis
 
 final class Server(execPath: String, config: Config) {
 

modules/ai/src/main/stockfish/Stockfish.scala

@@ -2,6 +2,7 @@ package lila.ai
 package stockfish
 
 import model.play.BestMove
+
 import chess.Game
 
 object Stockfish {

modules/ai/src/main/stockfish/model.scala

@@ -1,12 +1,12 @@
 package lila.ai
 package stockfish
 
-import chess.Pos.posAt
-import chess.format.UciMove
-import lila.analyse.{ Analysis, AnalysisBuilder }
-
 import akka.actor.ActorRef
 
+import chess.format.UciMove
+import chess.Pos.posAt
+import lila.analyse.{ Analysis, AnalysisBuilder }
+
 object model {
 
   type Task = Either[play.Task, analyse.Task]

modules/analyse/src/main/Analyser.scala

@@ -1,13 +1,13 @@
 package lila.analyse
 
-import lila.game.{ Game, GameRepo, PgnRepo }
-import lila.db.api._
-import tube.analysisTube
-import lila.game.tube.gameTube
-import makeTimeout.veryLarge
-
 import akka.pattern.ask
 
+import lila.db.api._
+import lila.game.tube.gameTube
+import lila.game.{ Game, GameRepo, PgnRepo }
+import makeTimeout.veryLarge
+import tube.analysisTube
+
 final class Analyser(ai: lila.hub.ActorLazyRef) {
 
   def get(id: String): Fu[Option[Analysis]] = $find.byId[Analysis](id)

modules/analyse/src/main/AnalysisRepo.scala

@@ -1,14 +1,13 @@
 package lila.analyse
 
+import org.joda.time.DateTime
+import org.scala_tools.time.Imports._
+import play.api.libs.json.Json
+
 import lila.db.api._
 import lila.db.Implicits._
 import tube.analysisTube
 
-import play.api.libs.json.Json
-
-import org.joda.time.DateTime
-import org.scala_tools.time.Imports._
-
 private[analyse] object AnalysisRepo {
 
   type ID = String

modules/analyse/src/main/Env.scala

@@ -1,10 +1,10 @@
 package lila.analyse
 
-import lila.common.PimpedConfig._
-
 import com.typesafe.config.Config
 import spray.caching.{ LruCache, Cache }
 
+import lila.common.PimpedConfig._
+
 final class Env(
     config: Config,
     db: lila.db.Env,

modules/analyse/src/main/PaginatorBuilder.scala

@@ -1,15 +1,15 @@
 package lila.analyse
 
+import play.api.libs.json.Json
+
 import lila.common.paginator._
-import lila.db.paginator._
 import lila.db.api._
 import lila.db.Implicits._
+import lila.db.paginator._
 import lila.game.Game
 import lila.game.tube.gameTube
 import tube.analysisTube
 
-import play.api.libs.json.Json
-
 private[analyse] final class PaginatorBuilder(
     cached: { def nbAnalysis: Fu[Int] },
     maxPerPage: Int) {

modules/analyse/src/main/TimeChart.scala

@@ -1,11 +1,12 @@
 package lila.analyse
 
-import lila.game.{ Game, Namer }
-import chess.Color
-
 import scala.concurrent.Future
+
 import play.api.libs.json.Json
 
+import chess.Color
+import lila.game.{ Game, Namer }
+
 final class TimeChart(game: Game, usernames: Map[Color, String]) {
 
   def columns = Json stringify {

modules/analyse/src/main/TimePie.scala

@@ -1,9 +1,9 @@
 package lila.analyse
 
-import lila.game.Pov
-
 import play.api.libs.json.Json
 
+import lila.game.Pov
+
 final class TimePie(val pov: Pov) {
 
   def columns = Json stringify {

modules/analyse/src/main/model.scala

@@ -1,7 +1,7 @@
 package lila.analyse
 
-import chess.{ Pos, Color, White, Black }
 import chess.format.{ UciMove, Nag }
+import chess.{ Pos, Color, White, Black }
 
 private[analyse] sealed trait Advice {
   def severity: Severity

modules/api/src/main/Env.scala

@@ -2,7 +2,6 @@ package lila.api
 
 import akka.actor._
 import com.typesafe.config.Config
-
 import play.api.Application
 
 final class Env(

modules/bookmark/src/main/BookmarkApi.scala

@@ -1,10 +1,10 @@
 package lila.bookmark
 
+import lila.db.api._
+import lila.game.tube.gameTube
 import lila.game.{ Game, GameRepo }
 import lila.user.User
-import lila.db.api._
 import tube.bookmarkTube
-import lila.game.tube.gameTube
 
 final class BookmarkApi(
     cached: Cached,

modules/bookmark/src/main/BookmarkRepo.scala

@@ -1,12 +1,12 @@
 package lila.bookmark
 
-import lila.db.Implicits._
-import lila.db.api._
-import tube.bookmarkTube
-
+import org.joda.time.DateTime
 import play.api.libs.json._
 import play.modules.reactivemongo.json.ImplicitBSONHandlers._
-import org.joda.time.DateTime
+
+import lila.db.api._
+import lila.db.Implicits._
+import tube.bookmarkTube
 
 case class Bookmark(game: lila.game.Game, user: lila.user.User)
 

modules/bookmark/src/main/Env.scala

@@ -1,7 +1,7 @@
 package lila.bookmark
 
-import com.typesafe.config.Config
 import akka.actor._
+import com.typesafe.config.Config
 
 import lila.common.PimpedConfig._
 import lila.hub.actorApi.bookmark._

modules/bookmark/src/main/PaginatorBuilder.scala

@@ -1,17 +1,17 @@
 package lila.bookmark
 
-import lila.game.{ Game, GameRepo }
-import lila.user.User
-import lila.common.paginator._
-import lila.common.PimpedJson._
-import lila.db.paginator._
-import lila.db.Implicits._
-import lila.db.api._
-import tube.bookmarkTube
-
+import org.joda.time.DateTime
 import play.api.libs.json._
 import play.modules.reactivemongo.json.ImplicitBSONHandlers._
-import org.joda.time.DateTime
+
+import lila.common.paginator._
+import lila.common.PimpedJson._
+import lila.db.api._
+import lila.db.Implicits._
+import lila.db.paginator._
+import lila.game.{ Game, GameRepo }
+import lila.user.User
+import tube.bookmarkTube
 
 private[bookmark] final class PaginatorBuilder(maxPerPage: Int) {
 

modules/bookmark/src/test/RepoTest.scala

@@ -1,17 +1,15 @@
 package lila.bookmark
 
-import lila.db.Implicits._
-import lila.db.api._
-import lila.db.test.WithDb
-import tube.bookmarkTube
-
-import org.specs2.mutable.Specification
-
-import play.api.test._
-import play.api.libs.json._
-
 import org.joda.time.DateTime
 import org.scala_tools.time.Imports._
+import org.specs2.mutable.Specification
+import play.api.libs.json._
+import play.api.test._
+
+import lila.db.api._
+import lila.db.Implicits._
+import lila.db.test.WithDb
+import tube.bookmarkTube
 
 final class RepoTest extends Specification {
 

modules/chess

@@ -1 +1 @@
-Subproject commit 1b6a57642983ac488162efb2d7dc223530fe3085
+Subproject commit 8e3b1469ba8885d7aab6707221eaa8511ee6f0aa

modules/common/src/main/CsvServer.scala

@@ -1,9 +1,10 @@
 package lila.common
 
+import scala.concurrent.Future
+
 import com.github.tototoshi.csv.CSVWriter
 import play.api.Play
 import play.api.Play.current
-import scala.concurrent.Future
 
 object CsvServer {
 

modules/common/src/main/LilaCookie.scala

@@ -1,9 +1,9 @@
 package lila.common
 
-import play.api.mvc.{ Cookie, Session, RequestHeader }
 import java.util.regex.Matcher.quoteReplacement
 
 import ornicar.scalalib.Random
+import play.api.mvc.{ Cookie, Session, RequestHeader }
 
 object LilaCookie {
 

modules/common/src/main/PackageObject.scala

@@ -1,10 +1,10 @@
 package lila
 
-import ornicar.scalalib
-
-import scalaz.{ Zero, Zeros, Functor, Monad, OptionT }
 import scala.concurrent.Future
 
+import ornicar.scalalib
+import scalaz.{ Zero, Zeros, Functor, Monad, OptionT }
+
 trait PackageObject
     extends WithFuture
     with scalalib.Validation

modules/common/src/main/PimpedConfig.scala

@@ -1,8 +1,9 @@
 package lila.common
+// import scalaz.{ Success, Failure }
+import scala.concurrent.duration._
 
 import com.typesafe.config.Config
-import scala.concurrent.duration._
-// import scalaz.{ Success, Failure }
+
 
 object PimpedConfig {
 

modules/common/src/main/PlayApp.scala

@@ -1,7 +1,7 @@
 package lila.common
 
-import play.api.{ Play, Application, Mode }
 import com.typesafe.config.Config
+import play.api.{ Play, Application, Mode }
 
 object PlayApp {
 

modules/common/src/main/Scheduler.scala

@@ -1,8 +1,9 @@
 package lila.common
 
+import scala.concurrent.duration._
+
 import akka.actor._
 import akka.pattern.{ ask, pipe }
-import scala.concurrent.duration._
 
 final class Scheduler(system: ActorSystem, enabled: Boolean) {
 

modules/db/src/main/Env.scala

@@ -1,10 +1,9 @@
 package lila.db
 
-import Types._
-
 import com.typesafe.config.Config
-import reactivemongo.api.DB
 import play.modules.reactivemongo.ReactiveMongoPlugin
+import reactivemongo.api.DB
+import Types._
 
 final class Env(config: Config) {
 

modules/db/src/main/PaginatorAdapter.scala

@@ -1,13 +1,13 @@
 package lila.db
 package paginator
 
-import Implicits._
 import api._
-
-import lila.common.paginator.AdapterLike
+import Implicits._
 import play.api.libs.json._
 import reactivemongo.api.SortOrder
 
+import lila.common.paginator.AdapterLike
+
 final class Adapter[A: TubeInColl](
     selector: JsObject,
     sort: Sort) extends AdapterLike[A] {

modules/db/src/main/Tube.scala

@@ -1,13 +1,13 @@
 package lila.db
 
-import Types.Coll
-import lila.common.LilaException
-
-import play.api.libs.json._
 import play.api.libs.functional.syntax._
-import Reads.constraints._
-import reactivemongo.bson._
+import play.api.libs.json._
 import play.modules.reactivemongo.json.ImplicitBSONHandlers._
+import reactivemongo.bson._
+import Reads.constraints._
+import Types.Coll
+
+import lila.common.LilaException
 
 trait InColl[A] { implicit def coll: Types.Coll }
 

modules/db/src/main/Typecheck.scala

@@ -1,7 +1,6 @@
 package lila.db
 
 import api._
-
 import play.api.libs.iteratee._
 
 object Typecheck {

modules/db/src/main/api/count.scala

@@ -1,11 +1,10 @@
 package lila.db
 package api
 
-import Types._
-
 import play.api.libs.json._
-import reactivemongo.core.commands.Count
 import play.modules.reactivemongo.json.ImplicitBSONHandlers.JsObjectWriter
+import reactivemongo.core.commands.Count
+import Types._
 
 object $count {
 

modules/db/src/main/api/cursor.scala

@@ -2,9 +2,7 @@ package lila.db
 package api
 
 import Implicits._
-
 import play.api.libs.json._
-
 import reactivemongo.api._
 import reactivemongo.bson._
 

modules/db/src/main/api/enumerate.scala

@@ -2,12 +2,11 @@ package lila.db
 package api
 
 import Implicits._
-
-import reactivemongo.bson._
-import reactivemongo.api.Cursor
-import play.modules.reactivemongo.json.ImplicitBSONHandlers._
-import play.api.libs.json._
 import play.api.libs.iteratee._
+import play.api.libs.json._
+import play.modules.reactivemongo.json.ImplicitBSONHandlers._
+import reactivemongo.api.Cursor
+import reactivemongo.bson._
 
 object $enumerate {
 

modules/db/src/main/api/find.scala

@@ -2,10 +2,9 @@ package lila.db
 package api
 
 import Implicits._
-
-import reactivemongo.bson._
-import play.modules.reactivemongo.json.ImplicitBSONHandlers._
 import play.api.libs.json._
+import play.modules.reactivemongo.json.ImplicitBSONHandlers._
+import reactivemongo.bson._
 import scalaz.{ OptionT, OptionTs }
 
 object $find extends OptionTs {

modules/db/src/main/api/insert.scala

@@ -1,11 +1,10 @@
 package lila.db
 package api
 
-import Types.Coll
-
-import reactivemongo.bson._
-import play.modules.reactivemongo.json.ImplicitBSONHandlers._
 import play.api.libs.json._
+import play.modules.reactivemongo.json.ImplicitBSONHandlers._
+import reactivemongo.bson._
+import Types.Coll
 
 object $insert {
 

modules/db/src/main/api/operator.scala

@@ -1,19 +1,16 @@
 package lila.db
 package api
 
-import play.api.libs.json._
-import Json.JsValueWrapper
-
-import reactivemongo.bson._
-import play.modules.reactivemongo.json.BSONFormats
-
 import org.joda.time.DateTime
+import play.api.libs.json._
+import play.modules.reactivemongo.json.BSONFormats
+import reactivemongo.bson._
 
 object $operator extends $operator
 trait $operator {
 
   def $set[A: Writes](pairs: (String, A)*) = Json.obj("$set" -> Json.obj(wrap(pairs): _*))
-  def $set(pairs: (String, JsValueWrapper)*) = Json.obj("$set" -> Json.obj(pairs: _*))
+  def $set(pairs: (String, Json.JsValueWrapper)*) = Json.obj("$set" -> Json.obj(pairs: _*))
   def $set(pairs: JsObject) = Json.obj("$set" -> pairs)
   def $unset(fields: String*) = Json.obj("$unset" -> Json.obj(wrap(fields map (_ -> true)): _*))
   def $inc[A: Writes](pairs: (String, A)*) = Json.obj("$inc" -> Json.obj(wrap(pairs): _*))
@@ -37,7 +34,7 @@ trait $operator {
 
   def $date(value: DateTime) = BSONFormats toJSON BSONDateTime(value.getMillis)
 
-  private def wrap[K, V: Writes](pairs: Seq[(K, V)]): Seq[(K, JsValueWrapper)] = pairs map {
+  private def wrap[K, V: Writes](pairs: Seq[(K, V)]): Seq[(K, Json.JsValueWrapper)] = pairs map {
     case (k, v) ⇒ k -> Json.toJsFieldJsValueWrapper(v)
   }
 }

modules/db/src/main/api/primitive.scala

@@ -2,10 +2,9 @@ package lila.db
 package api
 
 import Implicits._
-
-import reactivemongo.bson._
-import play.modules.reactivemongo.json.ImplicitBSONHandlers._
 import play.api.libs.json._
+import play.modules.reactivemongo.json.ImplicitBSONHandlers._
+import reactivemongo.bson._
 
 object $primitive {
 

modules/db/src/main/api/projection.scala

@@ -2,10 +2,9 @@ package lila.db
 package api
 
 import Implicits._
-
-import reactivemongo.bson._
-import play.modules.reactivemongo.json.ImplicitBSONHandlers._
 import play.api.libs.json._
+import play.modules.reactivemongo.json.ImplicitBSONHandlers._
+import reactivemongo.bson._
 
 object $projection {
 

modules/db/src/main/api/query.scala

@@ -1,11 +1,10 @@
 package lila.db
 package api
 
-import Types._
-
-import reactivemongo.bson._
-import play.modules.reactivemongo.json.ImplicitBSONHandlers._
 import play.api.libs.json._
+import play.modules.reactivemongo.json.ImplicitBSONHandlers._
+import reactivemongo.bson._
+import Types._
 
 object $query {
 

modules/db/src/main/api/remove.scala

@@ -1,10 +1,9 @@
 package lila.db
 package api
 
-import Types._
-
 import play.api.libs.json._
 import play.modules.reactivemongo.json.ImplicitBSONHandlers._
+import Types._
 
 object $remove {
 

modules/db/src/main/api/save.scala

@@ -1,10 +1,9 @@
 package lila.db
 package api
 
-import Types._
-
 import play.api.libs.json._
 import play.modules.reactivemongo.json.ImplicitBSONHandlers._
+import Types._
 
 object $save {
 

modules/db/src/main/api/select.scala

@@ -2,18 +2,13 @@ package lila.db
 package api
 
 import Implicits._
-
+import org.joda.time.DateTime
 import play.api.libs.json._
-import Json.JsValueWrapper
-
 import play.modules.reactivemongo.json.ImplicitBSONHandlers._
-
 import reactivemongo.api._
 import reactivemongo.bson._
 import reactivemongo.core.commands._
 
-import org.joda.time.DateTime
-
 object $select { 
 
   def all = Json.obj()

modules/db/src/main/api/sort.scala

@@ -1,14 +1,11 @@
 package lila.db
 package api
 
+import org.joda.time.DateTime
 import play.api.libs.json._
-import Json.JsValueWrapper
-
 import reactivemongo.api.SortOrder
 import reactivemongo.bson._
 
-import org.joda.time.DateTime
-
 object $sort {
 
   def asc: SortOrder = SortOrder.Ascending

modules/db/src/main/api/update.scala

@@ -1,10 +1,9 @@
 package lila.db
 package api
 
-import Types._
-
 import play.api.libs.json._
 import play.modules.reactivemongo.json.ImplicitBSONHandlers._
+import Types._
 
 object $update {
 

modules/db/src/main/test/WithTestColl.scala

@@ -1,13 +1,12 @@
 package lila.db
 package test
 
-import Types._
-
-import reactivemongo.api._
 import scala.concurrent._
 import scala.concurrent.duration._
 
 import org.specs2.execute.{ Result, AsResult }
+import reactivemongo.api._
+import Types._
 
 trait WithColl {
 

modules/db/src/main/typesAndImplicits.scala

@@ -1,9 +1,9 @@
 package lila.db
 
 import play.api.libs.json._, Json.JsValueWrapper
+import reactivemongo.api._
 import reactivemongo.api.collections.GenericQueryBuilder
 import reactivemongo.bson._
-import reactivemongo.api._
 
 object Types extends Types
 object Implicits extends Implicits

modules/db/src/test/DateTest.scala

@@ -1,17 +1,15 @@
 package lila.db
 
-import Implicits._
 import api._
-
-import org.specs2.specification._
-import org.specs2.mutable._
+import Implicits._
+import org.joda.time.DateTime
 import org.specs2.execute.{ Result, AsResult }
-
+import org.specs2.mutable._
+import org.specs2.specification._
 import play.api.libs.json._
 import play.api.test._
 import reactivemongo.api._
 import reactivemongo.bson._
-import org.joda.time.DateTime
 
 class DateTest extends Specification with test.WithColl {
 

modules/db/src/test/DbApiTest.scala

@@ -1,13 +1,10 @@
 package lila.db
 
-import Types._
-
+import org.joda.time.DateTime
 import org.specs2.mutable._
-
 import play.api.libs.json._
 import play.api.test._
-
-import org.joda.time.DateTime
+import Types._
 
 class DbApiTest extends Specification {
 

modules/forum/src/main/CategApi.scala

@@ -1,14 +1,14 @@
 package lila.forum
 
-import lila.user.{ User, Context }
-import lila.common.paginator._
-import lila.db.paginator._
-import lila.db.Implicits._
-import lila.db.api._
-import tube._
-
 import scalaz.{ OptionT, OptionTs }
 
+import lila.common.paginator._
+import lila.db.api._
+import lila.db.Implicits._
+import lila.db.paginator._
+import lila.user.{ User, Context }
+import tube._
+
 private[forum] final class CategApi(env: Env) extends OptionTs {
 
   def list(teams: List[String], troll: Boolean): Fu[List[CategView]] = for {

modules/forum/src/main/CategRepo.scala

@@ -1,11 +1,11 @@
 package lila.forum
 
-import lila.db.Implicits._
-import lila.db.api._
-import tube.categTube
-
 import play.api.libs.json.Json
 
+import lila.db.api._
+import lila.db.Implicits._
+import tube.categTube
+
 object CategRepo {
 
   def bySlug(slug: String) = $find byId slug

modules/forum/src/main/PostRepo.scala

@@ -1,11 +1,11 @@
 package lila.forum
 
-import lila.db.Implicits._
-import lila.db.api._
-import tube.postTube
-
 import play.api.libs.json.Json
 
+import lila.db.api._
+import lila.db.Implicits._
+import tube.postTube
+
 object PostRepo extends PostRepo(false) {
 
   def apply(troll: Boolean): PostRepo = troll.fold(PostRepoTroll, PostRepo)

modules/forum/src/main/Recent.scala

@@ -1,11 +1,12 @@
 package lila.forum
 
-import lila.user.User
-import lila.security.{ Permission, Granter ⇒ MasterGranter }
-
 import scala.concurrent.duration.Duration
+
 import spray.caching.{ LruCache, Cache }
 
+import lila.security.{ Permission, Granter ⇒ MasterGranter }
+import lila.user.User
+
 private[forum] final class Recent(postApi: PostApi, ttl: Duration) {
 
   private type GetTeams = String ⇒ Fu[List[String]]

modules/forum/src/main/TopicRepo.scala

@@ -1,11 +1,11 @@
 package lila.forum
 
-import lila.db.Implicits._
-import lila.db.api._
-import tube.topicTube
-
 import play.api.libs.json.Json
 
+import lila.db.api._
+import lila.db.Implicits._
+import tube.topicTube
+
 object TopicRepo extends TopicRepo(false) {
 
   def apply(troll: Boolean): TopicRepo = troll.fold(TopicRepoTroll, TopicRepo)

modules/forum/src/main/package.scala

@@ -1,8 +1,9 @@
 package lila
 
+import play.api.libs.json._
+
 import lila.db.Tube
 import Tube.Helpers._
-import play.api.libs.json._
 
 package object forum extends PackageObject with WithPlay {
 

modules/forumSearch/src/main/Env.scala

@@ -1,13 +1,13 @@
 package lila.forumSearch
 
-import lila.search.TypeIndexer
-import lila.forum.{ PostApi, Post ⇒ PostModel, PostView }
-
-import com.typesafe.config.Config
 import akka.actor._
+import com.typesafe.config.Config
+import org.elasticsearch.action.search.SearchResponse
 import play.api.libs.json.JsObject
 import scalastic.elasticsearch.{ Indexer ⇒ EsIndexer }
-import org.elasticsearch.action.search.SearchResponse
+
+import lila.forum.{ PostApi, Post ⇒ PostModel, PostView }
+import lila.search.TypeIndexer
 
 final class Env(
     config: Config,

modules/forumSearch/src/main/Indexer.scala

@@ -1,12 +1,12 @@
 package lila.forumSearch
 
-import lila.forum.PostApi
-import lila.forum.actorApi._
-import lila.search.{ actorApi ⇒ S }
-
 import akka.actor._
 import org.elasticsearch.index.query._, FilterBuilders._, QueryBuilders._
 
+import lila.forum.actorApi._
+import lila.forum.PostApi
+import lila.search.{ actorApi ⇒ S }
+
 private[forumSearch] final class Indexer(
     lowLevel: ActorRef,
     postApi: PostApi) extends Actor {

modules/forumSearch/src/main/Post.scala

@@ -1,8 +1,9 @@
 package lila.forumSearch
 
+import play.api.libs.json._
+
 import lila.forum.PostLiteView
 import lila.search.ElasticSearch
-import play.api.libs.json._
 
 private[forumSearch] object Post {
 

modules/forumSearch/src/main/Query.scala

@@ -1,9 +1,9 @@
 package lila.forumSearch
 
-import lila.search.ElasticSearch
+import org.elasticsearch.index.query._, QueryBuilders._, FilterBuilders._
 import Post.fields
 
-import org.elasticsearch.index.query._, QueryBuilders._, FilterBuilders._
+import lila.search.ElasticSearch
 
 private[forumSearch] final class Query private (
     terms: List[String],

modules/game/src/main/Cached.scala

@@ -1,12 +1,13 @@
 package lila.game
 
-import lila.db.api.$count
-import tube.gameTube
-import lila.memo.AsyncCache
-
 import scala.concurrent.duration._
+
 import play.api.libs.json.JsObject
 
+import lila.db.api.$count
+import lila.memo.AsyncCache
+import tube.gameTube
+
 private[game] final class Cached(ttl: Duration) {
 
   def nbGames: Fu[Int] = count(Query.all)

modules/game/src/main/Captcher.scala

@@ -1,20 +1,21 @@
 package lila.game
 
-import lila.common.Captcha, Captcha._
-import lila.db.api.$find
-import tube.gameTube
-import chess.{ Game ⇒ ChessGame, Color }
-import chess.format.{ Forsyth, pgn }
-import lila.hub.actorApi.captcha._
-
-import scalaz.{ NonEmptyList, NonEmptyLists, OptionT, OptionTs }
-import spray.caching.{ LruCache, Cache }
-import scala.concurrent.Future
 import scala.concurrent.duration._
-import play.api.libs.concurrent.Akka.system
-import play.api.Play.current
+import scala.concurrent.Future
+
 import akka.actor._
 import akka.pattern.{ ask, pipe }
+import play.api.libs.concurrent.Akka.system
+import play.api.Play.current
+import scalaz.{ NonEmptyList, NonEmptyLists, OptionT, OptionTs }
+import spray.caching.{ LruCache, Cache }
+
+import chess.format.{ Forsyth, pgn }
+import chess.{ Game ⇒ ChessGame, Color }
+import lila.common.Captcha, Captcha._
+import lila.db.api.$find
+import lila.hub.actorApi.captcha._
+import tube.gameTube
 
 // only works with standard chess (not chess960)
 private final class Captcher extends Actor {

modules/game/src/main/Cli.scala

@@ -1,10 +1,10 @@
 package lila.game
 
-import tube.gameTube
-import lila.db.api._
-
 import scala.concurrent.duration._
 
+import lila.db.api._
+import tube.gameTube
+
 private[game] final class Cli extends lila.common.Cli {
 
   def process = {

modules/game/src/main/Env.scala

@@ -1,9 +1,10 @@
 package lila.game
 
-import com.typesafe.config.Config
-import lila.common.PimpedConfig._
 import akka.actor._
 import akka.pattern.pipe
+import com.typesafe.config.Config
+
+import lila.common.PimpedConfig._
 
 final class Env(
     config: Config,

modules/game/src/main/Event.scala

@@ -1,10 +1,10 @@
 package lila.game
 
+import org.apache.commons.lang3.StringEscapeUtils.escapeXml
 import play.api.libs.json._
 
+import chess.Pos.{ piotr, allPiotrs }
 import chess.{ PromotableRole, Pos, Color, Situation, Move ⇒ ChessMove, Clock ⇒ ChessClock }
-import Pos.{ piotr, allPiotrs }
-import org.apache.commons.lang3.StringEscapeUtils.escapeXml
 
 sealed trait Event {
   def typ: String

modules/game/src/main/Export.scala

@@ -1,14 +1,14 @@
 package lila.game
 
-import lila.user.User
-import lila.common.CsvServer
-import lila.hub.actorApi.{ router ⇒ R }
-import makeTimeout.short
-
 import akka.pattern.ask
 import org.joda.time.DateTime
 import org.joda.time.format.{ DateTimeFormat, ISODateTimeFormat, DateTimeFormatter }
 
+import lila.common.CsvServer
+import lila.hub.actorApi.{ router ⇒ R }
+import lila.user.User
+import makeTimeout.short
+
 private[game] final class Export(router: lila.hub.ActorLazyRef) {
 
   private val dateFormatter = ISODateTimeFormat.dateTime

modules/game/src/main/Featured.scala

@@ -1,18 +1,18 @@
 package lila.game
 
-import lila.db.api._
-import tube.gameTube
-import Featured._
-import makeTimeout.large
-
-import scala.concurrent.{ Future, Await }
 import scala.concurrent.duration._
+import scala.concurrent.{ Future, Await }
+
 import akka.actor._
 import akka.pattern.ask
+import Featured._
 import play.api.Play.current
 import play.api.templates.Html
 
 import chess.Color
+import lila.db.api._
+import makeTimeout.large
+import tube.gameTube
 
 final class Featured(
     lobbySocket: lila.hub.ActorLazyRef,

modules/game/src/main/Game.scala

@@ -1,14 +1,13 @@
 package lila.game
 
-// import round.{ Event, Progress }
-import lila.user.User
-import chess.{ History ⇒ ChessHistory, Role, Board, Move, Pos, Game ⇒ ChessGame, Clock, Status, Color, Piece, Variant, Mode }
-import Color._
-import chess.Pos.piotr, chess.Role.forsyth, chess.format.Forsyth
-
 import org.joda.time.DateTime
 import org.scala_tools.time.Imports._
 
+import chess.Color._
+import chess.Pos.piotr, chess.Role.forsyth, chess.format.Forsyth
+import chess.{ History ⇒ ChessHistory, Role, Board, Move, Pos, Game ⇒ ChessGame, Clock, Status, Color, Piece, Variant, Mode }
+import lila.user.User
+
 case class Game(
     id: String,
     token: String,
@@ -231,7 +230,7 @@ case class Game(
   def playerCanProposeTakeback(color: Color) =
     started && playable && nonTournament &&
       bothPlayersHaveMoved &&
-      !player(color).isProposingTakeback && 
+      !player(color).isProposingTakeback &&
       !opponent(color).isProposingTakeback
 
   def moretimeable = playable && nonTournament && hasClock

modules/game/src/main/GameDiff.scala

@@ -1,15 +1,14 @@
 package lila.game
 
-import lila.db.api._
-
-import play.api.libs.json._
-import Json.JsValueWrapper
 import org.joda.time.DateTime
+import play.api.libs.json._
+
+import lila.db.api._
 
 // NICETOHAVE it works, but it could be more functional
 private[game] object GameDiff {
 
-  type Set = (String, JsValueWrapper)
+  type Set = (String, Json.JsValueWrapper)
   type Unset = String
 
   def apply(a: RawGame, b: RawGame): (List[Set], List[Unset]) = {

modules/game/src/main/GameRepo.scala

@@ -1,21 +1,20 @@
 package lila.game
 
-import chess.{ Color, Variant, Status }
-import chess.format.Forsyth
-
-import lila.user.User
-import lila.db.api._
-import lila.db.Implicits._
-import tube.gameTube
-import lila.common.PimpedJson._
-
-import play.api.libs.json._
-import play.modules.reactivemongo.json.ImplicitBSONHandlers.JsObjectWriter
-import play.modules.reactivemongo.json.BSONFormats.toJSON
+import scala.util.Random
 
 import org.joda.time.DateTime
 import org.scala_tools.time.Imports._
-import scala.util.Random
+import play.api.libs.json._
+import play.modules.reactivemongo.json.BSONFormats.toJSON
+import play.modules.reactivemongo.json.ImplicitBSONHandlers.JsObjectWriter
+
+import chess.format.Forsyth
+import chess.{ Color, Variant, Status }
+import lila.common.PimpedJson._
+import lila.db.api._
+import lila.db.Implicits._
+import lila.user.User
+import tube.gameTube
 
 object GameRepo {
 

modules/game/src/main/PaginatorBuilder.scala

@@ -1,14 +1,13 @@
 package lila.game
 
-import chess.Status
+import play.api.libs.json._
 
+import chess.Status
 import lila.common.paginator._
 import lila.db.paginator._
 import lila.db.Types.Sort
 import tube.gameTube
 
-import play.api.libs.json._
-
 private[game] final class PaginatorBuilder(cached: Cached, maxPerPage: Int) {
 
   def recent(page: Int): Fu[Paginator[Game]] =

modules/game/src/main/PgnDump.scala

@@ -1,12 +1,12 @@
 package lila.game
 
-import chess.format.Forsyth
-import chess.format.{ pgn ⇒ chessPgn }
-import chess.format.pgn.{ Pgn, Tag }
-import lila.user.User
-
 import org.joda.time.format.DateTimeFormat
 
+import chess.format.Forsyth
+import chess.format.pgn.{ Pgn, Tag }
+import chess.format.{ pgn ⇒ chessPgn }
+import lila.user.User
+
 final class PgnDump(
     findUser: String ⇒ Fu[Option[User]]) {
 

modules/game/src/main/PgnRepo.scala

@@ -1,11 +1,11 @@
 package lila.game
 
-import lila.db.api._
-import lila.common.PimpedJson._
-import tube.pgnTube
-
 import play.api.libs.json._
 
+import lila.common.PimpedJson._
+import lila.db.api._
+import tube.pgnTube
+
 object PgnRepo {
 
   type ID = String

modules/game/src/main/Query.scala

@@ -1,12 +1,12 @@
 package lila.game
 
-import lila.db.api._
-import lila.user.User
-import chess.{ Color, Status }
-
-import play.api.libs.json._
 import org.joda.time.DateTime
 import org.scala_tools.time.Imports._
+import play.api.libs.json._
+
+import chess.{ Color, Status }
+import lila.db.api._
+import lila.user.User
 
 object Query {
 

modules/game/src/main/RawClock.scala

@@ -1,8 +1,9 @@
 package lila.game
 
-import chess.{ Game ⇒ _, _ }
 import scala.math.round
 
+import chess.{ Game ⇒ _, _ }
+
 private[game] case class RawClock(
     c: Boolean,
     i: Int,

modules/game/src/main/Titivate.scala

@@ -1,15 +1,15 @@
 package lila.game
 
-import tube.gameTube
-import lila.db.api._
-import lila.common.PimpedJson._
-import lila.hub.actorApi.bookmark.Remove
-
 import org.joda.time.DateTime
 import org.scala_tools.time.Imports._
 import play.api.libs.json._
 import play.modules.reactivemongo.json.ImplicitBSONHandlers._
 
+import lila.common.PimpedJson._
+import lila.db.api._
+import lila.hub.actorApi.bookmark.Remove
+import tube.gameTube
+
 private[game] final class Titivate(bookmark: lila.hub.ActorLazyRef) {
 
   def cleanupUnplayed: Funit = GameRepo.unplayedIds flatMap { ids ⇒

modules/gameSearch/src/main/DataForm.scala

@@ -1,14 +1,13 @@
 package lila.gameSearch
 
-import lila.search.Range
-import lila.common.Form._
-
-import play.api.data._
-import play.api.data.Forms._
 import org.joda.time.DateTime
 import org.scala_tools.time.Imports._
+import play.api.data._
+import play.api.data.Forms._
 
 import chess.{ Mode }
+import lila.common.Form._
+import lila.search.Range
 
 private[gameSearch] final class DataForm {
 

modules/gameSearch/src/main/Env.scala

@@ -1,15 +1,15 @@
 package lila.gameSearch
 
-import lila.search.TypeIndexer
-import lila.game.{ GameRepo, PgnRepo, Game ⇒ GameModel, Query ⇒ DbQuery }
-import lila.db.api.$find
-import lila.game.tube.gameTube
-
-import com.typesafe.config.Config
 import akka.actor._
+import com.typesafe.config.Config
+import org.elasticsearch.action.search.SearchResponse
 import play.api.libs.json.JsObject
 import scalastic.elasticsearch.{ Indexer ⇒ EsIndexer }
-import org.elasticsearch.action.search.SearchResponse
+
+import lila.db.api.$find
+import lila.game.tube.gameTube
+import lila.game.{ GameRepo, PgnRepo, Game ⇒ GameModel, Query ⇒ DbQuery }
+import lila.search.TypeIndexer
 
 final class Env(
     config: Config,

modules/gameSearch/src/main/Game.scala

@@ -1,12 +1,12 @@
 package lila.gameSearch
 
-import lila.search.ElasticSearch
-import ElasticSearch._
-import lila.game.{ Game ⇒ GameModel }
-import chess.{ OpeningExplorer, Status }
-
 import play.api.libs.json._
 
+import chess.{ OpeningExplorer, Status }
+import lila.game.{ Game ⇒ GameModel }
+import lila.search.ElasticSearch
+import lila.search.ElasticSearch._
+
 private[gameSearch] object Game {
 
   object fields {

modules/gameSearch/src/main/Indexer.scala

@@ -1,11 +1,11 @@
 package lila.gameSearch
 
-import lila.game.PgnRepo
-import lila.game.actorApi._
-import lila.search.{ actorApi ⇒ S }
-
 import akka.actor._
 
+import lila.game.actorApi._
+import lila.game.PgnRepo
+import lila.search.{ actorApi ⇒ S }
+
 private[gameSearch] final class Indexer(
     lowLevel: ActorRef,
     isAnalyzed: String ⇒ Fu[Boolean]) extends Actor {

modules/gameSearch/src/main/Query.scala

@@ -1,14 +1,14 @@
 package lila.gameSearch
 
-import lila.search.{ ElasticSearch, Range }
-import lila.common.EloRange
 import Game.fields
-import chess.{ Variant, Mode, Status, EcoDb }
-
 import org.elasticsearch.index.query._, FilterBuilders._, QueryBuilders._
 import org.joda.time.DateTime
 import org.scala_tools.time.Imports._
 
+import chess.{ Variant, Mode, Status, EcoDb }
+import lila.common.EloRange
+import lila.search.{ ElasticSearch, Range }
+
 case class Query(
     user1: Option[String] = None,
     user2: Option[String] = None,

modules/hub/src/main/ActorMap.scala

@@ -1,10 +1,11 @@
 package lila.hub
 
-import actorApi.Tell
+import scala.concurrent.duration._
 
 import akka.actor._
 import akka.pattern.ask
-import scala.concurrent.duration._
+
+import actorApi.Tell
 import makeTimeout.short
 
 final class ActorMap[A <: Actor](mkActor: String ⇒ A) extends Actor {

modules/hub/src/main/Broadcast.scala

@@ -1,14 +1,15 @@
 package lila.hub
 
-import actorApi._
-
 import scala.concurrent.duration._
+
 import akka.actor._
-import akka.routing._
 import akka.dispatch.Dispatchers
 import akka.pattern.{ ask, pipe }
+import akka.routing._
 import akka.util.Timeout
 
+import actorApi._
+
 final class Broadcast(lazyRefs: List[ActorLazyRef])(implicit timeout: Timeout) extends Actor {
 
   def receive = {

modules/hub/src/main/CaptchedForm.scala

@@ -1,11 +1,11 @@
 package lila.hub
 
-import lila.common.Captcha
-import actorApi.captcha._
-
 import akka.pattern.ask
 import play.api.data._
 
+import actorApi.captcha._
+import lila.common.Captcha
+
 trait CaptchedForm {
 
   import makeTimeout.large

modules/hub/src/main/Env.scala

@@ -1,7 +1,8 @@
 package lila.hub
 
-import com.typesafe.config.Config
 import akka.actor._
+import com.typesafe.config.Config
+
 import lila.common.PimpedConfig._
 
 final class Env(config: Config, system: ActorSystem) {

modules/i18n/src/main/DataForm.scala

@@ -1,13 +1,13 @@
 package lila.i18n
 
+import org.joda.time.DateTime
+import play.api.data._
+import play.api.data.Forms._
+import play.api.mvc.Request
+
 import lila.db.api.$insert
 import tube.translationTube
 
-import play.api.mvc.Request
-import play.api.data._
-import play.api.data.Forms._
-import org.joda.time.DateTime
-
 final class DataForm(
     keys: I18nKeys, 
     val captcher: lila.hub.ActorLazyRef) extends lila.hub.CaptchedForm {

modules/i18n/src/main/Env.scala

@@ -1,13 +1,13 @@
 package lila.i18n
 
-import lila.common.PlayApp
-
 import com.typesafe.config.Config
-import play.api.i18n.{ MessagesApi, MessagesPlugin }
 import play.api.i18n.Lang
+import play.api.i18n.{ MessagesApi, MessagesPlugin }
 import play.api.libs.json._
 import play.api.Play.current
 
+import lila.common.PlayApp
+
 final class Env(
     config: Config,
     db: lila.db.Env,

modules/i18n/src/main/FileFix.scala

@@ -1,8 +1,9 @@
 package lila.i18n
 
-import play.api.i18n.{ MessagesApi, Lang }
-import scala.concurrent.Future
 import java.io._
+import scala.concurrent.Future
+
+import play.api.i18n.{ MessagesApi, Lang }
 
 private[i18n] final class FileFix(
     pool: I18nPool,

modules/i18n/src/main/GitWrite.scala

@@ -1,12 +1,14 @@
 package lila.i18n
 
 import java.io.File
-import org.eclipse.jgit.lib.Repository
-import org.eclipse.jgit.storage.file.FileRepository
 import scala.collection.JavaConversions._
 import scala.concurrent.Future
+
 import akka.actor._
 import akka.pattern.ask
+import org.eclipse.jgit.lib.Repository
+import org.eclipse.jgit.storage.file.FileRepository
+
 import makeTimeout.veryLarge
 
 private[i18n] final class GitWrite(

modules/i18n/src/main/I18nKey.scala

@@ -1,8 +1,9 @@
 package lila.i18n
 
-import lila.user.Context
-import play.api.templates.Html
 import play.api.i18n.Lang
+import play.api.templates.Html
+
+import lila.user.Context
 
 trait I18nKey {
 

modules/i18n/src/main/I18nKeys.scala

@@ -1,10 +1,10 @@
 // Generated with bin/trans-dump
 package lila.i18n
 
-import lila.user.Context
-
-import play.api.templates.Html
 import play.api.i18n.Lang
+import play.api.templates.Html
+
+import lila.user.Context
 
 final class I18nKeys(translator: Translator) {
 

modules/i18n/src/main/I18nPool.scala

@@ -1,7 +1,7 @@
 package lila.i18n
 
-import play.api.mvc.{ Action, RequestHeader, Handler }
 import play.api.i18n.Lang
+import play.api.mvc.{ Action, RequestHeader, Handler }
 
 private[i18n] case class I18nPool(val langs: Set[Lang], val default: Lang) {
 

modules/i18n/src/main/I18nRequestHandler.scala

@@ -1,8 +1,8 @@
 package lila.i18n
 
-import play.api.mvc.{ Action, RequestHeader, Handler }
-import play.api.mvc.Results.Redirect
 import play.api.i18n.Lang
+import play.api.mvc.Results.Redirect
+import play.api.mvc.{ Action, RequestHeader, Handler }
 
 final class I18nRequestHandler(pool: I18nPool, protocol: String) {
 

modules/i18n/src/main/JsDump.scala

@@ -1,8 +1,9 @@
 package lila.i18n
 
-import play.api.i18n.Lang
-import scala.concurrent.Future
 import java.io._
+import scala.concurrent.Future
+
+import play.api.i18n.Lang
 
 private[i18n] case class JsDump(
     path: String,

modules/i18n/src/main/TranslationRepo.scala

@@ -1,11 +1,11 @@
 package lila.i18n
 
+import play.api.libs.json.Json
+
 import lila.db.api._
 import lila.db.Implicits._
 import tube.translationTube
 
-import play.api.libs.json.Json
-
 private[i18n] object TranslationRepo {
 
   type ID = Int

modules/i18n/src/main/UpstreamFetch.scala

@@ -1,12 +1,11 @@
 package lila.i18n
 
-import lila.common.PimpedJson._
-import tube.translationTube
-
+import org.joda.time.DateTime
 import play.api.libs.json._
 import play.api.libs.ws.WS
 
-import org.joda.time.DateTime
+import lila.common.PimpedJson._
+import tube.translationTube
 
 private[i18n] final class UpstreamFetch(upstreamUrl: Int ⇒ String) {
 

modules/importer/src/main/DataForm.scala

@@ -1,13 +1,13 @@
 package lila.importer
 
-import lila.game._
-import chess.format.pgn.{ Parser, Reader, ParsedPgn, Tag, TagType }
-import chess.format.Forsyth
-import chess.{ Game => ChessGame, Board, Replay, Color, Mode, Variant, Move, Status }
-
 import play.api.data._
 import play.api.data.Forms._
 
+import chess.format.Forsyth
+import chess.format.pgn.{ Parser, Reader, ParsedPgn, Tag, TagType }
+import chess.{ Game => ChessGame, Board, Replay, Color, Mode, Variant, Move, Status }
+import lila.game._
+
 private[importer] final class DataForm {
 
   lazy val importForm = Form(mapping(

modules/importer/src/main/Env.scala

@@ -1,9 +1,9 @@
 package lila.importer
 
-import lila.common.PimpedConfig._
-
 import com.typesafe.config.Config
 
+import lila.common.PimpedConfig._
+
 final class Env(
     config: Config,
     roundMap: akka.actor.ActorRef,

modules/importer/src/main/Importer.scala

@@ -1,16 +1,17 @@
 package lila.importer
 
-import chess.{ Color, Move, Status }
-import lila.game.{ Game, GameRepo, Pov }
-import lila.round.actorApi.round._
-import lila.hub.actorApi.Tell
-import lila.game.tube.gameTube
-import lila.db.api._
-import makeTimeout.large
+import scala.concurrent.duration.Duration
 
 import akka.actor.ActorRef
 import akka.pattern.ask
-import scala.concurrent.duration.Duration
+
+import chess.{ Color, Move, Status }
+import lila.db.api._
+import lila.game.tube.gameTube
+import lila.game.{ Game, GameRepo, Pov }
+import lila.hub.actorApi.Tell
+import lila.round.actorApi.round._
+import makeTimeout.large
 
 private[importer] final class Importer(
     roundMap: ActorRef,

modules/lobby/src/main/Biter.scala

@@ -1,11 +1,11 @@
 package lila.lobby
 
+import akka.actor.ActorRef
+
 import actorApi.{ RemoveHook, BiteHook, JoinHook }
-import lila.user.{ User, UserRepo }
 import chess.{ Game ⇒ ChessGame, Board, Variant, Mode, Clock, Color ⇒ ChessColor }
 import lila.game.{ GameRepo, Game, Player, Pov, Progress }
-
-import akka.actor.ActorRef
+import lila.user.{ User, UserRepo }
 
 private[lobby] final class Biter(
     timeline: lila.hub.ActorLazyRef,