Merge branch 'main' into following

resolvers/zine/profile.py

@@ -132,7 +132,7 @@ async def user_followers(_, _info, slug) -> List[User]:
     q = add_author_stat_columns(q)
 
     aliased_user = aliased(User)
-    q = q.join(AuthorFollower).join(
+    q = q.join(AuthorFollower, AuthorFollower.follower == User.id).join(
         aliased_user, aliased_user.id == AuthorFollower.author
     ).where(
         aliased_user.slug == slug

resolvers/zine/reactions.py

@@ -14,7 +14,7 @@ from orm.user import User
 def add_reaction_stat_columns(q):
     aliased_reaction = aliased(Reaction)
 
-    q = q.outerjoin(aliased_reaction).add_columns(
+    q = q.outerjoin(aliased_reaction, Reaction.id == aliased_reaction.replyTo).add_columns(
         func.sum(
             aliased_reaction.id
         ).label('reacted_stat'),
@@ -201,13 +201,14 @@ async def create_reaction(_, info, reaction={}):
 
 @mutation.field("updateReaction")
 @login_required
-async def update_reaction(_, info, reaction={}):
+async def update_reaction(_, info, id, reaction={}):
     auth: AuthCredentials = info.context["request"].auth
 
     with local_session() as session:
         user = session.query(User).where(User.id == auth.user_id).first()
-        q = select(Reaction).filter(Reaction.id == reaction['id'])
+        q = select(Reaction).filter(Reaction.id == id)
         q = add_reaction_stat_columns(q)
+        q = q.group_by(Reaction.id)
 
         [r, reacted_stat, commented_stat, rating_stat] = session.execute(q).unique().one()
 
@@ -235,12 +236,12 @@ async def update_reaction(_, info, reaction={}):
 
 @mutation.field("deleteReaction")
 @login_required
-async def delete_reaction(_, info, reaction=None):
+async def delete_reaction(_, info, id):
     # NOTE: reaction is id
     auth: AuthCredentials = info.context["request"].auth
 
     with local_session() as session:
-        r = session.query(Reaction).filter(Reaction.id == reaction).first()
+        r = session.query(Reaction).filter(Reaction.id == id).first()
         if not r:
             return {"error": "invalid reaction id"}
         if r.createdBy != auth.user_id:
@@ -324,6 +325,9 @@ async def load_reactions_by(_, _info, by, limit=50, offset=0):
                 "commented": commented_stat,
                 "reacted": reacted_stat
             }
+
+            reaction.kind = reaction.kind.name
+
             reactions.append(reaction)
 
     # ?

schema.graphql

@@ -198,8 +198,8 @@ type Mutation {
 
   # reactions
   createReaction(reaction: ReactionInput!): Result!
-  updateReaction(reaction: ReactionInput!): Result!
+  updateReaction(id: Int!, reaction: ReactionInput!): Result!
-  deleteReaction(reaction: Int!): Result!
+  deleteReaction(id: Int!): Result!
 
   # draft / collab
   createDraft(draft: DraftInput!): Result!