persistent challenges wip

joeyksclark · Jan 31, 2016 · 6ca40a9 · 6ca40a9
1 parent 03c1b00
commit 6ca40a9
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 10 deletions.
diff --git a/app/controllers/Challenge.scala b/app/controllers/Challenge.scala
@@ -20,12 +20,17 @@ object Challenge extends LilaController {
 
  def all = Auth { implicit ctx =>
  me =>
- env.api.findByDestId(me.id) zip
- env.api.findByChallengerId(me.id) map {
- case (out, in) => Ok(env.jsonView.all(in, out)) as JSON
- }
+ renderAll(me)
  }
 
+ private[controllers] def renderAll(me: lila.user.User)(implicit ctx: Context) =
+ env.api.findByDestId(me.id) zip
+ env.api.findByChallengerId(me.id) map {
+ case (out, in) => Ok(env.jsonView.all(in, out)) as JSON
+ }
+ private[controllers] def renderOne(challenge: ChallengeModel)(implicit ctx: Context) =
+ Ok(env.jsonView.one(challenge)) as JSON
+
  private[controllers] def reach(id: String)(implicit ctx: Context): Fu[Result] =
  env.api byId id flatMap {
  case None => notFound

diff --git a/app/controllers/Setup.scala b/app/controllers/Setup.scala
@@ -92,9 +92,11 @@ object Setup extends LilaController with TheftPrevention {
  challenger = ctx.me,
  destUserId = userId)
  (Env.challenge.api insert challenge) >> negotiate(
- html = fuccess(Redirect(routes.Challenge.all)),
- api = apiVersion => ??? // TODO fix me!
- )
+ html = fuccess(Redirect(routes.Round.watcher(challenge.id, "white"))),
+ api = _ => ctx.me match {
+ case None => Challenge.renderOne(challenge).fuccess
+ case Some(me) => Challenge.renderAll(me)
+ })
  }
  )
  }

diff --git a/modules/challenge/src/main/JsonView.scala b/modules/challenge/src/main/JsonView.scala
@@ -12,6 +12,8 @@ final class JsonView(getLightUser: String => Option[lila.common.LightUser]) {
  "in" -> in.map(apply),
  "out" -> out.map(apply))
 
+ def one(challenge: Challenge) = Json.obj("out" -> List(apply(challenge)))
+
  def apply(c: Challenge) = Json.obj(
  "id" -> c.id,
  "challenger" -> c.challenger.right.toOption.map { u =>

diff --git a/ui/challenge/src/ctrl.js b/ui/challenge/src/ctrl.js
@@ -19,7 +19,7 @@ module.exports = function(env) {
  this.vm.reloading = false;
  }.bind(this);
 
- xhr.load();
+ xhr.load().then(this.update);
 
  this.trans = lichess.trans(env.i18n);
 };
diff --git a/ui/challenge/src/view.js b/ui/challenge/src/view.js
@@ -11,7 +11,7 @@ function user(u) {
  },
  children: [
  fullName,
- m('span.progress', [rating, ratingDiff])
+ m('span.progress', rating)
  ]
  };
 }

diff --git a/ui/challenge/src/xhr.js b/ui/challenge/src/xhr.js
@@ -15,6 +15,6 @@ module.exports = {
  method: 'GET',
  url: uncache('/challenge'),
  config: xhrConfig,
- }).then(ctrl.update);
+ });
  }
 };