From 528bb445993a9f5950ffbefbb2f74c61ff31721e Mon Sep 17 00:00:00 2001
From: Thibault Duplessis <thibault.duplessis@gmail.com>
Date: Fri, 10 Jan 2020 09:31:47 -0600
Subject: [PATCH] wait at least 5s before presenting timeout countdown

---
 modules/round/src/main/RoundDuct.scala | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/modules/round/src/main/RoundDuct.scala b/modules/round/src/main/RoundDuct.scala
index 36436e54d2..9360a9913d 100644
--- a/modules/round/src/main/RoundDuct.scala
+++ b/modules/round/src/main/RoundDuct.scala
@@ -91,14 +91,18 @@ final private[round] class RoundDuct(
       !botConnected && offlineSince.exists(_ < (nowMillis - timeoutMillis))
     } ?? !isHostingSimul
 
-    def millisToGone: Fu[Option[Long]] =
+    def showMillisToGone: Fu[Option[Long]] =
       if (botConnected) fuccess(none)
-      else
-        offlineSince ?? { since =>
+      else {
+        val now = nowMillis
+        offlineSince.filter { since =>
+          bye || (now - since) > 5000
+        } ?? { since =>
           isHostingSimul map {
-            !_ option (timeoutMillis + since - nowMillis)
+            !_ option (timeoutMillis + since - now)
           }
         }
+      }
 
     def setBotConnected(v: Boolean) =
       botConnected = v
@@ -461,7 +465,7 @@ final private[round] class RoundDuct(
         g.forceResignable ?? fuccess {
           Color.all.foreach { c =>
             if (!getPlayer(c).isOnline && getPlayer(!c).isOnline) {
-              getPlayer(c).millisToGone foreach {
+              getPlayer(c).showMillisToGone foreach {
                 _ ?? { millis =>
                   if (millis <= 0) notifyGone(c, true)
                   else if (g.clock.exists(_.remainingTime(c).millis > millis + 3000)) notifyGoneIn(c, millis)