fix dependency to spray.caching

This commit is contained in:
Thibault Duplessis 2013-03-20 14:24:47 +01:00
parent 5c89ded11e
commit eb69c9c807
3 changed files with 26 additions and 25 deletions

View file

@ -3,9 +3,10 @@ package controllers
import lila.app._
import views._
import lila.security.Permission
import lila.user.{ Context, GameFilterMenu, User UserModel }
import lila.user.{ Context, User UserModel }
import lila.http.LilaCookie
import lila.user.Env.{ current => userEnv }
import lila.security.Env.{ current => securityEnv }
import play.api.mvc._
import play.api.mvc.Results._
@ -21,30 +22,30 @@ object User extends LilaController {
private def securityStore = securityEnv.store
// private def modApi = env.mod.api
def show(username: String) = showFilter(username, "all", 1)
def show(username: String) = TODO //showFilter(username, "all", 1)
def showFilter(username: String, filterName: String, page: Int) = Open { implicit ctx
Async {
Akka.future {
(page < 50).fold(
IOptionIOk(userRepo byId username) { userShow(_, filterName, page) },
BadRequest("too old")
)
}
}
}
// def showFilter(username: String, filterName: String, page: Int) = Open { implicit ctx
// Async {
// Akka.future {
// (page < 50).fold(
// IOptionIOk(userRepo byId username) { userShow(_, filterName, page) },
// BadRequest("too old")
// )
// }
// }
// }
private def userShow(u: UserModel, filterName: String, page: Int)(implicit ctx: Context) =
(u.enabled || isGranted(_.MarkEngine)).fold({
val userSpy = isGranted(_.UserSpy) option securityStore.userSpy _
userEnvInfo(u, bookmarkApi, userSpy, ctx) map { info
val filters = GameFilterMenu(info, ctx.me, filterName)
val paginator = filters.query.fold(bookmarkApi.gamePaginatorByUser(u, page)) { query
gamePaginator.recentlyCreated(query, filters.cachedNb)(page)
}
html.user.show(u, info, paginator, filters)
}
}, io(html.user.disabled(u)))
// private def userShow(u: UserModel, filterName: String, page: Int)(implicit ctx: Context) =
// (u.enabled || isGranted(_.MarkEngine)).fold({
// val userSpy = isGranted(_.UserSpy) option securityStore.userSpy _
// userEnvInfo(u, bookmarkApi, userSpy, ctx) map { info
// val filters = GameFilterMenu(info, ctx.me, filterName)
// val paginator = filters.query.fold(bookmarkApi.gamePaginatorByUser(u, page)) { query
// gamePaginator.recentlyCreated(query, filters.cachedNb)(page)
// }
// html.user.show(u, info, paginator, filters)
// }
// }, io(html.user.disabled(u)))
// def list(page: Int) = Open { implicit ctx
// (page < 50).fold(

View file

@ -11,7 +11,8 @@ object ApplicationBuild extends Build {
settings = buildSettings ++ Seq(
libraryDependencies := Seq(
scalaz, scalalib, hasher, config, apache, scalaTime,
csv, jgit, actuarius, scalastic, findbugs),
csv, jgit, actuarius, scalastic, findbugs,
spray.caching),
templatesImport ++= Seq(
// "lila.app.game.{ DbGame, DbPlayer, Pov }",
"lila.user.{ User, Context }",

View file

@ -1,6 +1,5 @@
package lila.user
import scala.concurrent.{ Future, Await }
import scala.concurrent.duration._
import scala.collection.mutable