deepcrayon
/
lila
1
0
Fork 0
Code Releases Activity

Use (Light)Pov.gameId

pull/4220/head
Thibault Duplessis 2018-04-07 19:07:26 +02:00
parent 1e3e12f833
commit 7b3124b0cf
27 changed files with 44 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/controllers/Analyse.scala
View File

@ -30,10 +30,10 @@ object Analyse extends LilaController {
def replay(pov: Pov, userTv: Option[lila.user.User])(implicit ctx: Context) =
if (HTTPRequest isBot ctx.req) replayBot(pov)
else GameRepo initialFen pov.game.id flatMap { initialFen =>
else GameRepo initialFen pov.gameId flatMap { initialFen =>
Game.preloadUsers(pov.game) >> RedirectAtFen(pov, initialFen) {
(env.analyser get pov.game.id) zip
Env.fishnet.api.prioritaryAnalysisInProgress(pov.game.id) zip
(env.analyser get pov.gameId) zip
Env.fishnet.api.prioritaryAnalysisInProgress(pov.gameId) zip
(pov.game.simulId ?? Env.simul.repo.find) zip
Round.getWatcherChat(pov.game) zip
Env.game.crosstableApi.withMatchup(pov.game) zip
@ -96,8 +96,8 @@ object Analyse extends LilaController {
}
private def replayBot(pov: Pov)(implicit ctx: Context) = for {
initialFen <- GameRepo initialFen pov.game.id
analysis <- env.analyser get pov.game.id
initialFen <- GameRepo initialFen pov.gameId
analysis <- env.analyser get pov.gameId
simul <- pov.game.simulId ?? Env.simul.repo.find
crosstable <- Env.game.crosstableApi.withMatchup(pov.game)
pgn <- Env.api.pgnDump(pov.game, initialFen, PgnDump.WithFlags(clocks = false))

2
app/controllers/Challenge.scala
View File

@ -63,7 +63,7 @@ object Challenge extends LilaController {
OptionFuResult(env.api byId id) { c =>
isForMe(c) ?? env.api.accept(c, ctx.me).flatMap {
case Some(pov) => negotiate(
html = Redirect(routes.Round.watcher(pov.game.id, "white")).fuccess,
html = Redirect(routes.Round.watcher(pov.gameId, "white")).fuccess,
api = apiVersion => Env.api.roundApi.player(pov, apiVersion) map { Ok(_) }
) flatMap withChallengeAnonCookie(ctx.isAnon, c, false)
case None => negotiate(

6
app/controllers/Round.scala
View File

@ -96,7 +96,7 @@ object Round extends LilaController with TheftPrevention {
private def otherPovs(game: GameModel)(implicit ctx: Context) = ctx.me ?? { user =>
GameRepo urgentGames user map {
_ filter { pov =>
pov.game.id != game.id && pov.game.isSwitchable && pov.game.isSimul == game.isSimul
pov.gameId != game.id && pov.game.isSwitchable && pov.game.isSimul == game.isSimul
}
}
}
@ -183,13 +183,13 @@ object Round extends LilaController with TheftPrevention {
Ok(html.round.watcher(pov, data, tour, simul, crosstable, userTv = userTv, chatOption = chat, bookmarked = bookmarked))
}
else for { // web crawlers don't need the full thing
initialFen <- GameRepo.initialFen(pov.game.id)
initialFen <- GameRepo.initialFen(pov.gameId)
pgn <- Env.api.pgnDump(pov.game, initialFen, PgnDump.WithFlags(clocks = false))
} yield Ok(html.round.watcherBot(pov, initialFen, pgn))
}.mon(_.http.response.watcher.website),
api = apiVersion => for {
data <- Env.api.roundApi.watcher(pov, apiVersion, tv = none)
analysis <- pov.game.metadata.analysed.??(analyser get pov.game.id)
analysis <- pov.game.metadata.analysed.??(analyser get pov.gameId)
chat <- getWatcherChat(pov.game)
} yield Ok {
data

2
app/controllers/Setup.scala
View File

@ -207,7 +207,7 @@ object Setup extends LilaController with TheftPrevention {
private[controllers] def redirectPov(pov: Pov)(implicit ctx: Context) = {
implicit val req = ctx.req
val redir = Redirect(routes.Round.watcher(pov.game.id, "white"))
val redir = Redirect(routes.Round.watcher(pov.gameId, "white"))
if (ctx.isAuth) redir
else redir withCookies LilaCookie.cookie(
AnonCookie.name,

2
app/controllers/Tournament.scala
View File

@ -136,7 +136,7 @@ object Tournament extends LilaController {
def userGameNbShow(id: String, user: String, nb: Int) = Open { implicit ctx =>
withUserGameNb(id, user, nb) { pov =>
Redirect(routes.Round.watcher(pov.game.id, pov.color.name))
Redirect(routes.Round.watcher(pov.gameId, pov.color.name))
}
}

2
app/controllers/UserAnalysis.scala
View File

@ -78,7 +78,7 @@ object UserAnalysis extends LilaController with TheftPrevention {
}
private def mobileAnalysis(pov: Pov, apiVersion: lila.common.ApiVersion)(implicit ctx: Context): Fu[Result] =
GameRepo initialFen pov.game.id flatMap { initialFen =>
GameRepo initialFen pov.gameId flatMap { initialFen =>
Game.preloadUsers(pov.game) zip
(Env.analyse.analyser get pov.game) zip
Env.game.crosstableApi(pov.game) zip

2
app/mashup/Preload.scala
View File

@ -76,7 +76,7 @@ object Preload {
pov = pov,
opponent = opponent,
json = Json.obj(
"id" -> pov.game.id,
"id" -> pov.gameId,
"color" -> pov.color.name,
"opponent" -> opponent
)

12
app/templating/GameHelper.scala
View File

@ -17,9 +17,9 @@ trait GameHelper { self: I18nHelper with UserHelper with AiHelper with StringHel
def cdnUrl(path: String): String
def povOpenGraph(pov: Pov) = lila.app.ui.OpenGraph(
image = cdnUrl(routes.Export.png(pov.game.id).url).some,
image = cdnUrl(routes.Export.png(pov.gameId).url).some,
title = titleGame(pov.game),
url = s"$netBaseUrl${routes.Round.watcher(pov.game.id, pov.color.name).url}",
url = s"$netBaseUrl${routes.Round.watcher(pov.gameId, pov.color.name).url}",
description = describePov(pov)
)
@ -228,12 +228,12 @@ trait GameHelper { self: I18nHelper with UserHelper with AiHelper with StringHel
def gameFenNoCtx(pov: Pov, tv: Boolean = false, blank: Boolean = false) = Html {
val isLive = pov.game.isBeingPlayed
val variant = pov.game.variant.key
s"""<a href="%s%s" title="%s" class="mini_board mini_board_${pov.game.id} parse_fen is2d %s $variant" data-live="%s" data-color="%s" data-fen="%s" data-lastmove="%s"%s>$miniBoardContent</a>""".format(
s"""<a href="%s%s" title="%s" class="mini_board mini_board_${pov.gameId} parse_fen is2d %s $variant" data-live="%s" data-color="%s" data-fen="%s" data-lastmove="%s"%s>$miniBoardContent</a>""".format(
blank ?? netBaseUrl,
tv.fold(routes.Tv.index, routes.Round.watcher(pov.game.id, pov.color.name)),
tv.fold(routes.Tv.index, routes.Round.watcher(pov.gameId, pov.color.name)),
gameTitle(pov.game, pov.color),
isLive ?? ("live live_" + pov.game.id),
isLive ?? pov.game.id,
isLive ?? ("live live_" + pov.gameId),
isLive ?? pov.gameId,
pov.color.name,
Forsyth exportBoard pov.game.board,
~pov.game.lastMoveKeys,

2
app/views/activity/list.scala.html
View File

@ -106,7 +106,7 @@ case (pt, score) => {
@scoreHtml(score)
<div class="sub">
@povs.map { pov =>
<a class="glpt" href="@routes.Round.watcher(pov.game.id, pov.color.name)">
<a class="glpt" href="@routes.Round.watcher(pov.gameId, pov.color.name)">
@pov.game.wonBy(pov.color) match {
case Some(true) => {Victory}
case Some(false) => {Defeat}

4
modules/api/src/main/RoundApi.scala
View File

@ -108,7 +108,7 @@ private[api] final class RoundApi(
private def withTree(pov: Pov, analysis: Option[Analysis], initialFen: Option[FEN], withFlags: WithFlags)(obj: JsObject) =
obj + ("treeParts" -> partitionTreeJsonWriter.writes(lila.round.TreeBuilder(
id = pov.game.id,
id = pov.gameId,
pgnMoves = pov.game.pgnMoves,
variant = pov.game.variant,
analysis = analysis,
@ -119,7 +119,7 @@ private[api] final class RoundApi(
private def withSteps(pov: Pov, initialFen: Option[FEN])(obj: JsObject) =
obj + ("steps" -> lila.round.StepBuilder(
id = pov.game.id,
id = pov.gameId,
pgnMoves = pov.game.pgnMoves,
variant = pov.game.variant,
initialFen = initialFen.fold(pov.game.variant.initialFen)(_.value)

2
modules/challenge/src/main/ChallengeApi.scala
View File

@ -89,7 +89,7 @@ final class ChallengeApi(
color = (!pov.color).name,
challenger = Right(challenger),
destUser = Some(destUser),
rematchOf = pov.game.id.some
rematchOf = pov.gameId.some
)) inject true
}
} yield success

4
modules/game/src/main/Pov.scala
View File

@ -101,11 +101,9 @@ object PlayerRef {
}
case class LightPov(game: LightGame, color: Color) {
def gameId = game.id
def player = game player color
def opponent = game player !color
def win = game wonBy color
}

2
modules/insight/src/main/Chart.scala
View File

@ -48,7 +48,7 @@ object Chart {
def games = povs.map { pov =>
Json.obj(
"id" -> pov.game.id,
"id" -> pov.gameId,
"fen" -> (chess.format.Forsyth exportBoard pov.game.board),
"color" -> pov.player.color.name,
"lastMove" -> ~pov.game.lastMoveKeys,

2
modules/insight/src/main/Entry.scala
View File

@ -33,7 +33,7 @@ case class Entry(
case object Entry {
def povToId(pov: Pov) = pov.game.id + pov.color.letter
def povToId(pov: Pov) = pov.gameId + pov.color.letter
object BSONFields {
val id = "_id"

2
modules/insight/src/main/PovToEntry.scala
View File

@ -122,7 +122,7 @@ object PovToEntry {
!board.hasPiece(chess.Piece(color, chess.Queen))
}
case _ =>
logger.warn(s"https://lichess.org/${from.pov.game.id} missing endgame board")
logger.warn(s"https://lichess.org/${from.pov.gameId} missing endgame board")
false
}
}

2
modules/lobby/src/main/AbortListener.scala
View File

@ -17,7 +17,7 @@ private[lobby] final class AbortListener(seekApi: SeekApi) {
}
private def recreateSeek(pov: Pov): Funit = pov.player.userId ?? { aborterId =>
seekApi.findArchived(pov.game.id) flatMap {
seekApi.findArchived(pov.gameId) flatMap {
_ ?? { seek =>
(seek.user.id != aborterId) ?? {
worthRecreating(seek) flatMap {

4
modules/perfStat/src/main/PerfStat.scala
View File

@ -154,7 +154,7 @@ object RatingAt {
pov.player.stableRatingAfter.filter { r =>
cur.fold(true) { c => r.compare(c.int) == comp }
}.map {
RatingAt(_, pov.game.movedAt, pov.game.id)
RatingAt(_, pov.game.movedAt, pov.gameId)
} orElse cur
}
@ -171,7 +171,7 @@ case class Results(results: List[Result]) extends AnyVal {
opInt,
UserId(~pov.opponent.userId),
pov.game.movedAt,
pov.game.id
pov.gameId
) :: results).sortBy(_.opInt * comp) take Results.nb
)
}

2
modules/push/src/main/PushApi.scala
View File

@ -136,7 +136,7 @@ private final class PushApi(
private def corresGameJson(pov: Pov, typ: String) = Json.obj(
"type" -> typ,
"gameId" -> pov.game.id,
"gameId" -> pov.gameId,
"fullId" -> pov.fullId,
"color" -> pov.color.name,
"fen" -> Forsyth.exportBoard(pov.game.board),

4
modules/round/src/main/Env.scala
View File

@ -267,9 +267,9 @@ final class Env(
def resign(pov: Pov): Unit = {
if (pov.game.abortable)
roundMap ! Tell(pov.game.id, actorApi.round.Abort(pov.playerId))
roundMap ! Tell(pov.gameId, actorApi.round.Abort(pov.playerId))
else if (pov.game.playable)
roundMap ! Tell(pov.game.id, actorApi.round.Resign(pov.playerId))
roundMap ! Tell(pov.gameId, actorApi.round.Resign(pov.playerId))
}
}

2
modules/round/src/main/ForecastApi.scala
View File

@ -50,7 +50,7 @@ final class ForecastApi(coll: Coll, roundMap: akka.actor.ActorSelection) {
if (!pov.isMyTurn) funit
else Uci.Move(uciMove).fold[Funit](fufail(s"Invalid move $uciMove on $pov")) { uci =>
val promise = Promise[Unit]
roundMap ! Tell(pov.game.id, actorApi.round.HumanPlay(
roundMap ! Tell(pov.gameId, actorApi.round.HumanPlay(
playerId = pov.playerId,
uci = uci,
blur = true,

4
modules/round/src/main/JsonView.scala
View File

@ -55,7 +55,7 @@ final class JsonView(
initialFen: Option[FEN],
withFlags: WithFlags
): Fu[JsObject] =
getSocketStatus(pov.game.id) zip
getSocketStatus(pov.gameId) zip
(pov.opponent.userId ?? UserRepo.byId) zip
canTakeback(pov.game) map {
case ((socket, opponentUser), takebackable) =>
@ -144,7 +144,7 @@ final class JsonView(
initialFen: Option[FEN] = None,
withFlags: WithFlags
) =
getSocketStatus(pov.game.id) zip
getSocketStatus(pov.gameId) zip
UserRepo.pair(pov.player.userId, pov.opponent.userId) map {
case (socket, (playerUser, opponentUser)) =>
import pov._

4
modules/round/src/main/Rematcher.scala
View File

@ -54,7 +54,7 @@ private[round] final class Rematcher(
_ ← (GameRepo insertDenormalized nextGame) >>
GameRepo.saveNext(pov.game, nextGame.id) >>-
messenger.system(pov.game, _.rematchOfferAccepted) >>- {
if (pov.game.variant == Chess960 && !rematch960Cache.get(pov.game.id))
if (pov.game.variant == Chess960 && !rematch960Cache.get(pov.gameId))
rematch960Cache.put(nextGame.id)
}
} yield {
@ -74,7 +74,7 @@ private[round] final class Rematcher(
situation = initialFen flatMap Forsyth.<<<
pieces = pov.game.variant match {
case Chess960 =>
if (rematch960Cache.get(pov.game.id)) Chess960.pieces
if (rematch960Cache.get(pov.gameId)) Chess960.pieces
else situation.fold(Chess960.pieces)(_.situation.board.pieces)
case FromPosition => situation.fold(Standard.pieces)(_.situation.board.pieces)
case variant => variant.pieces

2
modules/round/src/main/SocketHandler.scala
View File

@ -156,7 +156,7 @@ private[round] final class SocketHandler(
Handler(hub, socket, uid, join) {
case Connected(enum, member) =>
// register to the TV channel when watching TV
if (playerId.isEmpty && isRecentTv(pov.game.id)) hub.channel.tvSelect ! lila.socket.Channel.Sub(member)
if (playerId.isEmpty && isRecentTv(pov.gameId)) hub.channel.tvSelect ! lila.socket.Channel.Sub(member)
(controller(pov.gameId, chatSetup, socket, uid, pov.ref, member, user), enum, member)
}
}

2
modules/setup/src/main/Processor.scala
View File

@ -21,7 +21,7 @@ private[setup] final class Processor(
val pov = config pov ctx.me
saveConfig(_ withAi config) >>
(GameRepo insertDenormalized pov.game) >>-
onStart(pov.game.id) >> {
onStart(pov.gameId) >> {
pov.game.player.isAi ?? fishnetPlayer(pov.game)
} inject pov
}

2
modules/study/src/main/ChapterMaker.scala
View File

@ -113,7 +113,7 @@ private final class ChapterMaker(
Chapter.Name(Namer.gameVsText(pov.game, withRatings = false)(lightUser.sync))
else data.name,
setup = Chapter.Setup(
!pov.game.synthetic option pov.game.id,
!pov.game.synthetic option pov.gameId,
pov.game.variant,
data.realOrientation
),

4
modules/study/src/main/StudyMaker.scala
View File

@ -39,12 +39,12 @@ private final class StudyMaker(
private def createFromPov(data: StudyMaker.Data, pov: Pov, initialFen: Option[FEN], user: User): Fu[Study.WithChapter] =
chapterMaker.game2root(pov.game, initialFen) map { root =>
val study = Study.make(user, Study.From.Game(pov.game.id), data.id, Study.Name("Game study").some)
val study = Study.make(user, Study.From.Game(pov.gameId), data.id, Study.Name("Game study").some)
val chapter: Chapter = Chapter.make(
studyId = study.id,
name = Chapter.Name(Namer.gameVsText(pov.game, withRatings = false)(lightUser)),
setup = Chapter.Setup(
gameId = pov.game.id.some,
gameId = pov.gameId.some,
variant = pov.game.variant,
orientation = pov.color
),

2
modules/tournament/src/main/JsonView.scala
View File

@ -131,7 +131,7 @@ final class JsonView(
.add("withdraw" -> player.withdraw),
"pairings" -> povScores.map {
case (pov, score) => Json.obj(
"id" -> pov.game.id,
"id" -> pov.gameId,
"color" -> pov.color.name,
"op" -> gameUserJson(pov.opponent.userId, pov.opponent.rating),
"win" -> pov.win,