forked from rDrama/rDrama
1
0
Fork 0
master
Aevann1 2022-05-26 22:49:36 +02:00
parent 4c8e88b758
commit d4f7f5497b
7 changed files with 12 additions and 13 deletions

View File

@ -84,7 +84,11 @@ mail = Mail(app)
@app.before_request
def before_request():
ua = request.headers.get("User-Agent")
if not ua: abort(403)
ua = ua.lower()
with open('site_settings.json', 'r') as f:
app.config['SETTINGS'] = json.load(f)
@ -95,8 +99,6 @@ def before_request():
g.db = db_session()
ua = request.headers.get("User-Agent","").lower()
if '; wv) ' in ua: g.webview = True
else: g.webview = False

View File

@ -54,7 +54,9 @@ def get_logged_in_user():
if session["session_id"] in loggedout: del loggedout[session["session_id"]]
loggedin[v.id] = timestamp
else:
loggedout[session["session_id"]] = (timestamp, str(user_agents.parse(request.headers.get("User-Agent"))))
ua = str(user_agents.parse(request.headers.get("User-Agent")))
if not ua.startswith('Spider'):
loggedout[session["session_id"]] = (timestamp, ua)
g.loggedin_counter = len([x for x in loggedin.values() if timestamp-x<15*60])
cache.set(f'{SITE}_loggedin', loggedin)

View File

@ -34,7 +34,7 @@ def loggedin_list(v):
@app.get('/admin/loggedout')
@admin_level_required(2)
def loggedout_list(v):
users = [val[1] for x,val in cache.get(f'{SITE}_loggedout').items() if time.time()-val[0]<15*60]
users = sorted([val[1] for x,val in cache.get(f'{SITE}_loggedout').items() if time.time()-val[0]<15*60])
return render_template("loggedout.html", v=v, users=users)
@app.get('/admin/merge/<id1>/<id2>')

View File

@ -188,9 +188,6 @@ def sign_up_get(v):
if v: return redirect(SITE_FULL)
agent = request.headers.get("User-Agent")
if not agent: abort(403)
ref = request.values.get("ref")
if ref:
@ -234,9 +231,6 @@ def sign_up_post(v):
if v: abort(403)
agent = request.headers.get("User-Agent")
if not agent: abort(403)
form_timestamp = request.values.get("now", '0')
form_formkey = request.values.get("formkey", "none")

View File

@ -25,6 +25,7 @@
<li><a href="/agendaposters">Users with Chud Theme</a></li>
<li><a href="/grassed">Currently Grassed Users</a></li>
<li><a href="/admin/loggedin">Currently Logged-in Users</a></li>
<li><a href="/admin/loggedout">Currently Logged-out Users</a></li>
</ul>
<h4>Safety</h4>

View File

@ -16,7 +16,7 @@
<img src="/e/marseylowpoly.webp" height=18 width=28>
{% if v and v.admin_level > 1 %}
People here now: <a href="/admin/loggedin">{{g.loggedin_counter}} logged in</a>, {{g.loggedout_counter}} logged out
People here now: <a href="/admin/loggedin">{{g.loggedin_counter}} logged in</a>, <a href="/admin/loggedout">{{g.loggedout_counter}} logged out</a>
{% else %}
People here now: {{g.loggedin_counter}} logged in, {{g.loggedout_counter}} logged out
{% endif %}

View File

@ -43,7 +43,7 @@ set VISITORS_HERE_FLAVOR = [
<p class="mt-1 ml-2 mb-4 text-center text-lg">
{% if v and v.admin_level > 1 %}
<a href="/admin/loggedin">{{g.loggedin_counter}} logged in</a>, {{g.loggedout_counter}} logged out
<a href="/admin/loggedin">{{g.loggedin_counter}} logged in</a>, <a href="/admin/loggedout">{{g.loggedout_counter}} logged out</a>
{% else %}
{{g.loggedin_counter}} logged in, {{g.loggedout_counter}} logged out
{% endif %}