notify tournament creation in the lobby

kraktus · Oct 30, 2012 · 51fefd2 · 51fefd2
1 parent f4321b6
commit 51fefd2
Show file tree

Hide file tree

Showing 16 changed files with 43 additions and 16 deletions.
diff --git a/app/core/CoreEnv.scala b/app/core/CoreEnv.scala
@@ -110,6 +110,7 @@ final class CoreEnv private (application: Application, val settings: Settings) {
  flood = security.flood,
  siteSocket = site.socket,
  lobbyNotify = lobby.socket.reloadTournaments,
+ lobbyMessage = lobby.socket.sysTalk,
  roundMeddler = round.meddler,
  incToints = user.userRepo.incToints,
  mongodb = mongodb.apply _)

diff --git a/app/lobby/Hub.scala b/app/lobby/Hub.scala
@@ -36,6 +36,10 @@ final class Hub(
  ))
  }
 
+ case SysTalk(txt) ⇒ messenger.system(txt).unsafePerformIO |> { message ⇒
+ notifyVersion("talk", Seq("txt" -> JsString(message.text)))
+ }
+
  case ReloadTournaments(html) => notifyTournaments(html)
 
  case AddEntry(entry) ⇒ notifyVersion("entry", JsString(entry.render))

diff --git a/app/lobby/Message.scala b/app/lobby/Message.scala
@@ -10,9 +10,7 @@ case class Message(
  username: String,
  text: String) {
 
- def render = Map(
- "txt" -> text,
- "u" -> username)
+ def render = Map("txt" -> text, "u" -> username)
 
  def createdAt = new DateTime(id.getTime)
 

diff --git a/app/lobby/Messenger.scala b/app/lobby/Messenger.scala
@@ -20,5 +20,9 @@ final class Messenger(
  _ ← message.fold(_ ⇒ io(), messageRepo.add)
  } yield message
 
+ def system(text: String): IO[Message] = Message(username = "", text = text) |> { message =>
+ messageRepo add message inject message
+ }
+
  def mute(username: String): IO[Unit] = messageRepo censorUsername username
 }
diff --git a/app/lobby/Socket.scala b/app/lobby/Socket.scala
@@ -73,4 +73,8 @@ final class Socket(hub: ActorRef, flood: Flood) {
  def reloadTournaments(html: String): IO[Unit] = io {
  hub ! ReloadTournaments(html)
  }
+
+ def sysTalk(text: String): IO[Unit] = io {
+ hub ! SysTalk(text)
+ }
 }
diff --git a/app/lobby/actorApi.scala b/app/lobby/actorApi.scala
@@ -27,6 +27,7 @@ case class Join(
  version: Int,
  hookOwnerId: Option[String])
 case class Talk(u: String, txt: String)
+case class SysTalk(txt: String)
 case class Connected(
  enumerator: JsEnumerator, 
  channel: JsChannel)
diff --git a/app/templating/AssetHelper.scala b/app/templating/AssetHelper.scala
@@ -7,7 +7,7 @@ import play.api.templates.Html
 
 trait AssetHelper {
 
- val assetVersion = 13
+ val assetVersion = 14
 
  def cssTag(name: String) = css("stylesheets/" + name)
 
@@ -29,4 +29,10 @@ trait AssetHelper {
  def jsAt(path: String) = Html {
  """<script src="%s?v=%d"></script>""".format(path, assetVersion)
  }
+
+ def embedJs(js: String): Html = Html("""<script type="text/javascript">
+/* <![CDATA[ */
+%s
+/* ]]> */
+</script>""" format js)
 }
diff --git a/app/tournament/TournamentApi.scala b/app/tournament/TournamentApi.scala
@@ -7,6 +7,7 @@ import scalaz.effects._
 import scalaz.{ NonEmptyList, Success, Failure }
 import play.api.libs.json._
 
+import controllers.routes
 import game.DbGame
 import user.User
 
@@ -16,6 +17,7 @@ private[tournament] final class TournamentApi(
  socket: Socket,
  siteSocket: site.Socket,
  lobbyNotify: String ⇒ IO[Unit],
+ lobbyMessage: String ⇒ IO[Unit],
  roundMeddler: round.Meddler,
  incToints: String ⇒ Int ⇒ IO[Unit]) {
 
@@ -39,6 +41,7 @@ private[tournament] final class TournamentApi(
  _ ← (withdrawIds map socket.reload).sequence
  _ ← reloadSiteSocket
  _ ← lobbyReload
+ _ ← sendLobbyMessage(created)
  } yield created
 
  def start(created: Created): Option[IO[Unit]] = created.start map { started ⇒
@@ -127,4 +130,8 @@ private[tournament] final class TournamentApi(
  siteSocket.sendToFlag("tournament", message)
  }
  private val reloadSiteSocket = sendToSiteSocket(reloadMessage)
+
+ private def sendLobbyMessage(tour: Created) = lobbyMessage {
+ """<a href="%s">%s tournament created</a>""".format(routes.Tournament.show(tour.id), tour.name)
+ }
 }
diff --git a/app/tournament/TournamentEnv.scala b/app/tournament/TournamentEnv.scala
@@ -24,6 +24,7 @@ final class TournamentEnv(
  flood: Flood,
  siteSocket: site.Socket,
  lobbyNotify: String ⇒ IO[Unit],
+ lobbyMessage: String ⇒ IO[Unit],
  roundMeddler: round.Meddler,
  incToints: String ⇒ Int ⇒ IO[Unit],
  mongodb: String ⇒ MongoCollection) {
@@ -42,6 +43,7 @@ final class TournamentEnv(
  socket = socket,
  siteSocket = siteSocket,
  lobbyNotify = lobbyNotify,
+ lobbyMessage = lobbyMessage,
  roundMeddler = roundMeddler,
  incToints = incToints)
 

diff --git a/app/views/lobby/home.scala.html b/app/views/lobby/home.scala.html
@@ -91,5 +91,5 @@
  </div>
  </div>
 </div>
-<script>var lichess_preload = @Html(preload);</script>
+@embedJs("var lichess_preload = " + preload) 
 }
diff --git a/app/views/round/player.scala.html b/app/views/round/player.scala.html
@@ -50,7 +50,7 @@
  @round.cemetery(!pov, "bottom")
  </div>
 </div>
-<script type="text/javascript">var _ld_ = @Html(roundPlayerJsData(pov, version))</script>
+@embedJs("var _ld_ = " + roundPlayerJsData(pov, version))
 @analyse.link(pov, analysed)
 @if(!tour.fold(_.isRunning, false)) {
 @views.html.game.more(pov, bookmarkers) {

diff --git a/app/views/round/watcher.scala.html b/app/views/round/watcher.scala.html
@@ -47,7 +47,7 @@
  @round.cemetery(!pov, "bottom")
  </div>
 </div>
-<script type="text/javascript">var _ld_ = @Html(roundWatcherJsData(pov, version))</script>
+@embedJs("var _ld_ = " + roundWatcherJsData(pov, version))
 @analyse.link(pov, analysed)
 @views.html.game.more(pov, bookmarkers) {
 <nav>

diff --git a/app/views/setup/await.scala.html b/app/views/setup/await.scala.html
@@ -31,5 +31,5 @@
  </div>
  </div>
 </div>
-<script type="text/javascript">var _ld_ = @Html(roundPlayerJsData(pov, version))</script>
+@embedJs("var _ld_ = " + roundPlayerJsData(pov, version))
 }
diff --git a/app/views/setup/join.scala.html b/app/views/setup/join.scala.html
@@ -25,5 +25,5 @@
  </div>
  </div>
 </div>
-<script type="text/javascript">var _ld_ = @Html(roundPlayerJsData(pov, version))</script>
+@embedJs("var _ld_ = " + roundPlayerJsData(pov, version))
 }
diff --git a/app/views/tournament/show/layout.scala.html b/app/views/tournament/show/layout.scala.html
@@ -40,7 +40,5 @@
  data-socket-url="@routes.Tournament.websocket(tour.id)">
  @tournament.show.inner(side)(body)
 </div>
-<script type="text/javascript">
- var _ld_ = @Html(tournamentJsData(tour, version, ctx.me))
-</script>
+@embedJs("var _ld_ = " + tournamentJsData(tour, version, ctx.me))
 }
diff --git a/public/javascripts/big.js b/public/javascripts/big.js
@@ -1529,7 +1529,11 @@ $(function() {
  }
  function buildChatMessage(txt, username) {
  var html = '<li><span>';
- html += '<a class="user_link" href="/@/'+username+'">'+username.substr(0, 12) + '</a>';
+ if (typeof username != "undefined" && username != "") {
+ html += '<a class="user_link" href="/@/'+username+'">'+username.substr(0, 12) + '</a>';
+ } else {
+ html += '-';
+ }
  html += '</span>' + urlToLink(txt) + '</li>';
  return html;
  }
@@ -1575,9 +1579,7 @@ $(function() {
  },
  tournaments: reloadTournaments
  },
- options: {
- name: "lobby"
- }
+ options: { name: "lobby" }
  }));
  $('body').trigger('lichess.content_loaded');