discours.io/inbox
5
0
Fork 0
Code Pull Requests Actions Wiki Activity

debug-load-messages-by-2
All checks were successful
deploy / deploy (push) Successful in 1m9s
Details

Browse Source
This commit is contained in:
Untone 2023-10-16 21:44:13 +03:00
parent b7cb93a746
commit e0d2ae37eb
2 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
resolvers/load.py
View File

@ -17,9 +17,7 @@ async def get_unread_counter(chat_id: str, author_id: int) -> int:
# NOTE: not an API handler # NOTE: not an API handler
async def load_messages( async def load_messages(chat_id: str, limit: int = 5, offset: int = 0, ids: Optional[List[int]] = None) -> List[Message]:
chat_id: str, limit: int = 5, offset: int = 0, ids: Optional[List[int]] = None
) -> List[Message]:
"""load :limit messages for :chat_id with :offset""" """load :limit messages for :chat_id with :offset"""
if ids is None: if ids is None:
ids = [] ids = []
@ -28,11 +26,11 @@ async def load_messages(
message_ids = [] + ids message_ids = [] + ids
if limit: if limit:
mids = (await redis.lrange(f"chats/{chat_id}/message_ids", offset, offset + limit)) or [] mids = (await redis.lrange(f"chats/{chat_id}/message_ids", offset, offset + limit)) or []
mids = [mid for mid in mids]
message_ids += mids message_ids += mids
if message_ids: if message_ids:
message_keys = [f"chats/{chat_id}/messages/{mid}" for mid in message_ids] message_keys = [f"chats/{chat_id}/messages/{mid}" for mid in message_ids]
messages = (await redis.mget(*message_keys)) or [] messages = (await redis.mget(*message_keys)) or []
messages = [json.loads(m) if m else None for m in messages]
replies = [] replies = []
for m in messages: for m in messages:
if m: if m:

24
resolvers/messages.py
View File

@ -81,8 +81,8 @@ async def create_message(_, info, chat: str, body: str, reply_to=None):
async def update_message(_, info, chat_id: str, message_id: int, body: str): async def update_message(_, info, chat_id: str, message_id: int, body: str):
author_id = info.context["author_id"] author_id = info.context["author_id"]
chat = await redis.execute("GET", f"chats/{chat_id}") chat_str = await redis.execute("GET", f"chats/{chat_id}")
if not chat: if not chat_str:
return {"error": "chat not exist"} return {"error": "chat not exist"}
message = await redis.execute("GET", f"chats/{chat_id}/messages/{message_id}") message = await redis.execute("GET", f"chats/{chat_id}/messages/{message_id}")
@ -98,9 +98,7 @@ async def update_message(_, info, chat_id: str, message_id: int, body: str):
await redis.execute("SET", f"chats/{chat_id}/messages/{message_id}", json.dumps(message)) await redis.execute("SET", f"chats/{chat_id}/messages/{message_id}", json.dumps(message))
# result = FollowingResult("UPDATE", "chat", new_message) # TODO: use presence service to notify about updated message
# await FollowingManager.push("chat", result)
# TODO: subscribe on updates
return {"message": message, "error": None} return {"message": message, "error": None}
@ -110,10 +108,10 @@ async def update_message(_, info, chat_id: str, message_id: int, body: str):
async def delete_message(_, info, chat_id: str, message_id: int): async def delete_message(_, info, chat_id: str, message_id: int):
author_id = info.context["author_id"] author_id = info.context["author_id"]
chat = await redis.execute("GET", f"chats/{chat_id}") chat_str = await redis.execute("GET", f"chats/{chat_id}")
if not chat: if not chat_str:
return {"error": "chat not exist"} return {"error": "chat not exist"}
chat = json.loads(chat) chat = json.loads(chat_str)
message_data = await redis.execute("GET", f"chats/{chat_id}/messages/{str(message_id)}") message_data = await redis.execute("GET", f"chats/{chat_id}/messages/{str(message_id)}")
if not message_data: if not message_data:
@ -129,9 +127,7 @@ async def delete_message(_, info, chat_id: str, message_id: int):
for member_id in members: for member_id in members:
await redis.execute("LREM", f"chats/{chat_id}/unread/{member_id}", 0, str(message_id)) await redis.execute("LREM", f"chats/{chat_id}/unread/{member_id}", 0, str(message_id))
# result = FollowingResult("DELETED", "chat", message) # TODO: use presence service to notify about deleted message
# await FollowingManager.push(result)
# TODO ?
return {} return {}
@ -141,11 +137,11 @@ async def delete_message(_, info, chat_id: str, message_id: int):
async def mark_as_read(_, info, chat_id: str, messages: List[int]): async def mark_as_read(_, info, chat_id: str, messages: List[int]):
author_id = info.context["author_id"] author_id = info.context["author_id"]
chat = await redis.execute("GET", f"chats/{chat_id}") chat_str = await redis.execute("GET", f"chats/{chat_id}")
if not chat: if not chat_str:
return {"error": "chat not exist"} return {"error": "chat not exist"}
chat = json.loads(chat) chat = json.loads(chat_str)
members = set(chat["members"]) members = set(chat["members"])
if author_id not in members: if author_id not in members:
return {"error": "access denied"} return {"error": "access denied"}