Continued:

- row[] does already contain named keys, e.g. 'total_websites' so let's alias
  the COUNT() statement to such key name which reduces some code
- renamed 'blocks_recorded' to 'total_blocks'

diff --git a/daemon.py b/daemon.py
index 7d7626f7e2758fd479103a78c47353c00af6d4cb..0f87bec19818a541af76657ab332a405a4f0977e 100755 (executable)
--- a/daemon.py
+++ b/daemon.py
@@ -56,15 +56,10 @@ templates = Jinja2Templates(directory="templates")
 
 @router.get(config.get("base_url") + "/api/info.json", response_class=JSONResponse)
 def api_info():
-    database.cursor.execute("SELECT (SELECT COUNT(domain) FROM instances), (SELECT COUNT(domain) FROM instances WHERE software IN ('pleroma', 'mastodon', 'lemmy', 'friendica', 'misskey', 'peertube', 'takahe', 'gotosocial', 'brighteon', 'wildebeest', 'bookwyrm', 'mitra', 'areionskey', 'mammuthus', 'neodb', 'smithereen', 'vebinet')), (SELECT COUNT(blocker) FROM blocks), (SELECT COUNT(domain) FROM instances WHERE last_error_details IS NOT NULL)")
+    database.cursor.execute("SELECT (SELECT COUNT(domain) AS total_websites FROM instances), (SELECT COUNT(domain) AS supported_instances FROM instances WHERE software IN ('pleroma', 'mastodon', 'lemmy', 'friendica', 'misskey', 'peertube', 'takahe', 'gotosocial', 'brighteon', 'wildebeest', 'bookwyrm', 'mitra', 'areionskey', 'mammuthus', 'neodb', 'smithereen', 'vebinet')), (SELECT COUNT(blocker) FROM blocks) AS total_blocks, (SELECT COUNT(domain) AS erroneous_instances FROM instances WHERE last_error_details IS NOT NULL)")
     row = database.cursor.fetchone()
 
-    return JSONResponse(status_code=200, content={
-        "total_websites"     : row[0],
-        "supported_instances": row[1],
-        "blocks_recorded"    : row[2],
-        "erroneous_instances": row[3],
-    })
+    return JSONResponse(status_code=200, content=row)
 
 @router.get(config.get("base_url") + "/api/scoreboard.json", response_class=JSONResponse)
 def api_scoreboard(mode: str, amount: int):

diff --git a/templates/views/index.html b/templates/views/index.html
index 4974c1bd71b50341858bf30d1fc0ffbda4dea7bd..0b607dccbf4e565ba8a8ffb30d26d1eb38d7ce75 100644 (file)
--- a/templates/views/index.html
+++ b/templates/views/index.html
@@ -92,7 +92,7 @@
            <tr>
                <td>{{info.total_websites}}</td>
                <td>{{info.supported_instances}}</td>
-               <td>{{info.blocks_recorded}}</td>
+               <td>{{info.total_blocks}}</td>
                <td>{{info.erroneous_instances}}</td>
            </tr>
         </tbody>