precached-authors-fix

resolvers/load.py

@@ -6,7 +6,7 @@ from models.chat import ChatPayload, Message
 from models.member import ChatMember
 from resolvers.chats import create_chat
 from services.auth import login_required
-from services.core import get_all_authors, get_my_followed
+from services.core import authors_by_id, get_my_followed
 from services.rediscache import redis
 from services.schema import query
 
@@ -65,8 +65,6 @@ async def load_chats(_, info, limit: int = 50, offset: int = 0) -> Dict[str, Uni
                 r = await create_chat(None, info, members=[1])  # member with id = 1 is discours
                 print(f"[resolvers.load] created chat: {r['chat_id']}")
                 cids.append(r["chat"]["id"])
-            all_authors: List[ChatMember] = await get_all_authors()
-            authors = {a["id"]: a for a in all_authors}
             for cid in cids:
                 async with lock:
                     chat_str: str = await redis.execute("GET", f"chats/{cid}")
@@ -78,7 +76,7 @@ async def load_chats(_, info, limit: int = 50, offset: int = 0) -> Dict[str, Uni
                         member_ids = c["members"].copy()
                         c["members"] = []
                         for member_id in member_ids:
-                            a = authors.get(member_id)
+                            a = authors_by_id.get(member_id)
                             if a:
                                 a["online"] = a.get("id") in members_online
                                 c["members"].append(a)
@@ -118,14 +116,13 @@ async def load_recipients(_, _info, limit=50, offset=0):
     """load possible chat participants"""
     onliners: List[int] = (await redis.execute("SMEMBERS", "authors-online")) or []
     r = []
-    all_authors: List[ChatMember] = await get_all_authors(limit, offset)
     my_followings: List[ChatMember] = await get_my_followed()
-    if all_authors:
-        if len(my_followings) < limit:
-            my_followings = my_followings + list(all_authors)[offset : limit - len(my_followings)]
-        for a in my_followings:
-            a["online"] = bool(a["id"] in list(onliners))
-            r.append(a)
+    if len(my_followings) < limit:
+        my_followings = my_followings + list(authors_by_id.values())[offset : limit - len(my_followings)]
+        my_followings = list(set(my_followings))
+    for a in my_followings:
+        a["online"] = bool(a["id"] in list(onliners))
+        r.append(a)
 
         # NOTE: maybe sort members here
 

resolvers/search.py

@@ -4,7 +4,7 @@ from typing import Any, Dict, List, Union
 
 from resolvers.load import load_messages
 from services.auth import login_required
-from services.core import get_all_authors
+from services.core import authors_by_id
 from services.rediscache import redis
 from services.schema import query
 
@@ -12,27 +12,24 @@ from services.schema import query
 @query.field("search_recipients")
 @login_required
 async def search_recipients(_, info, text: str, limit: int = 50, offset: int = 0):
-    result = []
+    result = set([])
 
     # TODO: maybe redis scan?
 
     author_id = info.context["author_id"]
     existed_chats = await redis.execute("SMEMBERS", f"/chats_by_author/{author_id}")
-    authors = await get_all_authors()
-    members = {a["id"]: a for a in authors}
     if existed_chats:
         for chat_id in list(json.loads(existed_chats))[offset : (offset + limit)]:
             members_ids = await redis.execute("GET", f"/chats/{chat_id}/members")
             for member_id in members_ids:
-                author = members.get(member_id)
+                author = authors_by_id.get(member_id)
                 if author:
                     if author["name"].startswith(text):
-                        if author not in result:
-                            result.append(author)
+                        result.add(author)
 
     more_amount = limit - len(result)
     if more_amount > 0:
-        result += authors[0:more_amount]
+        result.update(authors_by_id.values()[0:more_amount])
     return {"members": list(result), "error": None}