forked from rDrama/rDrama
fdMerge branch 'frost' of https://github.com/Aevann1/Drama into frost
commit
cd8f529b1e
|
@ -84,7 +84,11 @@ mail = Mail(app)
|
||||||
|
|
||||||
@app.before_request
|
@app.before_request
|
||||||
def 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:
|
with open('site_settings.json', 'r') as f:
|
||||||
app.config['SETTINGS'] = json.load(f)
|
app.config['SETTINGS'] = json.load(f)
|
||||||
|
|
||||||
|
@ -95,8 +99,6 @@ def before_request():
|
||||||
|
|
||||||
g.db = db_session()
|
g.db = db_session()
|
||||||
|
|
||||||
ua = request.headers.get("User-Agent","").lower()
|
|
||||||
|
|
||||||
if '; wv) ' in ua: g.webview = True
|
if '; wv) ' in ua: g.webview = True
|
||||||
else: g.webview = False
|
else: g.webview = False
|
||||||
|
|
||||||
|
|
|
@ -54,7 +54,9 @@ def get_logged_in_user():
|
||||||
if session["session_id"] in loggedout: del loggedout[session["session_id"]]
|
if session["session_id"] in loggedout: del loggedout[session["session_id"]]
|
||||||
loggedin[v.id] = timestamp
|
loggedin[v.id] = timestamp
|
||||||
else:
|
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])
|
g.loggedin_counter = len([x for x in loggedin.values() if timestamp-x<15*60])
|
||||||
cache.set(f'{SITE}_loggedin', loggedin)
|
cache.set(f'{SITE}_loggedin', loggedin)
|
||||||
|
|
|
@ -34,7 +34,7 @@ def loggedin_list(v):
|
||||||
@app.get('/admin/loggedout')
|
@app.get('/admin/loggedout')
|
||||||
@admin_level_required(2)
|
@admin_level_required(2)
|
||||||
def loggedout_list(v):
|
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)
|
return render_template("loggedout.html", v=v, users=users)
|
||||||
|
|
||||||
@app.get('/admin/merge/<id1>/<id2>')
|
@app.get('/admin/merge/<id1>/<id2>')
|
||||||
|
|
|
@ -188,9 +188,6 @@ def sign_up_get(v):
|
||||||
|
|
||||||
if v: return redirect(SITE_FULL)
|
if v: return redirect(SITE_FULL)
|
||||||
|
|
||||||
agent = request.headers.get("User-Agent")
|
|
||||||
if not agent: abort(403)
|
|
||||||
|
|
||||||
ref = request.values.get("ref")
|
ref = request.values.get("ref")
|
||||||
|
|
||||||
if ref:
|
if ref:
|
||||||
|
@ -234,9 +231,6 @@ def sign_up_post(v):
|
||||||
|
|
||||||
if v: abort(403)
|
if v: abort(403)
|
||||||
|
|
||||||
agent = request.headers.get("User-Agent")
|
|
||||||
if not agent: abort(403)
|
|
||||||
|
|
||||||
form_timestamp = request.values.get("now", '0')
|
form_timestamp = request.values.get("now", '0')
|
||||||
form_formkey = request.values.get("formkey", "none")
|
form_formkey = request.values.get("formkey", "none")
|
||||||
|
|
||||||
|
|
|
@ -25,6 +25,7 @@
|
||||||
<li><a href="/agendaposters">Users with Chud Theme</a></li>
|
<li><a href="/agendaposters">Users with Chud Theme</a></li>
|
||||||
<li><a href="/grassed">Currently Grassed Users</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/loggedin">Currently Logged-in Users</a></li>
|
||||||
|
<li><a href="/admin/loggedout">Currently Logged-out Users</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
<h4>Safety</h4>
|
<h4>Safety</h4>
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
<img src="/e/marseylowpoly.webp" height=18 width=28>
|
<img src="/e/marseylowpoly.webp" height=18 width=28>
|
||||||
|
|
||||||
{% if v and v.admin_level > 1 %}
|
{% 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 %}
|
{% else %}
|
||||||
People here now: {{g.loggedin_counter}} logged in, {{g.loggedout_counter}} logged out
|
People here now: {{g.loggedin_counter}} logged in, {{g.loggedout_counter}} logged out
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
|
@ -43,7 +43,7 @@ set VISITORS_HERE_FLAVOR = [
|
||||||
|
|
||||||
<p class="mt-1 ml-2 mb-4 text-center text-lg">
|
<p class="mt-1 ml-2 mb-4 text-center text-lg">
|
||||||
{% if v and v.admin_level > 1 %}
|
{% 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 %}
|
{% else %}
|
||||||
{{g.loggedin_counter}} logged in, {{g.loggedout_counter}} logged out
|
{{g.loggedin_counter}} logged in, {{g.loggedout_counter}} logged out
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
Loading…
Reference in New Issue