SHA256
Merge origin/main: умный поиск каналов и пользователей
This commit is contained in:
@@ -79,6 +79,7 @@ shine-solana/shine/scripts/**/TEMP_*.md
|
|||||||
# Локальные артефакты и внешние материалы ESP32-подпроекта
|
# Локальные артефакты и внешние материалы ESP32-подпроекта
|
||||||
ESP32/esp32-config-tool/
|
ESP32/esp32-config-tool/
|
||||||
ESP32/local-sketches/
|
ESP32/local-sketches/
|
||||||
|
ESP32/esp32/ESP32-S3-Touch-AMOLED-2.16/main-device/test_sketches/breath_dual_mode_monitor/
|
||||||
ESP32/**/.git/
|
ESP32/**/.git/
|
||||||
ESP32/**/.idea/
|
ESP32/**/.idea/
|
||||||
ESP32-wallet/.idea/
|
ESP32-wallet/.idea/
|
||||||
|
|||||||
@@ -47,6 +47,7 @@ case "${MODE}" in
|
|||||||
lvgl-official-based-test) SKETCH_DIR="${ROOT_DIR}/test_sketches/lvgl_official_based_test" ;;
|
lvgl-official-based-test) SKETCH_DIR="${ROOT_DIR}/test_sketches/lvgl_official_based_test" ;;
|
||||||
lvgl-subserver-touch-test) SKETCH_DIR="${ROOT_DIR}/test_sketches/lvgl_subserver_touch_test" ;;
|
lvgl-subserver-touch-test) SKETCH_DIR="${ROOT_DIR}/test_sketches/lvgl_subserver_touch_test" ;;
|
||||||
lvgl-russian-font-test) SKETCH_DIR="${ROOT_DIR}/test_sketches/lvgl_russian_font_test" ;;
|
lvgl-russian-font-test) SKETCH_DIR="${ROOT_DIR}/test_sketches/lvgl_russian_font_test" ;;
|
||||||
|
breath-dual-mode-monitor) SKETCH_DIR="${ROOT_DIR}/test_sketches/breath_dual_mode_monitor" ;;
|
||||||
usb-contact-test) SKETCH_DIR="${ROOT_DIR}/test_sketches/usb_contact_sensor_test" ;;
|
usb-contact-test) SKETCH_DIR="${ROOT_DIR}/test_sketches/usb_contact_sensor_test" ;;
|
||||||
usb-contact-debug-test) SKETCH_DIR="${ROOT_DIR}/test_sketches/usb_contact_sensor_debug_test" ;;
|
usb-contact-debug-test) SKETCH_DIR="${ROOT_DIR}/test_sketches/usb_contact_sensor_debug_test" ;;
|
||||||
usb-contact-resistance-test) SKETCH_DIR="${ROOT_DIR}/test_sketches/usb_contact_resistance_test" ;;
|
usb-contact-resistance-test) SKETCH_DIR="${ROOT_DIR}/test_sketches/usb_contact_resistance_test" ;;
|
||||||
@@ -54,7 +55,7 @@ case "${MODE}" in
|
|||||||
lvgl-nav-minimal-test) SKETCH_DIR="${ROOT_DIR}/shine_homeserver_main" ;;
|
lvgl-nav-minimal-test) SKETCH_DIR="${ROOT_DIR}/shine_homeserver_main" ;;
|
||||||
*)
|
*)
|
||||||
echo "Unknown mode: ${MODE}" >&2
|
echo "Unknown mode: ${MODE}" >&2
|
||||||
echo "Use one of: hello, widgets, audio, simple, argon2, homeserver-ui, shine-homeserver-main, shine-homeserver-ui-main, legacy-homeserver-ui, text-test, gfx-text-test, gfx-layout-test, lvgl-basic-test, lvgl-interaction-test, lvgl-touch-debug-test, lvgl-official-based-test, lvgl-subserver-touch-test, lvgl-russian-font-test, usb-contact-test, usb-contact-debug-test, usb-contact-resistance-test, usb-contact-screen-start-stub" >&2
|
echo "Use one of: hello, widgets, audio, simple, argon2, homeserver-ui, shine-homeserver-main, shine-homeserver-ui-main, legacy-homeserver-ui, text-test, gfx-text-test, gfx-layout-test, lvgl-basic-test, lvgl-interaction-test, lvgl-touch-debug-test, lvgl-official-based-test, lvgl-subserver-touch-test, lvgl-russian-font-test, breath-dual-mode-monitor, usb-contact-test, usb-contact-debug-test, usb-contact-resistance-test, usb-contact-screen-start-stub" >&2
|
||||||
exit 2
|
exit 2
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|||||||
@@ -15,6 +15,7 @@
|
|||||||
- `lvgl_official_based_test/` - минимальный наш экран поверх максимально близкой к официальному `05_LVGL_Widgets` инициализации
|
- `lvgl_official_based_test/` - минимальный наш экран поверх максимально близкой к официальному `05_LVGL_Widgets` инициализации
|
||||||
- `lvgl_subserver_touch_test/` - старый гибридный тест: `LVGL`-экран с инициализацией дисплея и чтением touch из старого `shine_homeserver_ui`; подтверждён на реальном устройстве
|
- `lvgl_subserver_touch_test/` - старый гибридный тест: `LVGL`-экран с инициализацией дисплея и чтением touch из старого `shine_homeserver_ui`; подтверждён на реальном устройстве
|
||||||
- `lvgl_russian_font_test/` - тест кастомного кириллического `LVGL`-шрифта с русскими кнопками, длинными строками и рабочим touch
|
- `lvgl_russian_font_test/` - тест кастомного кириллического `LVGL`-шрифта с русскими кнопками, длинными строками и рабочим touch
|
||||||
|
- `breath_dual_mode_monitor/` - dual-mode breath monitor в стиле GFX-скетча: старт USB-датчика или внешних кнопок `KEY3/BOOT`, настройки лимита и громкости, повторяющиеся звуковые предупреждения
|
||||||
- `usb_contact_sensor_test/` - тест переключения нативных USB D-/D+ (`GPIO19/20`) в режим простого замыкаемого контакта после нажатия Start; после перезагрузки снова обычный USB
|
- `usb_contact_sensor_test/` - тест переключения нативных USB D-/D+ (`GPIO19/20`) в режим простого замыкаемого контакта после нажатия Start; после перезагрузки снова обычный USB
|
||||||
- `usb_contact_sensor_debug_test/` - debug-версия теста замыкания контакта: экранная кнопка проверяет touch, а переход в sensor mode выполняется физической кнопкой BOOT
|
- `usb_contact_sensor_debug_test/` - debug-версия теста замыкания контакта: экранная кнопка проверяет touch, а переход в sensor mode выполняется физической кнопкой BOOT
|
||||||
- `usb_contact_resistance_test/` - тест измерения сопротивления между USB D-/D+ через ADC на GPIO20; рассчитан на внешний известный резистор 10 kΩ с D+ на GND
|
- `usb_contact_resistance_test/` - тест измерения сопротивления между USB D-/D+ через ADC на GPIO20; рассчитан на внешний известный резистор 10 kΩ с D+ на GND
|
||||||
@@ -32,6 +33,7 @@
|
|||||||
- `./burn.sh lvgl-official-based-test`
|
- `./burn.sh lvgl-official-based-test`
|
||||||
- `./burn.sh lvgl-subserver-touch-test`
|
- `./burn.sh lvgl-subserver-touch-test`
|
||||||
- `./burn.sh lvgl-russian-font-test`
|
- `./burn.sh lvgl-russian-font-test`
|
||||||
|
- `./burn.sh breath-dual-mode-monitor`
|
||||||
- `./burn.sh usb-contact-test`
|
- `./burn.sh usb-contact-test`
|
||||||
- `./burn.sh usb-contact-debug-test`
|
- `./burn.sh usb-contact-debug-test`
|
||||||
- `./burn.sh usb-contact-resistance-test`
|
- `./burn.sh usb-contact-resistance-test`
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ Diagnostic sketches:
|
|||||||
|
|
||||||
- `main-device/test_sketches/usb_contact_sensor_test/usb_contact_sensor_test.ino`
|
- `main-device/test_sketches/usb_contact_sensor_test/usb_contact_sensor_test.ino`
|
||||||
- `main-device/test_sketches/usb_contact_sensor_debug_test/usb_contact_sensor_debug_test.ino`
|
- `main-device/test_sketches/usb_contact_sensor_debug_test/usb_contact_sensor_debug_test.ino`
|
||||||
|
- `main-device/test_sketches/breath_dual_mode_monitor/breath_dual_mode_monitor.ino`
|
||||||
- `main-device/test_sketches/usb_contact_resistance_test/usb_contact_resistance_test.ino`
|
- `main-device/test_sketches/usb_contact_resistance_test/usb_contact_resistance_test.ino`
|
||||||
- `main-device/test_sketches/usb_contact_screen_start_stub/usb_contact_screen_start_stub.ino`
|
- `main-device/test_sketches/usb_contact_screen_start_stub/usb_contact_screen_start_stub.ino`
|
||||||
|
|
||||||
@@ -114,3 +115,45 @@ After tapping `START`:
|
|||||||
- reset/power cycle restores ordinary native USB boot
|
- reset/power cycle restores ordinary native USB boot
|
||||||
|
|
||||||
This version is intended to monitor breathing cadence from a dry-contact USB D-/D+ sensor.
|
This version is intended to monitor breathing cadence from a dry-contact USB D-/D+ sensor.
|
||||||
|
|
||||||
|
## Dual-mode GFX breath monitor version
|
||||||
|
|
||||||
|
The `breath_dual_mode_monitor` sketch reuses the production-style `Arduino_GFX` visual approach, audio path, settings sliders, and average-cycle alert behavior from the USB contact breath monitor. It supports two start modes on one firmware: USB contact sensor mode and external button mode.
|
||||||
|
|
||||||
|
Initial screen:
|
||||||
|
|
||||||
|
- title: `BREATH MONITOR`
|
||||||
|
- state: `READY`
|
||||||
|
- action button: `START USB SENSOR`
|
||||||
|
- action button: `START BUTTONS`
|
||||||
|
|
||||||
|
After `START USB SENSOR`:
|
||||||
|
|
||||||
|
- GPIO19 / USB `D-` is configured as `OUTPUT LOW`
|
||||||
|
- GPIO20 / USB `D+` is configured as `INPUT_PULLUP`
|
||||||
|
- closed contact is treated as `EXHALE`
|
||||||
|
- open contact is treated as `INHALE`
|
||||||
|
- USB sensor cycles shorter than 3 seconds are ignored without resetting the current cycle timer
|
||||||
|
- a short `KEY3 / GPIO18` press opens or closes settings in USB sensor mode
|
||||||
|
- the bottom line shows the durations of the last 5 accepted USB sensor cycles
|
||||||
|
|
||||||
|
After `START BUTTONS`:
|
||||||
|
|
||||||
|
- `KEY3 / GPIO18` is the external `INHALE` button, active LOW
|
||||||
|
- `BOOT / GPIO0` is the external `EXHALE` button, active LOW
|
||||||
|
- do not hold `BOOT` while booting or resetting the board
|
||||||
|
- the working screen does not show touch `INHALE`/`EXHALE` buttons
|
||||||
|
- long-holding `KEY3 / INHALE` for about 850 ms opens settings; the long press still counts as an inhale press
|
||||||
|
- while settings are open, the next `KEY3 / INHALE` press closes settings and also counts as an inhale press
|
||||||
|
|
||||||
|
In both modes:
|
||||||
|
|
||||||
|
- one breathing cycle is measured from one `EXHALE` tap to the next `EXHALE` tap
|
||||||
|
- inhale before any exhale does not create a cycle
|
||||||
|
- button-mode cycles shorter than 1.5 seconds are ignored
|
||||||
|
- USB sensor cycles shorter than 3 seconds are ignored
|
||||||
|
- the UI shows current cycle time, arithmetic average over the last 5 completed cycles, elapsed session time, selected limit, long-pause count, short-average count, and current short-average streak
|
||||||
|
- the lower numeric fields use a larger font than before
|
||||||
|
- if the average of the last up to 5 completed cycles is shorter than the selected limit, warning beeps are played like in the USB contact breath monitor
|
||||||
|
- if the current cycle reaches 60 seconds, 5 loud warning beeps are played, then after 5 seconds another 5 loud warning beeps are played, repeating until the user changes phase / exits the long cycle
|
||||||
|
- settings keep the same sliders: limit `5/7/10/15/20` seconds, quiet cycle tick volume `0..10`, and alert volume `0..10`
|
||||||
|
|||||||
@@ -22,8 +22,10 @@ public final class DatabaseInitializer {
|
|||||||
public static final int DB_FORMAT_VERSION = 2;
|
public static final int DB_FORMAT_VERSION = 2;
|
||||||
public static final int SCHEMA_VERSION_1 = 1;
|
public static final int SCHEMA_VERSION_1 = 1;
|
||||||
public static final int SCHEMA_VERSION_31 = 31;
|
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_SCHEMA_RESOURCE = "postgres/schema_v1.sql";
|
||||||
public static final String POSTGRES_MIGRATION_V31_RESOURCE = "postgres/migration_v31.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() {}
|
private DatabaseInitializer() {}
|
||||||
|
|
||||||
@@ -119,9 +121,13 @@ public final class DatabaseInitializer {
|
|||||||
runSqlScript(conn, POSTGRES_MIGRATION_V31_RESOURCE);
|
runSqlScript(conn, POSTGRES_MIGRATION_V31_RESOURCE);
|
||||||
currentVersion = readCurrentSchemaVersion(conn);
|
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(
|
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 --------------------
|
// -------------------- MAPPER --------------------
|
||||||
|
|
||||||
private CurrentUserEntry mapRow(ResultSet rs) throws SQLException {
|
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);
|
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;
|
COMMIT;
|
||||||
|
|||||||
+4
@@ -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_GetChannelsCounters_Handler;
|
||||||
import server.logic.ws_protocol.JSON.handlers.channels.Net_ListGroupChats200_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_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_GetUserCounters_Handler;
|
||||||
import server.logic.ws_protocol.JSON.handlers.channels.Net_SetChannelReadState_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_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_GetPersonalDiary_Request;
|
||||||
import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_ListGroupChats200_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_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_GetUserCounters_Request;
|
||||||
import server.logic.ws_protocol.JSON.handlers.channels.entyties.Net_SetChannelReadState_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.connections.Net_GetUserConnectionsGraph_Handler;
|
||||||
@@ -182,6 +184,7 @@ public final class JsonHandlerRegistry {
|
|||||||
private static final Map<String, JsonMessageHandler> HANDLERS = Map.ofEntries(
|
private static final Map<String, JsonMessageHandler> HANDLERS = Map.ofEntries(
|
||||||
Map.entry("GetUser", new Net_GetUser_Handler()),
|
Map.entry("GetUser", new Net_GetUser_Handler()),
|
||||||
Map.entry("SearchUsers", new Net_SearchUsers_Handler()),
|
Map.entry("SearchUsers", new Net_SearchUsers_Handler()),
|
||||||
|
Map.entry("SearchChannels", new Net_SearchChannels_Handler()),
|
||||||
|
|
||||||
// --- auth ---
|
// --- auth ---
|
||||||
Map.entry("ResolveLoginForAuth", new Net_ResolveLoginForAuth_Handler()),
|
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(
|
private static final Map<String, Class<? extends Net_Request>> REQUEST_TYPES = Map.ofEntries(
|
||||||
Map.entry("GetUser", Net_GetUser_Request.class),
|
Map.entry("GetUser", Net_GetUser_Request.class),
|
||||||
Map.entry("SearchUsers", Net_SearchUsers_Request.class),
|
Map.entry("SearchUsers", Net_SearchUsers_Request.class),
|
||||||
|
Map.entry("SearchChannels", Net_SearchChannels_Request.class),
|
||||||
|
|
||||||
// --- auth ---
|
// --- auth ---
|
||||||
Map.entry("ResolveLoginForAuth", Net_ResolveLoginForAuth_Request.class),
|
Map.entry("ResolveLoginForAuth", Net_ResolveLoginForAuth_Request.class),
|
||||||
|
|||||||
+4
-1
@@ -20,7 +20,10 @@ public final class RemoteUserOperationPolicy {
|
|||||||
"ClientErrorLog",
|
"ClientErrorLog",
|
||||||
"ClientDebugLog",
|
"ClientDebugLog",
|
||||||
"CloseActiveSession",
|
"CloseActiveSession",
|
||||||
"ResolveLoginForAuth"
|
"ResolveLoginForAuth",
|
||||||
|
// Публичный read-only поиск доступен и REMOTE-сессии.
|
||||||
|
"SearchChannels",
|
||||||
|
"SearchUsers"
|
||||||
);
|
);
|
||||||
|
|
||||||
private RemoteUserOperationPolicy() {}
|
private RemoteUserOperationPolicy() {}
|
||||||
|
|||||||
+52
@@ -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", "Ошибка БД при поиске каналов");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+17
@@ -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; }
|
||||||
|
}
|
||||||
+37
@@ -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; }
|
||||||
|
}
|
||||||
|
}
|
||||||
+14
-7
@@ -25,7 +25,8 @@ public class Net_SearchUsers_Handler implements JsonMessageHandler {
|
|||||||
public Net_Response handle(Net_Request baseRequest, ConnectionContext ctx) {
|
public Net_Response handle(Net_Request baseRequest, ConnectionContext ctx) {
|
||||||
Net_SearchUsers_Request req = (Net_SearchUsers_Request) baseRequest;
|
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(
|
return NetExceptionResponseFactory.error(
|
||||||
req,
|
req,
|
||||||
WireCodes.Status.BAD_REQUEST,
|
WireCodes.Status.BAD_REQUEST,
|
||||||
@@ -39,13 +40,18 @@ public class Net_SearchUsers_Handler implements JsonMessageHandler {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
CurrentUsersDAO dao = CurrentUsersDAO.getInstance();
|
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<>();
|
List<String> logins = new ArrayList<>();
|
||||||
for (CurrentUserEntry u : users) {
|
List<Net_SearchUsers_Response.UserItem> users = new ArrayList<>();
|
||||||
if (u != null && u.getLogin() != null) {
|
for (var card : cards) {
|
||||||
logins.add(u.getLogin()); // регистр как в БД
|
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();
|
Net_SearchUsers_Response resp = new Net_SearchUsers_Response();
|
||||||
@@ -53,6 +59,7 @@ public class Net_SearchUsers_Handler implements JsonMessageHandler {
|
|||||||
resp.setRequestId(req.getRequestId());
|
resp.setRequestId(req.getRequestId());
|
||||||
resp.setStatus(WireCodes.Status.OK);
|
resp.setStatus(WireCodes.Status.OK);
|
||||||
resp.setLogins(logins);
|
resp.setLogins(logins);
|
||||||
|
resp.setUsers(users);
|
||||||
|
|
||||||
log.info("✅ SearchUsers ok: prefix='{}', isServer={} -> {}", prefix, isServer, logins.size());
|
log.info("✅ SearchUsers ok: prefix='{}', isServer={} -> {}", prefix, isServer, logins.size());
|
||||||
return resp;
|
return resp;
|
||||||
|
|||||||
+3
@@ -19,7 +19,10 @@ public class Net_SearchUsers_Request extends Net_Request {
|
|||||||
|
|
||||||
private String prefix;
|
private String prefix;
|
||||||
private Boolean isServer;
|
private Boolean isServer;
|
||||||
|
private Integer limit;
|
||||||
|
|
||||||
|
public Integer getLimit() { return limit; }
|
||||||
|
public void setLimit(Integer value) { limit = value; }
|
||||||
public String getPrefix() { return prefix; }
|
public String getPrefix() { return prefix; }
|
||||||
public void setPrefix(String prefix) { this.prefix = prefix; }
|
public void setPrefix(String prefix) { this.prefix = prefix; }
|
||||||
public Boolean getIsServer() { return isServer; }
|
public Boolean getIsServer() { return isServer; }
|
||||||
|
|||||||
+14
@@ -23,6 +23,20 @@ import java.util.List;
|
|||||||
public class Net_SearchUsers_Response extends Net_Response {
|
public class Net_SearchUsers_Response extends Net_Response {
|
||||||
|
|
||||||
private List<String> logins = new ArrayList<>();
|
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 List<String> getLogins() { return logins; }
|
||||||
public void setLogins(List<String> logins) { this.logins = logins; }
|
public void setLogins(List<String> logins) { this.logins = logins; }
|
||||||
|
|||||||
+2
-2
@@ -1,2 +1,2 @@
|
|||||||
client.version=1.18.10
|
client.version=1.19.0
|
||||||
server.version=1.14.0
|
server.version=1.15.0
|
||||||
|
|||||||
@@ -118,7 +118,7 @@
|
|||||||
|
|
||||||
### Назначение
|
### Назначение
|
||||||
|
|
||||||
Поиск пользователей по префиксу логина. Операция зарегистрирована в серверном API и используется как вспомогательная dev/test операция.
|
Поиск пользователей по префиксу логина и фрагменту публичного имени (`first_name`, `last_name`) без учёта регистра и с нормализацией `ё/е`. Совместимый ответ — массив строк `logins`.
|
||||||
При необходимости можно включить фильтр только по server PDA.
|
При необходимости можно включить фильтр только по server PDA.
|
||||||
|
|
||||||
### Запрос
|
### Запрос
|
||||||
@@ -129,12 +129,14 @@
|
|||||||
"requestId": "search-001",
|
"requestId": "search-001",
|
||||||
"payload": {
|
"payload": {
|
||||||
"prefix": "an",
|
"prefix": "an",
|
||||||
"isServer": true
|
"isServer": true,
|
||||||
|
"limit": 10
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
- `prefix` — обязательный префикс логина.
|
- `prefix` — обязательный поисковый фрагмент (до 120 символов); логины ищутся по началу, публичные имена — по подстроке.
|
||||||
|
- `limit` — необязательное число результатов 1–50, по умолчанию **5** (совместимость с клиентами).
|
||||||
- `isServer` — необязательный boolean-флаг; если `true`, сервер вернёт только логины,
|
- `isServer` — необязательный boolean-флаг; если `true`, сервер вернёт только логины,
|
||||||
у которых в `solana_user_pda_current` стоит `is_server = true`.
|
у которых в `solana_user_pda_current` стоит `is_server = true`.
|
||||||
|
|
||||||
@@ -147,7 +149,11 @@
|
|||||||
"status": 200,
|
"status": 200,
|
||||||
"ok": true,
|
"ok": true,
|
||||||
"payload": {
|
"payload": {
|
||||||
"logins": ["anya", "andrey"]
|
"logins": ["anya", "andrey"],
|
||||||
|
"users": [
|
||||||
|
{ "login": "anya", "displayName": "Анна", "avatarAr": "" },
|
||||||
|
{ "login": "andrey", "displayName": "Андрей", "avatarAr": "" }
|
||||||
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|||||||
@@ -587,3 +587,58 @@ Channel/message responses expose three counters:
|
|||||||
- `shiningLikesCount` — likes from users who are currently both `primary` and `shining`.
|
- `shiningLikesCount` — likes from users who are currently both `primary` and `shining`.
|
||||||
|
|
||||||
Changing `account_role` or `shine` does not alter the raw reaction. The two qualified counters are recalculated from `reactions_state`; therefore old likes automatically enter or leave qualified counters when the actor's current status changes.
|
Changing `account_role` or `shine` does not alter the raw reaction. The two qualified counters are recalculated from `reactions_state`; therefore old likes automatically enter or leave qualified counters when the actor's current status changes.
|
||||||
|
|
||||||
|
|
||||||
|
## `SearchChannels` — публичный поиск каналов (v32)
|
||||||
|
|
||||||
|
Операция **без авторизации**, на текущем сервере (не федеративный поиск).
|
||||||
|
Результаты берутся из актуального состояния `channel_names_state`; публичные каналы — `channel_type_code = 1`, не удалённые (`is_deleted = false`).
|
||||||
|
|
||||||
|
Запрос:
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"op": "SearchChannels",
|
||||||
|
"requestId": "search-ch-1",
|
||||||
|
"payload": { "query": "гриб", "limit": 10 }
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
- `query` — текст от 1 до 120 символов. Не обязателен, если указан `ownerLogin`.
|
||||||
|
- `ownerLogin` — дополнительное ограничение по началу логина владельца, до 80 символов.
|
||||||
|
- `limit` — число результатов, по умолчанию 10, допустимо 1–50. Курсора и пагинации нет.
|
||||||
|
- `@anna` — каналы владельцев, чьи логины содержат `anna`.
|
||||||
|
- `anna/art` — каналы владельца `anna`, у которых публичное либо техническое название содержит `art`.
|
||||||
|
- `anna/` — все доступные каналы владельца `anna`.
|
||||||
|
- В обычном запросе ищутся **подстроки** в публичном имени `display_name`, техническом `slug` и логине `owner_login`. Регистр не важен, `ё` приравнивается к `е`. Вводимые `%`, `_` и `!` не работают как SQL-маски.
|
||||||
|
- Сначала идут точные совпадения с названием или slug, затем префиксные, затем частичные, далее учитывается количество подписчиков.
|
||||||
|
|
||||||
|
Ответ:
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"op": "SearchChannels",
|
||||||
|
"requestId": "search-ch-1",
|
||||||
|
"status": 200,
|
||||||
|
"ok": true,
|
||||||
|
"payload": {
|
||||||
|
"channels": [{
|
||||||
|
"ownerLogin": "anna",
|
||||||
|
"slug": "fungal-art",
|
||||||
|
"displayName": "Грибной мир",
|
||||||
|
"description": "Картины и грибы",
|
||||||
|
"avatarAr": "",
|
||||||
|
"avatarSha256": "",
|
||||||
|
"ownerBlockchainName": "anna-001",
|
||||||
|
"rootBlockNumber": 12,
|
||||||
|
"rootBlockHashHex": "<hex>",
|
||||||
|
"subscribersCount": 128
|
||||||
|
}]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
Массив `channels` пустой при отсутствии совпадений; URL не возвращается.
|
||||||
|
`ownerBlockchainName` и корневой блок позволяют клиенту открыть канонический канал через существующую маршрутизацию.
|
||||||
|
Неверные поля: HTTP-подобный статус `400`, код `BAD_FIELDS`; ошибки чтения БД: `SERVER_DATA_ERROR`, `DB_ERROR`.
|
||||||
|
Структура блокчейна не меняется. Индексы поиска добавлены миграцией БД v32 (`pg_trgm`).
|
||||||
|
|||||||
@@ -13,7 +13,8 @@
|
|||||||
| Операция | Раздел документации | Кратко |
|
| Операция | Раздел документации | Кратко |
|
||||||
| --- | --- | --- |
|
| --- | --- | --- |
|
||||||
| `GetUser` | `01_User_Registration_API.md` | чтение/проверка пользователя + server-состояние его блокчейна |
|
| `GetUser` | `01_User_Registration_API.md` | чтение/проверка пользователя + server-состояние его блокчейна |
|
||||||
| `SearchUsers` | `01_User_Registration_API.md` | поиск логинов по префиксу |
|
| `SearchUsers` | `01_User_Registration_API.md` | поиск логинов и публичных имён пользователей |
|
||||||
|
| `SearchChannels` | `06_Channels_Read_API.md` | поиск публичных каналов по названию, slug и логину владельца |
|
||||||
| `ResolveLoginForAuth` | `02_Authentication_API.md` | проверка login перед входом: LOCAL / REMOTE / NOT_FOUND / NO_ACCESS_SERVER + URL правильного access server |
|
| `ResolveLoginForAuth` | `02_Authentication_API.md` | проверка login перед входом: LOCAL / REMOTE / NOT_FOUND / NO_ACCESS_SERVER + URL правильного access server |
|
||||||
| `AuthChallenge` | `02_Authentication_API.md` | challenge для создания новой сессии |
|
| `AuthChallenge` | `02_Authentication_API.md` | challenge для создания новой сессии |
|
||||||
| `CreateAuthSession` | `02_Authentication_API.md` | создание новой авторизованной сессии |
|
| `CreateAuthSession` | `02_Authentication_API.md` | создание новой авторизованной сессии |
|
||||||
|
|||||||
+1
-1
@@ -39,7 +39,7 @@
|
|||||||
}());
|
}());
|
||||||
</script>
|
</script>
|
||||||
<script>
|
<script>
|
||||||
window.__SHINE_BUILD_HASH__ = '20261012121500';
|
window.__SHINE_BUILD_HASH__ = '20261012150000';
|
||||||
window.__SHINE_CLIENT_VERSION__ = '1.2.10';
|
window.__SHINE_CLIENT_VERSION__ = '1.2.10';
|
||||||
</script>
|
</script>
|
||||||
<script>
|
<script>
|
||||||
|
|||||||
+4
-1
@@ -106,7 +106,8 @@ import * as chatView from './pages/chat-view.js?v=202609260900';
|
|||||||
import * as userProfileView from './pages/user-profile-view.js';
|
import * as userProfileView from './pages/user-profile-view.js';
|
||||||
import * as userProfileListView from './pages/user-profile-list-view.js';
|
import * as userProfileListView from './pages/user-profile-list-view.js';
|
||||||
import * as userRelationManageView from './pages/user-relation-manage-view.js';
|
import * as userRelationManageView from './pages/user-relation-manage-view.js';
|
||||||
import * as channelsList from './pages/channels-list.js?v=202609260900';
|
import * as channelsList from './pages/channels-list.js?v=20261011-search';
|
||||||
|
import * as searchView from './pages/search-view.js';
|
||||||
import * as channelView from './pages/channel-view.js';
|
import * as channelView from './pages/channel-view.js';
|
||||||
import * as channelAboutView from './pages/channel-about-view.js';
|
import * as channelAboutView from './pages/channel-about-view.js';
|
||||||
import * as channelDonateView from './pages/channel-donate-view.js';
|
import * as channelDonateView from './pages/channel-donate-view.js';
|
||||||
@@ -178,6 +179,7 @@ const routes = {
|
|||||||
'user-profile-list-view': userProfileListView,
|
'user-profile-list-view': userProfileListView,
|
||||||
'user-relation-manage-view': userRelationManageView,
|
'user-relation-manage-view': userRelationManageView,
|
||||||
'channels-list': channelsList,
|
'channels-list': channelsList,
|
||||||
|
'search-view': searchView,
|
||||||
'channel-view': channelView,
|
'channel-view': channelView,
|
||||||
'channel-about-view': channelAboutView,
|
'channel-about-view': channelAboutView,
|
||||||
'channel-donate-view': channelDonateView,
|
'channel-donate-view': channelDonateView,
|
||||||
@@ -297,6 +299,7 @@ const GUEST_ALLOWED_PAGES = new Set([
|
|||||||
'language-view',
|
'language-view',
|
||||||
'network-view',
|
'network-view',
|
||||||
'channels-list',
|
'channels-list',
|
||||||
|
'search-view',
|
||||||
'channel-view',
|
'channel-view',
|
||||||
'channel-about-view',
|
'channel-about-view',
|
||||||
'channel-thread-view',
|
'channel-thread-view',
|
||||||
|
|||||||
@@ -507,187 +507,6 @@ function openSimpleSubscribeModal({ kind, kindLabel, submitLabel, unfollow = fal
|
|||||||
if (inputEl) inputEl.focus();
|
if (inputEl) inputEl.focus();
|
||||||
}
|
}
|
||||||
|
|
||||||
function openChannelFinderModal({ navigate }) {
|
|
||||||
const root = document.getElementById('modal-root');
|
|
||||||
root.innerHTML = `
|
|
||||||
<div class="modal" id="channels-find-modal">
|
|
||||||
<div class="modal-card stack">
|
|
||||||
<h3 class="modal-title">Поиск каналов</h3>
|
|
||||||
<p class="meta-muted">Введите логин (или начало логина), затем выберите пользователя и канал.</p>
|
|
||||||
<input id="channels-find-input" class="input" placeholder="Например: aidar" autocomplete="off" />
|
|
||||||
<div id="channels-find-suggest" class="channels-search-suggest" style="display:none"></div>
|
|
||||||
<div id="channels-find-list" class="channels-search-suggest" style="display:none"></div>
|
|
||||||
<div id="channels-find-error" class="meta-muted inline-error"></div>
|
|
||||||
<div class="form-actions-grid">
|
|
||||||
<button class="primary-btn" id="channels-find-run" type="button">Найти</button>
|
|
||||||
<button class="secondary-btn" id="channels-find-close" type="button">Закрыть</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
`;
|
|
||||||
|
|
||||||
const inputEl = root.querySelector('#channels-find-input');
|
|
||||||
const suggestEl = root.querySelector('#channels-find-suggest');
|
|
||||||
const channelsEl = root.querySelector('#channels-find-list');
|
|
||||||
const errorEl = root.querySelector('#channels-find-error');
|
|
||||||
const close = () => { root.innerHTML = ''; };
|
|
||||||
|
|
||||||
const renderButtons = (container, values, onPick) => {
|
|
||||||
container.innerHTML = '';
|
|
||||||
if (!values.length) {
|
|
||||||
container.style.display = 'none';
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
container.style.display = '';
|
|
||||||
values.forEach((value) => {
|
|
||||||
const btn = document.createElement('button');
|
|
||||||
btn.type = 'button';
|
|
||||||
btn.className = 'ui-button channel-search-item';
|
|
||||||
btn.textContent = value.label;
|
|
||||||
btn.addEventListener('click', () => onPick(value));
|
|
||||||
container.append(btn);
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
const renderChannelRows = (values) => {
|
|
||||||
channelsEl.innerHTML = '';
|
|
||||||
if (!values.length) {
|
|
||||||
channelsEl.style.display = 'none';
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
channelsEl.style.display = '';
|
|
||||||
values.forEach((item) => {
|
|
||||||
const row = document.createElement('div');
|
|
||||||
row.className = 'channel-search-item';
|
|
||||||
|
|
||||||
const label = document.createElement('span');
|
|
||||||
label.textContent = item.label;
|
|
||||||
|
|
||||||
const openBtn = document.createElement('button');
|
|
||||||
openBtn.type = 'button';
|
|
||||||
openBtn.className = 'secondary-btn small-btn';
|
|
||||||
openBtn.textContent = 'Просмотреть';
|
|
||||||
openBtn.addEventListener('click', () => {
|
|
||||||
close();
|
|
||||||
const route = makeShineChannelRoute({
|
|
||||||
ownerLogin: String(item.ownerLogin || '').trim(),
|
|
||||||
ownerBlockchainName: String(item.ownerBlockchainName || '').trim(),
|
|
||||||
channelName: String(item.channelName || '').trim(),
|
|
||||||
});
|
|
||||||
if (route) navigate(route);
|
|
||||||
});
|
|
||||||
|
|
||||||
row.style.display = 'flex';
|
|
||||||
row.style.alignItems = 'center';
|
|
||||||
row.style.justifyContent = 'space-between';
|
|
||||||
row.style.gap = '8px';
|
|
||||||
row.append(label, openBtn);
|
|
||||||
channelsEl.append(row);
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
const loadChannelsForLogin = async (login, filterChannel = '') => {
|
|
||||||
const ownerLogin = normalizeLoginInput(login);
|
|
||||||
if (!ownerLogin) return;
|
|
||||||
const feed = await authService.listSubscriptionsFeed(ownerLogin, 1000);
|
|
||||||
const rows = Array.isArray(feed?.ownedChannels) ? feed.ownedChannels.filter(isVisibleChannelSummary) : [];
|
|
||||||
const needle = String(filterChannel || '').trim().toLowerCase();
|
|
||||||
const channels = rows
|
|
||||||
.map((item) => ({
|
|
||||||
ownerBlockchainName: String(item?.channel?.ownerBlockchainName || '').trim(),
|
|
||||||
channelName: String(item?.channel?.channelName || '').trim(),
|
|
||||||
}))
|
|
||||||
.filter((item) => !!item.channelName)
|
|
||||||
.filter((item) => !needle || item.channelName.toLowerCase().includes(needle))
|
|
||||||
.slice(0, 200)
|
|
||||||
.map((item) => ({
|
|
||||||
label: `${ownerLogin} / ${item.channelName}`,
|
|
||||||
ownerLogin,
|
|
||||||
ownerBlockchainName: item.ownerBlockchainName,
|
|
||||||
channelName: item.channelName,
|
|
||||||
}));
|
|
||||||
renderChannelRows(channels);
|
|
||||||
if (!channels.length) {
|
|
||||||
errorEl.textContent = filterChannel
|
|
||||||
? 'Каналы с таким фильтром не найдены.'
|
|
||||||
: `У пользователя "${ownerLogin}" пока нет доступных каналов.`;
|
|
||||||
} else {
|
|
||||||
errorEl.textContent = '';
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const runSearch = async () => {
|
|
||||||
const raw = String(inputEl?.value || '').trim();
|
|
||||||
errorEl.textContent = '';
|
|
||||||
if (!raw) {
|
|
||||||
suggestEl.style.display = 'none';
|
|
||||||
suggestEl.innerHTML = '';
|
|
||||||
channelsEl.style.display = 'none';
|
|
||||||
channelsEl.innerHTML = '';
|
|
||||||
errorEl.textContent = 'Введите логин или начало логина.';
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const parts = raw.split('/');
|
|
||||||
const loginPrefix = normalizeLoginInput(parts[0] || '');
|
|
||||||
const channelFilter = String(parts[1] || '').trim();
|
|
||||||
|
|
||||||
try {
|
|
||||||
if (raw.includes('/')) {
|
|
||||||
suggestEl.style.display = 'none';
|
|
||||||
suggestEl.innerHTML = '';
|
|
||||||
await loadChannelsForLogin(loginPrefix, channelFilter);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (loginPrefix.length < 1) {
|
|
||||||
suggestEl.style.display = 'none';
|
|
||||||
suggestEl.innerHTML = '';
|
|
||||||
channelsEl.style.display = 'none';
|
|
||||||
channelsEl.innerHTML = '';
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const logins = await authService.searchUsers(loginPrefix);
|
|
||||||
const rows = Array.isArray(logins) ? logins : [];
|
|
||||||
if (!rows.length) {
|
|
||||||
suggestEl.style.display = 'none';
|
|
||||||
suggestEl.innerHTML = '';
|
|
||||||
channelsEl.style.display = 'none';
|
|
||||||
channelsEl.innerHTML = '';
|
|
||||||
errorEl.textContent = `Логины, начинающиеся на "${loginPrefix}", не найдены.`;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const items = (Array.isArray(logins) ? logins : []).slice(0, 15).map((login) => ({
|
|
||||||
label: login,
|
|
||||||
login,
|
|
||||||
}));
|
|
||||||
errorEl.textContent = '';
|
|
||||||
renderButtons(suggestEl, items, async (item) => {
|
|
||||||
inputEl.value = `${item.login}/`;
|
|
||||||
suggestEl.style.display = 'none';
|
|
||||||
suggestEl.innerHTML = '';
|
|
||||||
await loadChannelsForLogin(item.login, '');
|
|
||||||
});
|
|
||||||
} catch (error) {
|
|
||||||
errorEl.textContent = toUserMessage(error, 'Не удалось выполнить поиск.');
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const refresh = createDebounced(runSearch, 220);
|
|
||||||
|
|
||||||
root.querySelector('#channels-find-close')?.addEventListener('click', close);
|
|
||||||
root.querySelector('#channels-find-run')?.addEventListener('click', () => {
|
|
||||||
void runSearch();
|
|
||||||
});
|
|
||||||
inputEl?.addEventListener('keydown', (event) => {
|
|
||||||
if (event.key !== 'Enter') return;
|
|
||||||
event.preventDefault();
|
|
||||||
void runSearch();
|
|
||||||
});
|
|
||||||
inputEl?.addEventListener('input', refresh);
|
|
||||||
if (inputEl) inputEl.focus();
|
|
||||||
}
|
|
||||||
|
|
||||||
function mapMockGroups() {
|
function mapMockGroups() {
|
||||||
const mapRow = (channel) => ({
|
const mapRow = (channel) => ({
|
||||||
@@ -940,12 +759,12 @@ function renderEmptyState(listState, navigate) {
|
|||||||
heading.textContent = listState.query ? 'Ничего не найдено' : listState.viewMode === CHANNELS_VIEW_DELETED ? 'Удалённых каналов нет' : listState.viewMode === CHANNELS_VIEW_FOLLOWING ? 'Пока нет подписок' : listState.viewMode === CHANNELS_VIEW_OWNED ? 'Здесь будут ваши каналы' : 'Откройте свой первый канал';
|
heading.textContent = listState.query ? 'Ничего не найдено' : listState.viewMode === CHANNELS_VIEW_DELETED ? 'Удалённых каналов нет' : listState.viewMode === CHANNELS_VIEW_FOLLOWING ? 'Пока нет подписок' : listState.viewMode === CHANNELS_VIEW_OWNED ? 'Здесь будут ваши каналы' : 'Откройте свой первый канал';
|
||||||
const text = document.createElement('p');
|
const text = document.createElement('p');
|
||||||
text.className = 'meta-muted';
|
text.className = 'meta-muted';
|
||||||
text.textContent = listState.viewMode === CHANNELS_VIEW_DELETED ? 'Здесь появятся только ваши каналы, помеченные как удалённые.' : state.session.isAuthorized ? 'Найдите канал по имени автора или создайте свой.' : 'Войдите, чтобы видеть свои каналы и подписки.';
|
text.textContent = listState.viewMode === CHANNELS_VIEW_DELETED ? 'Здесь появятся только ваши каналы, помеченные как удалённые.' : state.session.isAuthorized ? 'Найдите канал по названию, адресу или автору — либо создайте свой.' : 'Войдите, чтобы видеть свои каналы и подписки.';
|
||||||
const action = document.createElement('button');
|
const action = document.createElement('button');
|
||||||
action.type = 'button';
|
action.type = 'button';
|
||||||
action.className = 'primary-btn';
|
action.className = 'primary-btn';
|
||||||
action.textContent = state.session.isAuthorized ? 'Найти по @автору' : 'Войти';
|
action.textContent = 'Найти каналы';
|
||||||
action.addEventListener('click', () => state.session.isAuthorized ? openChannelFinderModal({ navigate }) : navigate('login-view'));
|
action.addEventListener('click', () => navigate('search-view'));
|
||||||
wrap.append(heading, text, action);
|
wrap.append(heading, text, action);
|
||||||
|
|
||||||
return wrap;
|
return wrap;
|
||||||
@@ -1290,8 +1109,8 @@ export function render({ navigate, route, chrome }) {
|
|||||||
const serverSearchButton = document.createElement('button');
|
const serverSearchButton = document.createElement('button');
|
||||||
serverSearchButton.type = 'button';
|
serverSearchButton.type = 'button';
|
||||||
serverSearchButton.className = 'text-btn channels-server-search';
|
serverSearchButton.className = 'text-btn channels-server-search';
|
||||||
serverSearchButton.textContent = 'По @автору';
|
serverSearchButton.textContent = 'Поиск в SHiNE';
|
||||||
serverSearchButton.addEventListener('click', () => openChannelFinderModal({ navigate }));
|
serverSearchButton.addEventListener('click', () => navigate('search-view'));
|
||||||
searchWrap.append(searchInput, serverSearchButton);
|
searchWrap.append(searchInput, serverSearchButton);
|
||||||
|
|
||||||
const tabs = document.createElement('div');
|
const tabs = document.createElement('div');
|
||||||
|
|||||||
@@ -0,0 +1,219 @@
|
|||||||
|
import { authService } from '../state.js';
|
||||||
|
import { createTopBar } from '../components/topbar.js';
|
||||||
|
import { renderAvatar, renderUserAvatar } from '../components/avatar-image.js';
|
||||||
|
import { makeShineChannelRoute, makeProfileRoute } from '../services/shine-routes.js';
|
||||||
|
|
||||||
|
export const pageMeta = {
|
||||||
|
id: 'search-view',
|
||||||
|
title: 'Поиск SHiNE',
|
||||||
|
shellMode: { contentWidth: 'wide', topFade: false },
|
||||||
|
};
|
||||||
|
|
||||||
|
const SEARCH_DELAY_MS = 280;
|
||||||
|
|
||||||
|
function channelRow(item, navigate) {
|
||||||
|
const row = document.createElement('button');
|
||||||
|
row.type = 'button';
|
||||||
|
row.className = 'shine-search-result';
|
||||||
|
const displayName = String(item.displayName || item.slug || 'Канал').trim();
|
||||||
|
const ownerLogin = String(item.ownerLogin || '').trim();
|
||||||
|
const slug = String(item.slug || '').trim();
|
||||||
|
row.append(renderAvatar({
|
||||||
|
initials: Array.from(displayName)[0] || '#',
|
||||||
|
avatar: item.avatarAr || item.avatarSha256
|
||||||
|
? { ar: item.avatarAr || '', sha256Hex: item.avatarSha256 || '' }
|
||||||
|
: null,
|
||||||
|
authorLogin: ownerLogin,
|
||||||
|
size: 'lg',
|
||||||
|
className: 'avatar-plain',
|
||||||
|
title: displayName,
|
||||||
|
alt: 'Аватар канала',
|
||||||
|
}));
|
||||||
|
const text = document.createElement('span');
|
||||||
|
text.className = 'shine-search-result__text';
|
||||||
|
const title = document.createElement('strong');
|
||||||
|
title.className = 'shine-search-result__title';
|
||||||
|
title.textContent = displayName;
|
||||||
|
const address = document.createElement('span');
|
||||||
|
address.className = 'shine-search-result__address';
|
||||||
|
address.textContent = `@${ownerLogin}/${slug} · ${Number(item.subscribersCount || 0)} подписчиков`;
|
||||||
|
text.append(title, address);
|
||||||
|
const description = String(item.description || '').trim();
|
||||||
|
if (description) {
|
||||||
|
const desc = document.createElement('span');
|
||||||
|
desc.className = 'shine-search-result__description';
|
||||||
|
desc.textContent = description;
|
||||||
|
text.append(desc);
|
||||||
|
}
|
||||||
|
row.append(text);
|
||||||
|
row.addEventListener('click', () => {
|
||||||
|
const route = makeShineChannelRoute({
|
||||||
|
ownerLogin,
|
||||||
|
ownerBlockchainName: String(item.ownerBlockchainName || '').trim(),
|
||||||
|
channelName: slug,
|
||||||
|
});
|
||||||
|
if (route) navigate(route);
|
||||||
|
});
|
||||||
|
return row;
|
||||||
|
}
|
||||||
|
|
||||||
|
function personRow(person, navigate) {
|
||||||
|
const login = String(person?.login || '').trim();
|
||||||
|
const displayName = String(person?.displayName || '').trim();
|
||||||
|
const row = document.createElement('button');
|
||||||
|
row.type = 'button';
|
||||||
|
row.className = 'shine-search-result';
|
||||||
|
row.append(renderUserAvatar({ login, avatar: person.avatarAr ? { ar: person.avatarAr } : null, size: 'lg', className: 'avatar' }));
|
||||||
|
const text = document.createElement('span');
|
||||||
|
text.className = 'shine-search-result__text';
|
||||||
|
const title = document.createElement('strong');
|
||||||
|
title.className = 'shine-search-result__title';
|
||||||
|
title.textContent = displayName || `@${login}`;
|
||||||
|
text.append(title);
|
||||||
|
if (displayName) {
|
||||||
|
const address = document.createElement('span');
|
||||||
|
address.className = 'shine-search-result__address';
|
||||||
|
address.textContent = `@${login}`;
|
||||||
|
text.append(address);
|
||||||
|
}
|
||||||
|
row.append(text);
|
||||||
|
row.addEventListener('click', () => navigate(makeProfileRoute(login)));
|
||||||
|
return row;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function render({ navigate, chrome }) {
|
||||||
|
const screen = document.createElement('section');
|
||||||
|
screen.className = 'stack shine-search-screen';
|
||||||
|
chrome?.setTopbar(createTopBar({
|
||||||
|
title: 'Поиск SHiNE',
|
||||||
|
back: { label: '←', onClick: () => navigate('channels-list') },
|
||||||
|
}));
|
||||||
|
|
||||||
|
const search = document.createElement('input');
|
||||||
|
search.type = 'search';
|
||||||
|
search.className = 'input shine-search-input';
|
||||||
|
search.placeholder = 'Название канала, @автор или автор/канал';
|
||||||
|
search.maxLength = 120;
|
||||||
|
search.autocomplete = 'off';
|
||||||
|
search.enterKeyHint = 'search';
|
||||||
|
search.setAttribute('aria-label', 'Поиск по всей сети SHiNE');
|
||||||
|
const initialQuery = new URLSearchParams(window.location.search).get('q') || '';
|
||||||
|
search.value = initialQuery;
|
||||||
|
|
||||||
|
const tabs = document.createElement('div');
|
||||||
|
tabs.className = 'shine-search-tabs';
|
||||||
|
tabs.setAttribute('role', 'tablist');
|
||||||
|
const buttons = [['all', 'Все'], ['channels', 'Каналы'], ['people', 'Люди']].map(([id, label]) => {
|
||||||
|
const btn = document.createElement('button');
|
||||||
|
btn.type = 'button';
|
||||||
|
btn.className = 'shine-search-tab';
|
||||||
|
btn.textContent = label;
|
||||||
|
btn.dataset.tab = id;
|
||||||
|
btn.setAttribute('role', 'tab');
|
||||||
|
tabs.append(btn);
|
||||||
|
return btn;
|
||||||
|
});
|
||||||
|
|
||||||
|
const status = document.createElement('p');
|
||||||
|
status.className = 'shine-search-status';
|
||||||
|
status.setAttribute('role', 'status');
|
||||||
|
status.textContent = 'Введите имя канала, его адрес или логин пользователя.';
|
||||||
|
const list = document.createElement('div');
|
||||||
|
list.className = 'shine-search-results';
|
||||||
|
|
||||||
|
let selectedTab = 'all';
|
||||||
|
let channels = [];
|
||||||
|
let people = [];
|
||||||
|
let error = '';
|
||||||
|
let timer = null;
|
||||||
|
let seq = 0;
|
||||||
|
let disposed = false;
|
||||||
|
|
||||||
|
const appendSection = (title, items, factory) => {
|
||||||
|
if (!items.length) return;
|
||||||
|
const header = document.createElement('h3');
|
||||||
|
header.className = 'shine-search-section-heading';
|
||||||
|
header.textContent = `${title} · ${items.length}`;
|
||||||
|
list.append(header);
|
||||||
|
items.forEach((item) => list.append(factory(item, navigate)));
|
||||||
|
};
|
||||||
|
|
||||||
|
const renderResults = () => {
|
||||||
|
buttons.forEach((button) => {
|
||||||
|
const active = button.dataset.tab === selectedTab;
|
||||||
|
button.classList.toggle('is-active', active);
|
||||||
|
button.setAttribute('aria-selected', String(active));
|
||||||
|
});
|
||||||
|
list.replaceChildren();
|
||||||
|
const query = search.value.trim();
|
||||||
|
if (!query) {
|
||||||
|
status.textContent = 'Введите имя канала, его адрес или логин пользователя.';
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (selectedTab !== 'people') appendSection('Каналы', channels, channelRow);
|
||||||
|
if (selectedTab !== 'channels') appendSection('Люди', people, personRow);
|
||||||
|
const shown = (selectedTab === 'people' ? people.length
|
||||||
|
: selectedTab === 'channels' ? channels.length : channels.length + people.length);
|
||||||
|
if (error && !shown) status.textContent = error;
|
||||||
|
else status.textContent = shown ? `Показано: ${shown}` : 'Ничего не найдено. Попробуйте другое название.';
|
||||||
|
};
|
||||||
|
|
||||||
|
const runSearch = async () => {
|
||||||
|
const query = search.value.trim();
|
||||||
|
const currentSeq = ++seq;
|
||||||
|
if (!query) {
|
||||||
|
channels = []; people = []; error = '';
|
||||||
|
renderResults();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
status.textContent = 'Ищем…';
|
||||||
|
const userQuery = query.replace(/^@/, '').trim();
|
||||||
|
const requests = [authService.searchChannels(query, { limit: 10 })];
|
||||||
|
if (userQuery && !userQuery.includes('/')) requests.push(authService.searchPeople(userQuery, { limit: 10 }));
|
||||||
|
const results = await Promise.allSettled(requests);
|
||||||
|
if (disposed || currentSeq !== seq) return;
|
||||||
|
channels = results[0].status === 'fulfilled' ? results[0].value : [];
|
||||||
|
people = results[1]?.status === 'fulfilled' ? results[1].value : [];
|
||||||
|
error = results.every((result) => result.status === 'rejected')
|
||||||
|
? 'Не удалось выполнить поиск. Проверьте подключение к серверу.'
|
||||||
|
: '';
|
||||||
|
renderResults();
|
||||||
|
};
|
||||||
|
|
||||||
|
const rememberQueryInAddress = () => {
|
||||||
|
const url = new URL(window.location.href);
|
||||||
|
if (search.value.trim()) url.searchParams.set('q', search.value.trim());
|
||||||
|
else url.searchParams.delete('q');
|
||||||
|
window.history.replaceState(window.history.state, '', `${url.pathname}${url.search}${url.hash}`);
|
||||||
|
};
|
||||||
|
const scheduleSearch = () => {
|
||||||
|
if (timer) clearTimeout(timer);
|
||||||
|
++seq; // Устаревший ответ не должен подменить новый ввод.
|
||||||
|
channels = []; people = []; error = '';
|
||||||
|
list.replaceChildren();
|
||||||
|
status.textContent = search.value.trim() ? 'Ищем…' : 'Введите название или адрес.';
|
||||||
|
rememberQueryInAddress();
|
||||||
|
timer = setTimeout(() => { timer = null; void runSearch(); }, SEARCH_DELAY_MS);
|
||||||
|
};
|
||||||
|
search.addEventListener('input', scheduleSearch);
|
||||||
|
search.addEventListener('keydown', (e) => {
|
||||||
|
if (e.key === 'Enter') {
|
||||||
|
e.preventDefault();
|
||||||
|
if (timer) clearTimeout(timer);
|
||||||
|
timer = null;
|
||||||
|
void runSearch();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
buttons.forEach((btn) => btn.addEventListener('click', () => {
|
||||||
|
selectedTab = btn.dataset.tab;
|
||||||
|
renderResults();
|
||||||
|
}));
|
||||||
|
screen.append(search, tabs, status, list);
|
||||||
|
screen.cleanup = () => {
|
||||||
|
disposed = true;
|
||||||
|
++seq;
|
||||||
|
if (timer) clearTimeout(timer);
|
||||||
|
};
|
||||||
|
if (initialQuery.trim()) void runSearch();
|
||||||
|
return screen;
|
||||||
|
}
|
||||||
@@ -20,6 +20,7 @@ const PRETTY_PATHS = new Map([
|
|||||||
['profiles-view', 'profiles'],
|
['profiles-view', 'profiles'],
|
||||||
['messages-list', 'messages'],
|
['messages-list', 'messages'],
|
||||||
['contact-search-view', 'contacts'],
|
['contact-search-view', 'contacts'],
|
||||||
|
['search-view', 'search'],
|
||||||
['chat-view', 'chat'],
|
['chat-view', 'chat'],
|
||||||
['channels-list', 'channels'],
|
['channels-list', 'channels'],
|
||||||
['add-channel-view', 'channels/new'],
|
['add-channel-view', 'channels/new'],
|
||||||
@@ -265,6 +266,8 @@ export function parseRouteFromPath(pathname = '') {
|
|||||||
return { pageId: 'messages-list', params: {} };
|
return { pageId: 'messages-list', params: {} };
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (pageId === 'search') return { pageId: 'search-view', params: {} };
|
||||||
|
|
||||||
if (pageId === 'contacts') {
|
if (pageId === 'contacts') {
|
||||||
return { pageId: 'contact-search-view', params: {} };
|
return { pageId: 'contact-search-view', params: {} };
|
||||||
}
|
}
|
||||||
@@ -583,7 +586,7 @@ function resolveToolbarTab(pageId) {
|
|||||||
pageId === 'solana-users-init-view'
|
pageId === 'solana-users-init-view'
|
||||||
) return 'profile-view';
|
) return 'profile-view';
|
||||||
if (pageId === 'chat-view' || pageId === 'contact-search-view') return 'messages-list';
|
if (pageId === 'chat-view' || pageId === 'contact-search-view') return 'messages-list';
|
||||||
if (pageId === 'channel-view' || pageId === 'channel-about-view' || pageId === 'channel-donate-view' || pageId === 'channel-thread-view' || pageId === 'add-channel-view' || pageId === 'add-personal-public-chat-view') return 'channels-list';
|
if (pageId === 'search-view' || pageId === 'channel-view' || pageId === 'channel-about-view' || pageId === 'channel-donate-view' || pageId === 'channel-thread-view' || pageId === 'add-channel-view' || pageId === 'add-personal-public-chat-view') return 'channels-list';
|
||||||
return 'profile-view';
|
return 'profile-view';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -3206,8 +3206,23 @@ export class AuthService {
|
|||||||
return response.payload || {};
|
return response.payload || {};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async searchChannels(query, { limit = 10, ownerLogin = '' } = {}) {
|
||||||
|
const payload = { query, limit };
|
||||||
|
if (ownerLogin) payload.ownerLogin = ownerLogin;
|
||||||
|
const response = await this.ws.request('SearchChannels', payload);
|
||||||
|
if (response.status !== 200) throw opError('SearchChannels', response);
|
||||||
|
return Array.isArray(response.payload?.channels) ? response.payload.channels : [];
|
||||||
|
}
|
||||||
|
|
||||||
|
async searchPeople(query, { limit = 10 } = {}) {
|
||||||
|
const response = await this.ws.request('SearchUsers', { prefix: query, limit });
|
||||||
|
if (response.status !== 200) throw opError('SearchUsers', response);
|
||||||
|
return Array.isArray(response.payload?.users) ? response.payload.users : [];
|
||||||
|
}
|
||||||
|
|
||||||
async searchUsers(prefix, options = {}) {
|
async searchUsers(prefix, options = {}) {
|
||||||
const payload = { prefix };
|
const payload = { prefix };
|
||||||
|
if (Number.isInteger(options?.limit)) payload.limit = options.limit;
|
||||||
if (typeof options?.isServer === 'boolean') {
|
if (typeof options?.isServer === 'boolean') {
|
||||||
payload.isServer = options.isServer;
|
payload.isServer = options.isServer;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -289,3 +289,20 @@
|
|||||||
@media (prefers-reduced-motion: reduce) {
|
@media (prefers-reduced-motion: reduce) {
|
||||||
.channel-row { animation: none; transition: none; }
|
.channel-row { animation: none; transition: none; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Единый поиск каналов и людей */
|
||||||
|
.shine-search-screen { width: min(100%, 640px); margin-inline: auto; gap: 14px; padding-top: var(--page-top-gap); }
|
||||||
|
.shine-search-input { width: 100%; min-height: 48px; border-radius: 14px; font-size: 16px; }
|
||||||
|
.shine-search-tabs { display: flex; gap: 6px; padding: 4px; border-radius: 12px; background: var(--surface); }
|
||||||
|
.shine-search-tab { flex: 1; padding: 10px 8px; border: 0; border-radius: 9px; background: transparent; color: var(--text-secondary); cursor: pointer; }
|
||||||
|
.shine-search-tab.is-active { background: var(--surface-selected); color: var(--text-primary); font-weight: 600; }
|
||||||
|
.shine-search-tab:focus-visible, .shine-search-result:focus-visible { outline: 2px solid var(--focus-ring); outline-offset: 2px; }
|
||||||
|
.shine-search-status { margin: 0; min-height: 18px; color: var(--text-secondary); font-size: 13px; }
|
||||||
|
.shine-search-results { display: grid; gap: 2px; padding-bottom: 30px; }
|
||||||
|
.shine-search-section-heading { margin: 14px 0 4px; color: var(--text-secondary); font-size: 13px; font-weight: 600; }
|
||||||
|
.shine-search-result { display: flex; align-items: center; gap: 12px; width: 100%; min-width: 0; padding: 12px 6px; border: 0; border-bottom: 1px solid var(--border-subtle); background: transparent; color: var(--text-primary); text-align: left; cursor: pointer; }
|
||||||
|
.shine-search-result:hover { background: var(--surface); }
|
||||||
|
.shine-search-result .avatar { flex-shrink: 0; }
|
||||||
|
.shine-search-result__text { display: grid; gap: 3px; min-width: 0; }
|
||||||
|
.shine-search-result__title { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; font-size: 15px; }
|
||||||
|
.shine-search-result__address, .shine-search-result__description { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; color: var(--text-secondary); font-size: 12px; }
|
||||||
|
|||||||
Reference in New Issue
Block a user