WIP: новая схема сообщений и push (не проверено)

2026-04-19 20:41:58 +03:00
parent f0b560ec06
commit cc59bd18ee
27 changed files with 1668 additions and 94 deletions
@@ -1,6 +1,6 @@
 import { renderHeader } from '../components/header.js';
 import { directMessages } from '../mock-data.js';
-import { getChatMessages } from '../state.js';
+import { getChatMessages, setContacts, state } from '../state.js';
 import { loadCurrentRelations } from '../services/user-connections.js';

 export const pageMeta = { id: 'messages-list', title: 'Личные сообщения' };
@@ -30,6 +30,7 @@ export function render({ navigate }) {
      <div>
        <div class="row" style="justify-content:flex-start; gap:8px;">
          <strong>${item.name}</strong>
+          ${item.notInContacts ? '<span class="meta-muted">не в контактах</span>' : ''}
        </div>
        <p class="meta-muted" style="margin-top:4px;">${item.lastMessage}</p>
      </div>
@@ -46,32 +47,57 @@ export function render({ navigate }) {
    try {
      const relations = await loadCurrentRelations();
      const contacts = relations.outContacts || [];
+      setContacts(contacts);
      list.innerHTML = '';
-
-      if (!contacts.length) {
-        const empty = document.createElement('div');
-        empty.className = 'card meta-muted';
-        empty.textContent = 'Ваш список контактов пока пуст';
-        list.append(empty);
-        status.className = 'status-line is-available';
-        status.textContent = 'Нет контактов.';
-        return;
-      }
-
-      const rows = contacts.map((login) => {
+      const contactRows = contacts.map((login) => {
        const preview = directMessages.find((item) => item.id.toLowerCase() === login.toLowerCase());
        const chat = getChatMessages(login);
        const lastChat = chat[chat.length - 1];
+        const unread = chat.filter((m) => m?.from === 'in' && m?.unread).length;
        return {
          id: login,
          initials: (login[0] || '?').toUpperCase(),
          name: preview?.name || login,
          lastMessage: lastChat?.text || preview?.lastMessage || 'Диалог пока пуст.',
          time: preview?.time || '—',
-          unread: Number(preview?.unread || 0),
+          unread,
+          notInContacts: false,
        };
      });

+      const allChatIds = Object.keys(state.chats || {})
+        .filter((id) => id && id.toLowerCase() !== String(state.session.login || '').toLowerCase())
+        .filter((id) => (getChatMessages(id) || []).length > 0);
+
+      const contactKeys = new Set(contacts.map((x) => String(x || '').toLowerCase()));
+      const extraRows = allChatIds
+        .filter((login) => !contactKeys.has(String(login || '').toLowerCase()))
+        .map((login) => {
+          const chat = getChatMessages(login);
+          const lastChat = chat[chat.length - 1];
+          const unread = chat.filter((m) => m?.from === 'in' && m?.unread).length;
+          return {
+            id: login,
+            initials: (login[0] || '?').toUpperCase(),
+            name: login,
+            lastMessage: lastChat?.text || 'Диалог пока пуст.',
+            time: 'сейчас',
+            unread,
+            notInContacts: true,
+          };
+        });
+
+      const rows = [...contactRows, ...extraRows];
+      if (!rows.length) {
+        const empty = document.createElement('div');
+        empty.className = 'card meta-muted';
+        empty.textContent = 'Пока нет ни контактов, ни сообщений';
+        list.append(empty);
+        status.className = 'status-line is-available';
+        status.textContent = 'Нет диалогов.';
+        return;
+      }
+
      rows.forEach((item) => list.append(renderRow(item)));
      status.className = 'status-line is-available';
      status.textContent = `Загружено диалогов: ${rows.length}`;