stop counting viewers of broadcast rounds finished 3 days ago

Author: ornicar

modules/relay/src/main/RelayRound.scala

@@ -71,6 +71,10 @@ case class RelayRound(
       case Some(at) => at.isBefore(nowInstant.minusHours(3))
       case None => createdAt.isBefore(nowInstant.minusDays(1))
 
+  def daysSinceFinished =
+    import java.time.temporal.ChronoUnit
+    finishedAt.map(ChronoUnit.DAYS.between(_, nowInstant))
+
   def withSync(f: Update[RelayRound.Sync]) = copy(sync = f(sync))
 
   def withTour(tour: RelayTour) = RelayRound.WithTour(this, tour)

modules/relay/src/main/RelayStatsApi.scala

@@ -14,20 +14,24 @@ final class RelayStatsApi(colls: RelayColls, viewerCount: lila.memo.ViewerCountA
   import RelayStats.*
 
   object viewers:
-    private def maxCountIfRecent(tour: RelayTour) =
-      tour.tier
-        .map:
-          case RelayTour.Tier.normal => 1_000
-          case RelayTour.Tier.high => 10_000
-          case RelayTour.Tier.best => 100_000
-        .ifTrue(tour.daysSinceFinished.forall(_ <= 1))
+
     def hit(rt: RelayRound.WithTour)(using ctx: lila.ui.Context): Unit =
-      maxCountIfRecent(rt.tour).foreach: maxCount =>
+      maxCountIfRecent(rt).foreach: maxCount =>
         viewerCount.hit(rt.round.id.value, maxCount)(ctx.req, ctx.userId)
+
     def get(rt: RelayRound.WithTour): Fu[Int] =
-      maxCountIfRecent(rt.tour).nonEmpty.so:
+      maxCountIfRecent(rt).nonEmpty.so:
         rt.tour.official.so(viewerCount.get(rt.round.id.value))
 
+    private def maxCountIfRecent(rt: RelayRound.WithTour) =
+      rt.tour.tier
+        .map:
+          case RelayTour.Tier.normal => 1_000
+          case RelayTour.Tier.high => 10_000
+          case RelayTour.Tier.best => 100_000
+        .ifTrue(rt.round.daysSinceFinished.forall(_ <= 3))
+        .ifTrue(rt.tour.daysSinceFinished.forall(_ <= 1))
+
   // one measurement by minute at most; the storage depends on it.
   scheduler.scheduleWithFixedDelay(2.minutes, 2.minutes)(() => record())