Update DM and profile handling

shine-UI/js/pages/messages-list.js

@@ -11,9 +11,9 @@ import { renderUserAvatar } from '../components/avatar-image.js';
 import { createOverflowDots } from '../components/overflow-dots.js';
 import { createDropdownMenu } from '../components/dropdown-menu.js';
 import { createShineConnectionsLogo } from '../components/shine-logo.js';
+import { loadProfileSnapshot } from '../services/user-profile-params.js';
 import { parseDmTechBlocks } from '../services/dm-tech-blocks.js';
 import { formatRelativeTime } from '../services/channels-ux.js';
-import { userDisplayName } from '../services/user-display.js';
 
 export const pageMeta = { id: 'messages-list', title: 'Личные сообщения' };
 const PREVIEW_MAX_LEN = 200;
@@ -22,14 +22,72 @@ const SVG_CHEVRON = `
     <path d="M9 6l6 6-6 6"></path>
   </svg>
 `;
+const DM_BLOB_PREVIEW_CACHE = new Map();
+const DM_BLOB_PREVIEW_PENDING = new Map();
+const dmAvatarSnapshotCache = new Map();
+const dmAvatarPendingByLogin = new Map();
+
 const RELATION_ORDER = new Map([
   ['close_friend', 0],
   ['friend', 1],
   ['contact', 2],
-  ['none', 99],
+  ['none', 3],
 ]);
-const DM_BLOB_PREVIEW_CACHE = new Map();
-const DM_BLOB_PREVIEW_PENDING = new Map();
+
+async function loadDmAvatarSnapshot(login) {
+  const cleanLogin = String(login || '').trim();
+  if (!cleanLogin) return null;
+  const key = cleanLogin.toLowerCase();
+  if (dmAvatarSnapshotCache.has(key)) return dmAvatarSnapshotCache.get(key);
+  if (dmAvatarPendingByLogin.has(key)) return dmAvatarPendingByLogin.get(key);
+  const pending = loadProfileSnapshot(cleanLogin)
+    .then((snapshot) => {
+      dmAvatarSnapshotCache.set(key, snapshot || null);
+      dmAvatarPendingByLogin.delete(key);
+      return snapshot || null;
+    })
+    .catch(() => {
+      dmAvatarSnapshotCache.set(key, null);
+      dmAvatarPendingByLogin.delete(key);
+      return null;
+    });
+  dmAvatarPendingByLogin.set(key, pending);
+  return pending;
+}
+
+function createDmAvatar(login, { className = '', avatar = null, firstName = '', lastName = '' } = {}) {
+  const cleanLogin = String(login || '').trim();
+  const title = cleanLogin ? `Профиль ${cleanLogin}` : '';
+  const avatarEl = renderUserAvatar({
+    login: cleanLogin || 'unknown',
+    firstName: String(firstName || '').trim(),
+    lastName: String(lastName || '').trim(),
+    avatar: avatar?.ar ? { ar: String(avatar.ar || '').trim(), sha256Hex: String(avatar.sha256Hex || '').trim().toLowerCase() } : null,
+    size: 'lg',
+    title,
+    className,
+  });
+  if (!cleanLogin || avatar?.ar) return avatarEl;
+  void loadDmAvatarSnapshot(cleanLogin).then((snapshot) => {
+    if (!avatarEl.isConnected) return;
+    const upgraded = renderUserAvatar({
+      login: cleanLogin,
+      avatar: snapshot?.avatar?.txId
+        ? {
+          ar: String(snapshot.avatar.txId || '').trim(),
+          sha256Hex: String(snapshot?.avatar?.sha256Hex || '').trim().toLowerCase(),
+        }
+        : null,
+      size: 'lg',
+      title,
+      className,
+    });
+    upgraded.classList.add('avatar');
+    avatarEl.replaceWith(upgraded);
+  });
+  return avatarEl;
+}
+
 function normalizeRelationFlag(value) {
   const clean = String(value || '').trim().toLowerCase();
   if (clean === 'close_friend' || clean === 'friend' || clean === 'contact') return clean;
@@ -288,13 +346,10 @@ function renderRow(item) {
     const relationBadge = relationFlag === 'none'
       ? 'не в контактах'
       : relationLabel(relationFlag);
-    const avatarEl = renderUserAvatar({
-      login: item.peerLogin,
+    const avatarEl = createDmAvatar(item.peerLogin, {
+      avatar: item.avatar,
       firstName: item.firstName,
       lastName: item.lastName,
-      avatar: item.avatarAr ? { ar: String(item.avatarAr).trim() } : null,
-      size: 'lg',
-      title: `Профиль ${item.peerLogin}`,
     });
     avatarEl.classList.add('avatar');
     const avatarWrap = document.createElement('div');
@@ -319,7 +374,10 @@ function renderRow(item) {
     const titleEl = row.querySelector('.dm-row-title');
     const previewEl = row.querySelector('.dm-row-last-message');
     const timeEl = row.querySelector('.dm-row-time');
-    if (titleEl) titleEl.textContent = userDisplayName({ login: item.peerLogin, firstName: item.firstName, lastName: item.lastName });
+    if (titleEl) {
+      const fullName = [String(item.firstName || '').trim(), String(item.lastName || '').trim()].filter(Boolean).join(' ');
+      titleEl.textContent = fullName || String(item.peerLogin || '');
+    }
     if (previewEl) previewEl.textContent = 'Загрузка…';
     if (timeEl) timeEl.textContent = formatChatRowTime(item.lastMessageTimeMs);
     row.prepend(avatarWrap);
@@ -343,7 +401,10 @@ function renderRow(item) {
     try {
       const payload = await authService.listContacts();
       const dialogs = Array.isArray(payload?.dialogs) ? payload.dialogs : [];
-      const contacts = Array.isArray(payload?.contacts) ? payload.contacts : [];
+      const contacts = dialogs
+        .filter((dialog) => normalizeRelationFlag(dialog?.relationFlag) !== 'none')
+        .map((dialog) => String(dialog?.peerLogin || '').trim())
+        .filter(Boolean);
       setContacts(contacts);
       list.innerHTML = '';
 
@@ -356,12 +417,12 @@ function renderRow(item) {
         const next = {
           id: peerLogin,
           peerLogin,
+          relationFlag,
           firstName: String(dialog?.firstName || '').trim(),
           lastName: String(dialog?.lastName || '').trim(),
-          avatarAr: String(dialog?.avatarAr || '').trim(),
+          avatar: dialog?.avatar && typeof dialog.avatar === 'object' ? dialog.avatar : null,
           accountRole: String(dialog?.accountRole || '').trim(),
           shineStatus: String(dialog?.shineStatus || '').trim(),
-          relationFlag,
           lastMessageBlobB64: String(dialog?.lastMessageBlobB64 || ''),
           lastMessageTimeMs: Number(dialog?.lastMessageTimeMs || 0),
           unreadCount: Number(dialog?.unreadCount || 0),