diff --git a/files/assets/css/main.css b/files/assets/css/main.css index 633c80c7d..70d6ebb0f 100644 --- a/files/assets/css/main.css +++ b/files/assets/css/main.css @@ -213,6 +213,7 @@ .fa-at:before{content:"\40"} .fa-ankh:before{content:"\f644"} .fa-quotes:before{content:"\e234"} +.fa-tv:before{content:"\f26c"} /* do not remove - fixes hand, talking, marsey-love components from breaking out of the comment box diff --git a/files/helpers/config/const.py b/files/helpers/config/const.py index 028452d71..facdf14a3 100644 --- a/files/helpers/config/const.py +++ b/files/helpers/config/const.py @@ -71,7 +71,6 @@ if SITE == 'staging.rdrama.net': LOGGED_IN_CACHE_KEY = "loggedin" LOGGED_OUT_CACHE_KEY = "loggedout" -CHAT_ONLINE_CACHE_KEY = "online" CASINO_RELEASE_DAY = 1662825600 diff --git a/files/routes/chat.py b/files/routes/chat.py index 1b8c08d42..5ab422259 100644 --- a/files/routes/chat.py +++ b/files/routes/chat.py @@ -42,7 +42,8 @@ online = { f'{SITE_FULL}/orgy': [], } -cache.set(CHAT_ONLINE_CACHE_KEY, len(online[f'{SITE_FULL}/chat']), timeout=0) +cache.set('loggedin_chat', len(online[f'{SITE_FULL}/chat']), timeout=0) +cache.set('loggedin_orgy', len(online[f'{SITE_FULL}/orgy']), timeout=0) def auth_required_socketio(f): def wrapper(*args, **kwargs): @@ -72,10 +73,6 @@ def chat(v): if not v.allowed_in_chat: abort(403, CHAT_ERROR_MESSAGE) - orgy = get_orgy() - if orgy: - return redirect('/orgy') - displayed_messages = {k: val for k, val in messages[f"{SITE_FULL}/chat"].items() if val["user_id"] not in v.userblocks} return render_template("chat.html", v=v, messages=displayed_messages) @@ -200,12 +197,8 @@ def speak(data, v): def refresh_online(): emit("online", [online[request.referrer], muted], room=request.referrer, broadcast=True) - if get_orgy(): - key = f'{SITE_FULL}/orgy' - else: - key = f'{SITE_FULL}/chat' - - cache.set(CHAT_ONLINE_CACHE_KEY, len(online[key]), timeout=0) + cache.set('loggedin_chat', len(online[f'{SITE_FULL}/chat']), timeout=0) + cache.set('loggedin_orgy', len(online[f'{SITE_FULL}/orgy']), timeout=0) @socketio.on('connect') @auth_required_socketio diff --git a/files/routes/jinja2.py b/files/routes/jinja2.py index fa5246e46..9b14bf279 100644 --- a/files/routes/jinja2.py +++ b/files/routes/jinja2.py @@ -7,6 +7,7 @@ from jinja2 import pass_context from PIL import ImageColor from files.classes.user import User +from files.classes.orgy import get_orgy from files.helpers.assetcache import assetcache_path from files.helpers.config.const import * from files.helpers.regex import * @@ -129,5 +130,5 @@ def inject_constants(): "CHUD_PHRASES":CHUD_PHRASES, "hasattr":hasattr, "calc_users":calc_users, "HOLE_INACTIVITY_DELETION":HOLE_INACTIVITY_DELETION, "MAX_IMAGE_AUDIO_SIZE_MB":MAX_IMAGE_AUDIO_SIZE_MB, "MAX_IMAGE_AUDIO_SIZE_MB_PATRON":MAX_IMAGE_AUDIO_SIZE_MB_PATRON, "MAX_VIDEO_SIZE_MB":MAX_VIDEO_SIZE_MB, "MAX_VIDEO_SIZE_MB_PATRON":MAX_VIDEO_SIZE_MB_PATRON, - "CURSORMARSEY_DEFAULT":CURSORMARSEY_DEFAULT, "SNAPPY_ID":SNAPPY_ID, + "CURSORMARSEY_DEFAULT":CURSORMARSEY_DEFAULT, "SNAPPY_ID":SNAPPY_ID, "get_orgy":get_orgy, "TRUESCORE_CC_CHAT_MINIMUM":TRUESCORE_CC_CHAT_MINIMUM, } diff --git a/files/routes/wrappers.py b/files/routes/wrappers.py index 7e709a88a..ca9ec99a0 100644 --- a/files/routes/wrappers.py +++ b/files/routes/wrappers.py @@ -31,11 +31,14 @@ def calc_users(): g.loggedin_counter = 0 g.loggedout_counter = 0 g.loggedin_chat = 0 + g.loggedin_orgy = 0 v = getattr(g, 'v', None) if g else None if has_request_context and g and g.desires_auth and not g.is_api_or_xhr: loggedin = cache.get(LOGGED_IN_CACHE_KEY) or {} loggedout = cache.get(LOGGED_OUT_CACHE_KEY) or {} - g.loggedin_chat = cache.get(CHAT_ONLINE_CACHE_KEY) or 0 + g.loggedin_chat = cache.get('loggedin_chat') or 0 + g.loggedin_orgy = cache.get('loggedin_orgy') or 0 + timestamp = int(time.time()) check_session_id() diff --git a/files/templates/admin/admin_home.html b/files/templates/admin/admin_home.html index 579556af4..b1f030ce6 100644 --- a/files/templates/admin/admin_home.html +++ b/files/templates/admin/admin_home.html @@ -4,6 +4,13 @@ {% block content %}

Admin Tools

+{% if v.admin_level >= PERMS['ORGIES'] %} +

Orgies

+ +{%- endif %} + {% if v.admin_level >= PERMS['USE_ADMIGGER_THREADS'] and (SITE_NAME == 'rDrama' or SIDEBAR_THREAD or BANNER_THREAD or BADGE_THREAD or SNAPPY_THREAD) %}

Add Stuff

{%- endif %} -{% if v.admin_level >= PERMS['ORGIES'] %} -

Misc

- -{%- endif %}

Statistics