remotes/1693045480750635534/spooky-22
Aevann1 2022-01-22 22:03:46 +02:00
parent 65daa0d82c
commit 7c6a5c8b1e
3 changed files with 11 additions and 11 deletions

View File

@ -116,12 +116,11 @@ def after_request(response):
response.headers.add("X-Frame-Options", "deny")
return response
if not cache.get("marseys"):
with open("marseys.json", 'r') as f: cache.set("marseys", loads(f.read()))
with open("marseys.json", 'r') as f: cache.set("marseys", loads(f.read()))
from files.routes import *
def close_running_threads():
with open('marsey_count.json', 'w') as f: dump(cache.get("marseys"), f)
with open('marseys.json', 'w') as f: dump(cache.get("marseys"), f)
stdout.flush()
atexit.register(close_running_threads)

View File

@ -263,7 +263,7 @@ def sanitize(sanitized, noimages=False, alert=False, comment=False, edit=False):
if comment:
for emoji in marseys_used:
if emoji in marsey_count: marsey_count[emoji]["count"] += 1
marsey_count = cache.set("marseys", marsey_count)
cache.set("marseys", marsey_count)
return sanitized

View File

@ -241,13 +241,14 @@ def api_comment(v):
if ban.reason: reason += f" {ban.reason}"
return {"error": reason}, 401
existing = g.db.query(Comment.id).filter(Comment.author_id == v.id,
Comment.deleted_utc == 0,
Comment.parent_comment_id == parent_comment_id,
Comment.parent_submission == parent_submission,
Comment.body_html == body_html
).one_or_none()
if existing: return {"error": f"You already made that comment: /comment/{existing.id}"}, 409
if parent_post.id not in (37696,37697,37749,37833,37838):
existing = g.db.query(Comment.id).filter(Comment.author_id == v.id,
Comment.deleted_utc == 0,
Comment.parent_comment_id == parent_comment_id,
Comment.parent_submission == parent_submission,
Comment.body_html == body_html
).one_or_none()
if existing: return {"error": f"You already made that comment: /comment/{existing.id}"}, 409
if parent.author.any_block_exists(v) and v.admin_level < 2: return {"error": "You can't reply to users who have blocked you, or users you have blocked."}, 403