PR lichess-org#4453: simple requested changes

Author: thomas-daniels

app/controllers/Tournament.scala

@@ -84,25 +84,24 @@ object Tournament extends LilaController {
     negotiate(
       html = repo byId id flatMap {
         _.fold(tournamentNotFound.fuccess) { tour =>
-          teamIdsIBelongToO(ctx.me) flatMap { teams =>
-            (for {
-              verdicts <- env.api.verdicts(tour, ctx.me, teams)
-              version <- env.version(tour.id)
-              chat <- canHaveChat(tour) ?? Env.chat.api.userChat.cached.findMine(Chat.Id(tour.id), ctx.me).map(some)
-              json <- env.jsonView(tour, page, ctx.me, teams, none, version.some, ctx.lang)
-              _ <- chat ?? { c => Env.user.lightUserApi.preloadMany(c.chat.userIds) }
-              streamers <- streamerCache get tour.id
-              shieldOwner <- env.shieldApi currentOwner tour
-            } yield Ok(html.tournament.show(tour, verdicts, json, chat, streamers, shieldOwner))).mon(_.http.response.tournament.show.website)
-          }
+          (for {
+            teams <- ctx.me ?? { teamIdsIBelongTo(_).map(_.some) }
+            verdicts <- env.api.verdicts(tour, ctx.me, teams)
+            version <- env.version(tour.id)
+            chat <- canHaveChat(tour) ?? Env.chat.api.userChat.cached.findMine(Chat.Id(tour.id), ctx.me).map(some)
+            json <- env.jsonView(tour, page, ctx.me, teams, none, version.some, ctx.lang)
+            _ <- chat ?? { c => Env.user.lightUserApi.preloadMany(c.chat.userIds) }
+            streamers <- streamerCache get tour.id
+            shieldOwner <- env.shieldApi currentOwner tour
+          } yield Ok(html.tournament.show(tour, verdicts, json, chat, streamers, shieldOwner))).mon(_.http.response.tournament.show.website)
         }
       }, api = _ => repo byId id flatMap {
         case None => NotFound(jsonError("No such tournament")).fuccess
         case Some(tour) => {
           get("playerInfo").?? { env.api.playerInfo(tour.id, _) } zip
             getBool("socketVersion").??(env version tour.id map some) flatMap {
               case (playerInfoExt, socketVersion) =>
-                teamIdsIBelongToO(ctx.me) flatMap { teams =>
+                ctx.me ?? { teamIdsIBelongTo(_).map(_.some) } flatMap { teams =>
                   env.jsonView(tour, page, ctx.me, teams, playerInfoExt, socketVersion, ctx.lang)
                 }
             } map { Ok(_) }
@@ -241,10 +240,8 @@ object Tournament extends LilaController {
                 isGranted(_.ManageTournament)) 1 else 4
               CreateLimitPerUser(me.id, cost = 1) {
                 CreateLimitPerIP(HTTPRequest lastRemoteAddress ctx.req, cost = 1) {
-                  teamsIBelongTo(me) flatMap { teams =>
-                    env.api.createTournament(setup, me, teams) flatMap { tour =>
-                      fuccess(Redirect(routes.Tournament.show(tour.id)))
-                    }
+                  env.api.createTournament(setup, me, teams) flatMap { tour =>
+                    fuccess(Redirect(routes.Tournament.show(tour.id)))
                   }
                 }(rateLimited)
               }(rateLimited)
@@ -320,18 +317,12 @@ object Tournament extends LilaController {
     expireAfter = _.ExpireAfterWrite(15.seconds)
   )
 
-  private val teamApi = lila.app.Env.team.api
+  private val teamApi = Env.team.api
+  private val teamCached = Env.team.cached
   private def teamIdsIBelongTo(me: lila.user.User): Fu[List[String]] =
-    teamApi.mine(me) map { teams =>
-      teams.map(_.id)
-    }
+    teamCached.teamIdsList(me.id)
   private def teamsIBelongTo(me: lila.user.User): Fu[List[(String, String)]] =
     teamApi.mine(me) map { teams =>
       teams.map(t => t._id -> t.name)
     }
-  private def teamIdsIBelongToO(me: Option[lila.user.User]): Fu[Option[List[String]]] =
-    me match {
-      case Some(user) => teamIdsIBelongTo(user) map { t => t.some }
-      case None => fuccess(None)
-    }
 }

app/views/tournament/crud/inForm.scala.html

@@ -46,5 +46,5 @@
 @tournament.startingPosition(field)
 }
 <h2>Conditions of entry</h2>
-@tournament.conditionForm(form, auto = false, List())
+@tournament.conditionForm(form, auto = false, Nil)
 @base.form.submit()

modules/tournament/src/main/Condition.scala

@@ -255,13 +255,10 @@ object Condition {
       "teamId" -> optional(text)
     )(TeamMemberSetup.apply)(TeamMemberSetup.unapply)
     case class TeamMemberSetup(teamId: Option[String]) {
-      def convert(teams: Map[String, String]): Option[TeamMember] = {
-        val id = teamId getOrElse "";
-        teams.get(id) match {
-          case Some(teamName) => TeamMember(id, teamName).some
-          case None => None
+      def convert(teams: Map[String, String]): Option[TeamMember] =
+        teamId flatMap { id =>
+          teams.get(id) map { TeamMember(id, _) }
         }
-      }
     }
     object TeamMemberSetup {
       val default = TeamMemberSetup(None)

modules/tournament/src/main/JsonView.scala

@@ -56,7 +56,7 @@ final class JsonView(
     verdicts <- me match {
       case None => fuccess(tour.conditions.accepted)
       case Some(user) if myInfo.isDefined => fuccess(tour.conditions.accepted)
-      case Some(user) => verify(tour.conditions, user, myTeamIds.getOrElse(List()))
+      case Some(user) => verify(tour.conditions, user, ~myTeamIds)
     }
     stats <- statsApi(tour)
     myGameId <- me.ifTrue(myInfo.isDefined) ?? { fetchCurrentGameId(tour, _) }

modules/tournament/src/main/TournamentApi.scala

@@ -195,7 +195,7 @@ final class TournamentApi(
 
   def verdicts(tour: Tournament, me: Option[User], myTeamIds: Option[List[String]]): Fu[Condition.All.WithVerdicts] = me match {
     case None => fuccess(tour.conditions.accepted)
-    case Some(user) => verify(tour.conditions, user, myTeamIds.getOrElse(List()))
+    case Some(user) => verify(tour.conditions, user, ~myTeamIds)
   }
 
   def join(tourId: Tournament.ID, me: User, p: Option[String], myTeamIds: List[String]): Unit = {

translation/source/site.xml

@@ -303,8 +303,8 @@
   <string name="yourPerfRatingIsTooLow">Your %1$s rating (%2$s) is too low</string>
   <string name="ratedMoreThanInPerf">Rated ≥ %1$s in %2$s</string>
   <string name="ratedLessThanInPerf">Rated ≤ %1$s in %2$s</string>
-  <string name="mustBeInTeam">Must be in team %s.</string>
-  <string name="youAreNotInTeam">You are not in the team %s.</string>
+  <string name="mustBeInTeam">Must be in team %s</string>
+  <string name="youAreNotInTeam">You are not in the team %s</string>
   <string name="backToGame">Back to game</string>
   <string name="siteDescription">Free online Chess server. Play Chess now in a clean interface. No registration, no ads, no plugin required. Play Chess with the computer, friends or random opponents.</string>
   <string name="teams">Teams</string>