scalafmtAll and yarn run format

pull/9111/head
Adam Morris 2021-06-06 08:17:43 +10:00
parent 9e77a1f675
commit 042246bf63
8 changed files with 30 additions and 26 deletions

View File

@ -137,7 +137,9 @@ final class Setup(
NoBot {
if (HTTPRequest isXhr ctx.req) NoPlaybanOrCurrent {
val timeMode = get("time")
fuccess(forms.hookFilled(timeModeString = timeMode)) map { html.setup.forms.hook(_, timeMode.isDefined) }
fuccess(forms.hookFilled(timeModeString = timeMode)) map {
html.setup.forms.hook(_, timeMode.isDefined)
}
}
else
fuccess {

View File

@ -100,28 +100,29 @@ final class Swiss(
def form(teamId: String) =
Auth { implicit ctx => me =>
NoLameOrBot{
CheckTeamLeader(teamId) {
Ok(html.swiss.form.create(env.swiss.forms.create(me), teamId)).fuccess
NoLameOrBot {
CheckTeamLeader(teamId) {
Ok(html.swiss.form.create(env.swiss.forms.create(me), teamId)).fuccess
}
}
}
}
def create(teamId: String) =
AuthBody { implicit ctx => me =>
NoLameOrBot{
CheckTeamLeader(teamId) {
env.swiss.forms.create(me)
.bindFromRequest()(ctx.body, formBinding)
.fold(
err => BadRequest(html.swiss.form.create(err, teamId)).fuccess,
data =>
tourC.rateLimitCreation(me, isPrivate = true, ctx.req, Redirect(routes.Team.show(teamId))) {
env.swiss.api.create(data, me, teamId) map { swiss =>
Redirect(routes.Swiss.show(swiss.id.value))
NoLameOrBot {
CheckTeamLeader(teamId) {
env.swiss.forms
.create(me)
.bindFromRequest()(ctx.body, formBinding)
.fold(
err => BadRequest(html.swiss.form.create(err, teamId)).fuccess,
data =>
tourC.rateLimitCreation(me, isPrivate = true, ctx.req, Redirect(routes.Team.show(teamId))) {
env.swiss.api.create(data, me, teamId) map { swiss =>
Redirect(routes.Swiss.show(swiss.id.value))
}
}
}
)
)
}
}
}
@ -133,7 +134,8 @@ final class Swiss(
env.team.cached.isLeader(teamId, me.id) flatMap {
case false => notFoundJson("You're not a leader of that team")
case _ =>
env.swiss.forms.create(me)
env.swiss.forms
.create(me)
.bindFromRequest()
.fold(
jsonFormErrorDefaultLang,

View File

@ -44,9 +44,7 @@ object ofPlayer {
p(trans.puzzle.fromMyGamesNone())
else
frag(
p(strong
(trans.puzzle.fromXGamesFound((pager.nbResults), userLink(u)))
),
p(strong(trans.puzzle.fromXGamesFound((pager.nbResults), userLink(u)))),
div(cls := "puzzle-of-player__pager infinite-scroll")(
pager.currentPageResults.map { puzzle =>
div(cls := "puzzle-of-player__puzzle")(

View File

@ -75,7 +75,9 @@ object filter {
)
),
div(cls := "actions")(
button(tpe := "reset", cls := "button button-empty button-red text reset", dataIcon := "k")(trans.reset()),
button(tpe := "reset", cls := "button button-empty button-red text reset", dataIcon := "k")(
trans.reset()
),
submitButton(cls := "button button-green text apply", dataIcon := "E")(trans.apply())
)
)

View File

@ -124,7 +124,7 @@ object forms {
titleF: Frag,
route: Call,
error: Option[Frag] = None,
forceTimeMode: Boolean = false,
forceTimeMode: Boolean = false
)(fields: Frag)(implicit ctx: Context) =
div(cls := error.isDefined option "error")(
h2(titleF),

View File

@ -195,7 +195,7 @@ object JsonApi {
"id" -> a.id,
"nodes" -> Json.obj(
"nnue" -> a.nodes,
"classical" -> a.nodes * 2,
"classical" -> a.nodes * 2
)
),
"nodes" -> a.nodes * 2, // bc for fishnet 1.x clients without nnue

View File

@ -40,7 +40,7 @@ final class MentionNotifier(
.existingUsernameIds(candidates take 10)
.map(_.take(5).toSet)
mentionableUsers <- prefApi.mentionableIds(existingUsers)
users <- filterNotBlockedByUsers(mentionableUsers.toList, mentionedBy)
users <- filterNotBlockedByUsers(mentionableUsers.toList, mentionedBy)
} yield users.map(Notification.Notifies.apply)
}

View File

@ -673,7 +673,7 @@ object Game {
chess.variant.FromPosition,
chess.variant.Antichess,
chess.variant.Atomic,
chess.variant.RacingKings,
chess.variant.RacingKings
)
val hordeWhitePawnsSince = new DateTime(2015, 4, 11, 10, 0)