get-author-by-id-fix-3

resolvers/load.py

@@ -3,7 +3,7 @@ import json
 from typing import Any, Dict, List, Optional, Union
 
 from services.auth import login_required
-from services.core import get_author, get_network
+from services.core import get_my_followings, members
 from services.rediscache import redis
 from services.schema import query
 from validators.chat import Message, ChatPayload
@@ -73,7 +73,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:
-                    for a in (await get_network(member_id, 1)):
+                    for a in (await get_my_followings()):
                         a["online"] = a.get("id") in members_online
                         c["members"].append(a)
                 chats.append(c)
@@ -111,14 +111,17 @@ async def load_messages_by(_, info, by, limit: int = 10, offset: int = 0):
 async def load_recipients(_, _info, limit=50, offset=0):
     """load possible chat participants"""
     onliners = (await redis.execute("SMEMBERS", "authors-online")) or []
-    members = []
-    all_authors: List[ChatMember] = await get_network(limit, offset)
-    for a in all_authors:
+    r = []
+    all_authors: List[ChatMember] = members
+    my_followings = await get_my_followings()
+    if len(my_followings) < limit:
+        my_followings = my_followings + all_authors[0:limit-len(my_followings)]
+    for a in my_followings:
         a["online"] = a["id"] in onliners
-        members.append(a)
-
+        r.append(a)
+    
     # NOTE: maybe sort members here
 
-    print(f"[resolvers.load] loadRecipients found {len(members)} members")
+    print(f"[resolvers.load] loadRecipients found {len(r)} members")
     
-    return {"members": members, "error": None}
+    return {"members": r, "error": None}