From 92a94c66ac8a60b40880b3e0c8f697278249584b Mon Sep 17 00:00:00 2001
From: Fluffy <michal-gdula@protonmail.com>
Date: Mon, 26 Jun 2023 22:40:51 +0000
Subject: [PATCH] general stuffs :3

---
 TFR/server/config.py                   |  4 ++--
 TFR/server/models.py                   |  1 -
 TFR/server/templates/views/scores.html | 17 +++++++++--------
 TFR/server/views.py                    | 13 ++++++-------
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/TFR/server/config.py b/TFR/server/config.py
index d92a7bf..d1c27e6 100644
--- a/TFR/server/config.py
+++ b/TFR/server/config.py
@@ -9,12 +9,12 @@ UPLOAD_EXTENSIONS = ["png", "jpg", "jpeg", "gif", "webp"]
 UPLOAD_RESOLUTION = 169
 UPLOAD_MAX_SIZE = 3 * 1024 * 1024  # 3MB
 
-GAME_VERSION = "alpha"
+GAME_VERSION = "alpha-expo"
 GAME_DIFFICULTY = 0
 
 GAME_VERSIONS = {
-    "alpha": "Alpha",
     "alpha-expo": "Alpha (Expo Build)",
+    "alpha": "Alpha",
 }
 GAME_DIFFICULTIES = {
     0: "Easy - Level 1",
diff --git a/TFR/server/models.py b/TFR/server/models.py
index 04d6485..364735d 100644
--- a/TFR/server/models.py
+++ b/TFR/server/models.py
@@ -86,7 +86,6 @@ class Users(db.Model, UserMixin):
 
     id = db.Column(db.Integer, primary_key=True)
     alt_id = db.Column(db.String, nullable=False, unique=True)
-    superuser = db.Column(db.Boolean, default=False)
 
     picture = db.Column(db.String)
 
diff --git a/TFR/server/templates/views/scores.html b/TFR/server/templates/views/scores.html
index 51c9e7e..1d1c6b6 100644
--- a/TFR/server/templates/views/scores.html
+++ b/TFR/server/templates/views/scores.html
@@ -51,14 +51,15 @@
 
                 <p>Joined {{ user.joined_at|timesince }}</p>
 
-                <hr>
-
-                <div class="profile-links">
-                    {% if user.discord %}<button class="discord"><i class="ph ph-discord-logo"></i></button>{% endif %}
-                    {% if user.twitter %}<a href="https://twitter.com/{{ user.twitter }}" class="twitter"><i class="ph ph-twitter-logo"></i></a>{% endif %}
-                    {% if user.twitch %}<a href="https://twitch.com/{{ user.twitch }}" class="twitch"><i class="ph ph-twitch-logo"></i></a>{% endif %}
-                    {% if user.youtube %}<a href="https://youtube.com/{{ user.youtube }}" class="youtube"><i class="ph ph-youtube-logo"></i></a>{% endif %}
-                </div>
+                {% if user.discord or user.twitter or user.twitch or user.youtube %}
+                    <hr>
+                    <div class="profile-links">
+                        {% if user.discord %}<button class="discord"><i class="ph ph-discord-logo"></i></button>{% endif %}
+                        {% if user.twitter %}<a href="https://twitter.com/{{ user.twitter }}" class="twitter"><i class="ph ph-twitter-logo"></i></a>{% endif %}
+                        {% if user.twitch %}<a href="https://twitch.com/{{ user.twitch }}" class="twitch"><i class="ph ph-twitch-logo"></i></a>{% endif %}
+                        {% if user.youtube %}<a href="https://youtube.com/{{ user.youtube }}" class="youtube"><i class="ph ph-youtube-logo"></i></a>{% endif %}
+                    </div>
+                {% endif %}
             </div>
         </div>
     {% endif %}
diff --git a/TFR/server/views.py b/TFR/server/views.py
index 00d65bb..bbe7227 100644
--- a/TFR/server/views.py
+++ b/TFR/server/views.py
@@ -34,15 +34,14 @@ def index():
         )
     else:
         user = Users.query.filter_by(username=user_arg).first()
-        # get all tags from the junction table and add them to a list of tags
-        tags = (
-            db.session.query(Tags)
-            .join(TagJunction)
-            .filter(TagJunction.user_id == user.id)
-            .all()
-        )
         if user:
             scores = scores.filter_by(user_id=user.id)
+            tags = (
+                db.session.query(Tags)
+                .join(TagJunction)
+                .filter(TagJunction.user_id == user.id)
+                .all()
+            )
         else:
             abort(404, "User not found")