deepcrayon/lila
deepcrayon/lila
1
0
Fork 0
Code Releases Activity

Implement rematch offer and decline

Browse source
This commit is contained in:
Thibault Duplessis 2012-05-20 20:15:46 +02:00
parent a530956602
commit 308a317099
3 changed files with 33 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/Round.scala
View file

@ -70,6 +70,7 @@ object Round extends LilaController {
def drawOffer(fullId: String) = performAndRedirect(fullId, hand.drawOffer)
def drawCancel(fullId: String) = performAndRedirect(fullId, hand.drawCancel)
def drawDecline(fullId: String) = performAndRedirect(fullId, hand.drawDecline)
def rematch(fullId: String) = Action {
rematcher offerOrAccept fullId flatMap { validResult ⇒
validResult.fold(
@ -83,8 +84,9 @@ object Round extends LilaController {
)
} unsafePerformIO
}
def rematchCancel(fullId: String) = TODO
def rematchDecline(fullId: String) = TODO
def rematchCancel(fullId: String) = performAndRedirect(fullId, hand.rematchCancel)
def rematchDecline(fullId: String) = performAndRedirect(fullId, hand.rematchDecline)
def takebackAccept(fullId: String) = performAndRedirect(fullId, hand.takebackAccept)
def takebackOffer(fullId: String) = performAndRedirect(fullId, hand.takebackOffer)
def takebackCancel(fullId: String) = performAndRedirect(fullId, hand.takebackCancel)

42
app/round/Hand.scala
View file

@ -127,23 +127,33 @@ final class Hand(
else !!("no draw offer to decline " + fullId)
})
def rematch(fullId: String): IO[Valid[(String, List[Event])]] =
attempt(fullId, {
case pov @ Pov(game, color) if game playerCanRematch color ⇒
if (game.opponent(color).isOfferingRematch) success {
game.nextId.fold(
nextId ⇒ io(nextId -> Nil),
io(fullId -> Nil) // accept
)
}
else success {
val progress = Progress(game, Event.ReloadTable(!color)) map { g ⇒
g.updatePlayer(color, _.offerRematch)
def rematchCancel(fullId: String): IO[Valid[List[Event]]] = attempt(fullId, {
case pov @ Pov(g1, color) ⇒
pov.player.isOfferingRematch.fold(
success(for {
p1 ← messenger.systemMessages(g1, "Rematch offer canceled") map { es ⇒
Progress(g1, Event.ReloadTable(!color) :: es)
}
gameRepo save progress map { _ ⇒ fullId -> progress.events }
}
case _ ⇒ !!("invalid rematch offer " + fullId)
})
p2 = p1 map { g ⇒ g.updatePlayer(color, _.removeRematchOffer) }
_ ← gameRepo save p2
} yield p2.events),
!!("no rematch offer to cancel " + fullId)
)
})
def rematchDecline(fullId: String): IO[Valid[List[Event]]] = attempt(fullId, {
case pov @ Pov(g1, color) ⇒
g1.player(!color).isOfferingRematch.fold(
success(for {
p1 ← messenger.systemMessages(g1, "Rematch offer declined") map { es ⇒
Progress(g1, Event.ReloadTable(!color) :: es)
}
p2 = p1 map { g ⇒ g.updatePlayer(!color, _.removeRematchOffer) }
_ ← gameRepo save p2
} yield p2.events),
!!("no rematch offer to decline " + fullId)
)
})
def takebackAccept(fullId: String): IOValidEvents = fromPov(fullId) { pov ⇒
if (pov.opponent.isProposingTakeback) for {

7
app/setup/Rematcher.scala
View file

@ -20,7 +20,7 @@ final class Rematcher(
def offerOrAccept(fullId: String): IO[Valid[(String, List[Event])]] =
attempt(fullId, {
case pov @ Pov(game, color) if game playerCanRematch color ⇒
if (game.opponent(color).isOfferingRematch) success {
success(game.opponent(color).isOfferingRematch.fold(
game.nextId.fold(
nextId ⇒ io(nextId -> Nil),
for {
@ -39,13 +39,12 @@ final class Rematcher(
Event.ReloadTable(White),
Event.ReloadTable(Black))
)
}
else success {
, {
val progress = Progress(game, Event.ReloadTable(!color)) map { g ⇒
g.updatePlayer(color, _.offerRematch)
}
gameRepo save progress map { _ ⇒ fullId -> progress.events }
}
}))
case _ ⇒ !!("invalid rematch offer " + fullId)
})