deepcrayon
/
lila
1
0
Fork 0
Code Releases Activity

show last played game in idle user TV - resolves #150

pull/185/head
Thibault Duplessis 2014-12-26 22:18:32 +01:00
parent 89cb63807f
commit 744174fbfd
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/User.scala
View File

@ -23,7 +23,7 @@ object User extends LilaController {
def tv(username: String) = Open { implicit ctx =>
OptionFuResult(UserRepo named username) { user =>
(GameRepo lastPlayed user) orElse
(GameRepo lastPlayedPlaying user) orElse
(GameRepo lastPlayed user) flatMap {
_.fold(fuccess(Redirect(routes.User.show(username)))) { pov =>
Round.watch(pov, userTv = user.some)
@ -38,7 +38,7 @@ object User extends LilaController {
def showMini(username: String) = Open { implicit ctx =>
OptionFuResult(UserRepo named username) { user =>
GameRepo lastPlayed user zip
GameRepo lastPlayedPlaying user zip
(ctx.userId ?? { relationApi.blocks(user.id, _) }) zip
(ctx.isAuth ?? { Env.pref.api.followable(user.id) }) zip
(ctx.userId ?? { relationApi.relation(_, user.id) }) map {

2
modules/api/src/main/UserApi.scala
View File

@ -41,7 +41,7 @@ private[api] final class UserApi(
def one(username: String, token: Option[String]): Fu[Option[JsObject]] = UserRepo named username flatMap {
case None => fuccess(none)
case Some(u) => GameRepo lastPlayed u zip
case Some(u) => GameRepo lastPlayedPlaying u zip
makeUrl(R User username) zip
(check(token) ?? (knownEnginesSharingIp(u.id) map (_.some))) flatMap {
case ((gameOption, userUrl), knownEngines) => gameOption ?? { g =>

9
modules/game/src/main/GameRepo.scala
View File

@ -125,12 +125,17 @@ object GameRepo {
// gets most urgent game to play
def onePlaying(user: User): Fu[Option[Pov]] = nowPlaying(user) map (_.headOption)
// gets last recently played move game
def lastPlayed(user: User): Fu[Option[Pov]] =
// gets last recently played move game in progress
def lastPlayedPlaying(user: User): Fu[Option[Pov]] =
$find.one($query(Query recentlyPlayingWithClock user.id) sort Query.sortUpdatedNoIndex) map {
_ flatMap { Pov(_, user) }
}
def lastPlayed(user: User): Fu[Option[Pov]] =
$find($query(Query user user.id) sort ($sort desc F.createdAt), 20) map {
_.sortBy(_.updatedAt).lastOption flatMap { Pov(_, user) }
}
def countPlayingRealTime(userId: String): Fu[Int] =
$count(Query.nowPlaying(userId) ++ Query.clock(true))