diff --git a/ennstatus/api/functions.py b/ennstatus/api/functions.py --- a/ennstatus/api/functions.py +++ b/ennstatus/api/functions.py @@ -75,10 +75,8 @@ def update_server(server, ip): if server['server_type'] == 'Bridge': server['obfs'] = literal_eval(server['obfs']) - for key in ('fingerprint', 'ip'): - if key in server: - del server[key] - + if 'ip' in server: + del server['ip'] else: if 'obfs' in server: del server['obfs'] diff --git a/ennstatus/templates/status/macros.html b/ennstatus/templates/status/macros.html --- a/ennstatus/templates/status/macros.html +++ b/ennstatus/templates/status/macros.html @@ -35,7 +35,7 @@ {% if server_type in ('Exit', 'Relay') %} {% set headers = ['#', 'Name', 'IP', 'Server Status', 'Tor Status', 'Country', 'Fingerprint', 'Last Updated (UTC)'] %} {% else %} - {% set headers = ['#', 'Name', 'Server Status', 'Tor Status', 'Country', 'OBFS', 'Last Updated (UTC)'] %} + {% set headers = ['#', 'Name', 'Server Status', 'Tor Status', 'Country', 'Fingerprint', 'OBFS', 'Last Updated (UTC)'] %} {% endif %}

{{ server_type }}

@@ -62,9 +62,8 @@ {% endfor %} - {% if server_type in ('Exit', 'Relay') %} - - {% else %} + + {% if server_type == 'Bridge' %} {% endif %}
{{ colorize_status(status) }}{{ create_country(server['country']) }}{{ create_fingerprint(server['fingerprint']) }}{{ create_fingerprint(server['fingerprint']) }}{{ colorize_obfs(server['obfs']) }}{{ server['last_updated'] }}