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

refactor report filtering a bit

Browse source
This commit is contained in:
Thibault Duplessis 2017-01-08 19:41:22 +01:00
parent f1db48f76c
commit 043642db70
2 changed files with 27 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/controllers/Report.scala
View file

@ -6,6 +6,7 @@ import views._
import lila.app._
import lila.security.Granter
import lila.report.Reason
import lila.user.{ User => UserModel, UserRepo }
object Report extends LilaController {
@ -13,19 +14,14 @@ object Report extends LilaController {
private def forms = Env.report.forms
private def api = Env.report.api
def list = Secure(_.SeeReport) { implicit ctx => _ =>
api unprocessedAndRecent 200 map { reports =>
html.report.list(reports)
}
}
def list = listWithFilter("all")
def listWithFilter(reason: String) = Secure(_.SeeReport) { implicit ctx => _ =>
api unprocessedAndRecentWithFilter(200, reason) map { reports =>
api.unprocessedAndRecentWithFilter(50, Reason(reason)) map { reports =>
html.report.list(reports)
}
}
def process(id: String) = Secure(_.SeeReport) { implicit ctx => me =>
api.process(id, me) inject Redirect(routes.Report.list)
}
@ -64,10 +60,9 @@ object Report extends LilaController {
def irwinBotNext = Open { implicit ctx =>
Mod.ModExternalBot {
api unprocessedAndRecent 100 map { all =>
api.unprocessedAndRecentWithFilter(100, Reason.Cheat.some) map { all =>
all.find { r =>
r.report.isCheat && r.report.unprocessed && !r.hasIrwinNote &&
!irwinProcessedUserIds.get(r.user.id)
r.report.unprocessed && !r.hasIrwinNote && !irwinProcessedUserIds.get(r.user.id)
} match {
case None => NotFound
case Some(r) =>

64
modules/report/src/main/ReportApi.scala
View file

@ -150,6 +150,8 @@ final class ReportApi(
private val unprocessedSelect: Bdoc = "processedBy" $exists false
private val processedSelect: Bdoc = "processedBy" $exists true
private def reasonSelect(reason: Option[Reason]): Bdoc =
reason.?? { r => $doc("reason" -> r.name) }
def nbUnprocessed = coll.countSel(unprocessedSelect)
@ -166,53 +168,31 @@ final class ReportApi(
"createdBy" -> $ne("lichess")
).some)
def unprocessedAndRecent(nb: Int): Fu[List[Report.WithUserAndNotes]] =
recentUnprocessed(nb * 2) |+| recentProcessed(nb) flatMap { all =>
val reports = all take nb
UserRepo byIds reports.map(_.user).distinct map { users =>
reports.flatMap { r =>
users.find(_.id == r.user) map { u =>
Report.WithUser(r, u, isOnline(u.id))
def unprocessedAndRecentWithFilter(nb: Int, reason: Option[Reason]): Fu[List[Report.WithUserAndNotes]] =
findRecent(nb * 2, unprocessedSelect ++ reasonSelect(reason)) |+|
findRecent(nb, processedSelect ++ reasonSelect(reason)) flatMap { all =>
val reports = all take nb
UserRepo byIds reports.map(_.user).distinct map { users =>
reports.flatMap { r =>
users.find(_.id == r.user) map { u =>
Report.WithUser(r, u, isOnline(u.id))
}
}
}
} map {
_.sortBy(-_.urgency).take(nb * 2)
} flatMap { withUsers =>
noteApi.byUserIdsForMod(withUsers.map(_.user.id).distinct) map { notes =>
withUsers.map { wu =>
Report.WithUserAndNotes(wu, notes.filter(_.to == wu.user.id))
}
}
}
} map {
_.sortBy(-_.urgency).take(nb * 2)
} flatMap { withUsers =>
noteApi.byUserIdsForMod(withUsers.map(_.user.id).distinct) map { notes =>
withUsers.map { wu =>
Report.WithUserAndNotes(wu, notes.filter(_.to == wu.user.id))
}
}
}
def unprocessedAndRecentWithFilter(nb: Int, reason: String): Fu[List[Report.WithUserAndNotes]] =
coll.find($doc("processedBy" -> $doc("$exists" -> false), "reason" -> reason)).sort($sort.createdDesc).list[Report](nb * 2) |+| coll.find($doc("processedBy" -> $doc("$exists" -> true), "reason" -> reason)).sort($sort.createdDesc).list[Report](nb) flatMap { all =>
val reports = all take nb
UserRepo byIds reports.map(_.user).distinct map { users =>
reports.flatMap { r =>
users.find(_.id == r.user) map { u =>
Report.WithUser(r, u, isOnline(u.id))
}
}
}
} map {
_.sortBy(-_.urgency).take(nb * 2)
} flatMap { withUsers =>
noteApi.byUserIdsForMod(withUsers.map(_.user.id).distinct) map { notes =>
withUsers.map { wu =>
Report.WithUserAndNotes(wu, notes.filter(_.to == wu.user.id))
}
}
}
private def findRecent(nb: Int, selector: Bdoc) =
coll.find(selector).sort($sort.createdDesc).list[Report](nb)
private def recentUnprocessed(nb: Int) =
coll.find(unprocessedSelect).sort($sort.createdDesc).list[Report](nb)
private def recentProcessed(nb: Int) =
coll.find(processedSelect).sort($sort.createdDesc).list[Report](nb)
private def selectRecent(user: User, reason: Reason) = $doc(
private def selectRecent(user: User, reason: Reason): Bdoc = $doc(
"createdAt" $gt DateTime.now.minusDays(7),
"user" -> user.id,
"reason" -> reason.name)