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

fixes

Browse Source
This commit is contained in:
Igor Lobanov 2022-11-18 03:19:10 +01:00
parent aee83c31b5
commit f0fc09b1a1
4 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resolvers/profile.py
View File

@ -210,5 +210,5 @@ async def load_authors_by(_, info, by, limit, offset):
for a in authors: for a in authors:
a.stat = await get_author_stat(a.slug) a.stat = await get_author_stat(a.slug)
authors = list(set(authors)) authors = list(set(authors))
authors = sorted(authors, key=lambda a: a["stat"].get(by.get("stat"))) # authors = sorted(authors, key=lambda a: a["stat"].get(by.get("stat")))
return authors return authors

12
resolvers/reactions.py
View File

@ -217,13 +217,10 @@ async def load_reactions_by(_, info, by, limit=50, offset=0):
:return: Reaction[] :return: Reaction[]
""" """
q = select(Reaction).options( q = select(Reaction).join(
selectinload(Reaction.shout), Shout
).where( ).where(
Reaction.deletedAt.is_(None) Reaction.deletedAt.is_(None)
).join(
Shout,
Shout.slug == Reaction.shout
) )
if by.get("slug"): if by.get("slug"):
q = q.filter(Shout.slug == by["slug"]) q = q.filter(Shout.slug == by["slug"])
@ -243,8 +240,9 @@ async def load_reactions_by(_, info, by, limit=50, offset=0):
if by.get("days"): if by.get("days"):
before = datetime.now() - timedelta(days=int(by["days"]) or 30) before = datetime.now() - timedelta(days=int(by["days"]) or 30)
q = q.filter(Reaction.createdAt > before) q = q.filter(Reaction.createdAt > before)
q = q.group_by(Shout.id).order_by(
desc(by.get("order") or "createdAt") q = q.group_by(Reaction.id).order_by(
desc(by.get("order") or Reaction.createdAt)
).limit(limit).offset(offset) ).limit(limit).offset(offset)
rrr = [] rrr = []

19
resolvers/zine.py
View File

@ -18,15 +18,18 @@ from services.stat.reacted import ReactedStorage
@query.field("loadShout") @query.field("loadShout")
async def load_shout(_, info, slug): async def load_shout(_, info, slug):
shout = select(Shout).options( with local_session() as session:
# TODO add cation shout = session.query(Shout).options(
selectinload(Shout.authors), # TODO add cation
selectinload(Shout.topics), selectinload(Shout.authors),
).where( selectinload(Shout.topics),
Shout.deletedAt.is_(None) ).filter(
).one() Shout.slug == slug
).filter(
Shout.deletedAt.is_(None)
).one()
return shout return shout
@query.field("loadShouts") @query.field("loadShouts")

4
schema.graphql
View File

@ -277,7 +277,7 @@ type Query {
userFollowedAuthors(slug: String!): [Author]! userFollowedAuthors(slug: String!): [Author]!
userFollowedTopics(slug: String!): [Topic]! userFollowedTopics(slug: String!): [Topic]!
authorsAll: [Author]! authorsAll: [Author]!
getAuthor(slug: String!): User! getAuthor(slug: String!): User
# collab # collab
getCollabs: [Collab]! getCollabs: [Collab]!
@ -286,7 +286,7 @@ type Query {
markdownBody(body: String!): String! markdownBody(body: String!): String!
# topics # topics
getTopic(slug: String!): Topic! getTopic(slug: String!): Topic
topicsAll: [Topic]! topicsAll: [Topic]!
topicsRandom(amount: Int): [Topic]! topicsRandom(amount: Int): [Topic]!
topicsByCommunity(community: String!): [Topic]! topicsByCommunity(community: String!): [Topic]!