wip-refactoring

resolvers/collab.py

@@ -32,16 +32,16 @@ async def invite_author(_, info, author, shout):
         authors = [a.id for a in shout.authors]
         if user_id not in authors:
             return {"error": "access denied"}
-        author = session.query(User).filter(User.slug == author).first()
+        author = session.query(User).filter(User.id == author.id).first()
-        if author.id in authors:
+        if author:
-            return {"error": "already added"}
+            if author.id in authors:
-        shout.authors.append(author)
+                return {"error": "already added"}
+            shout.authors.append(author)
         shout.updated_at = datetime.now()
         session.add(shout)
         session.commit()
 
     # TODO: email notify
-
     return {}
 
 
@@ -59,9 +59,10 @@ async def remove_author(_, info, author, shout):
         if user_id not in authors:
             return {"error": "access denied"}
         author = session.query(User).filter(User.slug == author).first()
-        if author.id not in authors:
+        if author:
-            return {"error": "not in authors"}
+            if author.id not in authors:
-        shout.authors.remove(author)
+                return {"error": "not in authors"}
+            shout.authors.remove(author)
         shout.updated_at = datetime.now()
         session.add(shout)
         session.commit()

resolvers/inbox/load.py

@@ -1,13 +1,16 @@
 import json
 from datetime import datetime, timedelta
+
+from auth.authenticate import login_required
 from base.redis import redis
 from base.resolvers import query
-from auth.authenticate import login_required
 
 
 async def get_unread_counter(chat_id: str, user_slug: str):
     try:
-        return int(await redis.execute("LLEN", f"chats/{chat_id}/unread/{user_slug}"))
+        unread = await redis.execute("LLEN", f"chats/{chat_id}/unread/{user_slug}")
+        if unread:
+            return unread
     except Exception:
         return 0
 
@@ -55,7 +58,7 @@ async def load_chats(_, info, offset: int, amount: int):
     if not chats:
         chats = []
     for c in chats:
-        c['messages'] = await load_messages(c['id'])
+        c['messages'] = await load_messages(c['id'], offset, amount)
         c['unread'] = await get_unread_counter(c['id'], user.slug)
     return {
         "chats": chats,

resolvers/reactions.py

@@ -1,4 +1,5 @@
 from datetime import datetime, timedelta
+
 from sqlalchemy import and_, desc, select, text
 from sqlalchemy.orm import selectinload
 

schema.graphql

@@ -255,8 +255,6 @@ type Query {
   userFollowers(slug: String!): [Author]!
   userFollowedAuthors(slug: String!): [Author]!
   userFollowedTopics(slug: String!): [Topic]!
-
-
   authorsAll: [Author]!
   getAuthor(slug: String!): User!
 

services/stat/views.py

@@ -1,7 +1,9 @@
-from gql import gql, Client
-from gql.transport.aiohttp import AIOHTTPTransport
 import asyncio
 import json
+
+from gql import Client, gql
+from gql.transport.aiohttp import AIOHTTPTransport
+
 from base.redis import redis
 from services.zine.topics import TopicStorage