Skip to content

Commit

Permalink
Revert "never ignore comm reports even from reportbanned players"
Browse files Browse the repository at this point in the history
This reverts commit 0b4fef5.

At the request of moderators who apparently changed their mind.
  • Loading branch information
ornicar committed Jul 17, 2024
1 parent ec3e9aa commit 0f40175
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion modules/mod/src/main/ui/ModUserUi.scala
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ final class ModUserUi(helpers: Helpers, modUi: ModUi):
Granter.opt(_.ReportBan).option {
postForm(
action := routes.Mod.reportban(u.username, !u.marks.reportban),
title := "Enable/disable the boost/cheat report feature for this user.",
title := "Enable/disable the report feature for this user.",
cls := "xhr"
)(
submitButton(cls := List("btn-rack__btn" -> true, "active" -> u.marks.reportban))("Reportban")
Expand Down
3 changes: 1 addition & 2 deletions modules/report/src/main/ReportApi.scala
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@ final class ReportApi(
Reason(data.reason).exists(Reason.autoBlock)

def create(c: Candidate, score: Report.Score => Report.Score = identity): Funit =
val ignoreReport = c.reporter.user.marks.reportban && !c.reason.isComm
(!ignoreReport && !isAlreadySlain(c)).so {
(!c.reporter.user.marks.reportban && !isAlreadySlain(c)).so {
scorer(c).map(_.withScore(score)).flatMap { case scored @ Candidate.Scored(candidate, _) =>
for
prev <- coll.one[Report]:
Expand Down

0 comments on commit 0f40175

Please sign in to comment.