deepcrayon
/
lila
1
0
Fork 0
Code Releases Activity

Rename "ForceKid" -> "SetKidMode" 

Better name, since the user can still disable it
pull/7746/head
kraktus 2020-12-21 08:20:07 +00:00
parent 6f85ced046
commit 0c2f2cc6cb
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/Mod.scala
View File

@ -109,7 +109,7 @@ final class Mod(
)
def kid(username: String) =
OAuthMod(_.ForceKid) { _ => me =>
OAuthMod(_.SetKidMode) { _ => me =>
modApi.setKid(me.id, username) map some
}(actionResult(username))

2
app/views/user/mod.scala
View File

@ -100,7 +100,7 @@ object mod {
submitButton(cls := "btn-rack__btn confirm")("Clear PMs & chats")
)
},
isGranted(_.ForceKid) option {
isGranted(_.SetKidMode) option {
postForm(
action := routes.Mod.kid(u.username),
title := "Activate kid mode if not already the case",

2
modules/mod/src/main/ModApi.scala
View File

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

4
modules/mod/src/main/Modlog.scala
View File

@ -66,7 +66,7 @@ case class Modlog(
case Modlog.teamKick => "kick from team"
case Modlog.teamEdit => "edited team"
case Modlog.appealPost => "posted in appeal"
case Modlog.forceKid => "force kid mode"
case Modlog.setKidMode => "set kid mode"
case a => a
}
@ -130,5 +130,5 @@ object Modlog {
val teamKick = "teamKick"
val teamEdit = "teamEdit"
val appealPost = "appealPost"
val forceKid = "forceKid"
val setKidMode = "setKidMode"
}

4
modules/mod/src/main/ModlogApi.scala
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) =
def setKidMode(mod: User.ID, kid: User.ID) =
add {
Modlog(mod, kid.some, Modlog.forceKid)
Modlog(mod, kid.some, Modlog.setKidMode)
}
def disableTwoFactor(mod: User.ID, user: User.ID) =

6
modules/security/src/main/Permission.scala
View File

@ -22,7 +22,7 @@ object Permission {
case object NotifySlack extends Permission("NOTIFY_SLACK", List(UserSpy), "Notify #tavern")
case object ViewPrivateComms extends Permission("VIEW_PRIVATE_COMS", "View private comms")
case object Shadowban extends Permission("SHADOWBAN", List(UserSpy, ChatTimeout), "Shadowban")
case object ForceKid extends Permission("FORCE_KID", List(UserSpy), "Force Kid Mode")
case object SetKidMode extends Permission("SET_KID_MODE", List(UserSpy), "Set Kid Mode")
case object MarkEngine extends Permission("ADJUST_CHEATER", List(UserSpy), "Mark as cheater")
case object MarkBooster extends Permission("ADJUST_BOOSTER", List(UserSpy), "Mark as booster")
case object IpBan extends Permission("IP_BAN", List(UserSpy), "IP ban")
@ -102,7 +102,7 @@ object Permission {
List(
ViewPrivateComms,
Shadowban,
ForceKid,
SetKidMode,
ChatTimeout,
ModerateForum,
ReportBan,
@ -171,7 +171,7 @@ object Permission {
"Comm mod" -> List(
ViewPrivateComms,
Shadowban,
ForceKid,
SetKidMode,
ChatTimeout,
ModerateForum,
ReportBan,