visibility-fix

This commit is contained in:
Untone 2024-01-23 19:51:26 +03:00
parent 3a6c805bcf
commit 987eb8c078
3 changed files with 5 additions and 5 deletions

View File

@ -8,7 +8,7 @@ from sqlalchemy.sql import union
from orm.author import Author from orm.author import Author
from orm.reaction import Reaction, ReactionKind from orm.reaction import Reaction, ReactionKind
from orm.shout import Shout, ShoutReactionsFollower from orm.shout import Shout, ShoutReactionsFollower, ShoutVisibility
from services.auth import login_required, add_user_role from services.auth import login_required, add_user_role
from services.db import local_session from services.db import local_session
from services.notify import notify_reaction from services.notify import notify_reaction
@ -142,7 +142,7 @@ async def set_published(session, shout_id, approver_id):
s = session.query(Shout).where(Shout.id == shout_id).first() s = session.query(Shout).where(Shout.id == shout_id).first()
s.published_at = int(time.time()) s.published_at = int(time.time())
s.published_by = approver_id s.published_by = approver_id
s.visibility = text("public") s.visibility = ShoutVisibility.PUBLIC.value
author = session.query(Author).filter(Author.id == s.created_by).first() author = session.query(Author).filter(Author.id == s.created_by).first()
if author: if author:
await add_user_role(str(author.user)) await add_user_role(str(author.user))
@ -152,7 +152,7 @@ async def set_published(session, shout_id, approver_id):
def set_hidden(session, shout_id): def set_hidden(session, shout_id):
s = session.query(Shout).where(Shout.id == shout_id).first() s = session.query(Shout).where(Shout.id == shout_id).first()
s.visibility = text("community") s.visibility = ShoutVisibility.COMMUNITY.value
session.add(s) session.add(s)
session.commit() session.commit()

View File

@ -431,7 +431,7 @@ async def load_shouts_random_topic(_, info, limit: int = 10):
joinedload(Shout.authors), joinedload(Shout.authors),
joinedload(Shout.topics), joinedload(Shout.topics),
) )
.filter(and_(Shout.deleted_at.is_(None), Shout.visibility == "public", Shout.topics.any(slug=topic.slug))) .filter(and_(Shout.deleted_at.is_(None), Shout.visibility == ShoutVisibility.PUBLIC.value, Shout.topics.any(slug=topic.slug)))
) )
aliased_reaction = aliased(Reaction) aliased_reaction = aliased(Reaction)

View File

@ -132,7 +132,7 @@ type Shout {
cover_caption: String cover_caption: String
layout: String! layout: String!
version_of: String version_of: String
visibility: ShoutVisibility visibility: String
updated_at: Int updated_at: Int
deleted_at: Int deleted_at: Int
published_at: Int published_at: Int