Misc bug fixes

controllers/api/bot/faction.py

@@ -44,7 +44,7 @@ def faction_setter(guild_id: int, *args, **kwargs):
         return make_exception_response("4020", key)
 
     try:
-        Faction.select().get_by_id(faction_tid)
+        Faction.select().where(Faction.tid == faction_tid).get()
     except DoesNotExist:
         return make_exception_response("1102", key)
 

controllers/api/bot/verify.py

@@ -26,7 +26,7 @@
 def jsonified_verify_config(guild: Server):
     return jsonify(
         {
-            "enabled": guild.config.get("verify"),
+            "enabled": guild.verify_enabled,
             "verify_template": guild.verify_template,
             "verified_roles": guild.verified_roles,
             "faction_verify": guild.faction_verify,
@@ -76,9 +76,11 @@ def guild_verification(*args, **kwargs):
     if kwargs["user"].tid not in guild.admins:
         return make_exception_response("4020", key)
 
+    # TODO: Replace below error messages
+
     if request.method == "POST":
-        if guild.config.get("verify") in (None, 0):
-            guild.config["verify"] = 1
+        if not guild.verify_enabled:
+            guild.verify_enabled = True
             guild.save()
         else:
             return make_exception_response(
@@ -90,8 +92,8 @@ def guild_verification(*args, **kwargs):
                 },
             )
     elif request.method == "DELETE":
-        if guild.config.get("verify") in (None, 1):
-            guild.config["verify"] = 0
+        if guild.config.verify_enabled:
+            guild.verify_enabled = False
             guild.save()
         else:
             return make_exception_response(

controllers/authroutes.py

@@ -35,7 +35,6 @@
 from tornium_celery.tasks.misc import send_dm
 from tornium_celery.tasks.user import update_user
 from tornium_commons import Config, rds
-from tornium_commons.db_connection import requires_db_connection
 from tornium_commons.errors import MissingKeyError, NetworkingError, TornError
 from tornium_commons.models import User
 from tornium_commons.skyutils import SKYNET_INFO
@@ -50,7 +49,6 @@
 config = Config.from_json()
 
 
-@requires_db_connection
 @mod.route("/login", methods=["GET", "POST"])
 def login(*args, **kwargs):
     if request.method == "GET":

controllers/bot/oc.py

@@ -18,8 +18,8 @@
 
 
 @fresh_login_required
-def oc_dashboard(guildid):
+def oc_dashboard(guild_id):
     return render_template(
         "bot/oc.html",
-        guildid=guildid,
+        guildid=guild_id,
     )

controllers/faction/members.py

@@ -18,13 +18,11 @@
 
 from flask import render_template
 from flask_login import current_user, login_required
-from tornium_commons import requires_db_connection
 from tornium_commons.models import Faction, User
 
 from controllers.faction.decorators import fac_required
 
 
-@requires_db_connection
 @login_required
 @fac_required
 def members(*args, **kwargs):