Merge pull request lichess-org#4313 from veloce/addPlaybanToAccountInfo

Add current ban to account info

Author: ornicar

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)
             }
         }
     )

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