From 32d1eca2e4c4694db397d04d7335a363b22f791f Mon Sep 17 00:00:00 2001 From: Thibault Duplessis Date: Mon, 29 Feb 2016 09:45:02 +0700 Subject: [PATCH] closes #1638 --- app/controllers/User.scala | 4 ++-- modules/user/src/main/JsonView.scala | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/controllers/User.scala b/app/controllers/User.scala index 7b5ad2fd1f..ac59c5ae5b 100644 --- a/app/controllers/User.scala +++ b/app/controllers/User.scala @@ -1,6 +1,6 @@ package controllers -import play.api.libs.json.Json +import play.api.libs.json._ import play.api.mvc._, Results._ import lila.api.{ Context, BodyContext } @@ -147,7 +147,7 @@ object User extends LilaController { nbDay = nbDay, nbAllTime = nbAllTime))), api = _ => fuccess { - import lila.user.JsonView.lightPerfWrites + implicit val lpWrites = OWrites[UserModel.LightPerf](env.jsonView.lightPerfIsOnline) Ok(Json.obj( "bullet" -> leaderboards.bullet, "blitz" -> leaderboards.blitz, diff --git a/modules/user/src/main/JsonView.scala b/modules/user/src/main/JsonView.scala index 5f91752e48..e97a85d3cf 100644 --- a/modules/user/src/main/JsonView.scala +++ b/modules/user/src/main/JsonView.scala @@ -3,13 +3,13 @@ package lila.user import lila.common.PimpedJson._ import lila.rating.{ Perf, Glicko, PerfType } import play.api.libs.json._ -import User.PlayTime +import User.{PlayTime,LightPerf} final class JsonView(isOnline: String => Boolean) { import JsonView._ - private implicit val perfWrites: Writes[Perf] = Writes { o => + private implicit val perfWrites: OWrites[Perf] = OWrites { o => Json.obj( "games" -> o.nb, "rating" -> o.glicko.rating.toInt, @@ -36,7 +36,7 @@ final class JsonView(isOnline: String => Boolean) { "playTime" -> u.playTime ).noNull - def lightPerfIsOnline(lp: User.LightPerf) = { + def lightPerfIsOnline(lp: LightPerf) = { val json = lightPerfWrites.writes(lp) if (isOnline(lp.user.id)) json ++ Json.obj("online" -> true) else json @@ -49,7 +49,7 @@ object JsonView { JsString(u.username) } - implicit val lightPerfWrites = OWrites[User.LightPerf] { l => + implicit val lightPerfWrites = OWrites[LightPerf] { l => Json.obj( "id" -> l.user.id, "username" -> l.user.name,