From a25ae48d06039d81bebf60bc7b8e1c650a1d0ddc Mon Sep 17 00:00:00 2001
From: 4cuck <40539855+4cuck@users.noreply.github.com>
Date: Fri, 23 Feb 2024 02:56:55 +0100
Subject: [PATCH] warn about caching hosts

---
 scanner/src/cache_update.rs    |  3 +-
 server/templates/about.html.j2 | 57 +++++++++++++++++++++-------------
 server/templates/rip.html.j2   |  1 +
 3 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/scanner/src/cache_update.rs b/scanner/src/cache_update.rs
index 3bbbc7e..0af1620 100644
--- a/scanner/src/cache_update.rs
+++ b/scanner/src/cache_update.rs
@@ -134,8 +134,7 @@ impl Scanner {
                 .as_ref()
                 .map_or(false, |url| current_version.is_same_repo(&url));
 
-            let is_bad_host =
-                (!last_check.healthy) && self.inner.config.bad_hosts.contains(&host.domain);
+            let is_bad_host = self.inner.config.bad_hosts.contains(&host.domain);
 
             let host_ping_data = ping_data.remove(&host.id);
             let last_healthy = last_healthy_check.remove(&host.id);
diff --git a/server/templates/about.html.j2 b/server/templates/about.html.j2
index b6ce145..d58af21 100644
--- a/server/templates/about.html.j2
+++ b/server/templates/about.html.j2
@@ -1,16 +1,18 @@
 {# SPDX-License-Identifier: AGPL-3.0-only #}
 <!DOCTYPE html>
 <html lang="en" data-bs-theme="dark">
-  <head>
-    <meta charset="utf-8">
-    <link href="/static/bootstrap.min.css" rel="stylesheet">
-    <meta name="robots" content="nofollow" />
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta name="author" content="" />
-    <title>About Nitter Instance Health</title>
-  </head>
-  <body>
-    <div class="container">
+
+<head>
+  <meta charset="utf-8">
+  <link href="/static/bootstrap.min.css" rel="stylesheet">
+  <meta name="robots" content="nofollow" />
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <meta name="author" content="" />
+  <title>About Nitter Instance Health</title>
+</head>
+
+<body>
+  <div class="container">
     <h1>Nitter instance uptime & health tracker</h1>
     <p><a href="/">Home</a></p>
     <p id="update-interval">Uptime check interval: {{uptime_interval_s}}s.</p>
@@ -20,38 +22,49 @@
     <p>The following paths are checked per instance:</p>
     <ul>
       {%- for path in checked_paths %}
-        <li><code>{{path}}</code></li>
+      <li><code>{{path}}</code></li>
       {%- endfor %}
     </ul>
 
     <h4>Table Explanations</h4>
     <ul>
       <li><code>Country</code> for the host country reported in the instance wiki.</li>
-      <li><code>Healthy</code> stands for hosts which are reachable and pass a content check. Known bad hosts are marked with a ❓, these instances block healthchecks.</li>
-      <li><code>Average Time</code> is the response time average over the last {{ping_avg_interval_h}} hours. This is not a network ping.</li>
+      <li><code>Healthy</code> stands for hosts which are reachable and pass a content check.<br>
+        Known bad hosts are marked with a ❓. These instances prevent healthchecks (for example though long caching).
+      </li>
+      <li><code>Average Time</code> is the response time average over the last {{ping_avg_interval_h}} hours. This is
+        not a network ping.</li>
       <li><code>All Time %</code> for all time percentage of the instance being healthy.</li>
       <li><code>RSS</code> whether the host has RSS feeds enabled.</li>
       <li><code>LSH</code> Last Seen Healthy, for the last time an instance was seen healthy.</li>
       <li><code>Nitter Version</code> which nitter version the host reports.</li>
       <li><code>Connectivity</code> the IP connectivity support. One of All, IPv4, IPv6</li>
-      <li><code>Points</code> is a weighted instance score based on the availability over the last 3h, 30 and 120 days, together with the version.</li>
+      <li><code>Points</code> is a weighted instance score based on the availability over the last 3h, 30 and 120 days,
+        together with the version.</li>
     </ul>
 
     <p>Settings for visible columns are stored locally per client.</p>
 
     <h4>API</h4>
     <p id="api">
-      The same data as visible in the website/table can also be fetched as JSON from <code>/api/v1/instances</code> (<a rel="nofollow" href="/api/v1/instances">link</a>).
-      Note that the data only changes in the intervals stated <a href="#update-interval">above</a>. Thus requesting it very often will get you rate limited.
+      The same data as visible in the website/table can also be fetched as JSON from <code>/api/v1/instances</code> (<a
+        rel="nofollow" href="/api/v1/instances">link</a>).
+      Note that the data only changes in the intervals stated <a href="#update-interval">above</a>. Thus requesting it
+      very often will get you rate limited.
     </p>
     <p>
-      Please <b>do not use instances listed here for scraping(<a rel="nofollow" href="https://en.wikipedia.org/wiki/Web_scraping">?</a>) !</b>
-      Instead <a href="https://github.com/zedeus/nitter/#docker">host your own</a> nitter instance, so public instances can be used by less tech savy people and not get overrun by you. You can get help with that at the listed matrix channel.
+      Please <b>do not use instances listed here for scraping(<a rel="nofollow"
+          href="https://en.wikipedia.org/wiki/Web_scraping">?</a>) !</b>
+      Instead <a href="https://github.com/zedeus/nitter/#docker">host your own</a> nitter instance, so public instances
+      can be used by less tech savy people and not get overrun by you. You can get help with that at the listed matrix
+      channel.
     </p>
-    <p>The purpose of this API is to serve services like Twiiit, Farside or people looking for indication that their RSS feed is down - but not scrapers. Scraping will bring the downfall of public instances.</p>
+    <p>The purpose of this API is to serve services like Twiiit, Farside or people looking for indication that their RSS
+      feed is down - but not scrapers. Scraping will bring the downfall of public instances.</p>
 
     <p><a rel="nofollow" href="https://github.com/4cuck/nitter-status">Sourcecode</a></p>
     <p>License: AGPL3</p>
-    </div>
-  </body>
-</html>
+  </div>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/server/templates/rip.html.j2 b/server/templates/rip.html.j2
index fa4cecd..7058161 100644
--- a/server/templates/rip.html.j2
+++ b/server/templates/rip.html.j2
@@ -58,6 +58,7 @@
     </div>
     <script type="text/javascript" src="/static/dygraph.min.js"></script>
     <script type="text/javascript" src="/static/history.2.js"></script>
+  </div>
 </body>
 
 </html>
\ No newline at end of file