История сообщений (вроде как даже работает)

This commit is contained in:
Alexey Polyakov 2026-03-18 21:55:24 +03:00
parent 9c3038bc84
commit 09c1f8b6f6
3 changed files with 98 additions and 1 deletions

View File

@ -123,3 +123,7 @@ class AuthConfirmRegisterPayloadModel(pydantic.BaseModel):
if len(v) > 59:
raise ValueError('lastName too long')
return v
class ChatHistoryPayloadModel(pydantic.BaseModel):
chatId: int
backward: int

View File

@ -1063,6 +1063,95 @@ class Processors:
# Отправляем пакет
await self._send(writer, packet)
async def process_chat_history(self, payload, seq, writer, senderId):
"""Обработчик получения истории чата"""
# Валидируем данные пакета
try:
ChatHistoryPayloadModel.model_validate(payload)
except pydantic.ValidationError as error:
self.logger.error(f"Возникли ошибки при валидации пакета: {error}")
await self._send_error(seq, self.proto.CHAT_HISTORY, self.error_types.INVALID_PAYLOAD, writer)
return
# Извлекаем данные из пакета
chatId = payload.get("chatId")
forward = payload.get("forward", 0)
backward = payload.get("backward", 0)
from_time = payload.get("from", 0)
getMessages = payload.get("getMessages", True)
messages = []
# Проверяем, существует ли чат
async with self.db_pool.acquire() as conn:
async with conn.cursor() as cursor:
await cursor.execute("SELECT * FROM chats WHERE id = %s", (chatId,))
chat = await cursor.fetchone()
if not chat:
await self._send_error(seq, self.proto.CHAT_HISTORY, self.error_types.CHAT_NOT_FOUND, writer)
return
# Проверяем, является ли пользователь участником чата
participants = json.loads(chat.get("participants"))
if int(senderId) not in participants:
await self._send_error(seq, self.proto.CHAT_HISTORY, self.error_types.CHAT_NOT_ACCESS, writer)
return
# Если запрошены сообщения
if getMessages:
if backward > 0:
await cursor.execute(
"SELECT * FROM messages WHERE chat_id = %s AND time < %s ORDER BY id DESC LIMIT %s",
(chatId, from_time, backward)
)
result = await cursor.fetchall()
for row in result:
messages.append({
"id": row.get("id"),
"time": int(row.get("time")),
"type": row.get("type"),
"sender": row.get("sender"),
"text": row.get("text"),
"attaches": json.loads(row.get("attaches")),
"elements": json.loads(row.get("elements")),
"reactionInfo": {}
})
if forward > 0:
await cursor.execute(
"SELECT * FROM messages WHERE chat_id = %s AND time > %s ORDER BY id ASC LIMIT %s",
(chatId, from_time, forward)
)
result = await cursor.fetchall()
for row in result:
messages.append({
"id": row.get("id"),
"time": int(row.get("time")),
"type": row.get("type"),
"sender": row.get("sender"),
"text": row.get("text"),
"attaches": json.loads(row.get("attaches")),
"elements": json.loads(row.get("elements")),
"reactionInfo": {}
})
# Формируем ответ
payload = {
"messages": messages
}
# Собираем пакет
packet = self.proto.pack_packet(
cmd=self.proto.CMD_OK, seq=seq, opcode=self.proto.CHAT_HISTORY, payload=payload
)
# Отправялем
await self._send(writer, packet)
async def process_update_profile(self, payload, seq, writer, userId, userPhone):
# Валидируем входные данные
try:

View File

@ -129,6 +129,10 @@ class OnemeMobileServer:
await self.auth_required(
userPhone, self.processors.process_search_chats, payload, seq, writer, userId
)
case self.proto.CHAT_HISTORY:
await self.auth_required(
userPhone, self.processors.process_chat_history, payload, seq, writer, userId
)
case self.proto.CONTACT_INFO_BY_PHONE:
await self.auth_required(
userPhone, self.processors.process_search_by_phone, payload, seq, writer, userId