SHA256
Обновить обработку аватаров и вложений
This commit is contained in:
@@ -1,10 +1,6 @@
|
||||
import { authService, state } from '../state.js';
|
||||
import {
|
||||
buildArweaveAvatarValue,
|
||||
parseArweaveAvatarValue,
|
||||
validateArweaveTxId,
|
||||
validateSha256Hex,
|
||||
} from './arweave-file-service.js';
|
||||
import { validateArweaveTxId, validateSha256Hex } from './arweave-file-service.js';
|
||||
import { buildAvatarReference, parseAvatarReference } from './avatar-reference.js';
|
||||
|
||||
export const profileFieldDefs = [
|
||||
{ key: 'first_name', readKeys: ['first_name'], label: 'Имя', placeholder: 'Введите имя' },
|
||||
@@ -138,20 +134,24 @@ export async function loadProfileSnapshot(login) {
|
||||
const latestGender = loadLatestByAliasesFromItems(items, ['gender']);
|
||||
const gender = normalizeGenderValue(latestGender?.value || PROFILE_GENDER_UNKNOWN);
|
||||
const latestAvatar = loadLatestByAliasesFromItems(items, ['ava']);
|
||||
const parsedAvatar = parseArweaveAvatarValue(latestAvatar?.value || '');
|
||||
const parsedAvatar = parseAvatarReference(latestAvatar?.value || '');
|
||||
const avatar = parsedAvatar.ok
|
||||
? {
|
||||
value: buildArweaveAvatarValue(parsedAvatar.txId, parsedAvatar.sha256Hex),
|
||||
source: 'arweave',
|
||||
txId: parsedAvatar.txId,
|
||||
value: parsedAvatar.value,
|
||||
source: parsedAvatar.source,
|
||||
txId: parsedAvatar.txId || '',
|
||||
ar: parsedAvatar.ar || '',
|
||||
sha256Hex: parsedAvatar.sha256Hex || '',
|
||||
size: Number(parsedAvatar.size || 0),
|
||||
timeMs: latestAvatar?.timeMs || 0,
|
||||
}
|
||||
: {
|
||||
value: '',
|
||||
source: '',
|
||||
txId: '',
|
||||
ar: '',
|
||||
sha256Hex: '',
|
||||
size: 0,
|
||||
timeMs: latestAvatar?.timeMs || 0,
|
||||
};
|
||||
|
||||
@@ -209,14 +209,16 @@ export async function saveProfileGender(login, gender) {
|
||||
});
|
||||
}
|
||||
|
||||
export async function saveProfileAvatarArweave(login, txId, sha256Hex) {
|
||||
const cleanTxId = String(txId || '').trim();
|
||||
const cleanSha = String(sha256Hex || '').trim().toLowerCase();
|
||||
if (!validateArweaveTxId(cleanTxId)) {
|
||||
throw new Error('Некорректный Transaction ID Arweave');
|
||||
}
|
||||
if (!validateSha256Hex(cleanSha)) {
|
||||
throw new Error('Некорректный SHA256 хэш аватара');
|
||||
}
|
||||
await saveProfileParamBlock(login, 'ava', buildArweaveAvatarValue(cleanTxId, cleanSha));
|
||||
export async function saveProfileAvatar(login, avatar) {
|
||||
const cleanAr = String(avatar?.ar || '').trim();
|
||||
const cleanSha = String(avatar?.sha256 || avatar?.sha256Hex || '').trim().toLowerCase();
|
||||
const size = Number(avatar?.size || 0);
|
||||
if (cleanAr && !validateArweaveTxId(cleanAr)) throw new Error('Некорректный Transaction ID Arweave');
|
||||
if (!validateSha256Hex(cleanSha)) throw new Error('Некорректный SHA256 хэш аватара');
|
||||
await saveProfileParamBlock(login, 'ava', buildAvatarReference({ ar: cleanAr, sha256: cleanSha, size }));
|
||||
}
|
||||
|
||||
// Legacy export for old callers. New UI writes only <S:ava;...>.
|
||||
export async function saveProfileAvatarArweave(login, txId, sha256Hex, size = 1) {
|
||||
return saveProfileAvatar(login, { ar: txId, sha256: sha256Hex, size });
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user