tweak controllers
This commit is contained in:
parent
0641dbf5cf
commit
9d31dbed67
|
@ -11,11 +11,12 @@ final class Options(env: Env) extends LilaController(env) {
|
|||
val root = all("")
|
||||
|
||||
def all(@nowarn("cat=unused") url: String) = Action { req =>
|
||||
if (isApiOrApp(req))
|
||||
NoContent.withHeaders(
|
||||
"Allow" -> allowMethods,
|
||||
"Access-Control-Max-Age" -> "1728000"
|
||||
)
|
||||
if (isApiOrApp(req)) apiHeaders
|
||||
else NotFound
|
||||
}
|
||||
|
||||
private val apiHeaders = NoContent.withHeaders(
|
||||
"Allow" -> allowMethods,
|
||||
"Access-Control-Max-Age" -> "1728000"
|
||||
)
|
||||
}
|
||||
|
|
|
@ -113,9 +113,8 @@ final class Tournament(
|
|||
tourOption
|
||||
.fold(notFoundJson("No such tournament")) { tour =>
|
||||
get("playerInfo").?? { api.playerInfo(tour, _) } zip
|
||||
getBool("socketVersion").??(env.tournament version tour.id map some) flatMap {
|
||||
getBool("socketVersion").??(env.tournament version tour.id dmap some) flatMap {
|
||||
case (playerInfoExt, socketVersion) =>
|
||||
val partial = getBool("partial")
|
||||
jsonView(
|
||||
tour = tour,
|
||||
page = page,
|
||||
|
@ -124,7 +123,7 @@ final class Tournament(
|
|||
getTeamName = env.team.getTeamName,
|
||||
playerInfoExt = playerInfoExt,
|
||||
socketVersion = socketVersion,
|
||||
partial = partial
|
||||
partial = getBool("partial")
|
||||
)
|
||||
} dmap { Ok(_) }
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue