discours.io/core
5
0
Fork 0
Code Pull Requests Actions Projects Activity

unrated-fix
All checks were successful
Deploy on push / deploy (push) Successful in 1m14s
Details

Browse Source
This commit is contained in:
Untone 2024-10-24 16:27:16 +03:00
parent 9ac533ee73
commit a578e8160e
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
resolvers/reader.py
View File

@ -289,11 +289,12 @@ def apply_filters(q, filters, author_id=None):
), ),
) )
featured_filter = filters.get("featured", "") if "featured" in filters:
if featured_filter: featured_filter = filters.get("featured")
q = q.filter(Shout.featured_at.is_not(None)) if featured_filter:
elif "featured" in filters: q = q.filter(Shout.featured_at.is_not(None))
q = q.filter(Shout.featured_at.is_(None)) else:
q = q.filter(Shout.featured_at.is_(None))
else: else:
pass pass
by_layouts = filters.get("layouts") by_layouts = filters.get("layouts")
@ -461,7 +462,6 @@ async def load_shouts_search(_, _info, text, limit=50, offset=0):
@query.field("load_shouts_unrated") @query.field("load_shouts_unrated")
@login_required
async def load_shouts_unrated(_, info, limit: int = 50, offset: int = 0): async def load_shouts_unrated(_, info, limit: int = 50, offset: int = 0):
""" """
Загрузка публикаций с наименьшим количеством оценок. Загрузка публикаций с наименьшим количеством оценок.
@ -471,9 +471,6 @@ async def load_shouts_unrated(_, info, limit: int = 50, offset: int = 0):
:param offset: Смещение для пагинации. :param offset: Смещение для пагинации.
:return: Список публикаций с минимальным количеством оценок. :return: Список публикаций с минимальным количеством оценок.
""" """
author_id = info.context.get("author", {}).get("id")
if not author_id:
return []
q, aliased_reaction = query_shouts() q, aliased_reaction = query_shouts()
q = ( q = (
@ -482,7 +479,6 @@ async def load_shouts_unrated(_, info, limit: int = 50, offset: int = 0):
and_( and_(
aliased_reaction.shout == Shout.id, aliased_reaction.shout == Shout.id,
aliased_reaction.reply_to.is_(None), aliased_reaction.reply_to.is_(None),
aliased_reaction.created_by != author_id,
aliased_reaction.kind.in_([ReactionKind.LIKE.value, ReactionKind.DISLIKE.value]), aliased_reaction.kind.in_([ReactionKind.LIKE.value, ReactionKind.DISLIKE.value]),
), ),
) )
@ -493,7 +489,7 @@ async def load_shouts_unrated(_, info, limit: int = 50, offset: int = 0):
q = q.having(func.count(distinct(aliased_reaction.id)) <= 4) # 3 или менее голосов q = q.having(func.count(distinct(aliased_reaction.id)) <= 4) # 3 или менее голосов
q = q.order_by(func.random()) q = q.order_by(func.random())
return get_shouts_with_stats(q, limit, offset=offset, author_id=author_id) return get_shouts_with_stats(q, limit, offset=offset)
@query.field("load_shouts_random_top") @query.field("load_shouts_random_top")