TriHard
/
rDrama
forked from rDrama/rDrama
1
0
Fork 0
Code Pull Requests Activity

get rid of g.referrer

master
Aevann 2023-10-10 22:30:52 +03:00
parent 8877e41dd9
commit 4e780473d8
1 changed files with 51 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

144
files/routes/chat.py
View File

@ -28,37 +28,17 @@ socketio = SocketIO(
muted = cache.get(f'muted') or {} muted = cache.get(f'muted') or {}
ALLOWED_REFERRERS = { messages = cache.get(f'messages') or {}
f'{SITE_FULL}/chat', online = {}
f'{SITE_FULL}/notifications/messages', typing = []
}
messages = cache.get(f'messages') or { cache.set('loggedin_chat', len(online), timeout=0)
f'{SITE_FULL}/chat': {},
}
typing = {
f'{SITE_FULL}/chat': [],
}
online = {
f'{SITE_FULL}/chat': {},
}
cache.set('loggedin_chat', len(online[f'{SITE_FULL}/chat']), timeout=0)
def set_g_referrer():
if request.referrer:
g.referrer = request.referrer.split('?')[0]
if g.referrer not in ALLOWED_REFERRERS:
g.referrer = None
else:
g.referrer = None
def auth_required_socketio(f): def auth_required_socketio(f):
def wrapper(*args, **kwargs): def wrapper(*args, **kwargs):
v = get_logged_in_user() v = get_logged_in_user()
if not v: return '', 401 if not v: return '', 401
if v.is_permabanned: return '', 403 if v.is_permabanned: return '', 403
set_g_referrer()
return make_response(f(*args, v=v, **kwargs)) return make_response(f(*args, v=v, **kwargs))
wrapper.__name__ = f.__name__ wrapper.__name__ = f.__name__
return wrapper return wrapper
@ -68,7 +48,6 @@ def is_not_banned_socketio(f):
v = get_logged_in_user() v = get_logged_in_user()
if not v: return '', 401 if not v: return '', 401
if v.is_suspended: return '', 403 if v.is_suspended: return '', 403
set_g_referrer()
return make_response(f(*args, v=v, **kwargs)) return make_response(f(*args, v=v, **kwargs))
wrapper.__name__ = f.__name__ wrapper.__name__ = f.__name__
return wrapper return wrapper
@ -77,7 +56,7 @@ CHAT_ERROR_MESSAGE = f"To prevent spam, you'll need {TRUESCORE_MINIMUM} truescor
@app.post('/refresh_chat') @app.post('/refresh_chat')
def refresh_chat(): def refresh_chat():
emit('refresh_chat', namespace='/', to=f'{SITE_FULL}/chat') emit('refresh_chat', namespace='/', to="chat")
return '' return ''
@app.get("/chat") @app.get("/chat")
@ -88,7 +67,7 @@ def chat(v):
if not v.allowed_in_chat: if not v.allowed_in_chat:
abort(403, CHAT_ERROR_MESSAGE) abort(403, CHAT_ERROR_MESSAGE)
displayed_messages = {k: val for k, val in messages[f"{SITE_FULL}/chat"].items() if val["user_id"] not in v.userblocks} displayed_messages = {k: val for k, val in messages.items() if val["user_id"] not in v.userblocks}
orgy = get_orgy(v) orgy = get_orgy(v)
if orgy: if orgy:
@ -105,9 +84,6 @@ def chat(v):
@socketio.on('speak') @socketio.on('speak')
@is_not_banned_socketio @is_not_banned_socketio
def speak(data, v): def speak(data, v):
if not g.referrer:
return '', 400
image = None image = None
if data['file']: if data['file']:
name = f'/chat_images/{time.time()}'.replace('.','') + '.webp' name = f'/chat_images/{time.time()}'.replace('.','') + '.webp'
@ -149,20 +125,20 @@ def speak(data, v):
refresh_online() refresh_online()
if not self_only: if not self_only:
identical = [x for x in list(messages[g.referrer].values())[-5:] if v.id == x['user_id'] and text == x['text']] identical = [x for x in list(messages.values())[-5:] if v.id == x['user_id'] and text == x['text']]
if len(identical) >= 3: shut_up() if len(identical) >= 3: shut_up()
if not self_only: if not self_only:
count = len([x for x in list(messages[g.referrer].values())[-12:] if v.id == x['user_id']]) count = len([x for x in list(messages.values())[-12:] if v.id == x['user_id']])
if count >= 10: shut_up() if count >= 10: shut_up()
if not self_only: if not self_only:
count = len([x for x in list(messages[g.referrer].values())[-25:] if v.id == x['user_id']]) count = len([x for x in list(messages.values())[-25:] if v.id == x['user_id']])
if count >= 20: shut_up() if count >= 20: shut_up()
data = { data = {
"id": id, "id": id,
"quotes": quotes if messages[g.referrer].get(quotes) else '', "quotes": quotes if messages.get(quotes) else '',
"hat": v.hat_active(v)[0], "hat": v.hat_active(v)[0],
"user_id": v.id, "user_id": v.id,
"username": v.username, "username": v.username,
@ -187,89 +163,77 @@ def speak(data, v):
if self_only or v.shadowbanned or execute_blackjack(v, None, text, "chat"): if self_only or v.shadowbanned or execute_blackjack(v, None, text, "chat"):
emit('speak', data) emit('speak', data)
else: else:
emit('speak', data, room=g.referrer, broadcast=True) emit('speak', data, room="chat", broadcast=True)
messages[g.referrer][id] = data messages[id] = data
messages[g.referrer] = dict(list(messages[g.referrer].items())[-250:]) messages = dict(list(messages.items())[-250:])
typing = [] typing = []
return '', 204 return ''
def refresh_online(): def refresh_online():
for li in online.values(): for k, val in list(online.items()):
for k, val in list(li.items()): if time.time() > val[0]:
if time.time() > val[0]: del online[k]
del li[k] if val[1] in typing:
if val[1] in typing[g.referrer]: typing.remove(val[1])
typing[g.referrer].remove(val[1])
data = [list(online[g.referrer].values()), muted] data = [list(online.values()), muted]
emit("online", data, room=g.referrer, broadcast=True) emit("online", data, room="chat", broadcast=True)
cache.set('loggedin_chat', len(online[f'{SITE_FULL}/chat']), timeout=0) cache.set('loggedin_chat', len(online), timeout=0)
@socketio.on('connect') @socketio.on('connect')
@auth_required_socketio @auth_required_socketio
def connect(v): def connect(v):
if not g.referrer: if request.referrer == f'{SITE_FULL}/notifications/messages':
return '', 400
if g.referrer == f'{SITE_FULL}/notifications/messages':
join_room(v.id) join_room(v.id)
return '' return ''
join_room(g.referrer) join_room("chat")
if v.username in typing[g.referrer]: if v.username in typing:
typing[g.referrer].remove(v.username) typing.remove(v.username)
emit('typing', typing[g.referrer], room=g.referrer) emit('typing', typing, room="chat")
return '', 204 return ''
@socketio.on('disconnect') @socketio.on('disconnect')
@auth_required_socketio @auth_required_socketio
def disconnect(v): def disconnect(v):
if g.referrer != f'{SITE_FULL}/notifications/messages': if request.referrer == f'{SITE_FULL}/notifications/messages':
for dictionary in online.values():
dictionary.pop(v.id, None)
if g.referrer and v.username in typing[g.referrer]:
typing[g.referrer].remove(v.username)
if not g.referrer:
return '', 400
elif g.referrer == f'{SITE_FULL}/notifications/messages':
leave_room(v.id) leave_room(v.id)
else: return ''
leave_room(g.referrer)
refresh_online()
return '', 204 online.pop(v.id, None)
if v.username in typing:
typing.remove(v.username)
leave_room("chat")
refresh_online()
return ''
@socketio.on('heartbeat') @socketio.on('heartbeat')
@auth_required_socketio @auth_required_socketio
def heartbeat(v): def heartbeat(v):
if g.referrer not in ALLOWED_REFERRERS:
return '', 400
expire_utc = int(time.time()) + 3610 expire_utc = int(time.time()) + 3610
already_there = online[g.referrer].get(v.id) already_there = online.get(v.id)
online[g.referrer][v.id] = (expire_utc, v.username, v.name_color, v.patron, v.id) online[v.id] = (expire_utc, v.username, v.name_color, v.patron, v.id)
if not already_there: if not already_there:
refresh_online() refresh_online()
return '', 204 return ''
@socketio.on('typing') @socketio.on('typing')
@is_not_banned_socketio @is_not_banned_socketio
def typing_indicator(data, v): def typing_indicator(data, v):
if not g.referrer: if data and v.username not in typing:
return '', 400 typing.append(v.username)
elif not data and v.username in typing:
typing.remove(v.username)
if data and v.username not in typing[g.referrer]: emit('typing', typing, room="chat", broadcast=True)
typing[g.referrer].append(v.username) return ''
elif not data and v.username in typing[g.referrer]:
typing[g.referrer].remove(v.username)
emit('typing', typing[g.referrer], room=g.referrer, broadcast=True)
return '', 204
@socketio.on('delete') @socketio.on('delete')
@ -277,17 +241,11 @@ def typing_indicator(data, v):
def delete(id, v): def delete(id, v):
set_g_referrer() set_g_referrer()
if not g.referrer: messages.pop(id, None)
return '', 400
for k, val in messages[g.referrer].items(): emit('delete', id, room="chat", broadcast=True)
if k == id:
del messages[g.referrer][k]
break
emit('delete', id, room=g.referrer, broadcast=True) return ''
return '', 204
def close_running_threads(): def close_running_threads():