fixes

resolvers/inbox/load.py

@@ -26,11 +26,11 @@ async def get_total_unread_counter(user_slug: str):
     return unread
 
 
-async def load_messages(chatId: str, offset: int, amount: int):
+async def load_messages(chatId: str, limit: int, offset: int):
-    ''' load :amount messages for :chatId with :offset '''
+    ''' load :limit messages for :chatId with :offset '''
     messages = []
     message_ids = await redis.lrange(
-        f"chats/{chatId}/message_ids", 0 - offset - amount, 0 - offset
+        f"chats/{chatId}/message_ids", 0 - offset - limit, 0 - offset
     )
     if message_ids:
         message_keys = [
@@ -46,16 +46,16 @@ async def load_messages(chatId: str, offset: int, amount: int):
 
 @query.field("loadChats")
 @login_required
-async def load_chats(_, info, offset: int, amount: int):
+async def load_chats(_, info, limit: int, offset: int):
-    """ load :amount chats of current user with :offset """
+    """ load :limit chats of current user with :offset """
     user = info.context["request"].user
     chats = await redis.execute("GET", f"chats_by_user/{user.slug}")
     if chats:
-        chats = list(json.loads(chats))[offset:offset + amount]
+        chats = list(json.loads(chats))[offset:offset + limit]
     if not chats:
         chats = []
     for c in chats:
-        c['messages'] = await load_messages(c['id'], offset, amount)
+        c['messages'] = await load_messages(c['id'], limit, offset)
         c['unread'] = await get_unread_counter(c['id'], user.slug)
     return {
         "chats": chats,
@@ -65,8 +65,8 @@ async def load_chats(_, info, offset: int, amount: int):
 
 @query.field("loadMessagesBy")
 @login_required
-async def load_messages_by(_, info, by, offset: int = 0, amount: int = 50):
+async def load_messages_by(_, info, by, limit: int = 50, offset: int = 0):
-    ''' load :amount messages of :chat_id with :offset '''
+    ''' load :amolimitunt messages of :chat_id with :offset '''
     user = info.context["request"].user
     my_chats = await redis.execute("GET", f"chats_by_user/{user.slug}")
     chat_id = by.get('chat')
@@ -76,17 +76,17 @@ async def load_messages_by(_, info, by, offset: int = 0, amount: int = 50):
             return {
                 "error": "chat not exist"
             }
-        messages = await load_messages(chat_id, offset, amount)
+        messages = await load_messages(chat_id, limit, offset)
     user_id = by.get('author')
     if user_id:
         chats = await redis.execute("GET", f"chats_by_user/{user_id}")
         our_chats = list(set(chats) & set(my_chats))
         for c in our_chats:
-            messages += await load_messages(c, offset, amount)
+            messages += await load_messages(c, limit, offset)
     body_like = by.get('body')
     if body_like:
         for c in my_chats:
-            mmm = await load_messages(c, offset, amount)
+            mmm = await load_messages(c, limit, offset)
             for m in mmm:
                 if body_like in m["body"]:
                     messages.append(m)

resolvers/inbox/search.py

@@ -9,13 +9,13 @@ from orm.user import AuthorFollower
 
 @query.field("searchUsers")
 @login_required
-async def search_users(_, info, query: str, offset: int = 0, amount: int = 50):
+async def search_users(_, info, query: str, limit: int = 50, offset: int = 0):
     result = []
     # TODO: maybe redis scan?
     user = info.context["request"].user
     talk_before = await redis.execute("GET", f"/chats_by_user/{user.slug}")
     if talk_before:
-        talk_before = list(json.loads(talk_before))[offset:offset + amount]
+        talk_before = list(json.loads(talk_before))[offset:offset + limit]
         for chat_id in talk_before:
             members = await redis.execute("GET", f"/chats/{chat_id}/users")
             if members:
@@ -26,17 +26,17 @@ async def search_users(_, info, query: str, offset: int = 0, amount: int = 50):
                             result.append(member)
     user = info.context["request"].user
 
-    more_amount = amount - len(result)
+    more_amount = limit - len(result)
 
     with local_session() as session:
         # followings
         result += session.query(AuthorFollower.author).where(AuthorFollower.follower.startswith(query))\
             .offset(offset + len(result)).limit(more_amount)
 
-        more_amount = amount
+        more_amount = limit
         # followers
         result += session.query(AuthorFollower.follower).where(AuthorFollower.author.startswith(query))\
-            .offset(offset + len(result)).limit(offset + len(result) + amount)
+            .offset(offset + len(result)).limit(offset + len(result) + limit)
     return {
         "slugs": list(result),
         "error": None

resolvers/profile.py

@@ -185,7 +185,7 @@ async def get_authors_all(_, _info):
 
 
 @query.field("loadAuthorsBy")
-async def load_authors_by(_, info, by, amount, offset):
+async def load_authors_by(_, info, by, limit, offset):
     authors = []
     with local_session() as session:
         aq = session.query(User)
@@ -206,7 +206,7 @@ async def load_authors_by(_, info, by, amount, offset):
             User.id
         ).order_by(
             by.get("order") or "createdAt"
-        ).limit(amount).offset(offset)
+        ).limit(limit).offset(offset)
         authors = list(map(lambda r: r.User, session.execute(aq)))
         if by.get("stat"):
             for a in authors:

resolvers/reactions.py

@@ -1,6 +1,6 @@
 from datetime import datetime, timedelta
 
-from sqlalchemy import and_, desc, select, text
+from sqlalchemy import and_, desc, select, text, func
 from sqlalchemy.orm import selectinload
 
 from auth.authenticate import login_required
@@ -202,7 +202,7 @@ async def delete_reaction(_, info, rid):
 
 
 @query.field("loadReactionsBy")
-async def load_reactions_by(_, info, by, amount=50, offset=0):
+async def load_reactions_by(_, info, by, limit=50, offset=0):
     """
     :param by: {
         shout: 'some-slug'
@@ -212,7 +212,7 @@ async def load_reactions_by(_, info, by, amount=50, offset=0):
         stat: 'rating' | 'comments' | 'reacted' | 'views',
         days: 30
     }
-    :param amount: int amount of shouts
+    :param limit: int amount of shouts
     :param offset: int offset in this order
     :return: Reaction[]
     """
@@ -236,13 +236,16 @@ async def load_reactions_by(_, info, by, amount=50, offset=0):
         if by.get("topic"):
             q = q.filter(Shout.topics.contains(by["topic"]))
         if by.get("body"):
+            if by["body"] is True:
+                q = q.filter(func.length(Reaction.body) > 0)
+            else:
                 q = q.filter(Reaction.body.ilike(f'%{by["body"]}%'))
         if by.get("days"):
             before = datetime.now() - timedelta(days=int(by["days"]) or 30)
             q = q.filter(Reaction.createdAt > before)
         q = q.group_by(Shout.id).order_by(
             desc(by.get("order") or "createdAt")
-        ).limit(amount).offset(offset)
+        ).limit(limit).offset(offset)
 
     rrr = []
     with local_session() as session:

resolvers/zine.py

@@ -17,7 +17,7 @@ from services.stat.reacted import ReactedStorage
 
 
 @query.field("loadShoutsBy")
-async def load_shouts_by(_, info, by, amount=50, offset=0):
+async def load_shouts_by(_, info, by, limit=50, offset=0):
     """
     :param by: {
         layout: 'audio',
@@ -29,7 +29,7 @@ async def load_shouts_by(_, info, by, amount=50, offset=0):
         stat: 'rating' | 'comments' | 'reacted' | 'views',
         days: 30
     }
-    :param amount: int amount of shouts
+    :param limit: int amount of shouts
     :param offset: int offset in this order
     :return: Shout[]
     """
@@ -69,7 +69,7 @@ async def load_shouts_by(_, info, by, amount=50, offset=0):
             q = q.filter(Shout.createdAt > before)
         q = q.group_by(Shout.id, Reaction.id).order_by(
             desc(by.get("order") or "createdAt")
-        ).limit(amount).offset(offset)
+        ).limit(limit).offset(offset)
     print(q)
     shouts = []
     with local_session() as session:

schema.graphql

@@ -239,9 +239,9 @@ input ReactionBy {
 
 type Query {
   # inbox
-  loadChats(offset: Int, amount: Int): Result!  # your chats
+  loadChats( limit: Int, offset: Int): Result!  # your chats
-  loadMessagesBy(by: MessagesBy!, amount: Int, offset: Int): Result!
+  loadMessagesBy(by: MessagesBy!, limit: Int, offset: Int): Result!
-  searchUsers(query: String!, amount: Int, offset: Int): Result!
+  searchUsers(query: String!, limit: Int, offset: Int): Result!
 
   # auth
   isEmailUsed(email: String!): Boolean!
@@ -249,9 +249,9 @@ type Query {
   signOut: AuthResult!
 
   # zine
-  loadAuthorsBy(by: AuthorsBy, amount: Int, offset: Int): [Author]!
+  loadAuthorsBy(by: AuthorsBy, limit: Int, offset: Int): [Author]!
-  loadShoutsBy(by: ShoutsBy, amount: Int, offset: Int): [Shout]!
+  loadShoutsBy(by: ShoutsBy, limit: Int, offset: Int): [Shout]!
-  loadReactionsBy(by: ReactionBy!, amount: Int, limit: Int): [Reaction]!
+  loadReactionsBy(by: ReactionBy!, limit: Int, offset: Int): [Reaction]!
   userFollowers(slug: String!): [Author]!
   userFollowedAuthors(slug: String!): [Author]!
   userFollowedTopics(slug: String!): [Topic]!