From 8c880ff9ea43e13d6d69dbd0b4b41cd512e8e5ed Mon Sep 17 00:00:00 2001 From: tonyrewin Date: Sun, 13 Nov 2022 18:35:43 +0300 Subject: [PATCH] filter published for layouts, unset publishedAt --- resolvers/reactions.py | 4 ++-- resolvers/zine.py | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/resolvers/reactions.py b/resolvers/reactions.py index f29cb7b2..f1b789ad 100644 --- a/resolvers/reactions.py +++ b/resolvers/reactions.py @@ -125,6 +125,8 @@ def set_published(session, slug, publisher): def set_hidden(session, slug): s = session.query(Shout).where(Shout.slug == slug).first() s.visibility = 'authors' + s.publishedAt = None # TODO: discuss + s.publishedBy = None # TODO: store changes history in git session.add(s) session.commit() @@ -134,8 +136,6 @@ def set_hidden(session, slug): async def create_reaction(_, info, inp): user = info.context["request"].user - # TODO: filter allowed for post reaction kinds - with local_session() as session: reaction = Reaction.create(**inp) session.add(reaction) diff --git a/resolvers/zine.py b/resolvers/zine.py index 271740b5..6ca139a8 100644 --- a/resolvers/zine.py +++ b/resolvers/zine.py @@ -136,10 +136,11 @@ async def shouts_by_layout(param, info, layout, amount=100, offset=0): # for layout in ['image', 'audio', 'video', 'literature']: shouts_by_layout = list(ShoutsCache.by_layout.get(layout, [])) for s in shouts_by_layout: - for a in s.authors: - a.caption = await ShoutAuthorStorage.get_author_caption(s.slug, a.slug) - # if bool(s.publishedAt): - shouts[s.slug] = s + if s.visibility == 'public': # if bool(s.publishedAt): + shouts[s.slug] = s + for a in s.authors: + a.caption = await ShoutAuthorStorage.get_author_caption(s.slug, a.slug) + shouts_prepared = list(shouts.values()) # TODO: pick keyfunc according to kind of query