SHA256
Обновить обработку аватаров и вложений
This commit is contained in:
@@ -7,9 +7,9 @@ import {
|
||||
} from '../services/channel-name-rules.js';
|
||||
import {
|
||||
getArweaveAttachmentAvailability,
|
||||
openArweaveAttachmentManager,
|
||||
markArweaveAttachmentPlaced,
|
||||
} from '../components/arweave-attachment-manager.js';
|
||||
import { openChannelAttachmentManager } from '../components/channel-attachment-manager.js';
|
||||
import { renderAvatar } from '../components/avatar-image.js';
|
||||
import { makeShineChannelShortRoute } from '../services/shine-routes.js';
|
||||
|
||||
@@ -44,6 +44,7 @@ function renderAvatarPreview(slot, avatar, title) {
|
||||
const wrap = renderAvatar({
|
||||
initials: label.slice(0, 1).toUpperCase() || 'К',
|
||||
avatar,
|
||||
authorLogin: state.session.login,
|
||||
size: 'xl',
|
||||
className: 'channel-profile-avatar',
|
||||
title: label,
|
||||
@@ -170,17 +171,21 @@ export function render({navigate, chrome}) {
|
||||
|
||||
const renderAvatarStatus = (nameValue, titleValue) => {
|
||||
renderAvatarPreview(avatarPreviewEl, selectedAvatar, titleValue || nameValue);
|
||||
avatarRemoveBtn.hidden = !selectedAvatar?.ar;
|
||||
if (!selectedAvatar?.ar) {
|
||||
avatarRemoveBtn.hidden = !selectedAvatar?.sha256;
|
||||
if (!selectedAvatar?.sha256) {
|
||||
avatarStatusEl.innerHTML = '<p class="channel-avatar-status-text">Аватар канала не установлен.</p>';
|
||||
return;
|
||||
}
|
||||
const txId = String(selectedAvatar.ar || '').trim();
|
||||
if (!txId) {
|
||||
avatarStatusEl.innerHTML = '<p class="channel-avatar-status-text">Аватар канала · сервер доступа</p><p class="channel-avatar-status-line">Хранится бесплатно на вашем сервере доступа.</p>';
|
||||
return;
|
||||
}
|
||||
const shortTxId = shortAvatarBlockchainAddress(txId);
|
||||
const isPending = avatarAvailabilityLabel === 'pending' || avatarAvailabilityTxId !== txId;
|
||||
avatarStatusEl.innerHTML = `
|
||||
<p class="channel-avatar-status-text">Аватар канала</p>
|
||||
<p class="channel-avatar-status-line">Адрес аватара в блокчейне Arweave <span class="channel-avatar-txid">${shortTxId}</span><span class="channel-avatar-status-pending">${isPending ? ', ещё не обновился в блокчейне.' : ''}</span></p>
|
||||
<p class="channel-avatar-status-text">Аватар канала · Arweave</p>
|
||||
<p class="channel-avatar-status-line">Адрес в Arweave <span class="channel-avatar-txid">${shortTxId}</span><span class="channel-avatar-status-pending">${isPending ? ', ещё не обновился в сети.' : ''}</span></p>
|
||||
`;
|
||||
};
|
||||
|
||||
@@ -271,14 +276,13 @@ export function render({navigate, chrome}) {
|
||||
descriptionEl.addEventListener('input', updateValidation);
|
||||
avatarBtn.addEventListener('click', async () => {
|
||||
try {
|
||||
const nextAvatar = await openArweaveAttachmentManager({
|
||||
const nextAvatar = await openChannelAttachmentManager({
|
||||
login: state.session.login,
|
||||
storagePwd: state.session.storagePwdInMemory,
|
||||
gateway: state.entrySettings.arweaveServer,
|
||||
mode: 'avatar',
|
||||
historyPurpose: 'avatar',
|
||||
});
|
||||
if (nextAvatar?.ar) {
|
||||
if (nextAvatar?.sha256) {
|
||||
selectedAvatar = nextAvatar;
|
||||
void refreshAvatarAvailability();
|
||||
}
|
||||
@@ -289,7 +293,7 @@ export function render({navigate, chrome}) {
|
||||
});
|
||||
|
||||
avatarRemoveBtn.addEventListener('click', () => {
|
||||
if (!selectedAvatar?.ar) return;
|
||||
if (!selectedAvatar?.sha256) return;
|
||||
const confirmed = window.confirm('Убрать аватар и сделать канал без аватара?');
|
||||
if (!confirmed) return;
|
||||
selectedAvatar = null;
|
||||
|
||||
@@ -3,6 +3,7 @@ import { createTopBar } from '../components/topbar.js';
|
||||
import { confirmDialog } from '../components/confirm-dialog.js';
|
||||
import { renderAvatar } from '../components/avatar-image.js';
|
||||
import { markArweaveAttachmentPlaced, openArweaveAttachmentManager } from '../components/arweave-attachment-manager.js';
|
||||
import { openChannelAttachmentManager } from '../components/channel-attachment-manager.js';
|
||||
import { authService, setChannelsFeed, state } from '../state.js';
|
||||
import { navigateBack, getPreviousTrackedPath } from '../router.js';
|
||||
import {
|
||||
@@ -84,7 +85,7 @@ function formatChannelCreatedAt(value) {
|
||||
function openChannelProfileEditor({ channel, selector, onSaved }) {
|
||||
const root = document.getElementById('modal-root');
|
||||
if (!root) return;
|
||||
let selectedAvatar = String(channel?.avaAr || '').trim() ? {
|
||||
let selectedAvatar = String(channel?.avaSha256 || '').trim() ? {
|
||||
name: 'Аватар',
|
||||
ar: String(channel.avaAr || '').trim(),
|
||||
sha256: String(channel?.avaSha256 || '').trim(),
|
||||
@@ -121,7 +122,8 @@ function openChannelProfileEditor({ channel, selector, onSaved }) {
|
||||
slot.innerHTML = '';
|
||||
slot.append(renderAvatar({
|
||||
initials: (title || 'К').slice(0, 1).toUpperCase(),
|
||||
avatar: selectedAvatar?.ar ? { ar: selectedAvatar.ar } : null,
|
||||
avatar: selectedAvatar?.sha256 ? { ar: String(selectedAvatar.ar || ''), sha256Hex: selectedAvatar.sha256 } : null,
|
||||
authorLogin: String(channel?.ownerLogin || state.session.login || '').trim(),
|
||||
size: 'xl',
|
||||
className: 'channel-about-avatar channel-profile-avatar',
|
||||
title: title || 'Канал',
|
||||
@@ -135,12 +137,11 @@ function openChannelProfileEditor({ channel, selector, onSaved }) {
|
||||
root.querySelector('#channel-profile-edit-avatar')?.addEventListener('click', async () => {
|
||||
const errorEl = root.querySelector('#channel-profile-edit-error');
|
||||
try {
|
||||
const item = await openArweaveAttachmentManager({
|
||||
const item = await openChannelAttachmentManager({
|
||||
login: state.session.login,
|
||||
storagePwd: state.session.storagePwdInMemory,
|
||||
gateway: state.entrySettings.arweaveServer,
|
||||
mode: 'avatar',
|
||||
historyPurpose: 'avatar',
|
||||
});
|
||||
if (!item) return;
|
||||
selectedAvatar = item;
|
||||
@@ -636,7 +637,8 @@ export function render({ navigate, route, chrome }) {
|
||||
|
||||
const channelAvatar = renderAvatar({
|
||||
initials: cleanName.slice(0, 1).toUpperCase() || 'К',
|
||||
avatar: String(channel?.avaAr || '').trim() ? { ar: String(channel.avaAr || '').trim() } : null,
|
||||
avatar: String(channel?.avaAr || channel?.avaSha256 || '').trim() ? { ar: String(channel.avaAr || '').trim(), sha256Hex: String(channel?.avaSha256 || '').trim() } : null,
|
||||
authorLogin: ownerLogin,
|
||||
size: 'xl',
|
||||
className: 'channel-about-avatar channel-profile-avatar',
|
||||
title: cleanName,
|
||||
|
||||
@@ -79,9 +79,9 @@ function createThreadAvatar(login) {
|
||||
if (!avatarEl.isConnected) return;
|
||||
const upgraded = renderUserAvatar({
|
||||
login: cleanLogin,
|
||||
avatar: snapshot?.avatar?.txId
|
||||
avatar: snapshot?.avatar?.source
|
||||
? {
|
||||
ar: String(snapshot.avatar.txId || '').trim(),
|
||||
ar: String(snapshot.avatar.txId || snapshot.avatar.ar || '').trim(),
|
||||
sha256Hex: String(snapshot?.avatar?.sha256Hex || '').trim().toLowerCase(),
|
||||
}
|
||||
: null,
|
||||
|
||||
@@ -25,8 +25,10 @@ import {
|
||||
softHaptic,
|
||||
} from '../services/channels-ux.js';
|
||||
import { renderAvatar, renderUserAvatar } from '../components/avatar-image.js';
|
||||
import { avatarReferenceToRenderModel, parseAvatarReference } from '../services/avatar-reference.js';
|
||||
import { openChannelEditor } from '../components/channel-editor.js';
|
||||
import { markArweaveAttachmentPlaced, openArweaveAttachmentManager } from '../components/arweave-attachment-manager.js';
|
||||
import { openChannelAttachmentManager } from '../components/channel-attachment-manager.js';
|
||||
import {
|
||||
composeMessageWithAttachments,
|
||||
createAttachmentCarouselElement,
|
||||
@@ -105,9 +107,9 @@ function createMessageAvatar(login) {
|
||||
if (!avatarEl.isConnected) return;
|
||||
const upgraded = renderUserAvatar({
|
||||
login: cleanLogin,
|
||||
avatar: snapshot?.avatar?.txId
|
||||
avatar: snapshot?.avatar?.source
|
||||
? {
|
||||
ar: String(snapshot.avatar.txId || '').trim(),
|
||||
ar: String(snapshot.avatar.txId || snapshot.avatar.ar || '').trim(),
|
||||
sha256Hex: String(snapshot?.avatar?.sha256Hex || '').trim().toLowerCase(),
|
||||
}
|
||||
: null,
|
||||
@@ -619,10 +621,12 @@ function getStatusActionOptionsForTarget(targetMsgSubType) {
|
||||
|
||||
function createChannelAvatarElement(channel, size = 96) {
|
||||
const txId = String(channel?.avaAr || '').trim();
|
||||
const sha256 = String(channel?.avaSha256 || '').trim().toLowerCase();
|
||||
const title = String(channel?.displayTitle || channel?.name || 'К').trim() || 'К';
|
||||
const wrap = renderAvatar({
|
||||
initials: title.slice(0, 1).toUpperCase() || 'К',
|
||||
avatar: txId ? { ar: txId } : null,
|
||||
avatar: (txId || sha256) ? { ar: txId, sha256Hex: sha256 } : null,
|
||||
authorLogin: String(channel?.ownerLogin || '').trim(),
|
||||
size: 'xl',
|
||||
className: 'channel-profile-avatar',
|
||||
title,
|
||||
@@ -639,9 +643,7 @@ function openChannelMetaDetailsModal({
|
||||
onEdit = null,
|
||||
changedAtMs = 0,
|
||||
} = {}) {
|
||||
const avatarState = String(channel.avaAr || '').trim()
|
||||
? 'Установлен'
|
||||
: 'Не установлен';
|
||||
const avatarState = String(channel.avaAr || channel.avaSha256 || '').trim() ? 'Установлен' : 'Не установлен';
|
||||
const changedAtLabel = changedAtMs
|
||||
? new Date(Number(changedAtMs)).toLocaleString('ru-RU')
|
||||
: '–';
|
||||
@@ -689,9 +691,9 @@ function openAboutChannelModal(channel, options = {}) {
|
||||
|
||||
function openEditChannelModal({ channel, onSave }) {
|
||||
const root = document.getElementById('modal-root');
|
||||
let selectedAvatar = channel?.avaAr ? {
|
||||
let selectedAvatar = channel?.avaSha256 ? {
|
||||
name: 'Аватар',
|
||||
ar: channel.avaAr,
|
||||
ar: String(channel.avaAr || ''),
|
||||
sha256: channel.avaSha256,
|
||||
size: channel.avaSize,
|
||||
purpose: 'avatar',
|
||||
@@ -704,6 +706,8 @@ function openEditChannelModal({ channel, onSave }) {
|
||||
slot.append(createChannelAvatarElement({
|
||||
...channel,
|
||||
avaAr: selectedAvatar?.ar || '',
|
||||
avaSha256: selectedAvatar?.sha256 || '',
|
||||
avaSize: selectedAvatar?.size || 0,
|
||||
displayTitle: root.querySelector('#edit-channel-title')?.value || channel.displayTitle,
|
||||
}, 86));
|
||||
};
|
||||
@@ -734,12 +738,11 @@ function openEditChannelModal({ channel, onSave }) {
|
||||
root.querySelector('#edit-channel-title')?.addEventListener('input', renderAvatarPreview);
|
||||
root.querySelector('#edit-channel-avatar')?.addEventListener('click', async () => {
|
||||
try {
|
||||
const item = await openArweaveAttachmentManager({
|
||||
const item = await openChannelAttachmentManager({
|
||||
login: state.session.login,
|
||||
storagePwd: state.session.storagePwdInMemory,
|
||||
gateway: state.entrySettings.arweaveServer,
|
||||
mode: 'avatar',
|
||||
historyPurpose: 'avatar',
|
||||
});
|
||||
if (!item) return;
|
||||
selectedAvatar = item;
|
||||
@@ -1754,7 +1757,7 @@ function openMessageLikesListModal({ navigate, messageRef, initialTab = 'shining
|
||||
login: String(row?.login || '').trim() || 'unknown',
|
||||
firstName: String(row?.firstName || ''),
|
||||
lastName: String(row?.lastName || ''),
|
||||
avatar: avatarRaw ? { ar: avatarRaw } : null,
|
||||
avatar: avatarReferenceToRenderModel(parseAvatarReference(avatarRaw)),
|
||||
size: 'md',
|
||||
}));
|
||||
const firstName = String(row?.firstName || '').trim();
|
||||
|
||||
@@ -123,7 +123,8 @@ function avatarLetterFromName(name = '') {
|
||||
function createChannelAvatar(channel = {}) {
|
||||
return renderAvatar({
|
||||
initials: channel.avatar || channel.initials || avatarLetterFromName(channel.displayTitle || channel.title || channel.name),
|
||||
avatar: channel.avaAr ? { ar: String(channel.avaAr || '').trim() } : null,
|
||||
avatar: (channel.avaAr || channel.avaSha256) ? { ar: String(channel.avaAr || '').trim(), sha256Hex: String(channel.avaSha256 || '').trim().toLowerCase() } : null,
|
||||
authorLogin: String(channel.ownerName || channel.ownerLogin || '').trim(),
|
||||
size: 'lg',
|
||||
className: 'avatar-plain',
|
||||
title: channel.displayTitle || channel.title || channel.name || 'Канал',
|
||||
@@ -751,6 +752,7 @@ function mapApiChannelRow(summary, bucketKey, idx, index, notificationsState) {
|
||||
channelRootBlockHash: normalizeHash(summary?.channel?.channelRoot?.blockHash),
|
||||
avatar: avatarLetterFromName(displayTitle || channelName),
|
||||
avaAr: String(summary?.channel?.avaAr || '').trim(),
|
||||
avaSha256: String(summary?.channel?.avaSha256 || '').trim().toLowerCase(),
|
||||
title,
|
||||
technicalLabel,
|
||||
channelName,
|
||||
@@ -789,6 +791,7 @@ function mapDeletedOwnedChannels(payload, notificationsState = {}) {
|
||||
channelRootBlockHash: normalizeHash(item?.rootBlockHashHex),
|
||||
avatar: avatarLetterFromName(displayTitle),
|
||||
avaAr: String(item?.avatarAr || '').trim(),
|
||||
avaSha256: String(item?.avatarSha256 || '').trim().toLowerCase(),
|
||||
title: displayTitle,
|
||||
technicalLabel: `@${ownerLogin}/${channelName}`,
|
||||
channelName,
|
||||
|
||||
@@ -128,7 +128,7 @@ function createChatHeaderParts(login, navigate) {
|
||||
login: cleanLogin,
|
||||
firstName,
|
||||
lastName,
|
||||
avatar: currentPeer?.avatar?.ar
|
||||
avatar: (currentPeer?.avatar?.ar || currentPeer?.avatar?.sha256Hex)
|
||||
? {
|
||||
ar: String(currentPeer.avatar.ar || '').trim(),
|
||||
sha256Hex: String(currentPeer.avatar.sha256Hex || '').trim().toLowerCase(),
|
||||
|
||||
@@ -44,9 +44,9 @@ function createSearchAvatar(login) {
|
||||
if (!avatarEl.isConnected) return;
|
||||
const upgraded = renderUserAvatar({
|
||||
login: cleanLogin,
|
||||
avatar: snapshot?.avatar?.txId
|
||||
avatar: snapshot?.avatar?.source
|
||||
? {
|
||||
ar: String(snapshot.avatar.txId || '').trim(),
|
||||
ar: String(snapshot.avatar.txId || snapshot.avatar.ar || '').trim(),
|
||||
sha256Hex: String(snapshot?.avatar?.sha256Hex || '').trim().toLowerCase(),
|
||||
}
|
||||
: null,
|
||||
|
||||
@@ -55,19 +55,19 @@ function createDmAvatar(login, { className = '', avatar = null, firstName = '',
|
||||
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,
|
||||
avatar: (avatar?.ar || avatar?.sha256Hex) ? { ar: String(avatar?.ar || '').trim(), sha256Hex: String(avatar?.sha256Hex || '').trim().toLowerCase() } : null,
|
||||
size: 'lg',
|
||||
title,
|
||||
className,
|
||||
});
|
||||
if (!cleanLogin || avatar?.ar) return avatarEl;
|
||||
if (!cleanLogin || avatar?.ar || avatar?.sha256Hex) return avatarEl;
|
||||
void loadDmAvatarSnapshot(cleanLogin).then((snapshot) => {
|
||||
if (!avatarEl.isConnected) return;
|
||||
const upgraded = renderUserAvatar({
|
||||
login: cleanLogin,
|
||||
avatar: snapshot?.avatar?.txId
|
||||
avatar: snapshot?.avatar?.source
|
||||
? {
|
||||
ar: String(snapshot.avatar.txId || '').trim(),
|
||||
ar: String(snapshot.avatar.txId || snapshot.avatar.ar || '').trim(),
|
||||
sha256Hex: String(snapshot?.avatar?.sha256Hex || '').trim().toLowerCase(),
|
||||
}
|
||||
: null,
|
||||
|
||||
@@ -109,7 +109,8 @@ function getMarkByLogin(allUsers) {
|
||||
|
||||
function normalizeAvatar(row) {
|
||||
const txFromAvatar = String(row?.avatar?.ar || '').trim();
|
||||
if (txFromAvatar) return { ar: txFromAvatar };
|
||||
const shaFromAvatar = String(row?.avatar?.sha256Hex || row?.avatar?.sha256 || '').trim().toLowerCase();
|
||||
if (txFromAvatar || shaFromAvatar) return { ar: txFromAvatar, sha256Hex: shaFromAvatar };
|
||||
const txFallback = String(row?.avatarTxId || '').trim();
|
||||
if (txFallback) return { ar: txFallback };
|
||||
return null;
|
||||
|
||||
@@ -17,6 +17,7 @@
|
||||
import { renderUserAvatar, buildAvatarInitials } from '../../components/avatar-image.js';
|
||||
import { state } from '../../state.js';
|
||||
import { buildArweaveDataUrl } from '../../services/arweave-file-service.js';
|
||||
import { resolvePublicFileUrl } from '../../services/public-file-service.js';
|
||||
|
||||
const SVGNS = 'http://www.w3.org/2000/svg';
|
||||
|
||||
@@ -149,6 +150,25 @@ function resolveAvatarPhotoSrc(src) {
|
||||
}
|
||||
}
|
||||
|
||||
async function resolveServerAvatarPhotoSrc(src) {
|
||||
const rawAvatar = src?.avatar;
|
||||
if (!rawAvatar || typeof rawAvatar === 'string') return '';
|
||||
const txId = String(rawAvatar?.ar || '').trim();
|
||||
const sha256 = String(rawAvatar?.sha256Hex || rawAvatar?.sha256 || '').trim().toLowerCase();
|
||||
const authorLogin = String(src?.login || src?.id || '').trim();
|
||||
if (txId || !sha256 || !authorLogin) return '';
|
||||
try {
|
||||
return await resolvePublicFileUrl({
|
||||
sha256,
|
||||
authorLogin,
|
||||
solanaEndpoint: state?.entrySettings?.solanaServer,
|
||||
fallbackServerLogin: state?.entrySettings?.shineServerLogin,
|
||||
});
|
||||
} catch {
|
||||
return '';
|
||||
}
|
||||
}
|
||||
|
||||
// Однократно внедряем скрытый SVG-фильтр свечения «сияющих» узлов (мягкое гауссово размытие).
|
||||
// Применяется к псевдо-ореолу ::before, а НЕ к самой аватарке — поэтому фото не размывается.
|
||||
function ensureShineFilter() {
|
||||
@@ -636,7 +656,28 @@ export function createForceGraph({ stage, model, onCenterTap, onNodeTap, onNodeL
|
||||
const dot = document.createElement('div');
|
||||
dot.className = 'avatar node-dot fg-orb-host';
|
||||
// Единый PNG-оверлей на ВСЕХ полных орбах (фокус + спутники). tier-3 точки (dotOnly) сюда не идут.
|
||||
dot.appendChild(buildPngOrb(photoSrc, { isFocus, initials }));
|
||||
const orb = buildPngOrb(photoSrc, { isFocus, initials });
|
||||
dot.appendChild(orb);
|
||||
if (!photoSrc && src?.avatar && typeof src.avatar === 'object' && !String(src.avatar.ar || '').trim() && String(src.avatar.sha256Hex || src.avatar.sha256 || '').trim()) {
|
||||
void resolveServerAvatarPhotoSrc(src).then((url) => {
|
||||
if (!url || !orb.isConnected) return;
|
||||
const currentPhoto = orb.querySelector('.fg-pngorb-photo');
|
||||
if (!currentPhoto) return;
|
||||
const img = document.createElement('img');
|
||||
img.className = 'fg-pngorb-photo';
|
||||
img.alt = '';
|
||||
img.loading = 'lazy';
|
||||
img.decoding = 'async';
|
||||
img.addEventListener('error', () => {
|
||||
const fallback = document.createElement('div');
|
||||
fallback.className = 'fg-pngorb-photo fg-pngorb-init';
|
||||
fallback.textContent = String(initials || '').slice(0, 2);
|
||||
try { img.replaceWith(fallback); } catch { /* node may already be gone */ }
|
||||
});
|
||||
img.src = url;
|
||||
try { currentPhoto.replaceWith(img); } catch { /* graph node was rebuilt */ }
|
||||
});
|
||||
}
|
||||
el.append(dot);
|
||||
syncOfficialBadge(el, Boolean(src.official));
|
||||
|
||||
|
||||
@@ -150,9 +150,9 @@ function renderEmpty(activeTab) {
|
||||
|
||||
function renderAvatar(item) {
|
||||
const profile = item.profile;
|
||||
const avatar = profile?.avatar?.txId
|
||||
const avatar = (profile?.avatar?.txId || profile?.avatar?.sha256Hex)
|
||||
? {
|
||||
ar: String(profile.avatar.txId || '').trim(),
|
||||
ar: String(profile.avatar.txId || profile.avatar.ar || '').trim(),
|
||||
sha256Hex: String(profile.avatar.sha256Hex || '').trim().toLowerCase(),
|
||||
}
|
||||
: null;
|
||||
|
||||
@@ -237,8 +237,8 @@ export function render({ navigate, chrome }) {
|
||||
login,
|
||||
firstName,
|
||||
lastName,
|
||||
avatar: currentAvatar?.txId
|
||||
? { ar: currentAvatar.txId, sha256Hex: String(currentAvatar?.sha256Hex || '').trim().toLowerCase() }
|
||||
avatar: (currentAvatar?.txId || currentAvatar?.sha256Hex)
|
||||
? { ar: String(currentAvatar.txId || currentAvatar.ar || '').trim(), sha256Hex: String(currentAvatar?.sha256Hex || '').trim().toLowerCase() }
|
||||
: null,
|
||||
size: 'xl',
|
||||
className: 'profile-avatar',
|
||||
|
||||
@@ -3,13 +3,12 @@ import { renderUserAvatar } from '../components/avatar-image.js';
|
||||
import { authService } from '../state.js';
|
||||
import { navigateBack } from '../router.js';
|
||||
import { userDisplayName } from '../services/user-display.js';
|
||||
import { avatarReferenceToRenderModel, parseAvatarReference } from '../services/avatar-reference.js';
|
||||
|
||||
export const pageMeta = { id: 'user-profile-list-view', title: 'Список' };
|
||||
|
||||
function parseAvatar(raw) {
|
||||
const value = String(raw || '');
|
||||
const m = value.match(/(?:^|,)\s*AR:([A-Za-z0-9_-]{43})(?:,|$)/);
|
||||
return m ? { ar: m[1] } : null;
|
||||
return avatarReferenceToRenderModel(parseAvatarReference(raw));
|
||||
}
|
||||
|
||||
const TITLES = {
|
||||
@@ -105,7 +104,7 @@ export function render({ navigate, route, chrome }) {
|
||||
const el = document.createElement('button');
|
||||
el.type = 'button';
|
||||
el.className = 'ui-button card row profile-list-row';
|
||||
el.append(renderUserAvatar({ login: row.ownerLogin, firstName: row.displayName, lastName: '', avatar: parseAvatar(row.avatarAr), size: 'md' }));
|
||||
el.append(renderUserAvatar({ login: row.ownerLogin, firstName: row.displayName, lastName: '', avatar: (row.avatarAr || row.avatarSha256) ? { ar: String(row.avatarAr || ''), sha256Hex: String(row.avatarSha256 || '') } : null, size: 'md' }));
|
||||
const t = document.createElement('div');
|
||||
t.className = 'profile-list-row-text';
|
||||
t.innerHTML = `<b>${String(row.displayName || row.slug || '')}${row.deleted ? ' · Удалён' : ''}</b><small>${String(row.ownerLogin || '')} / ${String(row.slug || '')}</small>`;
|
||||
|
||||
Reference in New Issue
Block a user