skorotkiewicz/rDrama
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

df

Browse source
This commit is contained in:
Aevann1 2021-07-24 23:20:28 +02:00
parent 13685da712
commit 6c3e41965a
1 changed files with 3 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

24
drama/helpers/get.py
View file

@ -89,20 +89,12 @@ def get_post(pid, v=None, graceful=False, **kwargs):
if v:
vt = g.db.query(Vote).filter_by(
user_id=v.id, submission_id=i).subquery()
mod = g.db.query(ModRelationship).filter_by(
user_id=v.id, accepted=True, invite_rescinded=False).subquery()
boardblocks = g.db.query(
BoardBlock).filter_by(user_id=v.id).subquery()
blocking = v.blocking.subquery()
items = g.db.query(
Submission,
vt.c.vote_type,
aliased(ModRelationship, alias=mod),
boardblocks.c.id,
blocking.c.id,
).options(
joinedload(Submission.author).joinedload(User.title)
)
if v.admin_level>=4:
@ -113,14 +105,6 @@ def get_post(pid, v=None, graceful=False, **kwargs):
vt,
vt.c.submission_id == Submission.id,
isouter=True
).join(
mod,
mod.c.board_id == Submission.board_id,
isouter=True
).join(
boardblocks,
boardblocks.c.board_id == Submission.board_id,
isouter=True
).join(
blocking,
blocking.c.target_id == Submission.author_id,
@ -132,9 +116,7 @@ def get_post(pid, v=None, graceful=False, **kwargs):
x = items[0]
x._voted = items[1] or 0
x._is_guildmaster = items[2] or 0
x._is_blocking_guild = items[3] or 0
x._is_blocking = items[4] or 0
x._is_blocking = items[2] or 0
else:
items = g.db.query(
@ -189,8 +171,8 @@ def get_posts(pids, sort="hot", v=None):
output = [p[0] for p in query]
for i in range(len(output)):
output[i]._voted = query[i][1] or 0
output[i]._is_blocking = query[i][4] or 0
output[i]._is_blocked = query[i][5] or 0
output[i]._is_blocking = query[i][2] or 0
output[i]._is_blocked = query[i][3] or 0
else:
query = g.db.query(
Submission,