Исправить edit/delete сообщений, упростить вкладки каналов и улучшить автоскролл DM

2026-05-19 21:00:29 +03:00
parent 7986184111
commit f3262c2d64
18 changed files with 845 additions and 104 deletions
@@ -37,7 +37,9 @@ const MSG_TYPE_CONNECTION = 3;

 const MSG_SUBTYPE_TECH_CREATE_CHANNEL = 1;
 const MSG_SUBTYPE_TEXT_POST = 10;
+const MSG_SUBTYPE_TEXT_EDIT_POST = 11;
 const MSG_SUBTYPE_TEXT_REPLY = 20;
+const MSG_SUBTYPE_TEXT_EDIT_REPLY = 21;
 const MSG_SUBTYPE_REACTION_LIKE = 1;
 const MSG_SUBTYPE_REACTION_UNLIKE = 2;
 const MSG_SUBTYPE_CONNECTION_FOLLOW = 30;
@@ -366,6 +368,56 @@ function makeTextReplyBodyBytes({ toBlockchainName, toBlockNumber, toBlockHashHe
  );
 }

+function makeTextEditPostBodyBytes({
+  lineCode,
+  prevLineNumber,
+  prevLineHashHex,
+  thisLineNumber,
+  toBlockNumber,
+  toBlockHashHex,
+  text,
+}) {
+  const message = String(text || '').trim();
+  const targetBlockNumber = Number(toBlockNumber);
+  if (!Number.isFinite(targetBlockNumber) || targetBlockNumber < 0) {
+    throw new Error('Invalid target block number for edit post');
+  }
+  const textBytes = utf8Bytes(message);
+  if (textBytes.length > 65535) {
+    throw new Error('Message text must be 0..65535 UTF-8 bytes');
+  }
+
+  return concatBytes(
+    int32Bytes(lineCode),
+    int32Bytes(prevLineNumber),
+    hexToBytes(normalizeHex32(prevLineHashHex)),
+    int32Bytes(thisLineNumber),
+    int32Bytes(targetBlockNumber),
+    hexToBytes(normalizeHex32(toBlockHashHex)),
+    int16Bytes(textBytes.length),
+    textBytes,
+  );
+}
+
+function makeTextEditReplyBodyBytes({ toBlockNumber, toBlockHashHex, text }) {
+  const message = String(text || '').trim();
+  const targetBlockNumber = Number(toBlockNumber);
+  if (!Number.isFinite(targetBlockNumber) || targetBlockNumber < 0) {
+    throw new Error('Invalid target block number for edit reply');
+  }
+  const textBytes = utf8Bytes(message);
+  if (textBytes.length > 65535) {
+    throw new Error('Message text must be 0..65535 UTF-8 bytes');
+  }
+
+  return concatBytes(
+    int32Bytes(targetBlockNumber),
+    hexToBytes(normalizeHex32(toBlockHashHex)),
+    int16Bytes(textBytes.length),
+    textBytes,
+  );
+}
+
 function makeConnectionBodyBytes({
  lineCode = 0,
  prevLineNumber = -1,
@@ -955,6 +1007,98 @@ export class AuthService {
    });
  }

+  async addBlockEditMessage({
+    login,
+    message,
+    text,
+    storagePwd,
+    isChannelPost = false,
+    channel = null,
+  }) {
+    const cleanLogin = String(login || '').trim();
+    const cleanText = String(text || '').trim();
+    const target = normalizeMessageRefTarget(message, 'edit');
+    const lockKey = `edit:${cleanLogin}:${target.blockchainName}:${target.blockNumber}:${target.blockHash}:${cleanText}:${isChannelPost ? 'post' : 'reply'}`;
+
+    return this.runWriteLocked(lockKey, async () => {
+      if (isChannelPost) {
+        const selector = channel || {};
+        const ownerBlockchainName = String(selector?.ownerBlockchainName || target.blockchainName || '').trim();
+        const lineCode = Number(selector?.channelRootBlockNumber);
+        if (!ownerBlockchainName || !Number.isFinite(lineCode) || lineCode < 0) {
+          throw new Error('Invalid channel selector for edit');
+        }
+
+        let rootHashHex = normalizeHex32(selector?.channelRootBlockHash, ZERO64);
+        if (rootHashHex === ZERO64) {
+          const ownChannels = await this.listOwnChannelsForBlockchain(cleanLogin, ownerBlockchainName);
+          const rootChannel = ownChannels.find((item) => item.rootBlockNumber === lineCode);
+          if (rootChannel) rootHashHex = normalizeHex32(rootChannel.rootBlockHash, ZERO64);
+        }
+
+        let prevLineNumber = lineCode;
+        let prevLineHashHex = rootHashHex;
+        let thisLineNumber = 1;
+        try {
+          const latestPayload = await this.getChannelMessages({
+            ownerBlockchainName,
+            channelRootBlockNumber: lineCode,
+            channelRootBlockHash: rootHashHex,
+          }, 1, 'desc', cleanLogin);
+          const latestMessage = Array.isArray(latestPayload?.messages) ? latestPayload.messages[0] : null;
+          const latestVersions = Array.isArray(latestMessage?.versions) ? latestMessage.versions : [];
+          const latestVersion = latestVersions[latestVersions.length - 1] || null;
+          const latestBlockNumber = Number(latestVersion?.blockNumber ?? latestMessage?.messageRef?.blockNumber);
+          const latestBlockHash = normalizeHex32(latestVersion?.blockHash ?? latestMessage?.messageRef?.blockHash, '');
+          const latestVersionsTotal = Number(latestMessage?.versionsTotal);
+          if (Number.isFinite(latestBlockNumber) && latestBlockNumber >= 0 && latestBlockHash) {
+            prevLineNumber = latestBlockNumber;
+            prevLineHashHex = latestBlockHash;
+            thisLineNumber = Number.isFinite(latestVersionsTotal) && latestVersionsTotal > 0
+              ? Math.max(1, latestVersionsTotal)
+              : 1;
+          }
+        } catch {
+          // fallback to root anchor
+        }
+
+        const bodyBytes = makeTextEditPostBodyBytes({
+          lineCode,
+          prevLineNumber,
+          prevLineHashHex,
+          thisLineNumber,
+          toBlockNumber: target.blockNumber,
+          toBlockHashHex: target.blockHash,
+          text: cleanText,
+        });
+
+        return this.addBlockSigned({
+          login: cleanLogin,
+          storagePwd,
+          msgType: MSG_TYPE_TEXT,
+          msgSubType: MSG_SUBTYPE_TEXT_EDIT_POST,
+          msgVersion: 1,
+          bodyBytes,
+        });
+      }
+
+      const bodyBytes = makeTextEditReplyBodyBytes({
+        toBlockNumber: target.blockNumber,
+        toBlockHashHex: target.blockHash,
+        text: cleanText,
+      });
+
+      return this.addBlockSigned({
+        login: cleanLogin,
+        storagePwd,
+        msgType: MSG_TYPE_TEXT,
+        msgSubType: MSG_SUBTYPE_TEXT_EDIT_REPLY,
+        msgVersion: 1,
+        bodyBytes,
+      });
+    });
+  }
+
  async addBlockFollowUser({ login, targetLogin, storagePwd, unfollow = false }) {
    const cleanTargetLogin = String(targetLogin || '').trim().replace(/^@+/, '');
    if (!cleanTargetLogin) throw new Error('Target login is required');