Continued:

- also expose this flag in relation to used software (currently only mastodon
  and pleroma obsfucate)

diff --git a/api.py b/api.py
index 4b4b4da5eb2f04d5d3a869aabfcb41c6aaac6a30..2d3bbe1d7e650691bf8aa1b537c99e1769ea1457 100644 (file)
--- a/api.py
+++ b/api.py
@@ -71,6 +71,8 @@ def api_scoreboard(mode: str, amount: int):
         database.cursor.execute("SELECT last_status_code, COUNT(domain) AS score FROM instances WHERE last_status_code IS NOT NULL AND last_status_code != '200' GROUP BY last_status_code ORDER BY score DESC LIMIT ?", [amount])
     elif mode == "avg_peers":
         database.cursor.execute("SELECT software, AVG(total_peers) AS sum FROM instances WHERE software IS NOT NULL GROUP BY software HAVING sum>0 ORDER BY sum DESC LIMIT ?", [amount])
+    elif mode == "obsfucator":
+        database.cursor.execute("SELECT software, COUNT(domain) AS cnt FROM instances WHERE has_obsfucation IS NOT NULL GROUP BY software ORDER BY cnt DESC LIMIT ?", [amount])
     else:
         raise HTTPException(status_code=400, detail="No filter specified")
 
@@ -177,6 +179,8 @@ def scoreboard(request: Request, mode: str, amount: int):
         response = requests.get(f"http://{config.get('host')}:{config.get('port')}{config.get('base_url')}/api/scoreboard.json?mode=error_code&amount={amount}")
     elif mode == "avg_peers" and amount > 0:
         response = requests.get(f"http://{config.get('host')}:{config.get('port')}{config.get('base_url')}/api/scoreboard.json?mode=avg_peers&amount={amount}")
+    elif mode == "obsfucator" and amount > 0:
+        response = requests.get(f"http://{config.get('host')}:{config.get('port')}{config.get('base_url')}/api/scoreboard.json?mode=obsfucator&amount={amount}")
     else:
         raise HTTPException(status_code=400, detail="No filter specified")
 

diff --git a/templates/views/index.html b/templates/views/index.html
index 2cab61039971db5067ac229a273b7957d2fd36ed..87b5602f1acf5db7ee64f499df814550fd3c06f1 100644 (file)
--- a/templates/views/index.html
+++ b/templates/views/index.html
@@ -31,7 +31,8 @@
         <a href="{{base_url}}/scoreboard?mode=software&amp;amount=50">used software</a> /
         <a href="{{base_url}}/scoreboard?mode=command&amp;amount=10">commands</a> /
         <a href="{{base_url}}/scoreboard?mode=error_code&amp;amount=30">error codes</a> /
-        <a href="{{base_url}}/scoreboard?mode=avg_peers&amp;amount=30">average peers</a>
+        <a href="{{base_url}}/scoreboard?mode=avg_peers&amp;amount=30">average peers</a> /
+        <a href="{{base_url}}/scoreboard?mode=obsfucator&amp;amount=30">obsfucating software</a>
     </p>
 {% endblock %}
 {% block footer %}

diff --git a/templates/views/scoreboard.html b/templates/views/scoreboard.html
index 12fa8b6f5137da1ef36f3dace97c5fe37cf55377..b0612ceabbfb7fffed56e9f221eb1a69da22a883 100644 (file)
--- a/templates/views/scoreboard.html
+++ b/templates/views/scoreboard.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 
-{% block title %}Scoreboard - {% if mode == 'software' %}TOP {{amount}} used software{% elif mode == 'avg_peers' %}TOP {{amount}} average peer count{% elif mode == 'command' %}TOP {{amount}} commands{% elif mode == 'error_code' %}TOP {{amount}} error codes{% elif mode == 'reference' %}TOP {{amount}} referencing instances{% elif mode == 'blocked' %}TOP {{amount}} deferated instances{% elif mode == 'blocker' %}TOP {{amount}} deferating instances{% endif %}{% endblock %}
+{% block title %}Scoreboard - {% if mode == 'software' %}TOP {{amount}} used software{% elif mode == 'obsfucator' %}TOP {{amount}} obsfucating software{% elif mode == 'avg_peers' %}TOP {{amount}} average peer count{% elif mode == 'command' %}TOP {{amount}} commands{% elif mode == 'error_code' %}TOP {{amount}} error codes{% elif mode == 'reference' %}TOP {{amount}} referencing instances{% elif mode == 'blocked' %}TOP {{amount}} deferated instances{% elif mode == 'blocker' %}TOP {{amount}} deferating instances{% endif %}{% endblock %}
 
 {% block header %}
     {% if mode == 'blocker' %}
@@ -15,6 +15,10 @@
         <h1>TOP {{amount}} commands</h1>
     {% elif mode == 'error_code' %}
         <h1>TOP {{amount}} error codes</h1>
+    {% elif mode == 'avg_peers' %}
+        <h1>TOP {{amount}} average peer count</h1>
+    {% elif mode == 'obsfucator' %}
+        <h1>TOP {{amount}} obsfucating software</h1>
     {% endif %}
 {% endblock %}
 
@@ -23,8 +27,8 @@
         <table>
             <thead>
                 <th>№</th>
-                <th>{% if mode in ('software', 'avg_peers') %}Software{% elif mode == 'error_code' %}Error code{% else %}Instance{% endif %}</th>
-                <th>{% if mode == 'reference' %}References{% elif mode == 'avg_peers' %}Average{% elif mode in('software', 'error_code') %}Total{% else %}Blocks{% endif %}</th>
+                <th>{% if mode in ('software', 'avg_peers', 'obsfucator') %}Software{% elif mode == 'error_code' %}Error code{% else %}Instance{% endif %}</th>
+                <th>{% if mode == 'reference' %}References{% elif mode == 'avg_peers' %}Average{% elif mode in('software', 'error_code', 'obsfucator') %}Total{% else %}Blocks{% endif %}</th>
             </thead>
 
             <tbody>
@@ -32,7 +36,7 @@
                 <tr>
                     <td>{{loop.index}}</td>
                     <td>
-                        {% if mode in ('software', 'command', 'error_code', 'avg_peers') %}
+                        {% if mode in ('software', 'command', 'error_code', 'avg_peers', 'obsfucator') %}
                             {{entry['domain']}}
                         {% elif entry['domain'] == None %}
                             -