Сохранить текущий снимок DM-синхронизации

shine-UI/js/pages/chat-view.js

@@ -528,10 +528,28 @@ function resolveEffectiveReadState(messages, msg) {
 function resolveDeliveryStatus(messages, msg) {
   if (msg?.from !== 'out') return '';
   if (resolveEffectiveReadState(messages, msg).isRead) return '✓✓';
-  if (msg?.firstTick) return '✓';
+  const deliveryState = String(msg?.deliveryState || '').trim().toLowerCase();
+  if (deliveryState === 'delivered') return '✓';
+  if (deliveryState === 'failed') return '!';
+  if (deliveryState === 'accepted' || msg?.firstTick) return '✓';
   return '…';
 }
 
+function resolveDeliveryTone(messages, msg) {
+  if (resolveEffectiveReadState(messages, msg).isRead) return 'read';
+  const deliveryState = String(msg?.deliveryState || '').trim().toLowerCase();
+  if (deliveryState === 'delivered') return 'delivered';
+  if (deliveryState === 'failed') return 'failed';
+  return 'accepted';
+}
+
+function resolveDeliveryNote(msg) {
+  if (msg?.from !== 'out') return '';
+  const deliveryState = String(msg?.deliveryState || '').trim().toLowerCase();
+  if (deliveryState === 'failed') return 'Сообщение не доставлено.';
+  return '';
+}
+
 function resolveMessageEditedTimeMs(msg) {
   const revisionTimeMs = Number(msg?.revisionTimeMs || 0);
   if (!Number.isFinite(revisionTimeMs) || revisionTimeMs <= 0) return 0;
@@ -744,13 +762,21 @@ function renderLog(
     const status = resolveDeliveryStatus(messages, msg);
     if (status) {
       const statusNode = document.createElement('span');
-      statusNode.className = 'bubble-status';
+      statusNode.className = `bubble-status bubble-status--${resolveDeliveryTone(messages, msg)}`;
       statusNode.textContent = status;
       metaNode.append(statusNode);
     }
 
     bubble.append(metaNode);
 
+    const deliveryNote = resolveDeliveryNote(msg);
+    if (deliveryNote) {
+      const deliveryNoteNode = document.createElement('div');
+      deliveryNoteNode.className = `bubble-delivery-note${String(msg?.deliveryState || '') === 'failed' ? ' bubble-delivery-note--failed' : ''}`;
+      deliveryNoteNode.textContent = deliveryNote;
+      bubble.append(deliveryNoteNode);
+    }
+
     const editedAtMs = resolveMessageEditedTimeMs(msg);
     if (editedAtMs > 0) {
       const editedNode = document.createElement('div');
@@ -831,6 +857,7 @@ async function mergeDirectMessagesPage(chatId, payloadMessages) {
         readAtMs: Number(item?.readAtMs || 0),
         rawBlobB64: blobB64,
         revisionTimeMs: Number(item?.revisionTimeMs || parsed?.revisionTimeMs || 0),
+        deliveryState: String(item?.deliveryState || ''),
       });
     } catch (error) {
       addAppLogEntry({
@@ -1248,7 +1275,12 @@ export function render({ navigate, route, chrome }) {
     focusInputToEnd();
   };
 
-  const applyLocalRevision = async ({ localOutgoingBlobB64, fallbackMessageKey = '', fallbackBaseKey = '' }) => {
+  const applyLocalRevision = async ({
+    localOutgoingBlobB64,
+    fallbackMessageKey = '',
+    fallbackBaseKey = '',
+    deliveryState = '',
+  }) => {
     if (!localOutgoingBlobB64) return;
     try {
       const parsed = authService.parseSignedMessageBlob(localOutgoingBlobB64);
@@ -1271,6 +1303,7 @@ export function render({ navigate, route, chrome }) {
         unread: false,
         rawBlobB64: localOutgoingBlobB64,
         revisionTimeMs: Number(parsed?.revisionTimeMs || 0),
+        deliveryState,
         deleted: Boolean(parsed?.deleted),
       });
       return true;
@@ -1346,6 +1379,7 @@ export function render({ navigate, route, chrome }) {
         markOutgoingSent(tempId, {
           messageKey: result?.outgoingKey || '',
           baseKey: result?.baseKey || result?.localBaseKey || '',
+          deliveryState: result?.deliveryState || 'accepted',
         });
       }
 
@@ -1353,6 +1387,7 @@ export function render({ navigate, route, chrome }) {
         localOutgoingBlobB64: result?.localOutgoingBlobB64 || '',
         fallbackMessageKey: result?.outgoingKey || '',
         fallbackBaseKey: result?.baseKey || result?.localBaseKey || '',
+        deliveryState: result?.deliveryState || 'accepted',
       });
 
       if (editing) {
@@ -1580,7 +1615,14 @@ export function render({ navigate, route, chrome }) {
     void sendReadReceiptsForVisible(chatId);
   };
 
+  const handleDeliveryRefresh = () => {
+    preserveComposerSelection(input, () => {
+      renderChatLog({ scrollMode: 'preserve', markAsRead: false });
+    });
+  };
+
   window.addEventListener('shine-chat-messages-updated', handleIncomingChatRefresh);
+  window.addEventListener('shine-dm-delivery-updated', handleDeliveryRefresh);
 
   wrap.append(historyLoader, log);
   screen.append(wrap);
@@ -1609,6 +1651,7 @@ export function render({ navigate, route, chrome }) {
     hideUnreadSeparator({ rerender: false });
     stopAllTwemojiAnimations();
     window.removeEventListener('shine-chat-messages-updated', handleIncomingChatRefresh);
+    window.removeEventListener('shine-dm-delivery-updated', handleDeliveryRefresh);
     boundScrollContainer?.removeEventListener('scroll', handleHistoryScroll);
     clearUnreadSeparatorHideTimer();
     document.body.classList.remove('chat-topbar-overlay');