From e28a748d8171f8e8c7f55ccbc3fb9096eba6fe23 Mon Sep 17 00:00:00 2001 From: Aevann Date: Sat, 9 Sep 2023 02:32:39 +0300 Subject: [PATCH] have orgy chat be running at all times instead of the error message --- files/routes/chat.py | 8 ++++---- files/templates/orgy.html | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/files/routes/chat.py b/files/routes/chat.py index 706bb1d3e..32670772d 100644 --- a/files/routes/chat.py +++ b/files/routes/chat.py @@ -85,12 +85,12 @@ def orgy(v): orgy = get_orgy() - if not orgy: - abort(403, "An orgy isn't currently in progress!") - displayed_messages = {k: val for k, val in messages[f"{SITE_FULL}/orgy"].items() if val["user_id"] not in v.userblocks} - return render_template("orgy.html", v=v, messages=displayed_messages, orgy=orgy, site=SITE) + if not orgy: + return render_template("chat.html", v=v, messages=displayed_messages) + + return render_template("orgy.html", v=v, messages=displayed_messages, orgy=orgy) @socketio.on('speak') @is_not_banned_socketio diff --git a/files/templates/orgy.html b/files/templates/orgy.html index e13e65a7a..59a2551fd 100644 --- a/files/templates/orgy.html +++ b/files/templates/orgy.html @@ -20,7 +20,7 @@ {% elif orgy.type == 'rumble' %} {% elif orgy.type == 'twitch' %} - + {% elif orgy.type == 'file' %}