From daa221a1586e63e204767e080de17d5fc8cf1fd835bac83849ca65f78109e89c Mon Sep 17 00:00:00 2001 From: AidarKC Date: Sat, 3 Oct 2026 16:39:35 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D1=81=D0=BA=D0=BE=D1=80=D0=B8=D1=82?= =?UTF-8?q?=D1=8C=20=D0=BF=D1=83=D0=B1=D0=BB=D0=B8=D0=BA=D0=B0=D1=86=D0=B8?= =?UTF-8?q?=D1=8E=20=D0=B1=D0=BB=D0=BE=D0=BA=D0=BE=D0=B2=20=D0=B2=20Arweav?= =?UTF-8?q?e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArweaveBlockPublisherScheduler.java | 119 ++++++++- .../archive/ArweaveBlockPublisherService.java | 55 +++- .../src/main/java/shine/db/dao/BlocksDAO.java | 10 + .../db/dao/KeyRotationCandidateBlocksDAO.java | 14 + .../blockchain/Net_AddBlock_Handler.java | 6 + .../Net_KeyRotationAddBlock_Handler.java | 5 + .../server/sync/ArweavePublishSignal.java | 74 ++++++ VERSION.properties | 4 +- shine-UI/js/components/profile-card.js | 57 +++- shine-UI/js/pages/profile-view.js | 6 - shine-UI/js/pages/user-profile-view.js | 142 +--------- .../js/pages/user-relation-manage-view.js | 251 +++++++++++++++--- shine-UI/styles/features/profile-page.css | 126 ++++++--- 13 files changed, 629 insertions(+), 240 deletions(-) create mode 100644 SHiNE-server/shine-server-net-protocol/src/main/java/server/sync/ArweavePublishSignal.java diff --git a/SHiNE-server/shine-server-archive/src/main/java/server/archive/ArweaveBlockPublisherScheduler.java b/SHiNE-server/shine-server-archive/src/main/java/server/archive/ArweaveBlockPublisherScheduler.java index 4025ff08..b2fba9d9 100644 --- a/SHiNE-server/shine-server-archive/src/main/java/server/archive/ArweaveBlockPublisherScheduler.java +++ b/SHiNE-server/shine-server-archive/src/main/java/server/archive/ArweaveBlockPublisherScheduler.java @@ -2,17 +2,32 @@ package server.archive; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import server.sync.ArweavePublishSignal; +import java.util.Base64; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; -/** Fixed-delay publisher. Empty cycles are no-ops. */ +/** + * Publisher с двумя путями доставки: + * 1) Turbo — немедленная неблокирующая попытка для только что принятого блока; + * 2) плановый fixed-delay цикл — страховочная добивка только зависших pending-записей. + */ public final class ArweaveBlockPublisherScheduler { private static final Logger log = LoggerFactory.getLogger(ArweaveBlockPublisherScheduler.class); + private static final long RETRY_MIN_PENDING_AGE_MS = 60_000L; private static final AtomicBoolean STARTED = new AtomicBoolean(false); + private static final AtomicBoolean IMMEDIATE_DRAIN_SCHEDULED = new AtomicBoolean(false); + private static final ConcurrentLinkedQueue IMMEDIATE_QUEUE = new ConcurrentLinkedQueue<>(); + private static final ConcurrentHashMap PENDING_SINCE_MS = new ConcurrentHashMap<>(); + private static ScheduledExecutorService executor; + private static ArweaveBlockPublisherService service; + private static ArweaveBlocksConfig config; private ArweaveBlockPublisherScheduler() {} @@ -23,15 +38,105 @@ public final class ArweaveBlockPublisherScheduler { if (!cfg.publishEnabled()) { log.info("Arweave user-block publisher disabled (mode=none)"); return; } if (!STARTED.compareAndSet(false,true)) return; try { - ArweaveBlockPublisherService service = new ArweaveBlockPublisherService(cfg); + config = cfg; + service = new ArweaveBlockPublisherService(cfg); executor = Executors.newSingleThreadScheduledExecutor(r -> { Thread t = new Thread(r, "shine-arweave-block-publisher"); t.setDaemon(true); return t; }); - Runnable task = () -> { try { service.runCycle(); } catch (Exception e) { log.error("Arweave block publish cycle failed", e); } }; - executor.scheduleWithFixedDelay(task, 0, cfg.publishIntervalMinutes(), TimeUnit.MINUTES); - log.info("Arweave user-block publisher enabled: mode={} interval={}m", cfg.publishMode(), cfg.publishIntervalMinutes()); - } catch (Exception e) { STARTED.set(false); log.error("Arweave user-block publisher failed to start", e); } + + if (cfg.publishMode() == ArweaveBlocksConfig.PublishMode.TURBO) { + ArweavePublishSignal.setListener(ArweaveBlockPublisherScheduler::enqueueImmediateTurboPublish); + } + + Runnable retryTask = () -> { + try { + if (config.publishMode() == ArweaveBlocksConfig.PublishMode.TURBO) { + long nowMs = System.currentTimeMillis(); + service.runRetryCycle( + id -> isOldEnoughForRetry(id, nowMs), + id -> PENDING_SINCE_MS.remove(idKey(id)) + ); + } else { + service.runCycle(); + } + } catch (Exception e) { + log.error("Arweave block publish retry cycle failed", e); + } + }; + long retryInitialDelayMinutes = cfg.publishMode() == ArweaveBlocksConfig.PublishMode.TURBO + ? cfg.publishIntervalMinutes() + : 0L; + executor.scheduleWithFixedDelay(retryTask, retryInitialDelayMinutes, cfg.publishIntervalMinutes(), TimeUnit.MINUTES); + log.info("Arweave user-block publisher enabled: mode={} immediateTurbo={} retryInterval={}m retryMinAge={}s", + cfg.publishMode(), cfg.publishMode() == ArweaveBlocksConfig.PublishMode.TURBO, + cfg.publishIntervalMinutes(), RETRY_MIN_PENDING_AGE_MS / 1000L); + } catch (Exception e) { + ArweavePublishSignal.clearListener(); + STARTED.set(false); + log.error("Arweave user-block publisher failed to start", e); + } } - public static void close() { ScheduledExecutorService e=executor; if(e!=null)e.shutdownNow(); } + private static void enqueueImmediateTurboPublish(ArweavePublishSignal.PendingRef item) { + if (!STARTED.get() || config == null || config.publishMode() != ArweaveBlocksConfig.PublishMode.TURBO) return; + PENDING_SINCE_MS.putIfAbsent(idKey(item.dataItemId()), System.currentTimeMillis()); + IMMEDIATE_QUEUE.offer(item); + scheduleImmediateDrain(); + } + + private static boolean isOldEnoughForRetry(byte[] dataItemId, long nowMs) { + Long pendingSince = PENDING_SINCE_MS.get(idKey(dataItemId)); + // Нет записи в памяти => pending пережил старт процесса и уже считается зависшим. + return pendingSince == null || nowMs - pendingSince >= RETRY_MIN_PENDING_AGE_MS; + } + + private static String idKey(byte[] dataItemId) { + return Base64.getUrlEncoder().withoutPadding().encodeToString(dataItemId); + } + + private static void scheduleImmediateDrain() { + ScheduledExecutorService currentExecutor = executor; + if (currentExecutor == null || currentExecutor.isShutdown()) return; + if (!IMMEDIATE_DRAIN_SCHEDULED.compareAndSet(false, true)) return; + try { + currentExecutor.execute(ArweaveBlockPublisherScheduler::drainImmediateQueue); + } catch (RuntimeException e) { + IMMEDIATE_DRAIN_SCHEDULED.set(false); + throw e; + } + } + + private static void drainImmediateQueue() { + try { + ArweavePublishSignal.PendingRef item; + while ((item = IMMEDIATE_QUEUE.poll()) != null) { + try { + boolean resolved = service.publishAcceptedNow(item); + if (resolved) PENDING_SINCE_MS.remove(idKey(item.dataItemId())); + } catch (Exception e) { + // Turbo недоступен: не держим поток клиента и не молотим всю очередь одной и той же ошибкой. + // Все элементы уже надёжно лежат в БД с pending=TRUE; плановый цикл подберёт их после min-age. + log.warn("Immediate Turbo publish failed; pending blocks will be retried by the periodic cycle: {}", e.getMessage()); + IMMEDIATE_QUEUE.clear(); + break; + } + } + } finally { + IMMEDIATE_DRAIN_SCHEDULED.set(false); + if (!IMMEDIATE_QUEUE.isEmpty()) scheduleImmediateDrain(); + } + } + + public static void close() { + ArweavePublishSignal.clearListener(); + IMMEDIATE_QUEUE.clear(); + PENDING_SINCE_MS.clear(); + IMMEDIATE_DRAIN_SCHEDULED.set(false); + ScheduledExecutorService e = executor; + executor = null; + service = null; + config = null; + STARTED.set(false); + if (e != null) e.shutdownNow(); + } } diff --git a/SHiNE-server/shine-server-archive/src/main/java/server/archive/ArweaveBlockPublisherService.java b/SHiNE-server/shine-server-archive/src/main/java/server/archive/ArweaveBlockPublisherService.java index bfd51a62..df48e67e 100644 --- a/SHiNE-server/shine-server-archive/src/main/java/server/archive/ArweaveBlockPublisherService.java +++ b/SHiNE-server/shine-server-archive/src/main/java/server/archive/ArweaveBlockPublisherService.java @@ -6,9 +6,12 @@ import shine.db.dao.BlocksDAO; import shine.db.dao.KeyRotationCandidateBlocksDAO; import shine.db.entities.BlockEntry; import shine.db.entities.KeyRotationCandidateBlockEntry; +import server.sync.ArweavePublishSignal; import java.util.ArrayList; import java.util.List; +import java.util.function.Consumer; +import java.util.function.Predicate; /** Publishes locally-created signed user DataItems through the configured transport. */ public final class ArweaveBlockPublisherService { @@ -26,7 +29,47 @@ public final class ArweaveBlockPublisherService { this.turboUploader = cfg.publishMode() == ArweaveBlocksConfig.PublishMode.TURBO ? new TurboDataItemUploader(cfg) : null; } + /** + * Мгновенная попытка для только что принятого DataItem. Вызывается только из фонового executor-а: + * сетевой запрос AddBlock не ждёт результат Turbo. Если запись уже успел обработать другой цикл, это no-op. + * При ошибке pending-флаг в БД не меняется, поэтому обычный runCycle() повторит публикацию позже. + */ + public boolean publishAcceptedNow(ArweavePublishSignal.PendingRef pending) throws Exception { + if (cfg.publishMode() != ArweaveBlocksConfig.PublishMode.TURBO) return false; + byte[] id = pending.dataItemId(); + if (pending.kind() == ArweavePublishSignal.Kind.KEY_ROTATION_CANDIDATE) { + KeyRotationCandidateBlockEntry entry = candidateBlocksDAO.getPendingArweaveByDataItemId(id); + if (entry == null) return true; + byte[] raw = entry.getBlockBytes(); + if (raw == null || raw.length == 0) return false; + TurboDataItemUploader.UploadResult result = turboUploader.upload(raw, id); + candidateBlocksDAO.markArweavePublished(List.of(id), System.currentTimeMillis()); + log.debug("Turbo immediately published key-rotation DataItem {} chain={} block={}", + result.dataItemId(), entry.getCandidateBlockchainName(), entry.getBlockNumber()); + return true; + } + + BlockEntry entry = blocksDAO.getPendingArweaveByDataItemId(id); + if (entry == null) return true; + byte[] raw = entry.getBlockBytes(); + if (raw == null || raw.length == 0) return false; + TurboDataItemUploader.UploadResult result = turboUploader.upload(raw, id); + blocksDAO.markArweavePublished(List.of(id), System.currentTimeMillis()); + log.debug("Turbo immediately published SHiNE DataItem {} chain={} block={}", + result.dataItemId(), entry.getBchName(), entry.getBlockNumber()); + return true; + } + public int runCycle() throws Exception { + return runCycle(id -> true, id -> {}); + } + + /** Плановый retry может отфильтровать слишком свежие pending-записи и получить callback успешных id. */ + public int runRetryCycle(Predicate eligible, Consumer onPublished) throws Exception { + return runCycle(eligible == null ? id -> true : eligible, onPublished == null ? id -> {} : onPublished); + } + + private int runCycle(Predicate eligible, Consumer onPublished) throws Exception { if (cfg.publishMode() == ArweaveBlocksConfig.PublishMode.NONE) return 0; int maxItems = cfg.publishMaxItems(); @@ -35,10 +78,11 @@ public final class ArweaveBlockPublisherService { // Ротация приоритетна: пользователь уже заблокирован для обычной записи и ждёт завершения копирования. List rotationCandidates = candidateBlocksDAO.listPendingArweave(maxItems); + rotationCandidates = rotationCandidates.stream().filter(e -> eligible.test(e.getDataItemId())).toList(); if (!rotationCandidates.isEmpty()) { attempted += rotationCandidates.size(); published += switch (cfg.publishMode()) { - case TURBO -> publishTurboRotation(rotationCandidates); + case TURBO -> publishTurboRotation(rotationCandidates, onPublished); case ARWEAVE -> publishDirectArweaveRotation(rotationCandidates); case NONE -> 0; }; @@ -48,16 +92,17 @@ public final class ArweaveBlockPublisherService { if (remaining == 0) return published; List candidates = blocksDAO.listPendingArweave(remaining); + candidates = candidates.stream().filter(e -> eligible.test(e.getDataItemId())).toList(); if (candidates.isEmpty()) return published; published += switch (cfg.publishMode()) { - case TURBO -> publishTurbo(candidates); + case TURBO -> publishTurbo(candidates, onPublished); case ARWEAVE -> publishDirectArweave(candidates); case NONE -> 0; }; return published; } - private int publishTurboRotation(List candidates) throws Exception { + private int publishTurboRotation(List candidates, Consumer onPublished) throws Exception { int published = 0; Exception firstFailure = null; for (KeyRotationCandidateBlockEntry e : candidates) { @@ -67,6 +112,7 @@ public final class ArweaveBlockPublisherService { try { TurboDataItemUploader.UploadResult result = turboUploader.upload(raw, id); candidateBlocksDAO.markArweavePublished(List.of(id), System.currentTimeMillis()); + onPublished.accept(id); published++; log.debug("Turbo published key-rotation DataItem {} chain={} block={}", result.dataItemId(), e.getCandidateBlockchainName(), e.getBlockNumber()); @@ -81,7 +127,7 @@ public final class ArweaveBlockPublisherService { return published; } - private int publishTurbo(List candidates) throws Exception { + private int publishTurbo(List candidates, Consumer onPublished) throws Exception { int published = 0; Exception firstFailure = null; for (BlockEntry e : candidates) { @@ -91,6 +137,7 @@ public final class ArweaveBlockPublisherService { try { TurboDataItemUploader.UploadResult result = turboUploader.upload(raw, id); blocksDAO.markArweavePublished(List.of(id), System.currentTimeMillis()); + onPublished.accept(id); published++; log.debug("Turbo published SHiNE DataItem {} chain={} block={}", result.dataItemId(), e.getBchName(), e.getBlockNumber()); } catch (Exception ex) { diff --git a/SHiNE-server/shine-server-db/src/main/java/shine/db/dao/BlocksDAO.java b/SHiNE-server/shine-server-db/src/main/java/shine/db/dao/BlocksDAO.java index 85bb4518..9d8aa7ab 100644 --- a/SHiNE-server/shine-server-db/src/main/java/shine/db/dao/BlocksDAO.java +++ b/SHiNE-server/shine-server-db/src/main/java/shine/db/dao/BlocksDAO.java @@ -68,6 +68,16 @@ public final class BlocksDAO { } } + /** Возвращает ещё не опубликованный пользовательский DataItem для быстрой Turbo-попытки. */ + public BlockEntry getPendingArweaveByDataItemId(byte[] dataItemId) throws SQLException { + if (dataItemId == null || dataItemId.length != 32) return null; + String sql = baseSelect() + " WHERE data_item_id=? AND arweave_publish_pending=TRUE LIMIT 1"; + try (Connection c = db.getConnection(); PreparedStatement ps = c.prepareStatement(sql)) { + ps.setBytes(1, dataItemId); + try (ResultSet rs = ps.executeQuery()) { return rs.next() ? mapRow(rs) : null; } + } + } + public List listPendingArweave(int limit) throws SQLException { int safeLimit = Math.max(1, Math.min(limit, 100_000)); String sql = """ diff --git a/SHiNE-server/shine-server-db/src/main/java/shine/db/dao/KeyRotationCandidateBlocksDAO.java b/SHiNE-server/shine-server-db/src/main/java/shine/db/dao/KeyRotationCandidateBlocksDAO.java index 2e83c419..f1afc953 100644 --- a/SHiNE-server/shine-server-db/src/main/java/shine/db/dao/KeyRotationCandidateBlocksDAO.java +++ b/SHiNE-server/shine-server-db/src/main/java/shine/db/dao/KeyRotationCandidateBlocksDAO.java @@ -132,6 +132,20 @@ public final class KeyRotationCandidateBlocksDAO { } } + /** Возвращает ещё не опубликованный candidate DataItem для быстрой Turbo-попытки. */ + public KeyRotationCandidateBlockEntry getPendingArweaveByDataItemId(byte[] dataItemId) throws SQLException { + if (dataItemId == null || dataItemId.length != 32) return null; + try (Connection c = db.getConnection(); + PreparedStatement ps = c.prepareStatement(""" + SELECT * FROM key_rotation_candidate_blocks + WHERE data_item_id = ? AND arweave_publish_pending = TRUE + LIMIT 1 + """)) { + ps.setBytes(1, dataItemId); + try (ResultSet rs = ps.executeQuery()) { return rs.next() ? map(rs) : null; } + } + } + /** Candidate-блоки имеют приоритет перед обычной очередью publisher-а. */ public List listPendingArweave(int limit) throws SQLException { if (limit <= 0) return List.of(); diff --git a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/blockchain/Net_AddBlock_Handler.java b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/blockchain/Net_AddBlock_Handler.java index 9d5e971e..acdce0c3 100644 --- a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/blockchain/Net_AddBlock_Handler.java +++ b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/blockchain/Net_AddBlock_Handler.java @@ -32,6 +32,7 @@ import server.logic.ws_protocol.JSON.handlers.channels.ChannelNamesStateBootstra import server.logic.ws_protocol.JSON.handlers.channels.UserCountersSupport; import server.logic.ws_protocol.WireCodes; import server.sync.AddBlockSyncService; +import server.sync.ArweavePublishSignal; import shine.db.channels.ChannelNameRules; import shine.db.dao.BlockchainStateDAO; import shine.db.dao.BlocksDAO; @@ -720,6 +721,11 @@ public final class Net_AddBlock_Handler implements JsonMessageHandler { upsertChat200StateFromCreate(chat200CreateSeed); } maybeApplyChat200Command(blockchainName, block); + + if (publishToArweave) { + // Только ставим быструю публикацию в очередь: ответ клиенту не ждёт сеть Turbo/Arweave. + ArweavePublishSignal.userBlockAccepted(be.getDataItemId()); + } } catch (Exception e) { if (isChannelSlugConflict(e)) { return new AddBlockResult(409, "channel_name_already_exists", serverLastNum, serverLastHashHex); diff --git a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/keyRotation/Net_KeyRotationAddBlock_Handler.java b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/keyRotation/Net_KeyRotationAddBlock_Handler.java index 6f39538e..b8b2e369 100644 --- a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/keyRotation/Net_KeyRotationAddBlock_Handler.java +++ b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/keyRotation/Net_KeyRotationAddBlock_Handler.java @@ -13,6 +13,7 @@ import server.logic.ws_protocol.JSON.handlers.JsonMessageHandler; import server.logic.ws_protocol.JSON.handlers.blockchain.Net_AddBlock_Handler_utils.BlockchainLocks; import server.logic.ws_protocol.JSON.handlers.keyRotation.entyties.Net_KeyRotationAddBlock_Request; import server.logic.ws_protocol.JSON.utils.NetExceptionResponseFactory; +import server.sync.ArweavePublishSignal; import shine.db.DbController; import shine.db.dao.BlocksDAO; import shine.db.dao.KeyRotationCandidateBlocksDAO; @@ -164,6 +165,10 @@ public final class Net_KeyRotationAddBlock_Handler implements JsonMessageHandler c.setAutoCommit(oldAutoCommit); } + // Как и обычный пользовательский блок, candidate сразу ставится в неблокирующую Turbo-очередь. + // При сетевой ошибке pending-флаг остаётся TRUE и его подберёт плановый retry. + ArweavePublishSignal.keyRotationCandidateAccepted(entry.getDataItemId()); + // progressCurrent обновляет Arweave publisher только после реальной публикации. KeyRotationSessionEntry refreshed = rotations.getActiveByLogin(login); return KeyRotationApiSupport.response(req.getOp(), req.getRequestId(), refreshed == null ? session : refreshed); diff --git a/SHiNE-server/shine-server-net-protocol/src/main/java/server/sync/ArweavePublishSignal.java b/SHiNE-server/shine-server-net-protocol/src/main/java/server/sync/ArweavePublishSignal.java new file mode 100644 index 00000000..51116ee8 --- /dev/null +++ b/SHiNE-server/shine-server-net-protocol/src/main/java/server/sync/ArweavePublishSignal.java @@ -0,0 +1,74 @@ +package server.sync; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.Arrays; + +/** + * Неблокирующий мост между приёмом блока по протоколу и Arweave/Turbo publisher-ом. + * + * Net-protocol не зависит от archive-модуля, поэтому publisher регистрирует здесь лёгкий listener. + * Listener обязан только поставить ссылку на уже сохранённый DataItem в свою очередь и не выполнять + * сетевую публикацию в потоке клиента. + */ +public final class ArweavePublishSignal { + private static final Logger log = LoggerFactory.getLogger(ArweavePublishSignal.class); + + public enum Kind { + USER_BLOCK, + KEY_ROTATION_CANDIDATE + } + + public record PendingRef(Kind kind, byte[] dataItemId) { + public PendingRef { + if (kind == null) throw new IllegalArgumentException("kind is null"); + if (dataItemId == null || dataItemId.length != 32) { + throw new IllegalArgumentException("dataItemId must be 32 bytes"); + } + dataItemId = Arrays.copyOf(dataItemId, dataItemId.length); + } + + @Override + public byte[] dataItemId() { + return Arrays.copyOf(dataItemId, dataItemId.length); + } + } + + @FunctionalInterface + public interface Listener { + void onPending(PendingRef item); + } + + private static volatile Listener listener; + + private ArweavePublishSignal() {} + + public static void setListener(Listener value) { + listener = value; + } + + public static void clearListener() { + listener = null; + } + + public static void userBlockAccepted(byte[] dataItemId) { + publish(new PendingRef(Kind.USER_BLOCK, dataItemId)); + } + + public static void keyRotationCandidateAccepted(byte[] dataItemId) { + publish(new PendingRef(Kind.KEY_ROTATION_CANDIDATE, dataItemId)); + } + + private static void publish(PendingRef item) { + Listener current = listener; + if (current == null) return; + try { + current.onPending(item); + } catch (RuntimeException e) { + // Ошибка постановки в быструю очередь не должна превращать уже принятый блок в ошибку клиента: + // arweave_publish_pending остаётся TRUE, и плановый retry подберёт его позже. + log.warn("Cannot enqueue immediate Arweave/Turbo publish; periodic retry will keep the block pending", e); + } + } +} diff --git a/VERSION.properties b/VERSION.properties index 0fdf55d3..35abfca3 100644 --- a/VERSION.properties +++ b/VERSION.properties @@ -1,2 +1,2 @@ -client.version=1.14.7 -server.version=1.12.5 +client.version=1.14.8 +server.version=1.12.6 diff --git a/shine-UI/js/components/profile-card.js b/shine-UI/js/components/profile-card.js index d10ed4b0..3d91a2a5 100644 --- a/shine-UI/js/components/profile-card.js +++ b/shine-UI/js/components/profile-card.js @@ -12,13 +12,27 @@ export function escapeProfileHtml(text) { const esc = escapeProfileHtml; -function statusChip({ kind, label, value, active }) { - const n = Number(value || 0); +function statusCardHtml({ kind, title, received, given }) { + const receivedCount = Number(received || 0); + const givenCount = Number(given || 0); + const isOfficial = kind === 'primary'; + const receivedKind = isOfficial ? 'primary_received' : 'shine_received'; + const givenKind = isOfficial ? 'primary_given' : 'shine_given'; + const receivedTitle = isOfficial ? 'Кто подтвердил этот официальный аккаунт' : 'Кто подтвердил, что этот аккаунт сияющий'; + const givenTitle = isOfficial ? 'Какие официальные аккаунты подтвердил этот пользователь' : 'Кого этот пользователь подтвердил как сияющего'; + return ` - `; +
+
${esc(title)}
+ + +
`; } function statHtml({ kind, label, valueHtml, ariaLabel }) { @@ -75,19 +89,34 @@ export function profileCardHtml({ card, login = '', tilesHtml = '', tilesWrapCla const listInner = aboutRow + contacts + pathRow; const listHtml = listInner.trim() ? `
${listInner}
` : ''; const friends = Number(stats.friendsCount || 0); - const statusChips = [ - (official || Number(stats.primaryReceivedCount || 0) > 0) && statusChip({ kind: 'primary_received', label: 'Официальный', value: stats.primaryReceivedCount, active: official }), - (shining || Number(stats.shineReceivedCount || 0) > 0) && statusChip({ kind: 'shine_received', label: 'Сияющий', value: stats.shineReceivedCount, active: shining }), - ].filter(Boolean); - const statusesHtml = statusChips.length ? `
${statusChips.join('')}
` : ''; const closeFriends = Number(stats.closeFriendsCount || 0); + const officialCard = official + ? statusCardHtml({ + kind: 'primary', + title: 'Официальный', + received: stats.primaryReceivedCount, + given: stats.primaryGivenCount, + }) + : ''; + const shiningCard = shining + ? statusCardHtml({ + kind: 'shine', + title: 'Сияющий', + received: stats.shineReceivedCount, + given: stats.shineGivenCount, + }) + : ''; + return ` -
- +
+
+
${officialCard}
+ +
${shiningCard}
+

${esc(displayName)}

- ${statusesHtml}
diff --git a/shine-UI/js/pages/profile-view.js b/shine-UI/js/pages/profile-view.js index b3e8badf..470f590c 100644 --- a/shine-UI/js/pages/profile-view.js +++ b/shine-UI/js/pages/profile-view.js @@ -30,8 +30,6 @@ export function render({ navigate, chrome }) { function renderProfile() { if (!card) return; - const official = card.accountRole === 'primary'; - const shining = card.shineStatus === 'shining'; body.innerHTML = profileCardHtml({ card, login, @@ -42,8 +40,6 @@ export function render({ navigate, chrome }) { ].join(''), }) + ` `; @@ -55,8 +51,6 @@ export function render({ navigate, chrome }) { avatar: card.avatar, size: 'xl', className: 'user-profile-hero-avatar', - glow: shining, - official, })); status.textContent = ''; diff --git a/shine-UI/js/pages/user-profile-view.js b/shine-UI/js/pages/user-profile-view.js index 155ab2b3..53fb9977 100644 --- a/shine-UI/js/pages/user-profile-view.js +++ b/shine-UI/js/pages/user-profile-view.js @@ -1,8 +1,8 @@ import { createTopBar } from '../components/topbar.js'; import { SHINE_CONNECTIONS_LOGO_SRC } from '../components/shine-logo.js'; import { renderUserAvatar } from '../components/avatar-image.js'; -import { authService, state } from '../state.js'; -import { loadRelationsForPair, loadUserProfileCard } from '../services/user-connections.js'; +import { state } from '../state.js'; +import { loadUserProfileCard } from '../services/user-connections.js'; import { makeProfileLinksRoute } from '../services/shine-routes.js'; import { navigateBack } from '../router.js'; import { profileCardHtml, profileTileHtml } from '../components/profile-card.js'; @@ -18,27 +18,6 @@ function escapeHtml(text) { .replaceAll("'", '''); } -function effectiveSocial(flags = {}) { - if (flags.outCloseFriend) return 'close_friend'; - if (flags.outFriend) return 'friend'; - if (flags.outContact) return 'contact'; - return 'none'; -} - -function relationMenuHtml(flags = {}) { - const current = effectiveSocial(flags); - const rows = [ - ['friend', 'Друг'], - ['close_friend', 'Близкий друг'], - ['contact', 'Контакт'], - ]; - return rows.map(([kind, label]) => ` - `).join(''); -} - export function render({ navigate, route, chrome }) { const requestedLogin = String(route?.params?.login || '').trim(); const selfLogin = String(state.session.login || '').trim(); @@ -61,80 +40,16 @@ export function render({ navigate, route, chrome }) { screen.append(status, body); let card = null; - let relationFlags = null; - let relationLoadPromise = null; - let addMenu = null; - let addActionButton = null; - - function updateRelationUi() { - if (!addMenu) return; - addMenu.innerHTML = relationMenuHtml(relationFlags || {}); - const social = effectiveSocial(relationFlags || {}); - addActionButton?.classList.toggle('is-active', social !== 'none'); - addActionButton?.setAttribute('aria-label', social === 'none' ? 'Добавить' : 'Изменить связь'); - } - - async function ensureRelationFlags() { - if (relationFlags) return relationFlags; - if (relationLoadPromise) return relationLoadPromise; - if (!selfLogin || !card?.login) return {}; - relationLoadPromise = loadRelationsForPair({ currentLogin: selfLogin, targetLogin: card.login }) - .then((flags) => { - relationFlags = flags || {}; - updateRelationUi(); - return relationFlags; - }) - .finally(() => { - relationLoadPromise = null; - }); - return relationLoadPromise; - } - - async function setRelationKind(kind, enabled) { - await authService.setUserRelation({ - login: selfLogin, - toLogin: card.login, - kind, - enabled, - storagePwd: state.session.storagePwdInMemory, - }); - } - - async function changeSocial(next) { - const flags = await ensureRelationFlags(); - const current = effectiveSocial(flags); - if (current === next) return; - - if (next === 'contact') { - if (flags.outCloseFriend) await setRelationKind('close_friend', false); - if (flags.outFriend) await setRelationKind('friend', false); - if (!flags.outContact) await setRelationKind('contact', true); - } - if (next === 'friend') { - if (flags.outCloseFriend) await setRelationKind('close_friend', false); - if (!flags.outFriend) await setRelationKind('friend', true); - } - if (next === 'close_friend' && !flags.outCloseFriend) { - await setRelationKind('close_friend', true); - } - - relationFlags = await loadRelationsForPair({ currentLogin: selfLogin, targetLogin: card.login }); - updateRelationUi(); - } - function renderProfile() { if (!card) return; const isSelf = card.login.toLowerCase() === selfLogin.toLowerCase(); - const official = card.accountRole === 'primary'; - const shining = card.shineStatus === 'shining'; body.innerHTML = profileCardHtml({ card, login: requestedLogin, isSelf, - beforeTilesHtml: '', tilesHtml: isSelf ? '' : [ - profileTileHtml({ icon: 'user-plus', label: 'Добавить', attrs: 'data-profile-action="add" aria-haspopup="menu" aria-expanded="false"' }), + profileTileHtml({ icon: 'user-plus', label: 'Добавить связь', attrs: 'data-profile-action="add"' }), profileTileHtml({ label: 'Связи', attrs: 'data-profile-action="links"', iconMarkup: `` }), profileTileHtml({ icon: 'message', label: 'Написать', attrs: 'data-profile-action="chat"' }), ].join(''), @@ -148,21 +63,12 @@ export function render({ navigate, route, chrome }) { avatar: card.avatar, size: 'xl', className: 'user-profile-hero-avatar', - glow: shining, - official, })); - addMenu = body.querySelector('.user-profile-add-menu'); - addActionButton = body.querySelector('[data-profile-action="add"]'); - updateRelationUi(); status.textContent = ''; - - if (!isSelf && selfLogin) { - void ensureRelationFlags().catch(() => {}); - } } - body.addEventListener('click', async (event) => { + body.addEventListener('click', (event) => { if (!card) return; const listButton = event.target.closest('[data-profile-list]'); if (listButton) { @@ -171,34 +77,9 @@ export function render({ navigate, route, chrome }) { return; } - const relationButton = event.target.closest('[data-relation-kind]'); - if (relationButton) { - if (!selfLogin) { - status.className = 'status-line user-profile-status is-unavailable'; - status.textContent = 'Для добавления пользователя необходимо войти.'; - return; - } - const next = relationButton.dataset.relationKind; - try { - addMenu?.classList.add('is-busy'); - await changeSocial(next); - if (addMenu) addMenu.hidden = true; - addActionButton?.setAttribute('aria-expanded', 'false'); - status.className = 'status-line user-profile-status'; - status.textContent = ''; - } catch (error) { - status.className = 'status-line user-profile-status is-unavailable'; - status.textContent = `Ошибка: ${error?.message || 'Не удалось изменить связь'}`; - } finally { - addMenu?.classList.remove('is-busy'); - } - return; - } - const actionButton = event.target.closest('[data-profile-action]'); const action = actionButton?.dataset.profileAction; if (action === 'add') { - if (!addMenu) return; navigate(`SHiNE/${encodeURIComponent(card.login)}/manage`); return; } @@ -211,17 +92,6 @@ export function render({ navigate, route, chrome }) { } }); - const handleOutsidePointer = (event) => { - if (!addMenu || addMenu.hidden) return; - if (event.target instanceof Node && body.contains(event.target)) { - const insideActions = event.target.closest?.('.user-profile-actions-wrap'); - if (insideActions) return; - } - addMenu.hidden = true; - addActionButton?.setAttribute('aria-expanded', 'false'); - }; - document.addEventListener('pointerdown', handleOutsidePointer); - async function refresh() { card = await loadUserProfileCard(requestedLogin); renderProfile(); @@ -232,9 +102,5 @@ export function render({ navigate, route, chrome }) { status.textContent = `Ошибка: ${error?.message || 'unknown'}`; }); - screen.cleanup = () => { - document.removeEventListener('pointerdown', handleOutsidePointer); - }; - return screen; } diff --git a/shine-UI/js/pages/user-relation-manage-view.js b/shine-UI/js/pages/user-relation-manage-view.js index a6db2c00..79c2f58b 100644 --- a/shine-UI/js/pages/user-relation-manage-view.js +++ b/shine-UI/js/pages/user-relation-manage-view.js @@ -2,54 +2,231 @@ import { createTopBar } from '../components/topbar.js'; import { authService, state } from '../state.js'; import { loadRelationsForPair, loadUserProfileCard } from '../services/user-connections.js'; import { navigateBack } from '../router.js'; +import { escapeProfileHtml } from '../components/profile-card.js'; -export const pageMeta = { id: 'user-relation-manage-view', title: 'Добавить' }; +export const pageMeta = { id: 'user-relation-manage-view', title: 'Добавить связь' }; -function effectiveSocial(f) { if (f.outCloseFriend) return 'close_friend'; if (f.outFriend) return 'friend'; if (f.outContact) return 'contact'; return 'none'; } +const SOCIAL_LABELS = { + none: 'Нет связи', + contact: 'Контакт', + friend: 'Друг', + close_friend: 'Близкий друг', +}; -export function render({route, chrome}) { - const targetLogin = String(route?.params?.login || '').trim(); const selfLogin = String(state.session.login || '').trim(); - const screen = document.createElement('section'); screen.className = 'stack'; - const body = document.createElement('div'); body.className = 'stack'; const status = document.createElement('div'); status.className = 'status-line'; - chrome?.setTopbar(createTopBar({ title: 'Добавить', back: { label: '←', onClick: () => navigateBack() } })); - screen.append( - status, - body, - ); - let flags, selfCard, targetCard; +const MUTUAL_LABELS = { + contact: 'контакты', + friend: 'друзья', + close_friend: 'близкие друзья', +}; - async function setKind(kind, enabled) { await authService.setUserRelation({ login: selfLogin, toLogin: targetLogin, kind, enabled, storagePwd: state.session.storagePwdInMemory }); } - async function changeSocial(next) { - const current = effectiveSocial(flags); if (current === next) return; - if (next === 'none') { if (flags.outCloseFriend) await setKind('close_friend', false); if (flags.outFriend) await setKind('friend', false); if (flags.outContact) await setKind('contact', false); } - if (next === 'contact') { if (flags.outCloseFriend) await setKind('close_friend', false); if (flags.outFriend) await setKind('friend', false); if (!flags.outContact) await setKind('contact', true); } - if (next === 'friend') { if (flags.outCloseFriend) await setKind('close_friend', false); if (!flags.outFriend) await setKind('friend', true); } - if (next === 'close_friend' && !flags.outCloseFriend) await setKind('close_friend', true); - await refresh(); +function effectiveSocial(flags = {}, direction = 'out') { + const prefix = direction === 'in' ? 'in' : 'out'; + if (flags[`${prefix}CloseFriend`]) return 'close_friend'; + if (flags[`${prefix}Friend`]) return 'friend'; + if (flags[`${prefix}Contact`]) return 'contact'; + return 'none'; +} + +function relationSummaryHtml(flags = {}) { + const outgoing = effectiveSocial(flags, 'out'); + const incoming = effectiveSocial(flags, 'in'); + + if (outgoing !== 'none' && outgoing === incoming) { + return ` +
+ Взаимно: + ${escapeProfileHtml(MUTUAL_LABELS[outgoing])} +
`; } - async function refresh() { - status.textContent = 'Загрузка...'; body.innerHTML = ''; - [selfCard, targetCard, flags] = await Promise.all([loadUserProfileCard(selfLogin), loadUserProfileCard(targetLogin), loadRelationsForPair({ currentLogin: selfLogin, targetLogin })]); - const social = effectiveSocial(flags); - const canPrimary = selfCard.accountRole === 'primary' && targetCard.accountRole !== 'non_voting'; - const canShine = selfCard.accountRole === 'primary' && selfCard.shineStatus === 'shining' && targetCard.shineStatus !== 'not_interested'; - body.innerHTML = ` -
Связь с ${targetLogin} -
${['none','contact','friend','close_friend'].map(v => ``).join('')}
+ return ` +
+
+ Вы к пользователю + ${escapeProfileHtml(SOCIAL_LABELS[outgoing])}
- ${canPrimary ? `
Основной аккаунт
` : ''} - ${canShine ? `
Сияющий
` : ''} + ${incoming !== 'none' ? ` +
+ Пользователь к вам + ${escapeProfileHtml(SOCIAL_LABELS[incoming])} +
` : ''} +
`; +} + +function socialButtonsHtml(flags = {}) { + const current = effectiveSocial(flags, 'out'); + const kinds = ['none', 'contact', 'friend', 'close_friend']; + return kinds.map((kind) => ` + `).join(''); +} + +function officialBlockHtml(flags = {}) { + return ` +
+
+ Основной аккаунт + Этот аккаунт — основной +
+
+ ${flags.outOfficialAccount ? '
✓ Вы подтвердили его основной аккаунт
' : ''} + ${flags.inOfficialAccount ? '
✓ Этот пользователь подтвердил ваш основной аккаунт
' : ''} +
+ +
`; +} + +function shineBlockHtml(flags = {}) { + return ` +
+
+ Сияющий + Этот аккаунт — сияющий +
+
+ ${flags.outShineConfirmed ? '
✓ Вы подтверждаете его сияющим
' : ''} + ${flags.inShineConfirmed ? '
✓ Этот пользователь подтверждает вас сияющим
' : ''} +
+ +
`; +} + +export function render({ route, chrome }) { + const targetLogin = String(route?.params?.login || '').trim(); + const selfLogin = String(state.session.login || '').trim(); + const screen = document.createElement('section'); + screen.className = 'stack relation-manage-screen'; + + const body = document.createElement('div'); + body.className = 'stack relation-manage-body'; + const status = document.createElement('div'); + status.className = 'status-line relation-manage-status'; + + chrome?.setTopbar(createTopBar({ + title: 'Добавить связь', + back: { label: '←', onClick: () => navigateBack() }, + })); + screen.append(status, body); + + let flags = {}; + let selfCard = null; + let targetCard = null; + let busy = false; + + async function setKind(kind, enabled) { + await authService.setUserRelation({ + login: selfLogin, + toLogin: targetLogin, + kind, + enabled, + storagePwd: state.session.storagePwdInMemory, + }); + } + + async function changeSocial(next) { + const current = effectiveSocial(flags, 'out'); + if (current === next) return; + + if (next === 'none') { + if (flags.outCloseFriend) await setKind('close_friend', false); + if (flags.outFriend) await setKind('friend', false); + if (flags.outContact) await setKind('contact', false); + } + if (next === 'contact') { + if (flags.outCloseFriend) await setKind('close_friend', false); + if (flags.outFriend) await setKind('friend', false); + if (!flags.outContact) await setKind('contact', true); + } + if (next === 'friend') { + if (flags.outCloseFriend) await setKind('close_friend', false); + if (!flags.outFriend) await setKind('friend', true); + } + if (next === 'close_friend' && !flags.outCloseFriend) { + await setKind('close_friend', true); + } + } + + function renderBody() { + const canPrimary = selfCard?.accountRole === 'primary' && targetCard?.accountRole === 'primary'; + const canShine = selfCard?.shineStatus === 'shining' && targetCard?.shineStatus === 'shining'; + + body.innerHTML = ` + + ${canPrimary ? officialBlockHtml(flags) : ''} + ${canShine ? shineBlockHtml(flags) : ''} `; + } + + async function refresh({ loading = true } = {}) { + if (loading) { + status.className = 'status-line relation-manage-status'; + status.textContent = 'Загрузка...'; + } + [selfCard, targetCard, flags] = await Promise.all([ + loadUserProfileCard(selfLogin), + loadUserProfileCard(targetLogin), + loadRelationsForPair({ currentLogin: selfLogin, targetLogin }), + ]); + renderBody(); + status.className = 'status-line relation-manage-status'; status.textContent = ''; } - body.addEventListener('click', async (e) => { - const btn = e.target.closest('button'); if (!btn) return; - const social = btn.dataset.socialKind; const confirm = btn.dataset.confirm; - try { status.textContent = 'Сохранение...'; if (social) await changeSocial(social); else if (confirm) { const enabled = confirm === 'official_account' ? !flags.outOfficialAccount : !flags.outShineConfirmed; await setKind(confirm, enabled); await refresh(); } } - catch (err) { status.className='status-line is-unavailable'; status.textContent=`Ошибка: ${err.message || 'unknown'}`; } + body.addEventListener('click', async (event) => { + const button = event.target.closest('button'); + if (!button || busy) return; + + const social = button.dataset.socialKind; + const confirm = button.dataset.confirm; + if (!social && !confirm) return; + + busy = true; + body.classList.add('is-busy'); + status.className = 'status-line relation-manage-status'; + status.textContent = 'Сохранение...'; + + try { + if (social) { + await changeSocial(social); + } else if (confirm === 'official_account') { + await setKind('official_account', !flags.outOfficialAccount); + } else if (confirm === 'shine_confirmed') { + await setKind('shine_confirmed', !flags.outShineConfirmed); + } + await refresh({ loading: false }); + } catch (error) { + status.className = 'status-line relation-manage-status is-unavailable'; + status.textContent = `Ошибка: ${error?.message || 'Не удалось изменить связь'}`; + } finally { + busy = false; + body.classList.remove('is-busy'); + } }); - refresh().catch(e => { status.className='status-line is-unavailable'; status.textContent=`Ошибка: ${e.message || 'unknown'}`; }); + + if (!selfLogin || !targetLogin) { + status.className = 'status-line relation-manage-status is-unavailable'; + status.textContent = 'Не удалось определить пользователя.'; + return screen; + } + + refresh().catch((error) => { + status.className = 'status-line relation-manage-status is-unavailable'; + status.textContent = `Ошибка: ${error?.message || 'Не удалось загрузить связи'}`; + }); + return screen; } diff --git a/shine-UI/styles/features/profile-page.css b/shine-UI/styles/features/profile-page.css index e2561f90..7d54b303 100644 --- a/shine-UI/styles/features/profile-page.css +++ b/shine-UI/styles/features/profile-page.css @@ -1,51 +1,81 @@ /* Карточка профиля (js/components/profile-card.js): свой и чужой профиль в одной системе с «О канале». * Селекторы привязаны к .user-profile-screen, чтобы перекрыть старую геометрию profile.css. */ -.user-profile-screen { gap: 0; min-height: 0; overflow-x: clip; } /* clip, а не hidden: hidden обрезал бы и свечение аватарки сверху */ +.user-profile-screen { gap: 0; min-height: 0; overflow-x: clip; } .user-profile-screen::before { content: none; } .user-profile-screen .user-profile-body { display: grid; gap: var(--space-4); padding: var(--space-2) 0 var(--space-5); } .user-profile-screen .user-profile-status:empty { display: none; } .user-profile-screen .pf-hero { display: grid; justify-items: center; gap: var(--space-1); text-align: center; } -.user-profile-screen .pf-avatar { position: relative; grid-column: auto; grid-row: auto; width: 96px; height: 96px; margin-bottom: var(--space-2); display: grid; place-items: center; justify-self: center; } +.user-profile-screen .pf-identity { + width: min(100%, 420px); + display: grid; + grid-template-columns: minmax(72px, 1fr) 96px minmax(72px, 1fr); + align-items: center; + gap: 10px; +} +.user-profile-screen .pf-status-card-slot { min-width: 0; display: grid; align-items: center; } +.user-profile-screen .pf-status-card-slot--left { justify-items: end; } +.user-profile-screen .pf-status-card-slot--right { justify-items: start; } +.user-profile-screen .pf-status-card { + width: min(100%, 106px); + aspect-ratio: 1; + display: grid; + grid-template-rows: auto minmax(0, 1fr) minmax(0, 1fr); + border: 1px solid var(--border-subtle); + border-radius: var(--radius-lg); + background: var(--surface); + overflow: hidden; +} +.user-profile-screen .pf-status-card--primary { border-color: color-mix(in srgb, var(--rel-family) 55%, var(--border-subtle)); } +.user-profile-screen .pf-status-card--shine { border-color: color-mix(in srgb, var(--rel-shining) 55%, var(--border-subtle)); } +.user-profile-screen .pf-status-card-title { + min-height: 27px; + padding: 7px 5px 5px; + display: grid; + place-items: center; + color: var(--text-primary); + font-size: 11px; + line-height: 1.1; + font-weight: var(--weight-bold); +} +.user-profile-screen .pf-status-card-count { + min-width: 0; + padding: 3px 2px; + display: grid; + place-items: center; + align-content: center; + gap: 0; + border: 0; + border-top: 1px solid var(--border-subtle); + background: transparent; + color: var(--text-primary); + font: inherit; + cursor: pointer; +} +.user-profile-screen .pf-status-card-count:hover, +.user-profile-screen .pf-status-card-count:active { background: var(--surface-selected); } +.user-profile-screen .pf-status-card-count:focus-visible { outline: 2px solid var(--focus-ring); outline-offset: -2px; } +.user-profile-screen .pf-status-card-count strong { font-size: var(--text-md); line-height: 1.05; font-weight: var(--weight-bold); } +.user-profile-screen .pf-status-card-count span { color: var(--text-secondary); font-size: 9px; line-height: 1.05; } +.user-profile-screen .pf-avatar { position: relative; width: 96px; height: 96px; display: grid; place-items: center; justify-self: center; } .user-profile-screen .pf-avatar .user-profile-hero-avatar.avatar, .user-profile-screen .pf-avatar .user-profile-hero-avatar.avatar-image { width: 96px; height: 96px; min-width: 96px; min-height: 96px; font-size: 36px; } .user-profile-screen .pf-avatar .user-profile-hero-avatar.avatar-framed > .avatar-fallback, .user-profile-screen .pf-avatar .user-profile-hero-avatar.avatar-framed > .avatar-photo { width: 100%; height: 100%; } .user-profile-screen .pf-avatar .user-profile-hero-avatar.avatar-framed::after, .user-profile-screen .pf-avatar .user-profile-hero-avatar.avatar-glow::before { content: none; } -.user-profile-screen .pf-hero.is-shining .pf-avatar::after { - content: ''; - position: absolute; - inset: -5px; - border-radius: 50%; - border: 2px solid var(--rel-shining); - box-shadow: 0 0 14px var(--rel-shining-glow); - pointer-events: none; -} -.user-profile-screen .pf-name { margin: 0; color: var(--text-primary); font-size: var(--text-xl); line-height: var(--leading-xl); font-weight: var(--weight-bold); overflow-wrap: anywhere; } +.user-profile-screen .pf-name { margin: var(--space-2) 0 0; color: var(--text-primary); font-size: var(--text-xl); line-height: var(--leading-xl); font-weight: var(--weight-bold); overflow-wrap: anywhere; } .user-profile-screen .pf-login { color: var(--text-secondary); font-size: var(--text-sm); line-height: var(--leading-sm); } -.user-profile-screen .pf-statuses { display: flex; flex-wrap: wrap; justify-content: center; gap: var(--space-2); margin-top: var(--space-2); } -.user-profile-screen .pf-status { - min-height: 32px; - padding: 0 12px; - display: inline-flex; - align-items: center; - gap: 6px; - border: 1px solid var(--border-subtle); - border-radius: var(--radius-pill); - color: var(--text-secondary); - background: var(--surface); - font: inherit; - font-size: var(--text-xs); - cursor: pointer; +@media (max-width: 360px) { + .user-profile-screen .pf-identity { grid-template-columns: minmax(66px, 1fr) 88px minmax(66px, 1fr); gap: 7px; } + .user-profile-screen .pf-avatar, + .user-profile-screen .pf-avatar .user-profile-hero-avatar.avatar, + .user-profile-screen .pf-avatar .user-profile-hero-avatar.avatar-image { width: 88px; height: 88px; min-width: 88px; min-height: 88px; } + .user-profile-screen .pf-status-card { width: min(100%, 96px); } + .user-profile-screen .pf-status-card-title { font-size: 10px; } + .user-profile-screen .pf-status-card-count span { font-size: 8px; } } -.user-profile-screen .pf-status b { color: var(--text-primary); font-weight: var(--weight-bold); } -.user-profile-screen .pf-status-dot { width: 7px; height: 7px; border-radius: 50%; background: var(--border-control); } -.user-profile-screen .pf-status.is-active { color: var(--text-primary); border-color: var(--border-control); } -.user-profile-screen .pf-status.is-active .pf-status-dot { background: var(--rel-shining); box-shadow: 0 0 6px var(--rel-shining-glow); } -.user-profile-screen .pf-status[data-profile-list='primary_received'].is-active .pf-status-dot { background: var(--rel-family); box-shadow: 0 0 6px var(--rel-family-glow); } -.user-profile-screen .pf-status:focus-visible { outline: 2px solid var(--focus-ring); outline-offset: 2px; } .user-profile-screen .pf-stats { display: grid; grid-template-columns: repeat(3, minmax(0, 1fr)); border: 1px solid var(--border-subtle); border-radius: var(--radius-lg); background: var(--surface); overflow: hidden; } .user-profile-screen .pf-stat { min-height: 64px; padding: var(--space-2) var(--space-1); display: grid; align-content: center; justify-items: center; gap: 2px; border: 0; border-left: 1px solid var(--border-subtle); background: transparent; color: var(--text-primary); font: inherit; cursor: pointer; } @@ -109,3 +139,35 @@ .profiles-active-badge { padding: 2px 8px; border-radius: var(--radius-pill); color: var(--accent); background: var(--accent-soft); font-size: .6875rem; font-weight: var(--weight-bold); } .screen-content .profiles-row .profiles-close { width: 44px; height: 44px; display: grid; place-items: center; border: 0; border-radius: var(--radius-md); color: var(--text-secondary); background: transparent; font-size: 22px; cursor: pointer; } .screen-content .profiles-row .profiles-close:hover { background: var(--surface-selected); color: var(--danger); } + +/* Экран управления отношениями с другим пользователем. */ +.relation-manage-screen { gap: var(--space-3); } +.relation-manage-status:empty { display: none; } +.relation-manage-body { gap: var(--space-3); } +.relation-manage-body.is-busy { opacity: .72; pointer-events: none; } +.relation-manage-card { gap: var(--space-3); } +.relation-manage-card-head { display: grid; gap: 2px; } +.relation-manage-card-head > strong { color: var(--text-primary); font-size: var(--text-md); } +.relation-manage-card-head > span { color: var(--text-secondary); font-size: var(--text-xs); } +.relation-manage-current { display: grid; border: 1px solid var(--border-subtle); border-radius: var(--radius-md); overflow: hidden; } +.relation-manage-current-row { min-height: 48px; padding: 8px 12px; display: flex; align-items: center; justify-content: space-between; gap: var(--space-3); border-top: 1px solid var(--border-subtle); } +.relation-manage-current-row:first-child { border-top: 0; } +.relation-manage-current-row > span { color: var(--text-secondary); font-size: var(--text-sm); } +.relation-manage-current-row > strong { color: var(--text-primary); font-size: var(--text-sm); text-align: right; } +.relation-manage-mutual { min-height: 52px; padding: 10px 12px; display: flex; align-items: center; justify-content: center; gap: 5px; border: 1px solid var(--border-subtle); border-radius: var(--radius-md); background: var(--surface-selected); } +.relation-manage-mutual-label { color: var(--text-secondary); } +.relation-manage-mutual > strong { color: var(--text-primary); } +.relation-manage-choices { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: var(--space-2); } +.relation-manage-choice { width: 100%; min-width: 0; } +.relation-manage-choice.is-active { background: var(--surface-selected); border-color: var(--accent); color: var(--accent); } +.relation-manage-confirmations { display: grid; gap: 6px; } +.relation-manage-confirmations:empty { display: none; } +.relation-manage-confirmation { padding: 9px 11px; border-radius: var(--radius-md); background: var(--surface-selected); color: var(--text-primary); font-size: var(--text-sm); line-height: var(--leading-sm); } +.relation-manage-confirm-btn { width: 100%; } +.relation-manage-card--official { border-color: color-mix(in srgb, var(--rel-family) 45%, var(--border-subtle)); } +.relation-manage-card--shine { border-color: color-mix(in srgb, var(--rel-shining) 45%, var(--border-subtle)); } + +@media (max-width: 420px) { + .relation-manage-choices { grid-template-columns: 1fr; } + .relation-manage-current-row { align-items: flex-start; } +}