some-fixes

resolvers/chats.py

@@ -5,9 +5,10 @@ from datetime import datetime, timezone
 from services.auth import login_required
 from services.rediscache import redis
 from services.schema import mutation
-from validators.chat import Chat, ChatUpdate
+from models.chat import Chat, ChatUpdate
 from services.presence import notify_chat
 
+
 @mutation.field("updateChat")
 @login_required
 async def update_chat(_, info, chat_new: ChatUpdate):

resolvers/load.py

@@ -6,9 +6,9 @@ from services.auth import login_required
 from services.core import get_my_followings, get_all_authors
 from services.rediscache import redis
 from services.schema import query
-from validators.chat import Message, ChatPayload
-from validators.member import ChatMember
-from .chats import create_chat
+from models.chat import Message, ChatPayload
+from models.member import ChatMember
+from resolvers.chats import create_chat
 
 
 async def get_unread_counter(chat_id: str, author_id: int) -> int:
@@ -19,13 +19,11 @@ async def get_unread_counter(chat_id: str, author_id: int) -> int:
 # NOTE: not an API handler
 async def load_messages(
     chat_id: str, limit: int = 5, offset: int = 0, ids: Optional[List[int]] = None
-) -> List[Message]:
+) -> List[Message|None]:
     """load :limit messages for :chat_id with :offset"""
-    if ids is None:
-        ids = []
     messages = []
     try:
-        message_ids = [] + ids
+        message_ids = [] + (ids or [])
         if limit:
             mids = (await redis.lrange(f"chats/{chat_id}/message_ids", offset, offset + limit)) or []
             message_ids += mids
@@ -119,15 +117,16 @@ async def load_recipients(_, _info, limit=50, offset=0):
     onliners = (await redis.execute("SMEMBERS", "authors-online")) or []
     r = []
     all_authors: List[ChatMember] = await get_all_authors()
-    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
-        r.append(a)
+    my_followings: List[ChatMember] = await get_my_followings()
+    if all_authors:
+        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
+            r.append(a)
 
-    # NOTE: maybe sort members here
+        # NOTE: maybe sort members here
 
-    print(f"[resolvers.load] loadRecipients found {len(r)} members")
+        print(f"[resolvers.load] loadRecipients found {len(r)} members")
 
-    return {"members": r, "error": None}
+        return {"members": r, "error": None}

resolvers/messages.py

@@ -1,11 +1,11 @@
 import json
-from datetime import datetime, timezone
+import time
 
 from services.auth import login_required
 from services.presence import notify_message
 from services.rediscache import redis
 from services.schema import mutation
-from validators.chat import Message
+from models.chat import Message
 
 
 @mutation.field("createMessage")
@@ -29,14 +29,14 @@ async def create_message(_, info, chat_id: str, body: str, reply_to=None):
         # Получение ID следующего сообщения
         message_id = await redis.execute("GET", f"chats/{chat_dict['id']}/next_message_id")
         message_id = int(message_id) if message_id else 0
-        chat_id = chat_dict['id']
+        chat_id = chat_dict["id"]
         # Создание нового сообщения
         new_message: Message = {
             "chat_id": chat_id,
             "id": message_id,
             "created_by": author_id,
             "body": body,
-            "created_at": int(datetime.now(tz=timezone.utc).timestamp()),
+            "created_at": int(time.time()),
             "updated_at": None,
         }
 
@@ -109,9 +109,9 @@ async def update_message(_, info, message):
         message["chat_id"] = chat_id
         await notify_message(message, "update")
 
-        return { "message": message, "error": None }
+        return {"message": message, "error": None}
     else:
-        return { "message": message, "error": "cannot update, no message_id" }
+        return {"message": message, "error": "cannot update, no message_id"}
 
 
 @mutation.field("deleteMessage")
@@ -164,7 +164,7 @@ async def mark_as_read(_, info, chat_id: str, message_id: int):
     if not message_data:
         return {"error": "message  not exist"}
     message: Message = json.loads(message_data)
-    
+
     await notify_message(message, "seen")
 
     return {"error": None}