SHA256
Уточнить удаление каналов и обновить версии
Доработана серверная и клиентская логика удаления публичных каналов. Обновлена документация API и форматов блокчейна.
This commit is contained in:
@@ -127,7 +127,7 @@ public final class ChannelNameStateDAO {
|
||||
SET is_deleted = ?,
|
||||
deleted_at_ms = ?,
|
||||
deleted_block_number = ?
|
||||
WHERE owner_bch_name = ?
|
||||
WHERE LOWER(owner_login) = LOWER(?)
|
||||
AND channel_root_block_number = ?
|
||||
AND is_deleted IS DISTINCT FROM ?
|
||||
""";
|
||||
@@ -135,7 +135,7 @@ public final class ChannelNameStateDAO {
|
||||
ps.setBoolean(1, deleted);
|
||||
ps.setLong(2, deleted ? Math.max(0L, deletedAtMs) : 0L);
|
||||
if (deleted && deletedBlockNumber != null) ps.setInt(3, deletedBlockNumber); else ps.setNull(3, java.sql.Types.INTEGER);
|
||||
ps.setString(4, ownerBchName);
|
||||
ps.setString(4, loginOf(ownerBchName));
|
||||
ps.setInt(5, rootBlockNumber);
|
||||
ps.setBoolean(6, deleted);
|
||||
return ps.executeUpdate() > 0;
|
||||
|
||||
+29
-4
@@ -17,6 +17,7 @@ import java.sql.ResultSet;
|
||||
import java.util.ArrayList;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
|
||||
public final class ChannelNamesStateBootstrapper {
|
||||
@@ -48,7 +49,15 @@ public final class ChannelNamesStateBootstrapper {
|
||||
SELECT login, bch_name, block_number, block_hash, block_bytes
|
||||
FROM blocks
|
||||
WHERE msg_type = ? AND msg_sub_type = ?
|
||||
ORDER BY bch_name, block_number
|
||||
AND fork_number=shine_canonical_fork(
|
||||
login,
|
||||
(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER
|
||||
FROM solana_user_pda_current
|
||||
WHERE LOWER(login)=LOWER(blocks.login)
|
||||
LIMIT 1),
|
||||
block_number
|
||||
)
|
||||
ORDER BY LOWER(login), block_number
|
||||
""";
|
||||
|
||||
try (Connection c = DbController.getInstance().getConnection()) {
|
||||
@@ -107,7 +116,7 @@ public final class ChannelNamesStateBootstrapper {
|
||||
}
|
||||
|
||||
String identity = ownerBch + "#" + blockNumber;
|
||||
String ownerTypeSlug = ownerBch + "|" + channelTypeCode + "|" + slug;
|
||||
String ownerTypeSlug = ownerLogin.toLowerCase(Locale.ROOT) + "|" + channelTypeCode + "|" + slug;
|
||||
String existing = slugToIdentity.putIfAbsent(ownerTypeSlug, identity);
|
||||
if (existing != null && !existing.equals(identity)) {
|
||||
conflicts.add("owner/type/slug=\"" + ownerTypeSlug + "\" conflicts: " + existing + " vs " + identity);
|
||||
@@ -188,7 +197,15 @@ public final class ChannelNamesStateBootstrapper {
|
||||
SELECT bch_name, block_number, block_bytes, msg_sub_type
|
||||
FROM blocks
|
||||
WHERE msg_type = ? AND msg_sub_type IN (?, ?, ?, ?, ?, ?, ?)
|
||||
ORDER BY bch_name, block_number
|
||||
AND fork_number=shine_canonical_fork(
|
||||
login,
|
||||
(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER
|
||||
FROM solana_user_pda_current
|
||||
WHERE LOWER(login)=LOWER(blocks.login)
|
||||
LIMIT 1),
|
||||
block_number
|
||||
)
|
||||
ORDER BY LOWER(login), block_number
|
||||
""";
|
||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||
ps.setInt(1, MSG_TYPE_TEXT);
|
||||
@@ -229,7 +246,15 @@ public final class ChannelNamesStateBootstrapper {
|
||||
SELECT login, bch_name, block_number, block_bytes
|
||||
FROM blocks
|
||||
WHERE msg_type = ? AND msg_sub_type = ?
|
||||
ORDER BY bch_name, block_number
|
||||
AND fork_number=shine_canonical_fork(
|
||||
login,
|
||||
(SELECT substring(blockchain_name from '([0-9]{3})$')::INTEGER
|
||||
FROM solana_user_pda_current
|
||||
WHERE LOWER(login)=LOWER(blocks.login)
|
||||
LIMIT 1),
|
||||
block_number
|
||||
)
|
||||
ORDER BY LOWER(login), block_number
|
||||
""";
|
||||
try (PreparedStatement ps = c.prepareStatement(sql)) {
|
||||
ps.setInt(1, MSG_TYPE_TEXT);
|
||||
|
||||
Reference in New Issue
Block a user