auto-visibility, schema upgrades
This commit is contained in:
parent
2e705fa2c9
commit
941f8cdd71
|
@ -148,6 +148,9 @@ async def migrate(entry, storage):
|
||||||
r["updatedAt"] = date_parse(entry["updatedAt"]) if "updatedAt" in entry else ts
|
r["updatedAt"] = date_parse(entry["updatedAt"]) if "updatedAt" in entry else ts
|
||||||
if entry.get("published"):
|
if entry.get("published"):
|
||||||
r["publishedAt"] = date_parse(entry.get("publishedAt", OLD_DATE))
|
r["publishedAt"] = date_parse(entry.get("publishedAt", OLD_DATE))
|
||||||
|
r["visibility"] = "public"
|
||||||
|
else:
|
||||||
|
r["visibility"] = "authors"
|
||||||
if "deletedAt" in entry:
|
if "deletedAt" in entry:
|
||||||
r["deletedAt"] = date_parse(entry["deletedAt"])
|
r["deletedAt"] = date_parse(entry["deletedAt"])
|
||||||
|
|
||||||
|
|
|
@ -229,6 +229,7 @@
|
||||||
"essay": "essay",
|
"essay": "essay",
|
||||||
"estetika": "aestetics",
|
"estetika": "aestetics",
|
||||||
"etika": "ethics",
|
"etika": "ethics",
|
||||||
|
"etno": "ethno",
|
||||||
"etnos": "ethnics",
|
"etnos": "ethnics",
|
||||||
"everyday-life": "everyday-life",
|
"everyday-life": "everyday-life",
|
||||||
"evgeniy-onegin": "eugene-onegin",
|
"evgeniy-onegin": "eugene-onegin",
|
||||||
|
|
|
@ -9,13 +9,14 @@ from base.resolvers import mutation, query
|
||||||
from orm.reaction import Reaction
|
from orm.reaction import Reaction
|
||||||
from orm.shout import Shout
|
from orm.shout import Shout
|
||||||
from orm.topic import Topic, TopicFollower
|
from orm.topic import Topic, TopicFollower
|
||||||
from orm.user import User, UserRole, Role, UserRating, AuthorFollower
|
from orm.user import AuthorFollower, Role, User, UserRating, UserRole
|
||||||
|
from services.auth.users import UserStorage
|
||||||
|
from services.stat.reacted import ReactedStorage
|
||||||
|
from services.zine.shoutscache import ShoutsCache
|
||||||
|
|
||||||
from .community import followed_communities
|
from .community import followed_communities
|
||||||
from .inbox.load import get_total_unread_counter
|
from .inbox.load import get_total_unread_counter
|
||||||
from .topics import get_topic_stat
|
from .topics import get_topic_stat
|
||||||
from services.auth.users import UserStorage
|
|
||||||
from services.zine.shoutscache import ShoutsCache
|
|
||||||
from services.stat.reacted import ReactedStorage
|
|
||||||
|
|
||||||
|
|
||||||
async def user_subscriptions(slug: str):
|
async def user_subscriptions(slug: str):
|
||||||
|
@ -34,7 +35,14 @@ async def get_author_stat(slug):
|
||||||
return {
|
return {
|
||||||
"followers": session.query(AuthorFollower).where(AuthorFollower.author == slug).count(),
|
"followers": session.query(AuthorFollower).where(AuthorFollower.author == slug).count(),
|
||||||
"followings": session.query(AuthorFollower).where(AuthorFollower.follower == slug).count(),
|
"followings": session.query(AuthorFollower).where(AuthorFollower.follower == slug).count(),
|
||||||
"rating": session.query(func.sum(UserRating.value)).where(UserRating.user == slug).first()
|
"rating": session.query(func.sum(UserRating.value)).where(UserRating.user == slug).first(),
|
||||||
|
"commented": session.query(
|
||||||
|
Reaction.id
|
||||||
|
).where(
|
||||||
|
Reaction.createdBy == slug
|
||||||
|
).filter(
|
||||||
|
func.length(Reaction.body) > 0
|
||||||
|
).count()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
|
||||||
from sqlalchemy import desc, and_
|
from sqlalchemy import and_, desc
|
||||||
|
|
||||||
from auth.authenticate import login_required
|
from auth.authenticate import login_required
|
||||||
from base.orm import local_session
|
from base.orm import local_session
|
||||||
from base.resolvers import mutation, query
|
from base.resolvers import mutation, query
|
||||||
from orm.reaction import Reaction
|
from orm.reaction import Reaction, ReactionKind
|
||||||
from orm.shout import ShoutReactionsFollower
|
from orm.shout import Shout, ShoutReactionsFollower
|
||||||
from orm.user import User
|
from orm.user import User
|
||||||
from services.auth.users import UserStorage
|
from services.auth.users import UserStorage
|
||||||
from services.stat.reacted import ReactedStorage
|
from services.stat.reacted import ReactedStorage
|
||||||
|
@ -57,6 +57,78 @@ def reactions_unfollow(user, slug):
|
||||||
session.commit()
|
session.commit()
|
||||||
|
|
||||||
|
|
||||||
|
def is_published_author(session, userslug):
|
||||||
|
''' checks if user has at least one publication '''
|
||||||
|
return session.query(
|
||||||
|
Shout
|
||||||
|
).where(
|
||||||
|
Shout.authors.contains(userslug)
|
||||||
|
).filter(
|
||||||
|
and_(
|
||||||
|
Shout.publishedAt.is_not(None),
|
||||||
|
Shout.deletedAt.is_(None)
|
||||||
|
)
|
||||||
|
).count() > 0
|
||||||
|
|
||||||
|
|
||||||
|
def check_to_publish(session, user, reaction):
|
||||||
|
''' set shout to public if publicated approvers amount > 4 '''
|
||||||
|
if not reaction.replyTo and reaction.kind in [
|
||||||
|
ReactionKind.ACCEPT,
|
||||||
|
ReactionKind.LIKE,
|
||||||
|
ReactionKind.PROOF
|
||||||
|
]:
|
||||||
|
if is_published_author(user):
|
||||||
|
# now count how many approvers are voted already
|
||||||
|
approvers_reactions = session.query(Reaction).where(Reaction.shout == reaction.shout).all()
|
||||||
|
approvers = [user.slug, ]
|
||||||
|
for ar in approvers_reactions:
|
||||||
|
a = ar.createdBy
|
||||||
|
if is_published_author(session, a):
|
||||||
|
approvers.append(a)
|
||||||
|
if len(approvers) > 4:
|
||||||
|
return True
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
|
def check_to_hide(session, user, reaction):
|
||||||
|
''' hides any shout if 20% of reactions are negative '''
|
||||||
|
if not reaction.replyTo and reaction.kind in [
|
||||||
|
ReactionKind.DECLINE,
|
||||||
|
ReactionKind.UNLIKE,
|
||||||
|
ReactionKind.UNPROOF
|
||||||
|
]:
|
||||||
|
# if is_published_author(user):
|
||||||
|
approvers_reactions = session.query(Reaction).where(Reaction.shout == reaction.shout).all()
|
||||||
|
declines = 0
|
||||||
|
for r in approvers_reactions:
|
||||||
|
if r.kind in [
|
||||||
|
ReactionKind.DECLINE,
|
||||||
|
ReactionKind.UNLIKE,
|
||||||
|
ReactionKind.UNPROOF
|
||||||
|
]:
|
||||||
|
declines += 1
|
||||||
|
if len(approvers_reactions) / declines < 5:
|
||||||
|
return True
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
|
def set_published(session, slug, publisher):
|
||||||
|
s = session.query(Shout).where(Shout.slug == slug).first()
|
||||||
|
s.publishedAt = datetime.now()
|
||||||
|
s.publishedBy = publisher
|
||||||
|
s.visibility = 'public'
|
||||||
|
session.add(s)
|
||||||
|
session.commit()
|
||||||
|
|
||||||
|
|
||||||
|
def set_hidden(session, slug):
|
||||||
|
s = session.query(Shout).where(Shout.slug == slug).first()
|
||||||
|
s.visibility = 'authors'
|
||||||
|
session.add(s)
|
||||||
|
session.commit()
|
||||||
|
|
||||||
|
|
||||||
@mutation.field("createReaction")
|
@mutation.field("createReaction")
|
||||||
@login_required
|
@login_required
|
||||||
async def create_reaction(_, info, inp):
|
async def create_reaction(_, info, inp):
|
||||||
|
@ -68,6 +140,14 @@ async def create_reaction(_, info, inp):
|
||||||
reaction = Reaction.create(**inp)
|
reaction = Reaction.create(**inp)
|
||||||
session.add(reaction)
|
session.add(reaction)
|
||||||
session.commit()
|
session.commit()
|
||||||
|
|
||||||
|
# self-regulation mechanics
|
||||||
|
|
||||||
|
if check_to_hide(session, user, reaction):
|
||||||
|
set_hidden(session, reaction.shout)
|
||||||
|
elif check_to_publish(session, user, reaction):
|
||||||
|
set_published(session, reaction.shout, reaction.createdBy)
|
||||||
|
|
||||||
ReactedStorage.react(reaction)
|
ReactedStorage.react(reaction)
|
||||||
try:
|
try:
|
||||||
reactions_follow(user, inp["shout"], True)
|
reactions_follow(user, inp["shout"], True)
|
||||||
|
|
|
@ -36,6 +36,7 @@ type AuthorStat {
|
||||||
followings: Int
|
followings: Int
|
||||||
followers: Int
|
followers: Int
|
||||||
rating: Int
|
rating: Int
|
||||||
|
commented: Int
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user