have orgy chat be running at all times instead of the error message
parent
1bb16c6e65
commit
e28a748d81
|
@ -85,12 +85,12 @@ def orgy(v):
|
||||||
|
|
||||||
orgy = get_orgy()
|
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}
|
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')
|
@socketio.on('speak')
|
||||||
@is_not_banned_socketio
|
@is_not_banned_socketio
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
{% elif orgy.type == 'rumble' %}
|
{% elif orgy.type == 'rumble' %}
|
||||||
<iframe src="{{orgy.data}}" frameborder="0" allowfullscreen></iframe>
|
<iframe src="{{orgy.data}}" frameborder="0" allowfullscreen></iframe>
|
||||||
{% elif orgy.type == 'twitch' %}
|
{% 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' %}
|
{% elif orgy.type == 'file' %}
|
||||||
<meta name="referrer" content="strict-origin-when-cross-origin">
|
<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}}">
|
<video id="orgy-file" data-created_utc="{{orgy.real_created_utc}}" controls preload="none" src="{{orgy.data}}">
|
||||||
|
|
Loading…
Reference in New Issue