better monitor mod actions and reports closed

to move charts from lichess to grafana

Author: ornicar

modules/mod/src/main/AssessApi.scala

@@ -150,11 +150,10 @@ final class AssessApi(
             .getTitle(userId)
             .flatMap:
               case None =>
-                modApi
-                  .autoMark(
-                    SuspectId(userId),
-                    playerAggregateAssessment.reportText(3)
-                  )(using UserId.lichessAsMe)
+                modApi.autoMark(
+                  SuspectId(userId),
+                  playerAggregateAssessment.reportText(3)
+                )(using UserId.lichessAsMe)
               case Some(_) =>
                 reportApi.autoCheatReport(userId, playerAggregateAssessment.reportText(3))
         case AccountAction.Report(_) =>

modules/mod/src/main/ModlogApi.scala

@@ -403,12 +403,12 @@ final class ModlogApi(repo: ModlogRepo, userRepo: UserRepo, ircApi: IrcApi, pres
             case u => u
 
   private def add(m: Modlog): Funit =
-    lila.mon.mod.log.create.increment()
+    lila.mon.mod.log.create(m.mod.userId, m.action).increment()
     lila.log("mod").info(m.toString)
     m.notable.so:
       coll.insert.one {
         bsonWriteObjTry[Modlog](m).get ++ (!m.isLichess).so($doc("human" -> true))
-      } >> (m.notableZulip.so(zulipMonitor(m)))
+      } >> m.notableZulip.so(zulipMonitor(m))
 
   private def zulipMonitor(m: Modlog): Funit =
     import lila.mod.Modlog as M

modules/mon/src/main/mon.scala

@@ -258,7 +258,8 @@ object actor:
 object mod:
   object report:
     val highest = gauge("mod.report.highest").withoutTags()
-    val close = counter("mod.report.close").withoutTags()
+    def close(mod: UserId, room: String) = counter("mod.report.close").withTags:
+      tags("mod" -> mod, "room" -> room)
     def create(reason: String, score: Int) =
       counter("mod.report.create").withTags:
         tags("reason" -> reason, "score" -> score)
@@ -268,7 +269,8 @@ object mod:
       val imageRequest = future("mod.report.automod.image.request")
       def imageFlagged(v: Boolean) = counter("mod.report.automod.image.flagged").withTag("flagged", v)
   object log:
-    val create = counter("mod.log.create").withoutTags()
+    def create(mod: UserId, action: String) = counter("mod.log.create").withTags:
+      tags("mod" -> mod, "action" -> action)
   object irwin:
     val report = counter("mod.report.irwin.report").withoutTags()
     val mark = counter("mod.report.irwin.mark").withoutTags()

modules/report/src/main/ReportApi.scala

@@ -314,16 +314,16 @@ final class ReportApi(
     deletedAppeal <- deleteIfAppealInquiry(report)
     _ <- (!deletedAppeal).so:
       doProcessReport($id(report.id), unsetInquiry = true)
-  yield onReportClose()
+  yield onReportClose(report.room)
 
   def autoProcess(sus: Suspect, rooms: Set[Room])(using MyId): Funit =
-    val selector = $doc(
-      "user" -> sus.user.id,
-      "room".$in(rooms),
-      "open" -> true
-    )
-    for _ <- doProcessReport(selector, unsetInquiry = true)
-    yield onReportClose()
+    val selector = $doc("user" -> sus.user.id, "room".$in(rooms), "open" -> true)
+    for
+      reports <- coll.list[Report](selector)
+      _ <- reports.sequentiallyVoid: report =>
+        onReportClose(report.room)
+        doProcessReport($id(report.id), unsetInquiry = true)
+    yield ()
 
   def automodComms(
       userText: String,
@@ -373,9 +373,9 @@ final class ReportApi(
           logger.warn(s"Comms automod failed for ${me.username} on $url: ${e.getMessage}", e)
           funit
 
-  private def onReportClose() =
+  private def onReportClose(room: Room)(using me: MyId) =
     maxScoreCache.invalidateUnit()
-    lila.mon.mod.report.close.increment()
+    lila.mon.mod.report.close(me, room.key).increment()
 
   private def deleteIfAppealInquiry(report: Report)(using me: MyId): Fu[Boolean] =
     if report.isAppealInquiryByMe