remind players about running tournament

app/round/RoundHelper.scala

@@ -36,7 +36,8 @@ trait RoundHelper { self: ConfigHelper ⇒
  "ai" -> opponent.isAi
  ),
  "possible_moves" -> possibleMoves(pov),
- "animation_delay" -> animationDelay(pov)
+ "animation_delay" -> animationDelay(pov),
+ "tournament_id" -> game.tournamentId
  )
  }
 

app/templating/AssetHelper.scala

@@ -7,7 +7,7 @@ import play.api.templates.Html
 
 trait AssetHelper {
 
- val assetVersion = 9
+ val assetVersion = 10
 
  def cssTag(name: String) = css("stylesheets/" + name)
 

app/tournament/Organizer.scala

@@ -16,7 +16,6 @@ private[tournament] final class Organizer(
  api: TournamentApi,
  repo: TournamentRepo,
  reminder: ActorRef,
- register: ActorRef,
  hubMaster: ActorRef) extends Actor {
 
  implicit val timeout = Timeout(1 second)
@@ -47,7 +46,7 @@ private[tournament] final class Organizer(
 
  def createdTournament(tour: Created) {
  if (tour.isEmpty) (api wipeEmpty tour).unsafePerformIO
- else if (tour.readyToStart) api start tour map (_.unsafePerformIO) foreach { reminder ! _ }
+ else if (tour.readyToStart) api start tour map (_.unsafePerformIO) 
  else (hubMaster ? GetTournamentUsernames(tour.id)).mapTo[Iterable[String]] onSuccess {
  case usernames ⇒ (tour.userIds diff usernames.toList.map(_.toLowerCase)) |> { leavers ⇒
  leavers.map(u ⇒ api.withdraw(tour, u)).sequence.unsafePerformIO
@@ -58,7 +57,7 @@ private[tournament] final class Organizer(
  def startedTournaments {
  repo.started.unsafePerformIO ~ { tours ⇒
  tours foreach startedTournament
- register ! SetTournaments(tours)
+ reminder ! RemindTournaments(tours)
  }
  }
 

app/tournament/Reminder.scala

@@ -20,10 +20,14 @@ private[tournament] final class Reminder(hubNames: List[String]) extends Actor {
  implicit val timeout = Timeout(1 second)
 
  def receive = {
- case tour: Started ⇒ {
- val msg = SendTos(tour.userIds.toSet, JsObject(Seq(
+
+ case RemindTournaments(tours) ⇒ tours foreach { tour =>
+ val msg = SendTos(tour.activeUserIds.toSet, JsObject(Seq(
  "t" -> JsString("tournamentReminder"),
- "d" -> JsString(views.html.tournament.reminder(tour).toString)
+ "d" -> JsObject(Seq(
+ "id" -> JsString(tour.id),
+ "html" -> JsString(views.html.tournament.reminder(tour).toString)
+ ))
  )))
  hubRefs foreach { _ ! msg }
  }

app/tournament/TournamentApi.scala

@@ -41,13 +41,13 @@ private[tournament] final class TournamentApi(
  _ ← lobbyReload
  } yield created
 
- def start(created: Created): Option[IO[Started]] = created.start map { started ⇒
+ def start(created: Created): Option[IO[Unit]] = created.start map { started ⇒
  for {
  _ ← repo saveIO started
  _ ← socket reload started.id
  _ ← reloadSiteSocket
  _ ← lobbyReload
- } yield started
+ } yield ()
  }
 
  def wipeEmpty(created: Created): IO[Unit] = (for {

app/tournament/TournamentEnv.scala

@@ -73,15 +73,12 @@ final class TournamentEnv(
  repo = repo,
  api = api,
  reminder = reminder,
- register = register,
  hubMaster = hubMaster
  )), name = ActorTournamentOrganizer)
 
  lazy val reminder = Akka.system.actorOf(Props(new Reminder(List(
  ActorLobbyHub, ActorSiteHub, ActorRoundHubMaster, ActorTournamentHubMaster
  ))), name = ActorTournamentReminder)
-
- lazy val register = Akka.system.actorOf(Props(new Register), name = ActorTournamentRegister)
 
  private lazy val joiner = new GameJoiner(
  gameRepo = gameRepo,

app/tournament/actorApi.scala

@@ -51,5 +51,4 @@ case class StartedTournament(tour: Started)
 case object StartPairings
 case class StartPairing(tour: Started)
 case class GetTournamentUsernames(tournamentId: String)
-case class GetUserTournament(userId: String)
-case class SetTournaments(tours: List[Tournament])
+case class RemindTournaments(tours: List[Started])

app/views/base/layout.scala.html

@@ -51,8 +51,8 @@
  <div class="themes dropdown" data-href="@routes.Setting.set("theme")">
  @themeList.map { theme =>
  <div class="theme" data-theme="@theme.name"><div class="inner">
- <div class="lcs black @theme.name"></div>
- <div class="lcs white @theme.name"></div>
+  <div class="lcs black @theme.name"></div>
+  <div class="lcs white @theme.name"></div>
  </div></div>
  }
  </div>
@@ -61,11 +61,9 @@
  <span></span>
  </a>
  </div>
- <div class="notifications">
- <div id="tournament_reminder">
- </div>
- @ctx.me.map(notifications(_))
- </div>
+ @ctx.me.map { me =>
+ <div class="notifications">@notifications(me)</div>
+ }
  <div class="content">
  <div class="header">
  <h1>

app/views/notification/view.scala.html

@@ -1,7 +1,9 @@
-@(id: String, from: Option[String] = None)(html: Html)
+@(id: String, from: Option[String] = None, closable: Boolean = true)(html: Html)
 
 <div id="@id" class="notification">
+ @if(closable) {
  <a class="close" href="@routes.Notification.remove(id)">X</a>
+ }
  @from.map { user =>
  @userIdLink(user, none)
  }

app/views/tournament/reminder.scala.html

@@ -1,11 +1,7 @@
 @(tour: lila.tournament.Tournament)
 
-@notification.view("tournament_reminder") {
+@notification.view("tournament_reminder", closable = false) {
 @linkTo(tour) in progress!
-<form action="@routes.Tournament.join(tour.id)" method="POST">
- <input type="submit" class="submit button" value="Join" />
-</form>
-<form action="@routes.Tournament.withdraw(tour.id)" method="POST">
- <input type="submit" class="submit button strong" value="Withdraw" />
-</form>
+<a class="action withdraw" href="@routes.Tournament.withdraw(tour.id)">Withdraw</a>
+<a class="action" href="@routes.Tournament.show(tour.id)">Join</a>
 }

public/javascripts/big.js

@@ -199,14 +199,14 @@ var lichess = {
  nbm: function(e) {
  $('#nb_messages').text(e || "0").toggleClass("unread", e > 0);
  },
- notificationAdd: function(html) {
- $('div.notifications').prepend(html);
- },
- notificationRemove: function(id) {
- $('#' + id).remove();
- },
- tournamentReminder: function(html) {
- $('#tournament_reminder').html(html).show();
+ tournamentReminder: function(data) {
+ if (!$('#tournament_reminder').length && $('body').data("tournament-id") != data.id) {
+  $('div.notifications').append(data.html).find("a.withdraw").click(function() {
+  $.post($(this).attr("href"));
+  $('#tournament_reminder').remove();
+  return false;
+  });
+ }
  },
  analysisAvailable: function() {
  $("div.game_analysis.status").remove();
@@ -405,20 +405,6 @@ $(function() {
  return false;
  });
 
- $("div.notifications").on("click", "div.notification a", function(e) {
- var $a = $(this);
- var $notif = $a.closest("div.notification");
- var follow = !$a.hasClass("close");
- $.ajax($notif.find("a.close").attr("href"), {
- type: "delete",
- success: function() {
- if (follow) location.href = $a.attr("href");
- }
- });
- $notif.remove();
- return false;
- });
-
  $("form.request_analysis a").click(function() {
  $(this).parent().submit();
  });
@@ -525,6 +511,10 @@ $.widget("lichess.game", {
  $(this).clock({time: $(this).data("time")}).clock("start");
  });
 
+ if (self.options.tournament_id) {
+ $('body').data('tournament-id', self.options.tournament_id);
+ }
+
  if (self.options.game.started) {
  self.indicateTurn();
  self.initSquaresAndPieces();
@@ -1714,6 +1704,8 @@ $(function() {
  return;
  }
 
+ $('body').data('tournament-id', _ld_.tournament.id);
+
  var $chat = $("div.lichess_chat");
  var $chatToggle = $chat.find('input.toggle_chat');
  var chatExists = $chat.length > 0;

public/stylesheets/common.css

@@ -770,6 +770,8 @@ div.notifications > div a.close {
 div.notifications > div a.close:hover {
  font-weight: bold;
 }
-div.notifications > div form {
+#tournament_reminder .action {
  float: right;
+ display: block;
+ margin-left: 8px;
 }