simplify force kid log

pull/7746/head
kraktus 2020-12-20 08:54:52 +00:00
parent 427fae0bd9
commit 28a61dee92
3 changed files with 5 additions and 8 deletions

View File

@ -113,8 +113,7 @@ final class ModApi(
def setKid(mod: String, username: String): Funit =
withUser(username) { user =>
userRepo.isKid(user.id) flatMap {
case false => (userRepo.setKid(user, true)) >> logApi.forceKid(mod, user.id, true)
case true => logApi.forceKid(mod, user.id, false)
!_ ?? {(userRepo.setKid(user, true))} >> logApi.forceKid(mod, user.id)
}
}

View File

@ -66,8 +66,7 @@ case class Modlog(
case Modlog.teamKick => "kick from team"
case Modlog.teamEdit => "edited team"
case Modlog.appealPost => "posted in appeal"
case Modlog.forceKidSuccess => "force kid mode"
case Modlog.forceKidFailure => "force kid mode on already kid account"
case Modlog.forceKid => "force kid mode"
case a => a
}
@ -131,6 +130,5 @@ object Modlog {
val teamKick = "teamKick"
val teamEdit = "teamEdit"
val appealPost = "appealPost"
val forceKidSuccess = "forceKidSuccess"
val forceKidFailure = "forceKidFailure"
val forceKid = "forceKid"
}

View File

@ -53,9 +53,9 @@ final class ModlogApi(repo: ModlogRepo, userRepo: UserRepo, slackApi: lila.slack
Modlog.make(mod, sus, if (sus.user.marks.troll) Modlog.troll else Modlog.untroll)
}
def forceKid(mod: User.ID, kid: User.ID, success: Boolean) =
def forceKid(mod: User.ID, kid: User.ID) =
add {
Modlog(mod, kid.some, if (success) Modlog.forceKidSuccess else Modlog.forceKidFailure)
Modlog(mod, kid.some, Modlog.forceKid)
}
def disableTwoFactor(mod: User.ID, user: User.ID) =