Добавлен умный поиск в каналах

This commit is contained in:
AidarKC
2026-10-11 23:57:09 +03:00
parent 07ddaf5e4c
commit bb725ee451
28 changed files with 731 additions and 208 deletions
@@ -22,8 +22,10 @@ public final class DatabaseInitializer {
public static final int DB_FORMAT_VERSION = 2;
public static final int SCHEMA_VERSION_1 = 1;
public static final int SCHEMA_VERSION_31 = 31;
public static final int SCHEMA_VERSION_32 = 32;
public static final String POSTGRES_SCHEMA_RESOURCE = "postgres/schema_v1.sql";
public static final String POSTGRES_MIGRATION_V31_RESOURCE = "postgres/migration_v31.sql";
public static final String POSTGRES_MIGRATION_V32_RESOURCE = "postgres/migration_v32.sql";
private DatabaseInitializer() {}
@@ -119,9 +121,13 @@ public final class DatabaseInitializer {
runSqlScript(conn, POSTGRES_MIGRATION_V31_RESOURCE);
currentVersion = readCurrentSchemaVersion(conn);
}
if (currentVersion != SCHEMA_VERSION_31) {
if (currentVersion == SCHEMA_VERSION_31) {
runSqlScript(conn, POSTGRES_MIGRATION_V32_RESOURCE);
currentVersion = readCurrentSchemaVersion(conn);
}
if (currentVersion != SCHEMA_VERSION_32) {
throw new SQLException(
"Unsupported SHiNE DB v2 schema version: expected 31, found " + currentVersion);
"Unsupported SHiNE DB v2 schema version: expected 32, found " + currentVersion);
}
}
}
@@ -0,0 +1,120 @@
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 java.util.Locale;
/** Read-only поиск по серверному индексу актуальных публичных каналов. */
public final class ChannelSearchDAO {
private ChannelSearchDAO() {}
public record Match(String ownerLogin, String slug, String displayName, String description,
String avatarAr, String avatarSha256, String ownerBlockchainName,
int rootBlockNumber, String rootBlockHashHex, int subscribersCount) {}
// LIKE ESCAPE '!' — введённые пользователем %, _ и ! трактуются буквально.
private static String escapedPattern(String text) {
return text.replace("!", "!!").replace("%", "!%").replace("_", "!_");
}
private static String normalized(String text) {
return (text == null ? "" : text.trim()).toLowerCase(Locale.ROOT).replace('ё', 'е');
}
public static List<Match> search(Connection c, String query, String ownerLogin, int limit) throws SQLException {
String needle = normalized(query).replaceFirst("^@", "");
String ownerFilter = normalized(ownerLogin).replaceFirst("^@", "");
boolean ownerOnly = query != null && query.trim().startsWith("@") && !needle.contains("/");
String channelNeedle = needle;
if (needle.contains("/")) {
String[] parts = needle.split("/", 2);
if (ownerFilter.isBlank()) ownerFilter = parts[0];
channelNeedle = parts[1];
}
// Если указан owner/название, техническое и публичное название ищем только у владельца.
boolean hasOwner = !ownerFilter.isBlank();
String exact = channelNeedle;
String anywhere = "%" + escapedPattern(exact) + "%";
String prefix = escapedPattern(exact) + "%";
String ownerExact = ownerFilter;
String ownerPrefix = escapedPattern(ownerExact) + "%";
String ownerAnywhere = "%" + escapedPattern(ownerExact) + "%";
String sql = """
SELECT cn.owner_login, cn.slug, cn.display_name, cn.channel_description,
cn.ava_ar, cn.ava_sha256, cn.owner_bch_name,
cn.channel_root_block_number, encode(cn.channel_root_block_hash, 'hex') AS root_hash,
COALESCE(cs.subscribers_count, 0) AS subscribers_count
FROM channel_names_state cn
LEFT JOIN channel_stats_state cs
ON cs.owner_bch_name = cn.owner_bch_name
AND cs.channel_root_block_number = cn.channel_root_block_number
AND cs.channel_root_block_hash = cn.channel_root_block_hash
WHERE cn.channel_type_code = 1 AND NOT cn.is_deleted
AND (? = '' OR replace(lower(cn.owner_login), 'ё','е') LIKE ? ESCAPE '!')
AND (
(? = true AND replace(lower(cn.owner_login), 'ё','е') LIKE ? ESCAPE '!')
OR (? = false AND (
replace(lower(cn.display_name), 'ё','е') LIKE ? ESCAPE '!'
OR replace(lower(cn.slug), 'ё','е') LIKE ? ESCAPE '!'
OR (? = false AND replace(lower(cn.owner_login), 'ё','е') LIKE ? ESCAPE '!')
OR (? = true AND ? = '' AND replace(lower(cn.owner_login), 'ё','е') LIKE ? ESCAPE '!')
))
)
ORDER BY
CASE
WHEN replace(lower(cn.display_name), 'ё','е') = ? THEN 0
WHEN replace(lower(cn.slug), 'ё','е') = ? THEN 1
WHEN replace(lower(cn.display_name), 'ё','е') LIKE ? ESCAPE '!' THEN 2
WHEN replace(lower(cn.slug), 'ё','е') LIKE ? ESCAPE '!' THEN 3
WHEN replace(lower(cn.owner_login), 'ё','е') = ? THEN 4
WHEN replace(lower(cn.display_name), 'ё','е') LIKE ? ESCAPE '!' THEN 5
WHEN replace(lower(cn.slug), 'ё','е') LIKE ? ESCAPE '!' THEN 6
ELSE 7
END,
COALESCE(cs.subscribers_count, 0) DESC,
lower(cn.owner_login), lower(cn.slug), cn.owner_bch_name
LIMIT ?
""";
// ownerOnly = поиск @login. Когда указан владелец — ограничиваем выборку,
// а пустой сегмент / означает «все каналы этого пользователя».
String term = exact;
boolean filterByOwner = hasOwner && !ownerOnly;
List<Match> matches = new ArrayList<>();
try (PreparedStatement ps = c.prepareStatement(sql)) {
int i = 1;
ps.setString(i++, filterByOwner ? ownerFilter : "");
ps.setString(i++, ownerPrefix);
ps.setBoolean(i++, ownerOnly);
ps.setString(i++, "%" + escapedPattern(term) + "%");
ps.setBoolean(i++, ownerOnly);
ps.setString(i++, anywhere);
ps.setString(i++, anywhere);
ps.setBoolean(i++, filterByOwner);
ps.setString(i++, anywhere);
ps.setBoolean(i++, filterByOwner);
ps.setString(i++, exact);
ps.setString(i++, ownerAnywhere);
ps.setString(i++, term);
ps.setString(i++, term);
ps.setString(i++, prefix);
ps.setString(i++, prefix);
ps.setString(i++, term);
ps.setString(i++, anywhere);
ps.setString(i++, anywhere);
ps.setInt(i, Math.min(50, Math.max(1, limit)));
try (ResultSet rs = ps.executeQuery()) {
while (rs.next()) matches.add(new Match(
rs.getString("owner_login"), rs.getString("slug"), rs.getString("display_name"),
rs.getString("channel_description"), rs.getString("ava_ar"), rs.getString("ava_sha256"),
rs.getString("owner_bch_name"), rs.getInt("channel_root_block_number"),
rs.getString("root_hash"), rs.getInt("subscribers_count")
));
}
}
return matches;
}
}
@@ -204,6 +204,53 @@ public final class CurrentUsersDAO {
}
}
/** Поиск логинов и публичных имён; результат не раскрывает приватные ключи PDA. */
public record SearchUserCard(String login, String displayName, String avatarAr) {}
public List<SearchUserCard> searchDirectory(String query, Boolean isServer, int limit) throws SQLException {
String term = query.trim().toLowerCase(java.util.Locale.ROOT).replace('ё', 'е');
String escaped = term.replace("!", "!!").replace("%", "!%").replace("_", "!_");
String sql = """
SELECT su.login, coalesce(up.first_name, '') AS first_name,
coalesce(up.last_name, '') AS last_name, coalesce(up.ava_ar, '') AS ava_ar
FROM solana_user_pda_current su
LEFT JOIN user_profile_state up ON lower(up.login) = lower(su.login)
WHERE (? IS NULL OR su.is_server = ?)
AND (
replace(lower(su.login), 'ё', 'е') LIKE ? ESCAPE '!'
OR replace(lower(coalesce(up.first_name, '') || ' ' || coalesce(up.last_name, '')), 'ё', 'е') LIKE ? ESCAPE '!'
OR replace(lower(coalesce(up.last_name, '') || ' ' || coalesce(up.first_name, '')), 'ё', 'е') LIKE ? ESCAPE '!'
)
ORDER BY
CASE WHEN replace(lower(su.login), 'ё','е') = ? THEN 0
WHEN replace(lower(su.login), 'ё','е') LIKE ? ESCAPE '!' THEN 1
WHEN replace(lower(coalesce(up.first_name, '') || ' ' || coalesce(up.last_name, '')), 'ё', 'е') LIKE ? ESCAPE '!' THEN 2
ELSE 3 END,
lower(su.login)
LIMIT ?
""";
List<SearchUserCard> users = new ArrayList<>();
try (Connection c = db.getConnection(); PreparedStatement ps = c.prepareStatement(sql)) {
int i = 1;
if (isServer == null) { ps.setNull(i++, Types.BOOLEAN); ps.setNull(i++, Types.BOOLEAN); }
else { ps.setBoolean(i++, isServer); ps.setBoolean(i++, isServer); }
ps.setString(i++, escaped + "%");
ps.setString(i++, "%" + escaped + "%");
ps.setString(i++, "%" + escaped + "%");
ps.setString(i++, term);
ps.setString(i++, escaped + "%");
ps.setString(i++, escaped + "%");
ps.setInt(i, Math.min(50, Math.max(1, limit)));
try (ResultSet rs = ps.executeQuery()) {
while (rs.next()) {
String publicName = (rs.getString("first_name") + " " + rs.getString("last_name")).trim();
users.add(new SearchUserCard(rs.getString("login"), publicName, rs.getString("ava_ar")));
}
}
}
return users;
}
// -------------------- MAPPER --------------------
private CurrentUserEntry mapRow(ResultSet rs) throws SQLException {
@@ -0,0 +1,19 @@
-- Поиск публичных каналов и отображаемых имён (SHiNE DB v32).
BEGIN;
CREATE EXTENSION IF NOT EXISTS pg_trgm;
CREATE INDEX IF NOT EXISTS idx_channel_names_search_display
ON channel_names_state USING gin ((replace(lower(display_name), 'ё', 'е')) gin_trgm_ops)
WHERE channel_type_code = 1 AND NOT is_deleted;
CREATE INDEX IF NOT EXISTS idx_channel_names_search_slug
ON channel_names_state USING gin ((replace(lower(slug), 'ё', 'е')) gin_trgm_ops)
WHERE channel_type_code = 1 AND NOT is_deleted;
CREATE INDEX IF NOT EXISTS idx_channel_names_search_owner
ON channel_names_state USING gin ((replace(lower(owner_login), 'ё', 'е')) gin_trgm_ops)
WHERE channel_type_code = 1 AND NOT is_deleted;
CREATE INDEX IF NOT EXISTS idx_user_profile_search_name
ON user_profile_state USING gin ((replace(lower(coalesce(first_name, '') || ' ' || coalesce(last_name, '')), 'ё', 'е')) gin_trgm_ops);
CREATE INDEX IF NOT EXISTS idx_user_profile_search_name_reverse
ON user_profile_state USING gin ((replace(lower(coalesce(last_name, '') || ' ' || coalesce(first_name, '')), 'ё', 'е')) gin_trgm_ops);
UPDATE db_schema_version SET schema_version = 32,
updated_at_ms = CAST(EXTRACT(EPOCH FROM clock_timestamp()) * 1000 AS BIGINT) WHERE id = 1;
COMMIT;
@@ -2658,6 +2658,15 @@ CREATE TABLE IF NOT EXISTS canonical_rebuild_staging (
);
CREATE INDEX IF NOT EXISTS idx_canonical_rebuild_staging_login ON canonical_rebuild_staging(login,logical_block_number);
INSERT INTO db_schema_version(id,schema_version,updated_at_ms) VALUES(1,31,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;
-- v32: триграммные индексы публичного поиска.
CREATE EXTENSION IF NOT EXISTS pg_trgm;
CREATE INDEX IF NOT EXISTS idx_channel_names_search_display ON channel_names_state USING gin ((replace(lower(display_name), 'ё', 'е')) gin_trgm_ops) WHERE channel_type_code = 1 AND NOT is_deleted;
CREATE INDEX IF NOT EXISTS idx_channel_names_search_slug ON channel_names_state USING gin ((replace(lower(slug), 'ё', 'е')) gin_trgm_ops) WHERE channel_type_code = 1 AND NOT is_deleted;
CREATE INDEX IF NOT EXISTS idx_channel_names_search_owner ON channel_names_state USING gin ((replace(lower(owner_login), 'ё', 'е')) gin_trgm_ops) WHERE channel_type_code = 1 AND NOT is_deleted;
CREATE INDEX IF NOT EXISTS idx_user_profile_search_name ON user_profile_state USING gin ((replace(lower(coalesce(first_name, '') || ' ' || coalesce(last_name, '')), 'ё', 'е')) gin_trgm_ops);
CREATE INDEX IF NOT EXISTS idx_user_profile_search_name_reverse ON user_profile_state USING gin ((replace(lower(coalesce(last_name, '') || ' ' || coalesce(first_name, '')), 'ё', 'е')) gin_trgm_ops);
INSERT INTO db_schema_version(id,schema_version,updated_at_ms) VALUES(1,32,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;
@@ -96,6 +96,7 @@ import server.logic.ws_protocol.JSON.handlers.channels.Net_GetGroupDialog_Handle
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_SearchChannels_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;
@@ -106,6 +107,7 @@ import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_GetMessageLi
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_SearchChannels_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;
@@ -182,6 +184,7 @@ public final class JsonHandlerRegistry {
private static final Map<String, JsonMessageHandler> HANDLERS = Map.ofEntries(
Map.entry("GetUser", new Net_GetUser_Handler()),
Map.entry("SearchUsers", new Net_SearchUsers_Handler()),
Map.entry("SearchChannels", new Net_SearchChannels_Handler()),
// --- auth ---
Map.entry("ResolveLoginForAuth", new Net_ResolveLoginForAuth_Handler()),
@@ -286,6 +289,7 @@ public final class JsonHandlerRegistry {
private static final Map<String, Class<? extends Net_Request>> REQUEST_TYPES = Map.ofEntries(
Map.entry("GetUser", Net_GetUser_Request.class),
Map.entry("SearchUsers", Net_SearchUsers_Request.class),
Map.entry("SearchChannels", Net_SearchChannels_Request.class),
// --- auth ---
Map.entry("ResolveLoginForAuth", Net_ResolveLoginForAuth_Request.class),
@@ -20,7 +20,10 @@ public final class RemoteUserOperationPolicy {
"ClientErrorLog",
"ClientDebugLog",
"CloseActiveSession",
"ResolveLoginForAuth"
"ResolveLoginForAuth",
// Публичный read-only поиск доступен и REMOTE-сессии.
"SearchChannels",
"SearchUsers"
);
private RemoteUserOperationPolicy() {}
@@ -0,0 +1,52 @@
package server.logic.ws_protocol.JSON.handlers.channels;
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_SearchChannels_Request;
import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_SearchChannels_Response;
import server.logic.ws_protocol.JSON.utils.NetExceptionResponseFactory;
import server.logic.ws_protocol.WireCodes;
import shine.db.DbController;
import shine.db.dao.ChannelSearchDAO;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
public class Net_SearchChannels_Handler implements JsonMessageHandler {
@Override
public Net_Response handle(Net_Request base, ConnectionContext ctx) {
Net_SearchChannels_Request req = (Net_SearchChannels_Request) base;
String query = req.getQuery() == null ? "" : req.getQuery().trim();
String owner = req.getOwnerLogin() == null ? "" : req.getOwnerLogin().trim();
if ((query.isEmpty() && owner.isEmpty()) || query.equals("@") || query.startsWith("/")
|| query.startsWith("@/") || query.length() > 120 || owner.length() > 80
|| (req.getLimit() != null && (req.getLimit() < 1 || req.getLimit() > 50))) {
return NetExceptionResponseFactory.error(req, WireCodes.Status.BAD_REQUEST,
"BAD_FIELDS", "Нужен query или ownerLogin; limit от 1 до 50; длина query до 120 символов.");
}
int limit = req.getLimit() == null ? 10 : req.getLimit();
try (Connection c = DbController.getInstance().getConnection()) {
List<Net_SearchChannels_Response.ChannelItem> channels = new ArrayList<>();
for (var match : ChannelSearchDAO.search(c, query, owner, limit)) {
var item = new Net_SearchChannels_Response.ChannelItem();
item.setOwnerLogin(match.ownerLogin()); item.setSlug(match.slug());
item.setDisplayName(match.displayName()); item.setDescription(match.description());
item.setAvatarAr(match.avatarAr()); item.setAvatarSha256(match.avatarSha256());
item.setOwnerBlockchainName(match.ownerBlockchainName());
item.setRootBlockNumber(match.rootBlockNumber()); item.setRootBlockHashHex(match.rootBlockHashHex());
item.setSubscribersCount(match.subscribersCount());
channels.add(item);
}
var resp = new Net_SearchChannels_Response();
resp.setOp(req.getOp()); resp.setRequestId(req.getRequestId());
resp.setStatus(WireCodes.Status.OK); resp.setChannels(channels);
return resp;
} catch (SQLException e) {
return NetExceptionResponseFactory.error(req, WireCodes.Status.SERVER_DATA_ERROR,
"DB_ERROR", "Ошибка БД при поиске каналов");
}
}
}
@@ -0,0 +1,17 @@
package server.logic.ws_protocol.JSON.handlers.channels.entyties;
import server.logic.ws_protocol.JSON.entyties.Net_Request;
/** Поиск публичных каналов по названию, slug и логину владельца. */
public class Net_SearchChannels_Request extends Net_Request {
private String query;
private String ownerLogin;
private Integer limit;
public String getQuery() { return query; }
public void setQuery(String query) { this.query = query; }
public String getOwnerLogin() { return ownerLogin; }
public void setOwnerLogin(String ownerLogin) { this.ownerLogin = ownerLogin; }
public Integer getLimit() { return limit; }
public void setLimit(Integer limit) { this.limit = limit; }
}
@@ -0,0 +1,37 @@
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_SearchChannels_Response extends Net_Response {
private List<ChannelItem> channels = new ArrayList<>();
public List<ChannelItem> getChannels() { return channels; }
public void setChannels(List<ChannelItem> channels) { this.channels = channels; }
public static class ChannelItem {
private String ownerLogin, slug, displayName, description, avatarAr, avatarSha256,
ownerBlockchainName, rootBlockHashHex;
private int rootBlockNumber, subscribersCount;
public String getOwnerLogin() { return ownerLogin; }
public void setOwnerLogin(String v) { ownerLogin = v; }
public String getSlug() { return slug; }
public void setSlug(String v) { slug = v; }
public String getDisplayName() { return displayName; }
public void setDisplayName(String v) { displayName = v; }
public String getDescription() { return description; }
public void setDescription(String v) { description = v; }
public String getAvatarAr() { return avatarAr; }
public void setAvatarAr(String v) { avatarAr = v; }
public String getAvatarSha256() { return avatarSha256; }
public void setAvatarSha256(String v) { avatarSha256 = v; }
public String getOwnerBlockchainName() { return ownerBlockchainName; }
public void setOwnerBlockchainName(String v) { ownerBlockchainName = v; }
public int getRootBlockNumber() { return rootBlockNumber; }
public void setRootBlockNumber(int v) { rootBlockNumber = v; }
public String getRootBlockHashHex() { return rootBlockHashHex; }
public void setRootBlockHashHex(String v) { rootBlockHashHex = v; }
public int getSubscribersCount() { return subscribersCount; }
public void setSubscribersCount(int v) { subscribersCount = v; }
}
}
@@ -25,7 +25,8 @@ public class Net_SearchUsers_Handler implements JsonMessageHandler {
public Net_Response handle(Net_Request baseRequest, ConnectionContext ctx) {
Net_SearchUsers_Request req = (Net_SearchUsers_Request) baseRequest;
if (req.getPrefix() == null || req.getPrefix().isBlank()) {
if (req.getPrefix() == null || req.getPrefix().isBlank() || req.getPrefix().length() > 120
|| (req.getLimit() != null && (req.getLimit() < 1 || req.getLimit() > 50))) {
return NetExceptionResponseFactory.error(
req,
WireCodes.Status.BAD_REQUEST,
@@ -39,13 +40,18 @@ public class Net_SearchUsers_Handler implements JsonMessageHandler {
try {
CurrentUsersDAO dao = CurrentUsersDAO.getInstance();
List<CurrentUserEntry> users = dao.searchByLoginPrefix(prefix, isServer); // case-insensitive + LIMIT 5
// Старые клиенты по-прежнему получают массив строк logins.
// Новый поиск дополнительно учитывает человекочитаемое имя.
var cards = dao.searchDirectory(prefix, isServer, req.getLimit() == null ? 5 : req.getLimit());
List<String> logins = new ArrayList<>();
for (CurrentUserEntry u : users) {
if (u != null && u.getLogin() != null) {
logins.add(u.getLogin()); // регистр как в БД
}
List<Net_SearchUsers_Response.UserItem> users = new ArrayList<>();
for (var card : cards) {
logins.add(card.login());
var item = new Net_SearchUsers_Response.UserItem();
item.setLogin(card.login());
item.setDisplayName(card.displayName());
item.setAvatarAr(card.avatarAr());
users.add(item);
}
Net_SearchUsers_Response resp = new Net_SearchUsers_Response();
@@ -53,6 +59,7 @@ public class Net_SearchUsers_Handler implements JsonMessageHandler {
resp.setRequestId(req.getRequestId());
resp.setStatus(WireCodes.Status.OK);
resp.setLogins(logins);
resp.setUsers(users);
log.info("✅ SearchUsers ok: prefix='{}', isServer={} -> {}", prefix, isServer, logins.size());
return resp;
@@ -19,7 +19,10 @@ public class Net_SearchUsers_Request extends Net_Request {
private String prefix;
private Boolean isServer;
private Integer limit;
public Integer getLimit() { return limit; }
public void setLimit(Integer value) { limit = value; }
public String getPrefix() { return prefix; }
public void setPrefix(String prefix) { this.prefix = prefix; }
public Boolean getIsServer() { return isServer; }
@@ -23,6 +23,20 @@ import java.util.List;
public class Net_SearchUsers_Response extends Net_Response {
private List<String> logins = new ArrayList<>();
private List<UserItem> users = new ArrayList<>();
public List<UserItem> getUsers() { return users; }
public void setUsers(List<UserItem> users) { this.users = users; }
public static class UserItem {
private String login, displayName, avatarAr;
public String getLogin() { return login; }
public void setLogin(String value) { login = value; }
public String getDisplayName() { return displayName; }
public void setDisplayName(String value) { displayName = value; }
public String getAvatarAr() { return avatarAr; }
public void setAvatarAr(String value) { avatarAr = value; }
}
public List<String> getLogins() { return logins; }
public void setLogins(List<String> logins) { this.logins = logins; }