fix(ui): чат метаданные сообщений и корректная раскладка backlog type2

This commit is contained in:
AidarKC 2026-04-23 13:41:13 +03:00
parent 78d6124f2a
commit e9f58ca004
4 changed files with 90 additions and 9 deletions

View File

@ -1,4 +1,4 @@
1) Общий формат записи блока (BchBlockEntry) нет это неправильно откатись к1) Общий формат записи блока (BchBlockEntry)
Блок хранится как FULL = RAW + TAIL, где RAW участвует в хэшировании/подписи, а TAIL хранит подпись и итоговый хэш. Блок хранится как FULL = RAW + TAIL, где RAW участвует в хэшировании/подписи, а TAIL хранит подпись и итоговый хэш.

View File

@ -637,11 +637,10 @@ async function init() {
return; return;
} }
const myLogin = String(state.session.login || '').trim().toLowerCase();
const fromLogin = parsed.fromLogin || ''; const fromLogin = parsed.fromLogin || '';
const toLogin = parsed.toLogin || ''; const toLogin = parsed.toLogin || '';
const chatId = String(fromLogin || '').toLowerCase() === myLogin ? toLogin : fromLogin;
const messageType = Number(parsed.messageType || 0); const messageType = Number(parsed.messageType || 0);
const chatId = messageType === 2 ? toLogin : fromLogin;
const text = (messageType === 1 || messageType === 2) const text = (messageType === 1 || messageType === 2)
? new TextDecoder().decode(parsed.payloadBytes || new Uint8Array(0)) ? new TextDecoder().decode(parsed.payloadBytes || new Uint8Array(0))
: ''; : '';

View File

@ -27,6 +27,47 @@ function parseBaseKey(baseKey) {
return { fromLogin, toLogin, timeMs, nonce }; return { fromLogin, toLogin, timeMs, nonce };
} }
function resolveMessageTimeMs(msg) {
const base = parseBaseKey(msg?.baseKey);
if (base?.timeMs && Number.isFinite(base.timeMs) && base.timeMs > 0) return base.timeMs;
const messageKey = String(msg?.messageKey || '').trim();
if (messageKey) {
const parts = messageKey.split('|');
const timeMs = Number(parts[2] || 0);
if (parts.length >= 4 && Number.isFinite(timeMs) && timeMs > 0) return timeMs;
}
const tempId = String(msg?.tempId || '').trim();
if (tempId.startsWith('tmp-')) {
const ts = Number(tempId.split('-')[1] || 0);
if (Number.isFinite(ts) && ts > 0) return ts;
}
const fallback = Number(msg?.createdAtMs || 0);
if (Number.isFinite(fallback) && fallback > 0) return fallback;
return 0;
}
function formatMessageTime(valueMs) {
const timeMs = Number(valueMs || 0);
if (!Number.isFinite(timeMs) || timeMs <= 0) return '';
return new Intl.DateTimeFormat('ru-RU', {
day: '2-digit',
month: '2-digit',
year: '2-digit',
hour: '2-digit',
minute: '2-digit',
}).format(new Date(timeMs));
}
function resolveDeliveryStatus(msg) {
if (msg?.from !== 'out') return '';
if (msg?.secondTick) return '✓✓';
if (msg?.firstTick) return '✓';
return '…';
}
function renderLog(list, chatId) { function renderLog(list, chatId) {
list.innerHTML = ''; list.innerHTML = '';
const messages = getChatMessages(chatId); const messages = getChatMessages(chatId);
@ -45,13 +86,28 @@ function renderLog(list, chatId) {
const bubble = document.createElement('div'); const bubble = document.createElement('div');
const bubbleKind = String(msg?.kind || '').trim(); const bubbleKind = String(msg?.kind || '').trim();
bubble.className = `bubble ${msg.from}${bubbleKind ? ` ${bubbleKind}` : ''}`; bubble.className = `bubble ${msg.from}${bubbleKind ? ` ${bubbleKind}` : ''}`;
let text = msg.text || '';
if (msg.from === 'out') { const textNode = document.createElement('div');
if (msg.secondTick) text += ' ✓✓'; textNode.className = 'bubble-text';
else if (msg.firstTick) text += ' ✓'; textNode.textContent = msg.text || '';
else text += ' …';
const metaNode = document.createElement('div');
metaNode.className = 'bubble-meta';
const timeNode = document.createElement('span');
timeNode.className = 'bubble-time';
timeNode.textContent = formatMessageTime(resolveMessageTimeMs(msg));
metaNode.append(timeNode);
const status = resolveDeliveryStatus(msg);
if (status) {
const statusNode = document.createElement('span');
statusNode.className = 'bubble-status';
statusNode.textContent = status;
metaNode.append(statusNode);
} }
bubble.textContent = text;
bubble.append(textNode, metaNode);
list.append(bubble); list.append(bubble);
}); });
list.scrollTop = list.scrollHeight; list.scrollTop = list.scrollHeight;

View File

@ -796,6 +796,32 @@
line-height: 1.35; line-height: 1.35;
} }
.bubble-text {
white-space: pre-wrap;
word-break: break-word;
}
.bubble-meta {
margin-top: 4px;
display: flex;
justify-content: flex-end;
align-items: center;
gap: 5px;
font-size: 9px;
line-height: 1.1;
color: rgba(198, 214, 247, 0.78);
}
.bubble-time {
letter-spacing: 0.01em;
}
.bubble-status {
min-width: 14px;
text-align: right;
color: rgba(215, 230, 255, 0.92);
}
.bubble.in { .bubble.in {
justify-self: start; justify-self: start;
background: #1f2c46; background: #1f2c46;