carpathianflorist
/
MarseyWorld
forked from MarseyWorld/MarseyWorld
1
0
Fork 0
Code Pull Requests Activity

fix 500 error

master
Aevann 2024-10-29 20:39:05 +03:00
parent 190e58903a
commit 998d41635a
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
files/routes/holes.py
View File

@ -891,9 +891,9 @@ def hole_log(v, hole):
kind = request.values.get("kind") kind = request.values.get("kind")
used_kinds = HOLEACTION_KINDS kinds = HOLEACTION_KINDS
if kind and kind not in used_kinds: if kind and kind not in kinds:
kind = None kind = None
actions = [] actions = []
total=0 total=0
@ -902,11 +902,11 @@ def hole_log(v, hole):
if mod_id: if mod_id:
actions = actions.filter_by(user_id=mod_id) actions = actions.filter_by(user_id=mod_id)
kinds = {x.kind for x in actions} new_kinds = {x.kind for x in actions}
if kind: kinds.add(kind) if kind: new_kinds.add(kind)
kinds2 = {} kinds2 = {}
for k,val in used_kinds.items(): for k,val in kinds.items():
if k in kinds: kinds2[k] = val if k in new_kinds: kinds2[k] = val
kinds = kinds2 kinds = kinds2
if kind: actions = actions.filter_by(kind=kind) if kind: actions = actions.filter_by(kind=kind)
total = actions.count() total = actions.count()

24
files/routes/static.py
View File

@ -249,12 +249,12 @@ def log(v):
if v.admin_level >= PERMS['USER_SHADOWBAN']: if v.admin_level >= PERMS['USER_SHADOWBAN']:
if v.admin_level >= PERMS['PROGSTACK']: if v.admin_level >= PERMS['PROGSTACK']:
used_kinds = MODACTION_KINDS kinds = MODACTION_KINDS
else: else:
used_kinds = MODACTION_KINDS__FILTERED kinds = MODACTION_KINDS__FILTERED
else: used_kinds = MODACTION_KINDS_FILTERED else: kinds = MODACTION_KINDS_FILTERED
if kind and kind not in used_kinds: if kind and kind not in kinds:
kind = None kind = None
actions = [] actions = []
total = 0 total = 0
@ -266,11 +266,11 @@ def log(v):
actions = actions.filter(ModAction.kind.notin_(MODACTION_PRIVILEGED__KINDS)) actions = actions.filter(ModAction.kind.notin_(MODACTION_PRIVILEGED__KINDS))
if admin_id: if admin_id:
actions = actions.filter_by(user_id=admin_id) actions = actions.filter_by(user_id=admin_id)
kinds = {x.kind for x in actions} new_kinds = {x.kind for x in actions}
kinds.add(kind) new_kinds.add(kind)
kinds2 = {} kinds2 = {}
for k,val in used_kinds.items(): for k,val in kinds.items():
if k in kinds: kinds2[k] = val if k in new_kinds: kinds2[k] = val
kinds = kinds2 kinds = kinds2
if target_id: if target_id:
target_post_ids = [x[0] for x in g.db.query(Post.id).filter_by(author_id=target_id)] target_post_ids = [x[0] for x in g.db.query(Post.id).filter_by(author_id=target_id)]
@ -280,11 +280,11 @@ def log(v):
ModAction.target_post_id.in_(target_post_ids), ModAction.target_post_id.in_(target_post_ids),
ModAction.target_comment_id.in_(target_comment_ids), ModAction.target_comment_id.in_(target_comment_ids),
)) ))
kinds = {x.kind for x in actions} new_kinds = {x.kind for x in actions}
kinds.add(kind) new_kinds.add(kind)
kinds2 = {} kinds2 = {}
for k,val in used_kinds.items(): for k,val in kinds.items():
if k in kinds: kinds2[k] = val if k in new_kinds: kinds2[k] = val
kinds = kinds2 kinds = kinds2
if kind: actions = actions.filter_by(kind=kind) if kind: actions = actions.filter_by(kind=kind)
total = actions.count() total = actions.count()