diff --git a/files/routes/comments.py b/files/routes/comments.py index 1a8519500..98372e9ab 100644 --- a/files/routes/comments.py +++ b/files/routes/comments.py @@ -274,7 +274,7 @@ def api_comment(v): return {"error": "Invalid name!"}, 403 if "author" in marsey: author_id = get_user(marsey["author"]).id - elif "author_id" in marsey: author_id = marsey["author_id"] + elif "author_id" in marsey: author_id = int(marsey["author_id"]) else: abort(400) existing = g.db.query(Marsey.name).filter_by(name=name).one_or_none() diff --git a/files/routes/front.py b/files/routes/front.py index a220124d2..f0bccdfbc 100644 --- a/files/routes/front.py +++ b/files/routes/front.py @@ -131,13 +131,13 @@ def notifications(v): ) -@app.get("/") -@app.get("/logged_out") -@app.get("/s/") -@app.get("/logged_out/s/") +@app.get("/", subdomain="") +@app.get("/logged_out", subdomain="") +@app.get("/s/", subdomain="") +@app.get("/logged_out/s/", subdomain="") @limiter.limit("3/second;30/minute;1000/hour;5000/day") @auth_desired -def front_all(v, sub=None): +def front_all(v, sub=None, subdomain=None): if sub: sub = g.db.query(Sub).filter_by(name=sub.strip().lower()).one_or_none() if request.path.startswith('/s/') and not sub: abort(404) diff --git a/files/templates/emoji_modal.html b/files/templates/emoji_modal.html index 3d1725f01..d94d16bb1 100644 --- a/files/templates/emoji_modal.html +++ b/files/templates/emoji_modal.html @@ -94,4 +94,4 @@ - \ No newline at end of file + \ No newline at end of file