Обновить публичные ссылки и аватары каналов

This commit is contained in:
AidarKC
2026-10-28 20:03:34 +03:00
parent 8bb7d39c76
commit d2b2876a79
12 changed files with 174 additions and 28 deletions
+2 -2
View File
@@ -65,7 +65,7 @@ export function profileCardHtml({ card, login = '', tilesHtml = '', tilesWrapCla
const stats = card?.stats || {};
const official = card?.accountRole === 'primary';
const shining = card?.shineStatus === 'shining';
const cardLogin = card?.login || login;
const cardLogin = String(card?.login || login || '').trim().replace(/^@+/, '');
const city = displayCity(card?.city);
const fullName = [card?.firstName, card?.lastName].map((v) => String(v || '').trim()).filter(Boolean).join(' ');
const displayName = fullName || cardLogin || 'Профиль';
@@ -109,7 +109,7 @@ export function profileCardHtml({ card, login = '', tilesHtml = '', tilesWrapCla
<div class="pf-side pf-side--right">${shineSide}</div>
</div>
<h2 class="pf-name">${esc(displayName)}</h2>
<div class="pf-login">@${esc(cardLogin)}</div>
<div class="pf-login">${esc(cardLogin)}</div>
${city ? `<div class="pf-city">${iconHtml('place')}<span>${esc(city)}</span></div>` : ''}
</div>
+21 -11
View File
@@ -642,7 +642,7 @@ function createChannelAvatarElement(channel, size = 96) {
const wrap = renderAvatar({
initials: title.slice(0, 1).toUpperCase() || 'К',
avatar: (txId || sha256) ? { ar: txId, sha256Hex: sha256 } : null,
authorLogin: String(channel?.ownerLogin || '').trim(),
authorLogin: String(channel?.ownerLogin || channel?.ownerName || extractLoginFromBlockchainName(channel?.ownerBlockchainName) || '').trim(),
size: 'xl',
className: 'channel-profile-avatar avatar-plain',
title,
@@ -659,10 +659,14 @@ function openChannelMetaDetailsModal({
onEdit = null,
changedAtMs = 0,
} = {}) {
const avatarState = String(channel.avaAr || channel.avaSha256 || '').trim() ? 'Установлен' : 'Не установлен';
const changedAtLabel = changedAtMs
? new Date(Number(changedAtMs)).toLocaleString('ru-RU')
: '–';
const channelTitle = String(channel.displayTitle || channel.displayName || channel.name || '–').trim();
const ownerLogin = String(channel.ownerLogin || channel.ownerName || extractLoginFromBlockchainName(channel.ownerBlockchainName) || '').trim();
const channelSlug = String(channel.name || '').trim();
const systemName = [ownerLogin, channelSlug].filter(Boolean).join('/') || '–';
const dateLabel = title === 'Канал создан' ? 'Дата создания' : 'Дата изменения';
const root = document.getElementById('modal-root');
root.innerHTML = `
<div class="modal" id="about-channel-modal">
@@ -671,14 +675,12 @@ function openChannelMetaDetailsModal({
<h3 class="modal-title">${escapeHtml(title)}</h3>
${canEdit ? '<button class="secondary-btn channel-profile-edit-btn" id="about-channel-edit" type="button" title="Изменить">✏️</button>' : ''}
</div>
<div id="about-channel-avatar-slot"></div>
<div id="about-channel-avatar-slot" class="channel-meta-avatar-slot"></div>
<div class="channel-meta-details-grid">
<span>Дата</span><strong>${escapeHtml(changedAtLabel)}</strong>
<span>Владелец</span><strong>${escapeHtml(channel.ownerName || 'автор')}</strong>
<span>Системное имя</span><code>${escapeHtml(channel.name || 'channel')}</code>
<span>Название</span><strong>${escapeHtml(channel.displayTitle || channel.displayName || channel.name || '–')}</strong>
<span>Название канала</span><strong>${escapeHtml(channelTitle)}</strong>
<span>Системное имя</span><code>${escapeHtml(systemName)}</code>
<span>${dateLabel}</span><strong>${escapeHtml(changedAtLabel)}</strong>
<span>Описание</span><span>${escapeHtml(channel.description || 'Описание не задано.')}</span>
<span>Аватар</span><span>${escapeHtml(avatarState)}</span>
</div>
<button class="secondary-btn" id="about-channel-close" type="button">Закрыть</button>
</div>
@@ -1549,6 +1551,7 @@ async function loadFromApi(route, channelId) {
return {
channel: {
name: payload.channel?.channelName || 'неизвестный канал',
ownerLogin,
ownerBlockchainName: String(payload.channel?.ownerBlockchainName || '').trim(),
displayTitle: String(payload.channel?.displayName || payload.channel?.channelName || 'неизвестный канал').trim(),
displayName: `${ownerLogin || 'неизвестно'}/${payload.channel?.channelName || 'неизвестный канал'}`,
@@ -1639,16 +1642,21 @@ function applyPendingScroll(screen, routeKey, forceBottom = false) {
}
function mapChannelMetaEvent(event, fallbackChannel) {
const hasEventAvatar = Boolean(String(event?.avaAr || event?.avaSha256 || '').trim());
return {
kind: String(event?.kind || '').trim(),
messageRef: event?.messageRef || null,
timestampMs: Number(event?.createdAtMs || 0),
title: String(event?.title || fallbackChannel?.displayTitle || fallbackChannel?.name || '').trim(),
description: String(event?.description || '').trim(),
avaAr: String(event?.avaAr || '').trim(),
avaSha256: String(event?.avaSha256 || '').trim(),
avaSize: Number(event?.avaSize || 0),
// Событие создания хранит снимок на момент создания и часто ещё без аватара.
// Показываем актуальную фотографию канала, если у события нет своей.
avaAr: String((hasEventAvatar ? event?.avaAr : fallbackChannel?.avaAr) || '').trim(),
avaSha256: String((hasEventAvatar ? event?.avaSha256 : fallbackChannel?.avaSha256) || '').trim(),
avaSize: Number((hasEventAvatar ? event?.avaSize : fallbackChannel?.avaSize) || 0),
ownerLogin: String(fallbackChannel?.ownerLogin || fallbackChannel?.ownerName || '').trim(),
ownerName: fallbackChannel?.ownerName || '',
ownerBlockchainName: fallbackChannel?.ownerBlockchainName || '',
name: fallbackChannel?.name || '',
};
}
@@ -1670,6 +1678,8 @@ function renderChannelMetaEventCard(event, dayLabel = '') {
title: label,
channel: {
name: event.name,
ownerLogin: event.ownerLogin,
ownerBlockchainName: event.ownerBlockchainName,
displayTitle: event.title,
description: event.description,
avaAr: event.avaAr,
+3 -3
View File
@@ -6,7 +6,7 @@ import { loadUserProfileCard } from '../services/user-connections.js';
import { profileCardHtml, profileTileHtml } from '../components/profile-card.js';
import { openShareSheet } from '../components/share-sheet.js';
import { createErrorState, createLoadingState } from '../components/feedback.js';
import { makeProfileRoute } from '../services/shine-routes.js';
import { makeSharedProfileRoute } from '../services/shine-routes.js';
import { toUserMessage } from '../services/ui-error-texts.js';
export const pageMeta = { id: 'profile-view', title: 'Профиль' };
@@ -22,11 +22,11 @@ export function render({ navigate, chrome }) {
// Ссылка на свой профиль – самое частое «поделиться» в соцсети.
const shareProfile = () => {
const url = new URL(window.location.href);
url.pathname = `/${makeProfileRoute(login)}`;
url.pathname = `/${makeSharedProfileRoute(login)}`;
url.search = '';
url.hash = '';
const name = [card?.firstName, card?.lastName].map((part) => String(part || '').trim()).filter(Boolean).join(' ');
openShareSheet({ title: 'Поделиться профилем', kicker: name ? `${name} · @${login}` : `@${login}`, text: 'Профиль в Сиянии', url: url.toString() });
openShareSheet({ title: 'Поделиться профилем', kicker: name ? `${name} · ${login}` : login, text: 'Профиль в Сиянии', url: url.toString() });
};
const topbar = createTopBar({
title: 'Профиль',
+11
View File
@@ -106,6 +106,12 @@ export function parseRouteFromPath(pathname = '') {
};
const isLikelyBlockNumber = (value) => /^[0-9]+$/.test(String(value || '').trim());
// Прямая публичная ссылка на профиль, в отличие от адреса канала.
if (segments.length === 3 && segments[0].toLowerCase() === 'shine' && segments[1].toLowerCase() === 'prof') {
const profileLogin = decodePart(segments[2]);
if (profileLogin) return { pageId: 'user', params: { login: profileLogin, fromPage: 'messages-list', section: 'profile' } };
}
const shineRoute = parseShineRouteParts(segments);
if (shineRoute?.entity) {
const shineLogin = shineRoute.entity;
@@ -531,6 +537,11 @@ export function toPrettyPath(path) {
if (!segments.length) return '';
const [head, ...tail] = segments;
const prettyHead = PRETTY_PATHS.get(head) || head;
// Старые вызовы навигации могут передавать %40 через encodeURIComponent.
// Для публичных SHiNE-путей оставляем @ видимым, сохраняя остальные escape-коды.
if (prettyHead.toLowerCase() === 'shine') {
return [prettyHead, ...tail.map((segment) => segment.replace(/%40/gi, '@'))].join('/');
}
return [prettyHead, ...tail].join('/');
}
+9 -1
View File
@@ -1,5 +1,7 @@
// @ допустим в сегменте пути URL: не маскируем namespace в публичных ссылках.
// Остальные специальные символы по-прежнему экранируются.
function encodeRoutePart(value = '') {
return encodeURIComponent(String(value || '').trim());
return encodeURIComponent(String(value || '').trim()).replace(/%40/gi, '@');
}
function decodeRoutePart(value = '') {
@@ -28,6 +30,12 @@ export function makeProfileRoute(login = '') {
return clean ? `${SHINE_ROUTE_SEGMENT}/${encodeRoutePart(clean)}` : 'profile';
}
// Публичный адрес шаринга. Старые /SHiNE/<login> остаются рабочими.
export function makeSharedProfileRoute(login = '') {
const clean = normalizeLogin(login);
return clean ? `${SHINE_ROUTE_SEGMENT}/Prof/${encodeRoutePart(clean)}` : 'profile';
}
export function makeProfileLinksRoute(login = '') {
const clean = normalizeLogin(login);
return clean ? `${SHINE_ROUTE_SEGMENT}/${encodeRoutePart(clean)}/links` : 'network/keep-history';