Revert "use redis for site settings instead of a json file"
This reverts commit a7b67db555
.
remotes/1693045480750635534/spooky-22
parent
d5ca8bf7cb
commit
f7cce1469c
|
@ -9,4 +9,5 @@ venv/
|
||||||
.vscode/
|
.vscode/
|
||||||
.sass-cache/
|
.sass-cache/
|
||||||
flask_session/
|
flask_session/
|
||||||
.DS_Store
|
.DS_Store
|
||||||
|
site_settings.json
|
|
@ -56,6 +56,7 @@ app.config['MAIL_USE_TLS'] = True
|
||||||
app.config['MAIL_USERNAME'] = environ.get("MAIL_USERNAME", "").strip()
|
app.config['MAIL_USERNAME'] = environ.get("MAIL_USERNAME", "").strip()
|
||||||
app.config['MAIL_PASSWORD'] = environ.get("MAIL_PASSWORD", "").strip()
|
app.config['MAIL_PASSWORD'] = environ.get("MAIL_PASSWORD", "").strip()
|
||||||
app.config['DESCRIPTION'] = environ.get("DESCRIPTION", "rdrama.net caters to drama in all forms such as: Real life, videos, photos, gossip, rumors, news sites, Reddit, and Beyond™. There isn't drama we won't touch, and we want it all!").strip()
|
app.config['DESCRIPTION'] = environ.get("DESCRIPTION", "rdrama.net caters to drama in all forms such as: Real life, videos, photos, gossip, rumors, news sites, Reddit, and Beyond™. There isn't drama we won't touch, and we want it all!").strip()
|
||||||
|
app.config['SETTINGS'] = {}
|
||||||
|
|
||||||
r=redis.Redis(host=environ.get("REDIS_URL", "redis://localhost"), decode_responses=True, ssl_cert_reqs=None)
|
r=redis.Redis(host=environ.get("REDIS_URL", "redis://localhost"), decode_responses=True, ssl_cert_reqs=None)
|
||||||
|
|
||||||
|
@ -81,9 +82,6 @@ cache = Cache(app)
|
||||||
Compress(app)
|
Compress(app)
|
||||||
mail = Mail(app)
|
mail = Mail(app)
|
||||||
|
|
||||||
if not cache.get(f'{app.config["SERVER_NAME"]}_settings'):
|
|
||||||
cache.set(f'{app.config["SERVER_NAME"]}_settings', {"Bots": True, "Fart mode": False, "Read-only mode": False, "Signups": True})
|
|
||||||
|
|
||||||
@app.before_request
|
@app.before_request
|
||||||
def before_request():
|
def before_request():
|
||||||
|
|
||||||
|
@ -92,7 +90,8 @@ def before_request():
|
||||||
|
|
||||||
ua = g.agent.lower()
|
ua = g.agent.lower()
|
||||||
|
|
||||||
app.config['SETTINGS'] = cache.get(f'{app.config["SERVER_NAME"]}_settings')
|
with open('site_settings.json', 'r') as f:
|
||||||
|
app.config['SETTINGS'] = json.load(f)
|
||||||
|
|
||||||
if request.host != app.config["SERVER_NAME"]: return {"error":"Unauthorized host provided."}, 401
|
if request.host != app.config["SERVER_NAME"]: return {"error":"Unauthorized host provided."}, 401
|
||||||
if request.headers.get("CF-Worker"): return {"error":"Cloudflare workers are not allowed to access this website."}, 401
|
if request.headers.get("CF-Worker"): return {"error":"Cloudflare workers are not allowed to access this website."}, 401
|
||||||
|
|
|
@ -506,8 +506,9 @@ def admin_git_head():
|
||||||
@admin_level_required(3)
|
@admin_level_required(3)
|
||||||
def change_settings(v, setting):
|
def change_settings(v, setting):
|
||||||
site_settings = app.config['SETTINGS']
|
site_settings = app.config['SETTINGS']
|
||||||
site_settings[setting] = not site_settings[setting]
|
site_settings[setting] = not site_settings[setting]
|
||||||
cache.set(f'{SITE}_settings', site_settings)
|
with open("site_settings.json", "w") as f:
|
||||||
|
json.dump(site_settings, f)
|
||||||
|
|
||||||
if site_settings[setting]: word = 'enable'
|
if site_settings[setting]: word = 'enable'
|
||||||
else: word = 'disable'
|
else: word = 'disable'
|
||||||
|
|
Loading…
Reference in New Issue