Зафиксировали текущие изменения UI и документации

2026-08-28 12:55:28 +04:00
parent f6b95d94bc
commit ef1fd9f579
12 changed files with 522 additions and 54 deletions
@@ -1,5 +1,6 @@
 import {
  authService,
+  getChatMessages,
  isSessionInvalidError,
  normalizeDmChatId,
  setContacts,
@@ -106,6 +107,8 @@ function clipPreviewText(text, maxLen = PREVIEW_MAX_LEN) {
 }

 async function resolveDialogPreview(dialog) {
+  const localText = clipPreviewText(String(dialog?.lastMessageText || '').trim());
+  if (localText) return localText;
  const blobB64 = String(dialog?.lastMessageBlobB64 || '').trim();
  if (!blobB64) return 'Диалог пока пуст.';

@@ -145,6 +148,29 @@ async function resolveDialogPreview(dialog) {
  return pending;
 }

+function resolveLocalMessageTimeMs(message) {
+  const keys = [message?.baseKey, message?.messageKey];
+  for (const key of keys) {
+    const parts = String(key || '').split('|');
+    const timeMs = Number(parts[2] || 0);
+    if (parts.length >= 4 && Number.isFinite(timeMs) && timeMs > 0) return timeMs;
+  }
+  const tempParts = String(message?.tempId || '').split('-');
+  const tempTimeMs = Number(tempParts[1] || 0);
+  if (tempParts[0] === 'tmp' && Number.isFinite(tempTimeMs) && tempTimeMs > 0) return tempTimeMs;
+  const createdAtMs = Number(message?.createdAtMs || message?.ts || 0);
+  return Number.isFinite(createdAtMs) && createdAtMs > 0 ? createdAtMs : 0;
+}
+
+function latestLocalDialogMessage(peerLogin) {
+  const messages = getChatMessages(peerLogin);
+  const latest = [...messages].sort((a, b) => resolveLocalMessageTimeMs(b) - resolveLocalMessageTimeMs(a))[0];
+  if (!latest) return null;
+  const parsed = parseDmTechBlocks(String(latest?.text || ''));
+  const text = clipPreviewText(String(parsed.displayText || parsed.visibleText || '').trim()) || 'Сообщение';
+  return { text, timeMs: resolveLocalMessageTimeMs(latest) };
+}
+
 function formatChatRowTime(ts) {
  const value = Number(ts || 0);
  if (!Number.isFinite(value) || value <= 0) return '';
@@ -350,16 +376,23 @@ function renderRow(item) {
          unreadCount: Number(dialog?.unreadCount || 0),
          hasDialog: Boolean(dialog?.hasDialog),
        };
+        const localLatest = latestLocalDialogMessage(peerLogin);
+        if (localLatest && localLatest.timeMs >= next.lastMessageTimeMs) {
+          next.lastMessageText = localLatest.text;
+          next.lastMessageTimeMs = localLatest.timeMs;
+        }
        const current = byPeer.get(key);
        if (!current) {
          byPeer.set(key, next);
          return;
        }
-        const currentRank = relationOrder(current.relationFlag);
-        const nextRank = relationOrder(relationFlag);
-        if (nextRank < currentRank || (nextRank === currentRank && next.lastMessageTimeMs > current.lastMessageTimeMs)) {
-          byPeer.set(key, next);
-        }
+        const newest = next.lastMessageTimeMs > current.lastMessageTimeMs ? next : current;
+        newest.relationFlag = relationOrder(relationFlag) < relationOrder(current.relationFlag)
+          ? relationFlag
+          : current.relationFlag;
+        newest.unreadCount = Math.max(Number(current.unreadCount || 0), Number(next.unreadCount || 0));
+        newest.hasDialog = Boolean(current.hasDialog || next.hasDialog);
+        byPeer.set(key, newest);
      });

      const rows = Array.from(byPeer.values()).sort((a, b) => {