SHA256
Поправил пуши для личных сообщений
This commit is contained in:
@@ -1,6 +1,5 @@
|
||||
import { createTopBar } from '../components/topbar.js';
|
||||
import { actionErrorText, toUserMessage } from '../services/ui-error-texts.js';
|
||||
import { confirmDialog } from '../components/confirm-dialog.js';
|
||||
import { showToast } from '../services/channels-ux.js';
|
||||
import { profile } from '../mock-data.js';
|
||||
import { authService, state } from '../state.js';
|
||||
@@ -18,7 +17,7 @@ import {
|
||||
saveProfileParamBlock,
|
||||
saveProfileStatus,
|
||||
} from '../services/user-profile-params.js';
|
||||
import { buildIdentityLines, loadUserProfileCard } from '../services/user-connections.js';
|
||||
import { buildIdentityLines } from '../services/user-connections.js';
|
||||
import { openAvatarWizard } from '../components/avatar-wizard.js';
|
||||
import { renderUserAvatar } from '../components/avatar-image.js';
|
||||
|
||||
@@ -55,45 +54,6 @@ const GENDER_OPTIONS = Object.freeze([
|
||||
{ value: PROFILE_GENDER_UNKNOWN, label: 'Не указан' },
|
||||
]);
|
||||
|
||||
// Родственные типы сохранены в протоколе, но пока намеренно скрыты из UI.
|
||||
const RELATIVE_RELATION_OPTIONS = Object.freeze([
|
||||
{ value: 'friend', label: 'Друг' },
|
||||
{ value: 'close_friend', label: 'Близкий друг' },
|
||||
]);
|
||||
|
||||
function normalizeGender(value) {
|
||||
const v = String(value || '').trim().toLowerCase();
|
||||
if (v === PROFILE_GENDER_MALE) return PROFILE_GENDER_MALE;
|
||||
if (v === PROFILE_GENDER_FEMALE) return PROFILE_GENDER_FEMALE;
|
||||
return PROFILE_GENDER_UNKNOWN;
|
||||
}
|
||||
|
||||
function relationAccusativeLabel(type, targetGender) {
|
||||
const gender = normalizeGender(targetGender);
|
||||
if (type === 'parent') {
|
||||
if (gender === PROFILE_GENDER_MALE) return 'отца';
|
||||
if (gender === PROFILE_GENDER_FEMALE) return 'мать';
|
||||
return 'родителя';
|
||||
}
|
||||
if (type === 'child') {
|
||||
if (gender === PROFILE_GENDER_MALE) return 'сына';
|
||||
if (gender === PROFILE_GENDER_FEMALE) return 'дочь';
|
||||
return 'ребёнка';
|
||||
}
|
||||
if (type === 'sibling') {
|
||||
if (gender === PROFILE_GENDER_MALE) return 'брата';
|
||||
if (gender === PROFILE_GENDER_FEMALE) return 'сестру';
|
||||
return 'брата/сестру';
|
||||
}
|
||||
if (type === 'spouse') {
|
||||
if (gender === PROFILE_GENDER_MALE) return 'мужа';
|
||||
if (gender === PROFILE_GENDER_FEMALE) return 'жену';
|
||||
return 'жену/мужа';
|
||||
}
|
||||
if (type === 'friend') return 'друга';
|
||||
return 'близкого друга';
|
||||
}
|
||||
|
||||
function escapeHtml(text) {
|
||||
return String(text || '')
|
||||
.replaceAll('&', '&')
|
||||
@@ -147,18 +107,9 @@ export function render({ navigate, chrome }) {
|
||||
const listWrap = document.createElement('div');
|
||||
listWrap.className = 'nav-list profile-param-list';
|
||||
|
||||
const relativesCard = document.createElement('div');
|
||||
relativesCard.className = 'card stack';
|
||||
relativesCard.innerHTML = `
|
||||
<div class="profile-param-value"><b>Друзья</b></div>
|
||||
<div class="meta-muted">Добавьте человека в друзья или в близкие друзья.</div>
|
||||
<button class="secondary-btn" type="button" data-add-relative="true">Добавить друга</button>
|
||||
`;
|
||||
|
||||
const reloadBtn = topRow.querySelector('[data-reload="true"]');
|
||||
const accountRoleBtn = badgesRow.querySelector('[data-status="account_role"]');
|
||||
const shineBtn = badgesRow.querySelector('[data-status="shine"]');
|
||||
const addRelativeBtn = relativesCard.querySelector('[data-add-relative="true"]');
|
||||
const avatarActionEl = topRow.querySelector('[data-change-avatar="true"]');
|
||||
|
||||
let currentFields = [];
|
||||
@@ -363,224 +314,6 @@ export function render({ navigate, chrome }) {
|
||||
});
|
||||
}
|
||||
|
||||
function openAddRelativeModal({ contacts = [] } = {}) {
|
||||
const root = document.getElementById('modal-root');
|
||||
if (!root) return Promise.resolve(null);
|
||||
const preparedContacts = Array.isArray(contacts)
|
||||
? contacts
|
||||
.map((item) => String(item || '').trim())
|
||||
.filter(Boolean)
|
||||
: [];
|
||||
const uniqueContacts = Array.from(new Set(preparedContacts.map((item) => item.toLowerCase())))
|
||||
.map((key) => preparedContacts.find((item) => item.toLowerCase() === key))
|
||||
.filter(Boolean);
|
||||
|
||||
root.innerHTML = `
|
||||
<div class="modal" id="profile-add-relative-modal">
|
||||
<div class="modal-card stack">
|
||||
<h3 class="modal-title">Добавить связь</h3>
|
||||
<label class="meta-muted" for="profile-relative-kind">Какой тип связи вы хотите добавить?</label>
|
||||
<select class="input profile-relation-select" id="profile-relative-kind">
|
||||
${RELATIVE_RELATION_OPTIONS.map((item) => (
|
||||
`<option value="${item.value}">${item.label}</option>`
|
||||
)).join('')}
|
||||
</select>
|
||||
<label class="meta-muted" for="profile-relative-login">Логин пользователя</label>
|
||||
<input
|
||||
class="input"
|
||||
id="profile-relative-login"
|
||||
type="text"
|
||||
maxlength="30"
|
||||
placeholder="Введите логин пользователя"
|
||||
/>
|
||||
<div class="meta-muted profile-relative-search-meta" id="profile-relative-search-meta">
|
||||
Начните вводить логин. Поиск запустится через 2 секунды паузы или по Enter.
|
||||
</div>
|
||||
<div class="profile-relative-search-suggest" id="profile-relative-search-suggest" hidden></div>
|
||||
<div class="meta-muted inline-error" id="profile-relative-error"></div>
|
||||
<div class="form-actions-grid">
|
||||
<button class="secondary-btn" id="profile-relative-cancel" type="button">Отмена</button>
|
||||
<button class="primary-btn" id="profile-relative-submit" type="button">Продолжить</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
`;
|
||||
|
||||
return new Promise((resolve) => {
|
||||
const modal = root.querySelector('#profile-add-relative-modal');
|
||||
const kindEl = root.querySelector('#profile-relative-kind');
|
||||
const loginEl = root.querySelector('#profile-relative-login');
|
||||
const submitEl = root.querySelector('#profile-relative-submit');
|
||||
const cancelEl = root.querySelector('#profile-relative-cancel');
|
||||
const errorEl = root.querySelector('#profile-relative-error');
|
||||
const searchMetaEl = root.querySelector('#profile-relative-search-meta');
|
||||
const suggestEl = root.querySelector('#profile-relative-search-suggest');
|
||||
|
||||
if (!(modal instanceof HTMLElement) || !(kindEl instanceof HTMLSelectElement) || !(loginEl instanceof HTMLInputElement)) {
|
||||
root.innerHTML = '';
|
||||
resolve(null);
|
||||
return;
|
||||
}
|
||||
|
||||
let closed = false;
|
||||
let searchTimerId = 0;
|
||||
let searchSeq = 0;
|
||||
|
||||
const clearSearchTimer = () => {
|
||||
if (!searchTimerId) return;
|
||||
window.clearTimeout(searchTimerId);
|
||||
searchTimerId = 0;
|
||||
};
|
||||
|
||||
const uniqueCaseInsensitive = (list) => {
|
||||
const out = [];
|
||||
const seen = new Set();
|
||||
(Array.isArray(list) ? list : []).forEach((item) => {
|
||||
const value = String(item || '').trim();
|
||||
if (!value) return;
|
||||
const key = value.toLowerCase();
|
||||
if (seen.has(key)) return;
|
||||
seen.add(key);
|
||||
out.push(value);
|
||||
});
|
||||
return out;
|
||||
};
|
||||
|
||||
const renderSuggestions = (list) => {
|
||||
if (!(suggestEl instanceof HTMLElement)) return;
|
||||
const values = uniqueCaseInsensitive(list).slice(0, 5);
|
||||
if (!values.length) {
|
||||
suggestEl.hidden = true;
|
||||
suggestEl.innerHTML = '';
|
||||
return;
|
||||
}
|
||||
suggestEl.hidden = false;
|
||||
suggestEl.innerHTML = values.map((value) => (
|
||||
`<button type="button" class="ui-button profile-relative-suggest-item" data-login="${escapeHtml(value)}">${escapeHtml(value)}</button>`
|
||||
)).join('');
|
||||
};
|
||||
|
||||
const searchContactsFallback = (prefix) => {
|
||||
const query = String(prefix || '').trim().toLowerCase();
|
||||
if (!query) return [];
|
||||
return uniqueContacts
|
||||
.filter((entry) => entry.toLowerCase().startsWith(query))
|
||||
.slice(0, 5);
|
||||
};
|
||||
|
||||
const runSearch = async ({ withErrorMessage = false } = {}) => {
|
||||
const prefix = String(loginEl.value || '').trim();
|
||||
if (!prefix) {
|
||||
renderSuggestions([]);
|
||||
if (searchMetaEl) {
|
||||
searchMetaEl.textContent = 'Начните вводить логин. Поиск запустится через 2 секунды паузы или по Enter.';
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
if (searchMetaEl) searchMetaEl.textContent = `Поиск пользователей по префиксу «${prefix}»...`;
|
||||
const reqId = ++searchSeq;
|
||||
let found = [];
|
||||
let searchFailed = false;
|
||||
|
||||
try {
|
||||
const payload = await authService.searchUsers(prefix);
|
||||
found = Array.isArray(payload) ? payload : [];
|
||||
} catch {
|
||||
searchFailed = true;
|
||||
found = [];
|
||||
}
|
||||
|
||||
if (closed || reqId !== searchSeq) return;
|
||||
|
||||
const query = prefix.toLowerCase();
|
||||
const candidateList = uniqueCaseInsensitive([
|
||||
...found,
|
||||
...searchContactsFallback(prefix),
|
||||
])
|
||||
.filter((entry) => entry.toLowerCase().startsWith(query))
|
||||
.slice(0, 5);
|
||||
|
||||
renderSuggestions(candidateList);
|
||||
|
||||
if (candidateList.length > 0) {
|
||||
if (searchMetaEl) searchMetaEl.textContent = `Найдено ${candidateList.length} пользователей. Выберите пользователя из списка.`;
|
||||
return;
|
||||
}
|
||||
|
||||
if (searchFailed) {
|
||||
if (searchMetaEl) searchMetaEl.textContent = 'Не удалось получить список пользователей. Уточните логин вручную.';
|
||||
if (withErrorMessage && errorEl) errorEl.textContent = 'Ошибка поиска пользователей.';
|
||||
return;
|
||||
}
|
||||
if (searchMetaEl) searchMetaEl.textContent = 'Пользователи с таким префиксом не найдены.';
|
||||
};
|
||||
|
||||
const close = (payload = null) => {
|
||||
closed = true;
|
||||
clearSearchTimer();
|
||||
root.innerHTML = '';
|
||||
resolve(payload);
|
||||
};
|
||||
|
||||
const submit = () => {
|
||||
const relationType = String(kindEl.value || '').trim();
|
||||
const toLogin = String(loginEl.value || '').trim();
|
||||
if (!relationType) {
|
||||
if (errorEl) errorEl.textContent = 'Выберите тип связи.';
|
||||
return;
|
||||
}
|
||||
if (!toLogin) {
|
||||
if (errorEl) errorEl.textContent = 'Введите логин пользователя.';
|
||||
return;
|
||||
}
|
||||
close({ relationType, toLogin });
|
||||
};
|
||||
|
||||
modal.addEventListener('click', (event) => {
|
||||
if (event.target === modal) close(null);
|
||||
});
|
||||
cancelEl?.addEventListener('click', () => close(null));
|
||||
submitEl?.addEventListener('click', submit);
|
||||
suggestEl?.addEventListener('click', (event) => {
|
||||
const target = event.target;
|
||||
if (!(target instanceof HTMLElement)) return;
|
||||
const button = target.closest('[data-login]');
|
||||
if (!(button instanceof HTMLElement)) return;
|
||||
const pickedLogin = String(button.dataset.login || '').trim();
|
||||
if (!pickedLogin) return;
|
||||
loginEl.value = pickedLogin;
|
||||
if (errorEl) errorEl.textContent = '';
|
||||
if (searchMetaEl) searchMetaEl.textContent = `Выбран пользователь «${pickedLogin}». Нажмите «Продолжить».`;
|
||||
renderSuggestions([]);
|
||||
});
|
||||
loginEl.addEventListener('input', () => {
|
||||
if (errorEl) errorEl.textContent = '';
|
||||
clearSearchTimer();
|
||||
const value = String(loginEl.value || '').trim();
|
||||
if (!value) {
|
||||
renderSuggestions([]);
|
||||
if (searchMetaEl) {
|
||||
searchMetaEl.textContent = 'Начните вводить логин. Поиск запустится через 2 секунды паузы или по Enter.';
|
||||
}
|
||||
return;
|
||||
}
|
||||
if (searchMetaEl) searchMetaEl.textContent = 'Ожидание паузы 2 секунды для поиска...';
|
||||
searchTimerId = window.setTimeout(() => {
|
||||
runSearch({ withErrorMessage: false });
|
||||
}, 2000);
|
||||
});
|
||||
loginEl.addEventListener('keydown', (event) => {
|
||||
if (event.key === 'Enter') {
|
||||
event.preventDefault();
|
||||
clearSearchTimer();
|
||||
runSearch({ withErrorMessage: true });
|
||||
}
|
||||
});
|
||||
window.setTimeout(() => loginEl.focus(), 0);
|
||||
});
|
||||
}
|
||||
|
||||
function renderFields(fields) {
|
||||
listWrap.innerHTML = '';
|
||||
fields.forEach((field) => {
|
||||
@@ -611,7 +344,6 @@ export function render({ navigate, chrome }) {
|
||||
reloadBtn.disabled = true;
|
||||
accountRoleBtn.disabled = true;
|
||||
shineBtn.disabled = true;
|
||||
if (addRelativeBtn instanceof HTMLButtonElement) addRelativeBtn.disabled = true;
|
||||
|
||||
try {
|
||||
const snapshot = await loadProfileSnapshot(login);
|
||||
@@ -637,7 +369,6 @@ export function render({ navigate, chrome }) {
|
||||
reloadBtn.disabled = false;
|
||||
accountRoleBtn.disabled = false;
|
||||
shineBtn.disabled = false;
|
||||
if (addRelativeBtn instanceof HTMLButtonElement) addRelativeBtn.disabled = false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -750,86 +481,6 @@ export function render({ navigate, chrome }) {
|
||||
}
|
||||
}
|
||||
|
||||
async function onAddRelativeClick() {
|
||||
const sessionLogin = String(login || '').trim();
|
||||
if (!sessionLogin) {
|
||||
showToast('Для добавления связи нужен вход в аккаунт.', { kind: 'error' });
|
||||
return;
|
||||
}
|
||||
|
||||
status.className = 'status-line';
|
||||
status.textContent = 'Подготовка окна добавления связи...';
|
||||
|
||||
let contacts = [];
|
||||
try {
|
||||
const payload = await authService.listContacts();
|
||||
contacts = Array.isArray(payload?.contacts) ? payload.contacts : [];
|
||||
} catch {
|
||||
contacts = [];
|
||||
}
|
||||
|
||||
const picked = await openAddRelativeModal({ contacts });
|
||||
if (!picked) {
|
||||
status.className = 'status-line is-available';
|
||||
status.textContent = 'Добавление связи отменено.';
|
||||
return;
|
||||
}
|
||||
|
||||
const relationType = String(picked.relationType || '').trim().toLowerCase();
|
||||
const inputLogin = String(picked.toLogin || '').trim();
|
||||
if (!relationType || !inputLogin) return;
|
||||
if (inputLogin.toLowerCase() === sessionLogin.toLowerCase()) {
|
||||
status.className = 'status-line is-unavailable';
|
||||
status.textContent = 'Нельзя добавить связь с самим собой.';
|
||||
return;
|
||||
}
|
||||
|
||||
status.className = 'status-line';
|
||||
status.textContent = 'Проверка пользователя...';
|
||||
|
||||
let targetCard;
|
||||
try {
|
||||
targetCard = await loadUserProfileCard(inputLogin);
|
||||
} catch (error) {
|
||||
status.className = 'status-line is-unavailable';
|
||||
status.textContent = actionErrorText('Не удалось найти пользователя', error);
|
||||
showLocalErrorAlert('Не удалось выбрать пользователя', error);
|
||||
return;
|
||||
}
|
||||
|
||||
const targetLogin = String(targetCard?.login || inputLogin).trim();
|
||||
const targetGender = normalizeGender(targetCard?.gender || PROFILE_GENDER_UNKNOWN);
|
||||
const relationLabel = relationAccusativeLabel(relationType, targetGender);
|
||||
const confirmed = await confirmDialog({
|
||||
title: 'Добавить связь?',
|
||||
text: `Добавить ${targetLogin} как ${relationLabel}?`,
|
||||
confirmLabel: 'Добавить',
|
||||
});
|
||||
if (!confirmed) return;
|
||||
|
||||
status.className = 'status-line';
|
||||
status.textContent = 'Сохранение связи...';
|
||||
|
||||
try {
|
||||
if (!state.session.storagePwdInMemory) {
|
||||
throw new Error('Нет storagePwd в памяти сессии. Выполните вход заново.');
|
||||
}
|
||||
await authService.setUserRelation({
|
||||
login: sessionLogin,
|
||||
toLogin: targetLogin,
|
||||
kind: relationType,
|
||||
enabled: true,
|
||||
storagePwd: state.session.storagePwdInMemory,
|
||||
});
|
||||
status.className = 'status-line is-available';
|
||||
status.textContent = `Связь добавлена: ${targetLogin} как ${relationLabel}.`;
|
||||
} catch (error) {
|
||||
status.className = 'status-line is-unavailable';
|
||||
status.textContent = actionErrorText('Не удалось добавить связь', error);
|
||||
showLocalErrorAlert('Не удалось добавить связь', error);
|
||||
}
|
||||
}
|
||||
|
||||
listWrap.addEventListener('click', (event) => {
|
||||
const target = event.target;
|
||||
if (!(target instanceof HTMLElement)) return;
|
||||
@@ -847,10 +498,9 @@ export function render({ navigate, chrome }) {
|
||||
reloadBtn.addEventListener('click', refreshProfileSnapshot);
|
||||
accountRoleBtn.addEventListener('click', () => onStatusClick('account_role'));
|
||||
shineBtn.addEventListener('click', () => onStatusClick('shine'));
|
||||
addRelativeBtn?.addEventListener('click', onAddRelativeClick);
|
||||
avatarActionEl?.addEventListener('click', () => { void onChangeAvatarClick(); });
|
||||
|
||||
card.append(topRow, badgesRow, status, listWrap, relativesCard);
|
||||
card.append(topRow, badgesRow, status, listWrap);
|
||||
screen.append(card);
|
||||
|
||||
updateAvatarUi();
|
||||
|
||||
Reference in New Issue
Block a user