Migrated to postgresql

.editorconfig

@@ -0,0 +1,16 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_new_line = true
+
+[*.{js,py,lua,txt}]
+charset = utf-8
+
+[*.{js,py}]
+indent_style = space
+indent_size = 4
+
+[*.html]
+indent_style = space
+indent_size = 4

.flake8

@@ -0,0 +1,16 @@
+[flake8]
+exclude = ./.tox,./.git,__pycache__,./venv,./docs
+max-line-length = 120
+extend-ignore =
+    # E203: Black autoformatting
+    E203,
+    # E266: multiple # in comment
+    E266,
+    # E402: invocation of ddtrace and other packages before normal packages
+    E402,
+    # E501: line too long
+    E501,
+    # F401: ?
+    F401,
+    # E712: peewee query (? == True)
+    E712

app.py

@@ -46,21 +46,12 @@
 import flask
 from flask_cors import CORS
 from flask_login import LoginManager, current_user
-from mongoengine import connect
+from peewee import JOIN, DoesNotExist
 from tornium_commons import Config, rds
 from tornium_commons.formatters import commas, rel_time, torn_timestamp
-from tornium_commons.models import FactionModel
+from tornium_commons.models import Faction
 
-config = Config().load()
-
-if not hasattr(sys, "_called_from_test"):
-    connect(
-        db="Tornium",
-        username=config["username"],
-        password=config["password"],
-        host=f'mongodb://{config["host"]}',
-        connect=False,
-    )
+config = Config.from_json()
 
 import utils
 
@@ -94,21 +85,22 @@ def init__app():
     from skynet import mod as skynet_mod
 
     app = flask.Flask(__name__)
-    if config["secret"] is None:
+    if config.flask_secret is None:
         app.secret_key = config.regen_secret()
     else:
-        app.secret_key = config["secret"]
+        app.secret_key = config.flask_secret
 
     app.config["REMEMBER_COOKIE_DURATION"] = 604800
     app.config["SESSION_COOKIE_SECURE"] = True
     app.config["SESSION_COOKIE_HTTPONLY"] = True
-    app.config["SESSION_COOKIE_SAMESITE"] = "Lax"
+    app.config["SESSION_COOKIE_SAMESITE"] = "strict"
+    app.config["SESSION_COOKIE_DOMAIN"] = config.flask_domain
 
     CORS(
         app,
         resources={
             r"/api/*": {"origins": "*"},
-            r"/*": {"origins": config["domain"]},
+            r"/*": {"origins": config.flask_domain},
         },
         supports_credentials=True,
     )
@@ -148,9 +140,9 @@ def init__app():
 
 @login_manager.user_loader
 def load_user(user_id):
-    from models.user import User
+    from models.user import AuthUser
 
-    return User(user_id)
+    return AuthUser.select().join(Faction, JOIN.LEFT_OUTER).where(AuthUser.tid == user_id).first()
 
 
 @login_manager.unauthorized_handler
@@ -173,16 +165,24 @@ def refresh_needed():
 
 @app.template_filter("reltime")
 def relative_time(s):
+    if s is None:
+        return ""
+    elif isinstance(s, datetime.datetime):
+        return rel_time(s)
+
     return rel_time(datetime.datetime.fromtimestamp(s))
 
 
 @app.template_filter("tcttime")
 def tct_time(s):
-    return torn_timestamp(int(s))
+    return torn_timestamp(s)
 
 
 @app.template_filter("commas")
 def commas_filter(s):
+    if s is None:
+        return ""
+
     return commas(int(s))
 
 
@@ -203,12 +203,12 @@ def join_list(iter: typing.Iterable[str], and_seperator=False):
 
 @app.template_filter("faction")
 def faction_filter(tid):
-    faction: typing.Optional[FactionModel] = FactionModel.objects(tid=int(tid)).first()
-
-    if faction is None or faction.name in ("", None):
+    try:
+        faction = Faction.select(Faction.name).where(Faction.tid == tid).get()
+    except DoesNotExist:
         return f"N/A {tid}"
-    else:
-        return f"{faction.name} [{faction.tid}]"
+
+    return f"{faction.name} [{tid}]"
 
 
 @app.before_request
@@ -253,9 +253,19 @@ def after_request(response: flask.Response):
             client_token = secrets.token_urlsafe()
 
             redis_client.set(
-                f"tornium:token:api:{client_token}", f"{int(time.time())}|{current_user.tid}", nx=True, ex=300
+                f"tornium:token:api:{client_token}",
+                f"{int(time.time())}|{current_user.tid}",
+                nx=True,
+                ex=300,
             )
 
-            response.set_cookie("token", client_token, max_age=300, secure=True, httponly=True, samesite="Strict")
+            response.set_cookie(
+                "token",
+                client_token,
+                max_age=300,
+                secure=True,
+                httponly=True,
+                samesite="Strict",
+            )
 
     return response

commands/commands.json

@@ -10,10 +10,11 @@
         "faction/banking/withdraw",
         "faction/data/faction",
         "notify/notify",
-        "stats/chainlist",
         "stats/stat",
         "stocks/stocks",
         "user/user"
     ],
-    "disabled": []
+    "disabled": [
+        "stats/chainlist"
+    ]
 }

controllers/__init__.py

@@ -30,11 +30,21 @@ def index():
     return render_template("index.html", extensions=extensions)
 
 
+@mod.route("/terms")
+def terms():
+    return render_template("terms.html")
+
+
+@mod.route("/privacy")
+def privacy():
+    return render_template("privacy.html")
+
+
 @mod.route("/settings")
 @fresh_login_required
 @token_required(setnx=True)
 def settings(*args, **kwargs):
-    if current_user.key == "":
+    if current_user.key in ("", None):
         obfuscated_key = "Not Set"
     else:
         obfuscated_key = current_user.key[:6] + "*" * 10

controllers/adminroutes.py

@@ -37,22 +37,30 @@ def load_user(tid):
         return (
             render_template("admin/load_user.html"),
             200,
-            {"Cache-Control": "no-cache, no-store, must-revalidate", "Pragma": "no-cache", "Expires": "0"},
+            {
+                "Cache-Control": "no-cache, no-store, must-revalidate",
+                "Pragma": "no-cache",
+                "Expires": "0",
+            },
         )
 
     passphrase = request.form.get("passphrase")
 
     if passphrase is None:
         return (
             render_template(
-                "errors/error.html", title="Invalid Passphrase", error="Your security passphrase was incorrect."
+                "errors/error.html",
+                title="Invalid Passphrase",
+                error="Your security passphrase was incorrect.",
             ),
             401,
         )
-    elif Config()["admin-passphrase"] != hashlib.sha512(passphrase.encode("utf-8")).hexdigest():
+    elif Config.from_cache()["admin-passphrase"] != hashlib.sha512(passphrase.encode("utf-8")).hexdigest():
         return (
             render_template(
-                "errors/error.html", title="Invalid Passphrase", error="Your security passphrase was incorrect."
+                "errors/error.html",
+                title="Invalid Passphrase",
+                error="Your security passphrase was incorrect.",
             ),
             401,
         )
@@ -61,12 +69,23 @@ def load_user(tid):
         user = OverrideUser(tid)
     except ValueError:
         return (
-            render_template("errors/error.html", title="Unknown User", error="This user is not found in the database."),
+            render_template(
+                "errors/error.html",
+                title="Unknown User",
+                error="This user is not found in the database.",
+            ),
             400,
         )
 
     if user.key == "":
-        return render_template("errors/error.html", title="Invalid User", error="This user is not signed in."), 400
+        return (
+            render_template(
+                "errors/error.html",
+                title="Invalid User",
+                error="This user is not signed in.",
+            ),
+            400,
+        )
 
     if user.discord_id not in (0, "", None):
         send_dm.delay(