carpathianflorist
/
MarseyWorld
forked from MarseyWorld/MarseyWorld
1
0
Fork 0
Code Pull Requests Activity

have orgy chat be running at all times instead of the error message

master
Aevann 2023-09-09 02:32:39 +03:00
parent 1bb16c6e65
commit e28a748d81
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
files/routes/chat.py
View File

@ -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

2
files/templates/orgy.html
View File

@ -20,7 +20,7 @@
{% elif orgy.type == 'rumble' %}
<iframe src="{{orgy.data}}" frameborder="0" allowfullscreen></iframe>
{% elif orgy.type == 'twitch' %}
<iframe src="https://player.twitch.tv/?channel={{orgy.data}}&parent={{site}}" frameborder="0" allowfullscreen></iframe>
<iframe src="https://player.twitch.tv/?channel={{orgy.data}}&parent={{SITE}}" frameborder="0" allowfullscreen></iframe>
{% elif orgy.type == 'file' %}
<meta name="referrer" content="strict-origin-when-cross-origin">
<video id="orgy-file" data-created_utc="{{orgy.real_created_utc}}" controls preload="none" src="{{orgy.data}}">