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

This commit is contained in:
AidarKC
2026-11-15 15:45:33 +03:00
parent ac6a2e5b3f
commit 4a6e072946
65 changed files with 292 additions and 457 deletions
@@ -31,6 +31,7 @@ public final class DatabaseInitializer {
public static final int SCHEMA_VERSION_38 = 38; public static final int SCHEMA_VERSION_38 = 38;
public static final int SCHEMA_VERSION_39 = 39; public static final int SCHEMA_VERSION_39 = 39;
public static final int SCHEMA_VERSION_40 = 40; public static final int SCHEMA_VERSION_40 = 40;
public static final int SCHEMA_VERSION_41 = 41;
public static final String POSTGRES_SCHEMA_RESOURCE = "postgres/schema_v1.sql"; public static final String POSTGRES_SCHEMA_RESOURCE = "postgres/schema_v1.sql";
public static final String POSTGRES_MIGRATION_V31_RESOURCE = "postgres/migration_v31.sql"; public static final String POSTGRES_MIGRATION_V31_RESOURCE = "postgres/migration_v31.sql";
public static final String POSTGRES_MIGRATION_V32_RESOURCE = "postgres/migration_v32.sql"; public static final String POSTGRES_MIGRATION_V32_RESOURCE = "postgres/migration_v32.sql";
@@ -42,6 +43,7 @@ public final class DatabaseInitializer {
public static final String POSTGRES_MIGRATION_V38_RESOURCE = "postgres/migration_v38.sql"; public static final String POSTGRES_MIGRATION_V38_RESOURCE = "postgres/migration_v38.sql";
public static final String POSTGRES_MIGRATION_V39_RESOURCE = "postgres/migration_v39.sql"; public static final String POSTGRES_MIGRATION_V39_RESOURCE = "postgres/migration_v39.sql";
public static final String POSTGRES_MIGRATION_V40_RESOURCE = "postgres/migration_v40.sql"; public static final String POSTGRES_MIGRATION_V40_RESOURCE = "postgres/migration_v40.sql";
public static final String POSTGRES_MIGRATION_V41_RESOURCE = "postgres/migration_v41.sql";
private DatabaseInitializer() {} private DatabaseInitializer() {}
@@ -173,9 +175,13 @@ public final class DatabaseInitializer {
runSqlScript(conn, POSTGRES_MIGRATION_V40_RESOURCE); runSqlScript(conn, POSTGRES_MIGRATION_V40_RESOURCE);
currentVersion = readCurrentSchemaVersion(conn); currentVersion = readCurrentSchemaVersion(conn);
} }
if (currentVersion != SCHEMA_VERSION_40) { if (currentVersion == SCHEMA_VERSION_40) {
runSqlScript(conn, POSTGRES_MIGRATION_V41_RESOURCE);
currentVersion = readCurrentSchemaVersion(conn);
}
if (currentVersion != SCHEMA_VERSION_41) {
throw new SQLException( throw new SQLException(
"Unsupported SHiNE DB v2 schema version: expected 40, found " + currentVersion); "Unsupported SHiNE DB v2 schema version: expected 41, found " + currentVersion);
} }
normalizeBlockchainStateKeysToBase64(conn); normalizeBlockchainStateKeysToBase64(conn);
} }
@@ -67,7 +67,7 @@ public final class ChannelNameStateDAO {
channel_root_block_hash, channel_root_block_hash,
created_at_ms, created_at_ms,
ava_ar, ava_ar,
ava_sha256, ava_pr,
ava_size, ava_size,
meta_updated_at_ms meta_updated_at_ms
) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
@@ -84,7 +84,7 @@ public final class ChannelNameStateDAO {
ps.setBytes(9, entry.getChannelRootBlockHash()); ps.setBytes(9, entry.getChannelRootBlockHash());
ps.setLong(10, entry.getCreatedAtMs()); ps.setLong(10, entry.getCreatedAtMs());
ps.setString(11, entry.getAvaAr() == null ? "" : entry.getAvaAr()); ps.setString(11, entry.getAvaAr() == null ? "" : entry.getAvaAr());
ps.setString(12, entry.getAvaSha256() == null ? "" : entry.getAvaSha256()); ps.setString(12, entry.getAvaPr() == null ? "" : entry.getAvaPr());
ps.setLong(13, Math.max(0L, entry.getAvaSize())); ps.setLong(13, Math.max(0L, entry.getAvaSize()));
ps.setLong(14, Math.max(0L, entry.getMetaUpdatedAtMs())); ps.setLong(14, Math.max(0L, entry.getMetaUpdatedAtMs()));
ps.executeUpdate(); ps.executeUpdate();
@@ -97,7 +97,7 @@ public final class ChannelNameStateDAO {
SET display_name = ?, SET display_name = ?,
channel_description = ?, channel_description = ?,
ava_ar = ?, ava_ar = ?,
ava_sha256 = ?, ava_pr = ?,
ava_size = ?, ava_size = ?,
meta_updated_at_ms = ? meta_updated_at_ms = ?
WHERE LOWER(owner_login)=LOWER(?) AND channel_root_block_number = ? WHERE LOWER(owner_login)=LOWER(?) AND channel_root_block_number = ?
@@ -106,7 +106,7 @@ public final class ChannelNameStateDAO {
ps.setString(1, entry.getDisplayName() == null ? "" : entry.getDisplayName()); ps.setString(1, entry.getDisplayName() == null ? "" : entry.getDisplayName());
ps.setString(2, entry.getChannelDescription() == null ? "" : entry.getChannelDescription()); ps.setString(2, entry.getChannelDescription() == null ? "" : entry.getChannelDescription());
ps.setString(3, entry.getAvaAr() == null ? "" : entry.getAvaAr()); ps.setString(3, entry.getAvaAr() == null ? "" : entry.getAvaAr());
ps.setString(4, entry.getAvaSha256() == null ? "" : entry.getAvaSha256()); ps.setString(4, entry.getAvaPr() == null ? "" : entry.getAvaPr());
ps.setLong(5, Math.max(0L, entry.getAvaSize())); ps.setLong(5, Math.max(0L, entry.getAvaSize()));
ps.setLong(6, Math.max(0L, entry.getMetaUpdatedAtMs())); ps.setLong(6, Math.max(0L, entry.getMetaUpdatedAtMs()));
ps.setString(7, entry.getOwnerLogin()); ps.setString(7, entry.getOwnerLogin());
@@ -13,7 +13,7 @@ public final class ChannelSearchDAO {
private ChannelSearchDAO() {} private ChannelSearchDAO() {}
public record Match(String ownerLogin, String slug, String displayName, String description, public record Match(String ownerLogin, String slug, String displayName, String description,
String avatarAr, String avatarSha256, String ownerBlockchainName, String avatarAr, String avatarPr, String ownerBlockchainName,
int rootBlockNumber, String rootBlockHashHex, int subscribersCount) {} int rootBlockNumber, String rootBlockHashHex, int subscribersCount) {}
// LIKE ESCAPE '!' — введённые пользователем %, _ и ! трактуются буквально. // LIKE ESCAPE '!' — введённые пользователем %, _ и ! трактуются буквально.
@@ -45,7 +45,7 @@ public final class ChannelSearchDAO {
String ownerAnywhere = "%" + escapedPattern(ownerExact) + "%"; String ownerAnywhere = "%" + escapedPattern(ownerExact) + "%";
String sql = """ String sql = """
SELECT cn.owner_login, cn.slug, cn.display_name, cn.channel_description, SELECT cn.owner_login, cn.slug, cn.display_name, cn.channel_description,
cn.ava_ar, cn.ava_sha256, cn.owner_bch_name, cn.ava_ar, cn.ava_pr, cn.owner_bch_name,
cn.channel_root_block_number, encode(cn.channel_root_block_hash, 'hex') AS root_hash, cn.channel_root_block_number, encode(cn.channel_root_block_hash, 'hex') AS root_hash,
COALESCE(cs.subscribers_count, 0) AS subscribers_count COALESCE(cs.subscribers_count, 0) AS subscribers_count
FROM channel_names_state cn FROM channel_names_state cn
@@ -109,7 +109,7 @@ public final class ChannelSearchDAO {
try (ResultSet rs = ps.executeQuery()) { try (ResultSet rs = ps.executeQuery()) {
while (rs.next()) matches.add(new Match( while (rs.next()) matches.add(new Match(
rs.getString("owner_login"), rs.getString("slug"), rs.getString("display_name"), rs.getString("owner_login"), rs.getString("slug"), rs.getString("display_name"),
rs.getString("channel_description"), rs.getString("ava_ar"), rs.getString("ava_sha256"), rs.getString("channel_description"), rs.getString("ava_ar"), rs.getString("ava_pr"),
rs.getString("owner_bch_name"), rs.getInt("channel_root_block_number"), rs.getString("owner_bch_name"), rs.getInt("channel_root_block_number"),
rs.getString("root_hash"), rs.getInt("subscribers_count") rs.getString("root_hash"), rs.getInt("subscribers_count")
)); ));
@@ -116,7 +116,7 @@ public final class UserProfileStateDAO {
String sql; String sql;
if ("owned".equals(mode)) { if ("owned".equals(mode)) {
sql=""" sql="""
SELECT cn.owner_login, cn.slug, cn.display_name, cn.ava_ar, cn.ava_sha256, cn.owner_bch_name, SELECT cn.owner_login, cn.slug, cn.display_name, cn.ava_ar, cn.ava_pr, cn.owner_bch_name,
cn.channel_root_block_number, encode(cn.channel_root_block_hash,'hex') root_hash, cn.channel_root_block_number, encode(cn.channel_root_block_hash,'hex') root_hash,
cn.is_deleted, cn.deleted_at_ms, cn.deleted_block_number cn.is_deleted, cn.deleted_at_ms, cn.deleted_block_number
FROM channel_names_state cn FROM channel_names_state cn
@@ -125,7 +125,7 @@ public final class UserProfileStateDAO {
"""; """;
} else if ("following".equals(mode)) { } else if ("following".equals(mode)) {
sql=""" sql="""
SELECT DISTINCT cn.owner_login, cn.slug, cn.display_name, cn.ava_ar, cn.ava_sha256, cn.owner_bch_name, SELECT DISTINCT cn.owner_login, cn.slug, cn.display_name, cn.ava_ar, cn.ava_pr, cn.owner_bch_name,
cn.channel_root_block_number, encode(cn.channel_root_block_hash,'hex') root_hash, cn.channel_root_block_number, encode(cn.channel_root_block_hash,'hex') root_hash,
cn.is_deleted, cn.deleted_at_ms, cn.deleted_block_number cn.is_deleted, cn.deleted_at_ms, cn.deleted_block_number
FROM connections_state cs FROM connections_state cs
@@ -142,7 +142,7 @@ public final class UserProfileStateDAO {
ps.setString(1,login); ps.setBoolean(2,includeDeleted); ps.setInt(3,safeLimit); ps.setInt(4,safeOffset); ps.setString(1,login); ps.setBoolean(2,includeDeleted); ps.setInt(3,safeLimit); ps.setInt(4,safeOffset);
try(ResultSet rs=ps.executeQuery()){ try(ResultSet rs=ps.executeQuery()){
while(rs.next()) out.add(new ChannelCard( while(rs.next()) out.add(new ChannelCard(
rs.getString("owner_login"), rs.getString("slug"), rs.getString("display_name"), rs.getString("ava_ar"), rs.getString("ava_sha256"), rs.getString("owner_login"), rs.getString("slug"), rs.getString("display_name"), rs.getString("ava_ar"), rs.getString("ava_pr"),
rs.getString("owner_bch_name"), rs.getInt("channel_root_block_number"), rs.getString("root_hash"), rs.getString("owner_bch_name"), rs.getInt("channel_root_block_number"), rs.getString("root_hash"),
rs.getBoolean("is_deleted"), rs.getLong("deleted_at_ms"), (Integer) rs.getObject("deleted_block_number") rs.getBoolean("is_deleted"), rs.getLong("deleted_at_ms"), (Integer) rs.getObject("deleted_block_number")
)); ));
@@ -154,5 +154,5 @@ public final class UserProfileStateDAO {
private static ProfileCard map(ResultSet rs)throws SQLException{return new ProfileCard(rs.getString("login"),rs.getString("first_name"),rs.getString("last_name"),rs.getString("ava_ar"),rs.getString("account_role"),rs.getString("shine_status"));} private static ProfileCard map(ResultSet rs)throws SQLException{return new ProfileCard(rs.getString("login"),rs.getString("first_name"),rs.getString("last_name"),rs.getString("ava_ar"),rs.getString("account_role"),rs.getString("shine_status"));}
public record ProfileCard(String login,String firstName,String lastName,String avatarAr,String accountRole,String shineStatus){} public record ProfileCard(String login,String firstName,String lastName,String avatarAr,String accountRole,String shineStatus){}
public record RelationCard(String login,String firstName,String lastName,String avatarAr,String accountRole,String shineStatus,boolean primaryConfirmed,boolean shineConfirmed,String relationType,int primaryConfirmationsCount,int shineConfirmationsCount){} public record RelationCard(String login,String firstName,String lastName,String avatarAr,String accountRole,String shineStatus,boolean primaryConfirmed,boolean shineConfirmed,String relationType,int primaryConfirmationsCount,int shineConfirmationsCount){}
public record ChannelCard(String ownerLogin,String slug,String displayName,String avatarAr,String avatarSha256,String ownerBlockchainName,int rootBlockNumber,String rootBlockHashHex,boolean deleted,long deletedAtMs,Integer deletedBlockNumber){} public record ChannelCard(String ownerLogin,String slug,String displayName,String avatarAr,String avatarPr,String ownerBlockchainName,int rootBlockNumber,String rootBlockHashHex,boolean deleted,long deletedAtMs,Integer deletedBlockNumber){}
} }
@@ -14,7 +14,7 @@ public class ChannelNameStateEntry {
private byte[] channelRootBlockHash; private byte[] channelRootBlockHash;
private long createdAtMs; private long createdAtMs;
private String avaAr; private String avaAr;
private String avaSha256; private String avaPr;
private long avaSize; private long avaSize;
private long metaUpdatedAtMs; private long metaUpdatedAtMs;
@@ -106,12 +106,12 @@ public class ChannelNameStateEntry {
this.avaAr = avaAr; this.avaAr = avaAr;
} }
public String getAvaSha256() { public String getAvaPr() {
return avaSha256; return avaPr;
} }
public void setAvaSha256(String avaSha256) { public void setAvaPr(String avaPr) {
this.avaSha256 = avaSha256; this.avaPr = avaPr;
} }
public long getAvaSize() { public long getAvaSize() {
@@ -454,7 +454,7 @@ public final class Net_AddBlock_Handler implements JsonMessageHandler {
? "" ? ""
: ChannelNameRules.normalizeDisplayName(createChannelBody.channelDescription); : ChannelNameRules.normalizeDisplayName(createChannelBody.channelDescription);
String avaAr = ""; String avaAr = "";
String avaSha256 = ""; String avaPr = "";
long avaSize = 0L; long avaSize = 0L;
long metaUpdatedAtMs = 0L; long metaUpdatedAtMs = 0L;
if (channelTypeCode == (CreateChannelBody.CHANNEL_TYPE_PUBLIC & 0xFFFF)) { if (channelTypeCode == (CreateChannelBody.CHANNEL_TYPE_PUBLIC & 0xFFFF)) {
@@ -463,7 +463,7 @@ public final class Net_AddBlock_Handler implements JsonMessageHandler {
displayName = createMeta.title(); displayName = createMeta.title();
channelDescription = createMeta.description(); channelDescription = createMeta.description();
avaAr = createMeta.avaAr(); avaAr = createMeta.avaAr();
avaSha256 = createMeta.avaSha256(); avaPr = createMeta.avaPr();
avaSize = createMeta.avaSize(); avaSize = createMeta.avaSize();
metaUpdatedAtMs = block.timestamp * 1000L; metaUpdatedAtMs = block.timestamp * 1000L;
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
@@ -476,7 +476,7 @@ public final class Net_AddBlock_Handler implements JsonMessageHandler {
channelNameStateEntry.setDisplayName(displayName); channelNameStateEntry.setDisplayName(displayName);
channelNameStateEntry.setChannelDescription(channelDescription); channelNameStateEntry.setChannelDescription(channelDescription);
channelNameStateEntry.setAvaAr(avaAr); channelNameStateEntry.setAvaAr(avaAr);
channelNameStateEntry.setAvaSha256(avaSha256); channelNameStateEntry.setAvaPr(avaPr);
channelNameStateEntry.setAvaSize(avaSize); channelNameStateEntry.setAvaSize(avaSize);
channelNameStateEntry.setMetaUpdatedAtMs(metaUpdatedAtMs); channelNameStateEntry.setMetaUpdatedAtMs(metaUpdatedAtMs);
channelNameStateEntry.setOwnerLogin(login); channelNameStateEntry.setOwnerLogin(login);
@@ -519,7 +519,7 @@ public final class Net_AddBlock_Handler implements JsonMessageHandler {
channelMetaUpdateEntry.setDisplayName(parsedMeta.title()); channelMetaUpdateEntry.setDisplayName(parsedMeta.title());
channelMetaUpdateEntry.setChannelDescription(parsedMeta.description()); channelMetaUpdateEntry.setChannelDescription(parsedMeta.description());
channelMetaUpdateEntry.setAvaAr(parsedMeta.avaAr()); channelMetaUpdateEntry.setAvaAr(parsedMeta.avaAr());
channelMetaUpdateEntry.setAvaSha256(parsedMeta.avaSha256()); channelMetaUpdateEntry.setAvaPr(parsedMeta.avaPr());
channelMetaUpdateEntry.setAvaSize(parsedMeta.avaSize()); channelMetaUpdateEntry.setAvaSize(parsedMeta.avaSize());
channelMetaUpdateEntry.setMetaUpdatedAtMs(block.timestamp * 1000L); channelMetaUpdateEntry.setMetaUpdatedAtMs(block.timestamp * 1000L);
} }
@@ -1,5 +1,6 @@
package server.logic.ws_protocol.JSON.handlers.channels; package server.logic.ws_protocol.JSON.handlers.channels;
import server.logic.ws_protocol.JSON.handlers.avatars.PiecesRootValidator;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@@ -15,7 +16,7 @@ public final class ChannelMetaTextParser {
String text = String.valueOf(rawText == null ? "" : rawText); String text = String.valueOf(rawText == null ? "" : rawText);
String title = ""; String title = "";
String avaAr = ""; String avaAr = "";
String avaSha256 = ""; String avaPr = "";
long avaSize = 0L; long avaSize = 0L;
boolean seenTitle = false; boolean seenTitle = false;
boolean seenAvatar = false; boolean seenAvatar = false;
@@ -33,10 +34,14 @@ public final class ChannelMetaTextParser {
} else if (body.startsWith("avatar;") || body.startsWith("ava;")) { } else if (body.startsWith("avatar;") || body.startsWith("ava;")) {
if (seenAvatar) throw new IllegalArgumentException("duplicate_channel_meta_avatar"); if (seenAvatar) throw new IllegalArgumentException("duplicate_channel_meta_avatar");
seenAvatar = true; seenAvatar = true;
Avatar avatar = parseAvatarTag(body); // Old SHA/hex avatars are not supported. Ignore just the avatar, not the whole channel.
avaAr = avatar.ar; // Otherwise rebuilding the index from an old channel block would remove that channel.
avaSha256 = avatar.sha256; if (!body.matches("(?:ava|avatar);v=1;.*")) {
avaSize = avatar.size; Avatar avatar = parseAvatarTag(body);
avaAr = avatar.ar;
avaPr = avatar.pr;
avaSize = avatar.size;
}
} else { } else {
throw new IllegalArgumentException("unknown_channel_meta_tag"); throw new IllegalArgumentException("unknown_channel_meta_tag");
} }
@@ -52,7 +57,7 @@ public final class ChannelMetaTextParser {
String cleanTitle = title.isBlank() ? String.valueOf(fallbackTitle == null ? "" : fallbackTitle).trim() : title.trim(); String cleanTitle = title.isBlank() ? String.valueOf(fallbackTitle == null ? "" : fallbackTitle).trim() : title.trim();
validateTitle(cleanTitle); validateTitle(cleanTitle);
return new Parsed(cleanTitle, description, avaAr, avaSha256, avaSize); return new Parsed(cleanTitle, description, avaAr, avaPr, avaSize);
} }
private static String parseTitleTag(String body) { private static String parseTitleTag(String body) {
@@ -68,12 +73,12 @@ public final class ChannelMetaTextParser {
? body.substring("ava;".length()) ? body.substring("ava;".length())
: body.substring("avatar;".length()); : body.substring("avatar;".length());
Map<String, String> fields = parseFields(rawFields); Map<String, String> fields = parseFields(rawFields);
if (!"1".equals(fields.get("v"))) throw new IllegalArgumentException("bad_channel_meta_avatar_version"); if (!"2".equals(fields.get("v"))) throw new IllegalArgumentException("bad_channel_meta_avatar_version");
String ar = String.valueOf(fields.getOrDefault("ar", "")).trim(); String ar = String.valueOf(fields.getOrDefault("ar", "")).trim();
String sha256 = String.valueOf(fields.getOrDefault("sha256", "")).trim().toLowerCase(); String pr = String.valueOf(fields.getOrDefault("pr", "")).trim();
String sizeRaw = String.valueOf(fields.containsKey("sz") ? fields.get("sz") : fields.getOrDefault("size", "")).trim(); String sizeRaw = String.valueOf(fields.containsKey("sz") ? fields.get("sz") : fields.getOrDefault("size", "")).trim();
if (!ar.isEmpty() && !ar.matches("^[A-Za-z0-9_-]{43}$")) throw new IllegalArgumentException("bad_channel_meta_avatar_ar"); if (!ar.isEmpty() && !ar.matches("^[A-Za-z0-9_-]{43}$")) throw new IllegalArgumentException("bad_channel_meta_avatar_ar");
if (!sha256.matches("^[0-9a-f]{64}$")) throw new IllegalArgumentException("bad_channel_meta_avatar_sha256"); if (!PiecesRootValidator.valid(pr)) throw new IllegalArgumentException("bad_channel_meta_avatar_pr");
long size; long size;
try { try {
size = Long.parseLong(sizeRaw); size = Long.parseLong(sizeRaw);
@@ -81,7 +86,7 @@ public final class ChannelMetaTextParser {
throw new IllegalArgumentException("bad_channel_meta_avatar_size"); throw new IllegalArgumentException("bad_channel_meta_avatar_size");
} }
if (size <= 0L) throw new IllegalArgumentException("bad_channel_meta_avatar_size"); if (size <= 0L) throw new IllegalArgumentException("bad_channel_meta_avatar_size");
return new Avatar(ar, sha256, size); return new Avatar(ar, pr, size);
} }
private static boolean startsWithTagPrefix(String text, int offset) { private static boolean startsWithTagPrefix(String text, int offset) {
@@ -122,7 +127,7 @@ public final class ChannelMetaTextParser {
return String.valueOf(value == null ? "" : value).codePointCount(0, String.valueOf(value == null ? "" : value).length()); return String.valueOf(value == null ? "" : value).codePointCount(0, String.valueOf(value == null ? "" : value).length());
} }
private record Avatar(String ar, String sha256, long size) {} private record Avatar(String ar, String pr, long size) {}
public record Parsed(String title, String description, String avaAr, String avaSha256, long avaSize) {} public record Parsed(String title, String description, String avaAr, String avaPr, long avaSize) {}
} }
@@ -92,7 +92,7 @@ public final class ChannelNamesStateBootstrapper {
final int channelTypeCode; final int channelTypeCode;
final int channelTypeVersion; final int channelTypeVersion;
String avaAr = ""; String avaAr = "";
String avaSha256 = ""; String avaPr = "";
long avaSize = 0L; long avaSize = 0L;
long metaUpdatedAtMs = 0L; long metaUpdatedAtMs = 0L;
try { try {
@@ -106,7 +106,7 @@ public final class ChannelNamesStateBootstrapper {
displayName = createMeta.title(); displayName = createMeta.title();
channelDescription = createMeta.description(); channelDescription = createMeta.description();
avaAr = createMeta.avaAr(); avaAr = createMeta.avaAr();
avaSha256 = createMeta.avaSha256(); avaPr = createMeta.avaPr();
avaSize = createMeta.avaSize(); avaSize = createMeta.avaSize();
metaUpdatedAtMs = parsed.timestamp * 1000L; metaUpdatedAtMs = parsed.timestamp * 1000L;
} }
@@ -128,7 +128,7 @@ public final class ChannelNamesStateBootstrapper {
entry.setDisplayName(displayName); entry.setDisplayName(displayName);
entry.setChannelDescription(channelDescription == null ? "" : channelDescription); entry.setChannelDescription(channelDescription == null ? "" : channelDescription);
entry.setAvaAr(avaAr); entry.setAvaAr(avaAr);
entry.setAvaSha256(avaSha256); entry.setAvaPr(avaPr);
entry.setAvaSize(avaSize); entry.setAvaSize(avaSize);
entry.setMetaUpdatedAtMs(metaUpdatedAtMs); entry.setMetaUpdatedAtMs(metaUpdatedAtMs);
entry.setOwnerLogin(ownerLogin); entry.setOwnerLogin(ownerLogin);
@@ -280,7 +280,7 @@ public final class ChannelNamesStateBootstrapper {
update.setDisplayName(parsedMeta.title()); update.setDisplayName(parsedMeta.title());
update.setChannelDescription(parsedMeta.description()); update.setChannelDescription(parsedMeta.description());
update.setAvaAr(parsedMeta.avaAr()); update.setAvaAr(parsedMeta.avaAr());
update.setAvaSha256(parsedMeta.avaSha256()); update.setAvaPr(parsedMeta.avaPr());
update.setAvaSize(parsedMeta.avaSize()); update.setAvaSize(parsedMeta.avaSize());
update.setMetaUpdatedAtMs(parsed.timestamp * 1000L); update.setMetaUpdatedAtMs(parsed.timestamp * 1000L);
dao.updateMeta(c, update); dao.updateMeta(c, update);
@@ -68,7 +68,7 @@ final class ChannelsReadSupport {
String stateSql = """ String stateSql = """
SELECT slug, display_name, channel_description, channel_type_code, channel_type_version, SELECT slug, display_name, channel_description, channel_type_code, channel_type_version,
created_at_ms, ava_ar, ava_sha256, ava_size, meta_updated_at_ms, is_deleted, deleted_at_ms, deleted_block_number created_at_ms, ava_ar, ava_pr, ava_size, meta_updated_at_ms, is_deleted, deleted_at_ms, deleted_block_number
FROM channel_names_state FROM channel_names_state
WHERE LOWER(owner_login)=LOWER(?) AND channel_root_block_number = ? WHERE LOWER(owner_login)=LOWER(?) AND channel_root_block_number = ?
LIMIT 1 LIMIT 1
@@ -85,7 +85,7 @@ final class ChannelsReadSupport {
meta.channelTypeVersion = rs.getInt("channel_type_version"); meta.channelTypeVersion = rs.getInt("channel_type_version");
meta.createdAtMs = rs.getLong("created_at_ms"); meta.createdAtMs = rs.getLong("created_at_ms");
meta.avaAr = String.valueOf(rs.getString("ava_ar") == null ? "" : rs.getString("ava_ar")); meta.avaAr = String.valueOf(rs.getString("ava_ar") == null ? "" : rs.getString("ava_ar"));
meta.avaSha256 = String.valueOf(rs.getString("ava_sha256") == null ? "" : rs.getString("ava_sha256")); meta.avaPr = String.valueOf(rs.getString("ava_pr") == null ? "" : rs.getString("ava_pr"));
meta.avaSize = rs.getLong("ava_size"); meta.avaSize = rs.getLong("ava_size");
meta.metaUpdatedAtMs = rs.getLong("meta_updated_at_ms"); meta.metaUpdatedAtMs = rs.getLong("meta_updated_at_ms");
meta.deleted = rs.getBoolean("is_deleted"); meta.deleted = rs.getBoolean("is_deleted");
@@ -130,7 +130,7 @@ final class ChannelsReadSupport {
meta.displayName = parsedMeta.title(); meta.displayName = parsedMeta.title();
meta.channelDescription = parsedMeta.description(); meta.channelDescription = parsedMeta.description();
meta.avaAr = parsedMeta.avaAr(); meta.avaAr = parsedMeta.avaAr();
meta.avaSha256 = parsedMeta.avaSha256(); meta.avaPr = parsedMeta.avaPr();
meta.avaSize = parsedMeta.avaSize(); meta.avaSize = parsedMeta.avaSize();
meta.createdAtMs = e.timestamp * 1000L; meta.createdAtMs = e.timestamp * 1000L;
meta.metaUpdatedAtMs = e.timestamp * 1000L; meta.metaUpdatedAtMs = e.timestamp * 1000L;
@@ -497,7 +497,7 @@ final class ChannelsReadSupport {
event.title = parsedMeta.title(); event.title = parsedMeta.title();
event.description = parsedMeta.description(); event.description = parsedMeta.description();
event.avaAr = parsedMeta.avaAr(); event.avaAr = parsedMeta.avaAr();
event.avaSha256 = parsedMeta.avaSha256(); event.avaPr = parsedMeta.avaPr();
event.avaSize = parsedMeta.avaSize(); event.avaSize = parsedMeta.avaSize();
} }
} }
@@ -509,7 +509,7 @@ final class ChannelsReadSupport {
} }
if (event.description == null) event.description = ""; if (event.description == null) event.description = "";
if (event.avaAr == null) event.avaAr = ""; if (event.avaAr == null) event.avaAr = "";
if (event.avaSha256 == null) event.avaSha256 = ""; if (event.avaPr == null) event.avaPr = "";
out.add(event); out.add(event);
} }
} }
@@ -545,7 +545,7 @@ final class ChannelsReadSupport {
event.title = parsed.title(); event.title = parsed.title();
event.description = parsed.description(); event.description = parsed.description();
event.avaAr = parsed.avaAr(); event.avaAr = parsed.avaAr();
event.avaSha256 = parsed.avaSha256(); event.avaPr = parsed.avaPr();
event.avaSize = parsed.avaSize(); event.avaSize = parsed.avaSize();
out.add(event); out.add(event);
} catch (Exception ignored) { } catch (Exception ignored) {
@@ -728,7 +728,7 @@ final class ChannelsReadSupport {
int channelTypeCode; int channelTypeCode;
int channelTypeVersion; int channelTypeVersion;
String avaAr = ""; String avaAr = "";
String avaSha256 = ""; String avaPr = "";
long avaSize = 0L; long avaSize = 0L;
long createdAtMs = 0L; long createdAtMs = 0L;
long metaUpdatedAtMs = 0L; long metaUpdatedAtMs = 0L;
@@ -748,7 +748,7 @@ final class ChannelsReadSupport {
String title; String title;
String description; String description;
String avaAr; String avaAr;
String avaSha256; String avaPr;
long avaSize; long avaSize;
} }
@@ -67,7 +67,7 @@ public class Net_GetChannelMessages_Handler implements JsonMessageHandler {
channel.setDisplayName(meta.displayName == null || meta.displayName.isBlank() ? meta.channelName : meta.displayName); channel.setDisplayName(meta.displayName == null || meta.displayName.isBlank() ? meta.channelName : meta.displayName);
channel.setChannelDescription(meta.channelDescription); channel.setChannelDescription(meta.channelDescription);
channel.setAvaAr(meta.avaAr); channel.setAvaAr(meta.avaAr);
channel.setAvaSha256(meta.avaSha256); channel.setAvaPr(meta.avaPr);
channel.setAvaSize(meta.avaSize); channel.setAvaSize(meta.avaSize);
channel.setMetaUpdatedAtMs(meta.metaUpdatedAtMs); channel.setMetaUpdatedAtMs(meta.metaUpdatedAtMs);
channel.setCreatedAtMs(meta.createdAtMs); channel.setCreatedAtMs(meta.createdAtMs);
@@ -98,7 +98,7 @@ public class Net_GetChannelMessages_Handler implements JsonMessageHandler {
outEvent.setTitle(event.title); outEvent.setTitle(event.title);
outEvent.setDescription(event.description); outEvent.setDescription(event.description);
outEvent.setAvaAr(event.avaAr); outEvent.setAvaAr(event.avaAr);
outEvent.setAvaSha256(event.avaSha256); outEvent.setAvaPr(event.avaPr);
outEvent.setAvaSize(event.avaSize); outEvent.setAvaSize(event.avaSize);
metaEvents.add(outEvent); metaEvents.add(outEvent);
} }
@@ -1,4 +1,5 @@
package server.logic.ws_protocol.JSON.handlers.channels; package server.logic.ws_protocol.JSON.handlers.channels;
import server.logic.ws_protocol.JSON.handlers.profile.AvatarValueParser;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -72,7 +73,9 @@ public class Net_GetMessageLikes_Handler implements JsonMessageHandler {
user.setLogin(rs.getString("from_login")); user.setLogin(rs.getString("from_login"));
user.setFirstName(rs.getString("first_name")); user.setFirstName(rs.getString("first_name"));
user.setLastName(rs.getString("last_name")); user.setLastName(rs.getString("last_name"));
user.setAvatarAr(rs.getString("avatar_ar")); var avatar = AvatarValueParser.parse(rs.getString("avatar_ar"));
user.setAvatarAr(avatar.ar());
user.setAvatarPr(avatar.pr());
boolean isOfficial = "primary".equalsIgnoreCase(rs.getString("account_role")); boolean isOfficial = "primary".equalsIgnoreCase(rs.getString("account_role"));
boolean isShining = "shining".equalsIgnoreCase(rs.getString("shine_status")); boolean isShining = "shining".equalsIgnoreCase(rs.getString("shine_status"));
@@ -72,7 +72,7 @@ public class Net_ListSubscriptionsFeed_Handler implements JsonMessageHandler {
channelRef.setDisplayName(meta.displayName == null || meta.displayName.isBlank() ? meta.channelName : meta.displayName); channelRef.setDisplayName(meta.displayName == null || meta.displayName.isBlank() ? meta.channelName : meta.displayName);
channelRef.setChannelDescription(meta.channelDescription); channelRef.setChannelDescription(meta.channelDescription);
channelRef.setAvaAr(meta.avaAr); channelRef.setAvaAr(meta.avaAr);
channelRef.setAvaSha256(meta.avaSha256); channelRef.setAvaPr(meta.avaPr);
channelRef.setAvaSize(meta.avaSize); channelRef.setAvaSize(meta.avaSize);
channelRef.setMetaUpdatedAtMs(meta.metaUpdatedAtMs); channelRef.setMetaUpdatedAtMs(meta.metaUpdatedAtMs);
channelRef.setChannelTypeCode(meta.channelTypeCode); channelRef.setChannelTypeCode(meta.channelTypeCode);
@@ -34,7 +34,7 @@ public class Net_SearchChannels_Handler implements JsonMessageHandler {
var item = new Net_SearchChannels_Response.ChannelItem(); var item = new Net_SearchChannels_Response.ChannelItem();
item.setOwnerLogin(match.ownerLogin()); item.setSlug(match.slug()); item.setOwnerLogin(match.ownerLogin()); item.setSlug(match.slug());
item.setDisplayName(match.displayName()); item.setDescription(match.description()); item.setDisplayName(match.displayName()); item.setDescription(match.description());
item.setAvatarAr(match.avatarAr()); item.setAvatarSha256(match.avatarSha256()); item.setAvatarAr(match.avatarAr()); item.setAvatarPr(match.avatarPr());
item.setOwnerBlockchainName(match.ownerBlockchainName()); item.setOwnerBlockchainName(match.ownerBlockchainName());
item.setRootBlockNumber(match.rootBlockNumber()); item.setRootBlockHashHex(match.rootBlockHashHex()); item.setRootBlockNumber(match.rootBlockNumber()); item.setRootBlockHashHex(match.rootBlockHashHex());
item.setSubscribersCount(match.subscribersCount()); item.setSubscribersCount(match.subscribersCount());
@@ -27,7 +27,7 @@ public class Net_GetChannelMessages_Response extends Net_Response {
private String displayName; private String displayName;
private String channelDescription; private String channelDescription;
private String avaAr; private String avaAr;
private String avaSha256; private String avaPr;
private Long avaSize; private Long avaSize;
private Long metaUpdatedAtMs; private Long metaUpdatedAtMs;
private Long createdAtMs; private Long createdAtMs;
@@ -57,8 +57,8 @@ public class Net_GetChannelMessages_Response extends Net_Response {
public String getAvaAr() { return avaAr; } public String getAvaAr() { return avaAr; }
public void setAvaAr(String avaAr) { this.avaAr = avaAr; } public void setAvaAr(String avaAr) { this.avaAr = avaAr; }
public String getAvaSha256() { return avaSha256; } public String getAvaPr() { return avaPr; }
public void setAvaSha256(String avaSha256) { this.avaSha256 = avaSha256; } public void setAvaPr(String avaPr) { this.avaPr = avaPr; }
public Long getAvaSize() { return avaSize; } public Long getAvaSize() { return avaSize; }
public void setAvaSize(Long avaSize) { this.avaSize = avaSize; } public void setAvaSize(Long avaSize) { this.avaSize = avaSize; }
@@ -99,7 +99,7 @@ public class Net_GetChannelMessages_Response extends Net_Response {
private String title; private String title;
private String description; private String description;
private String avaAr; private String avaAr;
private String avaSha256; private String avaPr;
private Long avaSize; private Long avaSize;
public String getKind() { return kind; } public String getKind() { return kind; }
@@ -129,8 +129,8 @@ public class Net_GetChannelMessages_Response extends Net_Response {
public String getAvaAr() { return avaAr; } public String getAvaAr() { return avaAr; }
public void setAvaAr(String avaAr) { this.avaAr = avaAr; } public void setAvaAr(String avaAr) { this.avaAr = avaAr; }
public String getAvaSha256() { return avaSha256; } public String getAvaPr() { return avaPr; }
public void setAvaSha256(String avaSha256) { this.avaSha256 = avaSha256; } public void setAvaPr(String avaPr) { this.avaPr = avaPr; }
public Long getAvaSize() { return avaSize; } public Long getAvaSize() { return avaSize; }
public void setAvaSize(Long avaSize) { this.avaSize = avaSize; } public void setAvaSize(Long avaSize) { this.avaSize = avaSize; }
@@ -27,6 +27,7 @@ public class Net_GetMessageLikes_Response extends Net_Response {
private String firstName; private String firstName;
private String lastName; private String lastName;
private String avatarAr; private String avatarAr;
private String avatarPr;
public String getLogin() { return login; } public String getLogin() { return login; }
public void setLogin(String login) { this.login = login; } public void setLogin(String login) { this.login = login; }
@@ -36,5 +37,7 @@ public class Net_GetMessageLikes_Response extends Net_Response {
public void setLastName(String lastName) { this.lastName = lastName; } public void setLastName(String lastName) { this.lastName = lastName; }
public String getAvatarAr() { return avatarAr; } public String getAvatarAr() { return avatarAr; }
public void setAvatarAr(String avatarAr) { this.avatarAr = avatarAr; } public void setAvatarAr(String avatarAr) { this.avatarAr = avatarAr; }
public String getAvatarPr() { return avatarPr; }
public void setAvatarPr(String avatarPr) { this.avatarPr = avatarPr; }
} }
} }
@@ -57,7 +57,7 @@ public class Net_ListSubscriptionsFeed_Response extends Net_Response {
private String displayName; private String displayName;
private String channelDescription; private String channelDescription;
private String avaAr; private String avaAr;
private String avaSha256; private String avaPr;
private Long avaSize; private Long avaSize;
private Long metaUpdatedAtMs; private Long metaUpdatedAtMs;
private Integer channelTypeCode; private Integer channelTypeCode;
@@ -86,8 +86,8 @@ public class Net_ListSubscriptionsFeed_Response extends Net_Response {
public String getAvaAr() { return avaAr; } public String getAvaAr() { return avaAr; }
public void setAvaAr(String avaAr) { this.avaAr = avaAr; } public void setAvaAr(String avaAr) { this.avaAr = avaAr; }
public String getAvaSha256() { return avaSha256; } public String getAvaPr() { return avaPr; }
public void setAvaSha256(String avaSha256) { this.avaSha256 = avaSha256; } public void setAvaPr(String avaPr) { this.avaPr = avaPr; }
public Long getAvaSize() { return avaSize; } public Long getAvaSize() { return avaSize; }
public void setAvaSize(Long avaSize) { this.avaSize = avaSize; } public void setAvaSize(Long avaSize) { this.avaSize = avaSize; }
@@ -10,7 +10,7 @@ public class Net_SearchChannels_Response extends Net_Response {
public void setChannels(List<ChannelItem> channels) { this.channels = channels; } public void setChannels(List<ChannelItem> channels) { this.channels = channels; }
public static class ChannelItem { public static class ChannelItem {
private String ownerLogin, slug, displayName, description, avatarAr, avatarSha256, private String ownerLogin, slug, displayName, description, avatarAr, avatarPr,
ownerBlockchainName, rootBlockHashHex; ownerBlockchainName, rootBlockHashHex;
private int rootBlockNumber, subscribersCount; private int rootBlockNumber, subscribersCount;
public String getOwnerLogin() { return ownerLogin; } public String getOwnerLogin() { return ownerLogin; }
@@ -23,8 +23,8 @@ public class Net_SearchChannels_Response extends Net_Response {
public void setDescription(String v) { description = v; } public void setDescription(String v) { description = v; }
public String getAvatarAr() { return avatarAr; } public String getAvatarAr() { return avatarAr; }
public void setAvatarAr(String v) { avatarAr = v; } public void setAvatarAr(String v) { avatarAr = v; }
public String getAvatarSha256() { return avatarSha256; } public String getAvatarPr() { return avatarPr; }
public void setAvatarSha256(String v) { avatarSha256 = v; } public void setAvatarPr(String v) { avatarPr = v; }
public String getOwnerBlockchainName() { return ownerBlockchainName; } public String getOwnerBlockchainName() { return ownerBlockchainName; }
public void setOwnerBlockchainName(String v) { ownerBlockchainName = v; } public void setOwnerBlockchainName(String v) { ownerBlockchainName = v; }
public int getRootBlockNumber() { return rootBlockNumber; } public int getRootBlockNumber() { return rootBlockNumber; }
@@ -297,7 +297,7 @@ public class Net_GetUserConnectionsGraph_Handler implements JsonMessageHandler {
if (!parsed.ok()) return null; if (!parsed.ok()) return null;
Net_GetUserConnectionsGraph_Response.AvatarItem avatar = new Net_GetUserConnectionsGraph_Response.AvatarItem(); Net_GetUserConnectionsGraph_Response.AvatarItem avatar = new Net_GetUserConnectionsGraph_Response.AvatarItem();
avatar.setAr(parsed.ar()); avatar.setAr(parsed.ar());
avatar.setSha256Hex(parsed.sha256Hex()); avatar.setPr(parsed.pr());
return avatar; return avatar;
} }
@@ -63,7 +63,7 @@ public class Net_ListContacts_Handler implements JsonMessageHandler {
AvatarValueParser.Parsed parsed = AvatarValueParser.parse(value); AvatarValueParser.Parsed parsed = AvatarValueParser.parse(value);
if (!parsed.ok()) return out; if (!parsed.ok()) return out;
out.setAr(parsed.ar()); out.setAr(parsed.ar());
out.setSha256Hex(parsed.sha256Hex()); out.setPr(parsed.pr());
return out; return out;
} }
@@ -39,12 +39,12 @@ public class Net_GetUserConnectionsGraph_Response extends Net_Response {
public static class AvatarItem { public static class AvatarItem {
private String ar; private String ar;
private String sha256Hex; private String pr;
public String getAr() { return ar; } public String getAr() { return ar; }
public void setAr(String ar) { this.ar = ar; } public void setAr(String ar) { this.ar = ar; }
public String getSha256Hex() { return sha256Hex; } public String getPr() { return pr; }
public void setSha256Hex(String sha256Hex) { this.sha256Hex = sha256Hex; } public void setPr(String pr) { this.pr = pr; }
} }
public static class RelativeItem { public static class RelativeItem {
@@ -56,10 +56,10 @@ public class Net_ListContacts_Response extends Net_Response {
public static class Avatar { public static class Avatar {
private String ar; private String ar;
private String sha256Hex; private String pr;
public String getAr() { return ar; } public String getAr() { return ar; }
public void setAr(String ar) { this.ar = ar; } public void setAr(String ar) { this.ar = ar; }
public String getSha256Hex() { return sha256Hex; } public String getPr() { return pr; }
public void setSha256Hex(String sha256Hex) { this.sha256Hex = sha256Hex; } public void setPr(String pr) { this.pr = pr; }
} }
} }
@@ -1,57 +1,38 @@
package server.logic.ws_protocol.JSON.handlers.profile; package server.logic.ws_protocol.JSON.handlers.profile;
import server.logic.ws_protocol.JSON.handlers.avatars.PiecesRootValidator;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
/** Avatar v2 only. No SHA256/hex or legacy avatar tag support. */
public final class AvatarValueParser { public final class AvatarValueParser {
private static final Pattern NEW_TAG = Pattern.compile("^<(?:SHiNE|S):(?:ava|avatar);([^>]*)>$"); private static final Pattern TAG = Pattern.compile("^<S:ava;([^>]*)>$");
private static final Pattern LEGACY_AR = Pattern.compile("AR:([A-Za-z0-9_-]{43})");
private static final Pattern LEGACY_SHA = Pattern.compile("SHA256:([A-Fa-f0-9]{64})");
private static final Pattern AR = Pattern.compile("^[A-Za-z0-9_-]{43}$"); private static final Pattern AR = Pattern.compile("^[A-Za-z0-9_-]{43}$");
private static final Pattern SHA = Pattern.compile("^[A-Fa-f0-9]{64}$");
private AvatarValueParser() {} private AvatarValueParser() {}
public static Parsed parse(String rawValue) { public static Parsed parse(String rawValue) {
String raw = String.valueOf(rawValue == null ? "" : rawValue).trim(); String raw = String.valueOf(rawValue == null ? "" : rawValue).trim();
if (raw.isEmpty()) return new Parsed("", "", 0L, false); Matcher tag = TAG.matcher(raw);
if (!tag.matches()) return new Parsed("", "", 0L, false);
Matcher tag = NEW_TAG.matcher(raw); Map<String, String> fields = fields(tag.group(1));
if (tag.matches()) { if (!"2".equals(fields.get("v"))) return new Parsed("", "", 0L, false);
Map<String, String> fields = fields(tag.group(1)); String ar = fields.getOrDefault("ar", "").trim();
if (!"1".equals(fields.get("v"))) return new Parsed("", "", 0L, false); String pr = fields.getOrDefault("pr", "").trim();
String ar = String.valueOf(fields.getOrDefault("ar", "")).trim(); if ((!ar.isEmpty() && !AR.matcher(ar).matches()) || !PiecesRootValidator.valid(pr))
String sha = String.valueOf(fields.getOrDefault("sha256", "")).trim().toLowerCase(); return new Parsed("", "", 0L, false);
String sizeRaw = String.valueOf(fields.containsKey("sz") ? fields.get("sz") : fields.getOrDefault("size", "")).trim(); long size;
if (!ar.isEmpty() && !AR.matcher(ar).matches()) return new Parsed("", "", 0L, false); try { size = Long.parseLong(fields.getOrDefault("sz", "")); }
if (!SHA.matcher(sha).matches()) return new Parsed("", "", 0L, false); catch (Exception e) { return new Parsed("", "", 0L, false); }
long size; return size > 0 ? new Parsed(ar, pr, size, true) : new Parsed("", "", 0L, false);
try { size = Long.parseLong(sizeRaw); } catch (Exception e) { return new Parsed("", "", 0L, false); }
if (size <= 0L) return new Parsed("", "", 0L, false);
return new Parsed(ar, sha, size, true);
}
Matcher arMatcher = LEGACY_AR.matcher(raw);
Matcher shaMatcher = LEGACY_SHA.matcher(raw);
String ar = arMatcher.find() ? arMatcher.group(1) : "";
String sha = shaMatcher.find() ? shaMatcher.group(1).toLowerCase() : "";
if (!AR.matcher(ar).matches()) return new Parsed("", "", 0L, false);
return new Parsed(ar, SHA.matcher(sha).matches() ? sha : "", 0L, true);
} }
private static Map<String, String> fields(String raw) { private static Map<String, String> fields(String raw) {
Map<String, String> out = new HashMap<>(); Map<String, String> out = new HashMap<>();
for (String part : String.valueOf(raw == null ? "" : raw).split(";")) { for (String part : raw.split(";")) {
int eq = part.indexOf('='); int eq = part.indexOf('=');
if (eq <= 0) continue; if (eq > 0) out.put(part.substring(0, eq).trim(), part.substring(eq + 1).trim());
String key = part.substring(0, eq).trim();
String value = part.substring(eq + 1).trim();
if (!key.isEmpty()) out.put(key, value);
} }
return out; return out;
} }
public record Parsed(String ar, String pr, long size, boolean ok) {}
public record Parsed(String ar, String sha256Hex, long size, boolean ok) {}
} }
@@ -1,3 +1,3 @@
package server.logic.ws_protocol.JSON.handlers.profile; package server.logic.ws_protocol.JSON.handlers.profile;
import server.logic.ws_protocol.JSON.*;import server.logic.ws_protocol.JSON.entyties.*;import server.logic.ws_protocol.JSON.handlers.JsonMessageHandler;import server.logic.ws_protocol.JSON.handlers.profile.entyties.*;import server.logic.ws_protocol.JSON.utils.NetExceptionResponseFactory;import server.logic.ws_protocol.WireCodes;import shine.db.dao.UserProfileStateDAO;import java.sql.*;import java.util.*; import server.logic.ws_protocol.JSON.*;import server.logic.ws_protocol.JSON.entyties.*;import server.logic.ws_protocol.JSON.handlers.JsonMessageHandler;import server.logic.ws_protocol.JSON.handlers.profile.entyties.*;import server.logic.ws_protocol.JSON.utils.NetExceptionResponseFactory;import server.logic.ws_protocol.WireCodes;import shine.db.dao.UserProfileStateDAO;import java.sql.*;import java.util.*;
public class Net_ListUserProfileChannels_Handler implements JsonMessageHandler {public Net_Response handle(Net_Request base,ConnectionContext ctx)throws Exception{var req=(Net_ListUserProfileChannels_Request)base;if(req.getLogin()==null||req.getLogin().isBlank())return NetExceptionResponseFactory.error(req,400,"BAD_FIELDS","login required");try(Connection c=shine.db.DbController.getInstance().getConnection()){var rows=UserProfileStateDAO.getInstance().listPublicChannels(c,req.getLogin(),req.getMode(),Boolean.TRUE.equals(req.getIncludeDeleted()),req.getLimit()==null?100:req.getLimit(),req.getOffset()==null?0:req.getOffset());var resp=new Net_ListUserProfileChannels_Response();resp.setOp(req.getOp());resp.setRequestId(req.getRequestId());resp.setStatus(WireCodes.Status.OK);resp.setLogin(req.getLogin());resp.setMode(req.getMode());List<Net_ListUserProfileChannels_Response.ChannelItem> items=new ArrayList<>();for(var r:rows){var i=new Net_ListUserProfileChannels_Response.ChannelItem();i.setOwnerLogin(r.ownerLogin());i.setSlug(r.slug());i.setDisplayName(r.displayName());i.setAvatarAr(r.avatarAr());i.setAvatarSha256(r.avatarSha256());i.setOwnerBlockchainName(r.ownerBlockchainName());i.setRootBlockNumber(r.rootBlockNumber());i.setRootBlockHashHex(r.rootBlockHashHex());i.setDeleted(r.deleted());i.setDeletedAtMs(r.deletedAtMs());i.setDeletedBlockNumber(r.deletedBlockNumber());items.add(i);}resp.setChannels(items);return resp;}}} public class Net_ListUserProfileChannels_Handler implements JsonMessageHandler {public Net_Response handle(Net_Request base,ConnectionContext ctx)throws Exception{var req=(Net_ListUserProfileChannels_Request)base;if(req.getLogin()==null||req.getLogin().isBlank())return NetExceptionResponseFactory.error(req,400,"BAD_FIELDS","login required");try(Connection c=shine.db.DbController.getInstance().getConnection()){var rows=UserProfileStateDAO.getInstance().listPublicChannels(c,req.getLogin(),req.getMode(),Boolean.TRUE.equals(req.getIncludeDeleted()),req.getLimit()==null?100:req.getLimit(),req.getOffset()==null?0:req.getOffset());var resp=new Net_ListUserProfileChannels_Response();resp.setOp(req.getOp());resp.setRequestId(req.getRequestId());resp.setStatus(WireCodes.Status.OK);resp.setLogin(req.getLogin());resp.setMode(req.getMode());List<Net_ListUserProfileChannels_Response.ChannelItem> items=new ArrayList<>();for(var r:rows){var i=new Net_ListUserProfileChannels_Response.ChannelItem();i.setOwnerLogin(r.ownerLogin());i.setSlug(r.slug());i.setDisplayName(r.displayName());i.setAvatarAr(r.avatarAr());i.setAvatarPr(r.avatarPr());i.setOwnerBlockchainName(r.ownerBlockchainName());i.setRootBlockNumber(r.rootBlockNumber());i.setRootBlockHashHex(r.rootBlockHashHex());i.setDeleted(r.deleted());i.setDeletedAtMs(r.deletedAtMs());i.setDeletedBlockNumber(r.deletedBlockNumber());items.add(i);}resp.setChannels(items);return resp;}}}
@@ -8,7 +8,7 @@ public class Net_ListUserProfileRelations_Handler implements JsonMessageHandler
try(Connection c=shine.db.DbController.getInstance().getConnection()){ try(Connection c=shine.db.DbController.getInstance().getConnection()){
var rows=UserProfileStateDAO.getInstance().listRelations(c,req.getLogin(),req.getListType(),req.getLimit()==null?100:req.getLimit(),req.getOffset()==null?0:req.getOffset()); var rows=UserProfileStateDAO.getInstance().listRelations(c,req.getLogin(),req.getListType(),req.getLimit()==null?100:req.getLimit(),req.getOffset()==null?0:req.getOffset());
var resp=new Net_ListUserProfileRelations_Response(); resp.setOp(req.getOp());resp.setRequestId(req.getRequestId());resp.setStatus(WireCodes.Status.OK);resp.setLogin(req.getLogin());resp.setListType(req.getListType()); var resp=new Net_ListUserProfileRelations_Response(); resp.setOp(req.getOp());resp.setRequestId(req.getRequestId());resp.setStatus(WireCodes.Status.OK);resp.setLogin(req.getLogin());resp.setListType(req.getListType());
List<Net_ListUserProfileRelations_Response.UserItem> items=new ArrayList<>(); for(var r:rows){var i=new Net_ListUserProfileRelations_Response.UserItem();i.setLogin(r.login());i.setFirstName(r.firstName());i.setLastName(r.lastName());i.setAvatarAr(r.avatarAr());i.setAccountRole(r.accountRole());i.setShineStatus(r.shineStatus());i.setRelationType(r.relationType());i.setPrimaryConfirmed(r.primaryConfirmed());i.setShineConfirmed(r.shineConfirmed());i.setPrimaryConfirmationsCount(r.primaryConfirmationsCount());i.setShineConfirmationsCount(r.shineConfirmationsCount());items.add(i);} resp.setUsers(items);return resp; List<Net_ListUserProfileRelations_Response.UserItem> items=new ArrayList<>(); for(var r:rows){var i=new Net_ListUserProfileRelations_Response.UserItem();i.setLogin(r.login());i.setFirstName(r.firstName());i.setLastName(r.lastName());var avatar = AvatarValueParser.parse(r.avatarAr());i.setAvatarAr(avatar.ar());i.setAvatarPr(avatar.pr());i.setAccountRole(r.accountRole());i.setShineStatus(r.shineStatus());i.setRelationType(r.relationType());i.setPrimaryConfirmed(r.primaryConfirmed());i.setShineConfirmed(r.shineConfirmed());i.setPrimaryConfirmationsCount(r.primaryConfirmationsCount());i.setShineConfirmationsCount(r.shineConfirmationsCount());items.add(i);} resp.setUsers(items);return resp;
} }
} }
} }
@@ -1,3 +1,3 @@
package server.logic.ws_protocol.JSON.handlers.profile.entyties; package server.logic.ws_protocol.JSON.handlers.profile.entyties;
import server.logic.ws_protocol.JSON.entyties.Net_Response;import java.util.*; import server.logic.ws_protocol.JSON.entyties.Net_Response;import java.util.*;
public class Net_ListUserProfileChannels_Response extends Net_Response {private String login,mode;private List<ChannelItem> channels=new ArrayList<>();public String getLogin(){return login;}public void setLogin(String v){login=v;}public String getMode(){return mode;}public void setMode(String v){mode=v;}public List<ChannelItem> getChannels(){return channels;}public void setChannels(List<ChannelItem> v){channels=v;}public static class ChannelItem{private String ownerLogin,slug,displayName,avatarAr,avatarSha256,ownerBlockchainName,rootBlockHashHex;private int rootBlockNumber;private boolean deleted;private long deletedAtMs;private Integer deletedBlockNumber;public String getOwnerLogin(){return ownerLogin;}public void setOwnerLogin(String v){ownerLogin=v;}public String getSlug(){return slug;}public void setSlug(String v){slug=v;}public String getDisplayName(){return displayName;}public void setDisplayName(String v){displayName=v;}public String getAvatarAr(){return avatarAr;}public void setAvatarAr(String v){avatarAr=v;}public String getAvatarSha256(){return avatarSha256;}public void setAvatarSha256(String v){avatarSha256=v;}public String getOwnerBlockchainName(){return ownerBlockchainName;}public void setOwnerBlockchainName(String v){ownerBlockchainName=v;}public int getRootBlockNumber(){return rootBlockNumber;}public void setRootBlockNumber(int v){rootBlockNumber=v;}public String getRootBlockHashHex(){return rootBlockHashHex;}public void setRootBlockHashHex(String v){rootBlockHashHex=v;}public boolean isDeleted(){return deleted;}public void setDeleted(boolean v){deleted=v;}public long getDeletedAtMs(){return deletedAtMs;}public void setDeletedAtMs(long v){deletedAtMs=v;}public Integer getDeletedBlockNumber(){return deletedBlockNumber;}public void setDeletedBlockNumber(Integer v){deletedBlockNumber=v;}}} public class Net_ListUserProfileChannels_Response extends Net_Response {private String login,mode;private List<ChannelItem> channels=new ArrayList<>();public String getLogin(){return login;}public void setLogin(String v){login=v;}public String getMode(){return mode;}public void setMode(String v){mode=v;}public List<ChannelItem> getChannels(){return channels;}public void setChannels(List<ChannelItem> v){channels=v;}public static class ChannelItem{private String ownerLogin,slug,displayName,avatarAr,avatarPr,ownerBlockchainName,rootBlockHashHex;private int rootBlockNumber;private boolean deleted;private long deletedAtMs;private Integer deletedBlockNumber;public String getOwnerLogin(){return ownerLogin;}public void setOwnerLogin(String v){ownerLogin=v;}public String getSlug(){return slug;}public void setSlug(String v){slug=v;}public String getDisplayName(){return displayName;}public void setDisplayName(String v){displayName=v;}public String getAvatarAr(){return avatarAr;}public void setAvatarAr(String v){avatarAr=v;}public String getAvatarPr(){return avatarPr;}public void setAvatarPr(String v){avatarPr=v;}public String getOwnerBlockchainName(){return ownerBlockchainName;}public void setOwnerBlockchainName(String v){ownerBlockchainName=v;}public int getRootBlockNumber(){return rootBlockNumber;}public void setRootBlockNumber(int v){rootBlockNumber=v;}public String getRootBlockHashHex(){return rootBlockHashHex;}public void setRootBlockHashHex(String v){rootBlockHashHex=v;}public boolean isDeleted(){return deleted;}public void setDeleted(boolean v){deleted=v;}public long getDeletedAtMs(){return deletedAtMs;}public void setDeletedAtMs(long v){deletedAtMs=v;}public Integer getDeletedBlockNumber(){return deletedBlockNumber;}public void setDeletedBlockNumber(Integer v){deletedBlockNumber=v;}}}
@@ -7,12 +7,13 @@ public class Net_ListUserProfileRelations_Response extends Net_Response {
public String getListType(){return listType;} public void setListType(String v){listType=v;} public String getListType(){return listType;} public void setListType(String v){listType=v;}
public List<UserItem> getUsers(){return users;} public void setUsers(List<UserItem> v){users=v;} public List<UserItem> getUsers(){return users;} public void setUsers(List<UserItem> v){users=v;}
public static class UserItem { public static class UserItem {
private String login,firstName,lastName,avatarAr,accountRole,shineStatus,relationType; private String login,firstName,lastName,avatarAr,avatarPr,accountRole,shineStatus,relationType;
private boolean primaryConfirmed,shineConfirmed; private int primaryConfirmationsCount,shineConfirmationsCount; private boolean primaryConfirmed,shineConfirmed; private int primaryConfirmationsCount,shineConfirmationsCount;
public String getLogin(){return login;} public void setLogin(String v){login=v;} public String getLogin(){return login;} public void setLogin(String v){login=v;}
public String getFirstName(){return firstName;} public void setFirstName(String v){firstName=v;} public String getFirstName(){return firstName;} public void setFirstName(String v){firstName=v;}
public String getLastName(){return lastName;} public void setLastName(String v){lastName=v;} public String getLastName(){return lastName;} public void setLastName(String v){lastName=v;}
public String getAvatarAr(){return avatarAr;} public void setAvatarAr(String v){avatarAr=v;} public String getAvatarAr(){return avatarAr;} public void setAvatarAr(String v){avatarAr=v;}
public String getAvatarPr(){return avatarPr;} public void setAvatarPr(String v){avatarPr=v;}
public String getAccountRole(){return accountRole;} public void setAccountRole(String v){accountRole=v;} public String getAccountRole(){return accountRole;} public void setAccountRole(String v){accountRole=v;}
public String getShineStatus(){return shineStatus;} public void setShineStatus(String v){shineStatus=v;} public String getShineStatus(){return shineStatus;} public void setShineStatus(String v){shineStatus=v;}
public String getRelationType(){return relationType;} public void setRelationType(String v){relationType=v;} public String getRelationType(){return relationType;} public void setRelationType(String v){relationType=v;}
@@ -6,6 +6,7 @@ import server.logic.ws_protocol.JSON.ConnectionContext;
import server.logic.ws_protocol.JSON.entyties.Net_Request; import server.logic.ws_protocol.JSON.entyties.Net_Request;
import server.logic.ws_protocol.JSON.entyties.Net_Response; import server.logic.ws_protocol.JSON.entyties.Net_Response;
import server.logic.ws_protocol.JSON.handlers.JsonMessageHandler; import server.logic.ws_protocol.JSON.handlers.JsonMessageHandler;
import server.logic.ws_protocol.JSON.handlers.profile.AvatarValueParser;
import server.logic.ws_protocol.JSON.handlers.tempToTest.entyties.Net_SearchUsers_Request; import server.logic.ws_protocol.JSON.handlers.tempToTest.entyties.Net_SearchUsers_Request;
import server.logic.ws_protocol.JSON.handlers.tempToTest.entyties.Net_SearchUsers_Response; import server.logic.ws_protocol.JSON.handlers.tempToTest.entyties.Net_SearchUsers_Response;
import server.logic.ws_protocol.JSON.utils.NetExceptionResponseFactory; import server.logic.ws_protocol.JSON.utils.NetExceptionResponseFactory;
@@ -50,7 +51,9 @@ public class Net_SearchUsers_Handler implements JsonMessageHandler {
var item = new Net_SearchUsers_Response.UserItem(); var item = new Net_SearchUsers_Response.UserItem();
item.setLogin(card.login()); item.setLogin(card.login());
item.setDisplayName(card.displayName()); item.setDisplayName(card.displayName());
item.setAvatarAr(card.avatarAr()); AvatarValueParser.Parsed avatar = AvatarValueParser.parse(card.avatarAr());
item.setAvatarAr(avatar.ar());
item.setAvatarPr(avatar.pr());
users.add(item); users.add(item);
} }
@@ -28,13 +28,15 @@ public class Net_SearchUsers_Response extends Net_Response {
public void setUsers(List<UserItem> users) { this.users = users; } public void setUsers(List<UserItem> users) { this.users = users; }
public static class UserItem { public static class UserItem {
private String login, displayName, avatarAr; private String login, displayName, avatarAr, avatarPr;
public String getLogin() { return login; } public String getLogin() { return login; }
public void setLogin(String value) { login = value; } public void setLogin(String value) { login = value; }
public String getDisplayName() { return displayName; } public String getDisplayName() { return displayName; }
public void setDisplayName(String value) { displayName = value; } public void setDisplayName(String value) { displayName = value; }
public String getAvatarAr() { return avatarAr; } public String getAvatarAr() { return avatarAr; }
public void setAvatarAr(String value) { avatarAr = value; } public void setAvatarAr(String value) { avatarAr = value; }
public String getAvatarPr() { return avatarPr; }
public void setAvatarPr(String value) { avatarPr = value; }
} }
@@ -139,7 +139,7 @@ public class Net_GetDirectMessages_Handler implements JsonMessageHandler {
AvatarValueParser.Parsed parsed = AvatarValueParser.parse(value); AvatarValueParser.Parsed parsed = AvatarValueParser.parse(value);
if (!parsed.ok()) return out; if (!parsed.ok()) return out;
out.setAr(parsed.ar()); out.setAr(parsed.ar());
out.setSha256Hex(parsed.sha256Hex()); out.setPr(parsed.pr());
return out; return out;
} }
@@ -60,11 +60,11 @@ public class Net_GetDirectMessages_Response extends Net_Response {
public static class Avatar { public static class Avatar {
private String ar; private String ar;
private String sha256Hex; private String pr;
public String getAr() { return ar; } public String getAr() { return ar; }
public void setAr(String ar) { this.ar = ar; } public void setAr(String ar) { this.ar = ar; }
public String getSha256Hex() { return sha256Hex; } public String getPr() { return pr; }
public void setSha256Hex(String sha256Hex) { this.sha256Hex = sha256Hex; } public void setPr(String pr) { this.pr = pr; }
} }
public static class MessageItem { public static class MessageItem {
+2 -2
View File
@@ -1,2 +1,2 @@
client.version=1.20.44 client.version=1.20.45
server.version=1.16.24 server.version=1.16.25
@@ -1,5 +1,7 @@
# Временное Test API для бесплатной загрузки аватаров в Arweave # Временное Test API для бесплатной загрузки аватаров в Arweave
> Актуальный формат публичных аватаров SHiNE — `<S:ava;v=2;sz=...;pr=BASE58[;ar=TXID]>`. PR вычисляется по BitTorrent v2 из байтов загруженного изображения; SHA256/hex в новых записях аватаров не применяется. Этот документ описывает только старый тестовый транспортный API Arweave и не является спецификацией идентификатора.
> Статус: **временное тестовое решение**. > Статус: **временное тестовое решение**.
> Все операции из этого файла начинаются с `Test...`, чтобы это было видно сразу и в коде, и в UI. > Все операции из этого файла начинаются с `Test...`, чтобы это было видно сразу и в коде, и в UI.
+6
View File
@@ -147,3 +147,9 @@ https://<current-access-server>/files/<sha256>
New public attachments use BitTorrent v2 `pr` (canonical Base58 encoding of the 32-byte Pieces Root, normally 43–44 characters, variable length 32–44), `mm` (optional MIME) and `v=1`. Avatars retain the original SHA-256 `/files/<sha256>` API. The client signs `PUBLIC_R2_PREPARE_V1:{sessionId}:{pr}:{size}:{mm}:{timeMs}` with its Ed25519 session key, submits JSON `{pr,size,mm}` to `POST /api/files/prepare` and provides `X-Shine-Session-Id`, `X-Shine-Time-Ms` and `X-Shine-Signature`. The endpoint returns `exists`, `fileUrl`, and for missing objects `uploadUrl` and `requiredHeaders`. The browser uploads the original Blob directly to the S3 endpoint, not the Java server. A signature does not certify the hash of uploaded content. The public GET URL is `https://files.shineup.me/<pr>`; the R2 object key is exactly the same Base58 `pr` (no extension). Old Base64URL PR identifiers are not read or migrated. Arweave TX IDs and DM file identifiers keep their existing encodings. Client and Java server must be updated together. New public attachments use BitTorrent v2 `pr` (canonical Base58 encoding of the 32-byte Pieces Root, normally 43–44 characters, variable length 32–44), `mm` (optional MIME) and `v=1`. Avatars retain the original SHA-256 `/files/<sha256>` API. The client signs `PUBLIC_R2_PREPARE_V1:{sessionId}:{pr}:{size}:{mm}:{timeMs}` with its Ed25519 session key, submits JSON `{pr,size,mm}` to `POST /api/files/prepare` and provides `X-Shine-Session-Id`, `X-Shine-Time-Ms` and `X-Shine-Signature`. The endpoint returns `exists`, `fileUrl`, and for missing objects `uploadUrl` and `requiredHeaders`. The browser uploads the original Blob directly to the S3 endpoint, not the Java server. A signature does not certify the hash of uploaded content. The public GET URL is `https://files.shineup.me/<pr>`; the R2 object key is exactly the same Base58 `pr` (no extension). Old Base64URL PR identifiers are not read or migrated. Arweave TX IDs and DM file identifiers keep their existing encodings. Client and Java server must be updated together.
Configuration: `R2_ENDPOINT`, `R2_ACCESS_KEY_ID`, `R2_SECRET_ACCESS_KEY`, `r2.publicBucket=shine-files` (or `r2.endpoint`, `r2.accessKeyId`, `r2.secretAccessKey` in trusted server config). Never publish keys. Configure browser CORS to permit signed PUT headers including `If-None-Match`. Max size: 500 MiB. Single PUT only, no multipart in this MVP. Configuration: `R2_ENDPOINT`, `R2_ACCESS_KEY_ID`, `R2_SECRET_ACCESS_KEY`, `r2.publicBucket=shine-files` (or `r2.endpoint`, `r2.accessKeyId`, `r2.secretAccessKey` in trusted server config). Never publish keys. Configure browser CORS to permit signed PUT headers including `If-None-Match`. Max size: 500 MiB. Single PUT only, no multipart in this MVP.
## Единый формат публичных идентификаторов
Аватарки и публичные вложения имеют одинаковый `PR = Base58(BitTorrent v2 Pieces Root)` и сохраняются в **корень** R2 bucket `shine-files`, URL `https://files.shineup.me/<PR>`. Папки `avatars/` нет; загрузка идёт через `/api/files/prepare`, не через `/api/avatars/prepare`. После оптимизации изображения вычисляется PR от именно передаваемых байтов. `<S:ava;v=2;sz=N;pr=BASE58[;ar=TXID]>`; `ar` остаётся нативным Arweave TX ID в Base64URL. Старые `<S:ava;v=1;...sha256=...>` не поддерживаются.
Для потенциального **будущего** SHA-256 типа идентификатора публичного файла используем `Base58(SHA-256(bytes))`, а не hex. Это отдельный алгоритм, его нельзя смешивать с PR. На данный момент новые публичные вложения/аватарки не используют SHA-256 как идентификатор.
@@ -17,7 +17,7 @@ Payload включает:
```text ```text
<S:title;v=1;Название канала> <S:title;v=1;Название канала>
<S:ava;v=1;sz=248193;sha256=3f2c8a...;ar=AbCdEf...> <S:ava;v=2;sz=248193;pr=JEKNVnkbo3jma5nREBBJCDoXFVeKkD56V3xKrvRmWxFG;ar=AbCdEf...>
Описание канала. Описание канала.
``` ```
+7 -7
View File
@@ -19,14 +19,14 @@
```text ```text
<S:title;v=1;Название канала> <S:title;v=1;Название канала>
<S:ava;v=1;sz=248193;sha256=3f2c8a...;ar=AbCdEf...> <S:ava;v=2;sz=248193;pr=JEKNVnkbo3jma5nREBBJCDoXFVeKkD56V3xKrvRmWxFG;ar=AbCdEf...>
Описание канала. Описание канала.
``` ```
Поддерживаемые теги: Поддерживаемые теги:
- `<S:title;v=1;...>` — человекочитаемое имя канала. - `<S:title;v=1;...>` — человекочитаемое имя канала.
- `<S:ava;v=1;sz=...;sha256=...;ar=...>` — аватар канала в Arweave. - `<S:ava;v=2;sz=...;pr=...;ar=...>` — аватар канала: PR/Base58 в R2 либо PR/Base58 + нативный Arweave TX ID (`ar` — необязательное поле).
## Правила ## Правила
@@ -43,7 +43,7 @@
- В `title` запрещены `<`, `>`, `;`, табуляция, перевод строки и `\0`. - В `title` запрещены `<`, `>`, `;`, табуляция, перевод строки и `\0`.
- Длина описания — максимум 250 Unicode code points. - Длина описания — максимум 250 Unicode code points.
- `avatar.ar` — Arweave transaction id из 43 символов. - `avatar.ar` — Arweave transaction id из 43 символов.
- `avatar.sha256` — 64 hex-символа. - `avatar.pr` — Base58 от 32 байт BitTorrent v2 Pieces Root (без hex и Base64URL).
- `avatar.sz` — положительный размер файла в байтах. - `avatar.sz` — положительный размер файла в байтах.
Если meta-блок невалиден, сервер не применяет его целиком. Если meta-блок невалиден, сервер не применяет его целиком.
@@ -60,8 +60,8 @@
Команда `/.desc` больше не используется и не применяется сервером. Описание канала меняется только через `TEXT_CHANNEL_META`. Команда `/.desc` больше не используется и не применяется сервером. Описание канала меняется только через `TEXT_CHANNEL_META`.
## Совместимость ## Версии
- Новый UI пишет сокращённые теги `<S:title ...>` и `<S:ava ...>`. - Новый UI пишет `<S:ava;v=2;sz=...;pr=...>` с **регистрозависимым** Base58. Старые аватары v1 с SHA-256/hex не отображаются и не мигрируются автоматически.
- Серверное чтение поддерживает и старые теги `<SHiNE:title ...>` / `<SHiNE:avatar ...>`. - При перестроении индекса старый тег v1 пропускается, но сам старый канал и его текст сохраняются.
- Для размера аватара чтение поддерживает и старое поле `size`, и новое поле `sz`. - Поле `ar` при наличии остаётся оригинальным Arweave Transaction ID (Base64URL), его не перекодируем.
-9
View File
@@ -1,9 +0,0 @@
#!/usr/bin/env bash
set -euo pipefail
# Run only from repository root after extracting Avatar PR patch ZIP.
[[ -f 'SHiNE-server/src/main/java/server/files/PublicFileApiConfigurator.java' ]] || { echo 'Run from SHiNE repository root' >&2; exit 1; }
rm -f 'SHiNE-server/src/main/java/server/files/R2AvatarPrepareServlet.java'
rm -f 'SHiNE-server/src/test/java/server/files/R2AvatarPrepareServletTest.java'
rm -f 'scripts/migrate_avatars_to_r2.py'
rm -f 'AVATAR_R2_PATCH_README.md'
echo 'Obsolete SHA256/hex avatar R2 files removed. /api/avatars/prepare is no longer registered.'
@@ -729,7 +729,7 @@ export function openArweaveAttachmentManager({
} }
const buffer = await selectedFile.arrayBuffer(); const buffer = await selectedFile.arrayBuffer();
selectedSha256 = await sha256HexFromArrayBuffer(buffer); selectedSha256 = await sha256HexFromArrayBuffer(buffer);
if (!isAvatarMode) selectedPrepared = await preparePublicFile(selectedFile); selectedPrepared = await preparePublicFile(selectedFile);
if (turboMode) { if (turboMode) {
await refreshTurboStateForCurrentFile(mainMetaEl, errorEl, uploadBtn); await refreshTurboStateForCurrentFile(mainMetaEl, errorEl, uploadBtn);
} else { } else {
@@ -780,9 +780,9 @@ export function openArweaveAttachmentManager({
...normalizedExtraUploadTags, ...normalizedExtraUploadTags,
], ],
}); });
const prepared = isAvatarMode ? null : (selectedPrepared || await preparePublicFile(selectedFile)); const prepared = selectedPrepared || await preparePublicFile(selectedFile);
finish(resolve, { finish(resolve, {
...(prepared ? { pr: prepared.pr, mm: prepared.mm } : {}), pr: prepared.pr, mm: prepared.mm,
name: isAvatarMode ? t('screens.arweave_attachment_manager.text_032') : (initialName || selectedFile.name || 'file'), name: isAvatarMode ? t('screens.arweave_attachment_manager.text_032') : (initialName || selectedFile.name || 'file'),
size: selectedFile.size, size: selectedFile.size,
sha256: selectedSha256, sha256: selectedSha256,
+13 -21
View File
@@ -1,8 +1,9 @@
import { t } from '../i18n/index.js'; import { t } from '../i18n/index.js';
import { state } from '../state.js'; import { state } from '../state.js';
import { buildArweaveDataUrl, validateArweaveTxId, validateSha256Hex } from '../services/arweave-file-service.js'; import { buildArweaveDataUrl, validateArweaveTxId } from '../services/arweave-file-service.js';
import { getCachedAvatarObjectUrl } from '../services/arweave-avatar-cache-service.js'; import { getCachedAvatarObjectUrl } from '../services/arweave-avatar-cache-service.js';
import { resolvePublicFileUrl } from '../services/public-file-service.js'; import { avatarR2Url } from '../services/public-file-service.js';
import { validatePublicPiecesRoot } from '../services/public-pieces-root.js';
function normalizeLogin(value) { function normalizeLogin(value) {
return String(value || '').trim(); return String(value || '').trim();
@@ -66,10 +67,10 @@ export function renderAvatar({
} }
const txId = String(avatar?.ar || '').trim(); const txId = String(avatar?.ar || '').trim();
const sha256Hex = String(avatar?.sha256Hex || avatar?.sha256 || '').trim().toLowerCase(); const pr = String(avatar?.pr || '').trim();
const expectedSha256Hex = validateSha256Hex(sha256Hex) ? sha256Hex : ''; const expectedPr = validatePublicPiecesRoot(pr) ? pr : '';
const hasArweave = validateArweaveTxId(txId); const hasArweave = validateArweaveTxId(txId);
const hasServerAvatar = !txId && expectedSha256Hex && normalizeLogin(authorLogin); const hasServerAvatar = !txId && expectedPr;
if (!hasArweave && !hasServerAvatar) return wrap; if (!hasArweave && !hasServerAvatar) return wrap;
const img = document.createElement('img'); const img = document.createElement('img');
@@ -85,24 +86,15 @@ export function renderAvatar({
setLoadedState(false); setLoadedState(false);
if (hasServerAvatar) { if (hasServerAvatar) {
void resolvePublicFileUrl({ // All public avatars use exactly the same PR/Base58 R2 object key as attachments.
sha256: expectedSha256Hex, img.onload = () => setLoadedState(true);
authorLogin: normalizeLogin(authorLogin), img.onerror = () => { img.removeAttribute('src'); setLoadedState(false); };
solanaEndpoint: state?.entrySettings?.solanaServer, img.src = avatarR2Url(expectedPr);
fallbackServerLogin: state?.entrySettings?.shineServerLogin,
}).then((url) => {
img.onload = () => setLoadedState(true);
img.onerror = () => { img.removeAttribute('src'); setLoadedState(false); };
img.src = url;
}).catch(() => {
img.removeAttribute('src');
setLoadedState(false);
});
return wrap; return wrap;
} }
const gateway = state?.entrySettings?.arweaveServer; const gateway = state?.entrySettings?.arweaveServer;
void getCachedAvatarObjectUrl({ gateway, txId, expectedSha256Hex }) void getCachedAvatarObjectUrl({ gateway, txId, expectedPr })
.then((objectUrl) => { .then((objectUrl) => {
const directUrl = buildArweaveDataUrl({ gateway, txId }); const directUrl = buildArweaveDataUrl({ gateway, txId });
let triedDirectUrl = false; let triedDirectUrl = false;
@@ -120,7 +112,7 @@ export function renderAvatar({
}; };
img.onerror = () => { img.onerror = () => {
if (!triedDirectUrl) { if (!triedDirectUrl) {
if (expectedSha256Hex) { if (expectedPr) {
releaseObjectUrl(); releaseObjectUrl();
img.removeAttribute('src'); img.removeAttribute('src');
setLoadedState(false); setLoadedState(false);
@@ -138,7 +130,7 @@ export function renderAvatar({
img.src = objectUrl; img.src = objectUrl;
}) })
.catch(() => { .catch(() => {
if (expectedSha256Hex) { if (expectedPr) {
img.removeAttribute('src'); img.removeAttribute('src');
setLoadedState(false); setLoadedState(false);
return; return;
+1 -1
View File
@@ -24,7 +24,7 @@ export async function openAvatarWizard({
mode: 'avatar', mode: 'avatar',
}); });
if (!item?.sha256 || !item?.size) return false; if (!item?.pr || !item?.size) return false;
if (typeof onStatus === 'function') { if (typeof onStatus === 'function') {
onStatus(t('screens.avatar_wizard.text_002')); onStatus(t('screens.avatar_wizard.text_002'));
+5 -5
View File
@@ -45,7 +45,7 @@ function renderAvatarPreview(slot, avatar, title) {
const initials = Array.from(label)[0]?.toUpperCase() || t('screens.add_channel_view.text_016'); const initials = Array.from(label)[0]?.toUpperCase() || t('screens.add_channel_view.text_016');
// При вводе названия обновляем только текст fallback. Иначе асинхронно // При вводе названия обновляем только текст fallback. Иначе асинхронно
// загруженная картинка каждый раз удаляется, и на мгновение виден кружок. // загруженная картинка каждый раз удаляется, и на мгновение виден кружок.
const avatarKey = `${String(avatar?.ar || '').trim()}|${String(avatar?.sha256Hex || avatar?.sha256 || '').trim().toLowerCase()}`; const avatarKey = `${String(avatar?.ar || '').trim()}|${String(avatar?.pr || '').trim()}`;
const current = slot.firstElementChild; const current = slot.firstElementChild;
if (current?.dataset.avatarPreviewKey === avatarKey) { if (current?.dataset.avatarPreviewKey === avatarKey) {
current.title = label; current.title = label;
@@ -184,8 +184,8 @@ export function render({navigate, chrome}) {
const renderAvatarStatus = (nameValue, titleValue) => { const renderAvatarStatus = (nameValue, titleValue) => {
renderAvatarPreview(avatarPreviewEl, selectedAvatar, titleValue || nameValue); renderAvatarPreview(avatarPreviewEl, selectedAvatar, titleValue || nameValue);
avatarRemoveBtn.hidden = !selectedAvatar?.sha256; avatarRemoveBtn.hidden = !selectedAvatar?.pr;
if (!selectedAvatar?.sha256) { if (!selectedAvatar?.pr) {
avatarStatusEl.innerHTML = t('screens.add_channel_view.text_017'); avatarStatusEl.innerHTML = t('screens.add_channel_view.text_017');
return; return;
} }
@@ -295,7 +295,7 @@ export function render({navigate, chrome}) {
gateway: state.entrySettings.arweaveServer, gateway: state.entrySettings.arweaveServer,
mode: 'avatar', mode: 'avatar',
}); });
if (nextAvatar?.sha256) { if (nextAvatar?.pr) {
selectedAvatar = nextAvatar; selectedAvatar = nextAvatar;
void refreshAvatarAvailability(); void refreshAvatarAvailability();
} }
@@ -306,7 +306,7 @@ export function render({navigate, chrome}) {
}); });
avatarRemoveBtn.addEventListener('click', async () => { avatarRemoveBtn.addEventListener('click', async () => {
if (!selectedAvatar?.sha256) return; if (!selectedAvatar?.pr) return;
const confirmed = await confirmDialog({ title: t('screens.add_channel_view.text_005'), text: t('screens.add_channel_view.text_013'), confirmLabel: t('screens.add_channel_view.text_006') }); const confirmed = await confirmDialog({ title: t('screens.add_channel_view.text_005'), text: t('screens.add_channel_view.text_013'), confirmLabel: t('screens.add_channel_view.text_006') });
if (!confirmed) return; if (!confirmed) return;
selectedAvatar = null; selectedAvatar = null;
+4 -4
View File
@@ -88,10 +88,10 @@ function formatChannelCreatedAt(value) {
function openChannelProfileEditor({ channel, selector, onSaved }) { function openChannelProfileEditor({ channel, selector, onSaved }) {
const root = document.getElementById('modal-root'); const root = document.getElementById('modal-root');
if (!root) return; if (!root) return;
let selectedAvatar = String(channel?.avaSha256 || '').trim() ? { let selectedAvatar = String(channel?.avaPr || '').trim() ? {
name: t('dialogs.remaining.pages.channel_about_view.openchannelprofileeditor.avatar'), name: t('dialogs.remaining.pages.channel_about_view.openchannelprofileeditor.avatar'),
ar: String(channel.avaAr || '').trim(), ar: String(channel.avaAr || '').trim(),
sha256: String(channel?.avaSha256 || '').trim(), pr: String(channel?.avaPr || '').trim(),
size: Number(channel?.avaSize || 0), size: Number(channel?.avaSize || 0),
purpose: 'avatar', purpose: 'avatar',
} : null; } : null;
@@ -125,7 +125,7 @@ function openChannelProfileEditor({ channel, selector, onSaved }) {
slot.innerHTML = ''; slot.innerHTML = '';
slot.append(renderAvatar({ slot.append(renderAvatar({
initials: (title || t('dialogs.remaining.pages.channel_about_view.renderpreview.k')).slice(0, 1).toUpperCase(), initials: (title || t('dialogs.remaining.pages.channel_about_view.renderpreview.k')).slice(0, 1).toUpperCase(),
avatar: selectedAvatar?.sha256 ? { ar: String(selectedAvatar.ar || ''), sha256Hex: selectedAvatar.sha256 } : null, avatar: selectedAvatar?.pr ? { ar: String(selectedAvatar.ar || ''), pr: selectedAvatar.pr } : null,
authorLogin: String(channel?.ownerLogin || state.session.login || '').trim(), authorLogin: String(channel?.ownerLogin || state.session.login || '').trim(),
size: 'xl', size: 'xl',
className: 'channel-about-avatar channel-profile-avatar avatar-plain', className: 'channel-about-avatar channel-profile-avatar avatar-plain',
@@ -640,7 +640,7 @@ export function render({ navigate, route, chrome }) {
const channelAvatar = renderAvatar({ const channelAvatar = renderAvatar({
initials: cleanName.slice(0, 1).toUpperCase() || t('screens.channel_about_view.text_030'), initials: cleanName.slice(0, 1).toUpperCase() || t('screens.channel_about_view.text_030'),
avatar: String(channel?.avaAr || channel?.avaSha256 || '').trim() ? { ar: String(channel.avaAr || '').trim(), sha256Hex: String(channel?.avaSha256 || '').trim() } : null, avatar: String(channel?.avaAr || channel?.avaPr || '').trim() ? { ar: String(channel.avaAr || '').trim(), pr: String(channel?.avaPr || '').trim() } : null,
authorLogin: ownerLogin, authorLogin: ownerLogin,
size: 'xl', size: 'xl',
className: 'channel-about-avatar channel-profile-avatar avatar-plain', className: 'channel-about-avatar channel-profile-avatar avatar-plain',
+10 -10
View File
@@ -95,7 +95,7 @@ function createThreadAvatar(login) {
avatar: snapshot?.avatar?.source avatar: snapshot?.avatar?.source
? { ? {
ar: String(snapshot.avatar.txId || snapshot.avatar.ar || '').trim(), ar: String(snapshot.avatar.txId || snapshot.avatar.ar || '').trim(),
sha256Hex: String(snapshot?.avatar?.sha256Hex || '').trim().toLowerCase(), pr: String(snapshot?.avatar?.pr || '').trim(),
} }
: null, : null,
size: 'sm', size: 'sm',
@@ -747,7 +747,7 @@ function renderNodeCard(node, heading, handlers, localNumber, { focusPost = fals
const title = String(channel.title || author).trim(); const title = String(channel.title || author).trim();
const channelAvatar = renderAvatar({ const channelAvatar = renderAvatar({
initials: (title[0] || t('screens.channel_thread_view.text_083')).toUpperCase(), initials: (title[0] || t('screens.channel_thread_view.text_083')).toUpperCase(),
avatar: (channel.avatarAr || channel.avatarSha256) ? { ar: channel.avatarAr, sha256Hex: channel.avatarSha256 } : null, avatar: (channel.avatarAr || channel.avatarPr) ? { ar: channel.avatarAr, pr: channel.avatarPr } : null,
authorLogin: author, authorLogin: author,
size: 'xl', size: 'xl',
className: 'channel-profile-avatar channel-message-avatar avatar-plain', className: 'channel-profile-avatar channel-message-avatar avatar-plain',
@@ -1565,7 +1565,7 @@ async function loadThreadData(sel, cacheKey, isCurrent) {
const channelSlug = String(sel?.short?.channelName || (resolvedChannelLabel.includes('/') ? resolvedChannelLabel.split('/').slice(1).join('/') : '')).trim(); const channelSlug = String(sel?.short?.channelName || (resolvedChannelLabel.includes('/') ? resolvedChannelLabel.split('/').slice(1).join('/') : '')).trim();
let title = channelTitleByLabel.get(resolvedChannelTitle) || channelSlug || resolvedChannelTitle; let title = channelTitleByLabel.get(resolvedChannelTitle) || channelSlug || resolvedChannelTitle;
let avatarAr = ''; let avatarAr = '';
let avatarSha256 = ''; let avatarPr = '';
// Метаданные канала доступны гостям: заголовок и аватар берём из того же API, что у ленты. // Метаданные канала доступны гостям: заголовок и аватар берём из того же API, что у ленты.
if (sel?.channel?.ownerBlockchainName && sel?.channel?.channelRootBlockNumber != null && Number.isFinite(Number(sel.channel.channelRootBlockNumber))) { if (sel?.channel?.ownerBlockchainName && sel?.channel?.channelRootBlockNumber != null && Number.isFinite(Number(sel.channel.channelRootBlockNumber))) {
try { try {
@@ -1581,13 +1581,13 @@ async function loadThreadData(sel, cacheKey, isCurrent) {
const meta = channelPayload?.channel || {}; const meta = channelPayload?.channel || {};
title = String(meta.displayName || meta.channelName || title).trim(); title = String(meta.displayName || meta.channelName || title).trim();
avatarAr = String(meta.avaAr || '').trim(); avatarAr = String(meta.avaAr || '').trim();
avatarSha256 = String(meta.avaSha256 || '').trim().toLowerCase(); avatarPr = String(meta.avaPr || '').trim();
if (!sel.short && meta.channelName) sel.short = { ownerBlockchainName: sel.channel.ownerBlockchainName, channelName: String(meta.channelName) }; if (!sel.short && meta.channelName) sel.short = { ownerBlockchainName: sel.channel.ownerBlockchainName, channelName: String(meta.channelName) };
} catch { } catch {
// Обсуждение должно открываться даже при временной недоступности метаданных канала. // Обсуждение должно открываться даже при временной недоступности метаданных канала.
} }
} }
return { selector: sel, ordinal, payload, resolvedChannelLabel, title, avatarAr, avatarSha256, channelSlug }; return { selector: sel, ordinal, payload, resolvedChannelLabel, title, avatarAr, avatarPr, channelSlug };
} }
const threadPrefetches = new Map(); const threadPrefetches = new Map();
@@ -1907,7 +1907,7 @@ export function render({ navigate, route, chrome }) {
const paint = (data, restorePosition, seq) => { const paint = (data, restorePosition, seq) => {
selector = data.selector; selector = data.selector;
focusOrdinal = data.ordinal; focusOrdinal = data.ordinal;
const { payload, resolvedChannelLabel, title, avatarAr, avatarSha256, channelSlug } = data; const { payload, resolvedChannelLabel, title, avatarAr, avatarPr, channelSlug } = data;
activeResolvedChannelLabel = resolvedChannelLabel; activeResolvedChannelLabel = resolvedChannelLabel;
const ancestors = Array.isArray(payload?.ancestors) ? payload.ancestors : []; const ancestors = Array.isArray(payload?.ancestors) ? payload.ancestors : [];
const focus = payload?.focus || null; const focus = payload?.focus || null;
@@ -1925,7 +1925,7 @@ export function render({ navigate, route, chrome }) {
threadHeaderButton.querySelector('.channel-thread-header-avatar')?.remove(); threadHeaderButton.querySelector('.channel-thread-header-avatar')?.remove();
const avatar = renderAvatar({ const avatar = renderAvatar({
initials: (title[0] || t('screens.channel_thread_view.text_094')).toUpperCase(), initials: (title[0] || t('screens.channel_thread_view.text_094')).toUpperCase(),
avatar: (avatarAr || avatarSha256) ? { ar: avatarAr, sha256Hex: avatarSha256 } : null, avatar: (avatarAr || avatarPr) ? { ar: avatarAr, pr: avatarPr } : null,
authorLogin: visibleOwner, authorLogin: visibleOwner,
size: 'xl', size: 'xl',
className: 'channel-profile-avatar channel-thread-header-avatar avatar-plain', className: 'channel-profile-avatar channel-thread-header-avatar avatar-plain',
@@ -1993,7 +1993,7 @@ export function render({ navigate, route, chrome }) {
if (isChannelPost) { if (isChannelPost) {
const avatar = renderAvatar({ const avatar = renderAvatar({
initials: (title[0] || t('screens.channel_thread_view.text_095')).toUpperCase(), initials: (title[0] || t('screens.channel_thread_view.text_095')).toUpperCase(),
avatar: (avatarAr || avatarSha256) ? { ar: avatarAr, sha256Hex: avatarSha256 } : null, avatar: (avatarAr || avatarPr) ? { ar: avatarAr, pr: avatarPr } : null,
authorLogin: node?.authorLogin, authorLogin: node?.authorLogin,
size: 'xl', size: 'xl',
className: 'channel-profile-avatar thread-comment__avatar avatar-plain', className: 'channel-profile-avatar thread-comment__avatar avatar-plain',
@@ -2017,7 +2017,7 @@ export function render({ navigate, route, chrome }) {
focusWrap.append(renderNodeCard(focus, '', handlers, focusOrdinal || Number(selector?.message?.blockNumber ?? 0), { focusWrap.append(renderNodeCard(focus, '', handlers, focusOrdinal || Number(selector?.message?.blockNumber ?? 0), {
focusPost: true, focusPost: true,
channelOwnerBlockchainName: selector?.channel?.ownerBlockchainName || '', channelOwnerBlockchainName: selector?.channel?.ownerBlockchainName || '',
channel: { title, avatarAr, avatarSha256 }, channel: { title, avatarAr, avatarPr },
})); }));
screen.append(focusWrap); screen.append(focusWrap);
} }
@@ -2106,7 +2106,7 @@ export function render({ navigate, route, chrome }) {
item.title = title; item.title = title;
item.avatar = renderAvatar({ item.avatar = renderAvatar({
initials: (title[0] || t('screens.channel_thread_view.text_096')).toUpperCase(), initials: (title[0] || t('screens.channel_thread_view.text_096')).toUpperCase(),
avatar: (avatarAr || avatarSha256) ? { ar: avatarAr, sha256Hex: avatarSha256 } : null, avatar: (avatarAr || avatarPr) ? { ar: avatarAr, pr: avatarPr } : null,
authorLogin: item.author, authorLogin: item.author,
size: 'xl', size: 'xl',
className: 'channel-profile-avatar avatar-plain', className: 'channel-profile-avatar avatar-plain',
+11 -11
View File
@@ -129,7 +129,7 @@ function createMessageAvatar(login) {
avatar: snapshot?.avatar?.source avatar: snapshot?.avatar?.source
? { ? {
ar: String(snapshot.avatar.txId || snapshot.avatar.ar || '').trim(), ar: String(snapshot.avatar.txId || snapshot.avatar.ar || '').trim(),
sha256Hex: String(snapshot?.avatar?.sha256Hex || '').trim().toLowerCase(), pr: String(snapshot?.avatar?.pr || '').trim(),
} }
: null, : null,
size: 'sm', size: 'sm',
@@ -644,11 +644,11 @@ function getStatusActionOptionsForTarget(targetMsgSubType) {
function createChannelAvatarElement(channel, size = 96) { function createChannelAvatarElement(channel, size = 96) {
const txId = String(channel?.avaAr || '').trim(); const txId = String(channel?.avaAr || '').trim();
const sha256 = String(channel?.avaSha256 || '').trim().toLowerCase(); const pr = String(channel?.avaPr || '').trim();
const title = String(channel?.displayTitle || channel?.name || t('screens.channel_view.text_111')).trim() || t('screens.channel_view.text_112'); const title = String(channel?.displayTitle || channel?.name || t('screens.channel_view.text_111')).trim() || t('screens.channel_view.text_112');
const wrap = renderAvatar({ const wrap = renderAvatar({
initials: title.slice(0, 1).toUpperCase() || t('screens.channel_view.text_113'), initials: title.slice(0, 1).toUpperCase() || t('screens.channel_view.text_113'),
avatar: (txId || sha256) ? { ar: txId, sha256Hex: sha256 } : null, avatar: (txId || pr) ? { ar: txId, pr: pr } : null,
authorLogin: String(channel?.ownerLogin || channel?.ownerName || extractLoginFromBlockchainName(channel?.ownerBlockchainName) || '').trim(), authorLogin: String(channel?.ownerLogin || channel?.ownerName || extractLoginFromBlockchainName(channel?.ownerBlockchainName) || '').trim(),
size: 'xl', size: 'xl',
className: 'channel-profile-avatar avatar-plain', className: 'channel-profile-avatar avatar-plain',
@@ -717,10 +717,10 @@ function openAboutChannelModal(channel, options = {}) {
function openEditChannelModal({ channel, onSave }) { function openEditChannelModal({ channel, onSave }) {
const root = document.getElementById('modal-root'); const root = document.getElementById('modal-root');
let selectedAvatar = channel?.avaSha256 ? { let selectedAvatar = channel?.avaPr ? {
name: t('dialogs.remaining.pages.channel_view.openeditchannelmodal.avatar'), name: t('dialogs.remaining.pages.channel_view.openeditchannelmodal.avatar'),
ar: String(channel.avaAr || ''), ar: String(channel.avaAr || ''),
sha256: channel.avaSha256, pr: channel.avaPr,
size: channel.avaSize, size: channel.avaSize,
purpose: 'avatar', purpose: 'avatar',
} : null; } : null;
@@ -732,7 +732,7 @@ function openEditChannelModal({ channel, onSave }) {
slot.append(createChannelAvatarElement({ slot.append(createChannelAvatarElement({
...channel, ...channel,
avaAr: selectedAvatar?.ar || '', avaAr: selectedAvatar?.ar || '',
avaSha256: selectedAvatar?.sha256 || '', avaPr: selectedAvatar?.pr || '',
avaSize: selectedAvatar?.size || 0, avaSize: selectedAvatar?.size || 0,
displayTitle: root.querySelector('#edit-channel-title')?.value || channel.displayTitle, displayTitle: root.querySelector('#edit-channel-title')?.value || channel.displayTitle,
}, 86)); }, 86));
@@ -1382,7 +1382,7 @@ async function loadFromApi(route, channelId) {
displayName: t('screens.channel_view.text_093'), displayName: t('screens.channel_view.text_093'),
description: String(diaryPayload?.channel?.channelDescription || '').trim(), description: String(diaryPayload?.channel?.channelDescription || '').trim(),
avaAr: '', avaAr: '',
avaSha256: '', avaPr: '',
avaSize: 0, avaSize: 0,
metaUpdatedAtMs: 0, metaUpdatedAtMs: 0,
ownerName: currentSessionLogin, ownerName: currentSessionLogin,
@@ -1566,7 +1566,7 @@ async function loadFromApi(route, channelId) {
displayName: `${ownerLogin || t('screens.channel_view.text_123')}/${payload.channel?.channelName || t('screens.channel_view.text_124')}`, displayName: `${ownerLogin || t('screens.channel_view.text_123')}/${payload.channel?.channelName || t('screens.channel_view.text_124')}`,
description: String(payload.channel?.channelDescription || '').trim(), description: String(payload.channel?.channelDescription || '').trim(),
avaAr: String(payload.channel?.avaAr || '').trim(), avaAr: String(payload.channel?.avaAr || '').trim(),
avaSha256: String(payload.channel?.avaSha256 || '').trim(), avaPr: String(payload.channel?.avaPr || '').trim(),
avaSize: Number(payload.channel?.avaSize || 0), avaSize: Number(payload.channel?.avaSize || 0),
metaUpdatedAtMs: Number(payload.channel?.metaUpdatedAtMs || 0), metaUpdatedAtMs: Number(payload.channel?.metaUpdatedAtMs || 0),
subscribersCount: Number(payload.channel?.subscribersCount || 0), subscribersCount: Number(payload.channel?.subscribersCount || 0),
@@ -1651,7 +1651,7 @@ function applyPendingScroll(screen, routeKey, forceBottom = false) {
} }
function mapChannelMetaEvent(event, fallbackChannel) { function mapChannelMetaEvent(event, fallbackChannel) {
const hasEventAvatar = Boolean(String(event?.avaAr || event?.avaSha256 || '').trim()); const hasEventAvatar = Boolean(String(event?.avaAr || event?.avaPr || '').trim());
return { return {
kind: String(event?.kind || '').trim(), kind: String(event?.kind || '').trim(),
messageRef: event?.messageRef || null, messageRef: event?.messageRef || null,
@@ -1661,7 +1661,7 @@ function mapChannelMetaEvent(event, fallbackChannel) {
// Событие создания хранит снимок на момент создания и часто ещё без аватара. // Событие создания хранит снимок на момент создания и часто ещё без аватара.
// Показываем актуальную фотографию канала, если у события нет своей. // Показываем актуальную фотографию канала, если у события нет своей.
avaAr: String((hasEventAvatar ? event?.avaAr : fallbackChannel?.avaAr) || '').trim(), avaAr: String((hasEventAvatar ? event?.avaAr : fallbackChannel?.avaAr) || '').trim(),
avaSha256: String((hasEventAvatar ? event?.avaSha256 : fallbackChannel?.avaSha256) || '').trim(), avaPr: String((hasEventAvatar ? event?.avaPr : fallbackChannel?.avaPr) || '').trim(),
avaSize: Number((hasEventAvatar ? event?.avaSize : fallbackChannel?.avaSize) || 0), avaSize: Number((hasEventAvatar ? event?.avaSize : fallbackChannel?.avaSize) || 0),
ownerLogin: String(fallbackChannel?.ownerLogin || fallbackChannel?.ownerName || '').trim(), ownerLogin: String(fallbackChannel?.ownerLogin || fallbackChannel?.ownerName || '').trim(),
ownerName: fallbackChannel?.ownerName || '', ownerName: fallbackChannel?.ownerName || '',
@@ -1693,7 +1693,7 @@ function renderChannelMetaEventCard(event, dayLabel = '') {
displayTitle: event.title, displayTitle: event.title,
description: event.description, description: event.description,
avaAr: event.avaAr, avaAr: event.avaAr,
avaSha256: event.avaSha256, avaPr: event.avaPr,
avaSize: event.avaSize, avaSize: event.avaSize,
ownerName: event.ownerName, ownerName: event.ownerName,
}, },
+3 -3
View File
@@ -128,7 +128,7 @@ function avatarLetterFromName(name = '') {
function createChannelAvatar(channel = {}) { function createChannelAvatar(channel = {}) {
return renderAvatar({ return renderAvatar({
initials: channel.avatar || channel.initials || avatarLetterFromName(channel.displayTitle || channel.title || channel.name), initials: channel.avatar || channel.initials || avatarLetterFromName(channel.displayTitle || channel.title || channel.name),
avatar: (channel.avaAr || channel.avaSha256) ? { ar: String(channel.avaAr || '').trim(), sha256Hex: String(channel.avaSha256 || '').trim().toLowerCase() } : null, avatar: (channel.avaAr || channel.avaPr) ? { ar: String(channel.avaAr || '').trim(), pr: String(channel.avaPr || '').trim() } : null,
authorLogin: String(channel.ownerName || channel.ownerLogin || '').trim(), authorLogin: String(channel.ownerName || channel.ownerLogin || '').trim(),
size: 'lg', size: 'lg',
className: 'avatar-plain', className: 'avatar-plain',
@@ -575,7 +575,7 @@ function mapApiChannelRow(summary, bucketKey, idx, index, notificationsState) {
channelRootBlockHash: normalizeHash(summary?.channel?.channelRoot?.blockHash), channelRootBlockHash: normalizeHash(summary?.channel?.channelRoot?.blockHash),
avatar: avatarLetterFromName(displayTitle || channelName), avatar: avatarLetterFromName(displayTitle || channelName),
avaAr: String(summary?.channel?.avaAr || '').trim(), avaAr: String(summary?.channel?.avaAr || '').trim(),
avaSha256: String(summary?.channel?.avaSha256 || '').trim().toLowerCase(), avaPr: String(summary?.channel?.avaPr || '').trim(),
title, title,
technicalLabel, technicalLabel,
channelName, channelName,
@@ -615,7 +615,7 @@ function mapDeletedOwnedChannels(payload, notificationsState = {}) {
channelRootBlockHash: normalizeHash(item?.rootBlockHashHex), channelRootBlockHash: normalizeHash(item?.rootBlockHashHex),
avatar: avatarLetterFromName(displayTitle), avatar: avatarLetterFromName(displayTitle),
avaAr: String(item?.avatarAr || '').trim(), avaAr: String(item?.avatarAr || '').trim(),
avaSha256: String(item?.avatarSha256 || '').trim().toLowerCase(), avaPr: String(item?.avatarPr || '').trim(),
title: displayTitle, title: displayTitle,
technicalLabel: formatChannelAddress({ ownerLogin, channelName }), technicalLabel: formatChannelAddress({ ownerLogin, channelName }),
channelName, channelName,
+2 -2
View File
@@ -154,10 +154,10 @@ function createChatHeaderParts(login, navigate) {
login: cleanLogin, login: cleanLogin,
firstName, firstName,
lastName, lastName,
avatar: (currentPeer?.avatar?.ar || currentPeer?.avatar?.sha256Hex) avatar: (currentPeer?.avatar?.ar || currentPeer?.avatar?.pr)
? { ? {
ar: String(currentPeer.avatar.ar || '').trim(), ar: String(currentPeer.avatar.ar || '').trim(),
sha256Hex: String(currentPeer.avatar.sha256Hex || '').trim().toLowerCase(), pr: String(currentPeer.avatar.pr || '').trim(),
} }
: null, : null,
size: 'md', size: 'md',
+2 -2
View File
@@ -58,7 +58,7 @@ export function render({ navigate, chrome }) {
name: displayName(person), name: displayName(person),
firstName: person.firstName, firstName: person.firstName,
lastName: person.lastName, lastName: person.lastName,
avatar: person.avatar || (person.avatarAr ? { ar: person.avatarAr } : null), avatar: person.avatar || ((person.avatarAr || person.avatarPr) ? { ar: person.avatarAr, pr: person.avatarPr } : null),
ring: person.relationFlag === 'close_friend' ? 'close' : '', ring: person.relationFlag === 'close_friend' ? 'close' : '',
sub, sub,
onClick: () => openChat(person.login), onClick: () => openChat(person.login),
@@ -93,7 +93,7 @@ export function render({ navigate, chrome }) {
frag.append(note); frag.append(note);
} else { } else {
others.forEach((user) => { others.forEach((user) => {
const person = { login: String(user.login || ''), displayName: user.displayName, avatarAr: user.avatarAr }; const person = { login: String(user.login || ''), displayName: user.displayName, avatarAr: user.avatarAr, avatarPr: user.avatarPr };
frag.append(personRow(person, displayName(person) !== person.login ? `${person.login}` : '')); frag.append(personRow(person, displayName(person) !== person.login ? `${person.login}` : ''));
}); });
} }
+3 -3
View File
@@ -73,12 +73,12 @@ function createDmAvatar(login, { className = '', avatar = null, firstName = '',
login: cleanLogin || 'unknown', login: cleanLogin || 'unknown',
firstName: String(firstName || '').trim(), firstName: String(firstName || '').trim(),
lastName: String(lastName || '').trim(), lastName: String(lastName || '').trim(),
avatar: (avatar?.ar || avatar?.sha256Hex) ? { ar: String(avatar?.ar || '').trim(), sha256Hex: String(avatar?.sha256Hex || '').trim().toLowerCase() } : null, avatar: (avatar?.ar || avatar?.pr) ? { ar: String(avatar?.ar || '').trim(), pr: String(avatar?.pr || '').trim() } : null,
size: 'lg', size: 'lg',
title, title,
className, className,
}); });
if (!cleanLogin || avatar?.ar || avatar?.sha256Hex) return avatarEl; if (!cleanLogin || avatar?.ar || avatar?.pr) return avatarEl;
const upgrade = () => loadDmAvatarSnapshot(cleanLogin).then((snapshot) => { const upgrade = () => loadDmAvatarSnapshot(cleanLogin).then((snapshot) => {
// Фото нет – оставляем инициалы имени как есть (раньше подменялись на букву логина). // Фото нет – оставляем инициалы имени как есть (раньше подменялись на букву логина).
if (!avatarEl.isConnected || !snapshot?.avatar?.source) return; if (!avatarEl.isConnected || !snapshot?.avatar?.source) return;
@@ -89,7 +89,7 @@ function createDmAvatar(login, { className = '', avatar = null, firstName = '',
avatar: snapshot?.avatar?.source avatar: snapshot?.avatar?.source
? { ? {
ar: String(snapshot.avatar.txId || snapshot.avatar.ar || '').trim(), ar: String(snapshot.avatar.txId || snapshot.avatar.ar || '').trim(),
sha256Hex: String(snapshot?.avatar?.sha256Hex || '').trim().toLowerCase(), pr: String(snapshot?.avatar?.pr || '').trim(),
} }
: null, : null,
size: 'lg', size: 'lg',
+1 -1
View File
@@ -239,7 +239,7 @@ function describeEntry(item, inspection, channelNames) {
const channelName = channelNameText(body.line?.lineCode, channelNames); const channelName = channelNameText(body.line?.lineCode, channelNames);
const title = String(body.channelMeta?.title || '').trim(); const title = String(body.channelMeta?.title || '').trim();
const description = previewText(body.channelMeta?.description || ''); const description = previewText(body.channelMeta?.description || '');
const changed = [title ? t('screens.my_blockchain_view.text_095', { value1: title }) : '', body.channelMeta?.avatarAr ? t('screens.my_blockchain_view.text_054') : '', description ? t('screens.my_blockchain_view.text_096', { value1: description }) : ''].filter(Boolean).join(' · '); const changed = [title ? t('screens.my_blockchain_view.text_095', { value1: title }) : '', (body.channelMeta?.avatarAr || body.channelMeta?.avatarPr) ? t('screens.my_blockchain_view.text_054') : '', description ? t('screens.my_blockchain_view.text_096', { value1: description }) : ''].filter(Boolean).join(' · ');
return { return {
title: t('screens.my_blockchain_view.text_097', { value1: channelName ? ` ${channelName}` : '', value2: changed ? ` · ${changed}` : '' }), title: t('screens.my_blockchain_view.text_097', { value1: channelName ? ` ${channelName}` : '', value2: changed ? ` · ${changed}` : '' }),
detailTitle: t('screens.my_blockchain_view.text_098', { value1: channelName ? ` ${channelName}` : '' }), detailTitle: t('screens.my_blockchain_view.text_098', { value1: channelName ? ` ${channelName}` : '' }),
@@ -9,8 +9,8 @@ const isFriend = (type) => type === 'friend' || type === 'close_friend';
function decorate(row, fallback) { function decorate(row, fallback) {
const login = String(row?.login || fallback || '').trim(); const login = String(row?.login || fallback || '').trim();
const avatar = row?.avatar?.ar || row?.avatar?.sha256Hex const avatar = row?.avatar?.ar || row?.avatar?.pr
? { ar: String(row.avatar.ar || ''), sha256Hex: String(row.avatar.sha256Hex || row.avatar.sha256 || '') } ? { ar: String(row.avatar.ar || ''), pr: String(row.avatar.pr || row.avatar.pr || '') }
: (row?.avatarTxId ? { ar: String(row.avatarTxId) } : null); : (row?.avatarTxId ? { ar: String(row.avatarTxId) } : null);
return { return {
login, login,
@@ -18,7 +18,7 @@ import { t } from '../../i18n/index.js';
import { renderUserAvatar, buildAvatarInitials } from '../../components/avatar-image.js'; import { renderUserAvatar, buildAvatarInitials } from '../../components/avatar-image.js';
import { state } from '../../state.js'; import { state } from '../../state.js';
import { buildArweaveDataUrl } from '../../services/arweave-file-service.js'; import { buildArweaveDataUrl } from '../../services/arweave-file-service.js';
import { resolvePublicFileUrl } from '../../services/public-file-service.js'; import { avatarR2Url } from '../../services/public-file-service.js';
const SVGNS = 'http://www.w3.org/2000/svg'; const SVGNS = 'http://www.w3.org/2000/svg';
@@ -154,16 +154,11 @@ async function resolveServerAvatarPhotoSrc(src) {
const rawAvatar = src?.avatar; const rawAvatar = src?.avatar;
if (!rawAvatar || typeof rawAvatar === 'string') return ''; if (!rawAvatar || typeof rawAvatar === 'string') return '';
const txId = String(rawAvatar?.ar || '').trim(); const txId = String(rawAvatar?.ar || '').trim();
const sha256 = String(rawAvatar?.sha256Hex || rawAvatar?.sha256 || '').trim().toLowerCase(); const pr = String(rawAvatar?.pr || '').trim();
const authorLogin = String(src?.login || src?.id || '').trim(); const authorLogin = String(src?.login || src?.id || '').trim();
if (txId || !sha256 || !authorLogin) return ''; if (txId || !pr || !authorLogin) return '';
try { try {
return await resolvePublicFileUrl({ return avatarR2Url(pr);
sha256,
authorLogin,
solanaEndpoint: state?.entrySettings?.solanaServer,
fallbackServerLogin: state?.entrySettings?.shineServerLogin,
});
} catch { } catch {
return ''; return '';
} }
@@ -658,7 +653,7 @@ export function createForceGraph({ stage, model, onCenterTap, onNodeTap, onNodeL
// Единый PNG-оверлей на ВСЕХ полных орбах (фокус + спутники). tier-3 точки (dotOnly) сюда не идут. // Единый PNG-оверлей на ВСЕХ полных орбах (фокус + спутники). tier-3 точки (dotOnly) сюда не идут.
const orb = buildPngOrb(photoSrc, { isFocus, initials }); const orb = buildPngOrb(photoSrc, { isFocus, initials });
dot.appendChild(orb); dot.appendChild(orb);
if (!photoSrc && src?.avatar && typeof src.avatar === 'object' && !String(src.avatar.ar || '').trim() && String(src.avatar.sha256Hex || src.avatar.sha256 || '').trim()) { if (!photoSrc && src?.avatar && typeof src.avatar === 'object' && !String(src.avatar.ar || '').trim() && String(src.avatar.pr || src.avatar.pr || '').trim()) {
void resolveServerAvatarPhotoSrc(src).then((url) => { void resolveServerAvatarPhotoSrc(src).then((url) => {
if (!url || !orb.isConnected) return; if (!url || !orb.isConnected) return;
const currentPhoto = orb.querySelector('.fg-pngorb-photo'); const currentPhoto = orb.querySelector('.fg-pngorb-photo');
@@ -110,8 +110,8 @@ function getMarkByLogin(allUsers) {
function normalizeAvatar(row) { function normalizeAvatar(row) {
const txFromAvatar = String(row?.avatar?.ar || '').trim(); const txFromAvatar = String(row?.avatar?.ar || '').trim();
const shaFromAvatar = String(row?.avatar?.sha256Hex || row?.avatar?.sha256 || '').trim().toLowerCase(); const prFromAvatar = String(row?.avatar?.pr || '').trim();
if (txFromAvatar || shaFromAvatar) return { ar: txFromAvatar, sha256Hex: shaFromAvatar }; if (txFromAvatar || prFromAvatar) return { ar: txFromAvatar, pr: prFromAvatar };
const txFallback = String(row?.avatarTxId || '').trim(); const txFallback = String(row?.avatarTxId || '').trim();
if (txFallback) return { ar: txFallback }; if (txFallback) return { ar: txFallback };
return null; return null;
+3 -3
View File
@@ -109,8 +109,8 @@ function getMarkByLogin(allUsers) {
function normalizeAvatar(row) { function normalizeAvatar(row) {
const txFromAvatar = String(row?.avatar?.ar || '').trim(); const txFromAvatar = String(row?.avatar?.ar || '').trim();
const shaFromAvatar = String(row?.avatar?.sha256Hex || row?.avatar?.sha256 || '').trim().toLowerCase(); const prFromAvatar = String(row?.avatar?.pr || '').trim();
if (txFromAvatar || shaFromAvatar) return { ar: txFromAvatar, sha256Hex: shaFromAvatar }; if (txFromAvatar || prFromAvatar) return { ar: txFromAvatar, pr: prFromAvatar };
const txFallback = String(row?.avatarTxId || '').trim(); const txFallback = String(row?.avatarTxId || '').trim();
if (txFallback) return { ar: txFallback }; if (txFallback) return { ar: txFallback };
return null; return null;
@@ -2252,7 +2252,7 @@ export function render({ navigate, route, chrome } = {}) {
target.append(createPersonRow({ target.append(createPersonRow({
login, login,
name: name || login, name: name || login,
avatar: user.avatarAr ? { ar: user.avatarAr } : null, avatar: (user.avatarAr || user.avatarPr) ? { ar: user.avatarAr, pr: user.avatarPr } : null,
sub: name && normKey(name) !== normKey(login) ? t('screens.network_view.text_174', { value1: login }) : t('screens.network_view.text_144'), sub: name && normKey(name) !== normKey(login) ? t('screens.network_view.text_174', { value1: login }) : t('screens.network_view.text_144'),
onClick: () => recenter(login), onClick: () => recenter(login),
actions: [{ icon: 'profile', label: t('screens.network_view.text_055'), onClick: () => { closeSearch(); navigate(profileRoute(login)); } }], actions: [{ icon: 'profile', label: t('screens.network_view.text_055'), onClick: () => { closeSearch(); navigate(profileRoute(login)); } }],
+4 -9
View File
@@ -30,7 +30,7 @@ import { t } from '../../i18n/index.js';
import { buildAvatarInitials } from '../../components/avatar-image.js'; import { buildAvatarInitials } from '../../components/avatar-image.js';
import { state } from '../../state.js'; import { state } from '../../state.js';
import { buildArweaveDataUrl } from '../../services/arweave-file-service.js'; import { buildArweaveDataUrl } from '../../services/arweave-file-service.js';
import { resolvePublicFileUrl } from '../../services/public-file-service.js'; import { avatarR2Url } from '../../services/public-file-service.js';
import { ISLAND_COLORS, layoutIslands, tieWeight } from './communities.js'; import { ISLAND_COLORS, layoutIslands, tieWeight } from './communities.js';
const NODE_R = { focus: 30, 1: 22, 2: 15, 3: 11 }; const NODE_R = { focus: 30, 1: 22, 2: 15, 3: 11 };
@@ -629,16 +629,11 @@ function avatarUrlSync(node) {
async function avatarUrlFromServer(node) { async function avatarUrlFromServer(node) {
const raw = node?.avatar; const raw = node?.avatar;
if (!raw || typeof raw !== 'object') return ''; if (!raw || typeof raw !== 'object') return '';
const sha256 = String(raw.sha256Hex || raw.sha256 || '').trim().toLowerCase(); const pr = String(raw.pr || '').trim();
const authorLogin = String(node?.login || node?.id || '').trim(); const authorLogin = String(node?.login || node?.id || '').trim();
if (String(raw.ar || '').trim() || !sha256 || !authorLogin) return ''; if (String(raw.ar || '').trim() || !pr || !authorLogin) return '';
try { try {
return await resolvePublicFileUrl({ return avatarR2Url(pr);
sha256,
authorLogin,
solanaEndpoint: state?.entrySettings?.solanaServer,
fallbackServerLogin: state?.entrySettings?.shineServerLogin,
});
} catch { } catch {
return ''; return '';
} }
+2 -2
View File
@@ -169,10 +169,10 @@ function renderEmpty(activeTab) {
function renderAvatar(item) { function renderAvatar(item) {
const profile = item.profile; const profile = item.profile;
const avatar = (profile?.avatar?.txId || profile?.avatar?.sha256Hex) const avatar = (profile?.avatar?.txId || profile?.avatar?.pr)
? { ? {
ar: String(profile.avatar.txId || profile.avatar.ar || '').trim(), ar: String(profile.avatar.txId || profile.avatar.ar || '').trim(),
sha256Hex: String(profile.avatar.sha256Hex || '').trim().toLowerCase(), pr: String(profile.avatar.pr || '').trim(),
} }
: null; : null;
return renderUserAvatar({ return renderUserAvatar({
+4 -4
View File
@@ -141,7 +141,7 @@ export function render({ navigate, chrome }) {
let currentShineStatus = ''; let currentShineStatus = '';
let currentGender = PROFILE_GENDER_UNKNOWN; let currentGender = PROFILE_GENDER_UNKNOWN;
let statusFlowOpen = false; let statusFlowOpen = false;
let currentAvatar = { value: '', source: '', txId: '', sha256Hex: '', timeMs: 0 }; let currentAvatar = { value: '', source: '', txId: '', pr: '', timeMs: 0 };
const identityEl = topRow.querySelector('[data-profile-identity="true"]'); const identityEl = topRow.querySelector('[data-profile-identity="true"]');
const avatarSlotEl = topRow.querySelector('[data-profile-avatar-slot="true"]'); const avatarSlotEl = topRow.querySelector('[data-profile-avatar-slot="true"]');
@@ -217,8 +217,8 @@ export function render({ navigate, chrome }) {
login, login,
firstName, firstName,
lastName, lastName,
avatar: (currentAvatar?.txId || currentAvatar?.sha256Hex) avatar: (currentAvatar?.txId || currentAvatar?.pr)
? { ar: String(currentAvatar.txId || currentAvatar.ar || '').trim(), sha256Hex: String(currentAvatar?.sha256Hex || '').trim().toLowerCase() } ? { ar: String(currentAvatar.txId || currentAvatar.ar || '').trim(), pr: String(currentAvatar?.pr || '').trim() }
: null, : null,
size: 'xl', size: 'xl',
// Как в карточке профиля: без стеклянного кольца, которое вылезало за край экрана. // Как в карточке профиля: без стеклянного кольца, которое вылезало за край экрана.
@@ -350,7 +350,7 @@ export function render({ navigate, chrome }) {
currentAccountRole = snapshot.accountRole || ''; currentAccountRole = snapshot.accountRole || '';
currentShineStatus = snapshot.shineStatus || ''; currentShineStatus = snapshot.shineStatus || '';
currentGender = snapshot.gender || PROFILE_GENDER_UNKNOWN; currentGender = snapshot.gender || PROFILE_GENDER_UNKNOWN;
currentAvatar = snapshot.avatar || { value: '', source: '', txId: '', sha256Hex: '', timeMs: 0 }; currentAvatar = snapshot.avatar || { value: '', source: '', txId: '', pr: '', timeMs: 0 };
syncIdentity(); syncIdentity();
renderFields(currentFields); renderFields(currentFields);
+3 -3
View File
@@ -24,8 +24,8 @@ function channelRow(item, navigate) {
const slug = String(item.slug || '').trim(); const slug = String(item.slug || '').trim();
row.append(renderAvatar({ row.append(renderAvatar({
initials: Array.from(displayName)[0] || '#', initials: Array.from(displayName)[0] || '#',
avatar: item.avatarAr || item.avatarSha256 avatar: item.avatarAr || item.avatarPr
? { ar: item.avatarAr || '', sha256Hex: item.avatarSha256 || '' } ? { ar: item.avatarAr || '', pr: item.avatarPr || '' }
: null, : null,
authorLogin: ownerLogin, authorLogin: ownerLogin,
size: 'lg', size: 'lg',
@@ -68,7 +68,7 @@ function personRow(person, navigate) {
return createPersonRow({ return createPersonRow({
login, login,
name: displayName || login, name: displayName || login,
avatar: person.avatarAr ? { ar: person.avatarAr } : null, avatar: (person.avatarAr || person.avatarPr) ? { ar: person.avatarAr, pr: person.avatarPr } : null,
sub: displayName && displayName !== login ? login : '', sub: displayName && displayName !== login ? login : '',
onClick: () => navigate(makeProfileRoute(login)), onClick: () => navigate(makeProfileRoute(login)),
actions: [{ icon: 'message', label: t('screens.search_view.text_003'), onClick: () => navigate(`chat/${encodeURIComponent(login)}`) }], actions: [{ icon: 'message', label: t('screens.search_view.text_003'), onClick: () => navigate(`chat/${encodeURIComponent(login)}`) }],
+2 -2
View File
@@ -130,7 +130,7 @@ export function render({ navigate, route, chrome }) {
name, name,
firstName: row.firstName, firstName: row.firstName,
lastName: row.lastName, lastName: row.lastName,
avatar: parseAvatar(row.avatarAr), avatar: (row.avatarAr || row.avatarPr) ? { ar: String(row.avatarAr || '').trim(), pr: String(row.avatarPr || '').trim() } : null,
official: row.accountRole === 'primary', official: row.accountRole === 'primary',
ring: row.shineStatus === 'shining' ? 'shining' : (row.relationType === 'close_friend' ? 'close' : ''), ring: row.shineStatus === 'shining' ? 'shining' : (row.relationType === 'close_friend' ? 'close' : ''),
sub, sub,
@@ -143,7 +143,7 @@ export function render({ navigate, route, chrome }) {
const el = document.createElement('button'); const el = document.createElement('button');
el.type = 'button'; el.type = 'button';
el.className = 'ui-button card row profile-list-row'; el.className = 'ui-button card row profile-list-row';
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' })); el.append(renderUserAvatar({ login: row.ownerLogin, firstName: row.displayName, lastName: '', avatar: (row.avatarAr || row.avatarPr) ? { ar: String(row.avatarAr || ''), pr: String(row.avatarPr || '') } : null, size: 'md' }));
const text = document.createElement('div'); const text = document.createElement('div');
text.className = 'profile-list-row-text'; text.className = 'profile-list-row-text';
const title = document.createElement('b'); const title = document.createElement('b');
@@ -1,10 +1,6 @@
import { t } from '../i18n/index.js'; import { buildArweaveDataUrl, validateArweaveTxId } from './arweave-file-service.js';
import { import { preparePublicFile } from './file-preparation-service.js';
buildArweaveDataUrl, import { validatePublicPiecesRoot } from './public-pieces-root.js';
sha256HexFromArrayBuffer,
validateArweaveTxId,
validateSha256Hex,
} from './arweave-file-service.js';
const DB_NAME = 'shine-ui-avatar-cache'; const DB_NAME = 'shine-ui-avatar-cache';
const DB_VERSION = 1; const DB_VERSION = 1;
@@ -61,12 +57,9 @@ async function putRecord(record) {
}); });
} }
async function verifyBlobSha256(blob, expectedSha256Hex) { async function verifyBlobPr(blob, expectedPr) {
const expected = String(expectedSha256Hex || '').trim().toLowerCase(); if (!validatePublicPiecesRoot(expectedPr) || !(blob instanceof Blob)) return false;
if (!validateSha256Hex(expected)) return true; return (await preparePublicFile(blob)).pr === expectedPr;
if (!(blob instanceof Blob)) return false;
const actual = await sha256HexFromArrayBuffer(await blob.arrayBuffer());
return actual === expected;
} }
async function getAllRecords() { async function getAllRecords() {
@@ -160,62 +153,30 @@ function detectImageMime(bytes) {
return ''; return '';
} }
async function getBlobFromCacheOrGateway({ gateway, txId, expectedSha256Hex = '' }) { async function getBlobFromCacheOrGateway({ gateway, txId, expectedPr }) {
const expected = String(expectedSha256Hex || '').trim().toLowerCase(); if (!validatePublicPiecesRoot(expectedPr)) throw new Error('Некорректный PR аватара');
try { try {
const cached = await getRecord(txId); const cached = await getRecord(txId);
if (cached?.blob instanceof Blob) { if (cached?.blob instanceof Blob) {
if (!validateSha256Hex(expected)) return cached.blob; if (await verifyBlobPr(cached.blob, expectedPr)) return cached.blob;
const cacheSha = String(cached?.sha256Hex || '').trim().toLowerCase();
if (cacheSha && cacheSha === expected) {
return cached.blob;
}
const ok = await verifyBlobSha256(cached.blob, expected);
if (ok) {
return cached.blob;
}
// кэш повреждён или не совпадает с ожидаемым хэшем: удаляем и перекачиваем
await deleteRecords([txId]); await deleteRecords([txId]);
} }
} catch { } catch { /* cache is optional */ }
// ignore IndexedDB errors and fallback to fetch
}
const blob = await fetchAvatarBlob({ gateway, txId }); const blob = await fetchAvatarBlob({ gateway, txId });
if (validateSha256Hex(expected)) { if (!(await verifyBlobPr(blob, expectedPr))) throw new Error('AVATAR_PR_MISMATCH');
const ok = await verifyBlobSha256(blob, expected);
if (!ok) {
throw new Error('SHA256_MISMATCH');
}
}
const computedSha256Hex = await sha256HexFromArrayBuffer(await blob.arrayBuffer());
const record = {
txId,
blob,
contentType: String(blob.type || 'application/octet-stream'),
sizeBytes: Number(blob.size || 0),
sha256Hex: computedSha256Hex,
cachedAtMs: Date.now(),
};
try { try {
await putRecord(record); await putRecord({ txId, blob, contentType: String(blob.type || 'application/octet-stream'),
sizeBytes: Number(blob.size || 0), pr: expectedPr, cachedAtMs: Date.now() });
await ensureCacheLimits(); await ensureCacheLimits();
} catch { } catch { /* cache is optional */ }
// ignore cache write errors
}
return blob; return blob;
} }
export async function getCachedAvatarObjectUrl({ gateway, txId, expectedSha256Hex = '' }) { export async function getCachedAvatarObjectUrl({ gateway, txId, expectedPr }) {
const cleanTxId = String(txId || '').trim(); const cleanTxId = String(txId || '').trim();
if (!validateArweaveTxId(cleanTxId)) { if (!validateArweaveTxId(cleanTxId)) throw new Error(t('remaining.avatar_errors.invalid_arweave_transaction_id'));
throw new Error(t('remaining.avatar_errors.invalid_arweave_transaction_id')); const blob = await getBlobFromCacheOrGateway({ gateway, txId: cleanTxId, expectedPr });
}
const blob = await getBlobFromCacheOrGateway({
gateway,
txId: cleanTxId,
expectedSha256Hex,
});
return URL.createObjectURL(blob); return URL.createObjectURL(blob);
} }
+22 -65
View File
@@ -1,86 +1,43 @@
import { validateArweaveTxId, validateSha256Hex } from './arweave-file-service.js'; import { validateArweaveTxId } from './arweave-file-service.js';
import { validatePublicPiecesRoot } from './public-pieces-root.js';
const AVATAR_TAG_RE = /^<(?:SHiNE|S):(ava|avatar);([^>]*)>$/u;
const AVATAR_TAG_RE = /^<S:ava;([^>]*)>$/u;
function parseFields(raw = '') { function parseFields(raw = '') {
const out = {}; const out = {};
String(raw || '').split(';').forEach((part) => { for (const part of String(raw).split(';')) {
const eq = part.indexOf('='); const eq = part.indexOf('=');
if (eq <= 0) return; if (eq > 0) out[part.slice(0, eq).trim()] = part.slice(eq + 1).trim();
const key = part.slice(0, eq).trim(); }
const value = part.slice(eq + 1).trim();
if (key) out[key] = value;
});
return out; return out;
} }
export function buildAvatarReference({ size, sha256, sha256Hex, ar = '' } = {}) { export function buildAvatarReference({ size, pr, ar = '' } = {}) {
const cleanSha = String(sha256 || sha256Hex || '').trim().toLowerCase(); const cleanPr = String(pr || '').trim(); // Base58 is case-sensitive. NEVER lowercase.
const cleanAr = String(ar || '').trim(); const cleanAr = String(ar || '').trim();
const cleanSize = Number(size || 0); const cleanSize = Number(size || 0);
if (!Number.isInteger(cleanSize) || cleanSize <= 0) throw new Error('Некорректный размер аватара.'); if (!Number.isSafeInteger(cleanSize) || cleanSize <= 0) throw new Error('Некорректный размер аватара.');
if (!validateSha256Hex(cleanSha)) throw new Error('Некорректный SHA-256 аватара.'); if (!validatePublicPiecesRoot(cleanPr)) throw new Error('Некорректный PR аватара.');
if (cleanAr && !validateArweaveTxId(cleanAr)) throw new Error('Некорректный Arweave txId аватара.'); if (cleanAr && !validateArweaveTxId(cleanAr)) throw new Error('Некорректный Arweave txId аватара.');
return `<S:ava;v=1;sz=${cleanSize};sha256=${cleanSha}${cleanAr ? `;ar=${cleanAr}` : ''}>`; return `<S:ava;v=2;sz=${cleanSize};pr=${cleanPr}${cleanAr ? `;ar=${cleanAr}` : ''}>`;
} }
export function parseAvatarReference(value) { export function parseAvatarReference(value) {
const raw = String(value || '').trim(); const raw = String(value || '').trim();
if (!raw) return { ok: false, source: '', ar: '', txId: '', sha256Hex: '', size: 0, legacy: false, value: '' }; const invalid = { ok: false, source: '', ar: '', txId: '', pr: '', size: 0, value: raw };
const tag = raw.match(AVATAR_TAG_RE); const tag = raw.match(AVATAR_TAG_RE);
if (tag) { if (!tag) return invalid; // old v1 / SHA256 / hex deliberately not supported.
const fields = parseFields(tag[2]); const fields = parseFields(tag[1]);
const version = String(fields.v || '').trim(); const pr = String(fields.pr || '').trim();
const sha256Hex = String(fields.sha256 || '').trim().toLowerCase(); const ar = String(fields.ar || '').trim();
const ar = String(fields.ar || '').trim(); const size = Number(fields.sz || '');
const size = Number(fields.sz || fields.size || 0); if (fields.v !== '2' || !validatePublicPiecesRoot(pr) || !Number.isSafeInteger(size) || size <= 0) return invalid;
if (version !== '1' || !validateSha256Hex(sha256Hex) || !Number.isInteger(size) || size <= 0) { if (ar && !validateArweaveTxId(ar)) return invalid;
return { ok: false, source: '', ar: '', txId: '', sha256Hex: '', size: 0, legacy: false, value: raw }; return { ok: true, source: ar ? 'arweave' : 'r2', ar, txId: ar, pr, size, value: raw };
}
if (ar && !validateArweaveTxId(ar)) {
return { ok: false, source: '', ar: '', txId: '', sha256Hex: '', size: 0, legacy: false, value: raw };
}
return {
ok: true,
source: ar ? 'arweave' : 'server',
ar,
txId: ar,
sha256Hex,
size,
legacy: false,
value: raw,
};
}
// Legacy USER_PROFILE ava: SHA256:<hash>,AR:<txid> or AR:<txid>.
const arMatch = raw.match(/AR:([A-Za-z0-9_-]{43})/u);
const shaMatch = raw.match(/SHA256:([A-Fa-f0-9]{64})/u);
const ar = String(arMatch?.[1] || '').trim();
const sha256Hex = String(shaMatch?.[1] || '').trim().toLowerCase();
if (validateArweaveTxId(ar)) {
return {
ok: true,
source: 'arweave',
ar,
txId: ar,
sha256Hex: validateSha256Hex(sha256Hex) ? sha256Hex : '',
size: 0,
legacy: true,
value: raw,
};
}
return { ok: false, source: '', ar: '', txId: '', sha256Hex: '', size: 0, legacy: false, value: raw };
} }
export function avatarReferenceToRenderModel(value) { export function avatarReferenceToRenderModel(value) {
const parsed = typeof value === 'string' ? parseAvatarReference(value) : value; const parsed = typeof value === 'string' ? parseAvatarReference(value) : value;
if (!parsed?.ok) return null; if (!parsed?.ok) return null;
return { return { ar: String(parsed.ar || parsed.txId || '').trim(), pr: String(parsed.pr || '').trim(),
ar: String(parsed.ar || parsed.txId || '').trim(), size: Number(parsed.size || 0), source: String(parsed.source || '') };
sha256Hex: String(parsed.sha256Hex || '').trim().toLowerCase(),
size: Number(parsed.size || 0),
source: String(parsed.source || ''),
};
} }
@@ -91,6 +91,7 @@ function parseChannelMetaText(rawText) {
const rows = String(rawText || '').replace(/\r\n/g, '\n').replace(/\r/g, '\n').split('\n'); const rows = String(rawText || '').replace(/\r\n/g, '\n').replace(/\r/g, '\n').split('\n');
let title = ''; let title = '';
let avatarAr = ''; let avatarAr = '';
let avatarPr = '';
const descriptionRows = []; const descriptionRows = [];
for (const row of rows) { for (const row of rows) {
const titleMatch = row.match(/^<S:title;v=1;([^>]*)>$/u); const titleMatch = row.match(/^<S:title;v=1;([^>]*)>$/u);
@@ -98,10 +99,12 @@ function parseChannelMetaText(rawText) {
title = String(titleMatch[1] || '').trim(); title = String(titleMatch[1] || '').trim();
continue; continue;
} }
const avatarMatch = row.match(/^<S:ava;v=1;([^>]*)>$/u); const avatarMatch = row.match(/^<S:ava;v=2;([^>]*)>$/u);
if (avatarMatch) { if (avatarMatch) {
const arMatch = String(avatarMatch[1] || '').match(/(?:^|;)ar=([A-Za-z0-9_-]{43})(?:;|$)/u); const arMatch = String(avatarMatch[1] || '').match(/(?:^|;)ar=([A-Za-z0-9_-]{43})(?:;|$)/u);
avatarAr = String(arMatch?.[1] || '').trim(); avatarAr = String(arMatch?.[1] || '').trim();
const prMatch = String(avatarMatch[1] || '').match(/(?:^|;)pr=([1-9A-HJ-NP-Za-km-z]{32,44})(?:;|$)/u);
avatarPr = String(prMatch?.[1] || '').trim();
continue; continue;
} }
descriptionRows.push(row); descriptionRows.push(row);
@@ -109,6 +112,7 @@ function parseChannelMetaText(rawText) {
return { return {
title, title,
avatarAr, avatarAr,
avatarPr,
description: descriptionRows.join('\n').trim(), description: descriptionRows.join('\n').trim(),
}; };
} }
+2 -2
View File
@@ -111,7 +111,7 @@ async function loadAvatarSnapshot(login) {
} }
function renderPeerAvatar(login, avatar = null) { function renderPeerAvatar(login, avatar = null) {
const hasAvatar = Boolean(String(avatar?.ar || '').trim() || String(avatar?.sha256Hex || '').trim()); const hasAvatar = Boolean(String(avatar?.ar || '').trim() || String(avatar?.pr || '').trim());
const avatarEl = renderUserAvatar({ const avatarEl = renderUserAvatar({
login: String(login || '').trim() || 'unknown', login: String(login || '').trim() || 'unknown',
avatar, avatar,
@@ -141,7 +141,7 @@ function updatePeerAvatar(login) {
const avatar = snapshot?.avatar?.source const avatar = snapshot?.avatar?.source
? { ? {
ar: String(snapshot.avatar.txId || snapshot.avatar.ar || '').trim(), ar: String(snapshot.avatar.txId || snapshot.avatar.ar || '').trim(),
sha256Hex: String(snapshot.avatar.sha256Hex || '').trim().toLowerCase(), pr: String(snapshot.avatar.pr || '').trim(),
} }
: null; : null;
const upgraded = renderPeerAvatar(cleanLogin, avatar); const upgraded = renderPeerAvatar(cleanLogin, avatar);
+10 -78
View File
@@ -2,7 +2,7 @@ import { t } from '../i18n/index.js';
import { preparePublicFile, R2_MAX_FILE_BYTES } from './file-preparation-service.js'; import { preparePublicFile, R2_MAX_FILE_BYTES } from './file-preparation-service.js';
import { validatePublicPiecesRoot } from './public-pieces-root.js'; import { validatePublicPiecesRoot } from './public-pieces-root.js';
import { importPkcs8Ed25519, signBase64 } from './crypto-utils.js'; import { importPkcs8Ed25519, signBase64 } from './crypto-utils.js';
import { sha256HexFromArrayBuffer, validateSha256Hex } from './arweave-file-service.js'; import { validateSha256Hex } from './arweave-file-service.js';
import { loadSessionMaterial } from './key-vault.js'; import { loadSessionMaterial } from './key-vault.js';
import { import {
DEFAULT_SHINE_SERVER_HTTP, DEFAULT_SHINE_SERVER_HTTP,
@@ -75,86 +75,18 @@ async function createUploadContext({ login, sessionId, wsUrl }) {
}; };
} }
/** Avatars share the same PR/Base58 R2 namespace and upload protocol as other public files. */
export async function uploadPublicFile({ file, login, sessionId, wsUrl, onStatus = null, purpose = 'attachment' } = {}) { export async function uploadPublicFile({ file, login, sessionId, wsUrl, onStatus = null, purpose = 'attachment' } = {}) {
if (purpose !== 'avatar') return uploadR2PublicFile({ file, login, sessionId, wsUrl, onStatus }); if (purpose === 'avatar' && (!(file instanceof Blob) || !file.size || file.size > 10 * 1024 * 1024
if (!(file instanceof File)) throw new Error(t('remaining.file_upload.no_file_selected')); || !['image/webp', 'image/jpeg'].includes(file.type))) {
if (Number(file.size || 0) <= 0) throw new Error(t('remaining.file_upload.cannot_upload_an_empty_file')); throw new Error('Аватар должен быть оптимизированным WebP/JPEG размером до 10 МиБ');
onStatus?.(t('remaining.file_upload.calculating_sha_256'));
const bytes = await file.arrayBuffer();
const sha256 = await sha256HexFromArrayBuffer(bytes);
const context = await createUploadContext({ login, sessionId, wsUrl });
const url = publicFileUrl(context.serverBase, sha256);
onStatus?.(t('remaining.file_upload.checking_whether_the_file_is_on_the_server'));
try {
const existing = await fetch(url, { method: 'HEAD', cache: 'no-store' });
if (existing.ok) {
const storedSize = Number(existing.headers.get('Content-Length') || -1);
if (storedSize < 0 || storedSize === file.size) {
return {
v: 1,
name: String(file.name || 'file'),
size: Number(file.size),
sha256,
ar: '',
uploadedAtMs: Date.now(),
alreadyExists: true,
};
}
}
} catch {
// HEAD — только оптимизация. PUT сам проверит hash и дедупликацию.
} }
return uploadR2PublicFile({ file, login, sessionId, wsUrl, onStatus });
}
const timeMs = Date.now(); /** Canonical public object URL; avatars do not have a special prefix. */
const signature = await signBase64(context.privateKey, uploadPreimage({ export function avatarR2Url(pr) {
sessionId: context.sessionId, return publicR2Url(pr);
sha256,
size: file.size,
timeMs,
}));
onStatus?.(t('remaining.file_upload.uploading_to_access_server'));
let response;
try {
response = await fetch(url, {
method: 'PUT',
headers: {
'Content-Type': 'application/octet-stream',
'X-Shine-Session-Id': context.sessionId,
'X-Shine-Time-Ms': String(timeMs),
'X-Shine-Content-Length': String(file.size),
'X-Shine-Signature': signature,
},
body: bytes,
cache: 'no-store',
});
} catch (error) {
throw new Error(`Не удалось загрузить файл на сервер доступа: ${error?.message || 'network error'}`);
}
if (!response.ok) {
const detail = await readErrorMessage(response);
throw new Error(detail || `Сервер отклонил файл (HTTP ${response.status}).`);
}
let alreadyExists = false;
try {
const payload = await response.clone().json();
alreadyExists = Boolean(payload?.alreadyExists);
} catch {
// Успешного HTTP достаточно.
}
return {
v: 1,
name: String(file.name || 'file'),
size: Number(file.size),
sha256,
ar: '',
uploadedAtMs: Date.now(),
alreadyExists,
};
} }
export async function resolvePublicFileUrl({ export async function resolvePublicFileUrl({
+1 -1
View File
@@ -277,7 +277,7 @@ export async function loadUserProfileCard(login) {
avatar: snapshot?.avatar?.source avatar: snapshot?.avatar?.source
? { ? {
ar: String(snapshot.avatar.txId || snapshot.avatar.ar || '').trim(), ar: String(snapshot.avatar.txId || snapshot.avatar.ar || '').trim(),
sha256Hex: String(snapshot?.avatar?.sha256Hex || '').trim().toLowerCase(), pr: String(snapshot?.avatar?.pr || '').trim(),
} }
: null, : null,
}; };
+9 -13
View File
@@ -1,6 +1,7 @@
import { t } from '../i18n/index.js'; import { t } from '../i18n/index.js';
import { authService, state } from '../state.js'; import { authService, state } from '../state.js';
import { validateArweaveTxId, validateSha256Hex } from './arweave-file-service.js'; import { validateArweaveTxId } from './arweave-file-service.js';
import { validatePublicPiecesRoot } from './public-pieces-root.js';
import { buildAvatarReference, parseAvatarReference } from './avatar-reference.js'; import { buildAvatarReference, parseAvatarReference } from './avatar-reference.js';
import { CITY_MAX_LENGTH, CITY_PARAM, CITY_SUGGESTIONS } from './cities.js'; import { CITY_MAX_LENGTH, CITY_PARAM, CITY_SUGGESTIONS } from './cities.js';
@@ -146,7 +147,7 @@ export async function loadProfileSnapshot(login) {
source: parsedAvatar.source, source: parsedAvatar.source,
txId: parsedAvatar.txId || '', txId: parsedAvatar.txId || '',
ar: parsedAvatar.ar || '', ar: parsedAvatar.ar || '',
sha256Hex: parsedAvatar.sha256Hex || '', pr: parsedAvatar.pr || '',
size: Number(parsedAvatar.size || 0), size: Number(parsedAvatar.size || 0),
timeMs: latestAvatar?.timeMs || 0, timeMs: latestAvatar?.timeMs || 0,
} }
@@ -155,7 +156,7 @@ export async function loadProfileSnapshot(login) {
source: '', source: '',
txId: '', txId: '',
ar: '', ar: '',
sha256Hex: '', pr: '',
size: 0, size: 0,
timeMs: latestAvatar?.timeMs || 0, timeMs: latestAvatar?.timeMs || 0,
}; };
@@ -215,15 +216,10 @@ export async function saveProfileGender(login, gender) {
} }
export async function saveProfileAvatar(login, avatar) { export async function saveProfileAvatar(login, avatar) {
const cleanAr = String(avatar?.ar || '').trim(); const ar = String(avatar?.ar || '').trim();
const cleanSha = String(avatar?.sha256 || avatar?.sha256Hex || '').trim().toLowerCase(); const pr = String(avatar?.pr || '').trim();
const size = Number(avatar?.size || 0); const size = Number(avatar?.size || 0);
if (cleanAr && !validateArweaveTxId(cleanAr)) throw new Error(t('remaining.profile_errors.invalid_arweave_transaction_id')); if (ar && !validateArweaveTxId(ar)) throw new Error(t('remaining.profile_errors.invalid_arweave_transaction_id'));
if (!validateSha256Hex(cleanSha)) throw new Error(t('remaining.profile_errors.invalid_avatar_sha_256_hash')); if (!validatePublicPiecesRoot(pr)) throw new Error('Некорректный Pieces Root аватара');
await saveProfileParamBlock(login, 'ava', buildAvatarReference({ ar: cleanAr, sha256: cleanSha, size })); await saveProfileParamBlock(login, 'ava', buildAvatarReference({ ar, pr, 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 });
} }
@@ -90,7 +90,7 @@ test('лента получает логин владельца и может з
const js = source('js/pages/channel-view.js'); const js = source('js/pages/channel-view.js');
assert.match(js, /name: payload\.channel\?\.channelName[^\n]*\n\s+ownerLogin,/); assert.match(js, /name: payload\.channel\?\.channelName[^\n]*\n\s+ownerLogin,/);
assert.match(js, /authorLogin: String\(channel\?\.ownerLogin \|\| channel\?\.ownerName/); assert.match(js, /authorLogin: String\(channel\?\.ownerLogin \|\| channel\?\.ownerName/);
assert.match(js, /hasEventAvatar \? event\?\.avaSha256 : fallbackChannel\?\.avaSha256/); assert.match(js, /hasEventAvatar \? event\?\.avaPr : fallbackChannel\?\.avaPr/);
assert.doesNotMatch(js, /Аватар<\/span><span>.*Установлен/); assert.doesNotMatch(js, /Аватар<\/span><span>.*Установлен/);
assert.match(js, /class="channel-meta-avatar-slot"/); assert.match(js, /class="channel-meta-avatar-slot"/);
}); });