viewed fixed
This commit is contained in:
@@ -176,7 +176,7 @@ async def login(_, info, email: str, password: str = "", lang: str = "ru"):
|
||||
}
|
||||
except InvalidPassword:
|
||||
print(f"[auth] {email}: invalid password")
|
||||
raise InvalidPassword("invalid passoword") # contains webserver status
|
||||
raise InvalidPassword("invalid password") # contains webserver status
|
||||
# return {"error": "invalid password"}
|
||||
|
||||
|
||||
|
@@ -31,6 +31,7 @@ def apply_filters(q, filters, user=None):
|
||||
q = q.filter(Shout.createdAt > before)
|
||||
return q
|
||||
|
||||
|
||||
@query.field("loadShout")
|
||||
async def load_shout(_, info, slug):
|
||||
with local_session() as session:
|
||||
|
@@ -1,5 +1,5 @@
|
||||
from datetime import datetime, timedelta
|
||||
from sqlalchemy import and_, asc, desc, select, text, func, column
|
||||
from sqlalchemy import and_, asc, desc, select, text, func
|
||||
from sqlalchemy.orm import aliased
|
||||
|
||||
from auth.authenticate import login_required
|
||||
@@ -23,12 +23,10 @@ async def get_reaction_stat(reaction_id):
|
||||
def reactions_follow(user: User, slug: str, auto=False):
|
||||
with local_session() as session:
|
||||
following = (
|
||||
session.query(ShoutReactionsFollower)
|
||||
.where(and_(
|
||||
session.query(ShoutReactionsFollower).where(and_(
|
||||
ShoutReactionsFollower.follower == user.slug,
|
||||
ShoutReactionsFollower.shout == slug
|
||||
))
|
||||
.first()
|
||||
)).first()
|
||||
)
|
||||
if not following:
|
||||
following = ShoutReactionsFollower.create(
|
||||
@@ -43,12 +41,10 @@ def reactions_follow(user: User, slug: str, auto=False):
|
||||
def reactions_unfollow(user, slug):
|
||||
with local_session() as session:
|
||||
following = (
|
||||
session.query(ShoutReactionsFollower)
|
||||
.where(and_(
|
||||
session.query(ShoutReactionsFollower).where(and_(
|
||||
ShoutReactionsFollower.follower == user.slug,
|
||||
ShoutReactionsFollower.shout == slug
|
||||
))
|
||||
.first()
|
||||
)).first()
|
||||
)
|
||||
if following:
|
||||
session.delete(following)
|
||||
@@ -199,6 +195,7 @@ async def delete_reaction(_, info, rid):
|
||||
session.commit()
|
||||
return {}
|
||||
|
||||
|
||||
def map_result_item(result_item):
|
||||
reaction = result_item[0]
|
||||
user = result_item[1]
|
||||
|
Reference in New Issue
Block a user