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

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
+1 -1
View File
@@ -1,2 +1,2 @@
client.version=1.20.8
client.version=1.20.9
server.version=1.16.8
+2 -2
View File
@@ -39,8 +39,8 @@
}());
</script>
<script>
window.__SHINE_BUILD_HASH__ = '20261015230000';
window.__SHINE_CLIENT_VERSION__ = '1.2.10';
window.__SHINE_BUILD_HASH__ = '20261028161209';
window.__SHINE_CLIENT_VERSION__ = '1.20.9';
</script>
<script>
(function attachStylesWithBuildHash() {
+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';
+1 -1
View File
@@ -42,7 +42,7 @@
.thread-block--ancestors { padding-top: 12px; }
.channels-screen .thread-comment--ancestor { padding-bottom: 14px; }
.thread-comment--ancestor::after { content: ''; position: absolute; top: 42px; bottom: 0; left: 17px; border-left: 2px solid var(--border-control); pointer-events: none; }
.thread-comment--ancestor .avatar.channel-profile-avatar { width: 36px; height: 36px; min-width: 36px; min-height: 36px; border-radius: 10px; font-size: 15px; }
.thread-comment--ancestor .avatar.channel-profile-avatar { width: 36px; height: 36px; min-width: 36px; min-height: 36px; border-radius: 50%; font-size: 15px; }
.thread-block--ancestors + .thread-block--focus .channel-message-card--threads-focus { padding-top: 0; }
.thread-quote { display: block; width: 100%; margin: 0 0 7px; padding: 5px 9px; border: 0; border-left: 2px solid var(--quote-line); border-radius: 0 6px 6px 0; background: var(--quote-bg); color: var(--text-secondary); font: inherit; font-size: .75rem; line-height: 1.125rem; text-align: left; cursor: pointer; }
+6 -3
View File
@@ -5,8 +5,11 @@
.channel-message-target-preview { display: grid; gap: 4px; padding: 12px; border-left: 2px solid var(--accent); background: var(--surface); font-size: .8125rem; overflow-wrap: anywhere; }
.channels-screen .channel-message-card.is-focus-flash { background: var(--surface-selected); }
.channel-system-event-card { padding: 8px; margin: 8px auto; width: fit-content; max-width: 100%; color: var(--text-secondary); font-size: .75rem; text-align: center; }
.channel-meta-details-grid { display: grid; grid-template-columns: auto minmax(0,1fr); gap: 8px; overflow-wrap: anywhere; }
.channel-profile-avatar { width: var(--channel-avatar-size, 96px); height: var(--channel-avatar-size, 96px); min-width: var(--channel-avatar-size, 96px); border-radius: calc(var(--channel-avatar-size, 96px) * .28); overflow: hidden; color: var(--accent); font-size: calc(var(--channel-avatar-size, 96px) * .5); }
.channel-meta-details-grid { display: grid; grid-template-columns: minmax(0, 128px) minmax(0,1fr); gap: 10px 12px; align-items: start; overflow-wrap: anywhere; }
.channel-meta-details-grid > span:nth-child(2n + 1) { color: var(--text-secondary); }
.channel-meta-details-grid code { overflow-wrap: anywhere; }
.channel-meta-avatar-slot { display: flex; justify-content: center; margin: 4px 0 12px; }
.channel-profile-avatar { width: var(--channel-avatar-size, 96px); height: var(--channel-avatar-size, 96px); min-width: var(--channel-avatar-size, 96px); border-radius: 50%; overflow: hidden; color: var(--accent); font-size: calc(var(--channel-avatar-size, 96px) * .5); }
.channel-profile-avatar img { width: 100%; height: 100%; object-fit: cover; }
.channel-profile-modal-head { display: flex; gap: 12px; align-items: center; }
.channel-main-action { width: 100%; min-height: 44px; display: inline-flex; align-items: center; justify-content: center; gap: 8px; border-radius: 12px; padding: 0 16px; color: var(--on-accent); background: var(--accent); font-weight: 600; }
@@ -25,7 +28,7 @@
.channel-about-hero { display: grid; justify-items: center; gap: 4px; padding: 8px 16px 0; text-align: center; }
.channel-about-avatar-slot { margin-bottom: 8px; }
.channel-about-avatar.avatar { width: 80px; height: 80px; min-width: 80px; min-height: 80px; border-radius: 24px; font-size: 36px; color: var(--accent); }
.channel-about-avatar.avatar { width: 80px; height: 80px; min-width: 80px; min-height: 80px; border-radius: 50%; font-size: 36px; color: var(--accent); }
.channel-about-title { margin: 0; color: var(--text-primary); font-size: 1.375rem; line-height: 1.75rem; font-weight: 600; overflow-wrap: anywhere; }
.channel-about-subline { color: var(--text-secondary); font-size: .875rem; line-height: 1.25rem; overflow-wrap: anywhere; }
+2 -2
View File
@@ -87,7 +87,7 @@
.channel-message-card--owner .channel-message-head-row[hidden] { display: none; }
.channel-message-card--owner .message-attachment-carousel { width: calc(100% + 2 * var(--page-gutter)); max-width: none; margin: 0 calc(-1 * var(--page-gutter)) 14px; }
.channel-message-card--owner .message-attachment-carousel-viewport { border: 0; border-radius: 0; }
.topbar-identity .avatar.channel-profile-avatar { --channel-avatar-size: 40px; width: 40px; height: 40px; min-width: 40px; min-height: 40px; font-size: 22px; border-radius: 11px; }
.topbar-identity .avatar.channel-profile-avatar { --channel-avatar-size: 40px; width: 40px; height: 40px; min-width: 40px; min-height: 40px; font-size: 22px; border-radius: 50%; }
.channel-message-card--owner .channel-message-actions { gap: 0; margin: 6px -8px 0; min-height: 50px; flex-wrap: nowrap; }
/* Равный шаг иконок: каждое действие – ячейка 56 px, иконка у левого края, счётчик внутри ячейки (влезает и «999»). */
.channel-message-card--owner .channel-action-item { width: 56px; min-width: 56px; min-height: 44px; padding: 0 0 0 8px; gap: 5px; justify-content: flex-start; border-radius: 10px; font-variant-numeric: tabular-nums; }
@@ -127,7 +127,7 @@
.channel-message-card--threads .channel-message-author-tile:is(:hover, :active) { filter: none; }
.channel-message-card--threads .channel-message-author-tile:active .author-line-login { color: var(--accent); }
@media (hover: hover) { .channel-message-card--threads .channel-message-author-tile:hover .author-line-login { color: var(--accent); } }
.channel-message-card--threads .avatar.channel-profile-avatar { width: 36px; height: 36px; min-width: 36px; min-height: 36px; border-radius: 10px; font-size: 15px; }
.channel-message-card--threads .avatar.channel-profile-avatar { width: 36px; height: 36px; min-width: 36px; min-height: 36px; border-radius: 50%; font-size: 15px; }
.channel-message-card--threads .author-line-login { font-size: .9375rem; }
.channel-message-card--threads .channel-message-author .channel-message-time::before { content: none; }
.channel-message-card--threads .channel-message-time { font-size: .875rem; line-height: 1.25rem; }
+2 -2
View File
@@ -104,8 +104,8 @@
height: 48px;
min-width: 48px;
min-height: 48px;
/* Каналы – скруглённый квадрат, как в ленте и шапке канала; люди – круг. */
border-radius: 28%;
/* Аватары каналов, как и пользователей, всегда круглые. */
border-radius: 50%;
overflow: hidden;
}
@@ -0,0 +1,114 @@
import test from 'node:test';
import assert from 'node:assert/strict';
import { readFileSync } from 'node:fs';
import { fileURLToPath } from 'node:url';
import { dirname, resolve } from 'node:path';
import {
makeSharedProfileRoute,
makeProfileRoute,
makeShineChannelRoute,
makeShineChannelShortRoute,
makeShineChannelStreamRoute,
makeShineMessageRoute,
} from '../js/services/shine-routes.js';
import { profileCardHtml } from '../js/components/profile-card.js';
const ui = resolve(dirname(fileURLToPath(import.meta.url)), '..');
const source = (name) => readFileSync(resolve(ui, name), 'utf8');
test('публичная ссылка профиля содержит /SHiNE/Prof/<login>', () => {
assert.equal(makeSharedProfileRoute('alice@free'), 'SHiNE/Prof/alice@free');
assert.equal(makeSharedProfileRoute('Пользователь'), 'SHiNE/Prof/%D0%9F%D0%BE%D0%BB%D1%8C%D0%B7%D0%BE%D0%B2%D0%B0%D1%82%D0%B5%D0%BB%D1%8C');
assert.equal(makeProfileRoute('alice@free'), 'SHiNE/alice@free');
});
test('открытые ссылки профиля, канала и сообщения показывают @, а не %40', () => {
assert.equal(makeSharedProfileRoute('@innaa@free'), 'SHiNE/Prof/innaa@free');
assert.equal(makeProfileRoute('innaa@free'), 'SHiNE/innaa@free');
assert.equal(makeShineChannelShortRoute({ ownerLogin: 'innaa@free', channelName: 'news' }), 'SHiNE/innaa@free/news');
assert.equal(makeShineChannelStreamRoute({ ownerLogin: 'innaa@free', channelName: 'news', messageOrdinal: 19 }), 'SHiNE/innaa@free/news/s/19');
assert.equal(makeShineChannelRoute({ ownerBlockchainName: 'innaa@free-002', channelName: 'news' }), 'SHiNE/innaa@free-002/news');
assert.equal(makeShineMessageRoute({ ownerLogin: 'innaa@free', messageBlockchainName: 'innaa@free-002', messageBlockNumber: 25, messageOrdinal: 3, channelName: 'news' }), 'SHiNE/innaa@free/news/3');
assert.equal(makeShineMessageRoute({ messageBlockchainName: 'innaa@free-002', messageBlockNumber: 25 }), 'SHiNE/innaa@free-002/25');
// Без потери безопасности: пробел, слэш и Unicode в пути по-прежнему кодируются.
assert.equal(makeShineChannelShortRoute({ ownerLogin: 'innaa@free', channelName: 'мои новости/2026' }),
'SHiNE/innaa@free/%D0%BC%D0%BE%D0%B8%20%D0%BD%D0%BE%D0%B2%D0%BE%D1%81%D1%82%D0%B8%2F2026');
const url = new URL('https://t2.shineup.me');
url.pathname = `/${makeSharedProfileRoute('innaa@free')}`;
assert.equal(url.toString(), 'https://t2.shineup.me/SHiNE/Prof/innaa@free');
});
test('отображение профиля не добавляет вторую собачку перед логином', () => {
for (const value of ['innaa@free', '@innaa@free']) {
const html = profileCardHtml({ card: { login: value }, isSelf: false });
assert.match(html, /<div class="pf-login">innaa@free<\/div>/);
assert.doesNotMatch(html, /@innaa@free/);
}
const shareSource = source('js/pages/profile-view.js');
assert.doesNotMatch(shareSource, /kicker: name \?[^\n]*· @\$\{login\}/);
});
test('при навигации старые вручную закодированные SHiNE-пути становятся читаемыми', async () => {
const previousWindow = globalThis.window;
globalThis.window = { location: { pathname: '/' } };
try {
const { toPrettyPath } = await import('../js/router.js');
assert.equal(toPrettyPath('SHiNE/innaa%40free/news/3'), 'SHiNE/innaa@free/news/3');
assert.equal(toPrettyPath('SHiNE/Prof/innaa%40free'), 'SHiNE/Prof/innaa@free');
assert.equal(toPrettyPath('chat/innaa%40free'), 'chat/innaa%40free');
} finally {
globalThis.window = previousWindow;
}
});
test('новые и старые ссылки профиля ведут на пользователя, не на канал', async () => {
const previousWindow = globalThis.window;
globalThis.window = { location: { pathname: '/' } };
try {
const { parseRouteFromPath } = await import('../js/router.js');
for (const route of ['/SHiNE/Prof/alice@free', '/SHiNE/Prof/alice%40free', '/shine/prof/alice%40free', '/SHiNE/alice@free', '/SHiNE/alice%40free']) {
const page = parseRouteFromPath(route);
assert.equal(page.pageId, 'user');
assert.equal(page.params.login, 'alice@free');
}
for (const path of ['/SHiNE/alice@free/news', '/SHiNE/alice%40free/news']) {
const channel = parseRouteFromPath(path);
assert.equal(channel.pageId, 'channel-view');
assert.equal(channel.params.channelName, 'news');
}
for (const path of ['/SHiNE/alice@free/news/3', '/SHiNE/alice%40free/news/3']) {
const thread = parseRouteFromPath(path);
assert.equal(thread.pageId, 'channel-thread-view');
assert.equal(thread.params.messageOrdinal, '3');
}
} finally {
globalThis.window = previousWindow;
}
});
test('лента получает логин владельца и может запросить фото канала', () => {
const js = source('js/pages/channel-view.js');
assert.match(js, /name: payload\.channel\?\.channelName[^\n]*\n\s+ownerLogin,/);
assert.match(js, /authorLogin: String\(channel\?\.ownerLogin \|\| channel\?\.ownerName/);
assert.match(js, /hasEventAvatar \? event\?\.avaSha256 : fallbackChannel\?\.avaSha256/);
assert.doesNotMatch(js, /Аватар<\/span><span>.*Установлен/);
assert.match(js, /class="channel-meta-avatar-slot"/);
});
test('аватары каналов в списке, карточках, обсуждениях и шапке круглые', () => {
const files = [
['styles/features/channel.css', ['.channel-profile-avatar', '.channel-about-avatar.avatar']],
['styles/features/channels-common.css', ['.topbar-identity .avatar.channel-profile-avatar', '.channel-message-card--threads .avatar.channel-profile-avatar']],
['styles/features/channel-thread.css', ['.thread-comment--ancestor .avatar.channel-profile-avatar']],
];
for (const [file, selectors] of files) {
const css = source(file);
for (const selector of selectors) {
const declaration = css.slice(css.indexOf(selector) + selector.length).match(/^\s*\{([^}]+)\}/);
assert.ok(declaration, `${file} ${selector}`);
assert.match(declaration[1], /border-radius:\s*50%\s*;/, `${file} ${selector}`);
}
}
const channelsListCss = source('styles/features/channels-list.css');
assert.match(channelsListCss, /\.channels-screen--list \.channel-row \.avatar\s*\{[^}]*border-radius:\s*50%;/s);
});