From 0535319a72ca7c38c44f2268e61147ec7324d7dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Gl=C3=BCpker?= <git@wgmd.de>
Date: Sat, 8 Oct 2022 21:01:00 +0200
Subject: Rename old typo s/Premade/Premate

---
 SteamAPI.py                   |   2 +-
 main.py                       |  14 ++--
 pyproject.toml                |   2 +-
 static/style.css              |   3 +-
 templates/lobby_html.jinja    |   2 +-
 templates/premades_html.jinja | 159 ------------------------------------------
 templates/premates_html.jinja | 159 ++++++++++++++++++++++++++++++++++++++++++
 templates/server_html.jinja   |   2 +-
 8 files changed, 171 insertions(+), 172 deletions(-)
 delete mode 100644 templates/premades_html.jinja
 create mode 100644 templates/premates_html.jinja

diff --git a/SteamAPI.py b/SteamAPI.py
index 95a7105..3ac4eeb 100644
--- a/SteamAPI.py
+++ b/SteamAPI.py
@@ -371,7 +371,7 @@ class SteamAPI:
 
         return result
 
-    def getDataForPremadefinder(self, steamids):
+    def getDataForPrematefinder(self, steamids):
 
         futures = dict()
         futures["profiles"] = executor.submit(self.getProfiles, steamids)
diff --git a/main.py b/main.py
index 5fd96a1..febee60 100755
--- a/main.py
+++ b/main.py
@@ -180,10 +180,10 @@ def lobby():
     )
 
 
-@app.route("/premadefinder", methods=["GET", "POST"])
-def premades():
+@app.route("/prematefinder", methods=["GET", "POST"])
+def premates():
     steamids = []
-    premadedata = dict()
+    prematedata = dict()
     connections = set()
 
     if request.method == "POST":
@@ -197,21 +197,21 @@ def premades():
             )
 
         # Ask steam about profiles
-        premadedata = steam.getDataForPremadefinder(steamids)
+        prematedata = steam.getDataForPrematefinder(steamids)
 
         # Add connection between friends.
         # Friends are always bidirectional, so we use set and min/max to avoid duplicates
         for steamid in steamids:
-            for friend in premadedata[steamid]["_friends"]:
+            for friend in prematedata[steamid]["_friends"]:
                 if friend in steamids:
                     friend_a = min(steamid, friend)
                     friend_b = max(steamid, friend)
                     connections.add((friend_a, friend_b))
 
     return render_template(
-        "premades_html.jinja",
+        "premates_html.jinja",
         steamids=steamids,
-        profiles=premadedata,
+        profiles=prematedata,
         current_time=time.time(),
         connections=connections,
     )
diff --git a/pyproject.toml b/pyproject.toml
index ecb7ddb..3ac3b2f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "lobbyfinder"
 version = "0.1.0"
-description = "Page to join my friends lobbies and check for premades"
+description = "Page to join my friends lobbies and check for premates"
 authors = ["André Glüpker <andre@wgmd.de>"]
 
 [tool.poetry.dependencies]
diff --git a/static/style.css b/static/style.css
index 9544769..d76b111 100644
--- a/static/style.css
+++ b/static/style.css
@@ -106,7 +106,7 @@ div.form {
   border: 1px dashed gray;
   text-align: center;
 }
-div#premades {
+div#premates {
   border: 1px dashed rgb(150, 150, 0);
   height: 500px;
 }
@@ -271,4 +271,3 @@ span.snooze            { color: rgb(135, 134, 135); }
 span.lookingtotrade    { color: rgb(255, 255, 0); }
 span.lookingtoplay     { color: rgb(0, 255, 0); }
 span.offline,a.offline { color: rgb(137, 137, 137); }
-
diff --git a/templates/lobby_html.jinja b/templates/lobby_html.jinja
index 0564e55..e6ed28f 100644
--- a/templates/lobby_html.jinja
+++ b/templates/lobby_html.jinja
@@ -12,7 +12,7 @@
       <li class="menu"><a class="joinbutton" href="javascript:hideOffline();" id="offlinetoggle">Hide Offline</a></li>
       <li class="menu"><a href="javascript:location.reload();" class="joinbutton">Refresh</a></li>
       <li class="menu app"><a class="joinbutton" href="server">Serverinfo</a></li>
-      <li class="menu app"><a class="joinbutton" href="premadefinder">Premadefinder</a></li>
+      <li class="menu app"><a class="joinbutton" href="prematefinder">Prematefinder</a></li>
     </ul>
 
     {% with messages = get_flashed_messages() %}
diff --git a/templates/premades_html.jinja b/templates/premades_html.jinja
deleted file mode 100644
index 539815a..0000000
--- a/templates/premades_html.jinja
+++ /dev/null
@@ -1,159 +0,0 @@
-<html>
-  <head>
-    <title>Steam Premadefinder</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <link rel="stylesheet" type="text/css" href="static/style.css" />
-    <link rel="icon" type="image/png" href="static/favicon.png" />
-    <script src="static/vivagraph.min.js"></script>
-  </head>
-  <body onload="onLoad();">
-
-  <ul id="menu">
-    <li class="menu app"><a class="joinbutton" href="server">Serverinfo</a></li>
-    <li class="menu app"><a class="joinbutton" href="lobby">Lobbylinkfinder</a></li>
-  </ul>
-
-  <div class="form">
-    Copy&amp;Paste den Inhalt von 'status' aus der Konsole.<br />
-    <form action="premadefinder" method="post">
-      <textarea name="statustext" cols="75" rows="10"></textarea><br />
-      <input class="joinbutton" type="submit" value="Premades finden!" />
-    </form>
-  </div>
-
-  {% if steamids %}
-    <script type="text/javascript">
-      function onLoad() {
-        const graph = Viva.Graph.graph();
-
-        {% for steamid in steamids %}
-          graph.addNode('{{ steamid }}',
-            {
-              url: "{{ profiles[steamid]['avatarmedium'] }}",
-              name: "{{ profiles[steamid]['personaname']|e }}",
-              details1: "{{ profiles[steamid]['_ownedPlayedGames']|e }}",
-              details2: "{{ profiles[steamid]['_userstats']['total_time_played']|e }}",
-              friends: {% if profiles[steamid]['communityvisibilitystate'] == 3 %} "yes" {% else %} "no" {% endif %}
-            }
-          )
-        {% endfor %}
-
-        {% for connection in connections %}
-          graph.addLink("{{ connection[0] }}", "{{ connection[1] }}");
-        {% endfor %}
-
-        const graphics = Viva.Graph.View.svgGraphics()
-        graphics.node(
-          (node) => {
-            if (!node.data) return
-
-            const ui = Viva.Graph.svg('g')
-            ui.append(Viva.Graph.svg('text')
-              .attr('text-anchor', 'middle')
-              .attr('fill', 'rgb(150, 150, 0)')
-              .attr('x', '+16px')
-              .attr('y', '-8px')
-              .text(node.data.name)
-            )
-            ui.append(Viva.Graph.svg('image')
-              .attr('width', 32)
-              .attr('height', 32)
-              .link(node.data.url)
-            )
-            if (node.data.details1) {
-              const col = (node.data.details1 < 10 || node.data.details1 == 'n/a') ? 'rgb(150, 0, 0)' : 'rgb(150, 150, 0)'
-              ui.append(Viva.Graph.svg('text')
-                .attr('text-anchor', 'middle')
-                .attr('fill', col)
-                .attr('x', '+16px')
-                .attr('y', '+48px')
-                .text(`Steamspiele: ${node.data.details1}`)
-              )
-            }
-            if (node.data.details2) {
-              ui.append(Viva.Graph.svg('text')
-                .attr('text-anchor', 'middle')
-                .attr('fill', 'rgb(150, 150, 0)')
-                .attr('x', '+16px')
-                .attr('y', '+64px')
-                .text(`Spielzeit: ${Math.floor(node.data.details2 / 3600)}h`)
-              )
-            }
-            if (node.data.friends == 'no') {
-              ui.append(Viva.Graph.svg('rect')
-                .attr('width', 36)
-                .attr('height', 36)
-                .attr('x', '-2px')
-                .attr('y', '-2px')
-                .attr('fill', 'red')
-              )
-            }
-            return ui
-          }
-        )
-        .placeNode(
-          (nodeUI, pos) => {
-            nodeUI.attr('transform', `translate(${pos.x - 16}, ${pos.y - 16})`)
-          }
-        )
-
-        const layout = Viva.Graph.Layout.forceDirected(graph,
-          {
-            stableThreshold: 0.09,
-            springLength:    150,
-            springCoeff:     0.0008,
-            dragCoeff:       0.05,
-            gravity:         -1.0
-          }
-        )
-
-        const renderer = Viva.Graph.View.renderer(graph,
-          {
-            container: document.getElementById('premades'),
-            graphics:  graphics,
-            layout:    layout
-          }
-        )
-
-        renderer.run()
-      }
-      </script>
-
-    <div id="premades">
-    </div>
-
-    <div id="info">
-      <strong>Steamspiele</strong>: Anzahl von Steamspielen mit Spielzeit. <br \>
-      <strong>Spielzeit</strong>: Die aktive Spielzeit in CSGO. <br \>
-      <strong>Private Profile</strong> sind durch einen roten Rahmen gekennzeichnet. <br \>
-    </div>
-  {% endif %}
-
-  <hr />
-
-  {% for profile in profiles.values() %}
-    <div class="player">
-      <div class="interna">
-        <a href="{{ profile['profileurl'] }}">
-          <span class="steamname {{ state }}">{{ profile['personaname']|e }}</span><br />
-          <img src="{{ profile['avatarmedium'] }}" class="avatar {{ state }}" /><br />
-        </a>
-      </div>
-      <div class="interna stats">
-        {% if profile['communityvisibilitystate'] == 3 %}
-          Account erstellt am: {{ profile['timecreated'] | display_time }}<br />
-          Spiele in Besitz: {{ profile['_ownedPlayedGames']|e }}<br />
-          {% if profile['_userstats'] %}
-            Spielzeit: {{ profile['_userstats']['total_time_played']|display_age }}<br />
-          {% else %}
-            Spielzeit: N/A
-          {% endif %}
-        {% else %}
-         <span class="error">Profile private</span>
-        {% endif %}
-      </div>
-    </div>
-  {% endfor %}
-
-  </body>
-</html>
diff --git a/templates/premates_html.jinja b/templates/premates_html.jinja
new file mode 100644
index 0000000..b891bac
--- /dev/null
+++ b/templates/premates_html.jinja
@@ -0,0 +1,159 @@
+<html>
+  <head>
+    <title>Steam Prematefinder</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <link rel="stylesheet" type="text/css" href="static/style.css" />
+    <link rel="icon" type="image/png" href="static/favicon.png" />
+    <script src="static/vivagraph.min.js"></script>
+  </head>
+  <body onload="onLoad();">
+
+  <ul id="menu">
+    <li class="menu app"><a class="joinbutton" href="server">Serverinfo</a></li>
+    <li class="menu app"><a class="joinbutton" href="lobby">Lobbylinkfinder</a></li>
+  </ul>
+
+  <div class="form">
+    Copy&amp;Paste den Inhalt von 'status' aus der Konsole.<br />
+    <form action="prematefinder" method="post">
+      <textarea name="statustext" cols="75" rows="10"></textarea><br />
+      <input class="joinbutton" type="submit" value="Premates finden!" />
+    </form>
+  </div>
+
+  {% if steamids %}
+    <script type="text/javascript">
+      function onLoad() {
+        const graph = Viva.Graph.graph();
+
+        {% for steamid in steamids %}
+          graph.addNode('{{ steamid }}',
+            {
+              url: "{{ profiles[steamid]['avatarmedium'] }}",
+              name: "{{ profiles[steamid]['personaname']|e }}",
+              details1: "{{ profiles[steamid]['_ownedPlayedGames']|e }}",
+              details2: "{{ profiles[steamid]['_userstats']['total_time_played']|e }}",
+              friends: {% if profiles[steamid]['communityvisibilitystate'] == 3 %} "yes" {% else %} "no" {% endif %}
+            }
+          )
+        {% endfor %}
+
+        {% for connection in connections %}
+          graph.addLink("{{ connection[0] }}", "{{ connection[1] }}");
+        {% endfor %}
+
+        const graphics = Viva.Graph.View.svgGraphics()
+        graphics.node(
+          (node) => {
+            if (!node.data) return
+
+            const ui = Viva.Graph.svg('g')
+            ui.append(Viva.Graph.svg('text')
+              .attr('text-anchor', 'middle')
+              .attr('fill', 'rgb(150, 150, 0)')
+              .attr('x', '+16px')
+              .attr('y', '-8px')
+              .text(node.data.name)
+            )
+            ui.append(Viva.Graph.svg('image')
+              .attr('width', 32)
+              .attr('height', 32)
+              .link(node.data.url)
+            )
+            if (node.data.details1) {
+              const col = (node.data.details1 < 10 || node.data.details1 == 'n/a') ? 'rgb(150, 0, 0)' : 'rgb(150, 150, 0)'
+              ui.append(Viva.Graph.svg('text')
+                .attr('text-anchor', 'middle')
+                .attr('fill', col)
+                .attr('x', '+16px')
+                .attr('y', '+48px')
+                .text(`Steamspiele: ${node.data.details1}`)
+              )
+            }
+            if (node.data.details2) {
+              ui.append(Viva.Graph.svg('text')
+                .attr('text-anchor', 'middle')
+                .attr('fill', 'rgb(150, 150, 0)')
+                .attr('x', '+16px')
+                .attr('y', '+64px')
+                .text(`Spielzeit: ${Math.floor(node.data.details2 / 3600)}h`)
+              )
+            }
+            if (node.data.friends == 'no') {
+              ui.append(Viva.Graph.svg('rect')
+                .attr('width', 36)
+                .attr('height', 36)
+                .attr('x', '-2px')
+                .attr('y', '-2px')
+                .attr('fill', 'red')
+              )
+            }
+            return ui
+          }
+        )
+        .placeNode(
+          (nodeUI, pos) => {
+            nodeUI.attr('transform', `translate(${pos.x - 16}, ${pos.y - 16})`)
+          }
+        )
+
+        const layout = Viva.Graph.Layout.forceDirected(graph,
+          {
+            stableThreshold: 0.09,
+            springLength:    150,
+            springCoeff:     0.0008,
+            dragCoeff:       0.05,
+            gravity:         -1.0
+          }
+        )
+
+        const renderer = Viva.Graph.View.renderer(graph,
+          {
+            container: document.getElementById('premates'),
+            graphics:  graphics,
+            layout:    layout
+          }
+        )
+
+        renderer.run()
+      }
+      </script>
+
+    <div id="premates">
+    </div>
+
+    <div id="info">
+      <strong>Steamspiele</strong>: Anzahl von Steamspielen mit Spielzeit. <br \>
+      <strong>Spielzeit</strong>: Die aktive Spielzeit in CSGO. <br \>
+      <strong>Private Profile</strong> sind durch einen roten Rahmen gekennzeichnet. <br \>
+    </div>
+  {% endif %}
+
+  <hr />
+
+  {% for profile in profiles.values() %}
+    <div class="player">
+      <div class="interna">
+        <a href="{{ profile['profileurl'] }}">
+          <span class="steamname {{ state }}">{{ profile['personaname']|e }}</span><br />
+          <img src="{{ profile['avatarmedium'] }}" class="avatar {{ state }}" /><br />
+        </a>
+      </div>
+      <div class="interna stats">
+        {% if profile['communityvisibilitystate'] == 3 %}
+          Account erstellt am: {{ profile['timecreated'] | display_time }}<br />
+          Spiele in Besitz: {{ profile['_ownedPlayedGames']|e }}<br />
+          {% if profile['_userstats'] %}
+            Spielzeit: {{ profile['_userstats']['total_time_played']|display_age }}<br />
+          {% else %}
+            Spielzeit: N/A
+          {% endif %}
+        {% else %}
+         <span class="error">Profile private</span>
+        {% endif %}
+      </div>
+    </div>
+  {% endfor %}
+
+  </body>
+</html>
diff --git a/templates/server_html.jinja b/templates/server_html.jinja
index 7d4e5c7..01cecb2 100644
--- a/templates/server_html.jinja
+++ b/templates/server_html.jinja
@@ -10,7 +10,7 @@
 
   <ul id="menu">
     <li class="menu"><a href="javascript:location.reload();" class="joinbutton">Refresh</a></li>
-    <li class="menu app"><a class="joinbutton" href="premadefinder">Premadefinder</a></li>
+    <li class="menu app"><a class="joinbutton" href="prematefinder">Prematefinder</a></li>
     <li class="menu app"><a class="joinbutton" href="lobby">Lobbylinkfinder</a></li>
   </ul>
 
-- 
cgit v1.2.3