From 7bf319b5f4d1f820f11e6b74f762056d36e943f2 Mon Sep 17 00:00:00 2001 From: Thibault Duplessis Date: Wed, 1 Jul 2020 11:53:13 +0200 Subject: [PATCH] better display closed accounts in mod view --- app/views/user/mod.scala | 3 ++- modules/security/src/main/UserSpy.scala | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/views/user/mod.scala b/app/views/user/mod.scala index c724a0d545..d91427f078 100644 --- a/app/views/user/mod.scala +++ b/app/views/user/mod.scala @@ -453,8 +453,8 @@ object mod { private val shadowban: Frag = iconTag("c") private val boosting: Frag = iconTag("9") private val engine: Frag = iconTag("n") + private val closed: Frag = iconTag("k") private val clean: Frag = iconTag("r") - private val closed = iconTag("k") private val reportban = iconTag("!") private val notesText = iconTag("m") private def markTd(nb: Int, content: => Frag) = @@ -683,6 +683,7 @@ object mod { alts.engines -> engine, alts.trolls -> shadowban, alts.alts -> alt, + alts.closed -> closed, alts.cleans -> clean ) collect { case (nb, tag) if nb > 4 => frag(List.fill(3)(tag), "+", nb - 3) diff --git a/modules/security/src/main/UserSpy.scala b/modules/security/src/main/UserSpy.scala index 1876331c01..63bd716c30 100644 --- a/modules/security/src/main/UserSpy.scala +++ b/modules/security/src/main/UserSpy.scala @@ -195,9 +195,10 @@ object UserSpy { lazy val engines = users.count(_.marks.engine) lazy val trolls = users.count(_.marks.troll) lazy val alts = users.count(_.marks.alt) - lazy val cleans = users.count(_.marks.clean) + lazy val closed = users.count(u => u.disabled && u.marks.clean) + lazy val cleans = users.count(u => u.enabled && u.marks.clean) def score = - (boosters * 10 + engines * 10 + trolls * 10 + alts * 10 + cleans) match { + (boosters * 10 + engines * 10 + trolls * 10 + alts * 10 + closed * 2 + cleans) match { case 0 => -999999 // rank empty alts last case n => n }