From d6126933ed92d232b60f36ac602069c65f17d0f6 Mon Sep 17 00:00:00 2001
From: Patric Stout <truebrain@openttd.org>
Date: Sat, 17 Jul 2021 11:34:15 +0200
Subject: [PATCH] Add: show in the server list and server detail if/what
 GameScript a server uses (#33)

---
 webclient/pages/servers.py                 |  10 +++++++++-
 webclient/static/img/server-gamescript.png | Bin 0 -> 4482 bytes
 webclient/templates/server_entry.html      |  10 ++++++++++
 webclient/templates/server_list.html       |   6 ++++++
 4 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 webclient/static/img/server-gamescript.png

diff --git a/webclient/pages/servers.py b/webclient/pages/servers.py
index 8b55d9e..ad42d11 100644
--- a/webclient/pages/servers.py
+++ b/webclient/pages/servers.py
@@ -10,6 +10,7 @@
     template,
 )
 
+GAMESCRIPT_VERSION_NONE = 4294967295  # (int32)-1 as uint32
 MAPSETS = {
     0: "Temperate",
     1: "Arctic",
@@ -165,6 +166,7 @@ def _list_servers(filter):
         servers_ipv6=servers_ipv6,
         filter=filter,
         mapsets=MAPSETS,
+        GAMESCRIPT_VERSION_NONE=GAMESCRIPT_VERSION_NONE,
     )
 
 
@@ -199,4 +201,10 @@ def server_entry(server_id):
 
     expire = datetime.utcfromtimestamp(_server_entry_cache[server_id]["expire"]).strftime("%Y-%m-%d %H:%M:%S") + " UTC"
 
-    return template("server_entry.html", server=server, expire=expire, mapsets=MAPSETS)
+    return template(
+        "server_entry.html",
+        server=server,
+        expire=expire,
+        mapsets=MAPSETS,
+        GAMESCRIPT_VERSION_NONE=GAMESCRIPT_VERSION_NONE,
+    )
diff --git a/webclient/static/img/server-gamescript.png b/webclient/static/img/server-gamescript.png
new file mode 100644
index 0000000000000000000000000000000000000000..501948b651a14541d876f69d814f14a706ceaf7b
GIT binary patch
literal 4482
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
Ug8gdQO8@`>07*qoM6N<$f))yVPyhe`

literal 0
HcmV?d00001

diff --git a/webclient/templates/server_entry.html b/webclient/templates/server_entry.html
index a498da7..de4f30b 100644
--- a/webclient/templates/server_entry.html
+++ b/webclient/templates/server_entry.html
@@ -95,6 +95,16 @@ <h1>{% block title %}{{ server["info"]["name"] }} {% endblock %}</h1>
                 {% endif %}
             </td>
         </tr>
+        <tr class="even">
+            <th>Gamescript:</th>
+            <td>
+                {% if server["info"]["gamescript_version"] and server["info"]["gamescript_version"] != GAMESCRIPT_VERSION_NONE %}
+                    {{ server["info"]["gamescript_name"] }} (v{{ server["info"]["gamescript_version"] }})
+                {% else %}
+                    None
+                {% endif %}
+            </td>
+        </tr>
         <tr class="odd">
             <th>NewGRFs in use:</th>
             <td>
diff --git a/webclient/templates/server_list.html b/webclient/templates/server_list.html
index f638388..ad1eef0 100644
--- a/webclient/templates/server_list.html
+++ b/webclient/templates/server_list.html
@@ -23,6 +23,7 @@ <h1>{% block title %}
         <th class="version">Version</th>
         <th class="icon-password"></th>
         <th class="icon-grf"></th>
+        <th class="icon-gamescript"></th>
     </tr>
 </thead>
 <tbody>
@@ -65,6 +66,11 @@ <h1>{% block title %}
                 <img src="/static/img/server-grf.png" alt="GRF" title="NewGRFs Required">
             {% endif %}
         </td>
+        <td class="image">
+            {% if server['info']['gamescript_version'] and server["info"]["gamescript_version"] != GAMESCRIPT_VERSION_NONE %}
+                <img src="/static/img/server-gamescript.png" alt="GS" title="Uses gamescript">
+            {% endif %}
+        </td>
     </tr>
 {% endfor %}
 </tbody>