SHA256
Обновить обработку аватаров и вложений
This commit is contained in:
@@ -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();
|
||||
|
||||
Reference in New Issue
Block a user