Связи - интересно но надо дорабатывать

# Conflicts:
#	shine-UI/styles/components.css

.gitignore

@@ -105,6 +105,7 @@ ESP32/**/*.a
 # Полные серверные бэкапы (тяжёлые архивы, не коммитим)
 deploy/backup/archive/**
 !deploy/backup/archive/.gitkeep
+SHiNE-bundle-*.zip
 
 # Локальная дев-обвязка AI-агентов (сессии, планы, настройки) — не коммитим
 .agents/

SHiNE-server/AGENTS.md

@@ -23,7 +23,7 @@ SHiNE-server — серверная часть мессенджера SHiNE: Web
 
 - **адрес сервера** (URL WebSocket/HTTPS, например `https://shineup.me/ws`);
 - **список серверов синхронизации** (`sync_servers`) — логины SHiNE-аккаунтов серверов-партнёров,
-  с которыми синхронизируются блоки и DM;
+  с которыми синхронизируются пользовательские блокчейны;
 - **корневой ключ** сервера (`root_key`).
 
 Клиенты читают PDA напрямую из Solana, чтобы узнать адрес сервера и при необходимости подключиться.
@@ -49,7 +49,9 @@ shine-UI/server-ui.html
 
 ## Синхронизация с партнёрскими серверами
 
-Сервер должен синхронизировать блоки блокчейна и DM с серверами-партнёрами из `sync_servers`.
+Сервер должен синхронизировать блоки пользовательских блокчейнов с
+серверами-партнёрами из `sync_servers`. DM между партнёрами не реплицируются:
+они доставляются только на первый access-сервер получателя.
 Детали: `docs/Blockchain/sync-between-servers.md`
 
 ## Деплой

SHiNE-server/shine-server-blockchain/src/main/java/blockchain/BodyRecordParser.java

@@ -36,6 +36,10 @@ public final class BodyRecordParser {
             case TextBody.KEY -> {
                 if (st == (MsgSubType.TEXT_POST & 0xFFFF)
                         || st == (MsgSubType.TEXT_EDIT_POST & 0xFFFF)
+                        || st == (MsgSubType.TEXT_EXERCISE & 0xFFFF)
+                        || st == (MsgSubType.TEXT_SERVICE & 0xFFFF)
+                        || st == (MsgSubType.TEXT_COURSE & 0xFFFF)
+                        || st == (MsgSubType.TEXT_ENTRYPOINT & 0xFFFF)
                         || st == (MsgSubType.TEXT_REPOST & 0xFFFF)
                         || st == (MsgSubType.TEXT_CHANNEL_META & 0xFFFF)) {
                     yield new TextLineBody(subType, version, bodyBytes);
@@ -46,12 +50,17 @@ public final class BodyRecordParser {
                     yield new TextReplyBody(subType, version, bodyBytes);
                 }
 
+                if (st == (MsgSubType.TEXT_RATING & 0xFFFF)) {
+                    yield new TextRatingBody(subType, version, bodyBytes);
+                }
+
                 throw new IllegalArgumentException("Unknown TEXT subType for type=1 ver=1: subType=" + st);
             }
 
             case ReactionBody.KEY -> new ReactionBody(subType, version, bodyBytes);
             case ConnectionBody.KEY -> new ConnectionBody(subType, version, bodyBytes);
             case UserParamBody.KEY -> new UserParamBody(subType, version, bodyBytes);
+            case StatusActionBody.KEY -> new StatusActionBody(subType, version, bodyBytes);
 
             default -> throw new IllegalArgumentException(String.format(
                     "Unknown body type/version from header: type=%d ver=%d subType=%d",

SHiNE-server/shine-server-blockchain/src/main/java/blockchain/MsgSubType.java

@@ -64,17 +64,29 @@ public final class MsgSubType {
      */
     public static final short TEXT_EDIT_REPLY = 21;
 
+    /** RATING — target-based отзыв на конкретный блок. */
+    public static final short TEXT_RATING = 30;
+
     /**
-     * REPOST — репост сообщения в линии канала.
+     * REPOST — отложенная будущая заготовка репоста сообщения в линии канала.
      * Имеет hasLine + target (toBlockchainName + toBlockGlobalNumber + toBlockHash32) + текст комментария.
      */
-    public static final short TEXT_REPOST = 30;
+    public static final short TEXT_REPOST = 50;
 
     /**
      * CHANNEL_META — скрытый технический снимок профиля канала.
      * Имеет hasLine, использует body как POST: line-поля + UTF-8 текст.
      */
-    public static final short TEXT_CHANNEL_META = 70;
+    public static final short TEXT_CHANNEL_META = 90;
+
+    /** ENTRYPOINT — входная страница канала (line-based). */
+    public static final short TEXT_ENTRYPOINT = 100;
+    /** EXERCISE — упражнение/комплекс (line-based). */
+    public static final short TEXT_EXERCISE = 110;
+    /** SERVICE — услуга/процедура (line-based). */
+    public static final short TEXT_SERVICE = 120;
+    /** COURSE — курс (line-based). */
+    public static final short TEXT_COURSE = 130;
 
     /* ===================== REACTION (msg_type=2) ===================== */
 
@@ -86,25 +98,27 @@ public final class MsgSubType {
     /* ===================== CONNECTION (msg_type=3) ===================== */
 
     /** Добавить в близкие друзья (close friend). */
-    public static final short CONNECTION_FRIEND = 10;
+    public static final short CONNECTION_CLOSE_FRIEND = 10;
     /** Удалить из близких друзей (close friend). */
-    public static final short CONNECTION_UNFRIEND = 11;
+    public static final short CONNECTION_UNCLOSE_FRIEND = 11;
 
-    /** Alias: добавить в close friend (то же значение, что CONNECTION_FRIEND). */
-    public static final short CONNECTION_CLOSE_FRIEND = CONNECTION_FRIEND;
-    /** Alias: удалить из close friend (то же значение, что CONNECTION_UNFRIEND). */
-    public static final short CONNECTION_UNCLOSE_FRIEND = CONNECTION_UNFRIEND;
+    /** Добавить в друзья. */
+    public static final short CONNECTION_FRIEND = 14;
+    /** Удалить из друзей. */
+    public static final short CONNECTION_UNFRIEND = 15;
 
     /** Добавить в контакты. */
     public static final short CONNECTION_CONTACT = 20;
     /** Удалить из контактов. */
     public static final short CONNECTION_UNCONTACT = 21;
 
+    // FOLLOW на публичный канал используется. Старый FOLLOW пользователя (target header/block 0) считается legacy. DO NOT REMOVE.
     /** Подписаться (follow). */
     public static final short CONNECTION_FOLLOW = 30;
     /** Отписаться (unfollow). */
     public static final short CONNECTION_UNFOLLOW = 31;
 
+    // Родственные связи пока не используются в UI. Сохраняем коды. DO NOT REMOVE.
     /** Добавить связь "жена/муж". */
     public static final short CONNECTION_SPOUSE = 40;
     /** Удалить связь "жена/муж". */
@@ -125,9 +139,8 @@ public final class MsgSubType {
     /** Удалить связь "брат/сестра". */
     public static final short CONNECTION_UNSIBLING = 55;
 
-    /** Просто знаю этого человека. */
+    // Legacy. Допускаем старые блоки 60/61, но новый UI их не создаёт и не использует. DO NOT REMOVE.
     public static final short CONNECTION_KNOWN_PERSON = 60;
-    /** Не знаю этого человека. */
     public static final short CONNECTION_UNKNOWN_PERSON = 61;
 
     /** Точно уверен, что сияющий. */
@@ -135,13 +148,31 @@ public final class MsgSubType {
     /** Не подтверждаю, что сияющий. */
     public static final short CONNECTION_SHINE_UNCONFIRMED = 71;
 
+    // Пока не используется в UI. Сохраняем для совместимости протокола/блокчейна. DO NOT REMOVE.
     /** Мало знаком, но видел сияющим. */
     public static final short CONNECTION_SHINE_SEEN = 74;
     /** Не отмечаю, что видел сияющим. */
     public static final short CONNECTION_SHINE_UNSEEN = 75;
 
+    /** Подтверждаю, что это действительно официальный аккаунт этого человека. */
+    public static final short CONNECTION_OFFICIAL_ACCOUNT_CONFIRMED = 80;
+    /** Снимаю подтверждение официального аккаунта этого человека. */
+    public static final short CONNECTION_OFFICIAL_ACCOUNT_UNCONFIRMED = 81;
+
     /* ===================== USER_PARAM (msg_type=4) ===================== */
 
     /** Параметр профиля key/value (обе строки). */
     public static final short USER_PARAM_TEXT_TEXT = 1;
+
+    /* ===================== STATUS_ACTION (msg_type=5) ===================== */
+
+    public static final short STATUS_DONE_ONCE = 10;
+    public static final short STATUS_LEARNED = 20;
+    public static final short STATUS_SERVICE_PASSED = 30;
+    public static final short STATUS_CONFIRMED = 100;
+    public static final short STATUS_INTERESTED = 110;
+    public static final short STATUS_STARTED = 120;
+    public static final short STATUS_IN_STUDY = 130;
+    public static final short STATUS_ABANDONED = 140;
+    public static final short STATUS_COMPLETED = 150;
 }

SHiNE-server/shine-server-blockchain/src/main/java/blockchain/body/ConnectionBody.java

@@ -20,9 +20,11 @@ import java.util.Objects;
  *   PARENT=50, UNPARENT=51
  *   CHILD=52, UNCHILD=53
  *   SIBLING=54, UNSIBLING=55
- *   KNOWN_PERSON=60, UNKNOWN_PERSON=61
+ *   FRIEND=14, UNFRIEND=15
+ *   KNOWN_PERSON=60, UNKNOWN_PERSON=61 (legacy; accepted but not used by current UI)
  *   SHINE_CONFIRMED=70, SHINE_UNCONFIRMED=71
- *   SHINE_SEEN=74, SHINE_UNSEEN=75
+ *   SHINE_SEEN=74, SHINE_UNSEEN=75 (currently not used by UI)
+ *   OFFICIAL_ACCOUNT_CONFIRMED=80, OFFICIAL_ACCOUNT_UNCONFIRMED=81
  *
  * bodyBytes (BigEndian), новый формат (toLogin НЕ ХРАНИМ):
  *   [4]  lineCode
@@ -66,7 +68,7 @@ import java.util.Objects;
  *                     toBlockHash32=hash32(CREATE_CHANNEL)
  *
  *  3) ЗАПРЕТЫ ВАЛИДАЦИИ (желательно на сервере/в БД):
- *     - CONNECTION_FRIEND/CONTACT не могут ссылаться на не-HEADER (toBlockNumber != 0 запрещено).
+ *     - CONNECTION_CLOSE_FRIEND/CONTACT не могут ссылаться на не-HEADER (toBlockNumber != 0 запрещено).
  *     - FOLLOW на канал "X" не может ссылаться на произвольный пост внутри канала:
  *       разрешено ТОЛЬКО на ROOT (HEADER или CREATE_CHANNEL).
  *
@@ -183,7 +185,9 @@ public final class ConnectionBody implements BodyRecord, BodyHasTarget, BodyHasL
 
     private static boolean isValidSubType(short st) {
         int v = st & 0xFFFF;
-        return v == (MsgSubType.CONNECTION_FRIEND & 0xFFFF)
+        return v == (MsgSubType.CONNECTION_CLOSE_FRIEND & 0xFFFF)
+                || v == (MsgSubType.CONNECTION_UNCLOSE_FRIEND & 0xFFFF)
+                || v == (MsgSubType.CONNECTION_FRIEND & 0xFFFF)
                 || v == (MsgSubType.CONNECTION_UNFRIEND & 0xFFFF)
                 || v == (MsgSubType.CONNECTION_CONTACT & 0xFFFF)
                 || v == (MsgSubType.CONNECTION_UNCONTACT & 0xFFFF)
@@ -202,7 +206,9 @@ public final class ConnectionBody implements BodyRecord, BodyHasTarget, BodyHasL
                 || v == (MsgSubType.CONNECTION_SHINE_CONFIRMED & 0xFFFF)
                 || v == (MsgSubType.CONNECTION_SHINE_UNCONFIRMED & 0xFFFF)
                 || v == (MsgSubType.CONNECTION_SHINE_SEEN & 0xFFFF)
-                || v == (MsgSubType.CONNECTION_SHINE_UNSEEN & 0xFFFF);
+                || v == (MsgSubType.CONNECTION_SHINE_UNSEEN & 0xFFFF)
+                || v == (MsgSubType.CONNECTION_OFFICIAL_ACCOUNT_CONFIRMED & 0xFFFF)
+                || v == (MsgSubType.CONNECTION_OFFICIAL_ACCOUNT_UNCONFIRMED & 0xFFFF);
     }
 
     @Override

SHiNE-server/shine-server-blockchain/src/main/java/blockchain/body/StatusActionBody.java

@@ -0,0 +1,166 @@
+package blockchain.body;
+
+import blockchain.MsgSubType;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.charset.CharacterCodingException;
+import java.nio.charset.CodingErrorAction;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.Objects;
+
+/**
+ * StatusActionBody — type=5, ver=1.
+ *
+ * Все STATUS_ACTION имеют target на конкретный блок и опциональный текст-пояснение.
+ *
+ * Формат bodyBytes (BigEndian):
+ *   [1] toBlockchainNameLen (uint8)
+ *   [N] toBlockchainName UTF-8
+ *   [4] toBlockGlobalNumber
+ *   [32] toBlockHash32
+ *   [2] textLenBytes (uint16)
+ *   [M] text UTF-8
+ */
+public final class StatusActionBody implements BodyRecord, BodyHasTarget {
+
+    public static final short TYPE = 5;
+    public static final short VER = 1;
+    public static final int KEY = ((TYPE & 0xFFFF) << 16) | (VER & 0xFFFF);
+
+    public final short subType;
+    public final short version;
+    public final String toBlockchainName;
+    public final int toBlockGlobalNumber;
+    public final byte[] toBlockHash32;
+    public final String message;
+
+    public StatusActionBody(short subType, short version, byte[] bodyBytes) {
+        Objects.requireNonNull(bodyBytes, "bodyBytes == null");
+        this.subType = subType;
+        this.version = version;
+
+        if ((version & 0xFFFF) != (VER & 0xFFFF)) {
+            throw new IllegalArgumentException("StatusActionBody version must be 1, got=" + (version & 0xFFFF));
+        }
+        if (!isSupportedSubType(subType)) {
+            throw new IllegalArgumentException("Unsupported STATUS_ACTION subType: " + (subType & 0xFFFF));
+        }
+
+        ByteBuffer bb = ByteBuffer.wrap(bodyBytes).order(ByteOrder.BIG_ENDIAN);
+        ensureMin(bb, 1 + 1 + 4 + 32 + 2, "STATUS_ACTION too short");
+
+        int nameLen = Byte.toUnsignedInt(bb.get());
+        if (nameLen <= 0) throw new IllegalArgumentException("STATUS_ACTION toBlockchainNameLen is 0");
+        ensureMin(bb, nameLen + 4 + 32 + 2, "STATUS_ACTION payload too short");
+
+        byte[] nameBytes = new byte[nameLen];
+        bb.get(nameBytes);
+        this.toBlockchainName = new String(nameBytes, StandardCharsets.UTF_8);
+        this.toBlockGlobalNumber = bb.getInt();
+        this.toBlockHash32 = new byte[32];
+        bb.get(this.toBlockHash32);
+        this.message = readStrictUtf8Len16AllowEmpty(bb, "StatusActionBody text");
+
+        ensureNoTail(bb, "StatusActionBody");
+    }
+
+    public StatusActionBody(short subType, String toBlockchainName, int toBlockGlobalNumber, byte[] toBlockHash32, String message) {
+        Objects.requireNonNull(toBlockchainName, "toBlockchainName == null");
+        Objects.requireNonNull(toBlockHash32, "toBlockHash32 == null");
+        Objects.requireNonNull(message, "message == null");
+        if (!isSupportedSubType(subType)) throw new IllegalArgumentException("Unsupported STATUS_ACTION subType");
+        if (toBlockchainName.isBlank()) throw new IllegalArgumentException("toBlockchainName is blank");
+        if (toBlockGlobalNumber < 0) throw new IllegalArgumentException("toBlockGlobalNumber < 0");
+        if (toBlockHash32.length != 32) throw new IllegalArgumentException("toBlockHash32 != 32");
+
+        this.subType = subType;
+        this.version = VER;
+        this.toBlockchainName = toBlockchainName;
+        this.toBlockGlobalNumber = toBlockGlobalNumber;
+        this.toBlockHash32 = Arrays.copyOf(toBlockHash32, 32);
+        this.message = message;
+    }
+
+    @Override
+    public StatusActionBody check() {
+        if (!isSupportedSubType(subType)) {
+            throw new IllegalArgumentException("Bad STATUS_ACTION subType: " + (subType & 0xFFFF));
+        }
+        if (toBlockchainName == null || toBlockchainName.isBlank()) {
+            throw new IllegalArgumentException("STATUS_ACTION toBlockchainName is blank");
+        }
+        if (toBlockGlobalNumber < 0) throw new IllegalArgumentException("toBlockGlobalNumber < 0");
+        if (toBlockHash32 == null || toBlockHash32.length != 32) {
+            throw new IllegalArgumentException("toBlockHash32 invalid");
+        }
+        if (message == null) throw new IllegalArgumentException("message is null");
+        return this;
+    }
+
+    @Override
+    public byte[] toBytes() {
+        byte[] msgUtf8 = message.getBytes(StandardCharsets.UTF_8);
+        if (msgUtf8.length > 65535) throw new IllegalArgumentException("Text too long (>65535 bytes)");
+
+        byte[] nameUtf8 = toBlockchainName.getBytes(StandardCharsets.UTF_8);
+        if (nameUtf8.length == 0 || nameUtf8.length > 255) {
+            throw new IllegalArgumentException("STATUS_ACTION toBlockchainName utf8 len must be 1..255");
+        }
+
+        ByteBuffer bb = ByteBuffer.allocate(1 + nameUtf8.length + 4 + 32 + 2 + msgUtf8.length)
+                .order(ByteOrder.BIG_ENDIAN);
+        bb.put((byte) nameUtf8.length);
+        bb.put(nameUtf8);
+        bb.putInt(toBlockGlobalNumber);
+        bb.put(toBlockHash32);
+        bb.putShort((short) msgUtf8.length);
+        bb.put(msgUtf8);
+        return bb.array();
+    }
+
+    @Override public String toBchName() { return toBlockchainName; }
+    @Override public Integer toBlockGlobalNumber() { return toBlockGlobalNumber; }
+    @Override public byte[] toBlockHashBytes() { return toBlockHash32; }
+
+    private static boolean isSupportedSubType(short subType) {
+        int st = subType & 0xFFFF;
+        return st == (MsgSubType.STATUS_DONE_ONCE & 0xFFFF)
+                || st == (MsgSubType.STATUS_LEARNED & 0xFFFF)
+                || st == (MsgSubType.STATUS_SERVICE_PASSED & 0xFFFF)
+                || st == (MsgSubType.STATUS_CONFIRMED & 0xFFFF)
+                || st == (MsgSubType.STATUS_INTERESTED & 0xFFFF)
+                || st == (MsgSubType.STATUS_STARTED & 0xFFFF)
+                || st == (MsgSubType.STATUS_IN_STUDY & 0xFFFF)
+                || st == (MsgSubType.STATUS_ABANDONED & 0xFFFF)
+                || st == (MsgSubType.STATUS_COMPLETED & 0xFFFF);
+    }
+
+    private static String readStrictUtf8Len16AllowEmpty(ByteBuffer bb, String fieldName) {
+        int len = Short.toUnsignedInt(bb.getShort());
+        if (len == 0) return "";
+        if (bb.remaining() < len) throw new IllegalArgumentException(fieldName + " payload too short (len=" + len + ")");
+
+        byte[] bytes = new byte[len];
+        bb.get(bytes);
+
+        var decoder = StandardCharsets.UTF_8.newDecoder()
+                .onMalformedInput(CodingErrorAction.REPORT)
+                .onUnmappableCharacter(CodingErrorAction.REPORT);
+
+        try {
+            return decoder.decode(ByteBuffer.wrap(bytes)).toString();
+        } catch (CharacterCodingException e) {
+            throw new IllegalArgumentException(fieldName + " is not valid UTF-8", e);
+        }
+    }
+
+    private static void ensureMin(ByteBuffer bb, int need, String msg) {
+        if (bb.remaining() < need) throw new IllegalArgumentException(msg + " (need=" + need + ", remaining=" + bb.remaining() + ")");
+    }
+
+    private static void ensureNoTail(ByteBuffer bb, String ctx) {
+        if (bb.remaining() != 0) throw new IllegalArgumentException("Unexpected tail bytes for " + ctx + ", remaining=" + bb.remaining());
+    }
+}

SHiNE-server/shine-server-blockchain/src/main/java/blockchain/body/TextLineBody.java

@@ -16,12 +16,16 @@ import java.util.Objects;
  * subType:
  *  - POST      (10)
  *  - EDIT_POST (11)
- *  - REPOST    (30)
- *  - CHANNEL_META (70)
+ *  - REPOST    (50)
+ *  - CHANNEL_META (90)
+ *  - ENTRYPOINT (100)
+ *  - EXERCISE (110)
+ *  - SERVICE (120)
+ *  - COURSE (130)
  *
  * Формат bodyBytes (BigEndian):
  *
- * POST / CHANNEL_META:
+ * POST / CHANNEL_META / ENTRYPOINT / EXERCISE / SERVICE / COURSE:
  *   [4]  lineCode
  *   [4]  prevLineNumber
  *   [32] prevLineHash32
@@ -91,7 +95,11 @@ public final class TextLineBody implements BodyRecord, BodyHasLine, BodyHasTarge
         if (st != (MsgSubType.TEXT_POST & 0xFFFF)
                 && st != (MsgSubType.TEXT_EDIT_POST & 0xFFFF)
                 && st != (MsgSubType.TEXT_REPOST & 0xFFFF)
-                && st != (MsgSubType.TEXT_CHANNEL_META & 0xFFFF)) {
+                && st != (MsgSubType.TEXT_CHANNEL_META & 0xFFFF)
+                && st != (MsgSubType.TEXT_ENTRYPOINT & 0xFFFF)
+                && st != (MsgSubType.TEXT_EXERCISE & 0xFFFF)
+                && st != (MsgSubType.TEXT_SERVICE & 0xFFFF)
+                && st != (MsgSubType.TEXT_COURSE & 0xFFFF)) {
             throw new IllegalArgumentException("TextLineBody supports only POST/EDIT_POST/REPOST/CHANNEL_META, got subType=" + st);
         }
 
@@ -159,12 +167,16 @@ public final class TextLineBody implements BodyRecord, BodyHasLine, BodyHasTarge
         if (st != (MsgSubType.TEXT_POST & 0xFFFF)
                 && st != (MsgSubType.TEXT_EDIT_POST & 0xFFFF)
                 && st != (MsgSubType.TEXT_REPOST & 0xFFFF)
-                && st != (MsgSubType.TEXT_CHANNEL_META & 0xFFFF)) {
+                && st != (MsgSubType.TEXT_CHANNEL_META & 0xFFFF)
+                && st != (MsgSubType.TEXT_ENTRYPOINT & 0xFFFF)
+                && st != (MsgSubType.TEXT_EXERCISE & 0xFFFF)
+                && st != (MsgSubType.TEXT_SERVICE & 0xFFFF)
+                && st != (MsgSubType.TEXT_COURSE & 0xFFFF)) {
             throw new IllegalArgumentException("TextLineBody supports only POST/EDIT_POST/REPOST/CHANNEL_META");
         }
 
         if (lineCode < 0) throw new IllegalArgumentException("lineCode < 0");
-        if (st == (MsgSubType.TEXT_POST & 0xFFFF) && message.isBlank()) {
+        if (requiresNonBlankMessage(st) && message.isBlank()) {
             throw new IllegalArgumentException("message is blank");
         }
 
@@ -211,7 +223,11 @@ public final class TextLineBody implements BodyRecord, BodyHasLine, BodyHasTarge
         if (st != (MsgSubType.TEXT_POST & 0xFFFF)
                 && st != (MsgSubType.TEXT_EDIT_POST & 0xFFFF)
                 && st != (MsgSubType.TEXT_REPOST & 0xFFFF)
-                && st != (MsgSubType.TEXT_CHANNEL_META & 0xFFFF))
+                && st != (MsgSubType.TEXT_CHANNEL_META & 0xFFFF)
+                && st != (MsgSubType.TEXT_ENTRYPOINT & 0xFFFF)
+                && st != (MsgSubType.TEXT_EXERCISE & 0xFFFF)
+                && st != (MsgSubType.TEXT_SERVICE & 0xFFFF)
+                && st != (MsgSubType.TEXT_COURSE & 0xFFFF))
             throw new IllegalArgumentException("Bad TextLineBody subType: " + st);
 
         if (lineCode < 0) throw new IllegalArgumentException("lineCode < 0");
@@ -238,8 +254,10 @@ public final class TextLineBody implements BodyRecord, BodyHasLine, BodyHasTarge
         } else {
             if (st == (MsgSubType.TEXT_CHANNEL_META & 0xFFFF)) {
                 if (message == null) throw new IllegalArgumentException("CHANNEL_META message is null");
-            } else if (message == null || message.isBlank()) {
+            } else if (requiresNonBlankMessage(st) && (message == null || message.isBlank())) {
                 throw new IllegalArgumentException("Text message is blank");
+            } else if (message == null) {
+                throw new IllegalArgumentException("Text message is null");
             }
             if (toBlockchainName != null || toBlockGlobalNumber != null || toBlockHash32 != null)
                 throw new IllegalArgumentException("POST/CHANNEL_META must not contain target fields");
@@ -254,12 +272,17 @@ public final class TextLineBody implements BodyRecord, BodyHasLine, BodyHasTarge
         if (msgUtf8.length > 65535) throw new IllegalArgumentException("Text too long (>65535 bytes)");
 
         int st = subType & 0xFFFF;
-        if (st == (MsgSubType.TEXT_POST & 0xFFFF) && msgUtf8.length == 0) {
+        if (requiresNonBlankMessage(st) && msgUtf8.length == 0) {
             throw new IllegalArgumentException("Text payload is empty");
         }
 
         int cap;
-        if (st == (MsgSubType.TEXT_POST & 0xFFFF) || st == (MsgSubType.TEXT_CHANNEL_META & 0xFFFF)) {
+        if (st == (MsgSubType.TEXT_POST & 0xFFFF)
+                || st == (MsgSubType.TEXT_CHANNEL_META & 0xFFFF)
+                || st == (MsgSubType.TEXT_ENTRYPOINT & 0xFFFF)
+                || st == (MsgSubType.TEXT_EXERCISE & 0xFFFF)
+                || st == (MsgSubType.TEXT_SERVICE & 0xFFFF)
+                || st == (MsgSubType.TEXT_COURSE & 0xFFFF)) {
             cap = (4 + 4 + 32 + 4) + 2 + msgUtf8.length;
         } else if (st == (MsgSubType.TEXT_EDIT_POST & 0xFFFF)) {
             // EDIT_POST
@@ -318,6 +341,15 @@ public final class TextLineBody implements BodyRecord, BodyHasLine, BodyHasTarge
         return (subType & 0xFFFF) == (MsgSubType.TEXT_EDIT_POST & 0xFFFF);
     }
 
+    private static boolean requiresNonBlankMessage(int st) {
+        return st == (MsgSubType.TEXT_POST & 0xFFFF)
+                || st == (MsgSubType.TEXT_REPOST & 0xFFFF)
+                || st == (MsgSubType.TEXT_ENTRYPOINT & 0xFFFF)
+                || st == (MsgSubType.TEXT_EXERCISE & 0xFFFF)
+                || st == (MsgSubType.TEXT_SERVICE & 0xFFFF)
+                || st == (MsgSubType.TEXT_COURSE & 0xFFFF);
+    }
+
     private static String readStrictUtf8Len16(ByteBuffer bb, String fieldName, boolean allowEmpty) {
         int len = Short.toUnsignedInt(bb.getShort());
         if (len == 0) {

SHiNE-server/shine-server-blockchain/src/main/java/blockchain/body/TextRatingBody.java

@@ -0,0 +1,157 @@
+package blockchain.body;
+
+import blockchain.MsgSubType;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.charset.CharacterCodingException;
+import java.nio.charset.CodingErrorAction;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.Objects;
+
+/**
+ * TextRatingBody — type=1, ver=1.
+ *
+ * subType:
+ *  - RATING (30)
+ *
+ * Формат bodyBytes (BigEndian):
+ *   [1] toBlockchainNameLen (uint8)
+ *   [N] toBlockchainName UTF-8
+ *   [4] toBlockGlobalNumber
+ *   [32] toBlockHash32
+ *   [2] textLenBytes (uint16)
+ *   [M] text UTF-8
+ */
+public final class TextRatingBody implements BodyRecord, BodyHasTarget {
+
+    public static final short TYPE = 1;
+    public static final short VER = 1;
+    public static final int KEY = ((TYPE & 0xFFFF) << 16) | (VER & 0xFFFF);
+
+    public final short subType;
+    public final short version;
+    public final String toBlockchainName;
+    public final int toBlockGlobalNumber;
+    public final byte[] toBlockHash32;
+    public final String message;
+
+    public TextRatingBody(short subType, short version, byte[] bodyBytes) {
+        Objects.requireNonNull(bodyBytes, "bodyBytes == null");
+        this.subType = subType;
+        this.version = version;
+
+        if ((version & 0xFFFF) != (VER & 0xFFFF)) {
+            throw new IllegalArgumentException("TextRatingBody version must be 1, got=" + (version & 0xFFFF));
+        }
+        if ((subType & 0xFFFF) != (MsgSubType.TEXT_RATING & 0xFFFF)) {
+            throw new IllegalArgumentException("TextRatingBody supports only TEXT_RATING");
+        }
+
+        ByteBuffer bb = ByteBuffer.wrap(bodyBytes).order(ByteOrder.BIG_ENDIAN);
+        ensureMin(bb, 1 + 1 + 4 + 32 + 2, "RATING too short");
+
+        int nameLen = Byte.toUnsignedInt(bb.get());
+        if (nameLen <= 0) throw new IllegalArgumentException("RATING toBlockchainNameLen is 0");
+        ensureMin(bb, nameLen + 4 + 32 + 2, "RATING payload too short");
+
+        byte[] nameBytes = new byte[nameLen];
+        bb.get(nameBytes);
+        this.toBlockchainName = new String(nameBytes, StandardCharsets.UTF_8);
+        this.toBlockGlobalNumber = bb.getInt();
+        this.toBlockHash32 = new byte[32];
+        bb.get(this.toBlockHash32);
+        this.message = readStrictUtf8Len16(bb, "TextRatingBody text");
+
+        ensureNoTail(bb, "TextRatingBody");
+    }
+
+    public TextRatingBody(String toBlockchainName, int toBlockGlobalNumber, byte[] toBlockHash32, String message) {
+        Objects.requireNonNull(toBlockchainName, "toBlockchainName == null");
+        Objects.requireNonNull(toBlockHash32, "toBlockHash32 == null");
+        Objects.requireNonNull(message, "message == null");
+        if (toBlockchainName.isBlank()) throw new IllegalArgumentException("toBlockchainName is blank");
+        if (toBlockGlobalNumber < 0) throw new IllegalArgumentException("toBlockGlobalNumber < 0");
+        if (toBlockHash32.length != 32) throw new IllegalArgumentException("toBlockHash32 != 32");
+        if (message.isBlank()) throw new IllegalArgumentException("message is blank");
+
+        this.subType = MsgSubType.TEXT_RATING;
+        this.version = VER;
+        this.toBlockchainName = toBlockchainName;
+        this.toBlockGlobalNumber = toBlockGlobalNumber;
+        this.toBlockHash32 = Arrays.copyOf(toBlockHash32, 32);
+        this.message = message;
+    }
+
+    @Override
+    public TextRatingBody check() {
+        if ((subType & 0xFFFF) != (MsgSubType.TEXT_RATING & 0xFFFF)) {
+            throw new IllegalArgumentException("Bad TextRatingBody subType: " + (subType & 0xFFFF));
+        }
+        if (toBlockchainName == null || toBlockchainName.isBlank()) {
+            throw new IllegalArgumentException("RATING toBlockchainName is blank");
+        }
+        if (toBlockGlobalNumber < 0) throw new IllegalArgumentException("toBlockGlobalNumber < 0");
+        if (toBlockHash32 == null || toBlockHash32.length != 32) {
+            throw new IllegalArgumentException("toBlockHash32 invalid");
+        }
+        if (message == null || message.isBlank()) throw new IllegalArgumentException("message is blank");
+        return this;
+    }
+
+    @Override
+    public byte[] toBytes() {
+        byte[] msgUtf8 = message.getBytes(StandardCharsets.UTF_8);
+        if (msgUtf8.length == 0) throw new IllegalArgumentException("Text payload is empty");
+        if (msgUtf8.length > 65535) throw new IllegalArgumentException("Text too long (>65535 bytes)");
+
+        byte[] nameUtf8 = toBlockchainName.getBytes(StandardCharsets.UTF_8);
+        if (nameUtf8.length == 0 || nameUtf8.length > 255) {
+            throw new IllegalArgumentException("RATING toBlockchainName utf8 len must be 1..255");
+        }
+
+        ByteBuffer bb = ByteBuffer.allocate(1 + nameUtf8.length + 4 + 32 + 2 + msgUtf8.length)
+                .order(ByteOrder.BIG_ENDIAN);
+        bb.put((byte) nameUtf8.length);
+        bb.put(nameUtf8);
+        bb.putInt(toBlockGlobalNumber);
+        bb.put(toBlockHash32);
+        bb.putShort((short) msgUtf8.length);
+        bb.put(msgUtf8);
+        return bb.array();
+    }
+
+    @Override public String toBchName() { return toBlockchainName; }
+    @Override public Integer toBlockGlobalNumber() { return toBlockGlobalNumber; }
+    @Override public byte[] toBlockHashBytes() { return toBlockHash32; }
+
+    private static String readStrictUtf8Len16(ByteBuffer bb, String fieldName) {
+        int len = Short.toUnsignedInt(bb.getShort());
+        if (len == 0) throw new IllegalArgumentException(fieldName + " is empty");
+        if (bb.remaining() < len) throw new IllegalArgumentException(fieldName + " payload too short (len=" + len + ")");
+
+        byte[] bytes = new byte[len];
+        bb.get(bytes);
+
+        var decoder = StandardCharsets.UTF_8.newDecoder()
+                .onMalformedInput(CodingErrorAction.REPORT)
+                .onUnmappableCharacter(CodingErrorAction.REPORT);
+
+        try {
+            String s = decoder.decode(ByteBuffer.wrap(bytes)).toString();
+            if (s.isBlank()) throw new IllegalArgumentException(fieldName + " is blank");
+            return s;
+        } catch (CharacterCodingException e) {
+            throw new IllegalArgumentException(fieldName + " is not valid UTF-8", e);
+        }
+    }
+
+    private static void ensureMin(ByteBuffer bb, int need, String msg) {
+        if (bb.remaining() < need) throw new IllegalArgumentException(msg + " (need=" + need + ", remaining=" + bb.remaining() + ")");
+    }
+
+    private static void ensureNoTail(ByteBuffer bb, String ctx) {
+        if (bb.remaining() != 0) throw new IllegalArgumentException("Unexpected tail bytes for " + ctx + ", remaining=" + bb.remaining());
+    }
+}

SHiNE-server/shine-server-config/src/main/java/utils/config/ShineSignatureConstants.java

@@ -14,6 +14,12 @@ public final class ShineSignatureConstants {
     /** Подписываемые данные параметра пользователя: prefix + login + param + time_ms + value */
     public static final String USER_PARAMETER_PREFIX = "SHiNe/UserParameter:";
 
+    /** Подписываемые данные пользовательских настроек: prefix + login + type + key + time_ms + value_text + value_num */
+    public static final String USER_SETTINGS_PREFIX = "SHiNe/UserSettings:";
+
+    /** Подписанный watermark чтения канала: prefix + login + owner_bch_name + channel_name + time_ms + read_count */
+    public static final String CHANNEL_READ_STATE_PREFIX = "SHiNe/ChannelReadState:";
+
     /** TAG в HeaderBody (genesis). ASCII "SHiNe". */
     public static final String BLOCKCHAIN_HEADER_TAG = "SHiNe";
 
@@ -31,4 +37,4 @@ public final class ShineSignatureConstants {
 
     /** Длина публичного ключа Ed25519. */
     public static final int ED25519_PUBLIC_KEY32_LEN = 32;
-}
+}

SHiNE-server/shine-server-db/src/main/java/shine/db/DatabaseInitializer.java

@@ -21,10 +21,44 @@ public final class DatabaseInitializer {
     public static final int SCHEMA_VERSION_2 = 2;
     public static final int SCHEMA_VERSION_3 = 3;
     public static final int SCHEMA_VERSION_4 = 4;
+    public static final int SCHEMA_VERSION_5 = 5;
+    public static final int SCHEMA_VERSION_6 = 6;
+    public static final int SCHEMA_VERSION_7 = 7;
+    public static final int SCHEMA_VERSION_8 = 8;
+    public static final int SCHEMA_VERSION_9 = 9;
+    public static final int SCHEMA_VERSION_10 = 10;
+    public static final int SCHEMA_VERSION_11 = 11;
+    public static final int SCHEMA_VERSION_12 = 12;
+    public static final int SCHEMA_VERSION_13 = 13;
+    public static final int SCHEMA_VERSION_14 = 14;
+    public static final int SCHEMA_VERSION_15 = 15;
+    public static final int SCHEMA_VERSION_16 = 16;
+    public static final int SCHEMA_VERSION_17 = 17;
+    public static final int SCHEMA_VERSION_18 = 18;
+    public static final int SCHEMA_VERSION_19 = 19;
+    public static final int SCHEMA_VERSION_20 = 20;
+    public static final int SCHEMA_VERSION_21 = 21;
     public static final String POSTGRES_SCHEMA_RESOURCE = "postgres/schema_v1.sql";
     public static final String POSTGRES_MIGRATION_V2_RESOURCE = "postgres/migration_v2.sql";
     public static final String POSTGRES_MIGRATION_V3_RESOURCE = "postgres/migration_v3.sql";
     public static final String POSTGRES_MIGRATION_V4_RESOURCE = "postgres/migration_v4.sql";
+    public static final String POSTGRES_MIGRATION_V5_RESOURCE = "postgres/migration_v5.sql";
+    public static final String POSTGRES_MIGRATION_V6_RESOURCE = "postgres/migration_v6.sql";
+    public static final String POSTGRES_MIGRATION_V7_RESOURCE = "postgres/migration_v7.sql";
+    public static final String POSTGRES_MIGRATION_V8_RESOURCE = "postgres/migration_v8.sql";
+    public static final String POSTGRES_MIGRATION_V9_RESOURCE = "postgres/migration_v9.sql";
+    public static final String POSTGRES_MIGRATION_V10_RESOURCE = "postgres/migration_v10.sql";
+    public static final String POSTGRES_MIGRATION_V11_RESOURCE = "postgres/migration_v11.sql";
+    public static final String POSTGRES_MIGRATION_V12_RESOURCE = "postgres/migration_v12.sql";
+    public static final String POSTGRES_MIGRATION_V13_RESOURCE = "postgres/migration_v13.sql";
+    public static final String POSTGRES_MIGRATION_V14_RESOURCE = "postgres/migration_v14.sql";
+    public static final String POSTGRES_MIGRATION_V15_RESOURCE = "postgres/migration_v15.sql";
+    public static final String POSTGRES_MIGRATION_V16_RESOURCE = "postgres/migration_v16.sql";
+    public static final String POSTGRES_MIGRATION_V17_RESOURCE = "postgres/migration_v17.sql";
+    public static final String POSTGRES_MIGRATION_V18_RESOURCE = "postgres/migration_v18.sql";
+    public static final String POSTGRES_MIGRATION_V19_RESOURCE = "postgres/migration_v19.sql";
+    public static final String POSTGRES_MIGRATION_V20_RESOURCE = "postgres/migration_v20.sql";
+    public static final String POSTGRES_MIGRATION_V21_RESOURCE = "postgres/migration_v21.sql";
 
     private DatabaseInitializer() {}
 
@@ -32,23 +66,31 @@ public final class DatabaseInitializer {
     public static final short TEXT_EDIT_POST = 11;
     public static final short TEXT_REPLY = 20;
     public static final short TEXT_EDIT_REPLY = 21;
-    public static final short TEXT_REPOST = 30;
-    public static final short TEXT_CHANNEL_META = 70;
+    public static final short TEXT_RATING = 30;
+    public static final short TEXT_REPOST = 50;
+    public static final short TEXT_CHANNEL_META = 90;
+    public static final short TEXT_ENTRYPOINT = 100;
+    public static final short TEXT_EXERCISE = 110;
+    public static final short TEXT_SERVICE = 120;
+    public static final short TEXT_COURSE = 130;
 
     public static final short REACTION_LIKE = 1;
     public static final short REACTION_UNLIKE = 2;
 
-    public static final short CONNECTION_FRIEND     = 10;
-    public static final short CONNECTION_UNFRIEND   = 11;
-    public static final short CONNECTION_CLOSE_FRIEND   = CONNECTION_FRIEND;
-    public static final short CONNECTION_UNCLOSE_FRIEND = CONNECTION_UNFRIEND;
+    public static final short CONNECTION_CLOSE_FRIEND   = 10;
+    public static final short CONNECTION_UNCLOSE_FRIEND = 11;
+
+    public static final short CONNECTION_FRIEND   = 14;
+    public static final short CONNECTION_UNFRIEND = 15;
 
     public static final short CONNECTION_CONTACT    = 20;
     public static final short CONNECTION_UNCONTACT  = 21;
 
+    // FOLLOW на публичный канал используется; user-to-user FOLLOW legacy. DO NOT REMOVE.
     public static final short CONNECTION_FOLLOW     = 30;
     public static final short CONNECTION_UNFOLLOW   = 31;
 
+    // Родственные связи пока не используются в UI. DO NOT REMOVE.
     public static final short CONNECTION_SPOUSE     = 40;
     public static final short CONNECTION_UNSPOUSE   = 41;
 
@@ -61,15 +103,20 @@ public final class DatabaseInitializer {
     public static final short CONNECTION_SIBLING    = 54;
     public static final short CONNECTION_UNSIBLING  = 55;
 
+    // Legacy 60/61: новый UI не использует. DO NOT REMOVE.
     public static final short CONNECTION_KNOWN_PERSON    = 60;
     public static final short CONNECTION_UNKNOWN_PERSON  = 61;
 
     public static final short CONNECTION_SHINE_CONFIRMED   = 70;
     public static final short CONNECTION_SHINE_UNCONFIRMED = 71;
 
+    // Пока не используется в UI. DO NOT REMOVE.
     public static final short CONNECTION_SHINE_SEEN   = 74;
     public static final short CONNECTION_SHINE_UNSEEN = 75;
 
+    public static final short CONNECTION_OFFICIAL_ACCOUNT_CONFIRMED   = 80;
+    public static final short CONNECTION_OFFICIAL_ACCOUNT_UNCONFIRMED = 81;
+
     public static void ensurePostgresSchemaInitialized(String jdbcUrl,
                                                        String user,
                                                        String password) throws SQLException {
@@ -95,6 +142,75 @@ public final class DatabaseInitializer {
             }
             if (currentVersion < SCHEMA_VERSION_4) {
                 runSqlScript(conn, POSTGRES_MIGRATION_V4_RESOURCE);
+                currentVersion = SCHEMA_VERSION_4;
+            }
+            if (currentVersion < SCHEMA_VERSION_5) {
+                runSqlScript(conn, POSTGRES_MIGRATION_V5_RESOURCE);
+                currentVersion = SCHEMA_VERSION_5;
+            }
+            if (currentVersion < SCHEMA_VERSION_6) {
+                runSqlScript(conn, POSTGRES_MIGRATION_V6_RESOURCE);
+                currentVersion = SCHEMA_VERSION_6;
+            }
+            if (currentVersion < SCHEMA_VERSION_7) {
+                runSqlScript(conn, POSTGRES_MIGRATION_V7_RESOURCE);
+                currentVersion = SCHEMA_VERSION_7;
+            }
+            if (currentVersion < SCHEMA_VERSION_8) {
+                runSqlScript(conn, POSTGRES_MIGRATION_V8_RESOURCE);
+                currentVersion = SCHEMA_VERSION_8;
+            }
+            if (currentVersion < SCHEMA_VERSION_9) {
+                runSqlScript(conn, POSTGRES_MIGRATION_V9_RESOURCE);
+                currentVersion = SCHEMA_VERSION_9;
+            }
+            if (currentVersion < SCHEMA_VERSION_10) {
+                runSqlScript(conn, POSTGRES_MIGRATION_V10_RESOURCE);
+                currentVersion = SCHEMA_VERSION_10;
+            }
+            if (currentVersion < SCHEMA_VERSION_11) {
+                runSqlScript(conn, POSTGRES_MIGRATION_V11_RESOURCE);
+                currentVersion = SCHEMA_VERSION_11;
+            }
+            if (currentVersion < SCHEMA_VERSION_12) {
+                runSqlScript(conn, POSTGRES_MIGRATION_V12_RESOURCE);
+                currentVersion = SCHEMA_VERSION_12;
+            }
+            if (currentVersion < SCHEMA_VERSION_13) {
+                runSqlScript(conn, POSTGRES_MIGRATION_V13_RESOURCE);
+                currentVersion = SCHEMA_VERSION_13;
+            }
+            if (currentVersion < SCHEMA_VERSION_14) {
+                runSqlScript(conn, POSTGRES_MIGRATION_V14_RESOURCE);
+                currentVersion = SCHEMA_VERSION_14;
+            }
+            if (currentVersion < SCHEMA_VERSION_15) {
+                runSqlScript(conn, POSTGRES_MIGRATION_V15_RESOURCE);
+                currentVersion = SCHEMA_VERSION_15;
+            }
+            if (currentVersion < SCHEMA_VERSION_16) {
+                runSqlScript(conn, POSTGRES_MIGRATION_V16_RESOURCE);
+                currentVersion = SCHEMA_VERSION_16;
+            }
+            if (currentVersion < SCHEMA_VERSION_17) {
+                runSqlScript(conn, POSTGRES_MIGRATION_V17_RESOURCE);
+                currentVersion = SCHEMA_VERSION_17;
+            }
+            if (currentVersion < SCHEMA_VERSION_18) {
+                runSqlScript(conn, POSTGRES_MIGRATION_V18_RESOURCE);
+                currentVersion = SCHEMA_VERSION_18;
+            }
+            if (currentVersion < SCHEMA_VERSION_19) {
+                runSqlScript(conn, POSTGRES_MIGRATION_V19_RESOURCE);
+                currentVersion = SCHEMA_VERSION_19;
+            }
+            if (currentVersion < SCHEMA_VERSION_20) {
+                runSqlScript(conn, POSTGRES_MIGRATION_V20_RESOURCE);
+                currentVersion = SCHEMA_VERSION_20;
+            }
+            if (currentVersion < SCHEMA_VERSION_21) {
+                runSqlScript(conn, POSTGRES_MIGRATION_V21_RESOURCE);
+                currentVersion = SCHEMA_VERSION_21;
             }
         }
     }

SHiNE-server/shine-server-db/src/main/java/shine/db/DbController.java

@@ -1,6 +1,7 @@
 package shine.db;
 
 import shine.db.connection.DbProvider;
+import shine.db.dao.DmDialogStateDAO;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -15,6 +16,7 @@ public final class DbController implements DbProvider {
     private static volatile DbController instance;
 
     private final PostgresDbController delegate;
+    private volatile boolean dmDialogStateBootstrapped;
 
     private DbController() {
         this.delegate = PostgresDbController.getInstance();
@@ -24,7 +26,9 @@ public final class DbController implements DbProvider {
         if (instance == null) {
             synchronized (DbController.class) {
                 if (instance == null) {
-                    instance = new DbController();
+                    DbController created = new DbController();
+                    instance = created;
+                    created.bootstrapDmDialogStateIfNeeded();
                 }
             }
         }
@@ -40,4 +44,18 @@ public final class DbController implements DbProvider {
     public void close() {
         delegate.close();
     }
+
+    private void bootstrapDmDialogStateIfNeeded() {
+        if (dmDialogStateBootstrapped) return;
+        synchronized (this) {
+            if (dmDialogStateBootstrapped) return;
+            try (Connection connection = delegate.getConnection()) {
+                DmDialogStateDAO.getInstance().bootstrapIfEmpty(connection);
+                dmDialogStateBootstrapped = true;
+            } catch (SQLException e) {
+                instance = null;
+                throw new RuntimeException("DM dialog state bootstrap failed", e);
+            }
+        }
+    }
 }

SHiNE-server/shine-server-db/src/main/java/shine/db/MsgSubType.java

@@ -30,11 +30,23 @@ public final class MsgSubType {
     /** EDIT_REPLY — редактирование исходного ответа. */
     public static final short TEXT_EDIT_REPLY = 21;
 
-    /** REPOST — репост сообщения в линии канала (с комментарием и target на оригинал). */
-    public static final short TEXT_REPOST = 30;
+    /** RATING — target-based отзыв на конкретный блок. */
+    public static final short TEXT_RATING = 30;
+
+    /** REPOST — отложенная будущая заготовка репоста сообщения в линии канала. */
+    public static final short TEXT_REPOST = 50;
 
     /** CHANNEL_META — скрытый технический снимок профиля канала. */
-    public static final short TEXT_CHANNEL_META = 70;
+    public static final short TEXT_CHANNEL_META = 90;
+
+    /** ENTRYPOINT — входная страница канала (line-based). */
+    public static final short TEXT_ENTRYPOINT = 100;
+    /** EXERCISE — упражнение/комплекс (line-based). */
+    public static final short TEXT_EXERCISE = 110;
+    /** SERVICE — услуга/процедура (line-based). */
+    public static final short TEXT_SERVICE = 120;
+    /** COURSE — курс (line-based). */
+    public static final short TEXT_COURSE = 130;
 
     /* ===================== REACTION (msg_type=2) ===================== */
 
@@ -46,23 +58,23 @@ public final class MsgSubType {
     /* ===================== CONNECTION (msg_type=3) ===================== */
     /**
  * Совпадает с ConnectionBody:
- * SET:   CLOSE_FRIEND(=FRIEND)=10, CONTACT=20, FOLLOW=30, SPOUSE=40, PARENT=50, CHILD=52, SIBLING=54,
- *        KNOWN_PERSON=60, SHINE_CONFIRMED=70, SHINE_SEEN=74
- * UNSET: UNCLOSE_FRIEND(=UNFRIEND)=11, UNCONTACT=21, UNFOLLOW=31, UNSPOUSE=41, UNPARENT=51, UNCHILD=53, UNSIBLING=55,
- *        UNKNOWN_PERSON=61, SHINE_UNCONFIRMED=71, SHINE_UNSEEN=75
+ * SET:   CLOSE_FRIEND=10, FRIEND=14, CONTACT=20, FOLLOW=30, SPOUSE=40, PARENT=50, CHILD=52, SIBLING=54,
+ *        KNOWN_PERSON(legacy)=60, SHINE_CONFIRMED=70, SHINE_SEEN=74, OFFICIAL_ACCOUNT_CONFIRMED=80
+ * UNSET: UNCLOSE_FRIEND=11, UNFRIEND=15, UNCONTACT=21, UNFOLLOW=31, UNSPOUSE=41, UNPARENT=51, UNCHILD=53, UNSIBLING=55,
+ *        UNKNOWN_PERSON(legacy)=61, SHINE_UNCONFIRMED=71, SHINE_UNSEEN=75, OFFICIAL_ACCOUNT_UNCONFIRMED=81
      */
 
     /** Добавить в близкие друзья (close friend). */
-    public static final short CONNECTION_FRIEND = 10;
+    public static final short CONNECTION_CLOSE_FRIEND = 10;
 
     /** Удалить из близких друзей (close friend). */
-    public static final short CONNECTION_UNFRIEND = 11;
+    public static final short CONNECTION_UNCLOSE_FRIEND = 11;
 
-    /** Alias: добавить в close friend (то же значение, что CONNECTION_FRIEND). */
-    public static final short CONNECTION_CLOSE_FRIEND = CONNECTION_FRIEND;
+    /** Добавить в друзья. */
+    public static final short CONNECTION_FRIEND = 14;
 
-    /** Alias: удалить из close friend (то же значение, что CONNECTION_UNFRIEND). */
-    public static final short CONNECTION_UNCLOSE_FRIEND = CONNECTION_UNFRIEND;
+    /** Удалить из друзей. */
+    public static final short CONNECTION_UNFRIEND = 15;
 
     /** Добавить в контакты. */
     public static final short CONNECTION_CONTACT = 20;
@@ -70,12 +82,14 @@ public final class MsgSubType {
     /** Удалить из контактов. */
     public static final short CONNECTION_UNCONTACT = 21;
 
+    // FOLLOW на публичный канал используется. Старый FOLLOW пользователя считается legacy. DO NOT REMOVE.
     /** Подписаться (follow). */
     public static final short CONNECTION_FOLLOW = 30;
 
     /** Отписаться (unfollow). */
     public static final short CONNECTION_UNFOLLOW = 31;
 
+    // Родственные связи пока не используются в UI. Сохраняем коды. DO NOT REMOVE.
     /** Добавить связь "жена/муж". */
     public static final short CONNECTION_SPOUSE = 40;
 
@@ -100,10 +114,8 @@ public final class MsgSubType {
     /** Удалить связь "брат/сестра". */
     public static final short CONNECTION_UNSIBLING = 55;
 
-    /** Просто знаю этого человека. */
+    // Legacy 60/61: принимаем старые данные, но новый UI их не использует. DO NOT REMOVE.
     public static final short CONNECTION_KNOWN_PERSON = 60;
-
-    /** Не знаю этого человека. */
     public static final short CONNECTION_UNKNOWN_PERSON = 61;
 
     /** Точно уверен, что сияющий. */
@@ -112,17 +124,36 @@ public final class MsgSubType {
     /** Не подтверждаю, что сияющий. */
     public static final short CONNECTION_SHINE_UNCONFIRMED = 71;
 
+    // Пока не используется в UI. Сохраняем для совместимости. DO NOT REMOVE.
     /** Мало знаком, но видел сияющим. */
     public static final short CONNECTION_SHINE_SEEN = 74;
 
     /** Не отмечаю, что видел сияющим. */
     public static final short CONNECTION_SHINE_UNSEEN = 75;
 
+    /** Подтверждение официального аккаунта человека. */
+    public static final short CONNECTION_OFFICIAL_ACCOUNT_CONFIRMED = 80;
+
+    /** Снятие подтверждения официального аккаунта человека. */
+    public static final short CONNECTION_OFFICIAL_ACCOUNT_UNCONFIRMED = 81;
+
     /* ===================== USER_PARAM (msg_type=4) ===================== */
 
     /** Параметр профиля key/value (обе строки). */
     public static final short USER_PARAM_TEXT_TEXT = 1;
 
+    /* ===================== STATUS_ACTION (msg_type=5) ===================== */
+
+    public static final short STATUS_DONE_ONCE = 10;
+    public static final short STATUS_LEARNED = 20;
+    public static final short STATUS_SERVICE_PASSED = 30;
+    public static final short STATUS_CONFIRMED = 100;
+    public static final short STATUS_INTERESTED = 110;
+    public static final short STATUS_STARTED = 120;
+    public static final short STATUS_IN_STUDY = 130;
+    public static final short STATUS_ABANDONED = 140;
+    public static final short STATUS_COMPLETED = 150;
+
     /* ===================== РЕЗЕРВ НА БУДУЩЕЕ ===================== */
     // Если позже захочешь BLOCK/UNBLOCK — лучше добавить новые значения,
     // не трогая уже занятые коды.

SHiNE-server/shine-server-db/src/main/java/shine/db/dao/BlockchainResyncCleanupDAO.java

@@ -99,6 +99,8 @@ public final class BlockchainResyncCleanupDAO {
                 int deletedBlocks = deleteBlocksForChain(c, blockchainName);
                 int deletedBlockchainState = deleteBlockchainStateForChain(c, blockchainName);
 
+                rebuildStatsState(c);
+
                 c.commit();
 
                 return new CleanupResult(
@@ -185,10 +187,10 @@ public final class BlockchainResyncCleanupDAO {
     private int decreaseForeignLikesCount(Connection c, String blockchainName) throws SQLException {
         String sql = """
             UPDATE message_stats
-            SET likes_count = MAX(
+            SET likes_count = GREATEST(
                 0,
-                likes_count - (
-                    SELECT COUNT(*)
+                likes_count - COALESCE((
+                    SELECT COUNT(*)::int
                     FROM reactions_state rs
                     WHERE rs.from_bch_name = ?
                       AND rs.reaction_type = ?
@@ -198,7 +200,7 @@ public final class BlockchainResyncCleanupDAO {
                       AND rs.to_block_number = message_stats.to_block_number
                       AND rs.to_block_hash = message_stats.to_block_hash
                       AND rs.to_bch_name <> ?
-                )
+                ), 0)
             )
             WHERE EXISTS (
                 SELECT 1
@@ -237,10 +239,10 @@ public final class BlockchainResyncCleanupDAO {
     private int decreaseForeignRepliesCount(Connection c, String blockchainName) throws SQLException {
         String sql = """
             UPDATE message_stats
-            SET replies_count = MAX(
+            SET replies_count = GREATEST(
                 0,
                 replies_count - COALESCE((
-                    SELECT COUNT(*)
+                    SELECT COUNT(*)::int
                     FROM blocks b
                     WHERE b.bch_name = ?
                       AND b.msg_type = 1
@@ -366,6 +368,119 @@ public final class BlockchainResyncCleanupDAO {
             """, blockchainName);
     }
 
+    private void rebuildStatsState(Connection c) throws SQLException {
+        try (PreparedStatement truncate = c.prepareStatement("""
+            TRUNCATE TABLE user_stats_state, channel_stats_state
+            """)) {
+            truncate.executeUpdate();
+        }
+
+        try (PreparedStatement ps = c.prepareStatement("""
+            INSERT INTO user_stats_state (
+                login,
+                owned_public_channels_count,
+                following_users_count,
+                following_channels_count,
+                close_friends_count,
+                updated_at_ms
+            )
+            SELECT
+                u.login,
+                COALESCE(own.owned_public_channels_count, 0),
+                COALESCE(fu.following_users_count, 0),
+                COALESCE(fc.following_channels_count, 0),
+                COALESCE(cf.close_friends_count, 0),
+                CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT)
+            FROM solana_user_pda_current u
+            LEFT JOIN (
+                SELECT owner_login, COUNT(*)::INTEGER AS owned_public_channels_count
+                FROM channel_names_state
+                WHERE channel_type_code = 1
+                GROUP BY owner_login
+            ) own ON LOWER(own.owner_login) = LOWER(u.login)
+            LEFT JOIN (
+                SELECT login, COUNT(*)::INTEGER AS following_users_count
+                FROM connections_state
+                WHERE rel_type = 30
+                  AND to_block_number = 0
+                GROUP BY login
+            ) fu ON LOWER(fu.login) = LOWER(u.login)
+            LEFT JOIN (
+                SELECT cs.login, COUNT(*)::INTEGER AS following_channels_count
+                FROM connections_state cs
+                JOIN channel_names_state cn
+                  ON cn.owner_bch_name = cs.to_bch_name
+                 AND cn.channel_root_block_number = cs.to_block_number
+                 AND cn.channel_root_block_hash = cs.to_block_hash
+                WHERE cs.rel_type = 30
+                  AND cn.channel_type_code = 1
+                GROUP BY cs.login
+            ) fc ON LOWER(fc.login) = LOWER(u.login)
+            LEFT JOIN (
+                SELECT login, COUNT(*)::INTEGER AS close_friends_count
+                FROM connections_state
+                WHERE rel_type = 10
+                GROUP BY login
+            ) cf ON LOWER(cf.login) = LOWER(u.login)
+            """)) {
+            ps.executeUpdate();
+        }
+
+
+        try (PreparedStatement ps = c.prepareStatement("SELECT shine_refresh_user_profile(login) FROM solana_user_pda_current")) {
+            ps.execute();
+        }
+        try (PreparedStatement ps = c.prepareStatement("SELECT shine_refresh_user_stats(login) FROM solana_user_pda_current")) {
+            ps.execute();
+        }
+        try (PreparedStatement ps = c.prepareStatement("""
+            UPDATE message_stats ms SET
+                primary_likes_count=(SELECT COUNT(*)::INTEGER FROM reactions_state rs WHERE rs.reaction_type=1 AND rs.last_sub_type=1
+                    AND rs.to_login=ms.to_login AND rs.to_bch_name=ms.to_bch_name AND rs.to_block_number=ms.to_block_number AND rs.to_block_hash=ms.to_block_hash
+                    AND shine_is_primary(rs.from_login)),
+                shining_likes_count=(SELECT COUNT(*)::INTEGER FROM reactions_state rs WHERE rs.reaction_type=1 AND rs.last_sub_type=1
+                    AND rs.to_login=ms.to_login AND rs.to_bch_name=ms.to_bch_name AND rs.to_block_number=ms.to_block_number AND rs.to_block_hash=ms.to_block_hash
+                    AND shine_is_primary(rs.from_login) AND shine_is_shining(rs.from_login))
+            """)) {
+            ps.executeUpdate();
+        }
+
+        try (PreparedStatement ps = c.prepareStatement("""
+            INSERT INTO channel_stats_state (
+                owner_bch_name,
+                channel_root_block_number,
+                channel_root_block_hash,
+                owner_login,
+                channel_type_code,
+                subscribers_count,
+                updated_at_ms
+            )
+            SELECT
+                cn.owner_bch_name,
+                cn.channel_root_block_number,
+                cn.channel_root_block_hash,
+                cn.owner_login,
+                cn.channel_type_code,
+                COUNT(DISTINCT cs.login)::INTEGER AS subscribers_count,
+                CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT)
+            FROM channel_names_state cn
+            LEFT JOIN connections_state cs
+              ON cs.rel_type = 30
+             AND cs.to_bch_name = cn.owner_bch_name
+             AND cs.to_block_number = cn.channel_root_block_number
+             AND cs.to_block_hash = cn.channel_root_block_hash
+            WHERE cn.channel_type_code = 1
+            GROUP BY
+                cn.owner_bch_name,
+                cn.channel_root_block_number,
+                cn.channel_root_block_hash,
+                cn.owner_login,
+                cn.channel_type_code
+            """)) {
+            ps.executeUpdate();
+        }
+    }
+
     private int executeDelete(Connection c, String sql, String value) throws SQLException {
         try (PreparedStatement ps = c.prepareStatement(sql)) {
             ps.setString(1, value);

SHiNE-server/shine-server-db/src/main/java/shine/db/dao/ChannelReadStateDAO.java

@@ -0,0 +1,298 @@
+package shine.db.dao;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Server projection for per-user channel read/unread state.
+ *
+ * Important rules:
+ *  - rows are created only by a signed client SetChannelReadState;
+ *  - channel publications increment unread_count only for rows that already exist;
+ *  - read_count is monotonic and unread_count is reduced by the accepted read delta;
+ *  - unread_count is never part of the client signature and is server-owned.
+ */
+public final class ChannelReadStateDAO {
+    private static volatile ChannelReadStateDAO instance;
+
+    private ChannelReadStateDAO() {}
+
+    public static ChannelReadStateDAO getInstance() {
+        if (instance == null) {
+            synchronized (ChannelReadStateDAO.class) {
+                if (instance == null) instance = new ChannelReadStateDAO();
+            }
+        }
+        return instance;
+    }
+
+    public record ReadState(long readCount, long unreadCount, long readUpdatedAtMs,
+                            String clientKey, String readSignature) {}
+
+    public record UpsertResult(boolean applied, long readCount, long unreadCount) {}
+
+    public ReadState get(Connection c, String viewerLogin, String ownerBchName, String channelName) throws SQLException {
+        String sql = """
+            SELECT read_count, unread_count, read_updated_at_ms, client_key, read_signature
+            FROM channel_read_state
+            WHERE LOWER(viewer_login)=LOWER(?) AND owner_bch_name=? AND channel_name=?
+            LIMIT 1
+            """;
+        try (PreparedStatement ps = c.prepareStatement(sql)) {
+            ps.setString(1, viewerLogin);
+            ps.setString(2, ownerBchName);
+            ps.setString(3, channelName);
+            try (ResultSet rs = ps.executeQuery()) {
+                if (!rs.next()) return null;
+                return new ReadState(
+                        Math.max(0L, rs.getLong("read_count")),
+                        Math.max(0L, rs.getLong("unread_count")),
+                        rs.getLong("read_updated_at_ms"),
+                        rs.getString("client_key"),
+                        rs.getString("read_signature"));
+            }
+        }
+    }
+
+    public long getUnreadCount(Connection c, String viewerLogin, String ownerBchName, String channelName) throws SQLException {
+        ReadState state = get(c, viewerLogin, ownerBchName, channelName);
+        return state == null ? 0L : state.unreadCount();
+    }
+
+    public long sumUnreadCount(Connection c, String viewerLogin) throws SQLException {
+        String sql = """
+            SELECT COALESCE(SUM(crs.unread_count),0)
+            FROM channel_read_state crs
+            WHERE LOWER(crs.viewer_login)=LOWER(?)
+              AND EXISTS (
+                  SELECT 1
+                  FROM channel_names_state cns
+                  JOIN connections_state cs
+                    ON LOWER(cs.login)=LOWER(crs.viewer_login)
+                   AND cs.rel_type=30
+                   AND cs.to_bch_name=cns.owner_bch_name
+                   AND COALESCE(cs.to_block_number,0)=cns.channel_root_block_number
+                   AND cs.to_block_hash=cns.channel_root_block_hash
+                  WHERE cns.owner_bch_name=crs.owner_bch_name
+                    AND cns.slug=crs.channel_name
+                    AND cns.channel_type_code=1
+              )
+            """;
+        try (PreparedStatement ps = c.prepareStatement(sql)) {
+            ps.setString(1, viewerLogin);
+            try (ResultSet rs = ps.executeQuery()) {
+                return rs.next() ? Math.max(0L, rs.getLong(1)) : 0L;
+            }
+        }
+    }
+
+    /**
+     * Validates that the requested public channel exists and that viewer currently follows it.
+     */
+    public boolean hasActiveSubscription(Connection c, String viewerLogin, String ownerBchName, String channelName,
+                                         int followRelType) throws SQLException {
+        String sql = """
+            SELECT 1
+            FROM channel_names_state cns
+            JOIN connections_state cs
+              ON LOWER(cs.login)=LOWER(?)
+             AND cs.rel_type=?
+             AND cs.to_bch_name=cns.owner_bch_name
+             AND COALESCE(cs.to_block_number,0)=cns.channel_root_block_number
+             AND cs.to_block_hash=cns.channel_root_block_hash
+            WHERE cns.owner_bch_name=?
+              AND cns.slug=?
+              AND cns.channel_type_code=1
+            LIMIT 1
+            """;
+        try (PreparedStatement ps = c.prepareStatement(sql)) {
+            ps.setString(1, viewerLogin);
+            ps.setInt(2, followRelType);
+            ps.setString(3, ownerBchName);
+            ps.setString(4, channelName);
+            try (ResultSet rs = ps.executeQuery()) {
+                return rs.next();
+            }
+        }
+    }
+
+    public String resolvePublicChannelNameByRoot(Connection c, String ownerBchName, int rootBlockNumber) throws SQLException {
+        String sql = """
+            SELECT slug
+            FROM channel_names_state
+            WHERE owner_bch_name=? AND channel_root_block_number=? AND channel_type_code=1
+            LIMIT 1
+            """;
+        try (PreparedStatement ps = c.prepareStatement(sql)) {
+            ps.setString(1, ownerBchName);
+            ps.setInt(2, rootBlockNumber);
+            try (ResultSet rs = ps.executeQuery()) {
+                return rs.next() ? rs.getString("slug") : null;
+            }
+        }
+    }
+
+
+    public Integer resolvePublicChannelRootByName(Connection c, String ownerBchName, String channelName) throws SQLException {
+        String sql = """
+            SELECT channel_root_block_number
+            FROM channel_names_state
+            WHERE owner_bch_name=? AND slug=? AND channel_type_code=1
+            LIMIT 1
+            """;
+        try (PreparedStatement ps = c.prepareStatement(sql)) {
+            ps.setString(1, ownerBchName);
+            ps.setString(2, channelName);
+            try (ResultSet rs = ps.executeQuery()) {
+                return rs.next() ? rs.getInt("channel_root_block_number") : null;
+            }
+        }
+    }
+
+    public String resolveOwnerLogin(Connection c, String ownerBchName, String channelName) throws SQLException {
+        String sql = """
+            SELECT owner_login
+            FROM channel_names_state
+            WHERE owner_bch_name=? AND slug=? AND channel_type_code=1
+            LIMIT 1
+            """;
+        try (PreparedStatement ps = c.prepareStatement(sql)) {
+            ps.setString(1, ownerBchName);
+            ps.setString(2, channelName);
+            try (ResultSet rs = ps.executeQuery()) {
+                return rs.next() ? rs.getString("owner_login") : null;
+            }
+        }
+    }
+
+    /**
+     * Inserts the first client baseline with unread=0, or advances an existing read watermark.
+     * Older timestamps and backwards read_count values are ignored.
+     */
+    public UpsertResult upsertSignedReadIfNewer(Connection c,
+                                                String viewerLogin,
+                                                String ownerLogin,
+                                                String ownerBchName,
+                                                String channelName,
+                                                long readCount,
+                                                long readUpdatedAtMs,
+                                                String clientKey,
+                                                String readSignature,
+                                                long nowMs) throws SQLException {
+        String sql = """
+            INSERT INTO channel_read_state (
+                viewer_login, owner_login, owner_bch_name, channel_name,
+                read_count, unread_count,
+                read_updated_at_ms, client_key, read_signature, updated_at_ms
+            ) VALUES (?, ?, ?, ?, ?, 0, ?, ?, ?, ?)
+            ON CONFLICT (viewer_login, owner_bch_name, channel_name)
+            DO UPDATE SET
+                owner_login = EXCLUDED.owner_login,
+                unread_count = GREATEST(
+                    0,
+                    channel_read_state.unread_count -
+                    GREATEST(0, EXCLUDED.read_count - channel_read_state.read_count)
+                ),
+                read_count = GREATEST(channel_read_state.read_count, EXCLUDED.read_count),
+                read_updated_at_ms = EXCLUDED.read_updated_at_ms,
+                client_key = EXCLUDED.client_key,
+                read_signature = EXCLUDED.read_signature,
+                updated_at_ms = EXCLUDED.updated_at_ms
+            WHERE channel_read_state.read_updated_at_ms < EXCLUDED.read_updated_at_ms
+              AND EXCLUDED.read_count >= channel_read_state.read_count
+            RETURNING read_count, unread_count
+            """;
+        try (PreparedStatement ps = c.prepareStatement(sql)) {
+            ps.setString(1, viewerLogin);
+            ps.setString(2, ownerLogin);
+            ps.setString(3, ownerBchName);
+            ps.setString(4, channelName);
+            ps.setLong(5, Math.max(0L, readCount));
+            ps.setLong(6, readUpdatedAtMs);
+            ps.setString(7, clientKey);
+            ps.setString(8, readSignature);
+            ps.setLong(9, nowMs);
+            try (ResultSet rs = ps.executeQuery()) {
+                if (rs.next()) {
+                    return new UpsertResult(true,
+                            Math.max(0L, rs.getLong("read_count")),
+                            Math.max(0L, rs.getLong("unread_count")));
+                }
+            }
+        }
+        ReadState current = get(c, viewerLogin, ownerBchName, channelName);
+        return new UpsertResult(false,
+                current == null ? 0L : current.readCount(),
+                current == null ? 0L : current.unreadCount());
+    }
+
+    /**
+     * Increments existing rows for current subscribers of one public channel.
+     * Missing channel_read_state rows are deliberately NOT created.
+     * Returns affected viewer logins for post-commit counter pushes.
+     */
+    public List<String> incrementUnreadForSubscribers(Connection c,
+                                                      String ownerBchName,
+                                                      String channelName,
+                                                      int followRelType,
+                                                      long nowMs) throws SQLException {
+        String sql = """
+            UPDATE channel_read_state crs
+            SET unread_count = crs.unread_count + 1,
+                updated_at_ms = ?
+            WHERE crs.owner_bch_name = ?
+              AND crs.channel_name = ?
+              AND LOWER(crs.viewer_login) <> LOWER(crs.owner_login)
+              AND EXISTS (
+                  SELECT 1
+                  FROM channel_names_state cns
+                  JOIN connections_state cs
+                    ON LOWER(cs.login)=LOWER(crs.viewer_login)
+                   AND cs.rel_type=?
+                   AND cs.to_bch_name=cns.owner_bch_name
+                   AND COALESCE(cs.to_block_number,0)=cns.channel_root_block_number
+                   AND cs.to_block_hash=cns.channel_root_block_hash
+                  WHERE cns.owner_bch_name=crs.owner_bch_name
+                    AND cns.slug=crs.channel_name
+                    AND cns.channel_type_code=1
+              )
+            RETURNING viewer_login
+            """;
+        List<String> affected = new ArrayList<>();
+        try (PreparedStatement ps = c.prepareStatement(sql)) {
+            ps.setLong(1, nowMs);
+            ps.setString(2, ownerBchName);
+            ps.setString(3, channelName);
+            ps.setInt(4, followRelType);
+            try (ResultSet rs = ps.executeQuery()) {
+                while (rs.next()) affected.add(rs.getString("viewer_login"));
+            }
+        }
+        return affected;
+    }
+
+    /** Delete the projection row when a channel FOLLOW is explicitly removed. */
+    public boolean deleteForUnfollowTarget(Connection c, String viewerLogin, String ownerBchName,
+                                           int rootBlockNumber) throws SQLException {
+        String sql = """
+            DELETE FROM channel_read_state crs
+            USING channel_names_state cns
+            WHERE LOWER(crs.viewer_login)=LOWER(?)
+              AND crs.owner_bch_name=?
+              AND cns.owner_bch_name=crs.owner_bch_name
+              AND cns.slug=crs.channel_name
+              AND cns.channel_root_block_number=?
+              AND cns.channel_type_code=1
+            """;
+        try (PreparedStatement ps = c.prepareStatement(sql)) {
+            ps.setString(1, viewerLogin);
+            ps.setString(2, ownerBchName);
+            ps.setInt(3, rootBlockNumber);
+            return ps.executeUpdate() > 0;
+        }
+    }
+}

SHiNE-server/shine-server-db/src/main/java/shine/db/dao/ConnectionsStateDAO.java

@@ -67,6 +67,36 @@ public final class ConnectionsStateDAO {
         return out;
     }
 
+    public boolean hasOutgoingByRelTypeCanonical(Connection c, String loginAnyCase, String peerLoginAnyCase, int relType) throws SQLException {
+        String sql = """
+            SELECT 1
+            FROM connections_state cs
+            LEFT JOIN %s
+              ON LOWER(u_login.login) = LOWER(cs.to_login)
+            LEFT JOIN %s
+              ON LOWER(u_bch.blockchain_name) = LOWER(cs.to_bch_name)
+            WHERE LOWER(cs.login) = LOWER(?)
+              AND cs.rel_type = ?
+              AND (
+                    LOWER(cs.to_login) = LOWER(?)
+                 OR LOWER(COALESCE(u_login.login, u_bch.login, cs.to_login)) = LOWER(?)
+              )
+            LIMIT 1
+            """.formatted(
+                CurrentUsersSql.usersSubquery("u_login"),
+                CurrentUsersSql.usersSubquery("u_bch")
+            );
+        try (PreparedStatement ps = c.prepareStatement(sql)) {
+            ps.setString(1, loginAnyCase);
+            ps.setInt(2, relType);
+            ps.setString(3, peerLoginAnyCase);
+            ps.setString(4, peerLoginAnyCase);
+            try (ResultSet rs = ps.executeQuery()) {
+                return rs.next();
+            }
+        }
+    }
+
     /**
      * Incoming: список логинов (канонических), кто поставил relType пользователю login.
      */

SHiNE-server/shine-server-db/src/main/java/shine/db/dao/CurrentUsersDAO.java

@@ -49,7 +49,7 @@ public final class CurrentUsersDAO {
         String sql = """
             SELECT 1
             FROM %s
-            WHERE LOWER(login) = LOWER(?)
+            WHERE normalized_login = LOWER(BTRIM(?))
             LIMIT 1
             """.formatted(CurrentUsersSql.usersSubquery("su"));
 
@@ -104,7 +104,7 @@ public final class CurrentUsersDAO {
                 blockchain_key,
                 client_key
             FROM %s
-            WHERE LOWER(login) = LOWER(?)
+            WHERE normalized_login = LOWER(BTRIM(?))
             """.formatted(CurrentUsersSql.usersSubquery("su"));
 
         try (PreparedStatement ps = c.prepareStatement(sql)) {
@@ -167,7 +167,7 @@ public final class CurrentUsersDAO {
                 blockchain_key,
                 client_key
             FROM %s
-            WHERE LOWER(login) LIKE ?
+            WHERE normalized_login LIKE LOWER(BTRIM(?))
               AND (? IS NULL OR is_server = ?)
             ORDER BY login
             LIMIT 5
@@ -176,7 +176,7 @@ public final class CurrentUsersDAO {
         List<CurrentUserEntry> result = new ArrayList<>();
 
         try (PreparedStatement ps = c.prepareStatement(sql)) {
-            ps.setString(1, prefix.toLowerCase() + "%");
+            ps.setString(1, prefix.trim() + "%");
             if (isServer == null) {
                 ps.setNull(2, Types.BOOLEAN);
                 ps.setNull(3, Types.BOOLEAN);

SHiNE-server/shine-server-db/src/main/java/shine/db/dao/DirectMessagesDAO.java

@@ -1,53 +0,0 @@
-package shine.db.dao;
-
-import shine.db.DbController;
-import shine.db.entities.DirectMessageEntry;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-
-public final class DirectMessagesDAO {
-    private static volatile DirectMessagesDAO instance;
-    private final DbController db = DbController.getInstance();
-
-    private DirectMessagesDAO() {}
-
-    public static DirectMessagesDAO getInstance() {
-        if (instance == null) {
-            synchronized (DirectMessagesDAO.class) {
-                if (instance == null) instance = new DirectMessagesDAO();
-            }
-        }
-        return instance;
-    }
-
-    public void insert(DirectMessageEntry entry) throws Exception {
-        try (Connection c = db.getConnection()) {
-            String sql = """
-                INSERT INTO direct_messages (
-                    message_id, from_login, to_login, text, created_at_ms
-                ) VALUES (?, ?, ?, ?, ?)
-                """;
-            try (PreparedStatement ps = c.prepareStatement(sql)) {
-                ps.setString(1, entry.getMessageId());
-                ps.setString(2, entry.getFromLogin());
-                ps.setString(3, entry.getToLogin());
-                ps.setString(4, entry.getText());
-                ps.setLong(5, entry.getCreatedAtMs());
-                ps.executeUpdate();
-            }
-        }
-    }
-
-    public boolean existsFromTo(String fromLogin, String toLogin) throws Exception {
-        try (Connection c = db.getConnection()) {
-            String sql = "SELECT 1 FROM direct_messages WHERE from_login = ? AND to_login = ? LIMIT 1";
-            try (PreparedStatement ps = c.prepareStatement(sql)) {
-                ps.setString(1, fromLogin);
-                ps.setString(2, toLogin);
-                return ps.executeQuery().next();
-            }
-        }
-    }
-
-}

SHiNE-server/shine-server-db/src/main/java/shine/db/dao/DmDeliveryStateDAO.java

@@ -0,0 +1,518 @@
+package shine.db.dao;
+
+import shine.db.DbController;
+import shine.db.entities.DmDeliveryStateEntry;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/** Хранилище изменяемого состояния межсерверной доставки DM-пары. */
+public final class DmDeliveryStateDAO {
+    private static volatile DmDeliveryStateDAO instance;
+    private final DbController db = DbController.getInstance();
+
+    private DmDeliveryStateDAO() {}
+
+    public static DmDeliveryStateDAO getInstance() {
+        if (instance == null) {
+            synchronized (DmDeliveryStateDAO.class) {
+                if (instance == null) instance = new DmDeliveryStateDAO();
+            }
+        }
+        return instance;
+    }
+
+    public DmDeliveryStateEntry upsertPair(
+            String outgoingMessageKey,
+            String eventId,
+            String baseKey,
+            String fromLogin,
+            String toLogin,
+            String incomingMessageKey,
+            long createdAtMs,
+            long expiresAtMs,
+            int initialState,
+            String deliveredServerLogin,
+            String routesHash,
+            boolean assistImmediately
+    ) throws SQLException {
+        long now = System.currentTimeMillis();
+        int safeState = normalizeState(initialState, deliveredServerLogin);
+        if (expiresAtMs <= now && safeState == DmDeliveryStateEntry.PENDING_NONE) {
+            safeState = DmDeliveryStateEntry.FAILED_FINAL;
+        }
+        Long nextAttemptAt = safeState == DmDeliveryStateEntry.ACCEPTED
+                ? now
+                : null;
+        String safeDeliveredLogin = safeState == DmDeliveryStateEntry.DELIVERED_ONE
+                ? normalize(deliveredServerLogin)
+                : null;
+
+        try (Connection c = db.getConnection()) {
+            String sql = """
+                INSERT INTO dm_delivery_state (
+                    outgoing_message_key, event_id, base_key, from_login, to_login,
+                    incoming_message_key, created_at_ms, delivery_expires_at_ms,
+                    delivery_state, delivered_server_login, recipient_routes_hash,
+                    attempt_index, next_attempt_at_ms, last_attempt_at_ms, last_error, updated_at_ms
+                ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 0, ?, NULL, NULL, ?)
+                ON CONFLICT (outgoing_message_key) DO UPDATE SET
+                    event_id = EXCLUDED.event_id,
+                    base_key = EXCLUDED.base_key,
+                    from_login = EXCLUDED.from_login,
+                    to_login = EXCLUDED.to_login,
+                    incoming_message_key = EXCLUDED.incoming_message_key,
+                    created_at_ms = CASE
+                        WHEN dm_delivery_state.event_id = EXCLUDED.event_id THEN dm_delivery_state.created_at_ms
+                        ELSE EXCLUDED.created_at_ms
+                    END,
+                    delivery_expires_at_ms = CASE
+                        WHEN dm_delivery_state.event_id = EXCLUDED.event_id THEN dm_delivery_state.delivery_expires_at_ms
+                        ELSE EXCLUDED.delivery_expires_at_ms
+                    END,
+                    delivery_state = CASE
+                        WHEN dm_delivery_state.event_id = EXCLUDED.event_id THEN dm_delivery_state.delivery_state
+                        ELSE EXCLUDED.delivery_state
+                    END,
+                    delivered_server_login = CASE
+                        WHEN dm_delivery_state.event_id = EXCLUDED.event_id THEN dm_delivery_state.delivered_server_login
+                        ELSE EXCLUDED.delivered_server_login
+                    END,
+                    recipient_routes_hash = CASE
+                        WHEN dm_delivery_state.event_id = EXCLUDED.event_id THEN COALESCE(dm_delivery_state.recipient_routes_hash, EXCLUDED.recipient_routes_hash)
+                        ELSE EXCLUDED.recipient_routes_hash
+                    END,
+                    attempt_index = CASE
+                        WHEN dm_delivery_state.event_id = EXCLUDED.event_id THEN dm_delivery_state.attempt_index
+                        ELSE 0
+                    END,
+                    next_attempt_at_ms = CASE
+                        WHEN dm_delivery_state.event_id = EXCLUDED.event_id THEN dm_delivery_state.next_attempt_at_ms
+                        ELSE EXCLUDED.next_attempt_at_ms
+                    END,
+                    last_attempt_at_ms = CASE
+                        WHEN dm_delivery_state.event_id = EXCLUDED.event_id THEN dm_delivery_state.last_attempt_at_ms
+                        ELSE NULL
+                    END,
+                    last_error = CASE
+                        WHEN dm_delivery_state.event_id = EXCLUDED.event_id THEN dm_delivery_state.last_error
+                        ELSE NULL
+                    END,
+                    updated_at_ms = EXCLUDED.updated_at_ms
+                """;
+            try (PreparedStatement ps = c.prepareStatement(sql)) {
+                ps.setString(1, outgoingMessageKey);
+                ps.setString(2, eventId);
+                ps.setString(3, baseKey);
+                ps.setString(4, normalize(fromLogin));
+                ps.setString(5, normalize(toLogin));
+                ps.setString(6, incomingMessageKey);
+                ps.setLong(7, createdAtMs);
+                ps.setLong(8, expiresAtMs);
+                ps.setInt(9, safeState);
+                setNullableString(ps, 10, safeDeliveredLogin);
+                setNullableString(ps, 11, normalizeBlank(routesHash));
+                setNullableLong(ps, 12, nextAttemptAt);
+                ps.setLong(13, now);
+                ps.executeUpdate();
+            }
+        }
+        DmDeliveryStateEntry result;
+        if (initialState != DmDeliveryStateEntry.PENDING_NONE || !isBlank(deliveredServerLogin)) {
+            result = mergeRemote(eventId, initialState, deliveredServerLogin, routesHash, now);
+        } else {
+            result = getByEventId(eventId);
+        }
+        if (result != null && result.getDeliveryExpiresAtMs() <= now
+                && result.getDeliveryState() == DmDeliveryStateEntry.PENDING_NONE) {
+            return finishAtExpiry(eventId, now);
+        }
+        return result;
+    }
+
+    public DmDeliveryStateEntry getByEventId(String eventId) throws SQLException {
+        if (isBlank(eventId)) return null;
+        try (Connection c = db.getConnection();
+             PreparedStatement ps = c.prepareStatement(selectColumns() + " WHERE event_id = ?")) {
+            ps.setString(1, eventId.trim());
+            try (ResultSet rs = ps.executeQuery()) {
+                return rs.next() ? mapRow(rs) : null;
+            }
+        }
+    }
+
+    public DmDeliveryStateEntry getByOutgoingMessageKey(String outgoingMessageKey) throws SQLException {
+        if (isBlank(outgoingMessageKey)) return null;
+        try (Connection c = db.getConnection();
+             PreparedStatement ps = c.prepareStatement(selectColumns() + " WHERE outgoing_message_key = ?")) {
+            ps.setString(1, outgoingMessageKey.trim());
+            try (ResultSet rs = ps.executeQuery()) {
+                return rs.next() ? mapRow(rs) : null;
+            }
+        }
+    }
+
+    public Map<String, DmDeliveryStateEntry> listByOutgoingMessageKeys(List<String> keys) throws SQLException {
+        Map<String, DmDeliveryStateEntry> out = new HashMap<>();
+        if (keys == null || keys.isEmpty()) return out;
+        String placeholders = String.join(",", java.util.Collections.nCopies(keys.size(), "?"));
+        String sql = selectColumns() + " WHERE outgoing_message_key IN (" + placeholders + ")";
+        try (Connection c = db.getConnection(); PreparedStatement ps = c.prepareStatement(sql)) {
+            for (int i = 0; i < keys.size(); i++) ps.setString(i + 1, keys.get(i));
+            try (ResultSet rs = ps.executeQuery()) {
+                while (rs.next()) {
+                    DmDeliveryStateEntry row = mapRow(rs);
+                    out.put(row.getOutgoingMessageKey(), row);
+                }
+            }
+        }
+        return out;
+    }
+
+    public List<DmDeliveryStateEntry> listDue(long nowMs, int limit) throws SQLException {
+        String sql = selectColumns() + """
+             WHERE delivery_state = 0
+               AND next_attempt_at_ms IS NOT NULL
+               AND next_attempt_at_ms <= ?
+             ORDER BY next_attempt_at_ms ASC, created_at_ms ASC
+             LIMIT ?
+            """;
+        List<DmDeliveryStateEntry> out = new ArrayList<>();
+        try (Connection c = db.getConnection(); PreparedStatement ps = c.prepareStatement(sql)) {
+            ps.setLong(1, nowMs);
+            ps.setInt(2, Math.max(1, limit));
+            try (ResultSet rs = ps.executeQuery()) {
+                while (rs.next()) out.add(mapRow(rs));
+            }
+        }
+        return out;
+    }
+
+    public boolean claimAttempt(DmDeliveryStateEntry row, long nowMs, Long nextAttemptAtMs) throws SQLException {
+        String sql = """
+            UPDATE dm_delivery_state
+            SET attempt_index = attempt_index + 1,
+                next_attempt_at_ms = ?,
+                last_attempt_at_ms = ?,
+                last_error = NULL,
+                updated_at_ms = ?
+            WHERE outgoing_message_key = ?
+              AND event_id = ?
+              AND attempt_index = ?
+              AND delivery_state = 0
+              AND next_attempt_at_ms IS NOT NULL
+              AND next_attempt_at_ms <= ?
+            """;
+        try (Connection c = db.getConnection(); PreparedStatement ps = c.prepareStatement(sql)) {
+            long networkLeaseUntilMs = nowMs + 60_000L;
+            Long claimedNextAttemptAtMs = nextAttemptAtMs == null
+                    ? networkLeaseUntilMs
+                    : Math.max(nextAttemptAtMs, networkLeaseUntilMs);
+            setNullableLong(ps, 1, claimedNextAttemptAtMs);
+            ps.setLong(2, nowMs);
+            ps.setLong(3, nowMs);
+            ps.setString(4, row.getOutgoingMessageKey());
+            ps.setString(5, row.getEventId());
+            ps.setInt(6, row.getAttemptIndex());
+            ps.setLong(7, nowMs);
+            return ps.executeUpdate() == 1;
+        }
+    }
+
+    public DmDeliveryStateEntry mergeRemote(
+            String eventId,
+            int remoteState,
+            String remoteDeliveredLogin,
+            String remoteRoutesHash,
+            long nowMs
+    ) throws SQLException {
+        try (Connection c = db.getConnection()) {
+            boolean previousAutoCommit = c.getAutoCommit();
+            c.setAutoCommit(false);
+            try {
+                DmDeliveryStateEntry current = getByEventIdForUpdate(c, eventId);
+                if (current == null) {
+                    c.rollback();
+                    return null;
+                }
+                MergeResult merged = merge(
+                        current.getDeliveryState(),
+                        current.getDeliveredServerLogin(),
+                        current.getRecipientRoutesHash(),
+                        remoteState,
+                        remoteDeliveredLogin,
+                        remoteRoutesHash
+                );
+                updateMutableState(c, current, merged.state(), merged.deliveredLogin(),
+                        merged.routesHash(), current.getNextAttemptAtMs(), current.getLastError(), nowMs);
+                c.commit();
+                return getByEventId(eventId);
+            } catch (Exception e) {
+                try { c.rollback(); } catch (Exception ignored) {}
+                throw e;
+            } finally {
+                c.setAutoCommit(previousAutoCommit);
+            }
+        }
+    }
+
+    public DmDeliveryStateEntry updateAfterAttempt(
+            String eventId,
+            int attemptedState,
+            String deliveredServerLogin,
+            String routesHash,
+            Long nextAttemptAtMs,
+            String lastError,
+            long nowMs
+    ) throws SQLException {
+        try (Connection c = db.getConnection()) {
+            boolean previousAutoCommit = c.getAutoCommit();
+            c.setAutoCommit(false);
+            try {
+                DmDeliveryStateEntry current = getByEventIdForUpdate(c, eventId);
+                if (current == null) {
+                    c.rollback();
+                    return null;
+                }
+                MergeResult merged = merge(
+                        current.getDeliveryState(), current.getDeliveredServerLogin(), current.getRecipientRoutesHash(),
+                        attemptedState, deliveredServerLogin, routesHash
+                );
+                Long effectiveNext = merged.state() == DmDeliveryStateEntry.ACCEPTED
+                        ? nextAttemptAtMs
+                        : null;
+                updateMutableState(c, current, merged.state(), merged.deliveredLogin(),
+                        merged.routesHash(), effectiveNext, lastError, nowMs);
+                c.commit();
+                return getByEventId(eventId);
+            } catch (Exception e) {
+                try { c.rollback(); } catch (Exception ignored) {}
+                throw e;
+            } finally {
+                c.setAutoCommit(previousAutoCommit);
+            }
+        }
+    }
+
+    public DmDeliveryStateEntry finishAtExpiry(String eventId, long nowMs) throws SQLException {
+        try (Connection c = db.getConnection()) {
+            String sql = """
+                UPDATE dm_delivery_state
+                SET delivery_state = CASE WHEN delivery_state = 0 THEN 3 ELSE delivery_state END,
+                    delivered_server_login = CASE WHEN delivery_state = 0 THEN NULL ELSE delivered_server_login END,
+                    next_attempt_at_ms = NULL,
+                    last_error = CASE WHEN delivery_state = 0 THEN 'DELIVERY_EXPIRED' ELSE last_error END,
+                    updated_at_ms = ?
+                WHERE event_id = ? AND delivery_state = 0
+                """;
+            try (PreparedStatement ps = c.prepareStatement(sql)) {
+                ps.setLong(1, nowMs);
+                ps.setString(2, eventId);
+                ps.executeUpdate();
+            }
+        }
+        return getByEventId(eventId);
+    }
+
+    /** Read-only peer confirmed that at least one recipient server accepted the message. */
+    public DmDeliveryStateEntry markDeliveredFromPeer(String eventId, long nowMs) throws SQLException {
+        try (Connection c = db.getConnection();
+             PreparedStatement ps = c.prepareStatement("""
+                 UPDATE dm_delivery_state
+                 SET delivery_state = 1,
+                     delivered_server_login = NULL,
+                     next_attempt_at_ms = NULL,
+                     last_error = NULL,
+                     updated_at_ms = ?
+                 WHERE event_id = ? AND delivery_state = 0
+                 """)) {
+            ps.setLong(1, nowMs);
+            ps.setString(2, eventId);
+            ps.executeUpdate();
+        }
+        return getByEventId(eventId);
+    }
+
+    public int removeByBaseKey(String baseKey) throws SQLException {
+        try (Connection c = db.getConnection();
+             PreparedStatement ps = c.prepareStatement("DELETE FROM dm_delivery_state WHERE base_key = ?")) {
+            ps.setString(1, baseKey);
+            return ps.executeUpdate();
+        }
+    }
+
+    public int removeConversationBefore(String fromLogin, String toLogin, long boundaryTimeMs) throws SQLException {
+        String sql = """
+            DELETE FROM dm_delivery_state
+            WHERE created_at_ms < ?
+              AND ((LOWER(from_login) = LOWER(?) AND LOWER(to_login) = LOWER(?))
+                OR (LOWER(from_login) = LOWER(?) AND LOWER(to_login) = LOWER(?)))
+            """;
+        try (Connection c = db.getConnection(); PreparedStatement ps = c.prepareStatement(sql)) {
+            ps.setLong(1, boundaryTimeMs);
+            ps.setString(2, fromLogin);
+            ps.setString(3, toLogin);
+            ps.setString(4, toLogin);
+            ps.setString(5, fromLogin);
+            return ps.executeUpdate();
+        }
+    }
+
+    public int removeMissingMessages() throws SQLException {
+        String sql = """
+            DELETE FROM dm_delivery_state d
+            WHERE NOT EXISTS (
+                SELECT 1 FROM signed_messages m WHERE m.message_key = d.outgoing_message_key
+            )
+            """;
+        try (Connection c = db.getConnection(); PreparedStatement ps = c.prepareStatement(sql)) {
+            return ps.executeUpdate();
+        }
+    }
+
+    private DmDeliveryStateEntry getByEventIdForUpdate(Connection c, String eventId) throws SQLException {
+        try (PreparedStatement ps = c.prepareStatement(selectColumns() + " WHERE event_id = ? FOR UPDATE")) {
+            ps.setString(1, eventId);
+            try (ResultSet rs = ps.executeQuery()) {
+                return rs.next() ? mapRow(rs) : null;
+            }
+        }
+    }
+
+    private void updateMutableState(
+            Connection c,
+            DmDeliveryStateEntry current,
+            int state,
+            String deliveredLogin,
+            String routesHash,
+            Long nextAttemptAtMs,
+            String lastError,
+            long nowMs
+    ) throws SQLException {
+        String sql = """
+            UPDATE dm_delivery_state
+            SET delivery_state = ?,
+                delivered_server_login = ?,
+                recipient_routes_hash = ?,
+                next_attempt_at_ms = ?,
+                last_error = ?,
+                updated_at_ms = ?
+            WHERE outgoing_message_key = ? AND event_id = ?
+            """;
+        try (PreparedStatement ps = c.prepareStatement(sql)) {
+            ps.setInt(1, state);
+            setNullableString(ps, 2, state == DmDeliveryStateEntry.DELIVERED_ONE ? normalize(deliveredLogin) : null);
+            setNullableString(ps, 3, normalizeBlank(routesHash));
+            setNullableLong(ps, 4, nextAttemptAtMs);
+            setNullableString(ps, 5, normalizeBlank(lastError));
+            ps.setLong(6, nowMs);
+            ps.setString(7, current.getOutgoingMessageKey());
+            ps.setString(8, current.getEventId());
+            ps.executeUpdate();
+        }
+    }
+
+    private MergeResult merge(
+            int localState,
+            String localLogin,
+            String localHash,
+            int remoteStateRaw,
+            String remoteLoginRaw,
+            String remoteHashRaw
+    ) {
+        int remoteState = normalizeState(remoteStateRaw, remoteLoginRaw);
+        String remoteLogin = normalize(remoteLoginRaw);
+        String localNormalizedLogin = normalize(localLogin);
+        String localRoutesHash = normalizeBlank(localHash);
+        String remoteRoutesHash = normalizeBlank(remoteHashRaw);
+        String resultHash = remoteRoutesHash != null ? remoteRoutesHash : localRoutesHash;
+
+        if (localState == DmDeliveryStateEntry.DELIVERED_ONE || localState == DmDeliveryStateEntry.DELIVERED_ALL) {
+            return new MergeResult(DmDeliveryStateEntry.DELIVERED, localNormalizedLogin,
+                    localRoutesHash != null ? localRoutesHash : remoteRoutesHash);
+        }
+        if (remoteState == DmDeliveryStateEntry.DELIVERED_ONE || remoteState == DmDeliveryStateEntry.DELIVERED_ALL) {
+            return new MergeResult(DmDeliveryStateEntry.DELIVERED, remoteLogin, resultHash);
+        }
+        if (localState == DmDeliveryStateEntry.FAILED_FINAL || remoteState == DmDeliveryStateEntry.FAILED_FINAL) {
+            return new MergeResult(DmDeliveryStateEntry.FAILED_FINAL, null, resultHash);
+        }
+        return new MergeResult(DmDeliveryStateEntry.PENDING_NONE, null, resultHash);
+    }
+
+    private int normalizeState(int state, String deliveredLogin) {
+        if (state < DmDeliveryStateEntry.PENDING_NONE || state > DmDeliveryStateEntry.FAILED_FINAL) {
+            return DmDeliveryStateEntry.PENDING_NONE;
+        }
+        if (state == DmDeliveryStateEntry.DELIVERED_ALL) return DmDeliveryStateEntry.DELIVERED;
+        return state;
+    }
+
+    private String selectColumns() {
+        return """
+            SELECT outgoing_message_key, event_id, base_key, from_login, to_login,
+                   incoming_message_key, created_at_ms, delivery_expires_at_ms,
+                   delivery_state, delivered_server_login, recipient_routes_hash,
+                   attempt_index, next_attempt_at_ms, last_attempt_at_ms, last_error, updated_at_ms
+            FROM dm_delivery_state
+            """;
+    }
+
+    private DmDeliveryStateEntry mapRow(ResultSet rs) throws SQLException {
+        DmDeliveryStateEntry e = new DmDeliveryStateEntry();
+        e.setOutgoingMessageKey(rs.getString("outgoing_message_key"));
+        e.setEventId(rs.getString("event_id"));
+        e.setBaseKey(rs.getString("base_key"));
+        e.setFromLogin(rs.getString("from_login"));
+        e.setToLogin(rs.getString("to_login"));
+        e.setIncomingMessageKey(rs.getString("incoming_message_key"));
+        e.setCreatedAtMs(rs.getLong("created_at_ms"));
+        e.setDeliveryExpiresAtMs(rs.getLong("delivery_expires_at_ms"));
+        e.setDeliveryState(rs.getInt("delivery_state"));
+        e.setDeliveredServerLogin(rs.getString("delivered_server_login"));
+        e.setRecipientRoutesHash(rs.getString("recipient_routes_hash"));
+        e.setAttemptIndex(rs.getInt("attempt_index"));
+        long next = rs.getLong("next_attempt_at_ms");
+        e.setNextAttemptAtMs(rs.wasNull() ? null : next);
+        long last = rs.getLong("last_attempt_at_ms");
+        e.setLastAttemptAtMs(rs.wasNull() ? null : last);
+        e.setLastError(rs.getString("last_error"));
+        e.setUpdatedAtMs(rs.getLong("updated_at_ms"));
+        return e;
+    }
+
+    private static void setNullableString(PreparedStatement ps, int index, String value) throws SQLException {
+        if (isBlank(value)) ps.setNull(index, Types.VARCHAR);
+        else ps.setString(index, value.trim());
+    }
+
+    private static void setNullableLong(PreparedStatement ps, int index, Long value) throws SQLException {
+        if (value == null) ps.setNull(index, Types.BIGINT);
+        else ps.setLong(index, value);
+    }
+
+    private static String normalize(String value) {
+        if (value == null) return null;
+        String normalized = value.trim().toLowerCase();
+        return normalized.isEmpty() ? null : normalized;
+    }
+
+    private static String normalizeBlank(String value) {
+        if (value == null) return null;
+        String normalized = value.trim();
+        return normalized.isEmpty() ? null : normalized;
+    }
+
+    private static boolean isBlank(String value) {
+        return value == null || value.isBlank();
+    }
+
+    private record MergeResult(int state, String deliveredLogin, String routesHash) {}
+}

SHiNE-server/shine-server-db/src/main/java/shine/db/dao/DmDialogStateDAO.java

@@ -0,0 +1,464 @@
+package shine.db.dao;
+
+import shine.db.MsgSubType;
+import shine.db.entities.SignedMessageEntry;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Base64;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+public final class DmDialogStateDAO {
+    private static volatile DmDialogStateDAO instance;
+
+    private DmDialogStateDAO() {}
+
+    public static DmDialogStateDAO getInstance() {
+        if (instance == null) {
+            synchronized (DmDialogStateDAO.class) {
+                if (instance == null) instance = new DmDialogStateDAO();
+            }
+        }
+        return instance;
+    }
+
+    public void bootstrapIfEmpty(Connection c) throws SQLException {
+        if (c == null) return;
+        if (hasAnyRow(c)) return;
+
+        boolean prevAutoCommit = c.getAutoCommit();
+        c.setAutoCommit(false);
+        try {
+            for (PairItem pair : listConversationPairs(c)) {
+                refreshConversationPair(c, pair.ownerLogin(), pair.peerLogin());
+            }
+            c.commit();
+        } catch (Exception e) {
+            try { c.rollback(); } catch (Exception ignored) {}
+            if (e instanceof SQLException sqlEx) throw sqlEx;
+            throw new SQLException("Failed to bootstrap dm_dialog_state", e);
+        } finally {
+            c.setAutoCommit(prevAutoCommit);
+        }
+    }
+
+    public void refreshConversationPair(Connection c, String ownerLogin, String peerLogin) throws SQLException {
+        String cleanOwner = normalize(ownerLogin);
+        String cleanPeer = normalize(peerLogin);
+        if (cleanOwner.isEmpty() || cleanPeer.isEmpty()) return;
+        if (cleanOwner.equalsIgnoreCase(cleanPeer)) return;
+        refreshConversation(c, cleanOwner, cleanPeer);
+        refreshConversation(c, cleanPeer, cleanOwner);
+    }
+
+    public List<DialogSummary> listInboxDialogs(Connection c, String ownerLogin) throws SQLException {
+        String cleanOwner = normalize(ownerLogin);
+        if (cleanOwner.isEmpty()) return List.of();
+
+        Map<String, DialogSummary> byPeer = new LinkedHashMap<>();
+        List<String> contacts = ConnectionsStateDAO.getInstance().listOutgoingByRelTypeCanonical(c, cleanOwner, MsgSubType.CONNECTION_CONTACT);
+        List<String> friends = ConnectionsStateDAO.getInstance().listOutgoingByRelTypeCanonical(c, cleanOwner, MsgSubType.CONNECTION_FRIEND);
+        List<String> closeFriends = ConnectionsStateDAO.getInstance().listOutgoingByRelTypeCanonical(c, cleanOwner, MsgSubType.CONNECTION_CLOSE_FRIEND);
+
+        try (PreparedStatement ps = c.prepareStatement("""
+            SELECT owner_login, peer_login, relation_flag, last_message_blob_b64,
+                   last_message_time_ms, unread_count, last_read_receipt_time_ms,
+                   updated_at_ms
+            FROM dm_dialog_state
+            WHERE LOWER(owner_login) = LOWER(?)
+            """)) {
+            ps.setString(1, cleanOwner);
+            try (ResultSet rs = ps.executeQuery()) {
+                while (rs.next()) {
+                    long lastMessageTimeMs = rs.getLong("last_message_time_ms");
+                    int unreadCount = rs.getInt("unread_count");
+                    DialogSummary row = new DialogSummary(
+                            rs.getString("owner_login"),
+                            rs.getString("peer_login"),
+                            normalizeRelationFlag(rs.getString("relation_flag")),
+                            rs.getString("last_message_blob_b64"),
+                            lastMessageTimeMs,
+                            unreadCount,
+                            rs.getLong("last_read_receipt_time_ms"),
+                            rs.getLong("updated_at_ms"),
+                            lastMessageTimeMs > 0 || unreadCount > 0
+                    );
+                    byPeer.put(normKey(row.peerLogin()), row);
+                }
+            }
+        }
+
+        for (String peer : contacts) {
+            addOrUpdateSummary(byPeer, cleanOwner, peer, "contact", false);
+        }
+        for (String peer : friends) {
+            addOrUpdateSummary(byPeer, cleanOwner, peer, "friend", false);
+        }
+        for (String peer : closeFriends) {
+            addOrUpdateSummary(byPeer, cleanOwner, peer, "close_friend", false);
+        }
+
+        for (DialogSummary row : new ArrayList<>(byPeer.values())) {
+            String relationFlag = resolveRelationFlag(c, cleanOwner, row.peerLogin());
+            byPeer.put(normKey(row.peerLogin()), new DialogSummary(
+                    row.ownerLogin(),
+                    row.peerLogin(),
+                    relationFlag,
+                    row.lastMessageBlobB64(),
+                    row.lastMessageTimeMs(),
+                    row.unreadCount(),
+                    row.lastReadReceiptTimeMs(),
+                    row.updatedAtMs(),
+                    row.hasDialog()
+            ));
+        }
+
+        List<DialogSummary> out = new ArrayList<>(byPeer.values());
+        out.sort((a, b) -> {
+            int cmp = Long.compare(b.lastMessageTimeMs(), a.lastMessageTimeMs());
+            if (cmp != 0) return cmp;
+            return normalize(a.peerLogin()).compareToIgnoreCase(normalize(b.peerLogin()));
+        });
+        return out;
+    }
+
+    public void refreshFromEntry(Connection c, SignedMessageEntry entry) throws SQLException {
+        if (entry == null) return;
+        refreshConversationPair(c, entry.getFromLogin(), entry.getToLogin());
+    }
+
+    private void refreshConversation(Connection c, String ownerLogin, String peerLogin) throws SQLException {
+        DialogSummary summary = loadConversationSummary(c, ownerLogin, peerLogin);
+        upsert(c, summary);
+        if (summary.lastReadReceiptTimeMs() > 0) {
+            syncMessagesToWatermark(c, summary.ownerLogin(), summary.peerLogin(), summary.lastReadReceiptTimeMs());
+        }
+    }
+
+    private DialogSummary loadConversationSummary(Connection c, String ownerLogin, String peerLogin) throws SQLException {
+        String cleanOwner = normalize(ownerLogin);
+        String cleanPeer = normalize(peerLogin);
+        if (cleanOwner.isEmpty() || cleanPeer.isEmpty() || cleanOwner.equalsIgnoreCase(cleanPeer)) {
+            return new DialogSummary(cleanOwner, cleanPeer, "none", "", 0L, 0, 0L, System.currentTimeMillis(), false);
+        }
+
+        String relationFlag = resolveRelationFlag(c, cleanOwner, cleanPeer);
+        long existingWatermark = loadExistingWatermark(c, cleanOwner, cleanPeer);
+
+        String latestSql = """
+            SELECT raw_block, time_ms
+            FROM signed_messages
+            WHERE (
+                    (LOWER(from_login) = LOWER(?) AND LOWER(to_login) = LOWER(?))
+                 OR (LOWER(from_login) = LOWER(?) AND LOWER(to_login) = LOWER(?))
+                  )
+              AND message_type IN (1, 2)
+            ORDER BY time_ms DESC, revision_time_ms DESC, reencrypted_at_ms DESC, created_at_ms DESC, message_key DESC
+            LIMIT 1
+            """;
+        String unreadSql = """
+            SELECT COUNT(*)
+            FROM signed_messages
+            WHERE LOWER(from_login) = LOWER(?)
+              AND LOWER(to_login) = LOWER(?)
+              AND message_type = 1
+              AND time_ms > ?
+              AND (read_at_ms IS NULL OR read_at_ms <= 0)
+            """;
+        String contentReadSql = """
+            SELECT MAX(read_at_ms)
+            FROM signed_messages
+            WHERE (
+                    (LOWER(from_login) = LOWER(?) AND LOWER(to_login) = LOWER(?))
+                 OR (LOWER(from_login) = LOWER(?) AND LOWER(to_login) = LOWER(?))
+                  )
+              AND message_type IN (1, 2)
+              AND read_at_ms IS NOT NULL
+              AND read_at_ms > 0
+            """;
+        String receiptWatermarkSql = """
+            SELECT MAX(time_ms)
+            FROM signed_messages
+            WHERE (
+                    (LOWER(from_login) = LOWER(?) AND LOWER(to_login) = LOWER(?))
+                 OR (LOWER(from_login) = LOWER(?) AND LOWER(to_login) = LOWER(?))
+                  )
+              AND message_type IN (3, 4)
+            """;
+
+        String lastMessageBlobB64 = "";
+        long lastMessageTimeMs = 0L;
+        int unreadCount = 0;
+        long lastReadReceiptTimeMs = existingWatermark;
+
+        try (PreparedStatement ps = c.prepareStatement(latestSql)) {
+            ps.setString(1, cleanOwner);
+            ps.setString(2, cleanPeer);
+            ps.setString(3, cleanPeer);
+            ps.setString(4, cleanOwner);
+            try (ResultSet rs = ps.executeQuery()) {
+                if (rs.next()) {
+                    lastMessageTimeMs = rs.getLong("time_ms");
+                    byte[] rawBlock = rs.getBytes("raw_block");
+                    if (rawBlock != null && rawBlock.length > 0) {
+                        lastMessageBlobB64 = Base64.getEncoder().encodeToString(rawBlock);
+                    }
+                }
+            }
+        }
+
+        try (PreparedStatement ps = c.prepareStatement(contentReadSql)) {
+            ps.setString(1, cleanOwner);
+            ps.setString(2, cleanPeer);
+            ps.setString(3, cleanPeer);
+            ps.setString(4, cleanOwner);
+            try (ResultSet rs = ps.executeQuery()) {
+                if (rs.next()) {
+                    long value = rs.getLong(1);
+                    if (!rs.wasNull()) lastReadReceiptTimeMs = Math.max(lastReadReceiptTimeMs, value);
+                }
+            }
+        }
+
+        try (PreparedStatement ps = c.prepareStatement(receiptWatermarkSql)) {
+            ps.setString(1, cleanOwner);
+            ps.setString(2, cleanPeer);
+            ps.setString(3, cleanPeer);
+            ps.setString(4, cleanOwner);
+            try (ResultSet rs = ps.executeQuery()) {
+                if (rs.next()) {
+                    long value = rs.getLong(1);
+                    if (!rs.wasNull()) lastReadReceiptTimeMs = Math.max(lastReadReceiptTimeMs, value);
+                }
+            }
+        }
+
+        try (PreparedStatement ps = c.prepareStatement(unreadSql)) {
+            ps.setString(1, cleanPeer);
+            ps.setString(2, cleanOwner);
+            ps.setLong(3, lastReadReceiptTimeMs);
+            try (ResultSet rs = ps.executeQuery()) {
+                if (rs.next()) unreadCount = rs.getInt(1);
+            }
+        }
+
+        return new DialogSummary(
+                cleanOwner,
+                cleanPeer,
+                relationFlag,
+                lastMessageBlobB64,
+                lastMessageTimeMs,
+                unreadCount,
+                lastReadReceiptTimeMs,
+                System.currentTimeMillis(),
+                lastMessageTimeMs > 0 || unreadCount > 0 || lastReadReceiptTimeMs > 0
+        );
+    }
+
+    private void upsert(Connection c, DialogSummary summary) throws SQLException {
+        try (PreparedStatement ps = c.prepareStatement("""
+            INSERT INTO dm_dialog_state (
+                owner_login, peer_login, relation_flag, last_message_blob_b64,
+                last_message_time_ms, unread_count, last_read_receipt_time_ms, updated_at_ms
+            ) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+            ON CONFLICT (owner_login, peer_login) DO UPDATE SET
+                relation_flag = EXCLUDED.relation_flag,
+                last_message_blob_b64 = EXCLUDED.last_message_blob_b64,
+                last_message_time_ms = EXCLUDED.last_message_time_ms,
+                unread_count = EXCLUDED.unread_count,
+                last_read_receipt_time_ms = EXCLUDED.last_read_receipt_time_ms,
+                updated_at_ms = EXCLUDED.updated_at_ms
+            """)) {
+            ps.setString(1, summary.ownerLogin());
+            ps.setString(2, summary.peerLogin());
+            ps.setString(3, normalizeRelationFlag(summary.relationFlag()));
+            ps.setString(4, summary.lastMessageBlobB64());
+            ps.setLong(5, summary.lastMessageTimeMs());
+            ps.setInt(6, summary.unreadCount());
+            ps.setLong(7, summary.lastReadReceiptTimeMs());
+            ps.setLong(8, summary.updatedAtMs());
+            ps.executeUpdate();
+        }
+    }
+
+    private String resolveRelationFlag(Connection c, String ownerLogin, String peerLogin) throws SQLException {
+        if (ConnectionsStateDAO.getInstance().hasOutgoingByRelTypeCanonical(c, ownerLogin, peerLogin, MsgSubType.CONNECTION_CLOSE_FRIEND)) {
+            return "close_friend";
+        }
+        if (ConnectionsStateDAO.getInstance().hasOutgoingByRelTypeCanonical(c, ownerLogin, peerLogin, MsgSubType.CONNECTION_FRIEND)) {
+            return "friend";
+        }
+        if (ConnectionsStateDAO.getInstance().hasOutgoingByRelTypeCanonical(c, ownerLogin, peerLogin, MsgSubType.CONNECTION_CONTACT)) {
+            return "contact";
+        }
+        return "none";
+    }
+
+    private boolean hasAnyRow(Connection c) throws SQLException {
+        try (Statement st = c.createStatement();
+             ResultSet rs = st.executeQuery("SELECT 1 FROM dm_dialog_state LIMIT 1")) {
+            return rs.next();
+        }
+    }
+
+    private List<PairItem> listConversationPairs(Connection c) throws SQLException {
+        String sql = """
+            SELECT DISTINCT owner_login, peer_login
+            FROM (
+                SELECT
+                    m.target_login AS owner_login,
+                    CASE
+                        WHEN LOWER(m.target_login) = LOWER(m.to_login) THEN m.from_login
+                        ELSE m.to_login
+                    END AS peer_login
+                FROM signed_messages m
+                WHERE m.message_type IN (1, 2, 3, 4, 5, 6, 7, 8)
+
+                UNION ALL
+
+                SELECT m.from_login AS owner_login, m.to_login AS peer_login
+                FROM signed_messages m
+                WHERE m.message_type IN (5, 6, 7, 8)
+
+                UNION ALL
+
+                SELECT m.to_login AS owner_login, m.from_login AS peer_login
+                FROM signed_messages m
+                WHERE m.message_type IN (5, 6, 7, 8)
+            ) pairs
+            WHERE owner_login IS NOT NULL
+              AND peer_login IS NOT NULL
+              AND BTRIM(owner_login) <> ''
+              AND BTRIM(peer_login) <> ''
+              AND LOWER(owner_login) <> LOWER(peer_login)
+            ORDER BY owner_login, peer_login
+            """;
+        List<PairItem> out = new ArrayList<>();
+        try (Statement st = c.createStatement();
+             ResultSet rs = st.executeQuery(sql)) {
+            while (rs.next()) {
+                String ownerLogin = rs.getString("owner_login");
+                String peerLogin = rs.getString("peer_login");
+                if (normalize(ownerLogin).isEmpty() || normalize(peerLogin).isEmpty()) continue;
+                out.add(new PairItem(ownerLogin, peerLogin));
+            }
+        }
+        return out;
+    }
+
+    private void addOrUpdateSummary(Map<String, DialogSummary> map, String ownerLogin, String peerLogin, String relationFlag, boolean hasDialog) {
+        String owner = normalize(ownerLogin);
+        String peer = normalize(peerLogin);
+        if (owner.isEmpty() || peer.isEmpty() || owner.equalsIgnoreCase(peer)) return;
+        String key = normKey(peer);
+        DialogSummary current = map.get(key);
+        if (current == null) {
+            map.put(key, new DialogSummary(owner, peer, relationFlag, "", 0L, 0, 0L, System.currentTimeMillis(), hasDialog));
+            return;
+        }
+        String nextRelation = current.relationFlag();
+        if ("close_friend".equalsIgnoreCase(relationFlag) || "close_friend".equalsIgnoreCase(nextRelation)) {
+            nextRelation = "close_friend";
+        } else if ("friend".equalsIgnoreCase(relationFlag) || "friend".equalsIgnoreCase(nextRelation)) {
+            nextRelation = "friend";
+        } else if ("contact".equalsIgnoreCase(relationFlag) || "contact".equalsIgnoreCase(nextRelation)) {
+            nextRelation = "contact";
+        } else {
+            nextRelation = normalizeRelationFlag(nextRelation);
+        }
+        map.put(key, new DialogSummary(
+                current.ownerLogin().isEmpty() ? owner : current.ownerLogin(),
+                peer,
+                nextRelation,
+                current.lastMessageBlobB64(),
+                current.lastMessageTimeMs(),
+                current.unreadCount(),
+                current.lastReadReceiptTimeMs(),
+                current.updatedAtMs(),
+                current.hasDialog() || hasDialog
+        ));
+    }
+
+    private void syncMessagesToWatermark(Connection c, String ownerLogin, String peerLogin, long watermark) throws SQLException {
+        if (watermark <= 0) return;
+        String cleanOwner = normalize(ownerLogin);
+        String cleanPeer = normalize(peerLogin);
+        if (cleanOwner.isEmpty() || cleanPeer.isEmpty() || cleanOwner.equalsIgnoreCase(cleanPeer)) return;
+        try (PreparedStatement ps = c.prepareStatement("""
+            UPDATE signed_messages
+            SET read_at_ms = CASE
+                WHEN read_at_ms IS NULL OR read_at_ms <= 0 THEN ?
+                WHEN read_at_ms > ? THEN read_at_ms
+                ELSE read_at_ms
+            END
+            WHERE (
+                    (LOWER(from_login) = LOWER(?) AND LOWER(to_login) = LOWER(?))
+                 OR (LOWER(from_login) = LOWER(?) AND LOWER(to_login) = LOWER(?))
+                  )
+              AND message_type IN (1, 2)
+              AND time_ms <= ?
+            """)) {
+            ps.setLong(1, watermark);
+            ps.setLong(2, watermark);
+            ps.setString(3, cleanOwner);
+            ps.setString(4, cleanPeer);
+            ps.setString(5, cleanPeer);
+            ps.setString(6, cleanOwner);
+            ps.setLong(7, watermark);
+            ps.executeUpdate();
+        }
+    }
+
+    private long loadExistingWatermark(Connection c, String ownerLogin, String peerLogin) throws SQLException {
+        try (PreparedStatement ps = c.prepareStatement("""
+            SELECT last_read_receipt_time_ms
+            FROM dm_dialog_state
+            WHERE LOWER(owner_login) = LOWER(?)
+              AND LOWER(peer_login) = LOWER(?)
+            LIMIT 1
+            """)) {
+            ps.setString(1, ownerLogin);
+            ps.setString(2, peerLogin);
+            try (ResultSet rs = ps.executeQuery()) {
+                if (!rs.next()) return 0L;
+                long value = rs.getLong(1);
+                return rs.wasNull() ? 0L : value;
+            }
+        }
+    }
+
+    private String normalize(String value) {
+        return value == null ? "" : value.trim();
+    }
+
+    private String normKey(String value) {
+        return normalize(value).toLowerCase(Locale.ROOT);
+    }
+
+    private String normalizeRelationFlag(String value) {
+        String clean = normalize(value).toLowerCase(Locale.ROOT);
+        if ("close_friend".equals(clean) || "friend".equals(clean) || "contact".equals(clean)) return clean;
+        return "none";
+    }
+
+    public record DialogSummary(
+            String ownerLogin,
+            String peerLogin,
+            String relationFlag,
+            String lastMessageBlobB64,
+            long lastMessageTimeMs,
+            int unreadCount,
+            long lastReadReceiptTimeMs,
+            long updatedAtMs,
+            boolean hasDialog
+    ) {}
+
+    private record PairItem(String ownerLogin, String peerLogin) {}
+}

SHiNE-server/shine-server-db/src/main/java/shine/db/dao/DmSyncOutboxDAO.java

@@ -0,0 +1,232 @@
+package shine.db.dao;
+
+import shine.db.DbController;
+import shine.db.entities.DmSyncOutboxEntry;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+import java.util.ArrayList;
+import java.util.List;
+
+/** Outbox событий DM для единственного второго access-сервера пользователя. */
+public final class DmSyncOutboxDAO {
+    private static volatile DmSyncOutboxDAO instance;
+    private final DbController db = DbController.getInstance();
+
+    private DmSyncOutboxDAO() {}
+
+    public static DmSyncOutboxDAO getInstance() {
+        if (instance == null) {
+            synchronized (DmSyncOutboxDAO.class) {
+                if (instance == null) instance = new DmSyncOutboxDAO();
+            }
+        }
+        return instance;
+    }
+
+    public void upsert(
+            String ownerLogin,
+            String primaryMessageKey,
+            String eventId,
+            String secondaryMessageKey,
+            boolean synced,
+            long createdAtMs
+    ) throws SQLException {
+        long now = System.currentTimeMillis();
+        String sql = """
+            INSERT INTO dm_sync_outbox (
+                owner_login, primary_message_key, event_id, secondary_message_key,
+                synced, created_at_ms, updated_at_ms
+            ) VALUES (LOWER(?), ?, ?, ?, ?, ?, ?)
+            ON CONFLICT (owner_login, primary_message_key) DO UPDATE SET
+                event_id = EXCLUDED.event_id,
+                secondary_message_key = EXCLUDED.secondary_message_key,
+                synced = CASE
+                    WHEN dm_sync_outbox.event_id = EXCLUDED.event_id
+                        THEN dm_sync_outbox.synced OR EXCLUDED.synced
+                    ELSE EXCLUDED.synced
+                END,
+                created_at_ms = CASE
+                    WHEN dm_sync_outbox.event_id = EXCLUDED.event_id
+                        THEN dm_sync_outbox.created_at_ms
+                    ELSE EXCLUDED.created_at_ms
+                END,
+                updated_at_ms = EXCLUDED.updated_at_ms
+            """;
+        try (Connection c = db.getConnection(); PreparedStatement ps = c.prepareStatement(sql)) {
+            ps.setString(1, ownerLogin);
+            ps.setString(2, primaryMessageKey);
+            ps.setString(3, eventId);
+            if (secondaryMessageKey == null || secondaryMessageKey.isBlank()) ps.setNull(4, Types.VARCHAR);
+            else ps.setString(4, secondaryMessageKey.trim());
+            ps.setBoolean(5, synced);
+            ps.setLong(6, createdAtMs);
+            ps.setLong(7, now);
+            ps.executeUpdate();
+        }
+    }
+
+    public List<DmSyncOutboxEntry> listUnsynced(String ownerLogin, int limit) throws SQLException {
+        return listUnsynced(ownerLogin, 0L, "", limit);
+    }
+
+    public List<DmSyncOutboxEntry> listUnsynced(
+            String ownerLogin, long afterCreatedAtMs, String afterPrimaryMessageKey, int limit
+    ) throws SQLException {
+        String sql = """
+            SELECT owner_login, primary_message_key, event_id, secondary_message_key,
+                   synced, created_at_ms, updated_at_ms
+            FROM dm_sync_outbox
+            WHERE LOWER(owner_login) = LOWER(?) AND synced = FALSE
+              AND (created_at_ms > ? OR (created_at_ms = ? AND primary_message_key > ?))
+            ORDER BY created_at_ms ASC, primary_message_key ASC
+            LIMIT ?
+            """;
+        List<DmSyncOutboxEntry> out = new ArrayList<>();
+        try (Connection c = db.getConnection(); PreparedStatement ps = c.prepareStatement(sql)) {
+            ps.setString(1, ownerLogin);
+            ps.setLong(2, Math.max(0L, afterCreatedAtMs));
+            ps.setLong(3, Math.max(0L, afterCreatedAtMs));
+            ps.setString(4, afterPrimaryMessageKey == null ? "" : afterPrimaryMessageKey);
+            ps.setInt(5, Math.max(1, limit));
+            try (ResultSet rs = ps.executeQuery()) {
+                while (rs.next()) out.add(mapRow(rs));
+            }
+        }
+        return out;
+    }
+
+    public boolean hasUnsyncedForServer(String serverLogin) throws SQLException {
+        String sql = """
+            SELECT 1
+            FROM dm_sync_outbox o
+            JOIN user_access_servers_current r
+              ON LOWER(r.user_login) = LOWER(o.owner_login)
+            WHERE o.synced = FALSE AND LOWER(r.server_login) = LOWER(?)
+              AND EXISTS (
+                  SELECT 1
+                  FROM user_access_servers_current peer
+                  WHERE LOWER(peer.user_login) = LOWER(o.owner_login)
+                    AND LOWER(peer.server_login) <> LOWER(?)
+              )
+            LIMIT 1
+            """;
+        try (Connection c = db.getConnection(); PreparedStatement ps = c.prepareStatement(sql)) {
+            ps.setString(1, serverLogin);
+            ps.setString(2, serverLogin);
+            try (ResultSet rs = ps.executeQuery()) {
+                return rs.next();
+            }
+        }
+    }
+
+    public List<String> listUnsyncedOwnersForServer(String serverLogin) throws SQLException {
+        String sql = """
+            SELECT DISTINCT o.owner_login
+            FROM dm_sync_outbox o
+            JOIN user_access_servers_current r
+              ON LOWER(r.user_login) = LOWER(o.owner_login)
+            WHERE o.synced = FALSE AND LOWER(r.server_login) = LOWER(?)
+              AND EXISTS (
+                  SELECT 1
+                  FROM user_access_servers_current peer
+                  WHERE LOWER(peer.user_login) = LOWER(o.owner_login)
+                    AND LOWER(peer.server_login) <> LOWER(?)
+              )
+            ORDER BY o.owner_login
+            """;
+        List<String> result = new ArrayList<>();
+        try (Connection c = db.getConnection(); PreparedStatement ps = c.prepareStatement(sql)) {
+            ps.setString(1, serverLogin);
+            ps.setString(2, serverLogin);
+            try (ResultSet rs = ps.executeQuery()) {
+                while (rs.next()) result.add(rs.getString("owner_login"));
+            }
+        }
+        return result;
+    }
+
+    public int markSynced(String ownerLogin, String eventId) throws SQLException {
+        String sql = """
+            UPDATE dm_sync_outbox
+            SET synced = TRUE, updated_at_ms = ?
+            WHERE LOWER(owner_login) = LOWER(?) AND event_id = ?
+            """;
+        try (Connection c = db.getConnection(); PreparedStatement ps = c.prepareStatement(sql)) {
+            ps.setLong(1, System.currentTimeMillis());
+            ps.setString(2, ownerLogin);
+            ps.setString(3, eventId);
+            return ps.executeUpdate();
+        }
+    }
+
+    public int markSynced(String ownerLogin, List<String> eventIds) throws SQLException {
+        if (eventIds == null || eventIds.isEmpty()) return 0;
+        int total = 0;
+        try (Connection c = db.getConnection();
+             PreparedStatement ps = c.prepareStatement("""
+                 UPDATE dm_sync_outbox
+                 SET synced = TRUE, updated_at_ms = ?
+                 WHERE LOWER(owner_login) = LOWER(?) AND event_id = ?
+                 """)) {
+            long now = System.currentTimeMillis();
+            for (String eventId : eventIds) {
+                if (eventId == null || eventId.isBlank()) continue;
+                ps.setLong(1, now);
+                ps.setString(2, ownerLogin);
+                ps.setString(3, eventId.trim());
+                ps.addBatch();
+            }
+            for (int changed : ps.executeBatch()) if (changed > 0) total += changed;
+        }
+        return total;
+    }
+
+    public int markAllUnsynced(String ownerLogin) throws SQLException {
+        String sql = """
+            UPDATE dm_sync_outbox
+            SET synced = FALSE, updated_at_ms = ?
+            WHERE LOWER(owner_login) = LOWER(?)
+            """;
+        try (Connection c = db.getConnection(); PreparedStatement ps = c.prepareStatement(sql)) {
+            ps.setLong(1, System.currentTimeMillis());
+            ps.setString(2, ownerLogin);
+            return ps.executeUpdate();
+        }
+    }
+
+    public int markAllUnsynced() throws SQLException {
+        try (Connection c = db.getConnection();
+             PreparedStatement ps = c.prepareStatement("UPDATE dm_sync_outbox SET synced = FALSE, updated_at_ms = ?")) {
+            ps.setLong(1, System.currentTimeMillis());
+            return ps.executeUpdate();
+        }
+    }
+
+    public int removeMissingMessages() throws SQLException {
+        String sql = """
+            DELETE FROM dm_sync_outbox o
+            WHERE NOT EXISTS (
+                SELECT 1 FROM signed_messages m WHERE m.message_key = o.primary_message_key
+            )
+            """;
+        try (Connection c = db.getConnection(); PreparedStatement ps = c.prepareStatement(sql)) {
+            return ps.executeUpdate();
+        }
+    }
+
+    private DmSyncOutboxEntry mapRow(ResultSet rs) throws SQLException {
+        DmSyncOutboxEntry e = new DmSyncOutboxEntry();
+        e.setOwnerLogin(rs.getString("owner_login"));
+        e.setPrimaryMessageKey(rs.getString("primary_message_key"));
+        e.setEventId(rs.getString("event_id"));
+        e.setSecondaryMessageKey(rs.getString("secondary_message_key"));
+        e.setSynced(rs.getBoolean("synced"));
+        e.setCreatedAtMs(rs.getLong("created_at_ms"));
+        e.setUpdatedAtMs(rs.getLong("updated_at_ms"));
+        return e;
+    }
+}

SHiNE-server/shine-server-db/src/main/java/shine/db/dao/SignedDirectMessagesHistoryDAO.java

@@ -1,47 +0,0 @@
-package shine.db.dao;
-
-import shine.db.DbController;
-import shine.db.entities.SignedDirectMessageHistoryEntry;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-
-public final class SignedDirectMessagesHistoryDAO {
-    private static volatile SignedDirectMessagesHistoryDAO instance;
-    private final DbController db = DbController.getInstance();
-
-    private SignedDirectMessagesHistoryDAO() {}
-
-    public static SignedDirectMessagesHistoryDAO getInstance() {
-        if (instance == null) {
-            synchronized (SignedDirectMessagesHistoryDAO.class) {
-                if (instance == null) instance = new SignedDirectMessagesHistoryDAO();
-            }
-        }
-        return instance;
-    }
-
-    public void insert(SignedDirectMessageHistoryEntry e) throws Exception {
-        try (Connection c = db.getConnection()) {
-            String sql = """
-                INSERT INTO signed_direct_messages_history (
-                    message_id, from_login, to_login, target_mode, target_session_id,
-                    message_type, time_ms, nonce, raw_packet, created_at_ms
-                ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-                """;
-            try (PreparedStatement ps = c.prepareStatement(sql)) {
-                ps.setString(1, e.getMessageId());
-                ps.setString(2, e.getFromLogin());
-                ps.setString(3, e.getToLogin());
-                ps.setInt(4, e.getTargetMode());
-                ps.setString(5, e.getTargetSessionId());
-                ps.setInt(6, e.getMessageType());
-                ps.setLong(7, e.getTimeMs());
-                ps.setLong(8, e.getNonce());
-                ps.setBytes(9, e.getRawPacket());
-                ps.setLong(10, e.getCreatedAtMs());
-                ps.executeUpdate();
-            }
-        }
-    }
-}

SHiNE-server/shine-server-db/src/main/java/shine/db/dao/SignedDmReplayDAO.java

@@ -1,51 +0,0 @@
-package shine.db.dao;
-
-import shine.db.DbController;
-
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-
-public final class SignedDmReplayDAO {
-    private static volatile SignedDmReplayDAO instance;
-    private final DbController db = DbController.getInstance();
-
-    private SignedDmReplayDAO() {}
-
-    public static SignedDmReplayDAO getInstance() {
-        if (instance == null) {
-            synchronized (SignedDmReplayDAO.class) {
-                if (instance == null) instance = new SignedDmReplayDAO();
-            }
-        }
-        return instance;
-    }
-
-    public boolean registerUnique(String fromLogin, long timeMs, long nonce, long nowMs) throws Exception {
-        cleanupExpired(nowMs - 15L * 60L * 1000L);
-        try (Connection c = db.getConnection()) {
-            String sql = """
-                    INSERT INTO signed_direct_message_replay (
-                        from_login, time_ms, nonce, created_at_ms
-                    ) VALUES (?, ?, ?, ?)
-                    ON CONFLICT DO NOTHING
-                    """;
-            try (PreparedStatement ps = c.prepareStatement(sql)) {
-                ps.setString(1, fromLogin);
-                ps.setLong(2, timeMs);
-                ps.setLong(3, nonce);
-                ps.setLong(4, nowMs);
-                return ps.executeUpdate() > 0;
-            }
-        }
-    }
-
-    public void cleanupExpired(long minCreatedAtMs) throws Exception {
-        try (Connection c = db.getConnection()) {
-            String sql = "DELETE FROM signed_direct_message_replay WHERE created_at_ms < ?";
-            try (PreparedStatement ps = c.prepareStatement(sql)) {
-                ps.setLong(1, minCreatedAtMs);
-                ps.executeUpdate();
-            }
-        }
-    }
-}

SHiNE-server/shine-server-db/src/main/java/shine/db/dao/SignedMessagesDAO.java

@@ -58,6 +58,7 @@ public final class SignedMessagesDAO {
                     ApplyStatus status = ps.executeUpdate() > 0 ? ApplyStatus.APPLIED : ApplyStatus.DUPLICATE_OR_OLDER;
                     if (status.applied()) {
                         markMessageReadByReceipt(c, e);
+                        DmDialogStateDAO.getInstance().refreshFromEntry(c, e);
                     }
                     return status;
                 }
@@ -76,6 +77,7 @@ public final class SignedMessagesDAO {
                     if (insertedFirst == 1 && insertedSecond == 1) {
                         markMessageReadByReceipt(c, first);
                         markMessageReadByReceipt(c, second);
+                        DmDialogStateDAO.getInstance().refreshConversationPair(c, first.getFromLogin(), first.getToLogin());
                         c.commit();
                         return true;
                     }
@@ -122,6 +124,7 @@ public final class SignedMessagesDAO {
                     markMessageReadByReceipt(c, outgoing);
                     resetDeliveryRows(c, incoming.getMessageKey());
                     resetDeliveryRows(c, outgoing.getMessageKey());
+                    DmDialogStateDAO.getInstance().refreshConversationPair(c, incoming.getFromLogin(), incoming.getToLogin());
 
                     c.commit();
                     return ApplyStatus.APPLIED;
@@ -160,6 +163,7 @@ public final class SignedMessagesDAO {
                     upsertMessage(c, incoming);
                     markMessageReadByReceipt(c, incoming);
                     resetDeliveryRows(c, incoming.getMessageKey());
+                    DmDialogStateDAO.getInstance().refreshConversationPair(c, incoming.getFromLogin(), incoming.getToLogin());
                     c.commit();
                     return ApplyStatus.APPLIED;
                 } catch (Exception ex) {
@@ -190,6 +194,7 @@ public final class SignedMessagesDAO {
                     deleteMessageContentAndReceipts(c, tombstone.getBaseKey());
                     upsertMessage(c, tombstone);
                     resetDeliveryRows(c, tombstone.getMessageKey());
+                    DmDialogStateDAO.getInstance().refreshConversationPair(c, tombstone.getFromLogin(), tombstone.getToLogin());
 
                     c.commit();
                     return ApplyStatus.APPLIED;
@@ -218,6 +223,7 @@ public final class SignedMessagesDAO {
                     deleteConversationHistoryBefore(c, tombstone.getFromLogin(), tombstone.getToLogin(), tombstone.getTimeMs());
                     upsertMessage(c, tombstone);
                     resetDeliveryRows(c, tombstone.getMessageKey());
+                    DmDialogStateDAO.getInstance().refreshConversationPair(c, tombstone.getFromLogin(), tombstone.getToLogin());
 
                     c.commit();
                     return ApplyStatus.APPLIED;

SHiNE-server/shine-server-db/src/main/java/shine/db/dao/SubscriptionsDAO.java

@@ -13,7 +13,7 @@ import java.util.List;
  * Возвращает по каждой активной подписке (FOLLOW) + "сам на себя":
  *  - login цели (channelLogin)
  *  - blockchainName цели (channelBchName)
- *  - count публикаций (TEXT_POST)
+ *  - count публикаций (видимые line-based TEXT-сообщения канала)
  *  - last publication: bytes оригинального блока (для timestamp)
  *  - last publication: bytes актуального блока (edit или orig) — для текста превью
  *
@@ -92,7 +92,7 @@ public final class SubscriptionsDAO {
 
     /**
      * Получить список подписок (активные FOLLOW) + "сам на себя" и по каждой:
-     * - count публикаций (TEXT_POST)
+     * - count публикаций (видимые line-based TEXT-сообщения канала)
      * - последнюю публикацию (orig bytes) + её edit (если есть)
      *
      * Поведение при 0 публикаций:
@@ -131,7 +131,7 @@ public final class SubscriptionsDAO {
                   ON s.channel_login = b.login
                  AND s.channel_bch_name = b.bch_name
                 WHERE b.msg_type = ?
-                  AND b.msg_sub_type IN (?, ?)
+                  AND b.msg_sub_type IN (?, ?, ?, ?, ?, ?)
                 GROUP BY b.login, b.bch_name
             ),
             last_pub AS (
@@ -144,7 +144,7 @@ public final class SubscriptionsDAO {
                   ON s.channel_login = b.login
                  AND s.channel_bch_name = b.bch_name
                 WHERE b.msg_type = ?
-                  AND b.msg_sub_type IN (?, ?)
+                  AND b.msg_sub_type IN (?, ?, ?, ?, ?, ?)
                 GROUP BY b.login, b.bch_name
             ),
             last_pub_block AS (
@@ -209,11 +209,19 @@ public final class SubscriptionsDAO {
             ps.setInt(i++, MSG_TYPE_TEXT);
             ps.setInt(i++, (int) MsgSubType.TEXT_POST);
             ps.setInt(i++, (int) MsgSubType.TEXT_REPOST);
+            ps.setInt(i++, (int) MsgSubType.TEXT_ENTRYPOINT);
+            ps.setInt(i++, (int) MsgSubType.TEXT_EXERCISE);
+            ps.setInt(i++, (int) MsgSubType.TEXT_SERVICE);
+            ps.setInt(i++, (int) MsgSubType.TEXT_COURSE);
 
             // last_pub
             ps.setInt(i++, MSG_TYPE_TEXT);
             ps.setInt(i++, (int) MsgSubType.TEXT_POST);
             ps.setInt(i++, (int) MsgSubType.TEXT_REPOST);
+            ps.setInt(i++, (int) MsgSubType.TEXT_ENTRYPOINT);
+            ps.setInt(i++, (int) MsgSubType.TEXT_EXERCISE);
+            ps.setInt(i++, (int) MsgSubType.TEXT_SERVICE);
+            ps.setInt(i++, (int) MsgSubType.TEXT_COURSE);
 
             try (ResultSet rs = ps.executeQuery()) {
                 while (rs.next()) {

SHiNE-server/shine-server-db/src/main/java/shine/db/dao/UserAccessServersCurrentDAO.java

@@ -36,6 +36,48 @@ public final class UserAccessServersCurrentDAO {
         }
     }
 
+    /**
+     * Возвращает первый access server пользователя ровно в порядке
+     * solana_user_pda_current.access_servers_json (access_servers[0]).
+     *
+     * В user_access_servers_current порядок массива намеренно не хранится,
+     * поэтому для auth-routing первичный сервер читается напрямую из PDA snapshot.
+     */
+    public UserAccessServerRouteEntry findPrimaryByUserLogin(String userLogin) throws SQLException {
+        String sql = """
+            SELECT
+                u.login AS user_login,
+                s.login AS server_login,
+                s.server_address AS server_url,
+                s.client_key AS server_client_key
+            FROM solana_user_pda_current u
+            CROSS JOIN LATERAL (
+                SELECT BTRIM(a.login_value) AS server_login
+                FROM jsonb_array_elements_text(
+                    CASE
+                        WHEN BTRIM(COALESCE(u.access_servers_json, '')) = '' THEN '[]'::jsonb
+                        ELSE u.access_servers_json::jsonb
+                    END
+                ) WITH ORDINALITY AS a(login_value, ord)
+                WHERE a.ord = 1
+            ) primary_access
+            JOIN solana_user_pda_current s
+              ON s.normalized_login = LOWER(primary_access.server_login)
+             AND s.is_server = TRUE
+             AND BTRIM(COALESCE(s.server_address, '')) <> ''
+            WHERE u.normalized_login = LOWER(BTRIM(?))
+            LIMIT 1
+            """;
+        try (Connection c = db.getConnection();
+             PreparedStatement ps = c.prepareStatement(sql)) {
+            ps.setString(1, userLogin);
+            try (ResultSet rs = ps.executeQuery()) {
+                if (!rs.next()) return null;
+                return mapRow(rs);
+            }
+        }
+    }
+
     public List<UserAccessServerRouteEntry> listByUserLogin(Connection c, String userLogin) throws SQLException {
         String sql = """
             SELECT user_login, server_login, server_url, server_client_key
@@ -75,6 +117,35 @@ public final class UserAccessServersCurrentDAO {
         return result;
     }
 
+    /**
+     * Возвращает уникальные физические серверы из текущей routing-проекции.
+     * Используется транспортным пулом: одно WSS-соединение держится на сервер,
+     * а не на каждого пользователя этого сервера.
+     */
+    public List<UserAccessServerRouteEntry> listDistinctServers() throws SQLException {
+        String sql = """
+            SELECT DISTINCT ON (LOWER(server_login))
+                   server_login, server_url
+            FROM user_access_servers_current
+            WHERE server_login IS NOT NULL AND BTRIM(server_login) <> ''
+              AND server_url IS NOT NULL AND BTRIM(server_url) <> ''
+            ORDER BY LOWER(server_login), server_login, server_url
+            """;
+        List<UserAccessServerRouteEntry> result = new ArrayList<>();
+        try (Connection c = db.getConnection();
+             PreparedStatement ps = c.prepareStatement(sql);
+             ResultSet rs = ps.executeQuery()) {
+            while (rs.next()) {
+                UserAccessServerRouteEntry entry = new UserAccessServerRouteEntry();
+                entry.setUserLogin("");
+                entry.setServerLogin(rs.getString("server_login"));
+                entry.setServerUrl(rs.getString("server_url"));
+                result.add(entry);
+            }
+        }
+        return result;
+    }
+
     private UserAccessServerRouteEntry mapRow(ResultSet rs) throws SQLException {
         UserAccessServerRouteEntry entry = new UserAccessServerRouteEntry();
         entry.setUserLogin(rs.getString("user_login"));

SHiNE-server/shine-server-db/src/main/java/shine/db/dao/UserNotificationSeenStateDAO.java

@@ -0,0 +1,35 @@
+package shine.db.dao;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+
+public final class UserNotificationSeenStateDAO {
+    private static final UserNotificationSeenStateDAO INSTANCE = new UserNotificationSeenStateDAO();
+    private UserNotificationSeenStateDAO() {}
+    public static UserNotificationSeenStateDAO getInstance() { return INSTANCE; }
+
+    public long getSeenAt(Connection c, String login, String category) throws Exception {
+        try (PreparedStatement ps = c.prepareStatement("SELECT seen_at_ms FROM user_notification_seen_state WHERE owner_login=? AND category=?")) {
+            ps.setString(1, login); ps.setString(2, category);
+            try (ResultSet rs = ps.executeQuery()) { return rs.next() ? rs.getLong(1) : 0L; }
+        }
+    }
+
+    public long advance(Connection c, String login, String category, long seenAtMs, long signedAtMs, byte[] signedBlob) throws Exception {
+        String sql = """
+            INSERT INTO user_notification_seen_state(owner_login, category, seen_at_ms, signed_blob, signed_at_ms, updated_at_ms)
+            VALUES (?, ?, ?, ?, ?, ?)
+            ON CONFLICT(owner_login, category) DO UPDATE SET
+                seen_at_ms=EXCLUDED.seen_at_ms, signed_blob=EXCLUDED.signed_blob,
+                signed_at_ms=EXCLUDED.signed_at_ms, updated_at_ms=EXCLUDED.updated_at_ms
+            WHERE user_notification_seen_state.seen_at_ms < EXCLUDED.seen_at_ms
+            """;
+        try (PreparedStatement ps = c.prepareStatement(sql)) {
+            ps.setString(1, login); ps.setString(2, category); ps.setLong(3, seenAtMs);
+            ps.setBytes(4, signedBlob); ps.setLong(5, signedAtMs); ps.setLong(6, System.currentTimeMillis());
+            ps.executeUpdate();
+        }
+        return getSeenAt(c, login, category);
+    }
+}

SHiNE-server/shine-server-db/src/main/java/shine/db/dao/UserNotificationsStateDAO.java

@@ -0,0 +1,132 @@
+package shine.db.dao;
+
+import shine.db.DbController;
+import shine.db.entities.UserNotificationEntry;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+import java.util.ArrayList;
+import java.util.List;
+
+public final class UserNotificationsStateDAO {
+    private static volatile UserNotificationsStateDAO instance;
+    private final DbController db = DbController.getInstance();
+
+    private UserNotificationsStateDAO() {}
+
+    public static UserNotificationsStateDAO getInstance() {
+        if (instance == null) {
+            synchronized (UserNotificationsStateDAO.class) {
+                if (instance == null) instance = new UserNotificationsStateDAO();
+            }
+        }
+        return instance;
+    }
+
+    public int upsert(Connection c, UserNotificationEntry e) throws SQLException {
+        String sql = """
+            INSERT INTO user_notifications_state (
+                owner_login, notification_kind, created_at_ms, source_login, source_bch_name,
+                source_block_number, source_block_hash, target_login, target_bch_name,
+                target_block_number, target_block_hash, source_msg_sub_type, source_text
+            ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+            ON CONFLICT(owner_login, notification_kind, source_bch_name, source_block_number, source_block_hash) DO UPDATE SET
+                created_at_ms = EXCLUDED.created_at_ms,
+                source_login = EXCLUDED.source_login,
+                target_login = EXCLUDED.target_login,
+                target_bch_name = EXCLUDED.target_bch_name,
+                target_block_number = EXCLUDED.target_block_number,
+                target_block_hash = EXCLUDED.target_block_hash,
+                source_msg_sub_type = EXCLUDED.source_msg_sub_type,
+                source_text = EXCLUDED.source_text
+            """;
+        try (PreparedStatement ps = c.prepareStatement(sql)) {
+            int i = 1;
+            ps.setString(i++, e.getOwnerLogin());
+            ps.setString(i++, e.getNotificationKind());
+            ps.setLong(i++, e.getCreatedAtMs());
+            ps.setString(i++, e.getSourceLogin());
+            ps.setString(i++, e.getSourceBchName());
+            ps.setInt(i++, e.getSourceBlockNumber());
+            ps.setBytes(i++, e.getSourceBlockHash());
+            if (e.getTargetLogin() != null) ps.setString(i++, e.getTargetLogin()); else ps.setNull(i++, Types.VARCHAR);
+            if (e.getTargetBchName() != null) ps.setString(i++, e.getTargetBchName()); else ps.setNull(i++, Types.VARCHAR);
+            if (e.getTargetBlockNumber() != null) ps.setInt(i++, e.getTargetBlockNumber()); else ps.setNull(i++, Types.INTEGER);
+            if (e.getTargetBlockHash() != null) ps.setBytes(i++, e.getTargetBlockHash()); else ps.setNull(i++, Types.BINARY);
+            ps.setInt(i++, e.getSourceMsgSubType());
+            ps.setString(i++, e.getSourceText() == null ? "" : e.getSourceText());
+            return ps.executeUpdate();
+        }
+    }
+
+    public List<UserNotificationEntry> listByOwnerAndKind(Connection c, String ownerLogin, String kind, int limit) throws SQLException {
+        String sql = """
+            SELECT owner_login, notification_kind, created_at_ms, source_login, source_bch_name,
+                   source_block_number, source_block_hash, target_login, target_bch_name,
+                   target_block_number, target_block_hash, source_msg_sub_type, source_text
+            FROM user_notifications_state
+            WHERE owner_login = ? AND notification_kind = ?
+            ORDER BY created_at_ms DESC, source_block_number DESC
+            LIMIT ?
+            """;
+        List<UserNotificationEntry> out = new ArrayList<>();
+        try (PreparedStatement ps = c.prepareStatement(sql)) {
+            ps.setString(1, ownerLogin);
+            ps.setString(2, kind);
+            ps.setInt(3, Math.max(1, limit));
+            try (ResultSet rs = ps.executeQuery()) {
+                while (rs.next()) out.add(mapRow(rs));
+            }
+        }
+        return out;
+    }
+
+    public List<UserNotificationEntry> listVisible(Connection c, String ownerLogin, String kind, long seenAtMs, long cutoffMs) throws SQLException {
+        String sql = """
+            SELECT owner_login, notification_kind, created_at_ms, source_login, source_bch_name,
+                   source_block_number, source_block_hash, target_login, target_bch_name,
+                   target_block_number, target_block_hash, source_msg_sub_type, source_text
+            FROM user_notifications_state
+            WHERE owner_login = ? AND notification_kind = ?
+              AND (created_at_ms > ? OR created_at_ms >= ?)
+            ORDER BY created_at_ms DESC, source_block_number DESC
+            """;
+        List<UserNotificationEntry> out = new ArrayList<>();
+        try (PreparedStatement ps = c.prepareStatement(sql)) {
+            ps.setString(1, ownerLogin); ps.setString(2, kind); ps.setLong(3, Math.max(0, seenAtMs));
+            ps.setLong(4, Math.max(0, cutoffMs));
+            try (ResultSet rs = ps.executeQuery()) { while (rs.next()) out.add(mapRow(rs)); }
+        }
+        return out;
+    }
+
+    public long countUnseen(Connection c, String ownerLogin, String kind, long seenAtMs) throws SQLException {
+        String sql = "SELECT COUNT(*) FROM user_notifications_state WHERE owner_login = ? AND notification_kind = ? AND created_at_ms > ?";
+        try (PreparedStatement ps = c.prepareStatement(sql)) {
+            ps.setString(1, ownerLogin); ps.setString(2, kind); ps.setLong(3, Math.max(0, seenAtMs));
+            try (ResultSet rs = ps.executeQuery()) { return rs.next() ? rs.getLong(1) : 0L; }
+        }
+    }
+
+    private static UserNotificationEntry mapRow(ResultSet rs) throws SQLException {
+        UserNotificationEntry e = new UserNotificationEntry();
+        e.setOwnerLogin(rs.getString("owner_login"));
+        e.setNotificationKind(rs.getString("notification_kind"));
+        e.setCreatedAtMs(rs.getLong("created_at_ms"));
+        e.setSourceLogin(rs.getString("source_login"));
+        e.setSourceBchName(rs.getString("source_bch_name"));
+        e.setSourceBlockNumber(rs.getInt("source_block_number"));
+        e.setSourceBlockHash(rs.getBytes("source_block_hash"));
+        e.setTargetLogin(rs.getString("target_login"));
+        e.setTargetBchName(rs.getString("target_bch_name"));
+        Object targetBlockNumber = rs.getObject("target_block_number");
+        e.setTargetBlockNumber(targetBlockNumber == null ? null : ((Number) targetBlockNumber).intValue());
+        e.setTargetBlockHash(rs.getBytes("target_block_hash"));
+        e.setSourceMsgSubType(rs.getInt("source_msg_sub_type"));
+        e.setSourceText(rs.getString("source_text"));
+        return e;
+    }
+}

SHiNE-server/shine-server-db/src/main/java/shine/db/dao/UserParamsDAO.java

@@ -55,6 +55,7 @@ public final class UserParamsDAO {
             WHERE users_params.time_ms < excluded.time_ms
             """;
 
+        int changed;
         try (PreparedStatement ps = c.prepareStatement(sql)) {
             ps.setString(1, e.getLogin());
             ps.setString(2, e.getParam());
@@ -67,8 +68,12 @@ public final class UserParamsDAO {
             if (e.getSignature() != null) ps.setString(6, e.getSignature());
             else ps.setNull(6, Types.VARCHAR);
 
-            return ps.executeUpdate();
+            changed = ps.executeUpdate();
         }
+        if (changed > 0 && affectsFastProfile(e.getParam())) {
+            refreshFastProfileAndDerivedState(c, e.getLogin(), e.getParam());
+        }
+        return changed;
     }
 
     public int upsertIfNewer(UserParamEntry e) throws SQLException {
@@ -77,6 +82,32 @@ public final class UserParamsDAO {
         }
     }
 
+
+    private static boolean affectsFastProfile(String param) {
+        if (param == null) return false;
+        return switch (param) {
+            case "first_name", "last_name", "ava", "account_role", "shine" -> true;
+            default -> false;
+        };
+    }
+
+    private static void refreshFastProfileAndDerivedState(Connection c, String login, String param) throws SQLException {
+        try (PreparedStatement ps = c.prepareStatement("SELECT shine_refresh_user_profile(?)")) {
+            ps.setString(1, login);
+            ps.execute();
+        }
+        if ("account_role".equals(param) || "shine".equals(param)) {
+            try (PreparedStatement ps = c.prepareStatement("SELECT shine_refresh_related_user_stats(?)")) {
+                ps.setString(1, login);
+                ps.execute();
+            }
+            try (PreparedStatement ps = c.prepareStatement("SELECT shine_refresh_message_qualified_likes_for_actor(?)")) {
+                ps.setString(1, login);
+                ps.execute();
+            }
+        }
+    }
+
     // -------------------- SELECT --------------------
 
     public UserParamEntry getByLoginAndParam(Connection c, String login, String param) throws SQLException {

SHiNE-server/shine-server-db/src/main/java/shine/db/dao/UserProfileStateDAO.java

@@ -0,0 +1,142 @@
+package shine.db.dao;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
+import shine.db.MsgSubType;
+
+/** Fast denormalized projection for user cards shown in dialogs/relations/profile lists. */
+public final class UserProfileStateDAO {
+    private static volatile UserProfileStateDAO instance;
+    private UserProfileStateDAO() {}
+    public static UserProfileStateDAO getInstance() {
+        if (instance == null) synchronized (UserProfileStateDAO.class) {
+            if (instance == null) instance = new UserProfileStateDAO();
+        }
+        return instance;
+    }
+
+    public ProfileCard get(Connection c, String login) throws SQLException {
+        try (PreparedStatement ps = c.prepareStatement("""
+            SELECT login, first_name, last_name, ava_ar, account_role, shine_status
+            FROM user_profile_state WHERE LOWER(login)=LOWER(?) LIMIT 1
+            """)) {
+            ps.setString(1, login);
+            try (ResultSet rs = ps.executeQuery()) {
+                if (!rs.next()) return new ProfileCard(login, "", "", "", null, null);
+                return map(rs);
+            }
+        }
+    }
+
+
+    /**
+     * Effective outgoing social relation with priority close_friend > friend > contact > none.
+     *
+     * Use the canonical relation lookup instead of comparing only connections_state.to_login:
+     * older/current blocks may address a user by blockchain name, so a direct to_login-only
+     * query can incorrectly report "none" even when ListContacts/Connections sees the relation.
+     */
+    public String getEffectiveRelationType(Connection c, String ownerLogin, String targetLogin) throws SQLException {
+        if (ownerLogin == null || ownerLogin.isBlank() || targetLogin == null || targetLogin.isBlank()) return "none";
+        ConnectionsStateDAO relations = ConnectionsStateDAO.getInstance();
+        if (relations.hasOutgoingByRelTypeCanonical(c, ownerLogin, targetLogin, MsgSubType.CONNECTION_CLOSE_FRIEND)) {
+            return "close_friend";
+        }
+        if (relations.hasOutgoingByRelTypeCanonical(c, ownerLogin, targetLogin, MsgSubType.CONNECTION_FRIEND)) {
+            return "friend";
+        }
+        if (relations.hasOutgoingByRelTypeCanonical(c, ownerLogin, targetLogin, MsgSubType.CONNECTION_CONTACT)) {
+            return "contact";
+        }
+        return "none";
+    }
+
+    public List<RelationCard> listRelations(Connection c, String ownerLogin, String listType, int limit, int offset) throws SQLException {
+        int safeLimit = Math.max(1, Math.min(limit <= 0 ? 100 : limit, 500));
+        int safeOffset = Math.max(0, offset);
+        String where = switch (String.valueOf(listType)) {
+            case "friends" -> "LOWER(cs.login)=LOWER(?) AND cs.rel_type=14 AND NOT EXISTS (SELECT 1 FROM connections_state cf WHERE LOWER(cf.login)=LOWER(cs.login) AND LOWER(cf.to_login)=LOWER(cs.to_login) AND cf.rel_type=10)";
+            case "close_friends" -> "LOWER(cs.login)=LOWER(?) AND cs.rel_type=10";
+            case "primary_received" -> "LOWER(cs.to_login)=LOWER(?) AND cs.rel_type=80 AND shine_is_primary(cs.login) AND shine_target_accepts_primary_confirmation(cs.to_login)";
+            case "primary_given" -> "LOWER(cs.login)=LOWER(?) AND cs.rel_type=80 AND shine_is_primary(cs.login) AND shine_target_accepts_primary_confirmation(cs.to_login)";
+            case "shine_received" -> "LOWER(cs.to_login)=LOWER(?) AND cs.rel_type=70 AND shine_is_primary(cs.login) AND shine_is_shining(cs.login) AND shine_target_accepts_shine_confirmation(cs.to_login)";
+            case "shine_given" -> "LOWER(cs.login)=LOWER(?) AND cs.rel_type=70 AND shine_is_primary(cs.login) AND shine_is_shining(cs.login) AND shine_target_accepts_shine_confirmation(cs.to_login)";
+            default -> throw new IllegalArgumentException("Unsupported listType: " + listType);
+        };
+        boolean received = "primary_received".equals(listType) || "shine_received".equals(listType);
+        String personExpr = received ? "cs.login" : "cs.to_login";
+        String sql = """
+            SELECT DISTINCT ON (LOWER(%s))
+                   %s AS person_login,
+                   COALESCE(up.first_name,'') AS first_name,
+                   COALESCE(up.last_name,'') AS last_name,
+                   COALESCE(up.ava_ar,'') AS ava_ar,
+                   up.account_role, up.shine_status,
+                   EXISTS(SELECT 1 FROM connections_state x WHERE LOWER(x.login)=LOWER(?) AND LOWER(x.to_login)=LOWER(%s) AND x.rel_type=80
+                          AND shine_is_primary(x.login) AND shine_target_accepts_primary_confirmation(x.to_login)) AS primary_confirmed,
+                   EXISTS(SELECT 1 FROM connections_state x WHERE LOWER(x.login)=LOWER(?) AND LOWER(x.to_login)=LOWER(%s) AND x.rel_type=70
+                          AND shine_is_primary(x.login) AND shine_is_shining(x.login) AND shine_target_accepts_shine_confirmation(x.to_login)) AS shine_confirmed,
+                   CASE
+                     WHEN EXISTS(SELECT 1 FROM connections_state x WHERE LOWER(x.login)=LOWER(?) AND LOWER(x.to_login)=LOWER(%s) AND x.rel_type=10) THEN 'close_friend'
+                     WHEN EXISTS(SELECT 1 FROM connections_state x WHERE LOWER(x.login)=LOWER(?) AND LOWER(x.to_login)=LOWER(%s) AND x.rel_type=14) THEN 'friend'
+                     WHEN EXISTS(SELECT 1 FROM connections_state x WHERE LOWER(x.login)=LOWER(?) AND LOWER(x.to_login)=LOWER(%s) AND x.rel_type=20) THEN 'contact'
+                     ELSE 'none' END AS relation_type,
+                   COALESCE(us.primary_confirmations_received_count,0) AS primary_confirmations_count,
+                   COALESCE(us.shine_confirmations_received_count,0) AS shine_confirmations_count
+            FROM connections_state cs
+            LEFT JOIN user_profile_state up ON LOWER(up.login)=LOWER(%s)
+            LEFT JOIN user_stats_state us ON LOWER(us.login)=LOWER(%s)
+            WHERE %s
+            ORDER BY LOWER(%s), %s
+            LIMIT ? OFFSET ?
+            """.formatted(personExpr, personExpr, personExpr, personExpr, personExpr, personExpr, personExpr, personExpr, personExpr, where, personExpr, personExpr);
+        List<RelationCard> out = new ArrayList<>();
+        try (PreparedStatement ps = c.prepareStatement(sql)) {
+            int i=1;
+            ps.setString(i++, ownerLogin); ps.setString(i++, ownerLogin); ps.setString(i++, ownerLogin); ps.setString(i++, ownerLogin); ps.setString(i++, ownerLogin);
+            ps.setString(i++, ownerLogin);
+            ps.setInt(i++, safeLimit); ps.setInt(i, safeOffset);
+            try (ResultSet rs = ps.executeQuery()) {
+                while (rs.next()) out.add(new RelationCard(
+                    rs.getString("person_login"), rs.getString("first_name"), rs.getString("last_name"), rs.getString("ava_ar"),
+                    rs.getString("account_role"), rs.getString("shine_status"), rs.getBoolean("primary_confirmed"), rs.getBoolean("shine_confirmed"),
+                    rs.getString("relation_type"), rs.getInt("primary_confirmations_count"), rs.getInt("shine_confirmations_count")
+                ));
+            }
+        }
+        return out;
+    }
+
+    public List<ChannelCard> listPublicChannels(Connection c, String login, String mode, int limit, int offset) throws SQLException {
+        int safeLimit=Math.max(1,Math.min(limit<=0?100:limit,500)), safeOffset=Math.max(0,offset);
+        String sql;
+        if ("owned".equals(mode)) {
+            sql="""
+                SELECT cn.owner_login, cn.slug, cn.display_name, cn.ava_ar, cn.owner_bch_name, cn.channel_root_block_number, encode(cn.channel_root_block_hash,'hex') root_hash
+                FROM channel_names_state cn WHERE LOWER(cn.owner_login)=LOWER(?) AND cn.channel_type_code=1
+                ORDER BY cn.display_name, cn.slug LIMIT ? OFFSET ?
+                """;
+        } else if ("following".equals(mode)) {
+            sql="""
+                SELECT DISTINCT cn.owner_login, cn.slug, cn.display_name, cn.ava_ar, cn.owner_bch_name, cn.channel_root_block_number, encode(cn.channel_root_block_hash,'hex') root_hash
+                FROM connections_state cs JOIN channel_names_state cn ON cn.owner_bch_name=cs.to_bch_name AND cn.channel_root_block_number=cs.to_block_number AND cn.channel_root_block_hash=cs.to_block_hash
+                WHERE LOWER(cs.login)=LOWER(?) AND cs.rel_type=30 AND cn.channel_type_code=1
+                ORDER BY cn.display_name, cn.slug LIMIT ? OFFSET ?
+                """;
+        } else throw new IllegalArgumentException("Unsupported channel mode: "+mode);
+        List<ChannelCard> out=new ArrayList<>();
+        try(PreparedStatement ps=c.prepareStatement(sql)){ ps.setString(1,login);ps.setInt(2,safeLimit);ps.setInt(3,safeOffset);
+            try(ResultSet rs=ps.executeQuery()){while(rs.next())out.add(new ChannelCard(rs.getString("owner_login"),rs.getString("slug"),rs.getString("display_name"),rs.getString("ava_ar"),rs.getString("owner_bch_name"),rs.getInt("channel_root_block_number"),rs.getString("root_hash")));}}
+        return out;
+    }
+
+    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 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 ownerBlockchainName,int rootBlockNumber,String rootBlockHashHex){}
+}

SHiNE-server/shine-server-db/src/main/java/shine/db/dao/UserSettingsDAO.java

@@ -0,0 +1,124 @@
+package shine.db.dao;
+
+import shine.db.DbController;
+import shine.db.entities.UserSettingEntry;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Локальное хранение подписанных пользовательских настроек.
+ * Запись уникальна по login + setting_type + setting_key и обновляется только
+ * более новым time_ms. Межсерверной репликации настроек нет.
+ */
+public final class UserSettingsDAO {
+    private static volatile UserSettingsDAO instance;
+    private final DbController db = DbController.getInstance();
+
+    private UserSettingsDAO() {}
+
+    public static UserSettingsDAO getInstance() {
+        if (instance == null) {
+            synchronized (UserSettingsDAO.class) {
+                if (instance == null) instance = new UserSettingsDAO();
+            }
+        }
+        return instance;
+    }
+
+    public int upsertIfNewer(Connection c, UserSettingEntry e) throws SQLException {
+        String sql = """
+            INSERT INTO user_settings (
+                login, setting_type, setting_key, time_ms,
+                value_text, value_num, client_key, signature
+            ) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+            ON CONFLICT (login, setting_type, setting_key)
+            DO UPDATE SET
+                time_ms    = EXCLUDED.time_ms,
+                value_text = EXCLUDED.value_text,
+                value_num  = EXCLUDED.value_num,
+                client_key = EXCLUDED.client_key,
+                signature  = EXCLUDED.signature
+            WHERE user_settings.time_ms < EXCLUDED.time_ms
+            """;
+        try (PreparedStatement ps = c.prepareStatement(sql)) {
+            ps.setString(1, e.getLogin());
+            ps.setInt(2, e.getSettingType());
+            ps.setString(3, e.getSettingKey());
+            ps.setLong(4, e.getTimeMs());
+            ps.setString(5, e.getValueText() == null ? "" : e.getValueText());
+            ps.setLong(6, e.getValueNum());
+            if (e.getClientKey() == null || e.getClientKey().isBlank()) ps.setNull(7, Types.VARCHAR);
+            else ps.setString(7, e.getClientKey());
+            if (e.getSignature() == null || e.getSignature().isBlank()) ps.setNull(8, Types.VARCHAR);
+            else ps.setString(8, e.getSignature());
+            return ps.executeUpdate();
+        }
+    }
+
+    public UserSettingEntry getByLoginTypeKey(
+            Connection c, String login, int settingType, String settingKey
+    ) throws SQLException {
+        String sql = """
+            SELECT login, setting_type, setting_key, time_ms,
+                   value_text, value_num, client_key, signature
+            FROM user_settings
+            WHERE LOWER(login) = LOWER(?) AND setting_type = ? AND setting_key = ?
+            LIMIT 1
+            """;
+        try (PreparedStatement ps = c.prepareStatement(sql)) {
+            ps.setString(1, login);
+            ps.setInt(2, settingType);
+            ps.setString(3, settingKey);
+            try (ResultSet rs = ps.executeQuery()) {
+                return rs.next() ? mapRow(rs) : null;
+            }
+        }
+    }
+
+    public List<UserSettingEntry> getByLogin(Connection c, String login) throws SQLException {
+        String sql = """
+            SELECT login, setting_type, setting_key, time_ms,
+                   value_text, value_num, client_key, signature
+            FROM user_settings
+            WHERE LOWER(login) = LOWER(?)
+            ORDER BY time_ms DESC, setting_type ASC, setting_key ASC
+            """;
+        List<UserSettingEntry> out = new ArrayList<>();
+        try (PreparedStatement ps = c.prepareStatement(sql)) {
+            ps.setString(1, login);
+            try (ResultSet rs = ps.executeQuery()) {
+                while (rs.next()) out.add(mapRow(rs));
+            }
+        }
+        return out;
+    }
+
+    public List<UserSettingEntry> getByLogin(String login) throws SQLException {
+        try (Connection c = db.getConnection()) {
+            return getByLogin(c, login);
+        }
+    }
+
+    private static UserSettingEntry mapRow(ResultSet rs) throws SQLException {
+        UserSettingEntry e = new UserSettingEntry();
+        e.setLogin(rs.getString("login"));
+        e.setSettingType(rs.getInt("setting_type"));
+        e.setSettingKey(rs.getString("setting_key"));
+        e.setTimeMs(rs.getLong("time_ms"));
+        e.setValueText(rs.getString("value_text"));
+        e.setValueNum(rs.getLong("value_num"));
+        String clientKey = rs.getString("client_key");
+        if (rs.wasNull()) clientKey = null;
+        e.setClientKey(clientKey);
+        String signature = rs.getString("signature");
+        if (rs.wasNull()) signature = null;
+        e.setSignature(signature);
+        return e;
+    }
+}

SHiNE-server/shine-server-db/src/main/java/shine/db/dao/UserSettingsSyncPeerStateDAO.java

@@ -0,0 +1,152 @@
+package shine.db.dao;
+
+import shine.db.DbController;
+import shine.db.entities.UserSettingsSyncPeerStateEntry;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+public final class UserSettingsSyncPeerStateDAO {
+
+    private static volatile UserSettingsSyncPeerStateDAO instance;
+    private final DbController db = DbController.getInstance();
+
+    private UserSettingsSyncPeerStateDAO() {}
+
+    public static UserSettingsSyncPeerStateDAO getInstance() {
+        if (instance == null) {
+            synchronized (UserSettingsSyncPeerStateDAO.class) {
+                if (instance == null) instance = new UserSettingsSyncPeerStateDAO();
+            }
+        }
+        return instance;
+    }
+
+    public UserSettingsSyncPeerStateEntry getOrCreate(Connection c, String ownerLogin, String remoteServerLogin, String remoteServerUrl) throws SQLException {
+        UserSettingsSyncPeerStateEntry existing = get(c, ownerLogin, remoteServerLogin);
+        if (existing != null) return existing;
+        long nowMs = System.currentTimeMillis();
+        String sql = """
+            INSERT INTO user_settings_sync_peer_state (
+                owner_login, remote_server_login, remote_server_url,
+                cursor_time_ms, cursor_setting_key, bootstrap_completed,
+                last_sync_at_ms, last_error, updated_at_ms
+            ) VALUES (?, ?, ?, 0, '', FALSE, NULL, NULL, ?)
+            ON CONFLICT (owner_login, remote_server_login) DO UPDATE SET
+                remote_server_url = EXCLUDED.remote_server_url,
+                updated_at_ms = EXCLUDED.updated_at_ms
+            """;
+        try (PreparedStatement ps = c.prepareStatement(sql)) {
+            ps.setString(1, ownerLogin);
+            ps.setString(2, remoteServerLogin);
+            ps.setString(3, remoteServerUrl);
+            ps.setLong(4, nowMs);
+            ps.executeUpdate();
+        }
+        return get(c, ownerLogin, remoteServerLogin);
+    }
+
+    public UserSettingsSyncPeerStateEntry get(Connection c, String ownerLogin, String remoteServerLogin) throws SQLException {
+        String sql = """
+            SELECT owner_login, remote_server_login, remote_server_url, cursor_time_ms, cursor_setting_key,
+                   bootstrap_completed, last_sync_at_ms, last_error, updated_at_ms
+            FROM user_settings_sync_peer_state
+            WHERE LOWER(owner_login) = LOWER(?) AND LOWER(remote_server_login) = LOWER(?)
+            LIMIT 1
+            """;
+        try (PreparedStatement ps = c.prepareStatement(sql)) {
+            ps.setString(1, ownerLogin);
+            ps.setString(2, remoteServerLogin);
+            try (ResultSet rs = ps.executeQuery()) {
+                return rs.next() ? mapRow(rs) : null;
+            }
+        }
+    }
+
+    public int updateSuccess(String ownerLogin, String remoteServerLogin, String remoteServerUrl, long cursorTimeMs, String cursorSettingKey, boolean bootstrapCompleted) throws SQLException {
+        try (Connection c = db.getConnection()) {
+            String sql = """
+                INSERT INTO user_settings_sync_peer_state (
+                    owner_login, remote_server_login, remote_server_url,
+                    cursor_time_ms, cursor_setting_key, bootstrap_completed,
+                    last_sync_at_ms, last_error, updated_at_ms
+                ) VALUES (?, ?, ?, ?, ?, ?, ?, NULL, ?)
+                ON CONFLICT (owner_login, remote_server_login) DO UPDATE SET
+                    remote_server_url = EXCLUDED.remote_server_url,
+                    cursor_time_ms = EXCLUDED.cursor_time_ms,
+                    cursor_setting_key = EXCLUDED.cursor_setting_key,
+                    bootstrap_completed = EXCLUDED.bootstrap_completed,
+                    last_sync_at_ms = EXCLUDED.last_sync_at_ms,
+                    last_error = NULL,
+                    updated_at_ms = EXCLUDED.updated_at_ms
+                """;
+            try (PreparedStatement ps = c.prepareStatement(sql)) {
+                long nowMs = System.currentTimeMillis();
+                ps.setString(1, ownerLogin);
+                ps.setString(2, remoteServerLogin);
+                ps.setString(3, remoteServerUrl);
+                ps.setLong(4, Math.max(0L, cursorTimeMs));
+                ps.setString(5, cursorSettingKey == null ? "" : cursorSettingKey);
+                ps.setBoolean(6, bootstrapCompleted);
+                ps.setLong(7, nowMs);
+                ps.setLong(8, nowMs);
+                return ps.executeUpdate();
+            }
+        }
+    }
+
+    public int updateError(String ownerLogin, String remoteServerLogin, String remoteServerUrl, String error) throws SQLException {
+        try (Connection c = db.getConnection()) {
+            String sql = """
+                INSERT INTO user_settings_sync_peer_state (
+                    owner_login, remote_server_login, remote_server_url,
+                    cursor_time_ms, cursor_setting_key, bootstrap_completed,
+                    last_sync_at_ms, last_error, updated_at_ms
+                ) VALUES (?, ?, ?, 0, '', FALSE, NULL, ?, ?)
+                ON CONFLICT (owner_login, remote_server_login) DO UPDATE SET
+                    remote_server_url = EXCLUDED.remote_server_url,
+                    last_error = EXCLUDED.last_error,
+                    updated_at_ms = EXCLUDED.updated_at_ms
+                """;
+            try (PreparedStatement ps = c.prepareStatement(sql)) {
+                long nowMs = System.currentTimeMillis();
+                ps.setString(1, ownerLogin);
+                ps.setString(2, remoteServerLogin);
+                ps.setString(3, remoteServerUrl);
+                ps.setString(4, error);
+                ps.setLong(5, nowMs);
+                return ps.executeUpdate();
+            }
+        }
+    }
+
+    public int clearBootstrap(String ownerLogin, String remoteServerLogin, String remoteServerUrl) throws SQLException {
+        return updateSuccess(ownerLogin, remoteServerLogin, remoteServerUrl, 0L, "", false);
+    }
+
+    public int deleteAllForOwner(String ownerLogin) throws SQLException {
+        try (Connection c = db.getConnection()) {
+            try (PreparedStatement ps = c.prepareStatement("DELETE FROM user_settings_sync_peer_state WHERE LOWER(owner_login) = LOWER(?)")) {
+                ps.setString(1, ownerLogin);
+                return ps.executeUpdate();
+            }
+        }
+    }
+
+    private static UserSettingsSyncPeerStateEntry mapRow(ResultSet rs) throws SQLException {
+        UserSettingsSyncPeerStateEntry e = new UserSettingsSyncPeerStateEntry();
+        e.setOwnerLogin(rs.getString("owner_login"));
+        e.setRemoteServerLogin(rs.getString("remote_server_login"));
+        e.setRemoteServerUrl(rs.getString("remote_server_url"));
+        e.setCursorTimeMs(rs.getLong("cursor_time_ms"));
+        e.setCursorSettingKey(rs.getString("cursor_setting_key"));
+        e.setBootstrapCompleted(rs.getBoolean("bootstrap_completed"));
+        long lastSyncAtMs = rs.getLong("last_sync_at_ms");
+        e.setLastSyncAtMs(rs.wasNull() ? null : lastSyncAtMs);
+        e.setLastError(rs.getString("last_error"));
+        e.setUpdatedAtMs(rs.getLong("updated_at_ms"));
+        return e;
+    }
+}

SHiNE-server/shine-server-db/src/main/java/shine/db/entities/DirectMessageEntry.java

@@ -1,24 +0,0 @@
-package shine.db.entities;
-
-public class DirectMessageEntry {
-    private String messageId;
-    private String fromLogin;
-    private String toLogin;
-    private String text;
-    private long createdAtMs;
-
-    public String getMessageId() { return messageId; }
-    public void setMessageId(String messageId) { this.messageId = messageId; }
-
-    public String getFromLogin() { return fromLogin; }
-    public void setFromLogin(String fromLogin) { this.fromLogin = fromLogin; }
-
-    public String getToLogin() { return toLogin; }
-    public void setToLogin(String toLogin) { this.toLogin = toLogin; }
-
-    public String getText() { return text; }
-    public void setText(String text) { this.text = text; }
-
-    public long getCreatedAtMs() { return createdAtMs; }
-    public void setCreatedAtMs(long createdAtMs) { this.createdAtMs = createdAtMs; }
-}

SHiNE-server/shine-server-db/src/main/java/shine/db/entities/DmDeliveryStateEntry.java

@@ -0,0 +1,84 @@
+package shine.db.entities;
+
+public class DmDeliveryStateEntry {
+    public static final int ACCEPTED = 0;
+    public static final int DELIVERED = 1;
+    public static final int FAILED = 3;
+
+    // Совместимость со строками БД, созданными ранней экспериментальной миграцией.
+    public static final int PENDING_NONE = ACCEPTED;
+    public static final int DELIVERED_ONE = DELIVERED;
+    public static final int DELIVERED_ALL = 2;
+    public static final int FAILED_FINAL = FAILED;
+
+    private String outgoingMessageKey;
+    private String eventId;
+    private String baseKey;
+    private String fromLogin;
+    private String toLogin;
+    private String incomingMessageKey;
+    private long createdAtMs;
+    private long deliveryExpiresAtMs;
+    private int deliveryState;
+    private String deliveredServerLogin;
+    private String recipientRoutesHash;
+    private int attemptIndex;
+    private Long nextAttemptAtMs;
+    private Long lastAttemptAtMs;
+    private String lastError;
+    private long updatedAtMs;
+
+    public String getOutgoingMessageKey() { return outgoingMessageKey; }
+    public void setOutgoingMessageKey(String value) { this.outgoingMessageKey = value; }
+    public String getEventId() { return eventId; }
+    public void setEventId(String value) { this.eventId = value; }
+    public String getBaseKey() { return baseKey; }
+    public void setBaseKey(String value) { this.baseKey = value; }
+    public String getFromLogin() { return fromLogin; }
+    public void setFromLogin(String value) { this.fromLogin = value; }
+    public String getToLogin() { return toLogin; }
+    public void setToLogin(String value) { this.toLogin = value; }
+    public String getIncomingMessageKey() { return incomingMessageKey; }
+    public void setIncomingMessageKey(String value) { this.incomingMessageKey = value; }
+    public long getCreatedAtMs() { return createdAtMs; }
+    public void setCreatedAtMs(long value) { this.createdAtMs = value; }
+    public long getDeliveryExpiresAtMs() { return deliveryExpiresAtMs; }
+    public void setDeliveryExpiresAtMs(long value) { this.deliveryExpiresAtMs = value; }
+    public int getDeliveryState() { return deliveryState; }
+    public void setDeliveryState(int value) { this.deliveryState = value; }
+    public String getDeliveredServerLogin() { return deliveredServerLogin; }
+    public void setDeliveredServerLogin(String value) { this.deliveredServerLogin = value; }
+    public String getRecipientRoutesHash() { return recipientRoutesHash; }
+    public void setRecipientRoutesHash(String value) { this.recipientRoutesHash = value; }
+    public int getAttemptIndex() { return attemptIndex; }
+    public void setAttemptIndex(int value) { this.attemptIndex = value; }
+    public Long getNextAttemptAtMs() { return nextAttemptAtMs; }
+    public void setNextAttemptAtMs(Long value) { this.nextAttemptAtMs = value; }
+    public Long getLastAttemptAtMs() { return lastAttemptAtMs; }
+    public void setLastAttemptAtMs(Long value) { this.lastAttemptAtMs = value; }
+    public String getLastError() { return lastError; }
+    public void setLastError(String value) { this.lastError = value; }
+    public long getUpdatedAtMs() { return updatedAtMs; }
+    public void setUpdatedAtMs(long value) { this.updatedAtMs = value; }
+
+    public String deliveryStateCode() {
+        return switch (deliveryState) {
+            case DELIVERED_ONE, DELIVERED_ALL -> "delivered";
+            case FAILED_FINAL -> "failed";
+            default -> "accepted";
+        };
+    }
+
+    public static int parseStateCode(String value) {
+        if (value == null) return ACCEPTED;
+        return switch (value.trim().toLowerCase()) {
+            case "delivered", "delivered_one", "delivered_all" -> DELIVERED;
+            case "failed", "failed_final" -> FAILED;
+            default -> ACCEPTED;
+        };
+    }
+
+    public boolean isDelivered() {
+        return deliveryState == DELIVERED_ONE || deliveryState == DELIVERED_ALL;
+    }
+}

SHiNE-server/shine-server-db/src/main/java/shine/db/entities/DmSyncOutboxEntry.java

@@ -0,0 +1,26 @@
+package shine.db.entities;
+
+public class DmSyncOutboxEntry {
+    private String ownerLogin;
+    private String primaryMessageKey;
+    private String eventId;
+    private String secondaryMessageKey;
+    private boolean synced;
+    private long createdAtMs;
+    private long updatedAtMs;
+
+    public String getOwnerLogin() { return ownerLogin; }
+    public void setOwnerLogin(String value) { this.ownerLogin = value; }
+    public String getPrimaryMessageKey() { return primaryMessageKey; }
+    public void setPrimaryMessageKey(String value) { this.primaryMessageKey = value; }
+    public String getEventId() { return eventId; }
+    public void setEventId(String value) { this.eventId = value; }
+    public String getSecondaryMessageKey() { return secondaryMessageKey; }
+    public void setSecondaryMessageKey(String value) { this.secondaryMessageKey = value; }
+    public boolean isSynced() { return synced; }
+    public void setSynced(boolean value) { this.synced = value; }
+    public long getCreatedAtMs() { return createdAtMs; }
+    public void setCreatedAtMs(long value) { this.createdAtMs = value; }
+    public long getUpdatedAtMs() { return updatedAtMs; }
+    public void setUpdatedAtMs(long value) { this.updatedAtMs = value; }
+}

SHiNE-server/shine-server-db/src/main/java/shine/db/entities/SignedDirectMessageHistoryEntry.java

@@ -1,35 +0,0 @@
-package shine.db.entities;
-
-public class SignedDirectMessageHistoryEntry {
-    private String messageId;
-    private String fromLogin;
-    private String toLogin;
-    private int targetMode;
-    private String targetSessionId;
-    private int messageType;
-    private long timeMs;
-    private long nonce;
-    private byte[] rawPacket;
-    private long createdAtMs;
-
-    public String getMessageId() { return messageId; }
-    public void setMessageId(String messageId) { this.messageId = messageId; }
-    public String getFromLogin() { return fromLogin; }
-    public void setFromLogin(String fromLogin) { this.fromLogin = fromLogin; }
-    public String getToLogin() { return toLogin; }
-    public void setToLogin(String toLogin) { this.toLogin = toLogin; }
-    public int getTargetMode() { return targetMode; }
-    public void setTargetMode(int targetMode) { this.targetMode = targetMode; }
-    public String getTargetSessionId() { return targetSessionId; }
-    public void setTargetSessionId(String targetSessionId) { this.targetSessionId = targetSessionId; }
-    public int getMessageType() { return messageType; }
-    public void setMessageType(int messageType) { this.messageType = messageType; }
-    public long getTimeMs() { return timeMs; }
-    public void setTimeMs(long timeMs) { this.timeMs = timeMs; }
-    public long getNonce() { return nonce; }
-    public void setNonce(long nonce) { this.nonce = nonce; }
-    public byte[] getRawPacket() { return rawPacket; }
-    public void setRawPacket(byte[] rawPacket) { this.rawPacket = rawPacket; }
-    public long getCreatedAtMs() { return createdAtMs; }
-    public void setCreatedAtMs(long createdAtMs) { this.createdAtMs = createdAtMs; }
-}

SHiNE-server/shine-server-db/src/main/java/shine/db/entities/UserNotificationEntry.java

@@ -0,0 +1,44 @@
+package shine.db.entities;
+
+public class UserNotificationEntry {
+    private String ownerLogin;
+    private String notificationKind;
+    private long createdAtMs;
+    private String sourceLogin;
+    private String sourceBchName;
+    private int sourceBlockNumber;
+    private byte[] sourceBlockHash;
+    private String targetLogin;
+    private String targetBchName;
+    private Integer targetBlockNumber;
+    private byte[] targetBlockHash;
+    private int sourceMsgSubType;
+    private String sourceText;
+
+    public String getOwnerLogin() { return ownerLogin; }
+    public void setOwnerLogin(String ownerLogin) { this.ownerLogin = ownerLogin; }
+    public String getNotificationKind() { return notificationKind; }
+    public void setNotificationKind(String notificationKind) { this.notificationKind = notificationKind; }
+    public long getCreatedAtMs() { return createdAtMs; }
+    public void setCreatedAtMs(long createdAtMs) { this.createdAtMs = createdAtMs; }
+    public String getSourceLogin() { return sourceLogin; }
+    public void setSourceLogin(String sourceLogin) { this.sourceLogin = sourceLogin; }
+    public String getSourceBchName() { return sourceBchName; }
+    public void setSourceBchName(String sourceBchName) { this.sourceBchName = sourceBchName; }
+    public int getSourceBlockNumber() { return sourceBlockNumber; }
+    public void setSourceBlockNumber(int sourceBlockNumber) { this.sourceBlockNumber = sourceBlockNumber; }
+    public byte[] getSourceBlockHash() { return sourceBlockHash; }
+    public void setSourceBlockHash(byte[] sourceBlockHash) { this.sourceBlockHash = sourceBlockHash; }
+    public String getTargetLogin() { return targetLogin; }
+    public void setTargetLogin(String targetLogin) { this.targetLogin = targetLogin; }
+    public String getTargetBchName() { return targetBchName; }
+    public void setTargetBchName(String targetBchName) { this.targetBchName = targetBchName; }
+    public Integer getTargetBlockNumber() { return targetBlockNumber; }
+    public void setTargetBlockNumber(Integer targetBlockNumber) { this.targetBlockNumber = targetBlockNumber; }
+    public byte[] getTargetBlockHash() { return targetBlockHash; }
+    public void setTargetBlockHash(byte[] targetBlockHash) { this.targetBlockHash = targetBlockHash; }
+    public int getSourceMsgSubType() { return sourceMsgSubType; }
+    public void setSourceMsgSubType(int sourceMsgSubType) { this.sourceMsgSubType = sourceMsgSubType; }
+    public String getSourceText() { return sourceText; }
+    public void setSourceText(String sourceText) { this.sourceText = sourceText; }
+}

SHiNE-server/shine-server-db/src/main/java/shine/db/entities/UserSettingEntry.java

@@ -0,0 +1,52 @@
+package shine.db.entities;
+
+/** Одна локально сохранённая подписанная пользовательская настройка. */
+public class UserSettingEntry {
+    private String login;
+    private int settingType;
+    private String settingKey;
+    private long timeMs;
+    private String valueText;
+    private long valueNum;
+    private String clientKey;
+    private String signature;
+
+    public UserSettingEntry() {}
+
+    public UserSettingEntry(
+            String login,
+            int settingType,
+            String settingKey,
+            long timeMs,
+            String valueText,
+            long valueNum,
+            String clientKey,
+            String signature
+    ) {
+        this.login = login;
+        this.settingType = settingType;
+        this.settingKey = settingKey;
+        this.timeMs = timeMs;
+        this.valueText = valueText;
+        this.valueNum = valueNum;
+        this.clientKey = clientKey;
+        this.signature = signature;
+    }
+
+    public String getLogin() { return login; }
+    public void setLogin(String login) { this.login = login; }
+    public int getSettingType() { return settingType; }
+    public void setSettingType(int settingType) { this.settingType = settingType; }
+    public String getSettingKey() { return settingKey; }
+    public void setSettingKey(String settingKey) { this.settingKey = settingKey; }
+    public long getTimeMs() { return timeMs; }
+    public void setTimeMs(long timeMs) { this.timeMs = timeMs; }
+    public String getValueText() { return valueText; }
+    public void setValueText(String valueText) { this.valueText = valueText; }
+    public long getValueNum() { return valueNum; }
+    public void setValueNum(long valueNum) { this.valueNum = valueNum; }
+    public String getClientKey() { return clientKey; }
+    public void setClientKey(String clientKey) { this.clientKey = clientKey; }
+    public String getSignature() { return signature; }
+    public void setSignature(String signature) { this.signature = signature; }
+}

SHiNE-server/shine-server-db/src/main/java/shine/db/entities/UserSettingsSyncPeerStateEntry.java

@@ -0,0 +1,40 @@
+package shine.db.entities;
+
+public class UserSettingsSyncPeerStateEntry {
+    private String ownerLogin;
+    private String remoteServerLogin;
+    private String remoteServerUrl;
+    private long cursorTimeMs;
+    private String cursorSettingKey;
+    private boolean bootstrapCompleted;
+    private Long lastSyncAtMs;
+    private String lastError;
+    private long updatedAtMs;
+
+    public String getOwnerLogin() { return ownerLogin; }
+    public void setOwnerLogin(String ownerLogin) { this.ownerLogin = ownerLogin; }
+
+    public String getRemoteServerLogin() { return remoteServerLogin; }
+    public void setRemoteServerLogin(String remoteServerLogin) { this.remoteServerLogin = remoteServerLogin; }
+
+    public String getRemoteServerUrl() { return remoteServerUrl; }
+    public void setRemoteServerUrl(String remoteServerUrl) { this.remoteServerUrl = remoteServerUrl; }
+
+    public long getCursorTimeMs() { return cursorTimeMs; }
+    public void setCursorTimeMs(long cursorTimeMs) { this.cursorTimeMs = cursorTimeMs; }
+
+    public String getCursorSettingKey() { return cursorSettingKey; }
+    public void setCursorSettingKey(String cursorSettingKey) { this.cursorSettingKey = cursorSettingKey; }
+
+    public boolean isBootstrapCompleted() { return bootstrapCompleted; }
+    public void setBootstrapCompleted(boolean bootstrapCompleted) { this.bootstrapCompleted = bootstrapCompleted; }
+
+    public Long getLastSyncAtMs() { return lastSyncAtMs; }
+    public void setLastSyncAtMs(Long lastSyncAtMs) { this.lastSyncAtMs = lastSyncAtMs; }
+
+    public String getLastError() { return lastError; }
+    public void setLastError(String lastError) { this.lastError = lastError; }
+
+    public long getUpdatedAtMs() { return updatedAtMs; }
+    public void setUpdatedAtMs(long updatedAtMs) { this.updatedAtMs = updatedAtMs; }
+}

SHiNE-server/shine-server-db/src/main/java/shine/db/sql/CurrentUsersSql.java

@@ -12,6 +12,7 @@ public final class CurrentUsersSql {
             (
                 SELECT
                     current_users.login AS login,
+                    current_users.normalized_login AS normalized_login,
                     current_users.blockchain_name AS blockchain_name,
                     current_users.client_key AS solana_key,
                     current_users.blockchain_key AS blockchain_key,

SHiNE-server/shine-server-db/src/main/resources/postgres/migration_v10.sql

@@ -0,0 +1,32 @@
+BEGIN;
+
+CREATE TABLE IF NOT EXISTS user_notifications_state (
+    owner_login           TEXT NOT NULL REFERENCES solana_user_pda_current(normalized_login),
+    notification_kind     TEXT NOT NULL CHECK (notification_kind IN ('reply', 'connection')),
+    created_at_ms         BIGINT NOT NULL,
+    source_login          TEXT NOT NULL,
+    source_bch_name       TEXT NOT NULL,
+    source_block_number   INTEGER NOT NULL CHECK (source_block_number >= 0),
+    source_block_hash     BYTEA NOT NULL,
+    target_login          TEXT,
+    target_bch_name       TEXT,
+    target_block_number   INTEGER,
+    target_block_hash     BYTEA,
+    source_msg_sub_type   INTEGER NOT NULL,
+    source_text           TEXT NOT NULL DEFAULT '',
+    UNIQUE (owner_login, notification_kind, source_bch_name, source_block_number, source_block_hash)
+);
+
+CREATE INDEX IF NOT EXISTS idx_user_notifications_state_owner_kind_time
+    ON user_notifications_state(owner_login, notification_kind, created_at_ms DESC, source_block_number DESC);
+
+CREATE INDEX IF NOT EXISTS idx_user_notifications_state_owner_time
+    ON user_notifications_state(owner_login, created_at_ms DESC);
+
+INSERT INTO db_schema_version (id, schema_version, updated_at_ms)
+VALUES (1, 10, CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT))
+ON CONFLICT (id) DO UPDATE SET
+    schema_version = EXCLUDED.schema_version,
+    updated_at_ms = EXCLUDED.updated_at_ms;
+
+COMMIT;

SHiNE-server/shine-server-db/src/main/resources/postgres/migration_v11.sql

@@ -0,0 +1,30 @@
+BEGIN;
+
+CREATE TABLE IF NOT EXISTS dm_dialog_state (
+    owner_login                   TEXT NOT NULL,
+    peer_login                    TEXT NOT NULL,
+    relation_flag                 TEXT NOT NULL DEFAULT 'none',
+    last_message_blob_b64         TEXT NOT NULL DEFAULT '',
+    last_message_key              TEXT NOT NULL DEFAULT '',
+    last_message_type             INTEGER NOT NULL DEFAULT 0,
+    last_message_time_ms          BIGINT NOT NULL DEFAULT 0,
+    last_message_revision_ms      BIGINT NOT NULL DEFAULT 0,
+    unread_count                  INTEGER NOT NULL DEFAULT 0,
+    last_read_receipt_time_ms     BIGINT NOT NULL DEFAULT 0,
+    updated_at_ms                 BIGINT NOT NULL,
+    PRIMARY KEY (owner_login, peer_login)
+);
+
+ALTER TABLE IF EXISTS dm_dialog_state
+    ADD COLUMN IF NOT EXISTS last_message_blob_b64 TEXT NOT NULL DEFAULT '';
+
+CREATE INDEX IF NOT EXISTS idx_dm_dialog_state_owner_last_time
+    ON dm_dialog_state(owner_login, last_message_time_ms DESC, peer_login);
+
+INSERT INTO db_schema_version (id, schema_version, updated_at_ms)
+VALUES (1, 11, CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT))
+ON CONFLICT (id) DO UPDATE SET
+    schema_version = EXCLUDED.schema_version,
+    updated_at_ms = EXCLUDED.updated_at_ms;
+
+COMMIT;

SHiNE-server/shine-server-db/src/main/resources/postgres/migration_v12.sql

@@ -0,0 +1,139 @@
+BEGIN;
+
+CREATE TABLE IF NOT EXISTS dm_delivery_state (
+    outgoing_message_key      TEXT PRIMARY KEY,
+    event_id                  TEXT NOT NULL UNIQUE,
+    base_key                  TEXT NOT NULL,
+    from_login                TEXT NOT NULL,
+    to_login                  TEXT NOT NULL,
+    incoming_message_key      TEXT NOT NULL,
+    created_at_ms             BIGINT NOT NULL,
+    delivery_expires_at_ms    BIGINT NOT NULL,
+    delivery_state            INTEGER NOT NULL DEFAULT 0 CHECK (delivery_state IN (0, 1, 2, 3)),
+    delivered_server_login    TEXT,
+    recipient_routes_hash     TEXT,
+    attempt_index             INTEGER NOT NULL DEFAULT 0,
+    next_attempt_at_ms        BIGINT,
+    last_attempt_at_ms        BIGINT,
+    last_error                TEXT,
+    updated_at_ms             BIGINT NOT NULL
+);
+
+CREATE INDEX IF NOT EXISTS idx_dm_delivery_state_due
+    ON dm_delivery_state(next_attempt_at_ms, delivery_state)
+    WHERE delivery_state = 0 AND next_attempt_at_ms IS NOT NULL;
+
+CREATE INDEX IF NOT EXISTS idx_dm_delivery_state_base
+    ON dm_delivery_state(base_key, from_login);
+
+CREATE TABLE IF NOT EXISTS dm_sync_outbox (
+    owner_login               TEXT NOT NULL,
+    primary_message_key       TEXT NOT NULL,
+    event_id                  TEXT NOT NULL,
+    secondary_message_key     TEXT,
+    synced                    BOOLEAN NOT NULL DEFAULT FALSE,
+    created_at_ms             BIGINT NOT NULL,
+    updated_at_ms             BIGINT NOT NULL,
+    PRIMARY KEY (owner_login, primary_message_key)
+);
+
+CREATE INDEX IF NOT EXISTS idx_dm_sync_outbox_unsynced
+    ON dm_sync_outbox(owner_login, created_at_ms, primary_message_key)
+    WHERE synced = FALSE;
+
+-- До v12 факт межсерверной доставки не сохранялся. Старые исходящие пары
+-- считаем уже доставленными, чтобы обновление не вызвало повторную рассылку.
+INSERT INTO dm_delivery_state (
+    outgoing_message_key, event_id, base_key, from_login, to_login,
+    incoming_message_key, created_at_ms, delivery_expires_at_ms,
+    delivery_state, delivered_server_login, recipient_routes_hash,
+    attempt_index, next_attempt_at_ms, last_attempt_at_ms, last_error, updated_at_ms
+)
+SELECT
+    outgoing.message_key,
+    outgoing.message_key || ':' || outgoing.revision_time_ms || ':' || outgoing.reencrypted_at_ms,
+    outgoing.base_key,
+    outgoing.from_login,
+    outgoing.to_login,
+    incoming.message_key,
+    outgoing.created_at_ms,
+    outgoing.created_at_ms + 3600000,
+    2,
+    NULL,
+    NULL,
+    9,
+    NULL,
+    NULL,
+    'MIGRATED_AS_DELIVERED',
+    CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT)
+FROM signed_messages outgoing
+JOIN signed_messages incoming
+  ON incoming.base_key = outgoing.base_key
+ AND incoming.message_type = outgoing.message_type - 1
+WHERE outgoing.message_type IN (2, 4)
+ON CONFLICT (outgoing_message_key) DO NOTHING;
+
+-- Историю до v12 считаем подтверждённой, иначе само обновление вызовет
+-- массовую повторную передачу. При замене сервера общий reset вернёт FALSE.
+INSERT INTO dm_sync_outbox (
+    owner_login, primary_message_key, event_id, secondary_message_key,
+    synced, created_at_ms, updated_at_ms
+)
+SELECT
+    LOWER(outgoing.from_login),
+    outgoing.message_key,
+    outgoing.message_key || ':' || outgoing.revision_time_ms || ':' || outgoing.reencrypted_at_ms,
+    incoming.message_key,
+    TRUE,
+    outgoing.created_at_ms,
+    CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT)
+FROM signed_messages outgoing
+JOIN signed_messages incoming
+  ON incoming.base_key = outgoing.base_key
+ AND incoming.message_type = outgoing.message_type - 1
+WHERE outgoing.message_type IN (2, 4)
+ON CONFLICT (owner_login, primary_message_key) DO NOTHING;
+
+-- Входящая копия синхронизируется отдельно между серверами получателя.
+INSERT INTO dm_sync_outbox (
+    owner_login, primary_message_key, event_id, secondary_message_key,
+    synced, created_at_ms, updated_at_ms
+)
+SELECT
+    LOWER(incoming.to_login),
+    incoming.message_key,
+    incoming.message_key || ':' || incoming.revision_time_ms || ':' || incoming.reencrypted_at_ms,
+    NULL,
+    TRUE,
+    incoming.created_at_ms,
+    CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT)
+FROM signed_messages incoming
+WHERE incoming.message_type IN (1, 3)
+ON CONFLICT (owner_login, primary_message_key) DO NOTHING;
+
+-- Tombstone принадлежит обоим участникам и должен попасть на второй сервер
+-- каждого из них. Для self-DM конфликт безопасно схлопывается.
+INSERT INTO dm_sync_outbox (
+    owner_login, primary_message_key, event_id, secondary_message_key,
+    synced, created_at_ms, updated_at_ms
+)
+SELECT
+    LOWER(owner_login),
+    tombstone.message_key,
+    tombstone.message_key || ':' || tombstone.revision_time_ms || ':' || tombstone.reencrypted_at_ms,
+    NULL,
+    TRUE,
+    tombstone.created_at_ms,
+    CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT)
+FROM signed_messages tombstone
+CROSS JOIN LATERAL (VALUES (tombstone.from_login), (tombstone.to_login)) owners(owner_login)
+WHERE tombstone.message_type IN (5, 6, 7, 8)
+ON CONFLICT (owner_login, primary_message_key) DO NOTHING;
+
+INSERT INTO db_schema_version (id, schema_version, updated_at_ms)
+VALUES (1, 12, CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT))
+ON CONFLICT (id) DO UPDATE SET
+    schema_version = EXCLUDED.schema_version,
+    updated_at_ms = EXCLUDED.updated_at_ms;
+
+COMMIT;

SHiNE-server/shine-server-db/src/main/resources/postgres/migration_v13.sql

@@ -0,0 +1,46 @@
+BEGIN;
+
+-- Нормализация экспериментальной схемы доставки v12:
+-- 0=accepted, 1=delivered, 3=failed. Старое delivered_all (2)
+-- объединяется с delivered, поскольку ACK одного сервера теперь достаточен.
+UPDATE dm_delivery_state
+SET delivery_state = 1,
+    delivered_server_login = NULL,
+    next_attempt_at_ms = NULL,
+    updated_at_ms = CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT)
+WHERE delivery_state = 2;
+
+-- Для незавершённых записей перестраиваем только будущую очередь. Повторная
+-- передача безопасна благодаря messageKey и идемпотентному приёму.
+UPDATE dm_delivery_state
+SET delivery_expires_at_ms = created_at_ms + 3600000,
+    attempt_index = CASE
+        WHEN CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT) >= created_at_ms + 3600000 THEN 4
+        WHEN CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT) >= created_at_ms + 1500000 THEN 3
+        WHEN CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT) >= created_at_ms + 300000 THEN 2
+        ELSE 1
+    END,
+    next_attempt_at_ms = CASE
+        WHEN CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT) >= created_at_ms + 3600000
+            THEN CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT)
+        WHEN CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT) >= created_at_ms + 1500000
+            THEN created_at_ms + 3600000
+        WHEN CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT) >= created_at_ms + 300000
+            THEN created_at_ms + 1500000
+        ELSE created_at_ms + 30000
+    END,
+    updated_at_ms = CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT)
+WHERE delivery_state = 0;
+
+DROP INDEX IF EXISTS idx_dm_delivery_state_due;
+CREATE INDEX idx_dm_delivery_state_due
+    ON dm_delivery_state(next_attempt_at_ms, delivery_state)
+    WHERE delivery_state = 0 AND next_attempt_at_ms IS NOT NULL;
+
+INSERT INTO db_schema_version (id, schema_version, updated_at_ms)
+VALUES (1, 13, CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT))
+ON CONFLICT (id) DO UPDATE SET
+    schema_version = EXCLUDED.schema_version,
+    updated_at_ms = EXCLUDED.updated_at_ms;
+
+COMMIT;

SHiNE-server/shine-server-db/src/main/resources/postgres/migration_v14.sql

@@ -0,0 +1,620 @@
+BEGIN;
+
+CREATE TABLE IF NOT EXISTS user_stats_state (
+    login                       TEXT PRIMARY KEY REFERENCES solana_user_pda_current(login) ON DELETE CASCADE,
+    owned_public_channels_count INTEGER NOT NULL DEFAULT 0 CHECK (owned_public_channels_count >= 0),
+    following_users_count       INTEGER NOT NULL DEFAULT 0 CHECK (following_users_count >= 0),
+    following_channels_count    INTEGER NOT NULL DEFAULT 0 CHECK (following_channels_count >= 0),
+    close_friends_count         INTEGER NOT NULL DEFAULT 0 CHECK (close_friends_count >= 0),
+    updated_at_ms               BIGINT NOT NULL
+);
+
+CREATE INDEX IF NOT EXISTS idx_user_stats_state_following_users_count
+    ON user_stats_state (following_users_count);
+
+CREATE TABLE IF NOT EXISTS channel_stats_state (
+    owner_bch_name            TEXT NOT NULL,
+    channel_root_block_number INTEGER NOT NULL CHECK (channel_root_block_number >= 0),
+    channel_root_block_hash   BYTEA NOT NULL,
+    owner_login               TEXT NOT NULL,
+    channel_type_code         INTEGER NOT NULL DEFAULT 1,
+    subscribers_count         INTEGER NOT NULL DEFAULT 0 CHECK (subscribers_count >= 0),
+    updated_at_ms             BIGINT NOT NULL,
+    PRIMARY KEY (owner_bch_name, channel_root_block_number, channel_root_block_hash)
+);
+
+CREATE INDEX IF NOT EXISTS idx_channel_stats_state_owner_login
+    ON channel_stats_state (owner_login);
+
+CREATE OR REPLACE FUNCTION shine_user_stats_state_ai()
+RETURNS TRIGGER
+LANGUAGE plpgsql
+AS $$
+DECLARE
+    now_ms BIGINT;
+BEGIN
+    now_ms := CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT);
+
+    INSERT INTO user_stats_state (
+        login,
+        owned_public_channels_count,
+        following_users_count,
+        following_channels_count,
+        close_friends_count,
+        updated_at_ms
+    ) VALUES (
+        NEW.login,
+        0,
+        0,
+        0,
+        0,
+        now_ms
+    )
+    ON CONFLICT (login) DO NOTHING;
+
+    RETURN NEW;
+END;
+$$;
+
+CREATE OR REPLACE FUNCTION shine_channel_names_state_stats_ai()
+RETURNS TRIGGER
+LANGUAGE plpgsql
+AS $$
+DECLARE
+    now_ms BIGINT;
+    public_subscribers_count INTEGER;
+BEGIN
+    now_ms := CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT);
+
+    IF NEW.owner_login IS NULL OR btrim(NEW.owner_login) = '' THEN
+        RETURN NEW;
+    END IF;
+
+    IF NEW.channel_type_code = 1 THEN
+        INSERT INTO user_stats_state (
+            login,
+            owned_public_channels_count,
+            following_users_count,
+            following_channels_count,
+            close_friends_count,
+            updated_at_ms
+        ) VALUES (
+            NEW.owner_login,
+            1,
+            0,
+            0,
+            0,
+            now_ms
+        )
+        ON CONFLICT (login) DO UPDATE SET
+            owned_public_channels_count = user_stats_state.owned_public_channels_count + 1,
+            updated_at_ms = EXCLUDED.updated_at_ms;
+
+        SELECT COUNT(*)::INTEGER
+        INTO public_subscribers_count
+        FROM connections_state cs
+        JOIN channel_names_state cn
+          ON cn.owner_bch_name = cs.to_bch_name
+         AND cn.channel_root_block_number = cs.to_block_number
+         AND cn.channel_root_block_hash = cs.to_block_hash
+        WHERE cs.rel_type = 30
+          AND cn.owner_bch_name = NEW.owner_bch_name
+          AND cn.channel_root_block_number = NEW.channel_root_block_number
+          AND cn.channel_root_block_hash = NEW.channel_root_block_hash
+          AND cn.channel_type_code = 1;
+
+        INSERT INTO channel_stats_state (
+            owner_bch_name,
+            channel_root_block_number,
+            channel_root_block_hash,
+            owner_login,
+            channel_type_code,
+            subscribers_count,
+            updated_at_ms
+        ) VALUES (
+            NEW.owner_bch_name,
+            NEW.channel_root_block_number,
+            NEW.channel_root_block_hash,
+            NEW.owner_login,
+            NEW.channel_type_code,
+            COALESCE(public_subscribers_count, 0),
+            now_ms
+        )
+        ON CONFLICT (owner_bch_name, channel_root_block_number, channel_root_block_hash) DO UPDATE SET
+            owner_login = EXCLUDED.owner_login,
+            channel_type_code = EXCLUDED.channel_type_code,
+            subscribers_count = EXCLUDED.subscribers_count,
+            updated_at_ms = EXCLUDED.updated_at_ms;
+    ELSE
+        WITH pending AS (
+            SELECT cs.login, COUNT(*)::INTEGER AS cnt
+            FROM connections_state cs
+            WHERE cs.rel_type = 30
+              AND cs.to_bch_name = NEW.owner_bch_name
+              AND cs.to_block_number = NEW.channel_root_block_number
+              AND cs.to_block_hash = NEW.channel_root_block_hash
+            GROUP BY cs.login
+        )
+        UPDATE user_stats_state us
+        SET following_channels_count = GREATEST(0, us.following_channels_count - pending.cnt),
+            updated_at_ms = now_ms
+        FROM pending
+        WHERE us.login = pending.login;
+    END IF;
+
+    RETURN NEW;
+END;
+$$;
+
+CREATE OR REPLACE FUNCTION shine_blocks_connection_state_ai()
+RETURNS TRIGGER
+LANGUAGE plpgsql
+AS $$
+DECLARE
+    resolved_login TEXT;
+    positive_rel_type INTEGER;
+    existed_before BOOLEAN;
+    target_channel_type INTEGER;
+BEGIN
+    IF NEW.msg_type <> 3 THEN
+        RETURN NEW;
+    END IF;
+
+    resolved_login := shine_resolve_login(NEW.to_login, NEW.to_bch_name);
+
+    IF NEW.msg_sub_type IN (10, 20, 30, 40, 50, 52, 54, 60, 70, 74) THEN
+        IF resolved_login IS NULL OR NEW.to_bch_name IS NULL THEN
+            RETURN NEW;
+        END IF;
+
+        SELECT EXISTS (
+            SELECT 1
+            FROM connections_state
+            WHERE login = NEW.login
+              AND rel_type = NEW.msg_sub_type
+              AND to_login = resolved_login
+              AND to_bch_name = NEW.to_bch_name
+              AND to_block_number = COALESCE(NEW.to_block_number, 0)
+              AND to_block_hash = COALESCE(NEW.to_block_hash, decode(repeat('00', 32), 'hex'))
+        )
+        INTO existed_before;
+
+        IF NOT existed_before THEN
+            IF NEW.msg_sub_type = 10 THEN
+                INSERT INTO user_stats_state (
+                    login,
+                    owned_public_channels_count,
+                    following_users_count,
+                    following_channels_count,
+                    close_friends_count,
+                    updated_at_ms
+                ) VALUES (
+                    NEW.login,
+                    0,
+                    0,
+                    0,
+                    1,
+                    CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT)
+                )
+                ON CONFLICT (login) DO UPDATE SET
+                    close_friends_count = user_stats_state.close_friends_count + 1,
+                    updated_at_ms = EXCLUDED.updated_at_ms;
+            ELSIF NEW.msg_sub_type = 30 THEN
+                IF NEW.to_block_number IS NULL THEN
+                    INSERT INTO user_stats_state (
+                        login,
+                        owned_public_channels_count,
+                        following_users_count,
+                        following_channels_count,
+                        close_friends_count,
+                        updated_at_ms
+                    ) VALUES (
+                        NEW.login,
+                        0,
+                        0,
+                        1,
+                        0,
+                        CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT)
+                    )
+                    ON CONFLICT (login) DO UPDATE SET
+                        following_channels_count = user_stats_state.following_channels_count + 1,
+                        updated_at_ms = EXCLUDED.updated_at_ms;
+                ELSIF NEW.to_block_number = 0 THEN
+                    INSERT INTO user_stats_state (
+                        login,
+                        owned_public_channels_count,
+                        following_users_count,
+                        following_channels_count,
+                        close_friends_count,
+                        updated_at_ms
+                    ) VALUES (
+                        NEW.login,
+                        0,
+                        1,
+                        0,
+                        0,
+                        CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT)
+                    )
+                    ON CONFLICT (login) DO UPDATE SET
+                        following_users_count = user_stats_state.following_users_count + 1,
+                        updated_at_ms = EXCLUDED.updated_at_ms;
+                ELSE
+                    SELECT cn.channel_type_code
+                    INTO target_channel_type
+                    FROM channel_names_state cn
+                    WHERE cn.owner_bch_name = NEW.to_bch_name
+                      AND cn.channel_root_block_number = NEW.to_block_number
+                      AND cn.channel_root_block_hash = NEW.to_block_hash
+                    LIMIT 1;
+
+                    IF target_channel_type = 1 THEN
+                        INSERT INTO user_stats_state (
+                            login,
+                            owned_public_channels_count,
+                            following_users_count,
+                            following_channels_count,
+                            close_friends_count,
+                            updated_at_ms
+                        ) VALUES (
+                            NEW.login,
+                            0,
+                            0,
+                            1,
+                            0,
+                            CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT)
+                        )
+                        ON CONFLICT (login) DO UPDATE SET
+                            following_channels_count = user_stats_state.following_channels_count + 1,
+                            updated_at_ms = EXCLUDED.updated_at_ms;
+
+                        INSERT INTO channel_stats_state (
+                            owner_bch_name,
+                            channel_root_block_number,
+                            channel_root_block_hash,
+                            owner_login,
+                            channel_type_code,
+                            subscribers_count,
+                            updated_at_ms
+                        ) VALUES (
+                            NEW.to_bch_name,
+                            NEW.to_block_number,
+                            NEW.to_block_hash,
+                            resolved_login,
+                            target_channel_type,
+                            1,
+                            CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT)
+                        )
+                        ON CONFLICT (owner_bch_name, channel_root_block_number, channel_root_block_hash) DO UPDATE SET
+                            owner_login = EXCLUDED.owner_login,
+                            channel_type_code = EXCLUDED.channel_type_code,
+                            subscribers_count = channel_stats_state.subscribers_count + 1,
+                            updated_at_ms = EXCLUDED.updated_at_ms;
+                    ELSIF target_channel_type IS NULL THEN
+                        INSERT INTO user_stats_state (
+                            login,
+                            owned_public_channels_count,
+                            following_users_count,
+                            following_channels_count,
+                            close_friends_count,
+                            updated_at_ms
+                        ) VALUES (
+                            NEW.login,
+                            0,
+                            0,
+                            1,
+                            0,
+                            CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT)
+                        )
+                        ON CONFLICT (login) DO UPDATE SET
+                            following_channels_count = user_stats_state.following_channels_count + 1,
+                            updated_at_ms = EXCLUDED.updated_at_ms;
+                    END IF;
+                END IF;
+            END IF;
+        END IF;
+
+        DELETE FROM connections_state
+        WHERE login = NEW.login
+          AND rel_type = NEW.msg_sub_type
+          AND to_login = resolved_login
+          AND to_bch_name = NEW.to_bch_name
+          AND to_block_number = COALESCE(NEW.to_block_number, 0)
+          AND to_block_hash = COALESCE(NEW.to_block_hash, decode(repeat('00', 32), 'hex'));
+
+        INSERT INTO connections_state (
+            login, rel_type, to_login, to_bch_name, to_block_number, to_block_hash
+        ) VALUES (
+            NEW.login,
+            NEW.msg_sub_type,
+            resolved_login,
+            NEW.to_bch_name,
+            COALESCE(NEW.to_block_number, 0),
+            COALESCE(NEW.to_block_hash, decode(repeat('00', 32), 'hex'))
+        );
+
+        RETURN NEW;
+    END IF;
+
+    positive_rel_type := CASE NEW.msg_sub_type
+        WHEN 11 THEN 10
+        WHEN 21 THEN 20
+        WHEN 31 THEN 30
+        WHEN 41 THEN 40
+        WHEN 51 THEN 50
+        WHEN 53 THEN 52
+        WHEN 55 THEN 54
+        WHEN 61 THEN 60
+        WHEN 71 THEN 70
+        WHEN 75 THEN 74
+        ELSE NULL
+    END;
+
+    IF positive_rel_type IS NULL OR resolved_login IS NULL THEN
+        RETURN NEW;
+    END IF;
+
+    SELECT EXISTS (
+        SELECT 1
+        FROM connections_state
+        WHERE login = NEW.login
+          AND rel_type = positive_rel_type
+          AND to_login = resolved_login
+          AND to_bch_name = NEW.to_bch_name
+          AND to_block_number = COALESCE(NEW.to_block_number, 0)
+          AND to_block_hash = COALESCE(NEW.to_block_hash, decode(repeat('00', 32), 'hex'))
+    )
+    INTO existed_before;
+
+    IF NOT existed_before THEN
+        RETURN NEW;
+    END IF;
+
+    IF positive_rel_type = 10 THEN
+        INSERT INTO user_stats_state (
+            login,
+            owned_public_channels_count,
+            following_users_count,
+            following_channels_count,
+            close_friends_count,
+            updated_at_ms
+        ) VALUES (
+            NEW.login,
+            0,
+            0,
+            0,
+            0,
+            CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT)
+        )
+        ON CONFLICT (login) DO UPDATE SET
+            close_friends_count = GREATEST(0, user_stats_state.close_friends_count - 1),
+            updated_at_ms = EXCLUDED.updated_at_ms;
+    ELSIF positive_rel_type = 30 THEN
+        IF NEW.to_block_number IS NULL THEN
+            INSERT INTO user_stats_state (
+                login,
+                owned_public_channels_count,
+                following_users_count,
+                following_channels_count,
+                close_friends_count,
+                updated_at_ms
+        ) VALUES (
+            NEW.login,
+            0,
+            0,
+            0,
+            0,
+            CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT)
+        )
+            ON CONFLICT (login) DO UPDATE SET
+                following_channels_count = GREATEST(0, user_stats_state.following_channels_count - 1),
+                updated_at_ms = EXCLUDED.updated_at_ms;
+        ELSIF NEW.to_block_number = 0 THEN
+            INSERT INTO user_stats_state (
+                login,
+                owned_public_channels_count,
+                following_users_count,
+                following_channels_count,
+                close_friends_count,
+                updated_at_ms
+        ) VALUES (
+            NEW.login,
+            0,
+            0,
+            0,
+            0,
+            CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT)
+        )
+            ON CONFLICT (login) DO UPDATE SET
+                following_users_count = GREATEST(0, user_stats_state.following_users_count - 1),
+                updated_at_ms = EXCLUDED.updated_at_ms;
+        ELSE
+            SELECT cn.channel_type_code
+            INTO target_channel_type
+            FROM channel_names_state cn
+            WHERE cn.owner_bch_name = NEW.to_bch_name
+              AND cn.channel_root_block_number = NEW.to_block_number
+              AND cn.channel_root_block_hash = NEW.to_block_hash
+            LIMIT 1;
+
+            IF target_channel_type = 1 THEN
+                INSERT INTO user_stats_state (
+                    login,
+                    owned_public_channels_count,
+                    following_users_count,
+                    following_channels_count,
+                    close_friends_count,
+                    updated_at_ms
+                ) VALUES (
+                    NEW.login,
+                    0,
+                    0,
+                    0,
+                    0,
+                    CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT)
+                )
+                ON CONFLICT (login) DO UPDATE SET
+                    following_channels_count = GREATEST(0, user_stats_state.following_channels_count - 1),
+                    updated_at_ms = EXCLUDED.updated_at_ms;
+
+                INSERT INTO channel_stats_state (
+                    owner_bch_name,
+                    channel_root_block_number,
+                    channel_root_block_hash,
+                    owner_login,
+                    channel_type_code,
+                    subscribers_count,
+                    updated_at_ms
+                ) VALUES (
+                    NEW.to_bch_name,
+                    NEW.to_block_number,
+                    NEW.to_block_hash,
+                    resolved_login,
+                    target_channel_type,
+                    0,
+                    CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT)
+                )
+                ON CONFLICT (owner_bch_name, channel_root_block_number, channel_root_block_hash) DO UPDATE SET
+                    owner_login = EXCLUDED.owner_login,
+                    channel_type_code = EXCLUDED.channel_type_code,
+                    subscribers_count = GREATEST(0, channel_stats_state.subscribers_count - 1),
+                    updated_at_ms = EXCLUDED.updated_at_ms;
+            ELSIF target_channel_type IS NULL THEN
+                INSERT INTO user_stats_state (
+                    login,
+                    owned_public_channels_count,
+                    following_users_count,
+                    following_channels_count,
+                    close_friends_count,
+                    updated_at_ms
+                ) VALUES (
+                    NEW.login,
+                    0,
+                    0,
+                    0,
+                    0,
+                    CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT)
+                )
+                ON CONFLICT (login) DO UPDATE SET
+                    following_channels_count = GREATEST(0, user_stats_state.following_channels_count - 1),
+                    updated_at_ms = EXCLUDED.updated_at_ms;
+            END IF;
+        END IF;
+    END IF;
+
+    DELETE FROM connections_state
+    WHERE login = NEW.login
+      AND rel_type = positive_rel_type
+      AND to_login = resolved_login
+      AND to_bch_name = NEW.to_bch_name
+      AND to_block_number = COALESCE(NEW.to_block_number, 0)
+      AND to_block_hash = COALESCE(NEW.to_block_hash, decode(repeat('00', 32), 'hex'));
+
+    RETURN NEW;
+END;
+$$;
+
+DROP TRIGGER IF EXISTS trg_user_stats_state_ai ON solana_user_pda_current;
+CREATE TRIGGER trg_user_stats_state_ai
+AFTER INSERT ON solana_user_pda_current
+FOR EACH ROW
+EXECUTE FUNCTION shine_user_stats_state_ai();
+
+DROP TRIGGER IF EXISTS trg_channel_names_state_stats_ai ON channel_names_state;
+CREATE TRIGGER trg_channel_names_state_stats_ai
+AFTER INSERT ON channel_names_state
+FOR EACH ROW
+EXECUTE FUNCTION shine_channel_names_state_stats_ai();
+
+DROP TRIGGER IF EXISTS trg_blocks_connection_state_ai ON blocks;
+CREATE TRIGGER trg_blocks_connection_state_ai
+AFTER INSERT ON blocks
+FOR EACH ROW
+EXECUTE FUNCTION shine_blocks_connection_state_ai();
+
+TRUNCATE TABLE user_stats_state, channel_stats_state;
+
+INSERT INTO user_stats_state (
+    login,
+    owned_public_channels_count,
+    following_users_count,
+    following_channels_count,
+    close_friends_count,
+    updated_at_ms
+)
+SELECT
+    u.login,
+    COALESCE(own.owned_public_channels_count, 0) AS owned_public_channels_count,
+    COALESCE(fu.following_users_count, 0) AS following_users_count,
+    COALESCE(fc.following_channels_count, 0) AS following_channels_count,
+    COALESCE(cf.close_friends_count, 0) AS close_friends_count,
+    CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT) AS updated_at_ms
+FROM solana_user_pda_current u
+LEFT JOIN (
+    SELECT owner_login, COUNT(*)::INTEGER AS owned_public_channels_count
+    FROM channel_names_state
+    WHERE channel_type_code = 1
+    GROUP BY owner_login
+) own ON LOWER(own.owner_login) = LOWER(u.login)
+LEFT JOIN (
+    SELECT login, COUNT(*)::INTEGER AS following_users_count
+    FROM connections_state
+    WHERE rel_type = 30
+      AND to_block_number = 0
+    GROUP BY login
+) fu ON LOWER(fu.login) = LOWER(u.login)
+LEFT JOIN (
+    SELECT cs.login, COUNT(*)::INTEGER AS following_channels_count
+    FROM connections_state cs
+    JOIN channel_names_state cn
+      ON cn.owner_bch_name = cs.to_bch_name
+     AND cn.channel_root_block_number = cs.to_block_number
+     AND cn.channel_root_block_hash = cs.to_block_hash
+    WHERE cs.rel_type = 30
+      AND cn.channel_type_code = 1
+    GROUP BY cs.login
+) fc ON LOWER(fc.login) = LOWER(u.login)
+LEFT JOIN (
+    SELECT login, COUNT(*)::INTEGER AS close_friends_count
+    FROM connections_state
+    WHERE rel_type = 10
+    GROUP BY login
+) cf ON LOWER(cf.login) = LOWER(u.login);
+
+INSERT INTO channel_stats_state (
+    owner_bch_name,
+    channel_root_block_number,
+    channel_root_block_hash,
+    owner_login,
+    channel_type_code,
+    subscribers_count,
+    updated_at_ms
+)
+SELECT
+    cn.owner_bch_name,
+    cn.channel_root_block_number,
+    cn.channel_root_block_hash,
+    cn.owner_login,
+    cn.channel_type_code,
+    COUNT(DISTINCT cs.login)::INTEGER AS subscribers_count,
+    CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT) AS updated_at_ms
+FROM channel_names_state cn
+LEFT JOIN connections_state cs
+  ON cs.rel_type = 30
+ AND cs.to_bch_name = cn.owner_bch_name
+ AND cs.to_block_number = cn.channel_root_block_number
+ AND cs.to_block_hash = cn.channel_root_block_hash
+WHERE cn.channel_type_code = 1
+GROUP BY
+    cn.owner_bch_name,
+    cn.channel_root_block_number,
+    cn.channel_root_block_hash,
+    cn.owner_login,
+    cn.channel_type_code;
+
+INSERT INTO db_schema_version (id, schema_version, updated_at_ms)
+VALUES (1, 14, CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT))
+ON CONFLICT (id) DO UPDATE SET
+    schema_version = EXCLUDED.schema_version,
+    updated_at_ms = EXCLUDED.updated_at_ms;
+
+COMMIT;

SHiNE-server/shine-server-db/src/main/resources/postgres/migration_v15.sql

@@ -0,0 +1,105 @@
+BEGIN;
+
+CREATE OR REPLACE FUNCTION shine_channel_names_state_stats_ai()
+RETURNS TRIGGER
+LANGUAGE plpgsql
+AS $$
+DECLARE
+    now_ms BIGINT;
+    public_subscribers_count INTEGER;
+BEGIN
+    now_ms := CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT);
+
+    IF NEW.owner_login IS NULL OR btrim(NEW.owner_login) = '' THEN
+        RETURN NEW;
+    END IF;
+
+    IF NEW.channel_type_code = 1 THEN
+        IF EXISTS (
+            SELECT 1
+            FROM solana_user_pda_current su
+            WHERE su.login = NEW.owner_login
+        ) THEN
+            INSERT INTO user_stats_state (
+                login,
+                owned_public_channels_count,
+                following_users_count,
+                following_channels_count,
+                close_friends_count,
+                updated_at_ms
+            ) VALUES (
+                NEW.owner_login,
+                1,
+                0,
+                0,
+                0,
+                now_ms
+            )
+            ON CONFLICT (login) DO UPDATE SET
+                owned_public_channels_count = user_stats_state.owned_public_channels_count + 1,
+                updated_at_ms = EXCLUDED.updated_at_ms;
+        END IF;
+
+        SELECT COUNT(*)::INTEGER
+        INTO public_subscribers_count
+        FROM connections_state cs
+        JOIN channel_names_state cn
+          ON cn.owner_bch_name = cs.to_bch_name
+         AND cn.channel_root_block_number = cs.to_block_number
+         AND cn.channel_root_block_hash = cs.to_block_hash
+        WHERE cs.rel_type = 30
+          AND cn.owner_bch_name = NEW.owner_bch_name
+          AND cn.channel_root_block_number = NEW.channel_root_block_number
+          AND cn.channel_root_block_hash = NEW.channel_root_block_hash
+          AND cn.channel_type_code = 1;
+
+        INSERT INTO channel_stats_state (
+            owner_bch_name,
+            channel_root_block_number,
+            channel_root_block_hash,
+            owner_login,
+            channel_type_code,
+            subscribers_count,
+            updated_at_ms
+        ) VALUES (
+            NEW.owner_bch_name,
+            NEW.channel_root_block_number,
+            NEW.channel_root_block_hash,
+            NEW.owner_login,
+            NEW.channel_type_code,
+            COALESCE(public_subscribers_count, 0),
+            now_ms
+        )
+        ON CONFLICT (owner_bch_name, channel_root_block_number, channel_root_block_hash) DO UPDATE SET
+            owner_login = EXCLUDED.owner_login,
+            channel_type_code = EXCLUDED.channel_type_code,
+            subscribers_count = EXCLUDED.subscribers_count,
+            updated_at_ms = EXCLUDED.updated_at_ms;
+    ELSE
+        WITH pending AS (
+            SELECT cs.login, COUNT(*)::INTEGER AS cnt
+            FROM connections_state cs
+            WHERE cs.rel_type = 30
+              AND cs.to_bch_name = NEW.owner_bch_name
+              AND cs.to_block_number = NEW.channel_root_block_number
+              AND cs.to_block_hash = NEW.channel_root_block_hash
+            GROUP BY cs.login
+        )
+        UPDATE user_stats_state us
+        SET following_channels_count = GREATEST(0, us.following_channels_count - pending.cnt),
+            updated_at_ms = now_ms
+        FROM pending
+        WHERE us.login = pending.login;
+    END IF;
+
+    RETURN NEW;
+END;
+$$;
+
+INSERT INTO db_schema_version (id, schema_version, updated_at_ms)
+VALUES (1, 15, CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT))
+ON CONFLICT (id) DO UPDATE SET
+    schema_version = EXCLUDED.schema_version,
+    updated_at_ms = EXCLUDED.updated_at_ms;
+
+COMMIT;

SHiNE-server/shine-server-db/src/main/resources/postgres/migration_v16.sql

@@ -0,0 +1,112 @@
+BEGIN;
+
+-- У пользователя действует только первый access_server из Solana PDA.
+CREATE OR REPLACE FUNCTION shine_refresh_user_access_servers_for_user(p_user_login TEXT)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+BEGIN
+    IF p_user_login IS NULL OR btrim(p_user_login) = '' THEN
+        RETURN;
+    END IF;
+
+    DELETE FROM user_access_servers_current
+    WHERE LOWER(user_login) = LOWER(p_user_login);
+
+    INSERT INTO user_access_servers_current (
+        user_login,
+        server_login,
+        server_url,
+        server_client_key,
+        user_record_number,
+        user_updated_at_ms,
+        server_record_number,
+        server_updated_at_ms,
+        refreshed_at_ms
+    )
+    SELECT
+        u.login,
+        s.login,
+        s.server_address,
+        s.client_key,
+        u.record_number,
+        u.updated_at_ms,
+        s.record_number,
+        s.updated_at_ms,
+        CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT)
+    FROM solana_user_pda_current u
+    CROSS JOIN LATERAL (
+        SELECT login_value
+        FROM jsonb_array_elements_text(
+            CASE
+                WHEN btrim(COALESCE(u.access_servers_json, '')) = '' THEN '[]'::jsonb
+                ELSE u.access_servers_json::jsonb
+            END
+        ) WITH ORDINALITY AS access_server(login_value, ord)
+        WHERE ord = 1
+    ) AS access_server
+    JOIN solana_user_pda_current s
+      ON LOWER(s.login) = LOWER(btrim(access_server.login_value))
+     AND s.is_server = TRUE
+     AND btrim(COALESCE(s.server_address, '')) <> ''
+    WHERE LOWER(u.login) = LOWER(p_user_login)
+    ON CONFLICT (user_login, server_login) DO UPDATE SET
+        server_url = EXCLUDED.server_url,
+        server_client_key = EXCLUDED.server_client_key,
+        user_record_number = EXCLUDED.user_record_number,
+        user_updated_at_ms = EXCLUDED.user_updated_at_ms,
+        server_record_number = EXCLUDED.server_record_number,
+        server_updated_at_ms = EXCLUDED.server_updated_at_ms,
+        refreshed_at_ms = EXCLUDED.refreshed_at_ms;
+END;
+$$;
+
+CREATE OR REPLACE FUNCTION shine_refresh_user_access_servers_for_server(p_server_login TEXT)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+    affected_user RECORD;
+BEGIN
+    IF p_server_login IS NULL OR btrim(p_server_login) = '' THEN
+        RETURN;
+    END IF;
+
+    DELETE FROM user_access_servers_current
+    WHERE LOWER(server_login) = LOWER(p_server_login);
+
+    FOR affected_user IN
+        SELECT u.login
+        FROM solana_user_pda_current u
+        CROSS JOIN LATERAL (
+            SELECT login_value
+            FROM jsonb_array_elements_text(
+                CASE
+                    WHEN btrim(COALESCE(u.access_servers_json, '')) = '' THEN '[]'::jsonb
+                    ELSE u.access_servers_json::jsonb
+                END
+            ) WITH ORDINALITY AS access_server(login_value, ord)
+            WHERE ord = 1
+        ) AS access_server
+        WHERE LOWER(btrim(access_server.login_value)) = LOWER(p_server_login)
+    LOOP
+        PERFORM shine_refresh_user_access_servers_for_user(affected_user.login);
+    END LOOP;
+END;
+$$;
+
+DROP TABLE IF EXISTS dm_sync_outbox;
+DROP TABLE IF EXISTS dm_sync_peer_state;
+DROP TABLE IF EXISTS user_settings_sync_peer_state;
+DROP INDEX IF EXISTS idx_user_settings_synced;
+ALTER TABLE user_settings DROP COLUMN IF EXISTS synced;
+
+SELECT shine_refresh_user_access_servers_all();
+
+INSERT INTO db_schema_version (id, schema_version, updated_at_ms)
+VALUES (1, 16, CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT))
+ON CONFLICT (id) DO UPDATE SET
+    schema_version = EXCLUDED.schema_version,
+    updated_at_ms = EXCLUDED.updated_at_ms;
+
+COMMIT;

SHiNE-server/shine-server-db/src/main/resources/postgres/migration_v17.sql

@@ -0,0 +1,381 @@
+BEGIN;
+
+-- Add active FRIEND 14/15 and OFFICIAL_ACCOUNT confirmation 80/81 to connection state.
+-- Legacy 60/61 remain accepted at protocol level; this migration does not reinterpret existing rows.
+
+CREATE OR REPLACE FUNCTION shine_blocks_connection_state_ai()
+RETURNS TRIGGER
+LANGUAGE plpgsql
+AS $$
+DECLARE
+    resolved_login TEXT;
+    positive_rel_type INTEGER;
+    existed_before BOOLEAN;
+    target_channel_type INTEGER;
+BEGIN
+    IF NEW.msg_type <> 3 THEN
+        RETURN NEW;
+    END IF;
+
+    resolved_login := shine_resolve_login(NEW.to_login, NEW.to_bch_name);
+
+    IF NEW.msg_sub_type IN (10, 14, 20, 30, 40, 50, 52, 54, 60, 70, 74, 80) THEN
+        IF resolved_login IS NULL OR NEW.to_bch_name IS NULL THEN
+            RETURN NEW;
+        END IF;
+
+        SELECT EXISTS (
+            SELECT 1
+            FROM connections_state
+            WHERE login = NEW.login
+              AND rel_type = NEW.msg_sub_type
+              AND to_login = resolved_login
+              AND to_bch_name = NEW.to_bch_name
+              AND to_block_number = COALESCE(NEW.to_block_number, 0)
+              AND to_block_hash = COALESCE(NEW.to_block_hash, decode(repeat('00', 32), 'hex'))
+        )
+        INTO existed_before;
+
+        IF NOT existed_before THEN
+            IF NEW.msg_sub_type = 10 THEN
+                INSERT INTO user_stats_state (
+                    login,
+                    owned_public_channels_count,
+                    following_users_count,
+                    following_channels_count,
+                    close_friends_count,
+                    updated_at_ms
+                ) VALUES (
+                    NEW.login,
+                    0,
+                    0,
+                    0,
+                    1,
+                    CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT)
+                )
+                ON CONFLICT (login) DO UPDATE SET
+                    close_friends_count = user_stats_state.close_friends_count + 1,
+                    updated_at_ms = EXCLUDED.updated_at_ms;
+            ELSIF NEW.msg_sub_type = 30 THEN
+                IF NEW.to_block_number IS NULL THEN
+                    INSERT INTO user_stats_state (
+                        login,
+                        owned_public_channels_count,
+                        following_users_count,
+                        following_channels_count,
+                        close_friends_count,
+                        updated_at_ms
+                    ) VALUES (
+                        NEW.login,
+                        0,
+                        0,
+                        1,
+                        0,
+                        CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT)
+                    )
+                    ON CONFLICT (login) DO UPDATE SET
+                        following_channels_count = user_stats_state.following_channels_count + 1,
+                        updated_at_ms = EXCLUDED.updated_at_ms;
+                ELSIF NEW.to_block_number = 0 THEN
+                    INSERT INTO user_stats_state (
+                        login,
+                        owned_public_channels_count,
+                        following_users_count,
+                        following_channels_count,
+                        close_friends_count,
+                        updated_at_ms
+                    ) VALUES (
+                        NEW.login,
+                        0,
+                        1,
+                        0,
+                        0,
+                        CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT)
+                    )
+                    ON CONFLICT (login) DO UPDATE SET
+                        following_users_count = user_stats_state.following_users_count + 1,
+                        updated_at_ms = EXCLUDED.updated_at_ms;
+                ELSE
+                    SELECT cn.channel_type_code
+                    INTO target_channel_type
+                    FROM channel_names_state cn
+                    WHERE cn.owner_bch_name = NEW.to_bch_name
+                      AND cn.channel_root_block_number = NEW.to_block_number
+                      AND cn.channel_root_block_hash = NEW.to_block_hash
+                    LIMIT 1;
+
+                    IF target_channel_type = 1 THEN
+                        INSERT INTO user_stats_state (
+                            login,
+                            owned_public_channels_count,
+                            following_users_count,
+                            following_channels_count,
+                            close_friends_count,
+                            updated_at_ms
+                        ) VALUES (
+                            NEW.login,
+                            0,
+                            0,
+                            1,
+                            0,
+                            CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT)
+                        )
+                        ON CONFLICT (login) DO UPDATE SET
+                            following_channels_count = user_stats_state.following_channels_count + 1,
+                            updated_at_ms = EXCLUDED.updated_at_ms;
+
+                        INSERT INTO channel_stats_state (
+                            owner_bch_name,
+                            channel_root_block_number,
+                            channel_root_block_hash,
+                            owner_login,
+                            channel_type_code,
+                            subscribers_count,
+                            updated_at_ms
+                        ) VALUES (
+                            NEW.to_bch_name,
+                            NEW.to_block_number,
+                            NEW.to_block_hash,
+                            resolved_login,
+                            target_channel_type,
+                            1,
+                            CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT)
+                        )
+                        ON CONFLICT (owner_bch_name, channel_root_block_number, channel_root_block_hash) DO UPDATE SET
+                            owner_login = EXCLUDED.owner_login,
+                            channel_type_code = EXCLUDED.channel_type_code,
+                            subscribers_count = channel_stats_state.subscribers_count + 1,
+                            updated_at_ms = EXCLUDED.updated_at_ms;
+                    ELSIF target_channel_type IS NULL THEN
+                        INSERT INTO user_stats_state (
+                            login,
+                            owned_public_channels_count,
+                            following_users_count,
+                            following_channels_count,
+                            close_friends_count,
+                            updated_at_ms
+                        ) VALUES (
+                            NEW.login,
+                            0,
+                            0,
+                            1,
+                            0,
+                            CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT)
+                        )
+                        ON CONFLICT (login) DO UPDATE SET
+                            following_channels_count = user_stats_state.following_channels_count + 1,
+                            updated_at_ms = EXCLUDED.updated_at_ms;
+                    END IF;
+                END IF;
+            END IF;
+        END IF;
+
+        DELETE FROM connections_state
+        WHERE login = NEW.login
+          AND rel_type = NEW.msg_sub_type
+          AND to_login = resolved_login
+          AND to_bch_name = NEW.to_bch_name
+          AND to_block_number = COALESCE(NEW.to_block_number, 0)
+          AND to_block_hash = COALESCE(NEW.to_block_hash, decode(repeat('00', 32), 'hex'));
+
+        INSERT INTO connections_state (
+            login, rel_type, to_login, to_bch_name, to_block_number, to_block_hash
+        ) VALUES (
+            NEW.login,
+            NEW.msg_sub_type,
+            resolved_login,
+            NEW.to_bch_name,
+            COALESCE(NEW.to_block_number, 0),
+            COALESCE(NEW.to_block_hash, decode(repeat('00', 32), 'hex'))
+        );
+
+        RETURN NEW;
+    END IF;
+
+    positive_rel_type := CASE NEW.msg_sub_type
+        WHEN 11 THEN 10
+        WHEN 15 THEN 14
+        WHEN 21 THEN 20
+        WHEN 31 THEN 30
+        WHEN 41 THEN 40
+        WHEN 51 THEN 50
+        WHEN 53 THEN 52
+        WHEN 55 THEN 54
+        WHEN 61 THEN 60
+        WHEN 71 THEN 70
+        WHEN 75 THEN 74
+        WHEN 81 THEN 80
+        ELSE NULL
+    END;
+
+    IF positive_rel_type IS NULL OR resolved_login IS NULL THEN
+        RETURN NEW;
+    END IF;
+
+    SELECT EXISTS (
+        SELECT 1
+        FROM connections_state
+        WHERE login = NEW.login
+          AND rel_type = positive_rel_type
+          AND to_login = resolved_login
+          AND to_bch_name = NEW.to_bch_name
+          AND to_block_number = COALESCE(NEW.to_block_number, 0)
+          AND to_block_hash = COALESCE(NEW.to_block_hash, decode(repeat('00', 32), 'hex'))
+    )
+    INTO existed_before;
+
+    IF NOT existed_before THEN
+        RETURN NEW;
+    END IF;
+
+    IF positive_rel_type = 10 THEN
+        INSERT INTO user_stats_state (
+            login,
+            owned_public_channels_count,
+            following_users_count,
+            following_channels_count,
+            close_friends_count,
+            updated_at_ms
+        ) VALUES (
+            NEW.login,
+            0,
+            0,
+            0,
+            0,
+            CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT)
+        )
+        ON CONFLICT (login) DO UPDATE SET
+            close_friends_count = GREATEST(0, user_stats_state.close_friends_count - 1),
+            updated_at_ms = EXCLUDED.updated_at_ms;
+    ELSIF positive_rel_type = 30 THEN
+        IF NEW.to_block_number IS NULL THEN
+            INSERT INTO user_stats_state (
+                login,
+                owned_public_channels_count,
+                following_users_count,
+                following_channels_count,
+                close_friends_count,
+                updated_at_ms
+        ) VALUES (
+            NEW.login,
+            0,
+            0,
+            0,
+            0,
+            CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT)
+        )
+            ON CONFLICT (login) DO UPDATE SET
+                following_channels_count = GREATEST(0, user_stats_state.following_channels_count - 1),
+                updated_at_ms = EXCLUDED.updated_at_ms;
+        ELSIF NEW.to_block_number = 0 THEN
+            INSERT INTO user_stats_state (
+                login,
+                owned_public_channels_count,
+                following_users_count,
+                following_channels_count,
+                close_friends_count,
+                updated_at_ms
+        ) VALUES (
+            NEW.login,
+            0,
+            0,
+            0,
+            0,
+            CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT)
+        )
+            ON CONFLICT (login) DO UPDATE SET
+                following_users_count = GREATEST(0, user_stats_state.following_users_count - 1),
+                updated_at_ms = EXCLUDED.updated_at_ms;
+        ELSE
+            SELECT cn.channel_type_code
+            INTO target_channel_type
+            FROM channel_names_state cn
+            WHERE cn.owner_bch_name = NEW.to_bch_name
+              AND cn.channel_root_block_number = NEW.to_block_number
+              AND cn.channel_root_block_hash = NEW.to_block_hash
+            LIMIT 1;
+
+            IF target_channel_type = 1 THEN
+                INSERT INTO user_stats_state (
+                    login,
+                    owned_public_channels_count,
+                    following_users_count,
+                    following_channels_count,
+                    close_friends_count,
+                    updated_at_ms
+                ) VALUES (
+                    NEW.login,
+                    0,
+                    0,
+                    0,
+                    0,
+                    CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT)
+                )
+                ON CONFLICT (login) DO UPDATE SET
+                    following_channels_count = GREATEST(0, user_stats_state.following_channels_count - 1),
+                    updated_at_ms = EXCLUDED.updated_at_ms;
+
+                INSERT INTO channel_stats_state (
+                    owner_bch_name,
+                    channel_root_block_number,
+                    channel_root_block_hash,
+                    owner_login,
+                    channel_type_code,
+                    subscribers_count,
+                    updated_at_ms
+                ) VALUES (
+                    NEW.to_bch_name,
+                    NEW.to_block_number,
+                    NEW.to_block_hash,
+                    resolved_login,
+                    target_channel_type,
+                    0,
+                    CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT)
+                )
+                ON CONFLICT (owner_bch_name, channel_root_block_number, channel_root_block_hash) DO UPDATE SET
+                    owner_login = EXCLUDED.owner_login,
+                    channel_type_code = EXCLUDED.channel_type_code,
+                    subscribers_count = GREATEST(0, channel_stats_state.subscribers_count - 1),
+                    updated_at_ms = EXCLUDED.updated_at_ms;
+            ELSIF target_channel_type IS NULL THEN
+                INSERT INTO user_stats_state (
+                    login,
+                    owned_public_channels_count,
+                    following_users_count,
+                    following_channels_count,
+                    close_friends_count,
+                    updated_at_ms
+                ) VALUES (
+                    NEW.login,
+                    0,
+                    0,
+                    0,
+                    0,
+                    CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT)
+                )
+                ON CONFLICT (login) DO UPDATE SET
+                    following_channels_count = GREATEST(0, user_stats_state.following_channels_count - 1),
+                    updated_at_ms = EXCLUDED.updated_at_ms;
+            END IF;
+        END IF;
+    END IF;
+
+    DELETE FROM connections_state
+    WHERE login = NEW.login
+      AND rel_type = positive_rel_type
+      AND to_login = resolved_login
+      AND to_bch_name = NEW.to_bch_name
+      AND to_block_number = COALESCE(NEW.to_block_number, 0)
+      AND to_block_hash = COALESCE(NEW.to_block_hash, decode(repeat('00', 32), 'hex'));
+
+    RETURN NEW;
+END;
+$$;
+
+INSERT INTO db_schema_version (id, schema_version, updated_at_ms)
+VALUES (1, 17, CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT))
+ON CONFLICT (id) DO UPDATE SET
+    schema_version = EXCLUDED.schema_version,
+    updated_at_ms = EXCLUDED.updated_at_ms;
+
+COMMIT;

SHiNE-server/shine-server-db/src/main/resources/postgres/migration_v18.sql

@@ -0,0 +1,348 @@
+BEGIN;
+
+-- v18: fast profile projection, effective social/voting statistics and qualified likes.
+-- Source of truth remains users_params / connections_state / reactions_state / channel_names_state.
+
+CREATE TABLE IF NOT EXISTS user_profile_state (
+    login           TEXT PRIMARY KEY,
+    first_name      TEXT NOT NULL DEFAULT '',
+    last_name       TEXT NOT NULL DEFAULT '',
+    ava_ar          TEXT NOT NULL DEFAULT '',
+    account_role    TEXT,
+    shine_status    TEXT,
+    updated_at_ms   BIGINT NOT NULL DEFAULT 0
+);
+
+CREATE INDEX IF NOT EXISTS idx_user_profile_state_name
+    ON user_profile_state (LOWER(last_name), LOWER(first_name), LOWER(login));
+
+ALTER TABLE user_stats_state
+    ADD COLUMN IF NOT EXISTS friends_count INTEGER NOT NULL DEFAULT 0 CHECK (friends_count >= 0),
+    ADD COLUMN IF NOT EXISTS primary_confirmations_received_count INTEGER NOT NULL DEFAULT 0 CHECK (primary_confirmations_received_count >= 0),
+    ADD COLUMN IF NOT EXISTS primary_confirmations_given_count INTEGER NOT NULL DEFAULT 0 CHECK (primary_confirmations_given_count >= 0),
+    ADD COLUMN IF NOT EXISTS shine_confirmations_received_count INTEGER NOT NULL DEFAULT 0 CHECK (shine_confirmations_received_count >= 0),
+    ADD COLUMN IF NOT EXISTS shine_confirmations_given_count INTEGER NOT NULL DEFAULT 0 CHECK (shine_confirmations_given_count >= 0);
+
+ALTER TABLE message_stats
+    ADD COLUMN IF NOT EXISTS primary_likes_count INTEGER NOT NULL DEFAULT 0 CHECK (primary_likes_count >= 0),
+    ADD COLUMN IF NOT EXISTS shining_likes_count INTEGER NOT NULL DEFAULT 0 CHECK (shining_likes_count >= 0);
+
+CREATE OR REPLACE FUNCTION shine_refresh_user_profile(p_login TEXT)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+    v_first_name TEXT := '';
+    v_last_name TEXT := '';
+    v_ava_ar TEXT := '';
+    v_account_role TEXT := NULL;
+    v_shine TEXT := NULL;
+    v_updated BIGINT := 0;
+BEGIN
+    IF p_login IS NULL OR btrim(p_login) = '' THEN RETURN; END IF;
+
+    SELECT COALESCE(MAX(value) FILTER (WHERE param = 'first_name'), ''),
+           COALESCE(MAX(value) FILTER (WHERE param = 'last_name'), ''),
+           COALESCE(MAX(value) FILTER (WHERE param = 'ava'), ''),
+           MAX(value) FILTER (WHERE param = 'account_role'),
+           MAX(value) FILTER (WHERE param = 'shine'),
+           COALESCE(MAX(time_ms), 0)
+    INTO v_first_name, v_last_name, v_ava_ar, v_account_role, v_shine, v_updated
+    FROM users_params
+    WHERE LOWER(login) = LOWER(p_login);
+
+    v_account_role := LOWER(BTRIM(COALESCE(v_account_role, '')));
+    IF v_account_role NOT IN ('primary', 'non_voting') THEN v_account_role := NULL; END IF;
+
+    v_shine := LOWER(BTRIM(COALESCE(v_shine, '')));
+    IF v_shine = 'yes' THEN v_shine := 'shining'; END IF; -- legacy compatibility
+    IF v_shine NOT IN ('shining', 'unknown', 'not_interested') THEN v_shine := NULL; END IF;
+
+    INSERT INTO user_profile_state(login, first_name, last_name, ava_ar, account_role, shine_status, updated_at_ms)
+    VALUES (p_login, v_first_name, v_last_name, v_ava_ar, v_account_role, v_shine, v_updated)
+    ON CONFLICT (login) DO UPDATE SET
+        first_name = EXCLUDED.first_name,
+        last_name = EXCLUDED.last_name,
+        ava_ar = EXCLUDED.ava_ar,
+        account_role = EXCLUDED.account_role,
+        shine_status = EXCLUDED.shine_status,
+        updated_at_ms = EXCLUDED.updated_at_ms;
+END;
+$$;
+
+CREATE OR REPLACE FUNCTION shine_is_primary(p_login TEXT)
+RETURNS BOOLEAN
+LANGUAGE sql
+STABLE
+AS $$
+    SELECT COALESCE((SELECT account_role = 'primary' FROM user_profile_state WHERE LOWER(login)=LOWER(p_login) LIMIT 1), FALSE)
+$$;
+
+CREATE OR REPLACE FUNCTION shine_is_shining(p_login TEXT)
+RETURNS BOOLEAN
+LANGUAGE sql
+STABLE
+AS $$
+    SELECT COALESCE((SELECT shine_status = 'shining' FROM user_profile_state WHERE LOWER(login)=LOWER(p_login) LIMIT 1), FALSE)
+$$;
+
+CREATE OR REPLACE FUNCTION shine_target_accepts_primary_confirmation(p_login TEXT)
+RETURNS BOOLEAN
+LANGUAGE sql
+STABLE
+AS $$
+    SELECT COALESCE((SELECT account_role IS DISTINCT FROM 'non_voting' FROM user_profile_state WHERE LOWER(login)=LOWER(p_login) LIMIT 1), TRUE)
+$$;
+
+CREATE OR REPLACE FUNCTION shine_target_accepts_shine_confirmation(p_login TEXT)
+RETURNS BOOLEAN
+LANGUAGE sql
+STABLE
+AS $$
+    SELECT COALESCE((SELECT shine_status IS DISTINCT FROM 'not_interested' FROM user_profile_state WHERE LOWER(login)=LOWER(p_login) LIMIT 1), TRUE)
+$$;
+
+CREATE OR REPLACE FUNCTION shine_refresh_user_stats(p_login TEXT)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+    v_now BIGINT := CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT);
+BEGIN
+    IF p_login IS NULL OR btrim(p_login) = '' THEN RETURN; END IF;
+
+    INSERT INTO user_stats_state(login, owned_public_channels_count, following_users_count,
+        following_channels_count, close_friends_count, friends_count,
+        primary_confirmations_received_count, primary_confirmations_given_count,
+        shine_confirmations_received_count, shine_confirmations_given_count, updated_at_ms)
+    SELECT p_login,
+        (SELECT COUNT(*)::INT FROM channel_names_state cn WHERE LOWER(cn.owner_login)=LOWER(p_login) AND cn.channel_type_code=1),
+        0,
+        (SELECT COUNT(*)::INT FROM connections_state cs JOIN channel_names_state cn
+            ON cn.owner_bch_name=cs.to_bch_name AND cn.channel_root_block_number=cs.to_block_number AND cn.channel_root_block_hash=cs.to_block_hash
+            WHERE LOWER(cs.login)=LOWER(p_login) AND cs.rel_type=30 AND cn.channel_type_code=1),
+        (SELECT COUNT(DISTINCT LOWER(cs.to_login))::INT FROM connections_state cs WHERE LOWER(cs.login)=LOWER(p_login) AND cs.rel_type=10),
+        (SELECT COUNT(DISTINCT LOWER(cs.to_login))::INT FROM connections_state cs
+            WHERE LOWER(cs.login)=LOWER(p_login) AND cs.rel_type=14
+              AND NOT EXISTS (SELECT 1 FROM connections_state cf WHERE LOWER(cf.login)=LOWER(p_login) AND LOWER(cf.to_login)=LOWER(cs.to_login) AND cf.rel_type=10)),
+        (SELECT COUNT(DISTINCT LOWER(cs.login))::INT FROM connections_state cs
+            WHERE LOWER(cs.to_login)=LOWER(p_login) AND cs.rel_type=80
+              AND shine_is_primary(cs.login) AND shine_target_accepts_primary_confirmation(p_login)),
+        (SELECT COUNT(DISTINCT LOWER(cs.to_login))::INT FROM connections_state cs
+            WHERE LOWER(cs.login)=LOWER(p_login) AND cs.rel_type=80
+              AND shine_is_primary(p_login) AND shine_target_accepts_primary_confirmation(cs.to_login)),
+        (SELECT COUNT(DISTINCT LOWER(cs.login))::INT FROM connections_state cs
+            WHERE LOWER(cs.to_login)=LOWER(p_login) AND cs.rel_type=70
+              AND shine_is_primary(cs.login) AND shine_is_shining(cs.login) AND shine_target_accepts_shine_confirmation(p_login)),
+        (SELECT COUNT(DISTINCT LOWER(cs.to_login))::INT FROM connections_state cs
+            WHERE LOWER(cs.login)=LOWER(p_login) AND cs.rel_type=70
+              AND shine_is_primary(p_login) AND shine_is_shining(p_login) AND shine_target_accepts_shine_confirmation(cs.to_login)),
+        v_now
+    ON CONFLICT (login) DO UPDATE SET
+        owned_public_channels_count=EXCLUDED.owned_public_channels_count,
+        following_users_count=0,
+        following_channels_count=EXCLUDED.following_channels_count,
+        close_friends_count=EXCLUDED.close_friends_count,
+        friends_count=EXCLUDED.friends_count,
+        primary_confirmations_received_count=EXCLUDED.primary_confirmations_received_count,
+        primary_confirmations_given_count=EXCLUDED.primary_confirmations_given_count,
+        shine_confirmations_received_count=EXCLUDED.shine_confirmations_received_count,
+        shine_confirmations_given_count=EXCLUDED.shine_confirmations_given_count,
+        updated_at_ms=EXCLUDED.updated_at_ms;
+END;
+$$;
+
+CREATE OR REPLACE FUNCTION shine_refresh_related_user_stats(p_login TEXT)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE r RECORD;
+BEGIN
+    PERFORM shine_refresh_user_stats(p_login);
+    FOR r IN
+        SELECT DISTINCT x.login FROM (
+            SELECT cs.login FROM connections_state cs WHERE LOWER(cs.to_login)=LOWER(p_login) AND cs.rel_type IN (70,80)
+            UNION
+            SELECT cs.to_login AS login FROM connections_state cs WHERE LOWER(cs.login)=LOWER(p_login) AND cs.rel_type IN (70,80)
+        ) x
+    LOOP
+        PERFORM shine_refresh_user_stats(r.login);
+    END LOOP;
+END;
+$$;
+
+CREATE OR REPLACE FUNCTION shine_refresh_message_qualified_likes_for_actor(p_login TEXT)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE r RECORD;
+BEGIN
+    FOR r IN
+        SELECT DISTINCT rs.to_login, rs.to_bch_name, rs.to_block_number, rs.to_block_hash
+        FROM reactions_state rs
+        WHERE LOWER(rs.from_login)=LOWER(p_login) AND rs.reaction_type=1 AND rs.last_sub_type=1
+    LOOP
+        UPDATE message_stats ms SET
+            primary_likes_count=(SELECT COUNT(*)::INT FROM reactions_state x WHERE x.reaction_type=1 AND x.last_sub_type=1
+                AND x.to_login=r.to_login AND x.to_bch_name=r.to_bch_name AND x.to_block_number=r.to_block_number AND x.to_block_hash=r.to_block_hash
+                AND shine_is_primary(x.from_login)),
+            shining_likes_count=(SELECT COUNT(*)::INT FROM reactions_state x WHERE x.reaction_type=1 AND x.last_sub_type=1
+                AND x.to_login=r.to_login AND x.to_bch_name=r.to_bch_name AND x.to_block_number=r.to_block_number AND x.to_block_hash=r.to_block_hash
+                AND shine_is_primary(x.from_login) AND shine_is_shining(x.from_login))
+        WHERE ms.to_login=r.to_login AND ms.to_bch_name=r.to_bch_name AND ms.to_block_number=r.to_block_number AND ms.to_block_hash=r.to_block_hash;
+    END LOOP;
+END;
+$$;
+
+
+CREATE OR REPLACE FUNCTION shine_refresh_channel_follow_stats(p_bch_name TEXT, p_block_number INTEGER, p_block_hash BYTEA)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+    v_owner_login TEXT;
+    v_channel_type INTEGER;
+    v_count INTEGER := 0;
+    v_now BIGINT := CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT);
+BEGIN
+    IF p_bch_name IS NULL OR p_block_number IS NULL OR p_block_hash IS NULL OR p_block_number <= 0 THEN RETURN; END IF;
+
+    SELECT cn.owner_login, cn.channel_type_code
+      INTO v_owner_login, v_channel_type
+      FROM channel_names_state cn
+     WHERE cn.owner_bch_name=p_bch_name
+       AND cn.channel_root_block_number=p_block_number
+       AND cn.channel_root_block_hash=p_block_hash
+     LIMIT 1;
+
+    IF v_channel_type IS NULL THEN RETURN; END IF;
+
+    SELECT COUNT(DISTINCT LOWER(cs.login))::INT
+      INTO v_count
+      FROM connections_state cs
+     WHERE cs.rel_type=30
+       AND cs.to_bch_name=p_bch_name
+       AND cs.to_block_number=p_block_number
+       AND cs.to_block_hash=p_block_hash;
+
+    INSERT INTO channel_stats_state(owner_bch_name,channel_root_block_number,channel_root_block_hash,owner_login,channel_type_code,subscribers_count,updated_at_ms)
+    VALUES(p_bch_name,p_block_number,p_block_hash,COALESCE(v_owner_login,''),v_channel_type,v_count,v_now)
+    ON CONFLICT(owner_bch_name,channel_root_block_number,channel_root_block_hash) DO UPDATE SET
+        owner_login=EXCLUDED.owner_login,
+        channel_type_code=EXCLUDED.channel_type_code,
+        subscribers_count=EXCLUDED.subscribers_count,
+        updated_at_ms=EXCLUDED.updated_at_ms;
+END;
+$$;
+
+-- Replace incremental channel-name counter with idempotent recomputation.
+CREATE OR REPLACE FUNCTION shine_channel_names_state_stats_ai()
+RETURNS TRIGGER
+LANGUAGE plpgsql
+AS $$
+BEGIN
+    IF NEW.channel_type_code = 1 THEN
+        PERFORM shine_refresh_user_stats(NEW.owner_login);
+    END IF;
+    RETURN NEW;
+END;
+$$;
+
+-- Rebuild connection state without incremental user counters; then recompute affected users.
+CREATE OR REPLACE FUNCTION shine_blocks_connection_state_ai()
+RETURNS TRIGGER
+LANGUAGE plpgsql
+AS $$
+DECLARE
+    resolved_login TEXT;
+    positive_rel_type INTEGER;
+BEGIN
+    IF NEW.msg_type <> 3 THEN RETURN NEW; END IF;
+    resolved_login := shine_resolve_login(NEW.to_login, NEW.to_bch_name);
+    IF resolved_login IS NULL OR NEW.to_bch_name IS NULL THEN RETURN NEW; END IF;
+
+    IF NEW.msg_sub_type IN (10,14,20,30,40,50,52,54,60,70,74,80) THEN
+        DELETE FROM connections_state WHERE login=NEW.login AND rel_type=NEW.msg_sub_type AND to_login=resolved_login
+            AND to_bch_name=NEW.to_bch_name AND to_block_number=COALESCE(NEW.to_block_number,0)
+            AND to_block_hash=COALESCE(NEW.to_block_hash,decode(repeat('00',32),'hex'));
+        INSERT INTO connections_state(login,rel_type,to_login,to_bch_name,to_block_number,to_block_hash)
+        VALUES(NEW.login,NEW.msg_sub_type,resolved_login,NEW.to_bch_name,COALESCE(NEW.to_block_number,0),COALESCE(NEW.to_block_hash,decode(repeat('00',32),'hex')));
+    ELSE
+        positive_rel_type := CASE NEW.msg_sub_type WHEN 11 THEN 10 WHEN 15 THEN 14 WHEN 21 THEN 20 WHEN 31 THEN 30 WHEN 41 THEN 40
+            WHEN 51 THEN 50 WHEN 53 THEN 52 WHEN 55 THEN 54 WHEN 61 THEN 60 WHEN 71 THEN 70 WHEN 75 THEN 74 WHEN 81 THEN 80 ELSE NULL END;
+        IF positive_rel_type IS NULL THEN RETURN NEW; END IF;
+        DELETE FROM connections_state WHERE login=NEW.login AND rel_type=positive_rel_type AND to_login=resolved_login
+            AND to_bch_name=NEW.to_bch_name AND to_block_number=COALESCE(NEW.to_block_number,0)
+            AND to_block_hash=COALESCE(NEW.to_block_hash,decode(repeat('00',32),'hex'));
+    END IF;
+
+    PERFORM shine_refresh_user_stats(NEW.login);
+    PERFORM shine_refresh_user_stats(resolved_login);
+    IF NEW.msg_sub_type IN (30,31) AND NEW.to_block_number IS NOT NULL AND NEW.to_block_number > 0 AND NEW.to_block_hash IS NOT NULL THEN
+        PERFORM shine_refresh_channel_follow_stats(NEW.to_bch_name, NEW.to_block_number, NEW.to_block_hash);
+    END IF;
+    RETURN NEW;
+END;
+$$;
+
+CREATE OR REPLACE FUNCTION shine_blocks_message_stats_like_ai()
+RETURNS TRIGGER
+LANGUAGE plpgsql
+AS $$
+DECLARE previous_sub_type INTEGER;
+BEGIN
+    IF NEW.msg_type<>2 OR NEW.msg_sub_type NOT IN (1,2) THEN RETURN NEW; END IF;
+    IF NEW.to_login IS NULL OR NEW.to_bch_name IS NULL OR NEW.to_block_number IS NULL OR NEW.to_block_hash IS NULL THEN RETURN NEW; END IF;
+
+    INSERT INTO message_stats(to_login,to_bch_name,to_block_number,to_block_hash,likes_count,primary_likes_count,shining_likes_count,replies_count,edits_count)
+    VALUES(NEW.to_login,NEW.to_bch_name,NEW.to_block_number,NEW.to_block_hash,0,0,0,0,0)
+    ON CONFLICT(to_login,to_bch_name,to_block_number,to_block_hash) DO NOTHING;
+
+    SELECT last_sub_type INTO previous_sub_type FROM reactions_state WHERE from_login=NEW.login AND from_bch_name=NEW.bch_name AND reaction_type=1
+        AND to_login=NEW.to_login AND to_bch_name=NEW.to_bch_name AND to_block_number=NEW.to_block_number AND to_block_hash=NEW.to_block_hash LIMIT 1;
+
+    IF NEW.msg_sub_type=1 AND previous_sub_type IS DISTINCT FROM 1 THEN
+        UPDATE message_stats SET likes_count=likes_count+1,
+            primary_likes_count=primary_likes_count + CASE WHEN shine_is_primary(NEW.login) THEN 1 ELSE 0 END,
+            shining_likes_count=shining_likes_count + CASE WHEN shine_is_primary(NEW.login) AND shine_is_shining(NEW.login) THEN 1 ELSE 0 END
+        WHERE to_login=NEW.to_login AND to_bch_name=NEW.to_bch_name AND to_block_number=NEW.to_block_number AND to_block_hash=NEW.to_block_hash;
+    ELSIF NEW.msg_sub_type=2 AND previous_sub_type=1 THEN
+        UPDATE message_stats SET likes_count=GREATEST(0,likes_count-1),
+            primary_likes_count=GREATEST(0,primary_likes_count - CASE WHEN shine_is_primary(NEW.login) THEN 1 ELSE 0 END),
+            shining_likes_count=GREATEST(0,shining_likes_count - CASE WHEN shine_is_primary(NEW.login) AND shine_is_shining(NEW.login) THEN 1 ELSE 0 END)
+        WHERE to_login=NEW.to_login AND to_bch_name=NEW.to_bch_name AND to_block_number=NEW.to_block_number AND to_block_hash=NEW.to_block_hash;
+    END IF;
+
+    INSERT INTO reactions_state(from_login,from_bch_name,reaction_type,to_login,to_bch_name,to_block_number,to_block_hash,last_sub_type)
+    VALUES(NEW.login,NEW.bch_name,1,NEW.to_login,NEW.to_bch_name,NEW.to_block_number,NEW.to_block_hash,NEW.msg_sub_type)
+    ON CONFLICT(from_login,from_bch_name,reaction_type,to_login,to_bch_name,to_block_number,to_block_hash) DO UPDATE SET last_sub_type=EXCLUDED.last_sub_type;
+    RETURN NEW;
+END;
+$$;
+
+-- Initial projection/rebuild.
+DO $$ DECLARE r RECORD; BEGIN
+    FOR r IN SELECT DISTINCT login FROM users_params LOOP PERFORM shine_refresh_user_profile(r.login); END LOOP;
+END $$;
+DO $$ DECLARE r RECORD; BEGIN
+    FOR r IN SELECT login FROM solana_user_pda_current LOOP PERFORM shine_refresh_user_stats(r.login); END LOOP;
+END $$;
+DO $$ DECLARE r RECORD; BEGIN
+    FOR r IN SELECT owner_bch_name, channel_root_block_number, channel_root_block_hash FROM channel_names_state WHERE channel_type_code=1 LOOP
+        PERFORM shine_refresh_channel_follow_stats(r.owner_bch_name, r.channel_root_block_number, r.channel_root_block_hash);
+    END LOOP;
+END $$;
+
+UPDATE message_stats ms SET
+    primary_likes_count=(SELECT COUNT(*)::INT FROM reactions_state rs WHERE rs.reaction_type=1 AND rs.last_sub_type=1
+        AND rs.to_login=ms.to_login AND rs.to_bch_name=ms.to_bch_name AND rs.to_block_number=ms.to_block_number AND rs.to_block_hash=ms.to_block_hash
+        AND shine_is_primary(rs.from_login)),
+    shining_likes_count=(SELECT COUNT(*)::INT FROM reactions_state rs WHERE rs.reaction_type=1 AND rs.last_sub_type=1
+        AND rs.to_login=ms.to_login AND rs.to_bch_name=ms.to_bch_name AND rs.to_block_number=ms.to_block_number AND rs.to_block_hash=ms.to_block_hash
+        AND shine_is_primary(rs.from_login) AND shine_is_shining(rs.from_login));
+
+INSERT INTO db_schema_version(id,schema_version,updated_at_ms)
+VALUES(1,18,CAST(EXTRACT(EPOCH FROM clock_timestamp())*1000 AS BIGINT))
+ON CONFLICT(id) DO UPDATE SET schema_version=EXCLUDED.schema_version, updated_at_ms=EXCLUDED.updated_at_ms;
+
+COMMIT;

SHiNE-server/shine-server-db/src/main/resources/postgres/migration_v19.sql

@@ -0,0 +1,83 @@
+BEGIN;
+
+-- v19: skip user_stats refresh for logins that are absent from solana_user_pda_current.
+-- This keeps bootstrap resilient to legacy rows that are still present in blocks.
+
+CREATE OR REPLACE FUNCTION shine_refresh_user_stats(p_login TEXT)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE
+    v_now BIGINT := CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT);
+BEGIN
+    IF p_login IS NULL OR btrim(p_login) = '' THEN RETURN; END IF;
+    IF NOT EXISTS (
+        SELECT 1
+        FROM solana_user_pda_current
+        WHERE login = p_login
+        LIMIT 1
+    ) THEN
+        RETURN;
+    END IF;
+
+    INSERT INTO user_stats_state(login, owned_public_channels_count, following_users_count,
+        following_channels_count, close_friends_count, friends_count,
+        primary_confirmations_received_count, primary_confirmations_given_count,
+        shine_confirmations_received_count, shine_confirmations_given_count, updated_at_ms)
+    SELECT p_login,
+        (SELECT COUNT(*)::INT FROM channel_names_state cn WHERE LOWER(cn.owner_login)=LOWER(p_login) AND cn.channel_type_code=1),
+        0,
+        (SELECT COUNT(*)::INT FROM connections_state cs JOIN channel_names_state cn
+            ON cn.owner_bch_name=cs.to_bch_name AND cn.channel_root_block_number=cs.to_block_number AND cn.channel_root_block_hash=cs.to_block_hash
+            WHERE LOWER(cs.login)=LOWER(p_login) AND cs.rel_type=30 AND cn.channel_type_code=1),
+        (SELECT COUNT(DISTINCT LOWER(cs.to_login))::INT FROM connections_state cs WHERE LOWER(cs.login)=LOWER(p_login) AND cs.rel_type=10),
+        (SELECT COUNT(DISTINCT LOWER(cs.to_login))::INT FROM connections_state cs
+            WHERE LOWER(cs.login)=LOWER(p_login) AND cs.rel_type=14
+              AND NOT EXISTS (SELECT 1 FROM connections_state cf WHERE LOWER(cf.login)=LOWER(p_login) AND LOWER(cf.to_login)=LOWER(cs.to_login) AND cf.rel_type=10)),
+        (SELECT COUNT(DISTINCT LOWER(cs.login))::INT FROM connections_state cs
+            WHERE LOWER(cs.to_login)=LOWER(p_login) AND cs.rel_type=80
+              AND shine_is_primary(cs.login) AND shine_target_accepts_primary_confirmation(p_login)),
+        (SELECT COUNT(DISTINCT LOWER(cs.to_login))::INT FROM connections_state cs
+            WHERE LOWER(cs.login)=LOWER(p_login) AND cs.rel_type=80
+              AND shine_is_primary(p_login) AND shine_target_accepts_primary_confirmation(cs.to_login)),
+        (SELECT COUNT(DISTINCT LOWER(cs.login))::INT FROM connections_state cs
+            WHERE LOWER(cs.to_login)=LOWER(p_login) AND cs.rel_type=70
+              AND shine_is_primary(cs.login) AND shine_is_shining(cs.login) AND shine_target_accepts_shine_confirmation(p_login)),
+        (SELECT COUNT(DISTINCT LOWER(cs.to_login))::INT FROM connections_state cs
+            WHERE LOWER(cs.login)=LOWER(p_login) AND cs.rel_type=70
+              AND shine_is_primary(p_login) AND shine_is_shining(p_login) AND shine_target_accepts_shine_confirmation(cs.to_login)),
+        v_now
+    ON CONFLICT (login) DO UPDATE SET
+        owned_public_channels_count=EXCLUDED.owned_public_channels_count,
+        following_users_count=0,
+        following_channels_count=EXCLUDED.following_channels_count,
+        close_friends_count=EXCLUDED.close_friends_count,
+        friends_count=EXCLUDED.friends_count,
+        primary_confirmations_received_count=EXCLUDED.primary_confirmations_received_count,
+        primary_confirmations_given_count=EXCLUDED.primary_confirmations_given_count,
+        shine_confirmations_received_count=EXCLUDED.shine_confirmations_received_count,
+        shine_confirmations_given_count=EXCLUDED.shine_confirmations_given_count,
+        updated_at_ms=EXCLUDED.updated_at_ms;
+END;
+$$;
+
+CREATE OR REPLACE FUNCTION shine_refresh_related_user_stats(p_login TEXT)
+RETURNS VOID
+LANGUAGE plpgsql
+AS $$
+DECLARE r RECORD;
+BEGIN
+    PERFORM shine_refresh_user_stats(p_login);
+    FOR r IN
+        SELECT DISTINCT x.login FROM (
+            SELECT cs.login FROM connections_state cs WHERE LOWER(cs.to_login)=LOWER(p_login) AND cs.rel_type IN (70,80)
+            UNION
+            SELECT cs.to_login AS login FROM connections_state cs WHERE LOWER(cs.login)=LOWER(p_login) AND cs.rel_type IN (70,80)
+        ) x
+    LOOP
+        PERFORM shine_refresh_user_stats(r.login);
+    END LOOP;
+END;
+$$;
+
+COMMIT;

SHiNE-server/shine-server-db/src/main/resources/postgres/migration_v2.sql

@@ -53,12 +53,16 @@ BEGIN
         s.updated_at_ms,
         CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT)
     FROM solana_user_pda_current u
-    CROSS JOIN LATERAL jsonb_array_elements_text(
-        CASE
-            WHEN btrim(COALESCE(u.access_servers_json, '')) = '' THEN '[]'::jsonb
-            ELSE u.access_servers_json::jsonb
-        END
-    ) AS access_server(login_value)
+    CROSS JOIN LATERAL (
+        SELECT login_value
+        FROM jsonb_array_elements_text(
+            CASE
+                WHEN btrim(COALESCE(u.access_servers_json, '')) = '' THEN '[]'::jsonb
+                ELSE u.access_servers_json::jsonb
+            END
+        ) WITH ORDINALITY AS access_server(login_value, ord)
+        WHERE ord <= 2
+    ) AS access_server
     JOIN solana_user_pda_current s
       ON LOWER(s.login) = LOWER(btrim(access_server.login_value))
      AND s.is_server = TRUE
@@ -92,12 +96,16 @@ BEGIN
     FOR affected_user IN
         SELECT u.login
         FROM solana_user_pda_current u
-        CROSS JOIN LATERAL jsonb_array_elements_text(
-            CASE
-                WHEN btrim(COALESCE(u.access_servers_json, '')) = '' THEN '[]'::jsonb
-                ELSE u.access_servers_json::jsonb
-            END
-        ) AS access_server(login_value)
+        CROSS JOIN LATERAL (
+            SELECT login_value
+            FROM jsonb_array_elements_text(
+                CASE
+                    WHEN btrim(COALESCE(u.access_servers_json, '')) = '' THEN '[]'::jsonb
+                    ELSE u.access_servers_json::jsonb
+                END
+            ) WITH ORDINALITY AS access_server(login_value, ord)
+            WHERE ord <= 2
+        ) AS access_server
         WHERE LOWER(btrim(access_server.login_value)) = LOWER(p_server_login)
     LOOP
         PERFORM shine_refresh_user_access_servers_for_user(affected_user.login);

SHiNE-server/shine-server-db/src/main/resources/postgres/migration_v20.sql

@@ -0,0 +1,19 @@
+-- Notifications v2: three categories + signed seen watermarks.
+
+ALTER TABLE user_notifications_state
+    DROP CONSTRAINT IF EXISTS user_notifications_state_notification_kind_check;
+ALTER TABLE user_notifications_state
+    ADD CONSTRAINT user_notifications_state_notification_kind_check
+    CHECK (notification_kind IN ('reply', 'connection', 'event'));
+
+CREATE TABLE IF NOT EXISTS user_notification_seen_state (
+    owner_login       VARCHAR(60) NOT NULL,
+    category          TEXT NOT NULL CHECK (category IN ('replies', 'connections', 'events')),
+    seen_at_ms        BIGINT NOT NULL DEFAULT 0,
+    signed_blob       BYTEA NOT NULL,
+    signed_at_ms      BIGINT NOT NULL,
+    updated_at_ms     BIGINT NOT NULL,
+    PRIMARY KEY (owner_login, category)
+);
+
+UPDATE db_schema_version SET schema_version = 20 WHERE id = 1;

SHiNE-server/shine-server-db/src/main/resources/postgres/migration_v21.sql

@@ -0,0 +1,25 @@
+-- Channel unread/read projection.
+-- The row is created only by a signed SetChannelReadState from the client.
+-- New channel publications only increment existing rows.
+
+CREATE TABLE IF NOT EXISTS channel_read_state (
+    viewer_login        TEXT NOT NULL REFERENCES solana_user_pda_current(login),
+    owner_login         TEXT NOT NULL,
+    owner_bch_name      TEXT NOT NULL,
+    channel_name        TEXT NOT NULL,
+    read_count          BIGINT NOT NULL DEFAULT 0 CHECK (read_count >= 0),
+    unread_count        BIGINT NOT NULL DEFAULT 0 CHECK (unread_count >= 0),
+    read_updated_at_ms  BIGINT NOT NULL,
+    client_key          TEXT NOT NULL,
+    read_signature      TEXT NOT NULL,
+    updated_at_ms       BIGINT NOT NULL,
+    PRIMARY KEY (viewer_login, owner_bch_name, channel_name)
+);
+
+CREATE INDEX IF NOT EXISTS idx_channel_read_state_viewer
+    ON channel_read_state(viewer_login);
+
+CREATE INDEX IF NOT EXISTS idx_channel_read_state_channel
+    ON channel_read_state(owner_bch_name, channel_name);
+
+UPDATE db_schema_version SET schema_version = 21 WHERE id = 1;

SHiNE-server/shine-server-db/src/main/resources/postgres/migration_v5.sql

@@ -0,0 +1,83 @@
+BEGIN;
+
+ALTER TABLE solana_user_pda_current
+    ADD COLUMN IF NOT EXISTS normalized_login TEXT;
+
+UPDATE solana_user_pda_current
+SET normalized_login = LOWER(BTRIM(login))
+WHERE normalized_login IS NULL
+   OR normalized_login <> LOWER(BTRIM(login));
+
+ALTER TABLE solana_user_pda_current
+    ALTER COLUMN normalized_login SET NOT NULL;
+
+CREATE UNIQUE INDEX IF NOT EXISTS uq_solana_user_pda_current_normalized_login
+    ON solana_user_pda_current(normalized_login);
+
+CREATE INDEX IF NOT EXISTS idx_user_pda_current_normalized_login
+    ON solana_user_pda_current(normalized_login);
+
+WITH bad_signed_messages AS (
+    SELECT DISTINCT sm.message_key
+    FROM signed_messages sm
+    LEFT JOIN solana_user_pda_current u_from
+      ON u_from.normalized_login = LOWER(BTRIM(sm.from_login))
+    LEFT JOIN solana_user_pda_current u_to
+      ON u_to.normalized_login = LOWER(BTRIM(sm.to_login))
+    WHERE (u_from.login IS NOT NULL AND sm.from_login <> u_from.login)
+       OR (u_to.login IS NOT NULL AND sm.to_login <> u_to.login)
+)
+DELETE FROM signed_message_session_delivery d
+USING bad_signed_messages bad
+WHERE d.message_key = bad.message_key;
+
+WITH bad_signed_messages AS (
+    SELECT DISTINCT sm.message_key
+    FROM signed_messages sm
+    LEFT JOIN solana_user_pda_current u_from
+      ON u_from.normalized_login = LOWER(BTRIM(sm.from_login))
+    LEFT JOIN solana_user_pda_current u_to
+      ON u_to.normalized_login = LOWER(BTRIM(sm.to_login))
+    WHERE (u_from.login IS NOT NULL AND sm.from_login <> u_from.login)
+       OR (u_to.login IS NOT NULL AND sm.to_login <> u_to.login)
+)
+DELETE FROM signed_messages sm
+USING bad_signed_messages bad
+WHERE sm.message_key = bad.message_key;
+
+DELETE FROM signed_direct_messages_history h
+USING solana_user_pda_current u_from,
+      solana_user_pda_current u_to
+WHERE u_from.normalized_login = LOWER(BTRIM(h.from_login))
+  AND u_to.normalized_login = LOWER(BTRIM(h.to_login))
+  AND (h.from_login <> u_from.login OR h.to_login <> u_to.login);
+
+DELETE FROM signed_direct_message_replay r
+USING solana_user_pda_current u_from
+WHERE u_from.normalized_login = LOWER(BTRIM(r.from_login))
+  AND r.from_login <> u_from.login;
+
+DO $$
+BEGIN
+    IF EXISTS (
+        SELECT 1
+        FROM information_schema.tables
+        WHERE table_schema = current_schema()
+          AND table_name = 'direct_messages'
+    ) THEN
+        DELETE FROM direct_messages d
+        USING solana_user_pda_current u_from,
+              solana_user_pda_current u_to
+        WHERE u_from.normalized_login = LOWER(BTRIM(d.from_login))
+          AND u_to.normalized_login = LOWER(BTRIM(d.to_login))
+          AND (d.from_login <> u_from.login OR d.to_login <> u_to.login);
+    END IF;
+END $$;
+
+INSERT INTO db_schema_version (id, schema_version, updated_at_ms)
+VALUES (1, 5, CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT))
+ON CONFLICT (id) DO UPDATE SET
+    schema_version = EXCLUDED.schema_version,
+    updated_at_ms = EXCLUDED.updated_at_ms;
+
+COMMIT;

SHiNE-server/shine-server-db/src/main/resources/postgres/migration_v6.sql

@@ -0,0 +1,21 @@
+BEGIN;
+
+ALTER TABLE signed_messages
+    DROP CONSTRAINT IF EXISTS signed_messages_from_login_fkey;
+
+ALTER TABLE signed_messages
+    DROP CONSTRAINT IF EXISTS signed_messages_to_login_fkey;
+
+ALTER TABLE signed_direct_messages_history
+    DROP CONSTRAINT IF EXISTS signed_direct_messages_history_from_login_fkey;
+
+ALTER TABLE signed_direct_messages_history
+    DROP CONSTRAINT IF EXISTS signed_direct_messages_history_to_login_fkey;
+
+INSERT INTO db_schema_version (id, schema_version, updated_at_ms)
+VALUES (1, 6, CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT))
+ON CONFLICT (id) DO UPDATE SET
+    schema_version = EXCLUDED.schema_version,
+    updated_at_ms = EXCLUDED.updated_at_ms;
+
+COMMIT;

SHiNE-server/shine-server-db/src/main/resources/postgres/migration_v7.sql

@@ -0,0 +1,16 @@
+BEGIN;
+
+ALTER TABLE blocks
+    DROP CONSTRAINT IF EXISTS blocks_login_fkey;
+
+ALTER TABLE blocks
+    ADD CONSTRAINT blocks_login_fkey
+        FOREIGN KEY (login) REFERENCES solana_user_pda_current(normalized_login);
+
+INSERT INTO db_schema_version (id, schema_version, updated_at_ms)
+VALUES (1, 7, CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT))
+ON CONFLICT (id) DO UPDATE SET
+    schema_version = EXCLUDED.schema_version,
+    updated_at_ms = EXCLUDED.updated_at_ms;
+
+COMMIT;

SHiNE-server/shine-server-db/src/main/resources/postgres/migration_v8.sql

@@ -0,0 +1,16 @@
+BEGIN;
+
+ALTER TABLE connections_state
+    DROP CONSTRAINT IF EXISTS connections_state_login_fkey;
+
+ALTER TABLE connections_state
+    ADD CONSTRAINT connections_state_login_fkey
+        FOREIGN KEY (login) REFERENCES solana_user_pda_current(normalized_login);
+
+INSERT INTO db_schema_version (id, schema_version, updated_at_ms)
+VALUES (1, 8, CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT))
+ON CONFLICT (id) DO UPDATE SET
+    schema_version = EXCLUDED.schema_version,
+    updated_at_ms = EXCLUDED.updated_at_ms;
+
+COMMIT;

SHiNE-server/shine-server-db/src/main/resources/postgres/migration_v9.sql

@@ -0,0 +1,47 @@
+BEGIN;
+
+CREATE TABLE IF NOT EXISTS user_settings (
+    login         TEXT NOT NULL REFERENCES solana_user_pda_current(login),
+    setting_type  INTEGER NOT NULL,
+    setting_key   TEXT NOT NULL,
+    time_ms       BIGINT NOT NULL,
+    value_text    TEXT NOT NULL DEFAULT '',
+    value_num     BIGINT NOT NULL DEFAULT 0,
+    client_key    TEXT NOT NULL DEFAULT '',
+    signature     TEXT NOT NULL DEFAULT '',
+    synced        BOOLEAN NOT NULL DEFAULT FALSE,
+    UNIQUE (login, setting_type, setting_key)
+);
+
+CREATE INDEX IF NOT EXISTS idx_user_settings_login
+    ON user_settings(login);
+
+CREATE INDEX IF NOT EXISTS idx_user_settings_synced
+    ON user_settings(login, synced, time_ms);
+
+CREATE INDEX IF NOT EXISTS idx_user_settings_type_key
+    ON user_settings(setting_type, setting_key);
+
+CREATE TABLE IF NOT EXISTS user_settings_sync_peer_state (
+    owner_login              TEXT NOT NULL,
+    remote_server_login      TEXT NOT NULL,
+    remote_server_url        TEXT NOT NULL,
+    cursor_time_ms           BIGINT NOT NULL DEFAULT 0,
+    cursor_setting_key       TEXT NOT NULL DEFAULT '',
+    bootstrap_completed      BOOLEAN NOT NULL DEFAULT FALSE,
+    last_sync_at_ms          BIGINT,
+    last_error               TEXT,
+    updated_at_ms            BIGINT NOT NULL,
+    PRIMARY KEY (owner_login, remote_server_login)
+);
+
+CREATE INDEX IF NOT EXISTS idx_user_settings_sync_peer_state_owner
+    ON user_settings_sync_peer_state(owner_login);
+
+INSERT INTO db_schema_version (id, schema_version, updated_at_ms)
+VALUES (1, 9, CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT))
+ON CONFLICT (id) DO UPDATE SET
+    schema_version = EXCLUDED.schema_version,
+    updated_at_ms = EXCLUDED.updated_at_ms;
+
+COMMIT;

SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/ConnectionContext.java

@@ -4,6 +4,8 @@ import org.eclipse.jetty.websocket.api.Session;
 import shine.db.entities.CurrentUserEntry;
 import shine.db.entities.ActiveSessionEntry;
 
+import java.util.List;
+
 /**
  * ConnectionContext — контекст состояния одного WebSocket-соединения.
  * Живёт ровно столько же, сколько живёт подключение.
@@ -25,6 +27,11 @@ public class ConnectionContext {
     public static final int AUTH_STATUS_AUTH_IN_PROGRESS = 1;  // выполнен challenge (AuthChallenge или SessionChallenge)
     public static final int AUTH_STATUS_USER = 2;              // авторизованный пользователь
 
+    // При успешной авторизации отдельно фиксируем отношение пользователя к этому серверу.
+    public static final int USER_SERVER_SCOPE_NONE = 0;
+    public static final int USER_SERVER_SCOPE_LOCAL = 1;
+    public static final int USER_SERVER_SCOPE_REMOTE = 2;
+
     // Полный пользователь из runtime БД (current users / solana_user_pda_current)
     private CurrentUserEntry currentUserEntry;
 
@@ -71,12 +78,24 @@ public class ConnectionContext {
      */
     private int authenticationStatus = AUTH_STATUS_NONE;
 
+    /**
+     * LOCAL — этот сервер является первым access server пользователя.
+     * REMOTE — пользователь криптографически авторизован, но его access server другой.
+     */
+    private int userServerScope = USER_SERVER_SCOPE_NONE;
+
     /**
      * WebSocket-сессия Jetty для данного подключения.
      * Нужна, чтобы через ConnectionContext можно было отправлять сообщения клиенту.
      */
     private Session wsSession;
 
+    /** Временная server-to-server роль, заявленная через ServerHello. */
+    private boolean serverConnection;
+    private String remoteServerLogin;
+    private int remoteServerProtocolVersion;
+    private List<String> remoteServerCapabilities = List.of();
+
     // --- WebSocket Session ---
 
     public Session getWsSession() {
@@ -87,6 +106,20 @@ public class ConnectionContext {
         this.wsSession = wsSession;
     }
 
+    public boolean isServerConnection() { return serverConnection; }
+    public void setServerConnection(boolean serverConnection) { this.serverConnection = serverConnection; }
+
+    public String getRemoteServerLogin() { return remoteServerLogin; }
+    public void setRemoteServerLogin(String remoteServerLogin) { this.remoteServerLogin = remoteServerLogin; }
+
+    public int getRemoteServerProtocolVersion() { return remoteServerProtocolVersion; }
+    public void setRemoteServerProtocolVersion(int value) { this.remoteServerProtocolVersion = value; }
+
+    public List<String> getRemoteServerCapabilities() { return remoteServerCapabilities; }
+    public void setRemoteServerCapabilities(List<String> capabilities) {
+        this.remoteServerCapabilities = capabilities == null ? List.of() : List.copyOf(capabilities);
+    }
+
     // --- SolanaUser / ActiveSession ---
 
     public CurrentUserEntry getCurrentUser() {
@@ -175,6 +208,28 @@ public class ConnectionContext {
         return authenticationStatus == AUTH_STATUS_NONE;
     }
 
+    public int getUserServerScope() {
+        return userServerScope;
+    }
+
+    public void setUserServerScope(int userServerScope) {
+        this.userServerScope = userServerScope;
+    }
+
+    public boolean isLocalAuthenticatedUser() {
+        return isAuthenticatedUser() && userServerScope == USER_SERVER_SCOPE_LOCAL;
+    }
+
+    public boolean isRemoteAuthenticatedUser() {
+        return isAuthenticatedUser() && userServerScope == USER_SERVER_SCOPE_REMOTE;
+    }
+
+    public String getUserServerScopeName() {
+        return userServerScope == USER_SERVER_SCOPE_LOCAL ? "LOCAL"
+                : userServerScope == USER_SERVER_SCOPE_REMOTE ? "REMOTE"
+                : "NONE";
+    }
+
     public void reset() {
         currentUserEntry = null;
         activeSessionEntry = null;
@@ -187,7 +242,12 @@ public class ConnectionContext {
         sessionLoginNonceExpiresAtMs = 0;
 
         authenticationStatus = AUTH_STATUS_NONE;
+        userServerScope = USER_SERVER_SCOPE_NONE;
         wsSession = null;
+        serverConnection = false;
+        remoteServerLogin = null;
+        remoteServerProtocolVersion = 0;
+        remoteServerCapabilities = List.of();
     }
 
     @Override
@@ -196,6 +256,7 @@ public class ConnectionContext {
                 "login='" + getLogin() + '\'' +
                 ", sessionId=" + sessionId +
                 ", authenticationStatus=" + authenticationStatus +
+                ", userServerScope=" + getUserServerScopeName() +
                 '}';
     }
 }

SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/JsonHandlerRegistry.java

@@ -4,6 +4,7 @@ import server.logic.ws_protocol.JSON.entyties.Net_Request;
 import server.logic.ws_protocol.JSON.handlers.JsonMessageHandler;
 
 import server.logic.ws_protocol.JSON.handlers.auth.Net_AuthChallenge_Handler;
+import server.logic.ws_protocol.JSON.handlers.auth.Net_ResolveLoginForAuth_Handler;
 import server.logic.ws_protocol.JSON.handlers.auth.Net_CloseActiveSession_Handler;
 import server.logic.ws_protocol.JSON.handlers.auth.Net_CreateAuthSession__Handler;
 import server.logic.ws_protocol.JSON.handlers.auth.Net_ListSessions_Handler;
@@ -22,6 +23,7 @@ import server.logic.ws_protocol.JSON.handlers.auth.Net_UpsertEspPairingSettings_
 
 // --- auth entities ---
 import server.logic.ws_protocol.JSON.handlers.auth.entyties.Net_AuthChallenge_Request;
+import server.logic.ws_protocol.JSON.handlers.auth.entyties.Net_ResolveLoginForAuth_Request;
 import server.logic.ws_protocol.JSON.handlers.auth.entyties.Net_CloseActiveSession_Request;
 import server.logic.ws_protocol.JSON.handlers.auth.entyties.Net_CreateAuthSession_Request;
 import server.logic.ws_protocol.JSON.handlers.auth.entyties.Net_ListSessions_Request;
@@ -60,6 +62,12 @@ import server.logic.ws_protocol.JSON.handlers.userParams.Net_UpsertUserParam_Han
 import server.logic.ws_protocol.JSON.handlers.userParams.entyties.Net_GetUserParam_Request;
 import server.logic.ws_protocol.JSON.handlers.userParams.entyties.Net_ListUserParams_Request;
 import server.logic.ws_protocol.JSON.handlers.userParams.entyties.Net_UpsertUserParam_Request;
+import server.logic.ws_protocol.JSON.handlers.userSettings.Net_GetUserSetting_Handler;
+import server.logic.ws_protocol.JSON.handlers.userSettings.Net_ListUserSettings_Handler;
+import server.logic.ws_protocol.JSON.handlers.userSettings.Net_UpsertUserSetting_Handler;
+import server.logic.ws_protocol.JSON.handlers.userSettings.entyties.Net_GetUserSetting_Request;
+import server.logic.ws_protocol.JSON.handlers.userSettings.entyties.Net_ListUserSettings_Request;
+import server.logic.ws_protocol.JSON.handlers.userSettings.entyties.Net_UpsertUserSetting_Request;
 
 // --- NEW: connections friends lists ---
 import server.logic.ws_protocol.JSON.handlers.connections.Net_GetFriendsLists_Handler;
@@ -67,32 +75,46 @@ import server.logic.ws_protocol.JSON.handlers.connections.entyties.Net_GetFriend
 import server.logic.ws_protocol.JSON.handlers.channels.ChannelNamesStateBootstrapper;
 import server.logic.ws_protocol.JSON.handlers.channels.Net_GetChannelMessages_Handler;
 import server.logic.ws_protocol.JSON.handlers.channels.Net_GetMessageThread_Handler;
+import server.logic.ws_protocol.JSON.handlers.channels.Net_GetMessageLikes_Handler;
+import server.logic.ws_protocol.JSON.handlers.channels.Net_GetPersonalDiary_Handler;
 import server.logic.ws_protocol.JSON.handlers.channels.Net_GetGroupDialog_Handler;
 import server.logic.ws_protocol.JSON.handlers.channels.Net_GetChannelsCounters_Handler;
 import server.logic.ws_protocol.JSON.handlers.channels.Net_ListGroupChats200_Handler;
 import server.logic.ws_protocol.JSON.handlers.channels.Net_ListSubscriptionsFeed_Handler;
+import server.logic.ws_protocol.JSON.handlers.channels.Net_GetUserCounters_Handler;
+import server.logic.ws_protocol.JSON.handlers.channels.Net_SetChannelReadState_Handler;
 import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_GetChannelsCounters_Request;
 import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_GetChannelMessages_Request;
 import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_GetGroupDialog_Request;
 import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_GetMessageThread_Request;
+import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_GetMessageLikes_Request;
+import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_GetPersonalDiary_Request;
 import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_ListGroupChats200_Request;
 import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_ListSubscriptionsFeed_Request;
+import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_GetUserCounters_Request;
+import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_SetChannelReadState_Request;
 import server.logic.ws_protocol.JSON.handlers.connections.Net_GetUserConnectionsGraph_Handler;
+import server.logic.ws_protocol.JSON.handlers.profile.Net_ListUserProfileRelations_Handler;
+import server.logic.ws_protocol.JSON.handlers.profile.Net_ListUserProfileChannels_Handler;
+import server.logic.ws_protocol.JSON.handlers.profile.entyties.Net_ListUserProfileRelations_Request;
+import server.logic.ws_protocol.JSON.handlers.profile.entyties.Net_ListUserProfileChannels_Request;
 import server.logic.ws_protocol.JSON.handlers.connections.Net_AddCloseFriend_Handler;
 import server.logic.ws_protocol.JSON.handlers.connections.Net_ListContacts_Handler;
+import server.logic.ws_protocol.JSON.handlers.notifications.Net_GetNotifications_Handler;
+import server.logic.ws_protocol.JSON.handlers.notifications.Net_SetNotificationState_Handler;
 import server.logic.ws_protocol.JSON.handlers.connections.entyties.Net_GetUserConnectionsGraph_Request;
 import server.logic.ws_protocol.JSON.handlers.connections.entyties.Net_AddCloseFriend_Request;
 import server.logic.ws_protocol.JSON.handlers.connections.entyties.Net_ListContacts_Request;
+import server.logic.ws_protocol.JSON.handlers.notifications.entyties.Net_GetNotifications_Request;
+import server.logic.ws_protocol.JSON.handlers.notifications.entyties.Net_SetNotificationState_Request;
 import server.logic.ws_protocol.JSON.messages.Net_AckSessionDelivery_Handler;
 import server.logic.ws_protocol.JSON.messages.Net_CallInviteBroadcast_Handler;
 import server.logic.ws_protocol.JSON.messages.Net_CallSignalToSession_Handler;
 import server.logic.ws_protocol.JSON.messages.Net_DeleteConversation_Handler;
 import server.logic.ws_protocol.JSON.messages.Net_DeleteMessage_Handler;
-import server.logic.ws_protocol.JSON.messages.Net_DmSyncBatch_Handler;
 import server.logic.ws_protocol.JSON.messages.Net_GetDirectMessages_Handler;
 import server.logic.ws_protocol.JSON.messages.Net_SendSignal_Handler;
 import server.logic.ws_protocol.JSON.messages.Net_ReceiveIncomingMessage_Handler;
-import server.logic.ws_protocol.JSON.messages.Net_SendDirectMessage_Handler;
 import server.logic.ws_protocol.JSON.messages.Net_SendMessagePair_Handler;
 import server.logic.ws_protocol.JSON.messages.Net_SendTestWebPush_Handler;
 import server.logic.ws_protocol.JSON.messages.Net_UpsertPushToken_Handler;
@@ -101,11 +123,9 @@ import server.logic.ws_protocol.JSON.messages.entyties.Net_CallInviteBroadcast_R
 import server.logic.ws_protocol.JSON.messages.entyties.Net_CallSignalToSession_Request;
 import server.logic.ws_protocol.JSON.messages.entyties.Net_DeleteConversation_Request;
 import server.logic.ws_protocol.JSON.messages.entyties.Net_DeleteMessage_Request;
-import server.logic.ws_protocol.JSON.messages.entyties.Net_DmSyncBatch_Request;
 import server.logic.ws_protocol.JSON.messages.entyties.Net_GetDirectMessages_Request;
 import server.logic.ws_protocol.JSON.messages.entyties.Net_SendSignal_Request;
 import server.logic.ws_protocol.JSON.messages.entyties.Net_ReceiveIncomingMessage_Request;
-import server.logic.ws_protocol.JSON.messages.entyties.Net_SendDirectMessage_Request;
 import server.logic.ws_protocol.JSON.messages.entyties.Net_SendMessagePair_Request;
 import server.logic.ws_protocol.JSON.messages.entyties.Net_SendTestWebPush_Request;
 import server.logic.ws_protocol.JSON.messages.entyties.Net_UpsertPushToken_Request;
@@ -119,6 +139,7 @@ import server.logic.ws_protocol.JSON.handlers.system.Net_ClientDebugLog_Handler;
 import server.logic.ws_protocol.JSON.handlers.system.Net_ListBlockchainHeads_Handler;
 import server.logic.ws_protocol.JSON.handlers.system.Net_CallDeliveryReport_Handler;
 import server.logic.ws_protocol.JSON.handlers.system.Net_Ping_Handler;
+import server.logic.ws_protocol.JSON.handlers.system.Net_ServerHello_Handler;
 import server.logic.ws_protocol.JSON.handlers.system.entyties.Net_CallDeliveryReport_Request;
 import server.logic.ws_protocol.JSON.handlers.system.entyties.Net_ClientErrorLog_Request;
 import server.logic.ws_protocol.JSON.handlers.system.entyties.Net_ClientDebugLog_Request;
@@ -127,6 +148,7 @@ import server.logic.ws_protocol.JSON.handlers.system.entyties.Net_GetServerInfo_
 import server.logic.ws_protocol.JSON.handlers.system.entyties.Net_GetSyncUserProfile_Request;
 import server.logic.ws_protocol.JSON.handlers.system.entyties.Net_ListBlockchainHeads_Request;
 import server.logic.ws_protocol.JSON.handlers.system.entyties.Net_Ping_Request;
+import server.logic.ws_protocol.JSON.handlers.system.entyties.Net_ServerHello_Request;
 
 import java.util.Map;
 
@@ -147,6 +169,7 @@ public final class JsonHandlerRegistry {
             Map.entry("TestUploadFreeAvatar", new Net_TestUploadFreeAvatar_Handler()),
 
             // --- auth ---
+            Map.entry("ResolveLoginForAuth", new Net_ResolveLoginForAuth_Handler()),
             Map.entry("AuthChallenge",      new Net_AuthChallenge_Handler()),
             Map.entry("CreateAuthSession",  new Net_CreateAuthSession__Handler()),
             Map.entry("CloseActiveSession", new Net_CloseActiveSession_Handler()),
@@ -180,27 +203,38 @@ public final class JsonHandlerRegistry {
             Map.entry("GetUserParam",       new Net_GetUserParam_Handler()),
             Map.entry("ListUserParams",     new Net_ListUserParams_Handler()),
 
+            // --- userSettings ---
+            Map.entry("UpsertUserSetting",  new Net_UpsertUserSetting_Handler()),
+            Map.entry("GetUserSetting",     new Net_GetUserSetting_Handler()),
+            Map.entry("ListUserSettings",   new Net_ListUserSettings_Handler()),
+
             // --- connections ---
             Map.entry("GetFriendsLists",    new Net_GetFriendsLists_Handler()),
             Map.entry("ListSubscriptionsFeed", new Net_ListSubscriptionsFeed_Handler()),
             Map.entry("GetChannelMessages", new Net_GetChannelMessages_Handler()),
+            Map.entry("GetPersonalDiary", new Net_GetPersonalDiary_Handler()),
             Map.entry("GetMessageThread", new Net_GetMessageThread_Handler()),
+            Map.entry("GetMessageLikes", new Net_GetMessageLikes_Handler()),
             Map.entry("GetGroupDialog", new Net_GetGroupDialog_Handler()),
             Map.entry("ListGroupChats200", new Net_ListGroupChats200_Handler()),
             Map.entry("GetChannelsCounters", new Net_GetChannelsCounters_Handler()),
+            Map.entry("GetUserCounters", new Net_GetUserCounters_Handler()),
+            Map.entry("SetChannelReadState", new Net_SetChannelReadState_Handler()),
             Map.entry("ListContacts", new Net_ListContacts_Handler()),
             Map.entry("GetUserConnectionsGraph", new Net_GetUserConnectionsGraph_Handler()),
+            Map.entry("ListUserProfileRelations", new Net_ListUserProfileRelations_Handler()),
+            Map.entry("ListUserProfileChannels", new Net_ListUserProfileChannels_Handler()),
             Map.entry("AddCloseFriend", new Net_AddCloseFriend_Handler()),
+            Map.entry("GetNotifications", new Net_GetNotifications_Handler()),
+            Map.entry("SetNotificationState", new Net_SetNotificationState_Handler()),
 
             // --- direct messages / push ---
             Map.entry("UpsertPushToken", new Net_UpsertPushToken_Handler()),
             Map.entry("SendTestWebPush", new Net_SendTestWebPush_Handler()),
             Map.entry("SendMessagePair", new Net_SendMessagePair_Handler()),
-            Map.entry("ReceiveOutcomingMessage", new Net_SendMessagePair_Handler()),
             Map.entry("ReceiveIncomingMessage", new Net_ReceiveIncomingMessage_Handler()),
             Map.entry("DeleteMessage", new Net_DeleteMessage_Handler()),
             Map.entry("DeleteConversation", new Net_DeleteConversation_Handler()),
-            Map.entry("DmSyncBatch", new Net_DmSyncBatch_Handler()),
             Map.entry("GetDirectMessages", new Net_GetDirectMessages_Handler()),
             Map.entry("AckSessionDelivery", new Net_AckSessionDelivery_Handler()),
             Map.entry("CallInviteBroadcast", new Net_CallInviteBroadcast_Handler()),
@@ -208,6 +242,7 @@ public final class JsonHandlerRegistry {
             Map.entry("SendSignal", new Net_SendSignal_Handler()),
 
             // --- system ---
+            Map.entry("ServerHello",        new Net_ServerHello_Handler()),
             Map.entry("Ping",               new Net_Ping_Handler()),
             Map.entry("GetServerInfo",      new Net_GetServerInfo_Handler()),
             Map.entry("ListBlockchainHeads", new Net_ListBlockchainHeads_Handler()),
@@ -228,6 +263,7 @@ public final class JsonHandlerRegistry {
             Map.entry("TestUploadFreeAvatar", Net_TestUploadFreeAvatar_Request.class),
 
             // --- auth ---
+            Map.entry("ResolveLoginForAuth", Net_ResolveLoginForAuth_Request.class),
             Map.entry("AuthChallenge",      Net_AuthChallenge_Request.class),
             Map.entry("CreateAuthSession",  Net_CreateAuthSession_Request.class),
             Map.entry("CloseActiveSession", Net_CloseActiveSession_Request.class),
@@ -261,27 +297,38 @@ public final class JsonHandlerRegistry {
             Map.entry("GetUserParam",       Net_GetUserParam_Request.class),
             Map.entry("ListUserParams",     Net_ListUserParams_Request.class),
 
+            // --- userSettings ---
+            Map.entry("UpsertUserSetting",  Net_UpsertUserSetting_Request.class),
+            Map.entry("GetUserSetting",     Net_GetUserSetting_Request.class),
+            Map.entry("ListUserSettings",   Net_ListUserSettings_Request.class),
+
             // --- connections ---
             Map.entry("GetFriendsLists",    Net_GetFriendsLists_Request.class),
             Map.entry("ListSubscriptionsFeed", Net_ListSubscriptionsFeed_Request.class),
             Map.entry("GetChannelMessages", Net_GetChannelMessages_Request.class),
+            Map.entry("GetPersonalDiary", Net_GetPersonalDiary_Request.class),
             Map.entry("GetMessageThread", Net_GetMessageThread_Request.class),
+            Map.entry("GetMessageLikes", Net_GetMessageLikes_Request.class),
             Map.entry("GetGroupDialog", Net_GetGroupDialog_Request.class),
             Map.entry("ListGroupChats200", Net_ListGroupChats200_Request.class),
             Map.entry("GetChannelsCounters", Net_GetChannelsCounters_Request.class),
+            Map.entry("GetUserCounters", Net_GetUserCounters_Request.class),
+            Map.entry("SetChannelReadState", Net_SetChannelReadState_Request.class),
             Map.entry("ListContacts", Net_ListContacts_Request.class),
             Map.entry("GetUserConnectionsGraph", Net_GetUserConnectionsGraph_Request.class),
+            Map.entry("ListUserProfileRelations", Net_ListUserProfileRelations_Request.class),
+            Map.entry("ListUserProfileChannels", Net_ListUserProfileChannels_Request.class),
             Map.entry("AddCloseFriend", Net_AddCloseFriend_Request.class),
+            Map.entry("GetNotifications", Net_GetNotifications_Request.class),
+            Map.entry("SetNotificationState", Net_SetNotificationState_Request.class),
 
             // --- direct messages / push ---
             Map.entry("UpsertPushToken", Net_UpsertPushToken_Request.class),
             Map.entry("SendTestWebPush", Net_SendTestWebPush_Request.class),
             Map.entry("SendMessagePair", Net_SendMessagePair_Request.class),
-            Map.entry("ReceiveOutcomingMessage", Net_SendMessagePair_Request.class),
             Map.entry("ReceiveIncomingMessage", Net_ReceiveIncomingMessage_Request.class),
             Map.entry("DeleteMessage", Net_DeleteMessage_Request.class),
             Map.entry("DeleteConversation", Net_DeleteConversation_Request.class),
-            Map.entry("DmSyncBatch", Net_DmSyncBatch_Request.class),
             Map.entry("GetDirectMessages", Net_GetDirectMessages_Request.class),
             Map.entry("AckSessionDelivery", Net_AckSessionDelivery_Request.class),
             Map.entry("CallInviteBroadcast", Net_CallInviteBroadcast_Request.class),
@@ -289,6 +336,7 @@ public final class JsonHandlerRegistry {
             Map.entry("SendSignal", Net_SendSignal_Request.class),
 
             // --- system ---
+            Map.entry("ServerHello",        Net_ServerHello_Request.class),
             Map.entry("Ping",               Net_Ping_Request.class),
             Map.entry("GetServerInfo",      Net_GetServerInfo_Request.class),
             Map.entry("ListBlockchainHeads", Net_ListBlockchainHeads_Request.class),

SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/JsonInboundProcessor.java

@@ -205,6 +205,22 @@ public final class JsonInboundProcessor {
                         ctxLogin, ctxSessionId, safe(op), safe(requestId), shorten(safeToString(request), 1200));
             }
 
+            // REMOTE-пользователь успешно авторизован, но этот сервер не является
+            // его access server. Такой контекст нужен для realtime/call signaling,
+            // однако обычные homeserver-операции здесь запрещены централизованно.
+            if (ctx != null
+                    && ctx.isRemoteAuthenticatedUser()
+                    && !RemoteUserOperationPolicy.isAllowed(op)) {
+                Net_Exception_Response err = NetExceptionResponseFactory.error(
+                        op,
+                        requestId,
+                        403,
+                        "USER_NOT_LOCAL",
+                        "Пользователь авторизован, но относится к другому access server"
+                );
+                return writeResponse(err);
+            }
+
             // 5) Вызываем хэндлер
             Net_Response response;
             try {

SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/RemoteUserOperationPolicy.java

@@ -0,0 +1,31 @@
+package server.logic.ws_protocol.JSON;
+
+import java.util.Set;
+
+/**
+ * REMOTE-пользователь полностью авторизован криптографически, но этот сервер
+ * не является его access server. Поэтому ему разрешён только минимальный набор
+ * realtime/звонковых операций.
+ */
+public final class RemoteUserOperationPolicy {
+
+    private static final Set<String> ALLOWED = Set.of(
+            "Ping",
+            "GetServerInfo",
+            "GetCallIceConfig",
+            "CallInviteBroadcast",
+            "CallSignalToSession",
+            "SendSignal",
+            "CallDeliveryReport",
+            "ClientErrorLog",
+            "ClientDebugLog",
+            "CloseActiveSession",
+            "ResolveLoginForAuth"
+    );
+
+    private RemoteUserOperationPolicy() {}
+
+    public static boolean isAllowed(String op) {
+        return op != null && ALLOWED.contains(op);
+    }
+}

SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/auth/AuthAccessScopeSupport.java

@@ -0,0 +1,81 @@
+package server.logic.ws_protocol.JSON.handlers.auth;
+
+import server.logic.ws_protocol.JSON.ConnectionContext;
+import shine.db.dao.CurrentUsersDAO;
+import shine.db.dao.UserAccessServersCurrentDAO;
+import shine.db.entities.CurrentUserEntry;
+import shine.db.entities.UserAccessServerRouteEntry;
+import utils.config.AppConfig;
+
+import java.sql.SQLException;
+import java.util.Locale;
+
+/**
+ * Единая серверная логика определения, является ли текущий сервер
+ * домашним access server для пользователя.
+ */
+public final class AuthAccessScopeSupport {
+
+    public static final String RESOLUTION_LOCAL = "LOCAL";
+    public static final String RESOLUTION_REMOTE = "REMOTE";
+    public static final String RESOLUTION_NOT_FOUND = "NOT_FOUND";
+    public static final String RESOLUTION_NO_ACCESS_SERVER = "NO_ACCESS_SERVER";
+
+    private static final String SERVER_LOGIN_CONFIG = "server.SHiNE.login";
+
+    private AuthAccessScopeSupport() {}
+
+    public static Resolution resolveLogin(String login) throws SQLException {
+        String cleanLogin = login == null ? "" : login.trim();
+        if (cleanLogin.isBlank()) {
+            return new Resolution(RESOLUTION_NOT_FOUND, null, null, null);
+        }
+
+        CurrentUserEntry user = CurrentUsersDAO.getInstance().getByLogin(cleanLogin);
+        if (user == null) {
+            return new Resolution(RESOLUTION_NOT_FOUND, null, null, null);
+        }
+
+        UserAccessServerRouteEntry route =
+                UserAccessServersCurrentDAO.getInstance().findPrimaryByUserLogin(user.getLogin());
+        if (route == null) {
+            return new Resolution(RESOLUTION_NO_ACCESS_SERVER, user, null, null);
+        }
+
+        String ownServerLogin = currentServerLogin();
+        String routeServerLogin = normalize(route.getServerLogin());
+        String resolution = ownServerLogin != null && ownServerLogin.equals(routeServerLogin)
+                ? RESOLUTION_LOCAL
+                : RESOLUTION_REMOTE;
+
+        return new Resolution(resolution, user, route, ownServerLogin);
+    }
+
+    public static int connectionScopeForLogin(String login) throws SQLException {
+        Resolution resolution = resolveLogin(login);
+        return RESOLUTION_LOCAL.equals(resolution.resolution())
+                ? ConnectionContext.USER_SERVER_SCOPE_LOCAL
+                : ConnectionContext.USER_SERVER_SCOPE_REMOTE;
+    }
+
+    public static String connectionScopeName(int scope) {
+        return scope == ConnectionContext.USER_SERVER_SCOPE_LOCAL ? "LOCAL" : "REMOTE";
+    }
+
+    public static String currentServerLogin() {
+        return normalize(AppConfig.getInstance().getParam(SERVER_LOGIN_CONFIG));
+    }
+
+    private static String normalize(String value) {
+        if (value == null) return null;
+        String normalized = value.trim().toLowerCase(Locale.ROOT);
+        return normalized.isEmpty() ? null : normalized;
+    }
+
+    public record Resolution(
+            String resolution,
+            CurrentUserEntry user,
+            UserAccessServerRouteEntry primaryAccessServer,
+            String currentServerLogin
+    ) {}
+}

SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/auth/Net_AuthChallenge_Handler.java

@@ -71,6 +71,7 @@ public class Net_AuthChallenge_Handler implements JsonMessageHandler {
         }
 
         ctx.setCurrentUser(solanaUserEntry);
+        ctx.setUserServerScope(AuthAccessScopeSupport.connectionScopeForLogin(solanaUserEntry.getLogin()));
         ctx.setAuthenticationStatus(ConnectionContext.AUTH_STATUS_AUTH_IN_PROGRESS);
 
         byte[] buf = new byte[32];

SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/auth/Net_CreateAuthSession__Handler.java

@@ -414,10 +414,15 @@ public class Net_CreateAuthSession__Handler implements JsonMessageHandler {
             return err;
         }
 
+        // Между AuthChallenge и CreateAuthSession routing мог измениться,
+        // поэтому окончательный LOCAL/REMOTE scope вычисляем повторно.
+        int userServerScope = AuthAccessScopeSupport.connectionScopeForLogin(canonicalLogin);
+
         // --- обновляем контекст ---
         ctx.setActiveSession(activeSessionEntry);
         ctx.setSessionId(sessionId);
         ctx.setAuthNonce(null);
+        ctx.setUserServerScope(userServerScope);
         ctx.setAuthenticationStatus(ConnectionContext.AUTH_STATUS_USER);
 
         ActiveConnectionsRegistry.getInstance().register(ctx);
@@ -428,6 +433,7 @@ public class Net_CreateAuthSession__Handler implements JsonMessageHandler {
         resp.setRequestId(req.getRequestId());
         resp.setStatus(WireCodes.Status.OK);
         resp.setSessionId(sessionId);
+        resp.setConnectionScope(AuthAccessScopeSupport.connectionScopeName(userServerScope));
         return resp;
     }
 

SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/auth/Net_ResolveLoginForAuth_Handler.java

@@ -0,0 +1,45 @@
+package server.logic.ws_protocol.JSON.handlers.auth;
+
+import server.logic.ws_protocol.JSON.ConnectionContext;
+import server.logic.ws_protocol.JSON.entyties.Net_Request;
+import server.logic.ws_protocol.JSON.entyties.Net_Response;
+import server.logic.ws_protocol.JSON.handlers.JsonMessageHandler;
+import server.logic.ws_protocol.JSON.handlers.auth.entyties.Net_ResolveLoginForAuth_Request;
+import server.logic.ws_protocol.JSON.handlers.auth.entyties.Net_ResolveLoginForAuth_Response;
+import server.logic.ws_protocol.JSON.utils.NetExceptionResponseFactory;
+import server.logic.ws_protocol.WireCodes;
+import shine.db.entities.CurrentUserEntry;
+import shine.db.entities.UserAccessServerRouteEntry;
+
+public class Net_ResolveLoginForAuth_Handler implements JsonMessageHandler {
+
+    @Override
+    public Net_Response handle(Net_Request baseReq, ConnectionContext ctx) throws Exception {
+        Net_ResolveLoginForAuth_Request req = (Net_ResolveLoginForAuth_Request) baseReq;
+        String login = req.getLogin() == null ? "" : req.getLogin().trim();
+        if (login.isBlank()) {
+            return NetExceptionResponseFactory.error(
+                    req, WireCodes.Status.BAD_REQUEST, "EMPTY_LOGIN", "Пустой login");
+        }
+
+        AuthAccessScopeSupport.Resolution resolved = AuthAccessScopeSupport.resolveLogin(login);
+
+        Net_ResolveLoginForAuth_Response resp = new Net_ResolveLoginForAuth_Response();
+        resp.setOp(req.getOp());
+        resp.setRequestId(req.getRequestId());
+        resp.setStatus(WireCodes.Status.OK);
+        resp.setResolution(resolved.resolution());
+
+        CurrentUserEntry user = resolved.user();
+        if (user != null) {
+            resp.setLogin(user.getLogin());
+        }
+
+        UserAccessServerRouteEntry route = resolved.primaryAccessServer();
+        if (route != null) {
+            resp.setAccessServerLogin(route.getServerLogin());
+            resp.setAccessServerUrl(route.getServerUrl());
+        }
+        return resp;
+    }
+}

SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/auth/Net_SessionLogin_Handler.java

@@ -292,10 +292,13 @@ public class Net_SessionLogin_Handler implements JsonMessageHandler {
         session.setClientPlatform(clientPlatform);
         session.setUserLanguage(userLanguage);
 
+        int userServerScope = AuthAccessScopeSupport.connectionScopeForLogin(user.getLogin());
+
         // ctx
         ctx.setActiveSession(session);
         ctx.setCurrentUser(user);
         ctx.setSessionId(sessionId);
+        ctx.setUserServerScope(userServerScope);
         ctx.setAuthenticationStatus(ConnectionContext.AUTH_STATUS_USER);
 
         ActiveConnectionsRegistry.getInstance().register(ctx);
@@ -306,6 +309,7 @@ public class Net_SessionLogin_Handler implements JsonMessageHandler {
         resp.setRequestId(req.getRequestId());
         resp.setStatus(WireCodes.Status.OK);
         resp.setStoragePwd(session.getStoragePwd());
+        resp.setConnectionScope(AuthAccessScopeSupport.connectionScopeName(userServerScope));
         return resp;
     }
 

SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/auth/Net_StartEspPairing_Handler.java

@@ -66,6 +66,16 @@ public class Net_StartEspPairing_Handler implements JsonMessageHandler {
         }
         String canonicalLogin = user.getLogin();
 
+        AuthAccessScopeSupport.Resolution authResolution = AuthAccessScopeSupport.resolveLogin(canonicalLogin);
+        if (!AuthAccessScopeSupport.RESOLUTION_LOCAL.equals(authResolution.resolution())) {
+            return NetExceptionResponseFactory.error(
+                    req,
+                    409,
+                    "USER_NOT_LOCAL",
+                    "Вход через доверенное устройство нужно начинать на access server пользователя"
+            );
+        }
+
         EspPairingSettingsEntry settings = EspPairingSettingsDAO.getInstance().getByLogin(canonicalLogin);
         boolean enabled = settings == null || settings.isEnabled();
         if (!enabled) {
@@ -100,14 +110,6 @@ public class Net_StartEspPairing_Handler implements JsonMessageHandler {
         String clientPlatform = AuthSessionTypeSupport.normalizeClientPlatform(req.getRequesterClientPlatform());
         int ttlSeconds = EspPairingSupport.DEFAULT_TTL_SECONDS;
         List<ConnectionContext> approverConnections = EspPairingSupport.findOnlineTrustedConnections(canonicalLogin);
-        if (approverConnections.isEmpty()) {
-            return NetExceptionResponseFactory.error(
-                    req,
-                    422,
-                    "PAIRING_NO_TRUSTED_SESSION_ONLINE",
-                    "Нет ни одной активной доверенной сессии пользователя в сети"
-            );
-        }
         EspPairingSupport.PairingFingerprint fingerprint = EspPairingSupport.deriveFingerprint(
                 canonicalLogin,
                 requesterSessionKey,

SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/auth/SolanaUserPdaImportService.java

@@ -27,6 +27,7 @@ public final class SolanaUserPdaImportService {
     private static final ObjectMapper MAPPER = new ObjectMapper();
     private static final HttpClient HTTP = HttpClient.newHttpClient();
     private static final String MAGIC = "SHiNE";
+    private static final int MAX_EFFECTIVE_ACCESS_SERVERS = 1;
 
     private SolanaUserPdaImportService() {}
 
@@ -87,6 +88,7 @@ public final class SolanaUserPdaImportService {
             String serverAddress = safe(serverProfile.serverAddress());
             if (serverAddress.isBlank()) continue;
             routes.putIfAbsent(normalized, new ParsedServerRoute(normalized, serverAddress));
+            if (routes.size() >= MAX_EFFECTIVE_ACCESS_SERVERS) break;
         }
         return new ArrayList<>(routes.values());
     }
@@ -234,7 +236,13 @@ public final class SolanaUserPdaImportService {
                     int n = u8(raw, c++);
                     String accessServerLogin = new String(raw, c, n, StandardCharsets.UTF_8);
                     c += n;
-                    accessServers.add(normalizeLogin(accessServerLogin));
+                    String normalizedAccessServerLogin = normalizeLogin(accessServerLogin);
+                    if (normalizedAccessServerLogin == null || accessServers.contains(normalizedAccessServerLogin)) {
+                        continue;
+                    }
+                    if (accessServers.size() < MAX_EFFECTIVE_ACCESS_SERVERS) {
+                        accessServers.add(normalizedAccessServerLogin);
+                    }
                 }
             } else if (blockType == 50) {
                 int sessionsMode = u8(raw, c++);

SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/auth/entyties/Net_CreateAuthSession_Response.java

@@ -22,6 +22,7 @@ public class Net_CreateAuthSession_Response extends Net_Response {
 
     /** Идентификатор сессии, base64 от 32 байт. */
     private String sessionId;
+    private String connectionScope;
 
     public String getSessionId() {
         return sessionId;
@@ -30,4 +31,7 @@ public class Net_CreateAuthSession_Response extends Net_Response {
     public void setSessionId(String sessionId) {
         this.sessionId = sessionId;
     }
+
+    public String getConnectionScope() { return connectionScope; }
+    public void setConnectionScope(String connectionScope) { this.connectionScope = connectionScope; }
 }

SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/auth/entyties/Net_ResolveLoginForAuth_Request.java

@@ -0,0 +1,11 @@
+package server.logic.ws_protocol.JSON.handlers.auth.entyties;
+
+import server.logic.ws_protocol.JSON.entyties.Net_Request;
+
+/** Первый шаг UI-входа: определить существование пользователя и его access server. */
+public class Net_ResolveLoginForAuth_Request extends Net_Request {
+    private String login;
+
+    public String getLogin() { return login; }
+    public void setLogin(String login) { this.login = login; }
+}

SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/auth/entyties/Net_ResolveLoginForAuth_Response.java

@@ -0,0 +1,31 @@
+package server.logic.ws_protocol.JSON.handlers.auth.entyties;
+
+import server.logic.ws_protocol.JSON.entyties.Net_Response;
+
+/**
+ * Ответ ResolveLoginForAuth.
+ *
+ * resolution:
+ *  - LOCAL            пользователь существует и относится к этому серверу;
+ *  - REMOTE           пользователь существует, но его первый access server другой;
+ *  - NOT_FOUND        пользователя нет в текущем Solana PDA snapshot;
+ *  - NO_ACCESS_SERVER пользователь существует, но корректный access server не найден.
+ */
+public class Net_ResolveLoginForAuth_Response extends Net_Response {
+    private String resolution;
+    private String login;
+    private String accessServerLogin;
+    private String accessServerUrl;
+
+    public String getResolution() { return resolution; }
+    public void setResolution(String resolution) { this.resolution = resolution; }
+
+    public String getLogin() { return login; }
+    public void setLogin(String login) { this.login = login; }
+
+    public String getAccessServerLogin() { return accessServerLogin; }
+    public void setAccessServerLogin(String accessServerLogin) { this.accessServerLogin = accessServerLogin; }
+
+    public String getAccessServerUrl() { return accessServerUrl; }
+    public void setAccessServerUrl(String accessServerUrl) { this.accessServerUrl = accessServerUrl; }
+}

SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/auth/entyties/Net_SessionLogin_Response.java

@@ -9,6 +9,7 @@ import server.logic.ws_protocol.JSON.entyties.Net_Response;
 public class Net_SessionLogin_Response extends Net_Response {
 
     private String storagePwd;
+    private String connectionScope;
 
     public String getStoragePwd() {
         return storagePwd;
@@ -17,4 +18,7 @@ public class Net_SessionLogin_Response extends Net_Response {
     public void setStoragePwd(String storagePwd) {
         this.storagePwd = storagePwd;
     }
+
+    public String getConnectionScope() { return connectionScope; }
+    public void setConnectionScope(String connectionScope) { this.connectionScope = connectionScope; }
 }

SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/blockchain/Net_AddBlock_Handler.java

@@ -5,7 +5,10 @@ import blockchain.BchCryptoVerifier;
 import blockchain.MsgSubType;
 import blockchain.body.BodyHasLine;
 import blockchain.body.BodyHasTarget;
+import blockchain.body.ConnectionBody;
 import blockchain.body.CreateChannelBody;
+import blockchain.body.StatusActionBody;
+import blockchain.body.TextReplyBody;
 import blockchain.body.TextLineBody;
 import blockchain.body.UserParamBody;
 import org.slf4j.Logger;
@@ -23,20 +26,24 @@ import server.logic.ws_protocol.JSON.handlers.blockchain.entyties.Net_AddBlock_R
 import server.logic.ws_protocol.JSON.handlers.blockchain.entyties.Net_AddBlock_Response;
 import server.logic.ws_protocol.JSON.handlers.channels.ChannelMetaTextParser;
 import server.logic.ws_protocol.JSON.handlers.channels.ChannelNamesStateBootstrapper;
+import server.logic.ws_protocol.JSON.handlers.channels.UserCountersSupport;
 import server.logic.ws_protocol.WireCodes;
 import server.sync.AddBlockSyncService;
 import shine.db.channels.ChannelNameRules;
 import shine.db.dao.BlockchainStateDAO;
 import shine.db.dao.BlocksDAO;
 import shine.db.dao.ChannelNameStateDAO;
+import shine.db.dao.UserNotificationsStateDAO;
 import shine.db.dao.UserParamsDAO;
 import shine.db.entities.BlockchainStateEntry;
 import shine.db.entities.BlockEntry;
 import shine.db.entities.ChannelNameStateEntry;
+import shine.db.entities.UserNotificationEntry;
 import shine.db.entities.UserParamEntry;
 import utils.blockchain.BlockchainNameUtil;
 
 import java.util.Arrays;
+import java.util.List;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -60,7 +67,8 @@ public final class Net_AddBlock_Handler implements JsonMessageHandler {
     private final ChannelNameStateDAO channelNameStateDAO = ChannelNameStateDAO.getInstance();
     private final AddBlockSyncService addBlockSyncService = new AddBlockSyncService();
 
-    private final BlockchainWriter dbWriter = new BlockchainWriter(blocksDAO, stateDAO, userParamsDAO, channelNameStateDAO);
+    private final BlockchainWriter dbWriter = new BlockchainWriter(
+            blocksDAO, stateDAO, userParamsDAO, channelNameStateDAO, UserNotificationsStateDAO.getInstance());
 
     public Net_AddBlock_Handler() {
         ChannelNamesStateBootstrapper.bootstrapOrFailFast();
@@ -167,6 +175,9 @@ public final class Net_AddBlock_Handler implements JsonMessageHandler {
             case "db_error_prev_line_check" -> "Ошибка БД при проверке prevLine";
             case "channel_name_already_exists" -> "Такое название канала уже занято";
             case "repost_disabled" -> "Репосты временно отключены до будущей реализации";
+            case "entrypoint_edit_forbidden" -> "TEXT_ENTRYPOINT нельзя редактировать через TEXT_EDIT_POST";
+            case "status_confirmed_target_must_be_status_action" -> "STATUS_CONFIRMED должен ссылаться на STATUS_ACTION";
+            case "status_action_target_not_allowed" -> "Этот STATUS_ACTION нельзя ставить на выбранный тип материала";
             case "internal_error" -> "Внутренняя ошибка сервера при записи блока";
             case "chain_resync_in_progress" -> "Цепочка сейчас пересинхронизируется";
             default -> "Ошибка: " + code;
@@ -388,6 +399,33 @@ public final class Net_AddBlock_Handler implements JsonMessageHandler {
             channelMetaUpdateEntry.setMetaUpdatedAtMs(block.timestamp * 1000L);
         }
 
+        if ((block.type & 0xFFFF) == 1
+                && (block.subType & 0xFFFF) == (MsgSubType.TEXT_EDIT_POST & 0xFFFF)) {
+            try {
+                String editError = validateEditPostTarget(blockchainName, block);
+                if (editError != null) {
+                    return new AddBlockResult(WireCodes.Status.BAD_REQUEST, editError, serverLastNum, serverLastHashHex);
+                }
+            } catch (Exception e) {
+                log.error("AddBlock: edit_post_target_check_failed (login={}, blockchainName={}, blockNumber={})",
+                        login, blockchainName, block.blockNumber, e);
+                return new AddBlockResult(WireCodes.Status.INTERNAL_ERROR, "internal_error", serverLastNum, serverLastHashHex);
+            }
+        }
+
+        if ((block.type & 0xFFFF) == 5) {
+            try {
+                String statusError = validateStatusActionTarget(block);
+                if (statusError != null) {
+                    return new AddBlockResult(WireCodes.Status.BAD_REQUEST, statusError, serverLastNum, serverLastHashHex);
+                }
+            } catch (Exception e) {
+                log.error("AddBlock: status_action_target_check_failed (login={}, blockchainName={}, blockNumber={})",
+                        login, blockchainName, block.blockNumber, e);
+                return new AddBlockResult(WireCodes.Status.INTERNAL_ERROR, "internal_error", serverLastNum, serverLastHashHex);
+            }
+        }
+
         // 4.2) запрет дырок: blockNumber строго last+1
         int expectedBlockNumber = serverLastNum + 1;
         if (block.blockNumber != expectedBlockNumber) {
@@ -527,6 +565,13 @@ public final class Net_AddBlock_Handler implements JsonMessageHandler {
                 be.setEditedByBlockNumber(be.getToBlockNumber());
             }
 
+            if (block.body instanceof ConnectionBody connectionBody) {
+                String votingError = validateConnectionVotingRights(login, block.subType & 0xFFFF, connectionBody.toLogin());
+                if (votingError != null) {
+                    return new AddBlockResult(WireCodes.Status.BAD_REQUEST, votingError, serverLastNum, serverLastHashHex);
+                }
+            }
+
             UserParamEntry upsertedParam = null;
             if (block.body instanceof UserParamBody upBody) {
                 String effectiveLogin = (st.getLogin() != null && !st.getLogin().isBlank())
@@ -542,7 +587,13 @@ public final class Net_AddBlock_Handler implements JsonMessageHandler {
                 );
             }
 
-            dbWriter.appendBlockAndState(blockchainName, block, st, be, upsertedParam, channelNameStateEntry, channelMetaUpdateEntry);
+            UserNotificationEntry notificationEntry = buildNotificationEntry(block, be);
+            List<String> counterChangedLogins = dbWriter.appendBlockAndState(
+                    blockchainName, block, st, be, upsertedParam, channelNameStateEntry, channelMetaUpdateEntry, notificationEntry);
+
+            for (String changedLogin : counterChangedLogins) {
+                UserCountersSupport.pushChanged(changedLogin);
+            }
 
             if (chat200CreateSeed != null) {
                 upsertChat200StateFromCreate(chat200CreateSeed);
@@ -571,6 +622,31 @@ public final class Net_AddBlock_Handler implements JsonMessageHandler {
     /* ====================== Helpers ====================================== */
     /* ===================================================================== */
 
+    private String validateConnectionVotingRights(String actorLogin, int subType, String targetLogin) {
+        if (subType != (MsgSubType.CONNECTION_OFFICIAL_ACCOUNT_CONFIRMED & 0xFFFF)
+                && subType != (MsgSubType.CONNECTION_SHINE_CONFIRMED & 0xFFFF)) return null;
+        if (targetLogin == null || targetLogin.isBlank()) return "bad_connection_target";
+        String sql = subType == (MsgSubType.CONNECTION_OFFICIAL_ACCOUNT_CONFIRMED & 0xFFFF)
+                ? "SELECT shine_is_primary(?), shine_target_accepts_primary_confirmation(?)"
+                : "SELECT (shine_is_primary(?) AND shine_is_shining(?)), shine_target_accepts_shine_confirmation(?)";
+        try (Connection c = shine.db.DbController.getInstance().getConnection();
+             PreparedStatement ps = c.prepareStatement(sql)) {
+            if (subType == (MsgSubType.CONNECTION_OFFICIAL_ACCOUNT_CONFIRMED & 0xFFFF)) {
+                ps.setString(1, actorLogin); ps.setString(2, targetLogin);
+            } else {
+                ps.setString(1, actorLogin); ps.setString(2, actorLogin); ps.setString(3, targetLogin);
+            }
+            try (ResultSet rs = ps.executeQuery()) {
+                if (!rs.next() || !rs.getBoolean(1)) return subType == 80 ? "primary_vote_not_allowed" : "shine_vote_not_allowed";
+                if (!rs.getBoolean(2)) return subType == 80 ? "target_non_voting" : "target_shine_not_interested";
+            }
+            return null;
+        } catch (Exception e) {
+            log.warn("Connection voting permission check failed actor={} target={} subtype={}", actorLogin, targetLogin, subType, e);
+            return "voting_permission_check_failed";
+        }
+    }
+
     private static byte[] decodeBase64(String b64) {
         if (b64 == null) throw new IllegalArgumentException("blockBytesB64 == null");
         return Base64Ws.decode(b64);
@@ -605,6 +681,63 @@ public final class Net_AddBlock_Handler implements JsonMessageHandler {
         String slug;
     }
 
+    private String validateEditPostTarget(String ownerBch, BchBlockEntry block) throws Exception {
+        if (!(block.body instanceof TextLineBody editBody)) return null;
+        Integer targetBlockNumber = editBody.toBlockGlobalNumber();
+        byte[] targetHash = editBody.toBlockHashBytes();
+        if (targetBlockNumber == null || targetHash == null || targetHash.length != 32) return "bad_block_body";
+
+        BlockEntry target = blocksDAO.getByNumber(ownerBch, targetBlockNumber);
+        if (target == null || target.getBlockHash() == null || !Arrays.equals(target.getBlockHash(), targetHash)) {
+            return null;
+        }
+        if (target.getMsgType() != 1) return null;
+        if (target.getMsgSubType() == (MsgSubType.TEXT_ENTRYPOINT & 0xFFFF)) {
+            return "entrypoint_edit_forbidden";
+        }
+        return null;
+    }
+
+    private String validateStatusActionTarget(BchBlockEntry block) throws Exception {
+        if (!(block.body instanceof StatusActionBody statusBody)) return "bad_block_body";
+        String targetBch = statusBody.toBchName();
+        Integer targetBlockNumber = statusBody.toBlockGlobalNumber();
+        byte[] targetHash = statusBody.toBlockHashBytes();
+        if (targetBch == null || targetBch.isBlank() || targetBlockNumber == null || targetHash == null || targetHash.length != 32) {
+            return "bad_block_body";
+        }
+
+        BlockEntry target = blocksDAO.getByNumber(targetBch, targetBlockNumber);
+        if (target == null || target.getBlockHash() == null || !Arrays.equals(target.getBlockHash(), targetHash)) {
+            return null;
+        }
+        int statusSubType = block.subType & 0xFFFF;
+        if (statusSubType == (MsgSubType.STATUS_CONFIRMED & 0xFFFF)) {
+            if (target.getMsgType() != 5) {
+                return "status_confirmed_target_must_be_status_action";
+            }
+            return null;
+        }
+        if (target.getMsgType() != 1) return "status_action_target_not_allowed";
+
+        int targetSubType = target.getMsgSubType();
+        if (statusSubType == (MsgSubType.STATUS_DONE_ONCE & 0xFFFF)
+                || statusSubType == (MsgSubType.STATUS_LEARNED & 0xFFFF)) {
+            return targetSubType == (MsgSubType.TEXT_EXERCISE & 0xFFFF) ? null : "status_action_target_not_allowed";
+        }
+        if (statusSubType == (MsgSubType.STATUS_SERVICE_PASSED & 0xFFFF)) {
+            return targetSubType == (MsgSubType.TEXT_SERVICE & 0xFFFF) ? null : "status_action_target_not_allowed";
+        }
+        if (statusSubType == (MsgSubType.STATUS_INTERESTED & 0xFFFF)
+                || statusSubType == (MsgSubType.STATUS_STARTED & 0xFFFF)
+                || statusSubType == (MsgSubType.STATUS_IN_STUDY & 0xFFFF)
+                || statusSubType == (MsgSubType.STATUS_ABANDONED & 0xFFFF)
+                || statusSubType == (MsgSubType.STATUS_COMPLETED & 0xFFFF)) {
+            return targetSubType == (MsgSubType.TEXT_COURSE & 0xFFFF) ? null : "status_action_target_not_allowed";
+        }
+        return "status_action_target_not_allowed";
+    }
+
     private ExistingChannelState loadExistingChannelState(String ownerBch, int rootBlockNumber) throws Exception {
         try (Connection c = shine.db.DbController.getInstance().getConnection();
              PreparedStatement ps = c.prepareStatement("""
@@ -767,6 +900,73 @@ public final class Net_AddBlock_Handler implements JsonMessageHandler {
         return b;
     }
 
+    private UserNotificationEntry buildNotificationEntry(BchBlockEntry block, BlockEntry storedEntry) {
+        if (block == null || storedEntry == null) return null;
+        if (storedEntry.getToLogin() == null || storedEntry.getToLogin().isBlank()) return null;
+
+        int msgType = block.type & 0xFFFF;
+        int msgSubType = block.subType & 0xFFFF;
+        long createdAtMs = block.timestamp * 1000L;
+        String ownerLogin = storedEntry.getToLogin();
+        String sourceLogin = storedEntry.getLogin();
+
+        // A user must never receive a notification for replying to their own message/thread.
+        if (ownerLogin.equalsIgnoreCase(sourceLogin)) return null;
+
+        if (msgType == 1
+                && msgSubType == (MsgSubType.TEXT_REPLY & 0xFFFF)
+                && block.body instanceof TextReplyBody replyBody) {
+            UserNotificationEntry entry = baseNotificationEntry(storedEntry, ownerLogin, createdAtMs, msgSubType);
+            entry.setNotificationKind("reply");
+            entry.setSourceText(replyBody.message == null ? "" : replyBody.message);
+            return entry;
+        }
+
+        if (msgType == 3 && block.body instanceof ConnectionBody) {
+            boolean personalConnection = msgSubType == (MsgSubType.CONNECTION_CLOSE_FRIEND & 0xFFFF)
+                    || msgSubType == (MsgSubType.CONNECTION_UNCLOSE_FRIEND & 0xFFFF)
+                    || msgSubType == (MsgSubType.CONNECTION_FRIEND & 0xFFFF)
+                    || msgSubType == (MsgSubType.CONNECTION_UNFRIEND & 0xFFFF)
+                    || msgSubType == (MsgSubType.CONNECTION_SHINE_CONFIRMED & 0xFFFF)
+                    || msgSubType == (MsgSubType.CONNECTION_SHINE_UNCONFIRMED & 0xFFFF)
+                    || msgSubType == (MsgSubType.CONNECTION_OFFICIAL_ACCOUNT_CONFIRMED & 0xFFFF)
+                    || msgSubType == (MsgSubType.CONNECTION_OFFICIAL_ACCOUNT_UNCONFIRMED & 0xFFFF);
+            boolean channelEvent = msgSubType == (MsgSubType.CONNECTION_FOLLOW & 0xFFFF)
+                    || msgSubType == (MsgSubType.CONNECTION_UNFOLLOW & 0xFFFF);
+            if (personalConnection || channelEvent) {
+                UserNotificationEntry entry = baseNotificationEntry(storedEntry, ownerLogin, createdAtMs, msgSubType);
+                entry.setNotificationKind(channelEvent ? "event" : "connection");
+                entry.setSourceText("");
+                return entry;
+            }
+        }
+
+        return null;
+    }
+
+    private UserNotificationEntry baseNotificationEntry(BlockEntry storedEntry,
+                                                        String ownerLogin,
+                                                        long createdAtMs,
+                                                        int msgSubType) {
+        UserNotificationEntry entry = new UserNotificationEntry();
+        entry.setOwnerLogin(ownerLogin);
+        entry.setCreatedAtMs(createdAtMs);
+        entry.setSourceLogin(storedEntry.getLogin());
+        entry.setSourceBchName(blockchainNameFromEntry(storedEntry));
+        entry.setSourceBlockNumber(storedEntry.getBlockNumber());
+        entry.setSourceBlockHash(storedEntry.getBlockHash());
+        entry.setTargetLogin(storedEntry.getToLogin());
+        entry.setTargetBchName(storedEntry.getToBchName());
+        entry.setTargetBlockNumber(storedEntry.getToBlockNumber());
+        entry.setTargetBlockHash(storedEntry.getToBlockHash());
+        entry.setSourceMsgSubType(msgSubType);
+        return entry;
+    }
+
+    private String blockchainNameFromEntry(BlockEntry entry) {
+        return entry == null ? null : entry.getBchName();
+    }
+
     private static String toHex(byte[] bytes) {
         if (bytes == null) return "null";
         char[] HEX = "0123456789abcdef".toCharArray();

SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/blockchain/Net_AddBlock_Handler_utils/BlockchainWriter.java

@@ -4,11 +4,15 @@ import blockchain.BchBlockEntry;
 import shine.db.dao.BlockchainStateDAO;
 import shine.db.dao.BlocksDAO;
 import shine.db.dao.ChannelNameStateDAO;
+import shine.db.dao.ChannelReadStateDAO;
+import shine.db.MsgSubType;
 import shine.db.dao.UserParamsDAO;
+import shine.db.dao.UserNotificationsStateDAO;
 import shine.db.entities.BlockchainStateEntry;
 import shine.db.entities.BlockEntry;
 import shine.db.entities.ChannelNameStateEntry;
 import shine.db.entities.UserParamEntry;
+import shine.db.entities.UserNotificationEntry;
 import utils.files.FileStoreUtil;
 
 import java.io.IOException;
@@ -17,6 +21,8 @@ import java.nio.file.Path;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.HexFormat;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * BlockchainWriter — запись блока в БД и формирование файловой версии цепочки.
@@ -41,25 +47,30 @@ public final class BlockchainWriter {
     private final BlockchainStateDAO stateDAO;
     private final ChannelNameStateDAO channelNameStateDAO;
     private final UserParamsDAO userParamsDAO;
+    private final UserNotificationsStateDAO userNotificationsStateDAO;
+    private final ChannelReadStateDAO channelReadStateDAO = ChannelReadStateDAO.getInstance();
     private final FileStoreUtil fs = FileStoreUtil.getInstance();
 
     public BlockchainWriter(BlocksDAO blocksDAO,
                             BlockchainStateDAO stateDAO,
                             UserParamsDAO userParamsDAO,
-                            ChannelNameStateDAO channelNameStateDAO) {
+                            ChannelNameStateDAO channelNameStateDAO,
+                            UserNotificationsStateDAO userNotificationsStateDAO) {
         this.blocksDAO = blocksDAO;
         this.stateDAO = stateDAO;
         this.userParamsDAO = userParamsDAO;
         this.channelNameStateDAO = channelNameStateDAO;
+        this.userNotificationsStateDAO = userNotificationsStateDAO;
     }
 
-    public void appendBlockAndState(String blockchainName,
+    public List<String> appendBlockAndState(String blockchainName,
                                     BchBlockEntry block,
                                     BlockchainStateEntry st,
                                     BlockEntry be,
                                     UserParamEntry userParamEntry,
                                     ChannelNameStateEntry channelNameStateEntry,
-                                    ChannelNameStateEntry channelMetaUpdateEntry) throws SQLException {
+                                    ChannelNameStateEntry channelMetaUpdateEntry,
+                                    UserNotificationEntry notificationEntry) throws SQLException {
 
         long nowMs = System.currentTimeMillis();
         byte[] blockBytes = block.toBytes();
@@ -69,6 +80,7 @@ public final class BlockchainWriter {
         prepareWriteArtifacts(blockchainName, block.blockNumber, blockHashHex, candidateBytes);
 
         boolean committed = false;
+        List<String> counterChangedLogins = new ArrayList<>();
         try (Connection c = shine.db.DbController.getInstance().getConnection()) {
             c.setAutoCommit(false);
             try {
@@ -96,6 +108,35 @@ public final class BlockchainWriter {
                     channelNameStateDAO.updateMeta(c, channelMetaUpdateEntry);
                 }
 
+                // Notification projection is part of the same SQL transaction as the block.
+                // If notification indexing fails, the block/state write is rolled back as well.
+                if (notificationEntry != null) {
+                    userNotificationsStateDAO.upsert(c, notificationEntry);
+                }
+
+                // Channel read/unread projection is updated in the same SQL transaction as the block.
+                int msgType = block.type & 0xFFFF;
+                int msgSubType = block.subType & 0xFFFF;
+                Integer lineCode = be.getLineCode();
+                if (isPublicChannelPublication(msgType, msgSubType) && lineCode != null && lineCode > 0) {
+                    String channelName = channelReadStateDAO.resolvePublicChannelNameByRoot(c, blockchainName, lineCode);
+                    if (channelName != null && !channelName.isBlank()) {
+                        counterChangedLogins.addAll(channelReadStateDAO.incrementUnreadForSubscribers(
+                                c, blockchainName, channelName, MsgSubType.CONNECTION_FOLLOW, nowMs));
+                    }
+                }
+
+                // Explicit UNFOLLOW removes the projection row. FOLLOW never creates it.
+                if (msgType == 3
+                        && msgSubType == (MsgSubType.CONNECTION_UNFOLLOW & 0xFFFF)
+                        && be.getToBchName() != null && !be.getToBchName().isBlank()
+                        && be.getToBlockNumber() != null && be.getToBlockNumber() > 0) {
+                    if (channelReadStateDAO.deleteForUnfollowTarget(
+                            c, be.getLogin(), be.getToBchName(), be.getToBlockNumber())) {
+                        counterChangedLogins.add(be.getLogin());
+                    }
+                }
+
                 c.commit();
                 committed = true;
             } catch (Exception e) {
@@ -130,6 +171,17 @@ public final class BlockchainWriter {
 
         // 4) После успешной подмены — чистим временные артефакты.
         cleanupWriteArtifactsBestEffort(blockchainName);
+        return counterChangedLogins;
+    }
+
+    private static boolean isPublicChannelPublication(int msgType, int msgSubType) {
+        if (msgType != 1) return false;
+        return msgSubType == (MsgSubType.TEXT_POST & 0xFFFF)
+                || msgSubType == (MsgSubType.TEXT_REPOST & 0xFFFF)
+                || msgSubType == (MsgSubType.TEXT_ENTRYPOINT & 0xFFFF)
+                || msgSubType == (MsgSubType.TEXT_EXERCISE & 0xFFFF)
+                || msgSubType == (MsgSubType.TEXT_SERVICE & 0xFFFF)
+                || msgSubType == (MsgSubType.TEXT_COURSE & 0xFFFF);
     }
 
     private byte[] buildCandidateBlockchainBytes(String blockchainName, byte[] blockBytes) {

SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/ChannelMetaTextParser.java

@@ -6,6 +6,8 @@ import java.util.Map;
 public final class ChannelMetaTextParser {
     public static final int MAX_TITLE_CHARS = 50;
     public static final int MAX_DESCRIPTION_CHARS = 250;
+    private static final String LEGACY_PREFIX = "<SHiNE:";
+    private static final String SHORT_PREFIX = "<S:";
 
     private ChannelMetaTextParser() {}
 
@@ -19,15 +21,16 @@ public final class ChannelMetaTextParser {
         boolean seenAvatar = false;
 
         int offset = 0;
-        while (text.startsWith("<SHiNE:", offset)) {
+        while (startsWithTagPrefix(text, offset)) {
             int end = text.indexOf('>', offset);
             if (end < 0) throw new IllegalArgumentException("bad_channel_meta_tag");
-            String body = text.substring(offset + "<SHiNE:".length(), end);
+            int prefixLength = tagPrefixLength(text, offset);
+            String body = text.substring(offset + prefixLength, end);
             if (body.startsWith("title;")) {
                 if (seenTitle) throw new IllegalArgumentException("duplicate_channel_meta_title");
                 seenTitle = true;
                 title = parseTitleTag(body);
-            } else if (body.startsWith("avatar;")) {
+            } else if (body.startsWith("avatar;") || body.startsWith("ava;")) {
                 if (seenAvatar) throw new IllegalArgumentException("duplicate_channel_meta_avatar");
                 seenAvatar = true;
                 Avatar avatar = parseAvatarTag(body);
@@ -61,11 +64,14 @@ public final class ChannelMetaTextParser {
     }
 
     private static Avatar parseAvatarTag(String body) {
-        Map<String, String> fields = parseFields(body.substring("avatar;".length()));
+        String rawFields = body.startsWith("ava;")
+                ? body.substring("ava;".length())
+                : body.substring("avatar;".length());
+        Map<String, String> fields = parseFields(rawFields);
         if (!"1".equals(fields.get("v"))) throw new IllegalArgumentException("bad_channel_meta_avatar_version");
         String ar = String.valueOf(fields.getOrDefault("ar", "")).trim();
         String sha256 = String.valueOf(fields.getOrDefault("sha256", "")).trim().toLowerCase();
-        String sizeRaw = String.valueOf(fields.getOrDefault("size", "")).trim();
+        String sizeRaw = String.valueOf(fields.containsKey("sz") ? fields.get("sz") : fields.getOrDefault("size", "")).trim();
         if (!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");
         long size;
@@ -78,6 +84,16 @@ public final class ChannelMetaTextParser {
         return new Avatar(ar, sha256, size);
     }
 
+    private static boolean startsWithTagPrefix(String text, int offset) {
+        return text.startsWith(LEGACY_PREFIX, offset) || text.startsWith(SHORT_PREFIX, offset);
+    }
+
+    private static int tagPrefixLength(String text, int offset) {
+        if (text.startsWith(LEGACY_PREFIX, offset)) return LEGACY_PREFIX.length();
+        if (text.startsWith(SHORT_PREFIX, offset)) return SHORT_PREFIX.length();
+        return 0;
+    }
+
     private static Map<String, String> parseFields(String raw) {
         Map<String, String> out = new HashMap<>();
         for (String part : String.valueOf(raw == null ? "" : raw).split(";")) {

SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/ChannelNamesStateBootstrapper.java

@@ -138,6 +138,17 @@ public final class ChannelNamesStateBootstrapper {
                 dao.insertAll(c, entries);
 
                 applyMetaUpdates(c, dao, entries, skipped);
+                // v18: counters are a projection, so rebuild them from current state after a full channel-name bootstrap.
+                try (PreparedStatement ps = c.prepareStatement("SELECT shine_refresh_user_stats(login) FROM solana_user_pda_current")) {
+                    ps.execute();
+                }
+                try (PreparedStatement ps = c.prepareStatement("""
+                        SELECT shine_refresh_channel_follow_stats(owner_bch_name, channel_root_block_number, channel_root_block_hash)
+                        FROM channel_names_state
+                        WHERE channel_type_code = 1
+                        """)) {
+                    ps.execute();
+                }
                 c.commit();
                 log.info("channel_names_state bootstrapped: {}", entries.size());
                 if (!conflicts.isEmpty()) {

SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/ChannelsReadSupport.java

@@ -22,6 +22,7 @@ final class ChannelsReadSupport {
     static final int MSG_TYPE_TEXT = 1;
     static final int MSG_TYPE_REACTION = 2;
     static final int MSG_TYPE_TECH = 0;
+    static final int MSG_TYPE_STATUS_ACTION = 5;
     static final String STORIES_CHANNEL_NAME = "stories";
     static final String COMMAND_ADD = "add";
     static final String COMMAND_REMOVE = "remove";
@@ -126,24 +127,36 @@ final class ChannelsReadSupport {
     }
 
     static int countPosts(Connection c, String ownerBch, int lineCode) throws SQLException {
-        String sql = "SELECT COUNT(*) AS cnt FROM blocks WHERE bch_name=? AND msg_type=? AND msg_sub_type IN (?, ?) AND line_code=?";
+        String sql = "SELECT COUNT(*) AS cnt FROM blocks WHERE bch_name=? AND msg_type=? AND msg_sub_type IN (?, ?, ?, ?, ?, ?) AND line_code=?";
         try (PreparedStatement ps = c.prepareStatement(sql)) {
             ps.setString(1, ownerBch);
             ps.setInt(2, MSG_TYPE_TEXT);
             ps.setInt(3, MsgSubType.TEXT_POST);
             ps.setInt(4, MsgSubType.TEXT_REPOST);
-            ps.setInt(5, lineCode);
+            ps.setInt(5, MsgSubType.TEXT_ENTRYPOINT);
+            ps.setInt(6, MsgSubType.TEXT_EXERCISE);
+            ps.setInt(7, MsgSubType.TEXT_SERVICE);
+            ps.setInt(8, MsgSubType.TEXT_COURSE);
+            ps.setInt(9, lineCode);
             try (ResultSet rs = ps.executeQuery()) {
                 return rs.next() ? rs.getInt("cnt") : 0;
             }
         }
     }
 
+    static int countUnreadMessages(Connection c, String viewerLogin, String ownerBch, String channelName, int messagesCount) throws SQLException {
+        if (viewerLogin == null || viewerLogin.isBlank() || ownerBch == null || ownerBch.isBlank()
+                || channelName == null || channelName.isBlank()) return 0;
+        long unread = shine.db.dao.ChannelReadStateDAO.getInstance()
+                .getUnreadCount(c, viewerLogin, ownerBch, channelName);
+        return unread > Integer.MAX_VALUE ? Integer.MAX_VALUE : (int) Math.max(0L, unread);
+    }
+
     static PostBlock loadLastPost(Connection c, String ownerBch, int lineCode) throws SQLException {
         String sql = """
             SELECT login,bch_name,block_number,block_hash,block_bytes,this_line_number
             FROM blocks
-            WHERE bch_name=? AND msg_type=? AND msg_sub_type IN (?, ?) AND line_code=?
+            WHERE bch_name=? AND msg_type=? AND msg_sub_type IN (?, ?, ?, ?, ?, ?) AND line_code=?
             ORDER BY block_number DESC
             LIMIT 1
             """;
@@ -152,7 +165,11 @@ final class ChannelsReadSupport {
             ps.setInt(2, MSG_TYPE_TEXT);
             ps.setInt(3, MsgSubType.TEXT_POST);
             ps.setInt(4, MsgSubType.TEXT_REPOST);
-            ps.setInt(5, lineCode);
+            ps.setInt(5, MsgSubType.TEXT_ENTRYPOINT);
+            ps.setInt(6, MsgSubType.TEXT_EXERCISE);
+            ps.setInt(7, MsgSubType.TEXT_SERVICE);
+            ps.setInt(8, MsgSubType.TEXT_COURSE);
+            ps.setInt(9, lineCode);
             try (ResultSet rs = ps.executeQuery()) {
                 if (!rs.next()) return null;
                 PostBlock pb = new PostBlock();
@@ -204,6 +221,10 @@ final class ChannelsReadSupport {
                 ti.text = tlb.message;
             } else if (e.body instanceof TextReplyBody trb) {
                 ti.text = trb.message;
+            } else if (e.body instanceof blockchain.body.TextRatingBody trb) {
+                ti.text = trb.message;
+            } else if (e.body instanceof blockchain.body.StatusActionBody sab) {
+                ti.text = sab.message;
             } else if (e.body instanceof TextBody tb) {
                 ti.text = tb.message;
             }
@@ -215,19 +236,24 @@ final class ChannelsReadSupport {
 
     static List<PostBlock> channelPosts(Connection c, String ownerBch, int lineCode, int limit, boolean asc) throws SQLException {
         String order = asc ? "ASC" : "DESC";
+        boolean bounded = limit > 0;
         String sql = """
             SELECT login,bch_name,block_number,block_hash,block_bytes,to_bch_name,to_block_number,to_block_hash,msg_sub_type,this_line_number
             FROM blocks
-            WHERE bch_name=? AND msg_type=? AND msg_sub_type IN (?, ?) AND line_code=?
+            WHERE bch_name=? AND msg_type=? AND msg_sub_type IN (?, ?, ?, ?, ?, ?) AND line_code=?
             ORDER BY block_number
-            """ + order + " LIMIT ?";
+            """ + order + (bounded ? " LIMIT ?" : "");
         try (PreparedStatement ps = c.prepareStatement(sql)) {
             ps.setString(1, ownerBch);
             ps.setInt(2, MSG_TYPE_TEXT);
             ps.setInt(3, MsgSubType.TEXT_POST);
             ps.setInt(4, MsgSubType.TEXT_REPOST);
-            ps.setInt(5, lineCode);
-            ps.setInt(6, limit);
+            ps.setInt(5, MsgSubType.TEXT_ENTRYPOINT);
+            ps.setInt(6, MsgSubType.TEXT_EXERCISE);
+            ps.setInt(7, MsgSubType.TEXT_SERVICE);
+            ps.setInt(8, MsgSubType.TEXT_COURSE);
+            ps.setInt(9, lineCode);
+            if (bounded) ps.setInt(10, limit);
             try (ResultSet rs = ps.executeQuery()) {
                 List<PostBlock> out = new ArrayList<>();
                 while (rs.next()) {
@@ -291,16 +317,47 @@ final class ChannelsReadSupport {
     }
 
     static int[] loadStats(Connection c, String bch, int blockNumber, byte[] blockHash) throws SQLException {
-        String sql = "SELECT likes_count,replies_count FROM message_stats WHERE to_bch_name=? AND to_block_number=? AND to_block_hash=? LIMIT 1";
+        String sql = "SELECT likes_count,primary_likes_count,shining_likes_count,replies_count FROM message_stats WHERE to_bch_name=? AND to_block_number=? AND to_block_hash=? LIMIT 1";
+        int likesCount = 0;
+        int primaryLikesCount = 0;
+        int shiningLikesCount = 0;
+        int repliesCount = 0;
         try (PreparedStatement ps = c.prepareStatement(sql)) {
             ps.setString(1, bch);
             ps.setInt(2, blockNumber);
             ps.setBytes(3, blockHash);
             try (ResultSet rs = ps.executeQuery()) {
-                if (!rs.next()) return new int[] {0, 0};
-                return new int[] {rs.getInt("likes_count"), rs.getInt("replies_count")};
+                if (rs.next()) {
+                    likesCount = rs.getInt("likes_count");
+                    primaryLikesCount = rs.getInt("primary_likes_count");
+                    shiningLikesCount = rs.getInt("shining_likes_count");
+                    repliesCount = rs.getInt("replies_count");
+                }
             }
         }
+        String ratingsSql = """
+            SELECT COUNT(*)
+            FROM blocks
+            WHERE msg_type = ?
+              AND msg_sub_type = ?
+              AND to_bch_name = ?
+              AND to_block_number = ?
+              AND to_block_hash = ?
+            """;
+        int ratingsCount = 0;
+        try (PreparedStatement ps = c.prepareStatement(ratingsSql)) {
+            ps.setInt(1, MSG_TYPE_TEXT);
+            ps.setInt(2, MsgSubType.TEXT_RATING);
+            ps.setString(3, bch);
+            ps.setInt(4, blockNumber);
+            ps.setBytes(5, blockHash);
+            try (ResultSet rs = ps.executeQuery()) {
+                if (rs.next()) {
+                    ratingsCount = rs.getInt(1);
+                }
+            }
+        }
+        return new int[] {likesCount, repliesCount, ratingsCount, primaryLikesCount, shiningLikesCount};
     }
 
     static String detectChannelDescription(Connection c, String ownerBch, int rootNumber) throws SQLException {
@@ -589,6 +646,22 @@ final class ChannelsReadSupport {
         return sb.toString();
     }
 
+    static boolean isChannelFeedSubType(int subType) {
+        return subType == MsgSubType.TEXT_POST
+                || subType == MsgSubType.TEXT_REPOST
+                || subType == MsgSubType.TEXT_ENTRYPOINT
+                || subType == MsgSubType.TEXT_EXERCISE
+                || subType == MsgSubType.TEXT_SERVICE
+                || subType == MsgSubType.TEXT_COURSE;
+    }
+
+    static boolean supportsEditPostVersions(int subType) {
+        return subType == MsgSubType.TEXT_POST
+                || subType == MsgSubType.TEXT_EXERCISE
+                || subType == MsgSubType.TEXT_SERVICE
+                || subType == MsgSubType.TEXT_COURSE;
+    }
+
     static final class PostBlock {
         String login;
         String bchName;

SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/Net_GetChannelMessages_Handler.java

@@ -16,6 +16,8 @@ import utils.blockchain.BlockchainNameUtil;
 import blockchain.body.CreateChannelBody;
 
 import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -32,9 +34,11 @@ public class Net_GetChannelMessages_Handler implements JsonMessageHandler {
             return NetExceptionResponseFactory.error(req, WireCodes.Status.BAD_REQUEST, "bad_fields", "Некорректные поля channel");
         }
 
-        int limit = req.getLimit() == null ? 30 : req.getLimit();
-        if (limit <= 0 || limit > 1000) {
-            return NetExceptionResponseFactory.error(req, WireCodes.Status.BAD_REQUEST, "limit_too_large", "Некорректный limit");
+        // limit is optional. null/0 means "return the whole channel".
+        // Positive values are kept for backwards-compatible callers that still want a bounded response.
+        int limit = req.getLimit() == null ? 0 : req.getLimit();
+        if (limit < 0) {
+            return NetExceptionResponseFactory.error(req, WireCodes.Status.BAD_REQUEST, "bad_limit", "Некорректный limit");
         }
 
         boolean asc = req.getSort() == null || !"desc".equalsIgnoreCase(req.getSort());
@@ -65,6 +69,7 @@ public class Net_GetChannelMessages_Handler implements JsonMessageHandler {
             channel.setMetaUpdatedAtMs(meta.metaUpdatedAtMs);
             channel.setChannelTypeCode(meta.channelTypeCode);
             channel.setChannelTypeVersion(meta.channelTypeVersion);
+            channel.setSubscribersCount(loadSubscribersCount(c, ownerBch, lineCode, meta.channelTypeCode));
             Net_GetChannelMessages_Response.BlockRef rootRef = new Net_GetChannelMessages_Response.BlockRef();
             rootRef.setBlockNumber(lineCode);
             rootRef.setBlockHash(req.getChannel().getChannelRootBlockHash());
@@ -110,7 +115,7 @@ public class Net_GetChannelMessages_Handler implements JsonMessageHandler {
                     if (!asc) {
                         java.util.Collections.reverse(posts);
                     }
-                    if (posts.size() > limit) {
+                    if (limit > 0 && posts.size() > limit) {
                         posts = new ArrayList<>(posts.subList(0, limit));
                     }
                 }
@@ -143,7 +148,7 @@ public class Net_GetChannelMessages_Handler implements JsonMessageHandler {
                 v1.setCreatedAtMs(postText.createdAtMs);
                 versionsOut.add(v1);
 
-                if (post.msgSubType == MsgSubType.TEXT_POST) {
+                if (ChannelsReadSupport.supportsEditPostVersions(post.msgSubType)) {
                     List<ChannelsReadSupport.PostBlock> edits = ChannelsReadSupport.versionsForPost(c, post.bchName, post.blockNumber, post.blockHash);
                     for (ChannelsReadSupport.PostBlock edit : edits) {
                         ChannelsReadSupport.TextInfo editText = ChannelsReadSupport.parseTextAndTime(edit.blockBytes);
@@ -166,7 +171,10 @@ public class Net_GetChannelMessages_Handler implements JsonMessageHandler {
 
                 int[] stats = ChannelsReadSupport.loadStats(c, ownerBch, post.blockNumber, post.blockHash);
                 item.setLikesCount(stats[0]);
+                item.setPrimaryLikesCount(stats[3]);
+                item.setShiningLikesCount(stats[4]);
                 item.setRepliesCount(stats[1]);
+                item.setRatingsCount(stats[2]);
                 item.setLikedByMe(ChannelsReadSupport.isLikedByLogin(c, viewerLogin, post.bchName, post.blockNumber, post.blockHash));
 
                 items.add(item);
@@ -179,4 +187,28 @@ public class Net_GetChannelMessages_Handler implements JsonMessageHandler {
             return NetExceptionResponseFactory.error(req, WireCodes.Status.INTERNAL_ERROR, "internal_error", "Внутренняя ошибка сервера");
         }
     }
+
+    private static int loadSubscribersCount(Connection c, String ownerBch, int rootNumber, int channelTypeCode) {
+        if (channelTypeCode != (CreateChannelBody.CHANNEL_TYPE_PUBLIC & 0xFFFF)) {
+            return 0;
+        }
+        String sql = """
+            SELECT subscribers_count
+            FROM channel_stats_state
+            WHERE owner_bch_name = ?
+              AND channel_root_block_number = ?
+            LIMIT 1
+            """;
+        try (PreparedStatement ps = c.prepareStatement(sql)) {
+            ps.setString(1, ownerBch);
+            ps.setInt(2, rootNumber);
+            try (ResultSet rs = ps.executeQuery()) {
+                if (!rs.next()) return 0;
+                return Math.max(0, rs.getInt("subscribers_count"));
+            }
+        } catch (Exception e) {
+            log.warn("GetChannelMessages: не удалось загрузить subscribers_count для {}#{}", ownerBch, rootNumber, e);
+            return 0;
+        }
+    }
 }

SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/Net_GetMessageLikes_Handler.java

@@ -0,0 +1,101 @@
+package server.logic.ws_protocol.JSON.handlers.channels;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import server.logic.ws_protocol.JSON.ConnectionContext;
+import server.logic.ws_protocol.JSON.entyties.Net_Request;
+import server.logic.ws_protocol.JSON.entyties.Net_Response;
+import server.logic.ws_protocol.JSON.handlers.JsonMessageHandler;
+import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_GetMessageLikes_Request;
+import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_GetMessageLikes_Response;
+import server.logic.ws_protocol.JSON.utils.NetExceptionResponseFactory;
+import server.logic.ws_protocol.WireCodes;
+import shine.db.DbController;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.ArrayList;
+import java.util.List;
+
+public class Net_GetMessageLikes_Handler implements JsonMessageHandler {
+    private static final Logger log = LoggerFactory.getLogger(Net_GetMessageLikes_Handler.class);
+
+    @Override
+    public Net_Response handle(Net_Request baseRequest, ConnectionContext ctx) {
+        Net_GetMessageLikes_Request req = (Net_GetMessageLikes_Request) baseRequest;
+        Net_GetMessageLikes_Request.MessageSelector message = req.getMessage();
+        if (message == null || message.getBlockchainName() == null || message.getBlockchainName().isBlank()
+                || message.getBlockNumber() == null || message.getBlockNumber() < 0
+                || message.getBlockHash() == null || message.getBlockHash().isBlank()) {
+            return NetExceptionResponseFactory.error(req, WireCodes.Status.BAD_REQUEST, "bad_fields", "Некорректные поля message");
+        }
+
+        final byte[] blockHash;
+        try {
+            blockHash = ChannelsReadSupport.hexToBytes(message.getBlockHash());
+        } catch (Exception e) {
+            return NetExceptionResponseFactory.error(req, WireCodes.Status.BAD_REQUEST, "bad_hash", "Некорректный blockHash");
+        }
+        if (blockHash == null || blockHash.length == 0) {
+            return NetExceptionResponseFactory.error(req, WireCodes.Status.BAD_REQUEST, "bad_hash", "Некорректный blockHash");
+        }
+
+        try (Connection c = DbController.getInstance().getConnection()) {
+            String sql = """
+                SELECT rs.from_login,
+                       COALESCE(ups.first_name, '') AS first_name,
+                       COALESCE(ups.last_name, '') AS last_name,
+                       COALESCE(ups.ava_ar, '') AS avatar_ar,
+                       COALESCE(ups.account_role, 'unknown') AS account_role,
+                       COALESCE(ups.shine_status, 'unknown') AS shine_status
+                FROM reactions_state rs
+                LEFT JOIN user_profile_state ups ON LOWER(ups.login) = LOWER(rs.from_login)
+                WHERE rs.reaction_type = 1
+                  AND rs.last_sub_type = 1
+                  AND rs.to_bch_name = ?
+                  AND rs.to_block_number = ?
+                  AND rs.to_block_hash = ?
+                ORDER BY LOWER(rs.from_login)
+                """;
+
+            List<Net_GetMessageLikes_Response.UserItem> shining = new ArrayList<>();
+            List<Net_GetMessageLikes_Response.UserItem> official = new ArrayList<>();
+            List<Net_GetMessageLikes_Response.UserItem> others = new ArrayList<>();
+            try (PreparedStatement ps = c.prepareStatement(sql)) {
+                ps.setString(1, message.getBlockchainName().trim());
+                ps.setInt(2, message.getBlockNumber());
+                ps.setBytes(3, blockHash);
+                try (ResultSet rs = ps.executeQuery()) {
+                    while (rs.next()) {
+                        Net_GetMessageLikes_Response.UserItem user = new Net_GetMessageLikes_Response.UserItem();
+                        user.setLogin(rs.getString("from_login"));
+                        user.setFirstName(rs.getString("first_name"));
+                        user.setLastName(rs.getString("last_name"));
+                        user.setAvatarAr(rs.getString("avatar_ar"));
+
+                        boolean isOfficial = "primary".equalsIgnoreCase(rs.getString("account_role"));
+                        boolean isShining = "shining".equalsIgnoreCase(rs.getString("shine_status"));
+                        if (isOfficial && isShining) shining.add(user);
+                        else if (isOfficial) official.add(user);
+                        else others.add(user);
+                    }
+
+                    Net_GetMessageLikes_Response resp = new Net_GetMessageLikes_Response();
+                    resp.setOp(req.getOp());
+                    resp.setRequestId(req.getRequestId());
+                    resp.setStatus(WireCodes.Status.OK);
+                    resp.setShining(shining);
+                    resp.setOfficial(official);
+                    resp.setOthers(others);
+                    resp.setTotal(shining.size() + official.size() + others.size());
+                    resp.setTruncated(false);
+                    return resp;
+                }
+            }
+        } catch (Exception e) {
+            log.error("GetMessageLikes failed", e);
+            return NetExceptionResponseFactory.error(req, WireCodes.Status.INTERNAL_ERROR, "internal_error", "Внутренняя ошибка сервера");
+        }
+    }
+}

SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/Net_GetMessageThread_Handler.java

@@ -17,6 +17,7 @@ import shine.db.DbController;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
+import java.util.Comparator;
 import java.util.ArrayList;
 import java.util.Base64;
 import java.util.List;
@@ -89,7 +90,7 @@ public class Net_GetMessageThread_Handler implements JsonMessageHandler {
 
     private List<Net_GetMessageThread_Response.MessageNodeTree> loadChildren(Connection c, PostRow parent, int depthDown, int childLimit, String viewerLogin) throws Exception {
         if (depthDown <= 0) return List.of();
-        List<PostRow> replies = findReplies(c, parent.bchName, parent.blockNumber, parent.blockHash, childLimit);
+        List<PostRow> replies = findRepliesAndRatings(c, parent.bchName, parent.blockNumber, parent.blockHash, childLimit);
         List<Net_GetMessageThread_Response.MessageNodeTree> out = new ArrayList<>();
         for (PostRow row : replies) {
             Net_GetMessageThread_Response.MessageNodeTree t = new Net_GetMessageThread_Response.MessageNodeTree();
@@ -100,24 +101,29 @@ public class Net_GetMessageThread_Handler implements JsonMessageHandler {
         return out;
     }
 
-    private List<PostRow> findReplies(Connection c, String toBchName, int toBlockNumber, byte[] toBlockHash, int limit) throws Exception {
+    private List<PostRow> findRepliesAndRatings(Connection c, String toBchName, int toBlockNumber, byte[] toBlockHash, int limit) throws Exception {
         String sql = """
             SELECT login,bch_name,block_number,block_hash,block_bytes,to_bch_name,to_block_number,to_block_hash,line_code,msg_sub_type,this_line_number
             FROM blocks
-            WHERE msg_type=1 AND msg_sub_type=?
+            WHERE msg_type=1 AND msg_sub_type IN (?, ?)
               AND to_bch_name=? AND to_block_number=? AND to_block_hash=?
-            ORDER BY block_number ASC
-            LIMIT ?
             """;
         try (PreparedStatement ps = c.prepareStatement(sql)) {
             ps.setInt(1, MsgSubType.TEXT_REPLY);
-            ps.setString(2, toBchName);
-            ps.setInt(3, toBlockNumber);
-            ps.setBytes(4, toBlockHash);
-            ps.setInt(5, limit);
+            ps.setInt(2, MsgSubType.TEXT_RATING);
+            ps.setString(3, toBchName);
+            ps.setInt(4, toBlockNumber);
+            ps.setBytes(5, toBlockHash);
             try (ResultSet rs = ps.executeQuery()) {
                 List<PostRow> out = new ArrayList<>();
                 while (rs.next()) out.add(mapRow(rs));
+                out.sort(Comparator
+                        .comparingLong((PostRow row) -> ChannelsReadSupport.parseTextAndTime(row.blockBytes).createdAtMs)
+                        .thenComparing(row -> String.valueOf(row.bchName))
+                        .thenComparingInt(row -> row.blockNumber));
+                if (out.size() > limit) {
+                    return new ArrayList<>(out.subList(0, limit));
+                }
                 return out;
             }
         }
@@ -208,8 +214,12 @@ public class Net_GetMessageThread_Handler implements JsonMessageHandler {
         first.setCreatedAtMs(base.createdAtMs);
         versions.add(first);
 
-        if (row.msgSubType == MsgSubType.TEXT_REPLY || row.msgSubType == MsgSubType.TEXT_POST) {
-            short editType = row.msgSubType == MsgSubType.TEXT_REPLY ? MsgSubType.TEXT_EDIT_REPLY : MsgSubType.TEXT_EDIT_POST;
+        if (row.msgSubType == MsgSubType.TEXT_REPLY
+                || row.msgSubType == MsgSubType.TEXT_RATING
+                || ChannelsReadSupport.supportsEditPostVersions(row.msgSubType)) {
+            short editType = (row.msgSubType == MsgSubType.TEXT_REPLY || row.msgSubType == MsgSubType.TEXT_RATING)
+                    ? MsgSubType.TEXT_EDIT_REPLY
+                    : MsgSubType.TEXT_EDIT_POST;
             for (PostRow edit : findEdits(c, row.bchName, row.blockNumber, row.blockHash, editType)) {
                 ChannelsReadSupport.TextInfo et = ChannelsReadSupport.parseTextAndTime(edit.blockBytes);
                 Net_GetChannelMessages_Response.VersionItem v = new Net_GetChannelMessages_Response.VersionItem();
@@ -232,7 +242,10 @@ public class Net_GetMessageThread_Handler implements JsonMessageHandler {
 
         int[] stats = ChannelsReadSupport.loadStats(c, row.bchName, row.blockNumber, row.blockHash);
         node.setLikesCount(stats[0]);
+        node.setPrimaryLikesCount(stats[3]);
+        node.setShiningLikesCount(stats[4]);
         node.setRepliesCount(stats[1]);
+        node.setRatingsCount(stats[2]);
         node.setLikedByMe(ChannelsReadSupport.isLikedByLogin(c, viewerLogin, row.bchName, row.blockNumber, row.blockHash));
         if (row.lineCode != null && row.lineCode >= 0) {
             Net_GetMessageThread_Response.ChannelInfo ci = new Net_GetMessageThread_Response.ChannelInfo();

SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/Net_GetPersonalDiary_Handler.java

@@ -0,0 +1,238 @@
+package server.logic.ws_protocol.JSON.handlers.channels;
+
+import blockchain.BchBlockEntry;
+import blockchain.body.StatusActionBody;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import server.logic.ws_protocol.JSON.ConnectionContext;
+import server.logic.ws_protocol.JSON.entyties.Net_Request;
+import server.logic.ws_protocol.JSON.entyties.Net_Response;
+import server.logic.ws_protocol.JSON.handlers.JsonMessageHandler;
+import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_GetChannelMessages_Response;
+import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_GetPersonalDiary_Request;
+import server.logic.ws_protocol.JSON.utils.NetExceptionResponseFactory;
+import server.logic.ws_protocol.WireCodes;
+import shine.db.DbController;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.ArrayList;
+import java.util.List;
+
+public class Net_GetPersonalDiary_Handler implements JsonMessageHandler {
+    private static final Logger log = LoggerFactory.getLogger(Net_GetPersonalDiary_Handler.class);
+    private static final String DIARY_CHANNEL_NAME = "diary";
+    private static final String DIARY_DISPLAY_NAME = "Личный дневник";
+    private static final String DIARY_DESCRIPTION = "История ваших действий по упражнениям, услугам и курсам";
+
+    @Override
+    public Net_Response handle(Net_Request baseRequest, ConnectionContext ctx) {
+        Net_GetPersonalDiary_Request req = (Net_GetPersonalDiary_Request) baseRequest;
+        String requestedLogin = String.valueOf(req.getLogin() == null ? "" : req.getLogin()).trim();
+        if (requestedLogin.isBlank() && (ctx == null || ctx.getLogin() == null || ctx.getLogin().isBlank())) {
+            return NetExceptionResponseFactory.error(req, WireCodes.Status.BAD_REQUEST, "bad_fields", "Некорректные поля: login");
+        }
+
+        int limit = req.getLimit() == null ? 200 : req.getLimit();
+        if (limit <= 0 || limit > 1000) {
+            return NetExceptionResponseFactory.error(req, WireCodes.Status.BAD_REQUEST, "limit_too_large", "Некорректный limit");
+        }
+        boolean asc = req.getSort() == null || !"desc".equalsIgnoreCase(req.getSort());
+
+        try (Connection c = DbController.getInstance().getConnection()) {
+            String viewerLogin = ctx != null ? String.valueOf(ctx.getLogin() == null ? "" : ctx.getLogin()).trim() : "";
+            String canonicalLogin = !viewerLogin.isBlank()
+                    ? viewerLogin
+                    : ChannelsReadSupport.canonicalLogin(c, requestedLogin);
+            if (canonicalLogin == null || canonicalLogin.isBlank()) {
+                return NetExceptionResponseFactory.error(req, 404, "user_not_found", "Пользователь не найден");
+            }
+            if (!viewerLogin.isBlank() && !viewerLogin.equalsIgnoreCase(canonicalLogin)) {
+                return NetExceptionResponseFactory.error(req, 403, "forbidden", "Личный дневник доступен только владельцу");
+            }
+
+            String ownerBch = loadPrimaryBlockchainName(c, canonicalLogin);
+            if (ownerBch == null || ownerBch.isBlank()) {
+                return NetExceptionResponseFactory.error(req, 404, "blockchain_not_found", "Не найден blockchain пользователя");
+            }
+
+            Net_GetChannelMessages_Response resp = new Net_GetChannelMessages_Response();
+            resp.setOp(req.getOp());
+            resp.setRequestId(req.getRequestId());
+            resp.setStatus(WireCodes.Status.OK);
+
+            Net_GetChannelMessages_Response.Channel channel = new Net_GetChannelMessages_Response.Channel();
+            channel.setOwnerLogin(canonicalLogin);
+            channel.setOwnerBlockchainName(ownerBch);
+            channel.setChannelName(DIARY_CHANNEL_NAME);
+            channel.setDisplayName(DIARY_DISPLAY_NAME);
+            channel.setChannelDescription(DIARY_DESCRIPTION);
+            channel.setChannelTypeCode(900);
+            channel.setChannelTypeVersion(1);
+            Net_GetChannelMessages_Response.BlockRef rootRef = new Net_GetChannelMessages_Response.BlockRef();
+            rootRef.setBlockNumber(0);
+            rootRef.setBlockHash(ChannelsReadSupport.toHex(new byte[32]));
+            channel.setChannelRoot(rootRef);
+            resp.setChannel(channel);
+            resp.setMetaEvents(new ArrayList<>());
+
+            List<Net_GetChannelMessages_Response.MessageItem> items = loadDiaryItems(c, canonicalLogin, limit, asc);
+            resp.setMessages(items);
+            return resp;
+        } catch (Exception e) {
+            log.error("GetPersonalDiary failed", e);
+            return NetExceptionResponseFactory.error(req, WireCodes.Status.INTERNAL_ERROR, "internal_error", "Внутренняя ошибка сервера");
+        }
+    }
+
+    private String loadPrimaryBlockchainName(Connection c, String canonicalLogin) throws Exception {
+        try (PreparedStatement ps = c.prepareStatement("""
+                SELECT blockchain_name
+                FROM blockchain_state
+                WHERE login = ?
+                ORDER BY blockchain_name
+                LIMIT 1
+                """)) {
+            ps.setString(1, canonicalLogin);
+            try (ResultSet rs = ps.executeQuery()) {
+                return rs.next() ? rs.getString("blockchain_name") : null;
+            }
+        }
+    }
+
+    private List<Net_GetChannelMessages_Response.MessageItem> loadDiaryItems(Connection c, String canonicalLogin, int limit, boolean asc) throws Exception {
+        String order = asc ? "ASC" : "DESC";
+        List<Net_GetChannelMessages_Response.MessageItem> out = new ArrayList<>();
+        try (PreparedStatement ps = c.prepareStatement("""
+                SELECT login, bch_name, block_number, block_hash, block_bytes, msg_sub_type
+                FROM blocks
+                WHERE login = ? AND msg_type = ?
+                ORDER BY block_number
+                """ + order + " LIMIT ?")) {
+            ps.setString(1, canonicalLogin);
+            ps.setInt(2, ChannelsReadSupport.MSG_TYPE_STATUS_ACTION);
+            ps.setInt(3, limit);
+            try (ResultSet rs = ps.executeQuery()) {
+                while (rs.next()) {
+                    byte[] blockBytes = rs.getBytes("block_bytes");
+                    BchBlockEntry entry = new BchBlockEntry(blockBytes);
+                    if (!(entry.body instanceof StatusActionBody statusBody)) continue;
+
+                    Net_GetChannelMessages_Response.MessageItem item = new Net_GetChannelMessages_Response.MessageItem();
+                    Net_GetChannelMessages_Response.BlockRef ref = new Net_GetChannelMessages_Response.BlockRef();
+                    ref.setBlockNumber(rs.getInt("block_number"));
+                    ref.setBlockHash(ChannelsReadSupport.toHex(rs.getBytes("block_hash")));
+                    item.setMessageRef(ref);
+                    item.setMsgSubType(rs.getInt("msg_sub_type"));
+                    item.setAuthorLogin(rs.getString("login"));
+                    item.setAuthorBlockchainName(rs.getString("bch_name"));
+                    item.setCreatedAtMs(entry.timestamp * 1000L);
+                    item.setLikesCount(0);
+                    item.setLikedByMe(false);
+                    item.setRepliesCount(0);
+                    item.setRatingsCount(0);
+                    item.setTargetBlockchainName(statusBody.toBchName());
+                    item.setTargetBlockNumber(statusBody.toBlockGlobalNumber());
+                    item.setTargetBlockHash(ChannelsReadSupport.toHex(statusBody.toBlockHashBytes()));
+
+                    List<Net_GetChannelMessages_Response.VersionItem> versions = loadVersionsForDiaryItem(
+                            c,
+                            rs.getString("bch_name"),
+                            rs.getInt("block_number"),
+                            rs.getBytes("block_hash"),
+                            statusBody.message == null ? "" : statusBody.message,
+                            entry.timestamp * 1000L
+                    );
+                    item.setVersions(versions);
+                    item.setVersionsTotal(versions.size());
+                    item.setText(versions.get(versions.size() - 1).getText());
+
+                    fillTargetDetails(c, item, statusBody.toBchName(), statusBody.toBlockGlobalNumber(), statusBody.toBlockHashBytes());
+                    out.add(item);
+                }
+            }
+        }
+        return out;
+    }
+
+    private List<Net_GetChannelMessages_Response.VersionItem> loadVersionsForDiaryItem(Connection c,
+                                                                                      String ownerBch,
+                                                                                      int originalBlockNumber,
+                                                                                      byte[] originalBlockHash,
+                                                                                      String originalText,
+                                                                                      long originalCreatedAtMs) throws Exception {
+        List<Net_GetChannelMessages_Response.VersionItem> versions = new ArrayList<>();
+
+        Net_GetChannelMessages_Response.VersionItem first = new Net_GetChannelMessages_Response.VersionItem();
+        first.setVersionIndex(1);
+        first.setBlockNumber(originalBlockNumber);
+        first.setBlockHash(ChannelsReadSupport.toHex(originalBlockHash));
+        first.setText(originalText == null ? "" : originalText);
+        first.setCreatedAtMs(originalCreatedAtMs);
+        versions.add(first);
+
+        try (PreparedStatement ps = c.prepareStatement("""
+                SELECT block_number, block_hash, block_bytes
+                FROM blocks
+                WHERE bch_name = ?
+                  AND msg_type = ?
+                  AND msg_sub_type = ?
+                  AND to_block_number = ?
+                  AND to_block_hash = ?
+                  AND (to_bch_name = ? OR to_bch_name IS NULL OR to_bch_name = '')
+                ORDER BY block_number ASC
+                """)) {
+            ps.setString(1, ownerBch);
+            ps.setInt(2, ChannelsReadSupport.MSG_TYPE_TEXT);
+            ps.setInt(3, shine.db.MsgSubType.TEXT_EDIT_REPLY);
+            ps.setInt(4, originalBlockNumber);
+            ps.setBytes(5, originalBlockHash);
+            ps.setString(6, ownerBch);
+            try (ResultSet rs = ps.executeQuery()) {
+                while (rs.next()) {
+                    ChannelsReadSupport.TextInfo editText = ChannelsReadSupport.parseTextAndTime(rs.getBytes("block_bytes"));
+                    Net_GetChannelMessages_Response.VersionItem item = new Net_GetChannelMessages_Response.VersionItem();
+                    item.setVersionIndex(versions.size() + 1);
+                    item.setBlockNumber(rs.getInt("block_number"));
+                    item.setBlockHash(ChannelsReadSupport.toHex(rs.getBytes("block_hash")));
+                    item.setText(editText.text);
+                    item.setCreatedAtMs(editText.createdAtMs);
+                    versions.add(item);
+                }
+            }
+        }
+
+        return versions;
+    }
+
+    private void fillTargetDetails(Connection c,
+                                   Net_GetChannelMessages_Response.MessageItem item,
+                                   String targetBch,
+                                   Integer targetBlockNumber,
+                                   byte[] targetHash) throws Exception {
+        if (targetBch == null || targetBch.isBlank() || targetBlockNumber == null || targetHash == null || targetHash.length != 32) {
+            return;
+        }
+        try (PreparedStatement ps = c.prepareStatement("""
+                SELECT login, bch_name, block_number, block_hash, block_bytes, msg_sub_type
+                FROM blocks
+                WHERE bch_name = ? AND block_number = ?
+                LIMIT 1
+                """)) {
+            ps.setString(1, targetBch);
+            ps.setInt(2, targetBlockNumber);
+            try (ResultSet rs = ps.executeQuery()) {
+                if (!rs.next()) return;
+                byte[] actualHash = rs.getBytes("block_hash");
+                if (actualHash == null || !java.util.Arrays.equals(actualHash, targetHash)) return;
+                item.setTargetMsgSubType(rs.getInt("msg_sub_type"));
+                item.setTargetAuthorLogin(rs.getString("login"));
+                item.setTargetAuthorBlockchainName(rs.getString("bch_name"));
+                ChannelsReadSupport.TextInfo textInfo = ChannelsReadSupport.parseTextAndTime(rs.getBytes("block_bytes"));
+                item.setTargetText(textInfo.text);
+                item.setTargetCreatedAtMs(textInfo.createdAtMs);
+            }
+        }
+    }
+}

SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/Net_GetUserCounters_Handler.java

@@ -0,0 +1,46 @@
+package server.logic.ws_protocol.JSON.handlers.channels;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import server.logic.ws_protocol.JSON.ConnectionContext;
+import server.logic.ws_protocol.JSON.entyties.Net_Request;
+import server.logic.ws_protocol.JSON.entyties.Net_Response;
+import server.logic.ws_protocol.JSON.handlers.JsonMessageHandler;
+import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_GetUserCounters_Request;
+import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_GetUserCounters_Response;
+import server.logic.ws_protocol.JSON.utils.NetExceptionResponseFactory;
+import server.logic.ws_protocol.WireCodes;
+import shine.db.DbController;
+
+import java.sql.Connection;
+
+public class Net_GetUserCounters_Handler implements JsonMessageHandler {
+    private static final Logger log = LoggerFactory.getLogger(Net_GetUserCounters_Handler.class);
+
+    @Override
+    public Net_Response handle(Net_Request baseRequest, ConnectionContext ctx) {
+        Net_GetUserCounters_Request req = (Net_GetUserCounters_Request) baseRequest;
+        if (ctx == null || !ctx.isAuthenticatedUser() || ctx.getLogin() == null || ctx.getLogin().isBlank()) {
+            return NetExceptionResponseFactory.error(req, WireCodes.Status.UNVERIFIED, "NOT_AUTHENTICATED", "Требуется авторизация");
+        }
+        String login = ctx.getLogin().trim();
+        try (Connection c = DbController.getInstance().getConnection()) {
+            UserCountersSupport.Snapshot s = UserCountersSupport.calculate(c, login);
+            Net_GetUserCounters_Response r = new Net_GetUserCounters_Response();
+            r.setOp(req.getOp());
+            r.setRequestId(req.getRequestId());
+            r.setStatus(WireCodes.Status.OK);
+            r.setLogin(login);
+            r.setDmUnreadCount(s.dmUnreadCount());
+            r.setChannelsUnreadCount(s.channelsUnreadCount());
+            r.setNotificationsUnreadCount(s.notificationsUnreadCount());
+            r.setNotificationRepliesUnreadCount(s.repliesUnreadCount());
+            r.setNotificationConnectionsUnreadCount(s.connectionsUnreadCount());
+            r.setNotificationEventsUnreadCount(s.eventsUnreadCount());
+            return r;
+        } catch (Exception e) {
+            log.error("GetUserCounters failed for {}", login, e);
+            return NetExceptionResponseFactory.error(req, WireCodes.Status.INTERNAL_ERROR, "internal_error", "Не удалось получить счётчики");
+        }
+    }
+}

SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/Net_ListSubscriptionsFeed_Handler.java

@@ -12,6 +12,7 @@ import server.logic.ws_protocol.JSON.utils.NetExceptionResponseFactory;
 import server.logic.ws_protocol.WireCodes;
 import shine.db.MsgSubType;
 import shine.db.DbController;
+import shine.db.dao.ChannelReadStateDAO;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -81,8 +82,15 @@ public class Net_ListSubscriptionsFeed_Handler implements JsonMessageHandler {
             channelRef.setChannelRoot(rootRef);
 
             row.setChannel(channelRef);
-            row.setMessagesCount(ChannelsReadSupport.countPosts(c, key.ownerBch, key.rootNumber));
-            row.setUnreadCount(0);
+            int messagesCount = ChannelsReadSupport.countPosts(c, key.ownerBch, key.rootNumber);
+            row.setMessagesCount(messagesCount);
+            boolean ownChannel = key.ownerLogin != null && key.ownerLogin.equalsIgnoreCase(viewerLogin);
+            ChannelReadStateDAO.ReadState readState = ownChannel || meta.channelName == null
+                    ? null
+                    : ChannelReadStateDAO.getInstance().get(c, viewerLogin, key.ownerBch, meta.channelName);
+            row.setReadStateInitialized(readState != null);
+            row.setReadCount(readState == null ? 0L : Math.min(messagesCount, Math.max(0L, readState.readCount())));
+            row.setUnreadCount(readState == null ? 0 : (int) Math.min(Integer.MAX_VALUE, readState.unreadCount()));
 
             ChannelsReadSupport.PostBlock lastPost = ChannelsReadSupport.loadLastPost(c, key.ownerBch, key.rootNumber);
             if (lastPost != null) {

SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/Net_MarkChannelMessagesSeen_Handler.java

@@ -58,7 +58,7 @@ public class Net_MarkChannelMessagesSeen_Handler implements JsonMessageHandler {
                   AND block_number = ?
                   AND block_hash = ?
                   AND msg_type = ?
-                  AND msg_sub_type = ?
+                  AND msg_sub_type IN (?, ?, ?, ?, ?, ?)
                   %s
                 LIMIT 1
                 """.formatted(strictChannelMatch ? "AND line_code = ?" : "");
@@ -98,8 +98,13 @@ public class Net_MarkChannelMessagesSeen_Handler implements JsonMessageHandler {
                     existsPs.setBytes(3, ChannelsReadSupport.hexToBytes(hashHex));
                     existsPs.setInt(4, ChannelsReadSupport.MSG_TYPE_TEXT);
                     existsPs.setInt(5, MsgSubType.TEXT_POST);
+                    existsPs.setInt(6, MsgSubType.TEXT_REPOST);
+                    existsPs.setInt(7, MsgSubType.TEXT_ENTRYPOINT);
+                    existsPs.setInt(8, MsgSubType.TEXT_EXERCISE);
+                    existsPs.setInt(9, MsgSubType.TEXT_SERVICE);
+                    existsPs.setInt(10, MsgSubType.TEXT_COURSE);
                     if (strictChannelMatch) {
-                        existsPs.setInt(6, expectedRoot);
+                        existsPs.setInt(11, expectedRoot);
                     }
 
                     boolean exists;

SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/Net_SetChannelReadState_Handler.java

@@ -0,0 +1,145 @@
+package server.logic.ws_protocol.JSON.handlers.channels;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import server.logic.ws_protocol.Base64Ws;
+import server.logic.ws_protocol.JSON.ConnectionContext;
+import server.logic.ws_protocol.JSON.entyties.Net_Request;
+import server.logic.ws_protocol.JSON.entyties.Net_Response;
+import server.logic.ws_protocol.JSON.handlers.JsonMessageHandler;
+import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_SetChannelReadState_Request;
+import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_SetChannelReadState_Response;
+import server.logic.ws_protocol.JSON.utils.NetExceptionResponseFactory;
+import server.logic.ws_protocol.WireCodes;
+import shine.db.DbController;
+import shine.db.MsgSubType;
+import shine.db.dao.ChannelReadStateDAO;
+import utils.config.ShineSignatureConstants;
+import utils.crypto.Ed25519Util;
+
+import java.nio.charset.StandardCharsets;
+import java.sql.Connection;
+
+/** Accepts the signed client read watermark for one followed public channel. */
+public final class Net_SetChannelReadState_Handler implements JsonMessageHandler {
+    private static final Logger log = LoggerFactory.getLogger(Net_SetChannelReadState_Handler.class);
+    private static final long MAX_FUTURE_SKEW_MS = 5 * 60_000L;
+
+    @Override
+    public Net_Response handle(Net_Request baseRequest, ConnectionContext ctx) {
+        Net_SetChannelReadState_Request req = (Net_SetChannelReadState_Request) baseRequest;
+        if (ctx == null || !ctx.isAuthenticatedUser() || ctx.getCurrentUser() == null) {
+            return NetExceptionResponseFactory.error(req, WireCodes.Status.UNVERIFIED,
+                    "NOT_AUTHENTICATED", "Требуется авторизация");
+        }
+        if (req.getLogin() == null || req.getLogin().isBlank()
+                || req.getOwner_bch_name() == null || req.getOwner_bch_name().isBlank()
+                || req.getChannel_name() == null || req.getChannel_name().isBlank()
+                || req.getRead_count() == null || req.getRead_count() < 0
+                || req.getTime_ms() == null || req.getTime_ms() <= 0
+                || req.getClient_key() == null || req.getClient_key().isBlank()
+                || req.getSignature() == null || req.getSignature().isBlank()) {
+            return NetExceptionResponseFactory.error(req, WireCodes.Status.BAD_REQUEST,
+                    "BAD_FIELDS", "Некорректные поля ChannelReadState");
+        }
+
+        String authenticatedLogin = String.valueOf(ctx.getCurrentUser().getLogin()).trim();
+        String login = req.getLogin().trim();
+        String ownerBch = req.getOwner_bch_name().trim();
+        String channelName = req.getChannel_name().trim();
+        long readCount = req.getRead_count();
+        long timeMs = req.getTime_ms();
+        String clientKeyB64 = req.getClient_key().trim();
+        String signatureB64 = req.getSignature().trim();
+
+        if (!authenticatedLogin.equalsIgnoreCase(login)) {
+            return NetExceptionResponseFactory.error(req, WireCodes.Status.UNVERIFIED,
+                    "LOGIN_MISMATCH", "Состояние чтения принадлежит другому пользователю");
+        }
+        long nowMs = System.currentTimeMillis();
+        if (timeMs > nowMs + MAX_FUTURE_SKEW_MS) {
+            return NetExceptionResponseFactory.error(req, WireCodes.Status.UNVERIFIED,
+                    "BAD_TIME", "Некорректное время подписи");
+        }
+
+        try {
+            byte[] pubKey32;
+            byte[] sig64;
+            try {
+                pubKey32 = Base64Ws.decodeLen(clientKeyB64, 32, "client_key");
+                sig64 = Base64Ws.decodeLen(signatureB64, 64, "signature");
+            } catch (IllegalArgumentException e) {
+                return NetExceptionResponseFactory.error(req, WireCodes.Status.BAD_REQUEST,
+                        "BAD_BASE64", "client_key/signature должны быть Base64");
+            }
+
+            String userClientKey = String.valueOf(ctx.getCurrentUser().getClientKey() == null
+                    ? "" : ctx.getCurrentUser().getClientKey()).trim();
+            if (userClientKey.isBlank() || !userClientKey.equals(clientKeyB64)) {
+                return NetExceptionResponseFactory.error(req, 403,
+                        "DEVICE_KEY_MISMATCH", "client_key не соответствует пользователю");
+            }
+
+            String signText = ShineSignatureConstants.CHANNEL_READ_STATE_PREFIX
+                    + escapePart(login) + '|'
+                    + escapePart(ownerBch) + '|'
+                    + escapePart(channelName) + '|'
+                    + timeMs + '|'
+                    + readCount;
+            if (!Ed25519Util.verify(signText.getBytes(StandardCharsets.UTF_8), sig64, pubKey32)) {
+                return NetExceptionResponseFactory.error(req, WireCodes.Status.UNVERIFIED,
+                        "INVALID_SIGNATURE", "Подпись состояния чтения канала не прошла проверку");
+            }
+
+            ChannelReadStateDAO dao = ChannelReadStateDAO.getInstance();
+            ChannelReadStateDAO.UpsertResult result;
+            try (Connection c = DbController.getInstance().getConnection()) {
+                if (!dao.hasActiveSubscription(c, authenticatedLogin, ownerBch, channelName,
+                        MsgSubType.CONNECTION_FOLLOW)) {
+                    return NetExceptionResponseFactory.error(req, 409,
+                            "CHANNEL_NOT_FOLLOWED", "Пользователь не подписан на этот канал");
+                }
+                String ownerLogin = dao.resolveOwnerLogin(c, ownerBch, channelName);
+                Integer channelRoot = dao.resolvePublicChannelRootByName(c, ownerBch, channelName);
+                if (ownerLogin == null || ownerLogin.isBlank() || channelRoot == null) {
+                    return NetExceptionResponseFactory.error(req, 404,
+                            "CHANNEL_NOT_FOUND", "Канал не найден");
+                }
+
+                // Never persist a watermark beyond the number of messages that really exists.
+                // Without this guard, one buggy/malicious oversized read_count would be monotonic
+                // and could make all future unread counters impossible to clear correctly.
+                long actualMessagesCount = ChannelsReadSupport.countPosts(c, ownerBch, channelRoot);
+                long effectiveReadCount = Math.min(readCount, actualMessagesCount);
+
+                result = dao.upsertSignedReadIfNewer(c,
+                        authenticatedLogin, ownerLogin, ownerBch, channelName,
+                        effectiveReadCount, timeMs, clientKeyB64, signatureB64, nowMs);
+            }
+
+            Net_SetChannelReadState_Response resp = new Net_SetChannelReadState_Response();
+            resp.setOp(req.getOp());
+            resp.setRequestId(req.getRequestId());
+            resp.setStatus(WireCodes.Status.OK);
+            resp.setLogin(authenticatedLogin);
+            resp.setOwner_bch_name(ownerBch);
+            resp.setChannel_name(channelName);
+            resp.setRead_count(result.readCount());
+            resp.setUnread_count(result.unreadCount());
+            resp.setTime_ms(timeMs);
+            resp.setApplied(result.applied());
+            if (result.applied()) UserCountersSupport.pushChanged(authenticatedLogin);
+            return resp;
+        } catch (Exception e) {
+            log.error("SetChannelReadState failed", e);
+            return NetExceptionResponseFactory.error(req, WireCodes.Status.INTERNAL_ERROR,
+                    "INTERNAL_ERROR", NetExceptionResponseFactory.detailedMessage(
+                            "Внутренняя ошибка SetChannelReadState", e));
+        }
+    }
+
+    private static String escapePart(String value) {
+        String s = String.valueOf(value == null ? "" : value);
+        return s.replace("\\", "\\\\").replace("|", "\\|");
+    }
+}

SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/UserCountersSupport.java

@@ -0,0 +1,94 @@
+package server.logic.ws_protocol.JSON.handlers.channels;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import server.logic.ws_protocol.JSON.ActiveConnectionsRegistry;
+import server.logic.ws_protocol.JSON.ConnectionContext;
+import server.logic.ws_protocol.JSON.push.WsEventSender;
+import shine.db.DbController;
+import shine.db.dao.UserNotificationSeenStateDAO;
+import shine.db.dao.ChannelReadStateDAO;
+import shine.db.dao.UserNotificationsStateDAO;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+
+/**
+ * Temporary calculator behind the stable GetUserCounters/UserCountersChanged contract.
+ * It intentionally uses current DB state today; later it can read one materialized row/cache
+ * without changing API or UI.
+ */
+public final class UserCountersSupport {
+    private static final ObjectMapper MAPPER = new ObjectMapper();
+
+    private UserCountersSupport() {}
+
+    public record Snapshot(long dmUnreadCount, long channelsUnreadCount, long repliesUnreadCount,
+                           long connectionsUnreadCount, long eventsUnreadCount) {
+        public long notificationsUnreadCount() {
+            return repliesUnreadCount + connectionsUnreadCount + eventsUnreadCount;
+        }
+    }
+
+    public static Snapshot calculate(Connection c, String login) throws Exception {
+        long dm = countDmUnread(c, login);
+        long channels = countChannelsUnread(c, login);
+        UserNotificationSeenStateDAO seen = UserNotificationSeenStateDAO.getInstance();
+        UserNotificationsStateDAO notifications = UserNotificationsStateDAO.getInstance();
+        long repliesSeen = seen.getSeenAt(c, login, "replies");
+        long connectionsSeen = seen.getSeenAt(c, login, "connections");
+        long eventsSeen = seen.getSeenAt(c, login, "events");
+        long replies = notifications.countUnseen(c, login, "reply", repliesSeen);
+        long connections = notifications.countUnseen(c, login, "connection", connectionsSeen);
+        long events = notifications.countUnseen(c, login, "event", eventsSeen);
+        return new Snapshot(dm, channels, replies, connections, events);
+    }
+
+    public static Snapshot calculate(String login) throws Exception {
+        try (Connection c = DbController.getInstance().getConnection()) {
+            return calculate(c, login);
+        }
+    }
+
+    public static void pushChanged(String login) {
+        if (login == null || login.isBlank()) return;
+        try {
+            Snapshot s = calculate(login);
+            ObjectNode payload = toPayload(login, s);
+            String eventId = "user-counters-" + System.currentTimeMillis();
+            for (ConnectionContext ctx : ActiveConnectionsRegistry.getInstance().getByLogin(login)) {
+                WsEventSender.sendEvent(ctx, "UserCountersChanged", eventId, payload);
+            }
+        } catch (Exception ignored) {
+            // Counter push is best-effort. The client can always recover with GetUserCounters.
+        }
+    }
+
+    public static ObjectNode toPayload(String login, Snapshot s) {
+        ObjectNode p = MAPPER.createObjectNode();
+        p.put("login", login);
+        p.put("dmUnreadCount", s.dmUnreadCount());
+        p.put("channelsUnreadCount", s.channelsUnreadCount());
+        p.put("notificationsUnreadCount", s.notificationsUnreadCount());
+        ObjectNode n = p.putObject("notifications");
+        n.put("replies", s.repliesUnreadCount());
+        n.put("connections", s.connectionsUnreadCount());
+        n.put("events", s.eventsUnreadCount());
+        return p;
+    }
+
+    private static long countDmUnread(Connection c, String login) throws Exception {
+        String sql = "SELECT COALESCE(SUM(unread_count),0) FROM dm_dialog_state WHERE LOWER(owner_login)=LOWER(?)";
+        try (PreparedStatement ps = c.prepareStatement(sql)) {
+            ps.setString(1, login);
+            try (ResultSet rs = ps.executeQuery()) {
+                return rs.next() ? Math.max(0L, rs.getLong(1)) : 0L;
+            }
+        }
+    }
+
+    private static long countChannelsUnread(Connection c, String login) throws Exception {
+        return ChannelReadStateDAO.getInstance().sumUnreadCount(c, login);
+    }
+}

SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/entyties/Net_GetChannelMessages_Response.java

@@ -32,6 +32,7 @@ public class Net_GetChannelMessages_Response extends Net_Response {
         private Long metaUpdatedAtMs;
         private Integer channelTypeCode;
         private Integer channelTypeVersion;
+        private Integer subscribersCount;
         private BlockRef channelRoot;
 
         public String getOwnerLogin() { return ownerLogin; }
@@ -67,6 +68,9 @@ public class Net_GetChannelMessages_Response extends Net_Response {
         public Integer getChannelTypeVersion() { return channelTypeVersion; }
         public void setChannelTypeVersion(Integer channelTypeVersion) { this.channelTypeVersion = channelTypeVersion; }
 
+        public Integer getSubscribersCount() { return subscribersCount; }
+        public void setSubscribersCount(Integer subscribersCount) { this.subscribersCount = subscribersCount; }
+
         public BlockRef getChannelRoot() { return channelRoot; }
         public void setChannelRoot(BlockRef channelRoot) { this.channelRoot = channelRoot; }
     }
@@ -127,11 +131,19 @@ public class Net_GetChannelMessages_Response extends Net_Response {
         private String targetBlockchainName;
         private Integer targetBlockNumber;
         private String targetBlockHash;
+        private Integer targetMsgSubType;
+        private String targetText;
+        private String targetAuthorLogin;
+        private String targetAuthorBlockchainName;
+        private Long targetCreatedAtMs;
         private long createdAtMs;
         private String text;
         private int likesCount;
+        private int primaryLikesCount;
+        private int shiningLikesCount;
         private boolean likedByMe;
         private int repliesCount;
+        private int ratingsCount;
         private int versionsTotal;
         private List<VersionItem> versions = new ArrayList<>();
 
@@ -158,6 +170,21 @@ public class Net_GetChannelMessages_Response extends Net_Response {
         public String getTargetBlockHash() { return targetBlockHash; }
         public void setTargetBlockHash(String targetBlockHash) { this.targetBlockHash = targetBlockHash; }
 
+        public Integer getTargetMsgSubType() { return targetMsgSubType; }
+        public void setTargetMsgSubType(Integer targetMsgSubType) { this.targetMsgSubType = targetMsgSubType; }
+
+        public String getTargetText() { return targetText; }
+        public void setTargetText(String targetText) { this.targetText = targetText; }
+
+        public String getTargetAuthorLogin() { return targetAuthorLogin; }
+        public void setTargetAuthorLogin(String targetAuthorLogin) { this.targetAuthorLogin = targetAuthorLogin; }
+
+        public String getTargetAuthorBlockchainName() { return targetAuthorBlockchainName; }
+        public void setTargetAuthorBlockchainName(String targetAuthorBlockchainName) { this.targetAuthorBlockchainName = targetAuthorBlockchainName; }
+
+        public Long getTargetCreatedAtMs() { return targetCreatedAtMs; }
+        public void setTargetCreatedAtMs(Long targetCreatedAtMs) { this.targetCreatedAtMs = targetCreatedAtMs; }
+
         public long getCreatedAtMs() { return createdAtMs; }
         public void setCreatedAtMs(long createdAtMs) { this.createdAtMs = createdAtMs; }
 
@@ -166,6 +193,10 @@ public class Net_GetChannelMessages_Response extends Net_Response {
 
         public int getLikesCount() { return likesCount; }
         public void setLikesCount(int likesCount) { this.likesCount = likesCount; }
+        public int getPrimaryLikesCount() { return primaryLikesCount; }
+        public void setPrimaryLikesCount(int primaryLikesCount) { this.primaryLikesCount = primaryLikesCount; }
+        public int getShiningLikesCount() { return shiningLikesCount; }
+        public void setShiningLikesCount(int shiningLikesCount) { this.shiningLikesCount = shiningLikesCount; }
 
         public boolean isLikedByMe() { return likedByMe; }
         public void setLikedByMe(boolean likedByMe) { this.likedByMe = likedByMe; }
@@ -173,6 +204,9 @@ public class Net_GetChannelMessages_Response extends Net_Response {
         public int getRepliesCount() { return repliesCount; }
         public void setRepliesCount(int repliesCount) { this.repliesCount = repliesCount; }
 
+        public int getRatingsCount() { return ratingsCount; }
+        public void setRatingsCount(int ratingsCount) { this.ratingsCount = ratingsCount; }
+
         public int getVersionsTotal() { return versionsTotal; }
         public void setVersionsTotal(int versionsTotal) { this.versionsTotal = versionsTotal; }
 

SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/entyties/Net_GetMessageLikes_Request.java

@@ -0,0 +1,29 @@
+package server.logic.ws_protocol.JSON.handlers.channels.entyties;
+
+import server.logic.ws_protocol.JSON.entyties.Net_Request;
+
+public class Net_GetMessageLikes_Request extends Net_Request {
+    private MessageSelector message;
+    private Integer limit;
+
+    public MessageSelector getMessage() { return message; }
+    public void setMessage(MessageSelector message) { this.message = message; }
+
+    public Integer getLimit() { return limit; }
+    public void setLimit(Integer limit) { this.limit = limit; }
+
+    public static class MessageSelector {
+        private String blockchainName;
+        private Integer blockNumber;
+        private String blockHash;
+
+        public String getBlockchainName() { return blockchainName; }
+        public void setBlockchainName(String blockchainName) { this.blockchainName = blockchainName; }
+
+        public Integer getBlockNumber() { return blockNumber; }
+        public void setBlockNumber(Integer blockNumber) { this.blockNumber = blockNumber; }
+
+        public String getBlockHash() { return blockHash; }
+        public void setBlockHash(String blockHash) { this.blockHash = blockHash; }
+    }
+}

SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/entyties/Net_GetMessageLikes_Response.java

@@ -0,0 +1,40 @@
+package server.logic.ws_protocol.JSON.handlers.channels.entyties;
+
+import server.logic.ws_protocol.JSON.entyties.Net_Response;
+import java.util.ArrayList;
+import java.util.List;
+
+public class Net_GetMessageLikes_Response extends Net_Response {
+    private List<UserItem> shining = new ArrayList<>();
+    private List<UserItem> official = new ArrayList<>();
+    private List<UserItem> others = new ArrayList<>();
+    private int total;
+    private boolean truncated;
+
+    public List<UserItem> getShining() { return shining; }
+    public void setShining(List<UserItem> shining) { this.shining = shining; }
+    public List<UserItem> getOfficial() { return official; }
+    public void setOfficial(List<UserItem> official) { this.official = official; }
+    public List<UserItem> getOthers() { return others; }
+    public void setOthers(List<UserItem> others) { this.others = others; }
+    public int getTotal() { return total; }
+    public void setTotal(int total) { this.total = total; }
+    public boolean isTruncated() { return truncated; }
+    public void setTruncated(boolean truncated) { this.truncated = truncated; }
+
+    public static class UserItem {
+        private String login;
+        private String firstName;
+        private String lastName;
+        private String avatarAr;
+
+        public String getLogin() { return login; }
+        public void setLogin(String login) { this.login = login; }
+        public String getFirstName() { return firstName; }
+        public void setFirstName(String firstName) { this.firstName = firstName; }
+        public String getLastName() { return lastName; }
+        public void setLastName(String lastName) { this.lastName = lastName; }
+        public String getAvatarAr() { return avatarAr; }
+        public void setAvatarAr(String avatarAr) { this.avatarAr = avatarAr; }
+    }
+}

SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/entyties/Net_GetPersonalDiary_Request.java

@@ -0,0 +1,18 @@
+package server.logic.ws_protocol.JSON.handlers.channels.entyties;
+
+import server.logic.ws_protocol.JSON.entyties.Net_Request;
+
+public class Net_GetPersonalDiary_Request extends Net_Request {
+    private String login;
+    private Integer limit;
+    private String sort;
+
+    public String getLogin() { return login; }
+    public void setLogin(String login) { this.login = login; }
+
+    public Integer getLimit() { return limit; }
+    public void setLimit(Integer limit) { this.limit = limit; }
+
+    public String getSort() { return sort; }
+    public void setSort(String sort) { this.sort = sort; }
+}

SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/entyties/Net_GetUserCounters_Request.java

@@ -0,0 +1,7 @@
+package server.logic.ws_protocol.JSON.handlers.channels.entyties;
+
+import server.logic.ws_protocol.JSON.entyties.Net_Request;
+
+/** Lightweight authenticated request for bottom-toolbar counters. */
+public class Net_GetUserCounters_Request extends Net_Request {
+}

SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/entyties/Net_GetUserCounters_Response.java

@@ -0,0 +1,29 @@
+package server.logic.ws_protocol.JSON.handlers.channels.entyties;
+
+import server.logic.ws_protocol.JSON.entyties.Net_Response;
+
+/** Stable UI contract. Server-side calculation may be replaced by materialized counters later. */
+public class Net_GetUserCounters_Response extends Net_Response {
+    private String login;
+    private long dmUnreadCount;
+    private long channelsUnreadCount;
+    private long notificationsUnreadCount;
+    private long notificationRepliesUnreadCount;
+    private long notificationConnectionsUnreadCount;
+    private long notificationEventsUnreadCount;
+
+    public String getLogin() { return login; }
+    public void setLogin(String login) { this.login = login; }
+    public long getDmUnreadCount() { return dmUnreadCount; }
+    public void setDmUnreadCount(long value) { this.dmUnreadCount = value; }
+    public long getChannelsUnreadCount() { return channelsUnreadCount; }
+    public void setChannelsUnreadCount(long value) { this.channelsUnreadCount = value; }
+    public long getNotificationsUnreadCount() { return notificationsUnreadCount; }
+    public void setNotificationsUnreadCount(long value) { this.notificationsUnreadCount = value; }
+    public long getNotificationRepliesUnreadCount() { return notificationRepliesUnreadCount; }
+    public void setNotificationRepliesUnreadCount(long value) { this.notificationRepliesUnreadCount = value; }
+    public long getNotificationConnectionsUnreadCount() { return notificationConnectionsUnreadCount; }
+    public void setNotificationConnectionsUnreadCount(long value) { this.notificationConnectionsUnreadCount = value; }
+    public long getNotificationEventsUnreadCount() { return notificationEventsUnreadCount; }
+    public void setNotificationEventsUnreadCount(long value) { this.notificationEventsUnreadCount = value; }
+}

SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/entyties/Net_ListSubscriptionsFeed_Response.java

@@ -26,7 +26,9 @@ public class Net_ListSubscriptionsFeed_Response extends Net_Response {
     public static class ChannelSummary {
         private ChannelRef channel;
         private int messagesCount;
+        private long readCount;
         private int unreadCount;
+        private boolean readStateInitialized;
         private LastMessage lastMessage;
 
         public ChannelRef getChannel() { return channel; }
@@ -35,9 +37,15 @@ public class Net_ListSubscriptionsFeed_Response extends Net_Response {
         public int getMessagesCount() { return messagesCount; }
         public void setMessagesCount(int messagesCount) { this.messagesCount = messagesCount; }
 
+        public long getReadCount() { return readCount; }
+        public void setReadCount(long readCount) { this.readCount = readCount; }
+
         public int getUnreadCount() { return unreadCount; }
         public void setUnreadCount(int unreadCount) { this.unreadCount = unreadCount; }
 
+        public boolean isReadStateInitialized() { return readStateInitialized; }
+        public void setReadStateInitialized(boolean readStateInitialized) { this.readStateInitialized = readStateInitialized; }
+
         public LastMessage getLastMessage() { return lastMessage; }
         public void setLastMessage(LastMessage lastMessage) { this.lastMessage = lastMessage; }
     }

SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/entyties/Net_SetChannelReadState_Request.java

@@ -0,0 +1,34 @@
+package server.logic.ws_protocol.JSON.handlers.channels.entyties;
+
+import server.logic.ws_protocol.JSON.entyties.Net_Request;
+
+public class Net_SetChannelReadState_Request extends Net_Request {
+    private String login;
+    private String owner_bch_name;
+    private String channel_name;
+    private Long read_count;
+    private Long time_ms;
+    private String client_key;
+    private String signature;
+
+    public String getLogin() { return login; }
+    public void setLogin(String login) { this.login = login; }
+
+    public String getOwner_bch_name() { return owner_bch_name; }
+    public void setOwner_bch_name(String owner_bch_name) { this.owner_bch_name = owner_bch_name; }
+
+    public String getChannel_name() { return channel_name; }
+    public void setChannel_name(String channel_name) { this.channel_name = channel_name; }
+
+    public Long getRead_count() { return read_count; }
+    public void setRead_count(Long read_count) { this.read_count = read_count; }
+
+    public Long getTime_ms() { return time_ms; }
+    public void setTime_ms(Long time_ms) { this.time_ms = time_ms; }
+
+    public String getClient_key() { return client_key; }
+    public void setClient_key(String client_key) { this.client_key = client_key; }
+
+    public String getSignature() { return signature; }
+    public void setSignature(String signature) { this.signature = signature; }
+}

SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/entyties/Net_SetChannelReadState_Response.java

@@ -0,0 +1,34 @@
+package server.logic.ws_protocol.JSON.handlers.channels.entyties;
+
+import server.logic.ws_protocol.JSON.entyties.Net_Response;
+
+public class Net_SetChannelReadState_Response extends Net_Response {
+    private String login;
+    private String owner_bch_name;
+    private String channel_name;
+    private Long read_count;
+    private Long unread_count;
+    private Long time_ms;
+    private Boolean applied;
+
+    public String getLogin() { return login; }
+    public void setLogin(String login) { this.login = login; }
+
+    public String getOwner_bch_name() { return owner_bch_name; }
+    public void setOwner_bch_name(String owner_bch_name) { this.owner_bch_name = owner_bch_name; }
+
+    public String getChannel_name() { return channel_name; }
+    public void setChannel_name(String channel_name) { this.channel_name = channel_name; }
+
+    public Long getRead_count() { return read_count; }
+    public void setRead_count(Long read_count) { this.read_count = read_count; }
+
+    public Long getUnread_count() { return unread_count; }
+    public void setUnread_count(Long unread_count) { this.unread_count = unread_count; }
+
+    public Long getTime_ms() { return time_ms; }
+    public void setTime_ms(Long time_ms) { this.time_ms = time_ms; }
+
+    public Boolean getApplied() { return applied; }
+    public void setApplied(Boolean applied) { this.applied = applied; }
+}

SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/connections/Net_GetUserConnectionsGraph_Handler.java

@@ -46,8 +46,10 @@ public class Net_GetUserConnectionsGraph_Handler implements JsonMessageHandler {
                 return NetExceptionResponseFactory.error(req, 404, "USER_NOT_FOUND", "Пользователь не найден");
             }
 
-            List<String> outFriends = ConnectionsStateDAO.getInstance().listOutgoingByRelTypeCanonical(c, canonicalLogin, MsgSubType.CONNECTION_CLOSE_FRIEND);
-            List<String> inFriends = ConnectionsStateDAO.getInstance().listIncomingByRelTypeCanonical(c, canonicalLogin, MsgSubType.CONNECTION_CLOSE_FRIEND);
+            List<String> outFriends = ConnectionsStateDAO.getInstance().listOutgoingByRelTypeCanonical(c, canonicalLogin, MsgSubType.CONNECTION_FRIEND);
+            List<String> inFriends = ConnectionsStateDAO.getInstance().listIncomingByRelTypeCanonical(c, canonicalLogin, MsgSubType.CONNECTION_FRIEND);
+            List<String> outCloseFriends = ConnectionsStateDAO.getInstance().listOutgoingByRelTypeCanonical(c, canonicalLogin, MsgSubType.CONNECTION_CLOSE_FRIEND);
+            List<String> inCloseFriends = ConnectionsStateDAO.getInstance().listIncomingByRelTypeCanonical(c, canonicalLogin, MsgSubType.CONNECTION_CLOSE_FRIEND);
             List<String> outContacts = ConnectionsStateDAO.getInstance().listOutgoingByRelTypeCanonical(c, canonicalLogin, MsgSubType.CONNECTION_CONTACT);
             List<String> inContacts = ConnectionsStateDAO.getInstance().listIncomingByRelTypeCanonical(c, canonicalLogin, MsgSubType.CONNECTION_CONTACT);
             List<String> outFollows = ConnectionsStateDAO.getInstance().listOutgoingByRelTypeCanonical(c, canonicalLogin, MsgSubType.CONNECTION_FOLLOW);
@@ -60,18 +62,21 @@ public class Net_GetUserConnectionsGraph_Handler implements JsonMessageHandler {
             List<String> inChildren = ConnectionsStateDAO.getInstance().listIncomingByRelTypeCanonical(c, canonicalLogin, MsgSubType.CONNECTION_CHILD);
             List<String> outSiblings = ConnectionsStateDAO.getInstance().listOutgoingByRelTypeCanonical(c, canonicalLogin, MsgSubType.CONNECTION_SIBLING);
             List<String> inSiblings = ConnectionsStateDAO.getInstance().listIncomingByRelTypeCanonical(c, canonicalLogin, MsgSubType.CONNECTION_SIBLING);
-            List<String> outKnownPersons = ConnectionsStateDAO.getInstance().listOutgoingByRelTypeCanonical(c, canonicalLogin, MsgSubType.CONNECTION_KNOWN_PERSON);
-            List<String> inKnownPersons = ConnectionsStateDAO.getInstance().listIncomingByRelTypeCanonical(c, canonicalLogin, MsgSubType.CONNECTION_KNOWN_PERSON);
-            List<String> outShineConfirmed = ConnectionsStateDAO.getInstance().listOutgoingByRelTypeCanonical(c, canonicalLogin, MsgSubType.CONNECTION_SHINE_CONFIRMED);
-            List<String> inShineConfirmed = ConnectionsStateDAO.getInstance().listIncomingByRelTypeCanonical(c, canonicalLogin, MsgSubType.CONNECTION_SHINE_CONFIRMED);
+            // Legacy 60/61 are accepted by the protocol but intentionally not surfaced by current UI.
+            List<String> outKnownPersons = List.of();
+            List<String> inKnownPersons = List.of();
+            List<String> outOfficialAccounts = listEffectiveConfirmation(c, canonicalLogin, 80, true);
+            List<String> inOfficialAccounts = listEffectiveConfirmation(c, canonicalLogin, 80, false);
+            List<String> outShineConfirmed = listEffectiveConfirmation(c, canonicalLogin, 70, true);
+            List<String> inShineConfirmed = listEffectiveConfirmation(c, canonicalLogin, 70, false);
             List<String> outShineSeen = ConnectionsStateDAO.getInstance().listOutgoingByRelTypeCanonical(c, canonicalLogin, MsgSubType.CONNECTION_SHINE_SEEN);
             List<String> inShineSeen = ConnectionsStateDAO.getInstance().listIncomingByRelTypeCanonical(c, canonicalLogin, MsgSubType.CONNECTION_SHINE_SEEN);
 
             LinkedHashSet<String> allLogins = new LinkedHashSet<>();
             allLogins.add(canonicalLogin);
-            addAllLogins(allLogins, outFriends, inFriends, outContacts, inContacts, outFollows, inFollows,
+            addAllLogins(allLogins, outFriends, inFriends, outCloseFriends, inCloseFriends, outContacts, inContacts, outFollows, inFollows,
                     outSpouses, inSpouses, outParents, inParents, outChildren, inChildren, outSiblings, inSiblings,
-                    outKnownPersons, inKnownPersons, outShineConfirmed, inShineConfirmed, outShineSeen, inShineSeen);
+                    outKnownPersons, inKnownPersons, outOfficialAccounts, inOfficialAccounts, outShineConfirmed, inShineConfirmed, outShineSeen, inShineSeen);
 
             Map<String, UserMeta> metaByLogin = loadUserMeta(c, allLogins);
             List<String> spouseLogins = mergeUnique(outSpouses, inSpouses);
@@ -86,6 +91,8 @@ public class Net_GetUserConnectionsGraph_Handler implements JsonMessageHandler {
             resp.setLogin(canonicalLogin);
             resp.setOutFriends(outFriends);
             resp.setInFriends(inFriends);
+            resp.setOutCloseFriends(outCloseFriends);
+            resp.setInCloseFriends(inCloseFriends);
             resp.setOutContacts(outContacts);
             resp.setInContacts(inContacts);
             resp.setOutFollows(outFollows);
@@ -100,6 +107,8 @@ public class Net_GetUserConnectionsGraph_Handler implements JsonMessageHandler {
             resp.setInSiblings(inSiblings);
             resp.setOutKnownPersons(outKnownPersons);
             resp.setInKnownPersons(inKnownPersons);
+            resp.setOutOfficialAccounts(outOfficialAccounts);
+            resp.setInOfficialAccounts(inOfficialAccounts);
             resp.setOutShineConfirmed(outShineConfirmed);
             resp.setInShineConfirmed(inShineConfirmed);
             resp.setOutShineSeen(outShineSeen);
@@ -108,11 +117,49 @@ public class Net_GetUserConnectionsGraph_Handler implements JsonMessageHandler {
             resp.setChildren(toRelativeItems(childLogins, metaByLogin));
             resp.setSiblings(toRelativeItems(siblingLogins, metaByLogin));
             resp.setSpouses(toRelativeItems(spouseLogins, metaByLogin));
-            resp.setAllUsers(toUserMarkItems(allLogins, metaByLogin));
+            Map<String, String> relationTypes = buildEffectiveRelationTypes(outContacts, outFriends, outCloseFriends);
+            resp.setAllUsers(toUserMarkItems(allLogins, metaByLogin, relationTypes, outOfficialAccounts, outShineConfirmed));
             return resp;
         }
     }
 
+    private List<String> listEffectiveConfirmation(Connection c, String login, int relType, boolean outgoing) throws Exception {
+        String sql;
+        if (relType == 80) {
+            sql = outgoing ? """
+                SELECT DISTINCT cs.to_login AS peer FROM connections_state cs
+                WHERE LOWER(cs.login)=LOWER(?) AND cs.rel_type=80
+                  AND shine_is_primary(cs.login) AND shine_target_accepts_primary_confirmation(cs.to_login)
+                ORDER BY peer
+                """ : """
+                SELECT DISTINCT cs.login AS peer FROM connections_state cs
+                WHERE LOWER(cs.to_login)=LOWER(?) AND cs.rel_type=80
+                  AND shine_is_primary(cs.login) AND shine_target_accepts_primary_confirmation(cs.to_login)
+                ORDER BY peer
+                """;
+        } else {
+            sql = outgoing ? """
+                SELECT DISTINCT cs.to_login AS peer FROM connections_state cs
+                WHERE LOWER(cs.login)=LOWER(?) AND cs.rel_type=70
+                  AND shine_is_primary(cs.login) AND shine_is_shining(cs.login)
+                  AND shine_target_accepts_shine_confirmation(cs.to_login)
+                ORDER BY peer
+                """ : """
+                SELECT DISTINCT cs.login AS peer FROM connections_state cs
+                WHERE LOWER(cs.to_login)=LOWER(?) AND cs.rel_type=70
+                  AND shine_is_primary(cs.login) AND shine_is_shining(cs.login)
+                  AND shine_target_accepts_shine_confirmation(cs.to_login)
+                ORDER BY peer
+                """;
+        }
+        List<String> out = new ArrayList<>();
+        try (PreparedStatement ps = c.prepareStatement(sql)) {
+            ps.setString(1, login);
+            try (ResultSet rs = ps.executeQuery()) { while (rs.next()) out.add(rs.getString("peer")); }
+        }
+        return out;
+    }
+
     private String findCanonicalLogin(Connection c, String loginAnyCase) throws Exception {
         String sql = "SELECT login FROM " + CurrentUsersSql.usersSubquery("su")
                 + " WHERE LOWER(login) = LOWER(?) LIMIT 1";
@@ -160,47 +207,54 @@ public class Net_GetUserConnectionsGraph_Handler implements JsonMessageHandler {
     private Map<String, UserMeta> loadUserMeta(Connection c, Set<String> logins) throws Exception {
         Map<String, UserMeta> out = new HashMap<>();
         if (logins == null || logins.isEmpty()) return out;
-
         String[] placeholders = new String[logins.size()];
-        for (int i = 0; i < placeholders.length; i += 1) placeholders[i] = "?";
+        for (int i=0;i<placeholders.length;i++) placeholders[i]="?";
         String sql = """
-            SELECT
-                su.login AS login,
-                MAX(CASE WHEN up.param = 'gender' THEN up.value END) AS gender_value,
-                MAX(CASE WHEN up.param = 'official' THEN up.value END) AS official_value,
-                MAX(CASE WHEN up.param = 'shine' THEN up.value END) AS shine_value,
-                MAX(CASE WHEN up.param = 'ava' THEN up.value END) AS avatar_value
+            SELECT su.login,
+                   COALESCE(ups.first_name,'') first_name,
+                   COALESCE(ups.last_name,'') last_name,
+                   ups.account_role, ups.shine_status, COALESCE(ups.ava_ar,'') avatar_value,
+                   COALESCE(ust.primary_confirmations_received_count,0) primary_confirmations_count,
+                   COALESCE(ust.shine_confirmations_received_count,0) shine_confirmations_count,
+                   MAX(CASE WHEN up.param='gender' THEN up.value END) gender_value
             FROM %s
-            LEFT JOIN users_params up
-              ON LOWER(up.login) = LOWER(su.login)
-             AND up.param IN ('gender', 'official', 'shine', 'ava')
+            LEFT JOIN user_profile_state ups ON LOWER(ups.login)=LOWER(su.login)
+            LEFT JOIN user_stats_state ust ON LOWER(ust.login)=LOWER(su.login)
+            LEFT JOIN users_params up ON LOWER(up.login)=LOWER(su.login) AND up.param='gender'
             WHERE LOWER(su.login) IN (%s)
-            GROUP BY su.login
+            GROUP BY su.login, ups.first_name, ups.last_name, ups.account_role, ups.shine_status, ups.ava_ar,
+                     ust.primary_confirmations_received_count, ust.shine_confirmations_received_count
             ORDER BY su.login
             """.formatted(CurrentUsersSql.usersSubquery("su"), String.join(", ", placeholders));
-
-        try (PreparedStatement ps = c.prepareStatement(sql)) {
-            int i = 1;
-            for (String login : logins) {
-                ps.setString(i, normKey(login));
-                i += 1;
-            }
-            try (ResultSet rs = ps.executeQuery()) {
-                while (rs.next()) {
-                    String login = rs.getString("login");
-                    if (login == null || login.isBlank()) continue;
-                    UserMeta meta = new UserMeta();
-                    meta.gender = normalizeGender(rs.getString("gender_value"));
-                    meta.official = parseToggle(rs.getString("official_value"));
-                    meta.shine = parseToggle(rs.getString("shine_value"));
-                    meta.avatarAr = extractArAvatarTxId(rs.getString("avatar_value"));
-                    out.put(normKey(login), meta);
-                }
-            }
+        try(PreparedStatement ps=c.prepareStatement(sql)){
+            int i=1; for(String login:logins) ps.setString(i++,normKey(login));
+            try(ResultSet rs=ps.executeQuery()){while(rs.next()){
+                String login=rs.getString("login"); if(login==null||login.isBlank()) continue;
+                UserMeta meta=new UserMeta(); meta.firstName=rs.getString("first_name"); meta.lastName=rs.getString("last_name");
+                meta.accountRole=rs.getString("account_role"); meta.shineStatus=rs.getString("shine_status");
+                meta.gender=normalizeGender(rs.getString("gender_value")); meta.official="primary".equals(meta.accountRole); meta.shine="shining".equals(meta.shineStatus);
+                meta.primaryConfirmationsCount=rs.getInt("primary_confirmations_count"); meta.shineConfirmationsCount=rs.getInt("shine_confirmations_count");
+                meta.avatarAr=extractArAvatarTxId(rs.getString("avatar_value")); out.put(normKey(login),meta);
+            }}
         }
         return out;
     }
 
+    private Map<String,String> buildEffectiveRelationTypes(List<String> contacts,List<String> friends,List<String> closeFriends){
+        Map<String,String> out=new HashMap<>();
+        if(contacts!=null) for(String v:contacts) out.put(normKey(v),"contact");
+        if(friends!=null) for(String v:friends) out.put(normKey(v),"friend");
+        if(closeFriends!=null) for(String v:closeFriends) out.put(normKey(v),"close_friend");
+        return out;
+    }
+
+    private boolean listContainsLogin(List<String> list, String login) {
+        if (list == null || login == null) return false;
+        String key = normKey(login);
+        for (String value : list) if (key.equals(normKey(value))) return true;
+        return false;
+    }
+
     private boolean parseToggle(String rawValue) {
         String v = String.valueOf(rawValue == null ? "" : rawValue).trim().toLowerCase();
         return "1".equals(v) || "yes".equals(v) || "true".equals(v) || "on".equals(v);
@@ -269,7 +323,10 @@ public class Net_GetUserConnectionsGraph_Handler implements JsonMessageHandler {
 
     private List<Net_GetUserConnectionsGraph_Response.UserMarkItem> toUserMarkItems(
             Set<String> logins,
-            Map<String, UserMeta> metaByLogin
+            Map<String, UserMeta> metaByLogin,
+            Map<String, String> relationTypes,
+            List<String> primaryConfirmedLogins,
+            List<String> shineConfirmedLogins
     ) {
         List<Net_GetUserConnectionsGraph_Response.UserMarkItem> items = new ArrayList<>();
         if (logins == null) return items;
@@ -284,6 +341,15 @@ public class Net_GetUserConnectionsGraph_Handler implements JsonMessageHandler {
 
             Net_GetUserConnectionsGraph_Response.UserMarkItem it = new Net_GetUserConnectionsGraph_Response.UserMarkItem();
             it.setLogin(clean);
+            it.setFirstName(meta == null ? "" : meta.firstName);
+            it.setLastName(meta == null ? "" : meta.lastName);
+            it.setAccountRole(meta == null ? null : meta.accountRole);
+            it.setShineStatus(meta == null ? null : meta.shineStatus);
+            it.setRelationType(relationTypes == null ? "none" : relationTypes.getOrDefault(normKey(clean), "none"));
+            it.setPrimaryConfirmed(listContainsLogin(primaryConfirmedLogins, clean));
+            it.setShineConfirmed(listContainsLogin(shineConfirmedLogins, clean));
+            it.setPrimaryConfirmationsCount(meta == null ? 0 : meta.primaryConfirmationsCount);
+            it.setShineConfirmationsCount(meta == null ? 0 : meta.shineConfirmationsCount);
             it.setOfficial(official);
             it.setShine(shine);
             it.setOfficialLabel(official ? "официальный" : "неофициальный");
@@ -296,6 +362,12 @@ public class Net_GetUserConnectionsGraph_Handler implements JsonMessageHandler {
 
     private static final class UserMeta {
         private String gender = "unknown";
+        private String firstName = "";
+        private String lastName = "";
+        private String accountRole = null;
+        private String shineStatus = null;
+        private int primaryConfirmationsCount = 0;
+        private int shineConfirmationsCount = 0;
         private boolean official = false;
         private boolean shine = false;
         private String avatarAr = null;

SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/connections/Net_ListContacts_Handler.java

@@ -8,10 +8,11 @@ import server.logic.ws_protocol.JSON.handlers.connections.entyties.Net_ListConta
 import server.logic.ws_protocol.JSON.handlers.connections.entyties.Net_ListContacts_Response;
 import server.logic.ws_protocol.JSON.utils.NetExceptionResponseFactory;
 import server.logic.ws_protocol.WireCodes;
-import shine.db.MsgSubType;
-import shine.db.dao.ConnectionsStateDAO;
+import shine.db.dao.DmDialogStateDAO;
+import shine.db.dao.UserProfileStateDAO;
 
 import java.sql.Connection;
+import java.util.ArrayList;
 import java.util.List;
 
 public class Net_ListContacts_Handler implements JsonMessageHandler {
@@ -23,14 +24,47 @@ public class Net_ListContacts_Handler implements JsonMessageHandler {
         }
 
         try (Connection c = shine.db.DbController.getInstance().getConnection()) {
-            List<String> contacts = ConnectionsStateDAO.getInstance().listOutgoingByRelTypeCanonical(c, ctx.getLogin(), MsgSubType.CONNECTION_CONTACT);
+            List<DmDialogStateDAO.DialogSummary> dialogs = DmDialogStateDAO.getInstance().listInboxDialogs(c, ctx.getLogin());
             Net_ListContacts_Response resp = new Net_ListContacts_Response();
             resp.setOp(req.getOp());
             resp.setRequestId(req.getRequestId());
             resp.setStatus(WireCodes.Status.OK);
             resp.setLogin(ctx.getLogin());
-            resp.setContacts(contacts);
+            resp.setDialogs(toDialogItems(c, dialogs));
             return resp;
         }
     }
+
+    private List<Net_ListContacts_Response.DialogItem> toDialogItems(Connection c, List<DmDialogStateDAO.DialogSummary> dialogs) throws Exception {
+        List<Net_ListContacts_Response.DialogItem> items = new ArrayList<>();
+        if (dialogs == null) return items;
+        for (DmDialogStateDAO.DialogSummary dialog : dialogs) {
+            Net_ListContacts_Response.DialogItem item = new Net_ListContacts_Response.DialogItem();
+            item.setPeerLogin(dialog.peerLogin());
+            item.setRelationFlag(dialog.relationFlag());
+            UserProfileStateDAO.ProfileCard card = UserProfileStateDAO.getInstance().get(c, dialog.peerLogin());
+            item.setFirstName(card.firstName());
+            item.setLastName(card.lastName());
+            item.setAvatarAr(card.avatarAr());
+            item.setAvatar(parseAvatar(card.avatarAr()));
+            item.setAccountRole(card.accountRole());
+            item.setShineStatus(card.shineStatus());
+            item.setLastMessageBlobB64(dialog.lastMessageBlobB64());
+            item.setLastMessageTimeMs(dialog.lastMessageTimeMs());
+            item.setUnreadCount(dialog.unreadCount());
+            item.setHasDialog(dialog.hasDialog());
+            items.add(item);
+        }
+        return items;
+    }
+    private static Net_ListContacts_Response.Avatar parseAvatar(String value) {
+        Net_ListContacts_Response.Avatar out = new Net_ListContacts_Response.Avatar();
+        String raw = value == null ? "" : value.trim();
+        java.util.regex.Matcher ar = java.util.regex.Pattern.compile("AR:([A-Za-z0-9_-]{43})").matcher(raw);
+        if (ar.find()) out.setAr(ar.group(1));
+        java.util.regex.Matcher sha = java.util.regex.Pattern.compile("SHA256:([A-Fa-f0-9]{64})").matcher(raw);
+        if (sha.find()) out.setSha256Hex(sha.group(1).toLowerCase());
+        return out;
+    }
+
 }

SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/connections/entyties/Net_GetUserConnectionsGraph_Response.java

@@ -9,6 +9,8 @@ public class Net_GetUserConnectionsGraph_Response extends Net_Response {
     private String login;
     private List<String> outFriends = new ArrayList<>();
     private List<String> inFriends = new ArrayList<>();
+    private List<String> outCloseFriends = new ArrayList<>();
+    private List<String> inCloseFriends = new ArrayList<>();
     private List<String> outContacts = new ArrayList<>();
     private List<String> inContacts = new ArrayList<>();
     private List<String> outFollows = new ArrayList<>();
@@ -23,6 +25,8 @@ public class Net_GetUserConnectionsGraph_Response extends Net_Response {
     private List<String> inSiblings = new ArrayList<>();
     private List<String> outKnownPersons = new ArrayList<>();
     private List<String> inKnownPersons = new ArrayList<>();
+    private List<String> outOfficialAccounts = new ArrayList<>();
+    private List<String> inOfficialAccounts = new ArrayList<>();
     private List<String> outShineConfirmed = new ArrayList<>();
     private List<String> inShineConfirmed = new ArrayList<>();
     private List<String> outShineSeen = new ArrayList<>();
@@ -58,6 +62,15 @@ public class Net_GetUserConnectionsGraph_Response extends Net_Response {
 
     public static class UserMarkItem {
         private String login;
+        private String firstName;
+        private String lastName;
+        private String accountRole;
+        private String shineStatus;
+        private String relationType;
+        private boolean primaryConfirmed;
+        private boolean shineConfirmed;
+        private int primaryConfirmationsCount;
+        private int shineConfirmationsCount;
         private boolean official;
         private boolean shine;
         private String officialLabel;
@@ -66,6 +79,24 @@ public class Net_GetUserConnectionsGraph_Response extends Net_Response {
 
         public String getLogin() { return login; }
         public void setLogin(String login) { this.login = login; }
+        public String getFirstName() { return firstName; }
+        public void setFirstName(String v) { this.firstName = v; }
+        public String getLastName() { return lastName; }
+        public void setLastName(String v) { this.lastName = v; }
+        public String getAccountRole() { return accountRole; }
+        public void setAccountRole(String v) { this.accountRole = v; }
+        public String getShineStatus() { return shineStatus; }
+        public void setShineStatus(String v) { this.shineStatus = v; }
+        public String getRelationType() { return relationType; }
+        public void setRelationType(String v) { this.relationType = v; }
+        public boolean isPrimaryConfirmed() { return primaryConfirmed; }
+        public void setPrimaryConfirmed(boolean v) { this.primaryConfirmed = v; }
+        public boolean isShineConfirmed() { return shineConfirmed; }
+        public void setShineConfirmed(boolean v) { this.shineConfirmed = v; }
+        public int getPrimaryConfirmationsCount() { return primaryConfirmationsCount; }
+        public void setPrimaryConfirmationsCount(int v) { this.primaryConfirmationsCount = v; }
+        public int getShineConfirmationsCount() { return shineConfirmationsCount; }
+        public void setShineConfirmationsCount(int v) { this.shineConfirmationsCount = v; }
         public boolean isOfficial() { return official; }
         public void setOfficial(boolean official) { this.official = official; }
         public boolean isShine() { return shine; }
@@ -84,6 +115,10 @@ public class Net_GetUserConnectionsGraph_Response extends Net_Response {
     public void setOutFriends(List<String> outFriends) { this.outFriends = outFriends; }
     public List<String> getInFriends() { return inFriends; }
     public void setInFriends(List<String> inFriends) { this.inFriends = inFriends; }
+    public List<String> getOutCloseFriends() { return outCloseFriends; }
+    public void setOutCloseFriends(List<String> outCloseFriends) { this.outCloseFriends = outCloseFriends; }
+    public List<String> getInCloseFriends() { return inCloseFriends; }
+    public void setInCloseFriends(List<String> inCloseFriends) { this.inCloseFriends = inCloseFriends; }
     public List<String> getOutContacts() { return outContacts; }
     public void setOutContacts(List<String> outContacts) { this.outContacts = outContacts; }
     public List<String> getInContacts() { return inContacts; }
@@ -112,6 +147,10 @@ public class Net_GetUserConnectionsGraph_Response extends Net_Response {
     public void setOutKnownPersons(List<String> outKnownPersons) { this.outKnownPersons = outKnownPersons; }
     public List<String> getInKnownPersons() { return inKnownPersons; }
     public void setInKnownPersons(List<String> inKnownPersons) { this.inKnownPersons = inKnownPersons; }
+    public List<String> getOutOfficialAccounts() { return outOfficialAccounts; }
+    public void setOutOfficialAccounts(List<String> outOfficialAccounts) { this.outOfficialAccounts = outOfficialAccounts; }
+    public List<String> getInOfficialAccounts() { return inOfficialAccounts; }
+    public void setInOfficialAccounts(List<String> inOfficialAccounts) { this.inOfficialAccounts = inOfficialAccounts; }
     public List<String> getOutShineConfirmed() { return outShineConfirmed; }
     public void setOutShineConfirmed(List<String> outShineConfirmed) { this.outShineConfirmed = outShineConfirmed; }
     public List<String> getInShineConfirmed() { return inShineConfirmed; }

SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/connections/entyties/Net_ListContacts_Response.java

@@ -7,10 +7,59 @@ import java.util.List;
 
 public class Net_ListContacts_Response extends Net_Response {
     private String login;
-    private List<String> contacts = new ArrayList<>();
+    private List<DialogItem> dialogs = new ArrayList<>();
 
     public String getLogin() { return login; }
     public void setLogin(String login) { this.login = login; }
-    public List<String> getContacts() { return contacts; }
-    public void setContacts(List<String> contacts) { this.contacts = contacts; }
+    public List<DialogItem> getDialogs() { return dialogs; }
+    public void setDialogs(List<DialogItem> dialogs) { this.dialogs = dialogs; }
+
+    public static class DialogItem {
+        private String peerLogin;
+        private String relationFlag;
+        private String firstName;
+        private String lastName;
+        private String avatarAr;
+        private Avatar avatar;
+        private String accountRole;
+        private String shineStatus;
+        private String lastMessageBlobB64;
+        private long lastMessageTimeMs;
+        private int unreadCount;
+        private boolean hasDialog;
+
+        public String getPeerLogin() { return peerLogin; }
+        public void setPeerLogin(String peerLogin) { this.peerLogin = peerLogin; }
+        public String getRelationFlag() { return relationFlag; }
+        public void setRelationFlag(String relationFlag) { this.relationFlag = relationFlag; }
+        public String getFirstName() { return firstName; }
+        public void setFirstName(String firstName) { this.firstName = firstName; }
+        public String getLastName() { return lastName; }
+        public void setLastName(String lastName) { this.lastName = lastName; }
+        public String getAvatarAr() { return avatarAr; }
+        public void setAvatarAr(String avatarAr) { this.avatarAr = avatarAr; }
+        public Avatar getAvatar() { return avatar; }
+        public void setAvatar(Avatar avatar) { this.avatar = avatar; }
+        public String getAccountRole() { return accountRole; }
+        public void setAccountRole(String accountRole) { this.accountRole = accountRole; }
+        public String getShineStatus() { return shineStatus; }
+        public void setShineStatus(String shineStatus) { this.shineStatus = shineStatus; }
+        public String getLastMessageBlobB64() { return lastMessageBlobB64; }
+        public void setLastMessageBlobB64(String lastMessageBlobB64) { this.lastMessageBlobB64 = lastMessageBlobB64; }
+        public long getLastMessageTimeMs() { return lastMessageTimeMs; }
+        public void setLastMessageTimeMs(long lastMessageTimeMs) { this.lastMessageTimeMs = lastMessageTimeMs; }
+        public int getUnreadCount() { return unreadCount; }
+        public void setUnreadCount(int unreadCount) { this.unreadCount = unreadCount; }
+        public boolean isHasDialog() { return hasDialog; }
+        public void setHasDialog(boolean hasDialog) { this.hasDialog = hasDialog; }
+    }
+
+    public static class Avatar {
+        private String ar;
+        private String sha256Hex;
+        public String getAr() { return ar; }
+        public void setAr(String ar) { this.ar = ar; }
+        public String getSha256Hex() { return sha256Hex; }
+        public void setSha256Hex(String sha256Hex) { this.sha256Hex = sha256Hex; }
+    }
 }