forked from rDrama/rDrama
Revert "only show "upload profile background" if user on desktop or uses transparent theme"
This reverts commit 7b0de3e79d
.
master
parent
8d9c7fe635
commit
ab7144d94a
|
@ -1,5 +1,4 @@
|
||||||
import secrets
|
import secrets
|
||||||
import user_agents
|
|
||||||
|
|
||||||
from files.helpers.const import *
|
from files.helpers.const import *
|
||||||
from files.helpers.settings import get_setting
|
from files.helpers.settings import get_setting
|
||||||
|
@ -22,6 +21,8 @@ def before_request():
|
||||||
if not g.agent and request.path != '/kofi':
|
if not g.agent and request.path != '/kofi':
|
||||||
return 'Please use a "User-Agent" header!', 403
|
return 'Please use a "User-Agent" header!', 403
|
||||||
|
|
||||||
|
ua = g.agent.lower()
|
||||||
|
|
||||||
if request.host != SITE:
|
if request.host != SITE:
|
||||||
return {"error": "Unauthorized host provided"}, 403
|
return {"error": "Unauthorized host provided"}, 403
|
||||||
|
|
||||||
|
@ -29,13 +30,11 @@ def before_request():
|
||||||
|
|
||||||
if not get_setting('bots') and request.headers.get("Authorization"): abort(403)
|
if not get_setting('bots') and request.headers.get("Authorization"): abort(403)
|
||||||
|
|
||||||
g.agent_parsed = str(user_agents.parse(g.agent))
|
if '; wv) ' in ua:
|
||||||
|
|
||||||
if '; wv) ' in g.agent.lower():
|
|
||||||
g.browser = 'webview'
|
g.browser = 'webview'
|
||||||
elif g.agent_parsed.startswith('Firefox / '):
|
elif ' firefox/' in ua:
|
||||||
g.browser = 'firefox'
|
g.browser = 'firefox'
|
||||||
elif any(g.agent_parsed.startswith(x) for x in ('iPhone', 'iPad', 'iPod', 'PC / Mac OS X')):
|
elif 'iphone' in ua or 'ipad' in ua or 'ipod' in ua or 'mac os' in ua:
|
||||||
g.browser = 'apple'
|
g.browser = 'apple'
|
||||||
else:
|
else:
|
||||||
g.browser = 'chromium'
|
g.browser = 'chromium'
|
||||||
|
|
|
@ -2,6 +2,8 @@ import time
|
||||||
|
|
||||||
from os import environ, listdir, path
|
from os import environ, listdir, path
|
||||||
|
|
||||||
|
import user_agents
|
||||||
|
|
||||||
from flask import g, session, has_request_context
|
from flask import g, session, has_request_context
|
||||||
from jinja2 import pass_context
|
from jinja2 import pass_context
|
||||||
|
|
||||||
|
@ -57,8 +59,9 @@ def calc_users():
|
||||||
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:
|
||||||
if 'spider' not in g.agent_parsed.lower() and 'bot' not in g.agent_parsed.lower():
|
ua = str(user_agents.parse(g.agent))
|
||||||
loggedout[session["session_id"]] = (timestamp, g.agent_parsed)
|
if 'spider' not in ua.lower() and 'bot' not in ua.lower():
|
||||||
|
loggedout[session["session_id"]] = (timestamp, ua)
|
||||||
|
|
||||||
loggedin = {k: v for k, v in loggedin.items() if (timestamp - v) < LOGGEDIN_ACTIVE_TIME}
|
loggedin = {k: v for k, v in loggedin.items() if (timestamp - v) < LOGGEDIN_ACTIVE_TIME}
|
||||||
loggedout = {k: v for k, v in loggedout.items() if (timestamp - v[0]) < LOGGEDIN_ACTIVE_TIME}
|
loggedout = {k: v for k, v in loggedout.items() if (timestamp - v[0]) < LOGGEDIN_ACTIVE_TIME}
|
||||||
|
|
|
@ -422,7 +422,7 @@
|
||||||
<i class="fas fa-image mr-1"></i>
|
<i class="fas fa-image mr-1"></i>
|
||||||
{% if v.profile_background %}
|
{% if v.profile_background %}
|
||||||
{{v.profile_background}}
|
{{v.profile_background}}
|
||||||
{% elif v.theme == 'transparent' or g.agent_parsed.startswith('PC / ') %}
|
{% else %}
|
||||||
Upload Profile Background
|
Upload Profile Background
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</label>
|
</label>
|
||||||
|
|
Loading…
Reference in New Issue