diff --git a/app/controllers/Account.scala b/app/controllers/Account.scala index b4aa07dccd..a720dbe25b 100644 --- a/app/controllers/Account.scala +++ b/app/controllers/Account.scala @@ -35,8 +35,9 @@ object Account extends LilaController { relationEnv.api.countFollowing(me.id) zip Env.pref.api.getPref(me) zip lila.game.GameRepo.urgentGames(me) zip - Env.challenge.api.countInFor.get(me.id) map { - case nbFollowers ~ nbFollowing ~ prefs ~ povs ~ nbChallenges => + Env.challenge.api.countInFor.get(me.id) zip + Env.playban.api.currentBan(me.id) map { + case nbFollowers ~ nbFollowing ~ prefs ~ povs ~ nbChallenges ~ playban => Env.current.system.lilaBus.publish(lila.user.User.Active(me), 'userActive) Ok { import lila.pref.JsonView._ @@ -48,6 +49,7 @@ object Account extends LilaController { "nbChallenges" -> nbChallenges ).add("kid" -> me.kid) .add("troll" -> me.troll) + .add("playban" -> playban) } } ) diff --git a/modules/playban/src/main/model.scala b/modules/playban/src/main/model.scala index 034c47b88e..4d9a57ca22 100644 --- a/modules/playban/src/main/model.scala +++ b/modules/playban/src/main/model.scala @@ -1,5 +1,6 @@ package lila.playban +import play.api.libs.json._ import org.joda.time.DateTime case class UserRecord( @@ -63,6 +64,8 @@ case class TempBan( } object TempBan { + implicit val tempbanWrites = Json.writes[TempBan] + private def make(minutes: Int) = TempBan( DateTime.now, minutes atMost 48 * 60