SHA256
Длальше на доработку ЮАЙ -
Сервер работает для МВП почти вроде всё нету хороших звонков - но пока не о них и то что доработать можно ещё пуш уведомления при новых сообщениях в канале Делать сообщения репост И гдавное бесплатную регистрацию
This commit is contained in:
@@ -49,11 +49,12 @@ case "${MODE}" in
|
||||
lvgl-russian-font-test) SKETCH_DIR="${ROOT_DIR}/test_sketches/lvgl_russian_font_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-resistance-test) SKETCH_DIR="${ROOT_DIR}/test_sketches/usb_contact_resistance_test" ;;
|
||||
usb-contact-screen-start-stub) SKETCH_DIR="${ROOT_DIR}/test_sketches/usb_contact_screen_start_stub" ;;
|
||||
lvgl-nav-minimal-test) SKETCH_DIR="${ROOT_DIR}/shine_homeserver_main" ;;
|
||||
*)
|
||||
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-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, usb-contact-test, usb-contact-debug-test, usb-contact-resistance-test, usb-contact-screen-start-stub" >&2
|
||||
exit 2
|
||||
;;
|
||||
esac
|
||||
|
||||
@@ -17,6 +17,7 @@
|
||||
- `lvgl_russian_font_test/` - тест кастомного кириллического `LVGL`-шрифта с русскими кнопками, длинными строками и рабочим touch
|
||||
- `usb_contact_sensor_test/` - тест переключения нативных USB D-/D+ (`GPIO19/20`) в режим простого замыкаемого контакта после нажатия Start; после перезагрузки снова обычный USB
|
||||
- `usb_contact_sensor_debug_test/` - debug-версия теста замыкания контакта: экранная кнопка проверяет touch, а переход в sensor mode выполняется физической кнопкой BOOT
|
||||
- `usb_contact_resistance_test/` - тест измерения сопротивления между USB D-/D+ через ADC на GPIO20; рассчитан на внешний известный резистор 10 kΩ с D+ на GND
|
||||
- `lvgl_nav_minimal_test/` - старое тестовое имя, этот скетч перенесён в `shine_homeserver_main/` и теперь является основным
|
||||
|
||||
## Запуск
|
||||
@@ -33,3 +34,4 @@
|
||||
- `./burn.sh lvgl-russian-font-test`
|
||||
- `./burn.sh usb-contact-test`
|
||||
- `./burn.sh usb-contact-debug-test`
|
||||
- `./burn.sh usb-contact-resistance-test`
|
||||
|
||||
+295
@@ -0,0 +1,295 @@
|
||||
#include <Arduino.h>
|
||||
#include <Wire.h>
|
||||
#include <lvgl.h>
|
||||
#include <Arduino_GFX_Library.h>
|
||||
#include "pin_config.h"
|
||||
#include "TouchDrvCSTXXX.hpp"
|
||||
|
||||
#define EXAMPLE_LVGL_TICK_PERIOD_MS 2
|
||||
|
||||
// ESP32-S3 native USB data pins.
|
||||
static constexpr int kUsbDmPin = 19; // USB D-
|
||||
static constexpr int kUsbDpPin = 20; // USB D+, ADC input in resistance mode.
|
||||
static constexpr uint32_t kUiRefreshMs = 120;
|
||||
static constexpr uint32_t kAdcSamples = 32;
|
||||
|
||||
// For a stable ohm reading connect a known resistor from D+ / GPIO20 to GND.
|
||||
// The measured resistance must be connected between D- / GPIO19 and D+ / GPIO20.
|
||||
static constexpr float kKnownPulldownOhms = 10000.0f;
|
||||
static constexpr float kSourceMillivolts = 3300.0f;
|
||||
static constexpr float kOpenThresholdMillivolts = 25.0f;
|
||||
|
||||
static lv_disp_draw_buf_t gDrawBuf;
|
||||
static lv_color_t *gBuf1 = nullptr;
|
||||
static lv_color_t *gBuf2 = nullptr;
|
||||
static lv_obj_t *gModeLabel = nullptr;
|
||||
static lv_obj_t *gResistanceLabel = nullptr;
|
||||
static lv_obj_t *gRawLabel = nullptr;
|
||||
static lv_obj_t *gHintLabel = nullptr;
|
||||
static lv_obj_t *gActionButton = nullptr;
|
||||
static lv_obj_t *gActionButtonLabel = nullptr;
|
||||
|
||||
static TouchDrvCST92xx gTouch;
|
||||
static int16_t gTouchX[5];
|
||||
static int16_t gTouchY[5];
|
||||
|
||||
static bool gSensorMode = false;
|
||||
static uint32_t gLastUiRefreshMs = 0;
|
||||
|
||||
Arduino_DataBus *gBus = new Arduino_ESP32QSPI(
|
||||
LCD_CS, LCD_SCLK, LCD_SDIO0, LCD_SDIO1, LCD_SDIO2, LCD_SDIO3);
|
||||
Arduino_CO5300 *gfx = new Arduino_CO5300(
|
||||
gBus, LCD_RESET, 0, LCD_WIDTH, LCD_HEIGHT, 0, 0, 0, 0);
|
||||
|
||||
static void lvglFlushCb(lv_disp_drv_t *disp, const lv_area_t *area, lv_color_t *colorP) {
|
||||
uint32_t w = area->x2 - area->x1 + 1;
|
||||
uint32_t h = area->y2 - area->y1 + 1;
|
||||
#if (LV_COLOR_16_SWAP != 0)
|
||||
gfx->draw16bitBeRGBBitmap(area->x1, area->y1, (uint16_t *)&colorP->full, w, h);
|
||||
#else
|
||||
gfx->draw16bitRGBBitmap(area->x1, area->y1, (uint16_t *)&colorP->full, w, h);
|
||||
#endif
|
||||
lv_disp_flush_ready(disp);
|
||||
}
|
||||
|
||||
static void lvglTick(void *arg) {
|
||||
LV_UNUSED(arg);
|
||||
lv_tick_inc(EXAMPLE_LVGL_TICK_PERIOD_MS);
|
||||
}
|
||||
|
||||
static void lvglTouchRead(lv_indev_drv_t *indevDrv, lv_indev_data_t *data) {
|
||||
LV_UNUSED(indevDrv);
|
||||
uint8_t touched = gTouch.getPoint(gTouchX, gTouchY, gTouch.getSupportTouchPoint());
|
||||
if (touched > 0) {
|
||||
data->state = LV_INDEV_STATE_PR;
|
||||
data->point.x = gTouchX[0];
|
||||
data->point.y = gTouchY[0];
|
||||
return;
|
||||
}
|
||||
data->state = LV_INDEV_STATE_REL;
|
||||
}
|
||||
|
||||
static uint32_t readAverageRaw() {
|
||||
uint32_t sum = 0;
|
||||
for (uint32_t i = 0; i < kAdcSamples; i++) {
|
||||
sum += analogRead(kUsbDpPin);
|
||||
delayMicroseconds(250);
|
||||
}
|
||||
return sum / kAdcSamples;
|
||||
}
|
||||
|
||||
static uint32_t readAverageMillivolts() {
|
||||
uint32_t sum = 0;
|
||||
for (uint32_t i = 0; i < kAdcSamples; i++) {
|
||||
sum += analogReadMilliVolts(kUsbDpPin);
|
||||
delayMicroseconds(250);
|
||||
}
|
||||
return sum / kAdcSamples;
|
||||
}
|
||||
|
||||
static void setResistanceText(float ohms) {
|
||||
if (ohms >= 1000000.0f) {
|
||||
String text = String(ohms / 1000000.0f, 2) + " Mohm";
|
||||
lv_label_set_text(gResistanceLabel, text.c_str());
|
||||
} else if (ohms >= 1000.0f) {
|
||||
String text = String(ohms / 1000.0f, 2) + " kohm";
|
||||
lv_label_set_text(gResistanceLabel, text.c_str());
|
||||
} else {
|
||||
String text = String(ohms, 0) + " ohm";
|
||||
lv_label_set_text(gResistanceLabel, text.c_str());
|
||||
}
|
||||
}
|
||||
|
||||
static void updateResistanceUi() {
|
||||
if (!gSensorMode) {
|
||||
return;
|
||||
}
|
||||
|
||||
uint32_t now = millis();
|
||||
if (now - gLastUiRefreshMs < kUiRefreshMs) {
|
||||
return;
|
||||
}
|
||||
gLastUiRefreshMs = now;
|
||||
|
||||
uint32_t raw = readAverageRaw();
|
||||
uint32_t millivolts = readAverageMillivolts();
|
||||
|
||||
if (millivolts <= kOpenThresholdMillivolts) {
|
||||
lv_label_set_text(gResistanceLabel, "OPEN");
|
||||
lv_obj_set_style_text_color(gResistanceLabel, lv_color_hex(0xFFD166), 0);
|
||||
} else if (millivolts >= (uint32_t)(kSourceMillivolts - 80.0f)) {
|
||||
lv_label_set_text(gResistanceLabel, "SHORT / LOW");
|
||||
lv_obj_set_style_text_color(gResistanceLabel, lv_color_hex(0x7CFF8A), 0);
|
||||
} else {
|
||||
float rx = kKnownPulldownOhms * ((kSourceMillivolts / (float)millivolts) - 1.0f);
|
||||
lv_obj_set_style_text_color(gResistanceLabel, lv_color_hex(0x7CFF8A), 0);
|
||||
setResistanceText(rx);
|
||||
}
|
||||
|
||||
String rawText = "ADC raw: " + String(raw);
|
||||
rawText += "\nD+ voltage: " + String(millivolts) + " mV";
|
||||
rawText += "\nKnown pulldown: 10 kohm to GND";
|
||||
lv_label_set_text(gRawLabel, rawText.c_str());
|
||||
}
|
||||
|
||||
static void enterSensorMode() {
|
||||
Serial.flush();
|
||||
delay(30);
|
||||
|
||||
pinMode(kUsbDmPin, OUTPUT);
|
||||
digitalWrite(kUsbDmPin, HIGH);
|
||||
|
||||
pinMode(kUsbDpPin, INPUT);
|
||||
analogReadResolution(12);
|
||||
analogSetPinAttenuation(kUsbDpPin, ADC_11db);
|
||||
|
||||
gSensorMode = true;
|
||||
gLastUiRefreshMs = 0;
|
||||
|
||||
lv_label_set_text(gModeLabel, "Resistance mode");
|
||||
lv_label_set_text(gHintLabel, "D- is 3.3V source. D+ is ADC input.\nUse 10 kohm from D+ to GND for accurate readings.");
|
||||
lv_label_set_text(gActionButtonLabel, "Restart to USB");
|
||||
updateResistanceUi();
|
||||
}
|
||||
|
||||
static void actionButtonEventCb(lv_event_t *event) {
|
||||
if (lv_event_get_code(event) != LV_EVENT_CLICKED) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (!gSensorMode) {
|
||||
enterSensorMode();
|
||||
return;
|
||||
}
|
||||
|
||||
lv_label_set_text(gModeLabel, "Restarting...");
|
||||
lv_label_set_text(gHintLabel, "USB mode will return after reboot.");
|
||||
lv_timer_handler();
|
||||
delay(150);
|
||||
ESP.restart();
|
||||
}
|
||||
|
||||
static void createUi() {
|
||||
lv_obj_t *screen = lv_scr_act();
|
||||
lv_obj_set_style_bg_color(screen, lv_color_hex(0x0B1320), 0);
|
||||
lv_obj_set_style_bg_opa(screen, LV_OPA_COVER, 0);
|
||||
|
||||
lv_obj_t *title = lv_label_create(screen);
|
||||
lv_label_set_text(title, "USB RESISTANCE TEST");
|
||||
lv_obj_set_style_text_color(title, lv_color_hex(0xFFFFFF), 0);
|
||||
lv_obj_set_style_text_font(title, &lv_font_montserrat_22, 0);
|
||||
lv_obj_align(title, LV_ALIGN_TOP_MID, 0, 24);
|
||||
|
||||
gModeLabel = lv_label_create(screen);
|
||||
lv_label_set_text(gModeLabel, "USB mode");
|
||||
lv_obj_set_style_text_color(gModeLabel, lv_color_hex(0xB8C8DC), 0);
|
||||
lv_obj_set_style_text_font(gModeLabel, &lv_font_montserrat_18, 0);
|
||||
lv_obj_align(gModeLabel, LV_ALIGN_TOP_MID, 0, 68);
|
||||
|
||||
gResistanceLabel = lv_label_create(screen);
|
||||
lv_label_set_text(gResistanceLabel, "READY");
|
||||
lv_obj_set_style_text_color(gResistanceLabel, lv_color_hex(0x72D6FF), 0);
|
||||
lv_obj_set_style_text_font(gResistanceLabel, &lv_font_montserrat_40, 0);
|
||||
lv_obj_align(gResistanceLabel, LV_ALIGN_CENTER, 0, -72);
|
||||
|
||||
gRawLabel = lv_label_create(screen);
|
||||
lv_label_set_text(gRawLabel, "ADC raw: -\nD+ voltage: -\nKnown pulldown: 10 kohm to GND");
|
||||
lv_obj_set_width(gRawLabel, 420);
|
||||
lv_label_set_long_mode(gRawLabel, LV_LABEL_LONG_WRAP);
|
||||
lv_obj_set_style_text_align(gRawLabel, LV_TEXT_ALIGN_CENTER, 0);
|
||||
lv_obj_set_style_text_color(gRawLabel, lv_color_hex(0xD5DCE5), 0);
|
||||
lv_obj_set_style_text_font(gRawLabel, &lv_font_montserrat_16, 0);
|
||||
lv_obj_align(gRawLabel, LV_ALIGN_CENTER, 0, -8);
|
||||
|
||||
gHintLabel = lv_label_create(screen);
|
||||
lv_label_set_text(gHintLabel, "USB is normal now.\nTap Start to measure resistance between D- and D+.");
|
||||
lv_obj_set_width(gHintLabel, 420);
|
||||
lv_label_set_long_mode(gHintLabel, LV_LABEL_LONG_WRAP);
|
||||
lv_obj_set_style_text_align(gHintLabel, LV_TEXT_ALIGN_CENTER, 0);
|
||||
lv_obj_set_style_text_color(gHintLabel, lv_color_hex(0xAAB7C6), 0);
|
||||
lv_obj_set_style_text_font(gHintLabel, &lv_font_montserrat_14, 0);
|
||||
lv_obj_align(gHintLabel, LV_ALIGN_CENTER, 0, 72);
|
||||
|
||||
gActionButton = lv_btn_create(screen);
|
||||
lv_obj_set_size(gActionButton, 260, 72);
|
||||
lv_obj_align(gActionButton, LV_ALIGN_BOTTOM_MID, 0, -42);
|
||||
lv_obj_set_style_radius(gActionButton, 18, 0);
|
||||
lv_obj_set_style_bg_color(gActionButton, lv_color_hex(0x2A9D8F), 0);
|
||||
lv_obj_set_style_border_width(gActionButton, 0, 0);
|
||||
lv_obj_add_event_cb(gActionButton, actionButtonEventCb, LV_EVENT_CLICKED, nullptr);
|
||||
|
||||
gActionButtonLabel = lv_label_create(gActionButton);
|
||||
lv_label_set_text(gActionButtonLabel, "Start");
|
||||
lv_obj_set_style_text_color(gActionButtonLabel, lv_color_hex(0xFFFFFF), 0);
|
||||
lv_obj_set_style_text_font(gActionButtonLabel, &lv_font_montserrat_22, 0);
|
||||
lv_obj_center(gActionButtonLabel);
|
||||
}
|
||||
|
||||
void setup() {
|
||||
Serial.begin(115200);
|
||||
|
||||
Wire.begin(IIC_SDA, IIC_SCL);
|
||||
|
||||
pinMode(TP_RST, OUTPUT);
|
||||
pinMode(TP_INT, INPUT);
|
||||
digitalWrite(TP_RST, LOW);
|
||||
delay(30);
|
||||
digitalWrite(TP_RST, HIGH);
|
||||
delay(50);
|
||||
delay(1000);
|
||||
|
||||
gTouch.setPins(TP_RST, TP_INT);
|
||||
bool touchOk = gTouch.begin(Wire, 0x5A, IIC_SDA, IIC_SCL);
|
||||
if (!touchOk) {
|
||||
Serial.println("Touch init failed");
|
||||
} else {
|
||||
gTouch.sleep();
|
||||
gTouch.reset();
|
||||
gTouch.setMaxCoordinates(480, 480);
|
||||
gTouch.setSwapXY(true);
|
||||
gTouch.setMirrorXY(true, false);
|
||||
}
|
||||
|
||||
gfx->begin();
|
||||
gBus->writeC8D8(0x36, 0xA0);
|
||||
gfx->setBrightness(220);
|
||||
gfx->fillScreen(0x0000);
|
||||
|
||||
lv_init();
|
||||
|
||||
uint32_t screenWidth = gfx->width();
|
||||
uint32_t screenHeight = gfx->height();
|
||||
gBuf1 = (lv_color_t *)heap_caps_malloc(screenWidth * screenHeight / 4 * sizeof(lv_color_t), MALLOC_CAP_DMA);
|
||||
gBuf2 = (lv_color_t *)heap_caps_malloc(screenWidth * screenHeight / 4 * sizeof(lv_color_t), MALLOC_CAP_DMA);
|
||||
lv_disp_draw_buf_init(&gDrawBuf, gBuf1, gBuf2, screenWidth * screenHeight / 4);
|
||||
|
||||
static lv_disp_drv_t dispDrv;
|
||||
lv_disp_drv_init(&dispDrv);
|
||||
dispDrv.hor_res = screenWidth;
|
||||
dispDrv.ver_res = screenHeight;
|
||||
dispDrv.flush_cb = lvglFlushCb;
|
||||
dispDrv.draw_buf = &gDrawBuf;
|
||||
lv_disp_drv_register(&dispDrv);
|
||||
|
||||
static lv_indev_drv_t indevDrv;
|
||||
lv_indev_drv_init(&indevDrv);
|
||||
indevDrv.type = LV_INDEV_TYPE_POINTER;
|
||||
indevDrv.read_cb = lvglTouchRead;
|
||||
lv_indev_drv_register(&indevDrv);
|
||||
|
||||
const esp_timer_create_args_t lvglTickTimerArgs = {
|
||||
.callback = &lvglTick,
|
||||
.name = "lvgl_tick"};
|
||||
esp_timer_handle_t lvglTickTimer = nullptr;
|
||||
esp_timer_create(&lvglTickTimerArgs, &lvglTickTimer);
|
||||
esp_timer_start_periodic(lvglTickTimer, EXAMPLE_LVGL_TICK_PERIOD_MS * 1000);
|
||||
|
||||
createUi();
|
||||
Serial.println("USB resistance test ready; native USB remains active until Start is tapped.");
|
||||
}
|
||||
|
||||
void loop() {
|
||||
updateResistanceUi();
|
||||
lv_timer_handler();
|
||||
delay(5);
|
||||
}
|
||||
@@ -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_debug_test/usb_contact_sensor_debug_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`
|
||||
|
||||
## Purpose
|
||||
@@ -51,6 +52,33 @@ Sensor mode starts from the physical BOOT/user button on GPIO0, active LOW. The
|
||||
|
||||
While in sensor mode, pressing the BOOT/user button again restarts the device and returns normal USB mode on the next boot.
|
||||
|
||||
## Resistance version
|
||||
|
||||
The `usb_contact_resistance_test` sketch starts in normal USB mode and does not reconfigure GPIO19/20 until `Start` is tapped.
|
||||
|
||||
Initial screen:
|
||||
|
||||
- title: `USB RESISTANCE TEST`
|
||||
- mode: `USB mode`
|
||||
- state: `READY`
|
||||
- action button: `Start`
|
||||
|
||||
After `Start`:
|
||||
|
||||
- GPIO19 / USB `D-` is configured as `OUTPUT HIGH`
|
||||
- GPIO20 / USB `D+` is configured as ADC input
|
||||
- the measured resistance is connected between `D-` and `D+`
|
||||
- a known external 10 kΩ pulldown resistor must be connected from `D+` to `GND` for meaningful ohm calculation
|
||||
- UI shows calculated resistance, raw ADC value, and measured `D+` millivolts
|
||||
- very low ADC voltage is shown as `OPEN`
|
||||
- near-source voltage is shown as `SHORT / LOW`
|
||||
|
||||
The calculation assumes a divider where the unknown resistance is the high-side resistor from 3.3 V to ADC and the known 10 kΩ resistor is the low-side resistor from ADC to GND:
|
||||
|
||||
`Rx = 10000 * (3300 / Vadc - 1)`
|
||||
|
||||
This test is intended to check whether the USB contact pair can be reused as an ADC-measured resistance input, for example before wiring a 10 kΩ potentiometer. Native USB data is unavailable while resistance mode owns GPIO19/20. Pressing `Restart to USB` calls `ESP.restart()`; after reboot normal USB mode is restored.
|
||||
|
||||
## GFX breath monitor version
|
||||
|
||||
The `usb_contact_screen_start_stub` sketch is a breath monitor firmware based on the production `Arduino_GFX` display path instead of LVGL.
|
||||
|
||||
+1
-1
@@ -1,2 +1,2 @@
|
||||
client.version=1.15.0
|
||||
client.version=1.16.0
|
||||
server.version=1.13.0
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
# Ссылки в тексте сообщений SHiNE (UI)
|
||||
|
||||
Состояние: 10.10.2026. Изменений формата блокчейна и серверного API нет.
|
||||
|
||||
## Поддерживаемые текстовые ссылки
|
||||
|
||||
- `SHiNE/aidar/news/34` — ссылка на публикацию №34. В ленте открывает `/SHiNE/aidar/news/s/34`; при просмотре отдельной публикации, комментариев или личного чата — `/SHiNE/aidar/news/34`.
|
||||
- `SHiNE/aidar/news/s/34` — явно открывает ленту и прокручивает к публикации №34 независимо от исходного экрана.
|
||||
- `SHiNE/aidar/news` — канал, `SHiNE/aidar` — профиль.
|
||||
- Допускается ведущий `/`; используется текущий origin браузера, без привязки к конкретному серверу доступа.
|
||||
- `http://`, `https://` и `www.` — внешние ссылки, открываются в новой вкладке с `rel="noopener noreferrer"`.
|
||||
- Все ссылки могут находиться в обычном тексте публикаций, их обсуждений и личных сообщений. Текст передаётся и сохраняется без преобразований; ссылки становятся кликабельными исключительно при отображении.
|
||||
|
||||
## Техническое поведение
|
||||
|
||||
Обработчик `shine-UI/js/services/shine-message-links.js` безопасно создаёт DOM-ссылки через `textContent`, не вставляет пользовательский текст как HTML. Для внутренних переходов используется существующий `navigate()`; стандартный `href` позволяет копировать ссылку и открывать её в новой вкладке. Просмотр из контекста ленты передаётся опцией `viewMode: 'feed'` (без глобального переключателя режима). Вход из чата или извне без контекста по умолчанию открывает отдельную публикацию.
|
||||
|
||||
Порядковые номера определяются уже существующим `channel-message-ordinals.js`. Этот патч **не пересчитывает и не меняет** правила нумерации. Стабильность номера при позднем импорте/форке требует отдельной проверки.
|
||||
|
||||
В этой UI-реализации **пока не введена строгая проверка времени создания целевой публикации по отношению к конкретной редакции сообщения**. Проверка при записи (в том числе для сторонних клиентов), форки и варианты встроенных сокращённых ссылок отложены; их нельзя считать обеспеченными клиентским преобразованием текста. Редактирование старой публикации и добавление ссылки на уже существующую новую публикацию не блокируется UI.
|
||||
|
||||
## Тестирование
|
||||
|
||||
Из корня проекта:
|
||||
|
||||
```bash
|
||||
node --test shine-UI/tests/shine-message-links.test.mjs
|
||||
```
|
||||
|
||||
Проверяются маршруты, режим ленты, принудительный `/s/N`, внешние URL, текстовая безопасность и взаимодействие с текущим роутером. Для выпуска дополнительно требуется ручная проверка навигации в браузере из трёх экранов: лента, отдельная запись, личный чат.
|
||||
@@ -72,9 +72,12 @@ import * as profileEditView from './pages/profile-edit-view.js';
|
||||
import * as profilesView from './pages/profiles-view.js';
|
||||
import * as walletView from './pages/wallet-view.js?v=202609260900';
|
||||
import * as settingsView from './pages/settings-view.js';
|
||||
import * as accessKeysView from './pages/access-keys-view.js';
|
||||
import * as myBlockchainView from './pages/my-blockchain-view.js';
|
||||
import * as myBlockchainHistoryView from './pages/my-blockchain-history-view.js';
|
||||
import * as keyRotationView from './pages/key-rotation-view.js';
|
||||
import * as accessServersView from './pages/access-servers-view.js';
|
||||
import * as settingsServersView from './pages/settings-servers-view.js';
|
||||
import * as developerSettingsView from './pages/developer-settings-view.js';
|
||||
import * as advancedSettingsView from './pages/advanced-settings-view.js';
|
||||
import * as serverSettingsView from './pages/server-settings-view.js?v=202609260900';
|
||||
@@ -141,9 +144,12 @@ const routes = {
|
||||
'profiles-view': profilesView,
|
||||
'wallet-view': walletView,
|
||||
'settings-view': settingsView,
|
||||
'access-keys-view': accessKeysView,
|
||||
'my-blockchain-view': myBlockchainView,
|
||||
'my-blockchain-history-view': myBlockchainHistoryView,
|
||||
'key-rotation-view': keyRotationView,
|
||||
'access-servers-view': accessServersView,
|
||||
'settings-servers-view': settingsServersView,
|
||||
'developer-settings-view': developerSettingsView,
|
||||
'advanced-settings-view': advancedSettingsView,
|
||||
'server-settings-view': serverSettingsView,
|
||||
@@ -228,6 +234,7 @@ const FILLED_ACTION_BUTTON_PAGE_IDS = new Set([
|
||||
|
||||
const SETTINGS_BORDERED_ACTION_PAGE_IDS = new Set([
|
||||
'access-servers-view',
|
||||
'settings-servers-view',
|
||||
'server-settings-view',
|
||||
'arweave-uploads-view',
|
||||
'developer-settings-view',
|
||||
@@ -1395,6 +1402,14 @@ async function redirectToActiveKeyRotationIfNeeded() {
|
||||
function renderApp() {
|
||||
syncTrackedRouteHistory(window.location.pathname || '/');
|
||||
const route = getRoute();
|
||||
if (state.session.isAuthorized) {
|
||||
const returnPath = window.sessionStorage.getItem('shine-public-return-path');
|
||||
if (returnPath && returnPath.startsWith('/SHiNE/')) {
|
||||
window.sessionStorage.removeItem('shine-public-return-path');
|
||||
navigate(returnPath);
|
||||
return;
|
||||
}
|
||||
}
|
||||
const pageId = route.pageId || (state.session.isAuthorized ? 'messages-list' : 'start-view');
|
||||
|
||||
if (!state.session.isAuthorized && !PRE_AUTH_PAGES.includes(pageId) && !GUEST_ALLOWED_PAGES.has(pageId)) {
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
import { createTopBar } from '../components/topbar.js';
|
||||
|
||||
export const pageMeta = { id: 'access-keys-view', title: 'Ключи доступа' };
|
||||
|
||||
export function render({ navigate, chrome }) {
|
||||
const screen = document.createElement('section');
|
||||
screen.className = 'stack';
|
||||
chrome?.setTopbar(createTopBar({ title: 'Ключи доступа', back: { label: '←', onClick: () => navigate('settings-view') } }));
|
||||
const actions = document.createElement('div');
|
||||
actions.className = 'nav-list';
|
||||
actions.innerHTML = `
|
||||
<button type="button" class="nav-row" id="access-keys-show"><span class="nav-row__label">Показать ключи доступа</span><span class="nav-row__hint">Ключи, сохранённые на этом устройстве</span></button>
|
||||
<button type="button" class="nav-row" id="access-keys-rotate"><span class="nav-row__label">Сменить пароль</span><span class="nav-row__hint">Смена пароля также меняет ключи аккаунта и закрывает другие сеансы</span></button>
|
||||
`;
|
||||
actions.querySelector('#access-keys-show').addEventListener('click', () => navigate('show-keys-view'));
|
||||
actions.querySelector('#access-keys-rotate').addEventListener('click', () => navigate('key-rotation-view'));
|
||||
screen.append(actions);
|
||||
return screen;
|
||||
}
|
||||
@@ -265,7 +265,9 @@ export function render({navigate, chrome}) {
|
||||
const introCard = document.createElement('div');
|
||||
introCard.className = 'settings-intro';
|
||||
introCard.innerHTML = `
|
||||
<p class="meta-muted">Сервер доступа хранит вашу зашифрованную переписку и настройки и помогает со звонками. Публичные записи доступны через любой сервер. При смене сервера переписка сама не переносится.</p>
|
||||
<strong>Мой сервер доступа</strong>
|
||||
<p class="meta-muted">Вы работаете через сервер доступа, указанный ниже. Здесь хранится зашифрованная переписка и настройки, а также обеспечивается работа звонков.</p>
|
||||
<p class="meta-muted">В будущем можно будет одновременно подключаться к двум и более серверам доступа (RAS) для повышения стабильности. Сейчас эта возможность ещё не реализована.</p>
|
||||
`;
|
||||
|
||||
const listCard = document.createElement('div');
|
||||
@@ -292,7 +294,7 @@ export function render({navigate, chrome}) {
|
||||
addTitle.textContent = 'Сменить сервер доступа';
|
||||
const addHint = document.createElement('p');
|
||||
addHint.className = 'meta-muted';
|
||||
addHint.textContent = 'Введите логин нового сервера или несколько первых букв, затем выберите сервер из подсказок. Новый сервер заменит текущий.';
|
||||
addHint.textContent = 'Тестовая функция веб-версии. Для обычной смены сервера доступа необходимо открыть новый сервер и выполнить смену оттуда. Здесь можно указать новый сервер напрямую; переписка автоматически не переносится.';
|
||||
const addInput = document.createElement('input');
|
||||
addInput.className = 'input';
|
||||
addInput.type = 'text';
|
||||
@@ -310,6 +312,16 @@ export function render({navigate, chrome}) {
|
||||
addButton.textContent = 'Сменить сервер';
|
||||
addButton.disabled = true;
|
||||
addCard.append(addTitle, addHint, addInput, suggestEl, addStatus, addButton);
|
||||
addCard.hidden = true;
|
||||
const changeServerToggle = document.createElement('button');
|
||||
changeServerToggle.type = 'button';
|
||||
changeServerToggle.className = 'secondary-btn';
|
||||
changeServerToggle.textContent = 'Сменить сервер доступа (тестовая функция)';
|
||||
changeServerToggle.setAttribute('aria-expanded', 'false');
|
||||
changeServerToggle.addEventListener('click', () => {
|
||||
addCard.hidden = !addCard.hidden;
|
||||
changeServerToggle.setAttribute('aria-expanded', String(!addCard.hidden));
|
||||
});
|
||||
|
||||
const refreshAddButton = () => {
|
||||
addButton.disabled = operationBusy
|
||||
@@ -613,12 +625,13 @@ export function render({navigate, chrome}) {
|
||||
});
|
||||
|
||||
chrome?.setTopbar(createTopBar({
|
||||
title: 'Сервер доступа',
|
||||
back: { label: '←', onClick: () => navigate('settings-view') },
|
||||
title: 'Мой сервер доступа',
|
||||
back: { label: '←', onClick: () => navigate('settings-servers-view') },
|
||||
}));
|
||||
screen.append(
|
||||
introCard,
|
||||
listCard,
|
||||
changeServerToggle,
|
||||
addCard,
|
||||
);
|
||||
|
||||
|
||||
@@ -110,7 +110,7 @@ export function render({navigate, chrome}) {
|
||||
|
||||
const topbar = createTopBar({
|
||||
title: 'Файлы в блокчейне',
|
||||
back: { onClick: () => navigate('settings-view') },
|
||||
back: { onClick: () => navigate('my-blockchain-view') },
|
||||
actions: [
|
||||
{
|
||||
icon: 'plus',
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import { appendShineMessageLinks } from '../services/shine-message-links.js';
|
||||
import { confirmDialog } from '../components/confirm-dialog.js';
|
||||
import { iconHtml } from '../components/ui-icon.js';
|
||||
import { rememberChannelPosition, readChannelPosition, restoreChannelPosition } from '../services/channel-view-state.js';
|
||||
@@ -17,7 +18,7 @@ import {
|
||||
softHaptic,
|
||||
} from '../services/channels-ux.js';
|
||||
import { getPreviousTrackedPath, parseRouteFromPath } from '../router.js';
|
||||
import { renderUserAvatar } from '../components/avatar-image.js';
|
||||
import { renderAvatar, renderUserAvatar } from '../components/avatar-image.js';
|
||||
import { openChannelEditor } from '../components/channel-editor.js';
|
||||
import { createDropdownMenu } from '../components/dropdown-menu.js';
|
||||
import { createEmojiPicker } from '../components/emoji-picker.js';
|
||||
@@ -30,6 +31,7 @@ import {
|
||||
} from '../services/attachment-format.js';
|
||||
import { loadProfileSnapshot } from '../services/user-profile-params.js';
|
||||
import { extractLoginFromBlockchainName, makeProfileRoute, makeShineChannelRoute, makeShineMessageRoute } from '../services/shine-routes.js';
|
||||
import { parsePublicationOrdinal, publicationAtOrdinal, ordinalForPublication } from '../services/channel-message-ordinals.js';
|
||||
|
||||
export const pageMeta = { id: 'channel-thread-view', title: 'Обсуждение', hideToolbar: true, shellMode: { scrollbar: 'hidden', topFade: false, contentUnderTopbar: false, contentWidth: 'wide' } };
|
||||
const MSG_SUBTYPE_TEXT_POST = 10;
|
||||
@@ -158,16 +160,17 @@ function buildAbsoluteRouteUrl(routePath = '') {
|
||||
|
||||
function parseThreadSelector(route) {
|
||||
const params = route?.params || {};
|
||||
if (params.ownerBlockchainName && params.channelName && params.messageBlockNumber) {
|
||||
if (params.ownerBlockchainName && params.channelName && params.messageOrdinal) {
|
||||
return {
|
||||
short: {
|
||||
ownerBlockchainName: String(params.ownerBlockchainName || '').trim(),
|
||||
channelName: String(params.channelName || '').trim(),
|
||||
},
|
||||
publicationOrdinal: parsePublicationOrdinal(params.messageOrdinal),
|
||||
message: {
|
||||
blockchainName: '',
|
||||
blockNumber: toSafeInt(params.messageBlockNumber),
|
||||
blockHash: normalizeRouteHash(params.messageBlockHash),
|
||||
blockNumber: null,
|
||||
blockHash: '',
|
||||
},
|
||||
channel: {
|
||||
ownerBlockchainName: '',
|
||||
@@ -322,13 +325,20 @@ async function resolveChannelDisplayNameFromServer(channelSelector) {
|
||||
}
|
||||
}
|
||||
|
||||
function buildThreadRouteFromTarget(target, selector) {
|
||||
function buildThreadRouteFromTarget(target, selector, focusOrdinal = null) {
|
||||
if (!target) return '';
|
||||
const ownerBch = String(selector?.short?.ownerBlockchainName || selector?.channel?.ownerBlockchainName || '').trim();
|
||||
const ownerBch = String(selector?.channel?.ownerBlockchainName || selector?.short?.ownerBlockchainName || '').trim();
|
||||
const focus = selector?.message;
|
||||
const sameFocus = !!focus && Number(focus.blockNumber) === Number(target.blockNumber)
|
||||
&& String(focus.blockchainName || '').toLowerCase() === String(target.blockchainName || '').toLowerCase();
|
||||
return makeShineMessageRoute({
|
||||
ownerLogin: extractLoginFromBlockchainName(ownerBch) || extractLoginFromBlockchainName(target.blockchainName),
|
||||
messageBlockchainName: target.blockchainName,
|
||||
messageBlockNumber: target.blockNumber,
|
||||
// A channel link needs the POST ordinal; replies still use their technical address.
|
||||
messageOrdinal: sameFocus ? focusOrdinal : '',
|
||||
channelName: sameFocus ? selector?.short?.channelName || '' : '',
|
||||
channelOwnerBlockchainName: ownerBch,
|
||||
});
|
||||
}
|
||||
|
||||
@@ -648,9 +658,12 @@ function openEditMessageModal({ initialText = '', allowEmptyText = false, onSave
|
||||
});
|
||||
}
|
||||
|
||||
function renderNodeCard(node, heading, handlers, localNumber) {
|
||||
function renderNodeCard(node, heading, handlers, localNumber, { focusPost = false, channelOwnerBlockchainName = '' } = {}) {
|
||||
const card = document.createElement('article');
|
||||
card.className = 'card stack thread-node-card channel-message-card';
|
||||
const isOwnerPost = focusPost && channelOwnerBlockchainName
|
||||
&& String(node?.authorBlockchainName || '').trim().toLowerCase() === channelOwnerBlockchainName.trim().toLowerCase();
|
||||
if (isOwnerPost) card.classList.add('channel-message-card--owner');
|
||||
|
||||
const author = node?.authorLogin || 'автор';
|
||||
const versions = Array.isArray(node?.versions) ? node.versions : [];
|
||||
@@ -723,6 +736,7 @@ function renderNodeCard(node, heading, handlers, localNumber) {
|
||||
if (node?.createdAtMs) timestamp.title = new Date(node.createdAtMs).toLocaleString('ru-RU');
|
||||
authorBlock.append(title, timestamp);
|
||||
authorTile.append(avatar, authorBlock);
|
||||
if (isOwnerPost) authorTile.hidden = true;
|
||||
headRow.append(authorTile);
|
||||
const typeMeta = getChannelMessageTypeMeta(node?.msgSubType);
|
||||
if (typeMeta) {
|
||||
@@ -780,7 +794,7 @@ function renderNodeCard(node, heading, handlers, localNumber) {
|
||||
}
|
||||
const body = document.createElement('p');
|
||||
body.className = 'channel-message-body';
|
||||
body.textContent = parsedText.text;
|
||||
appendShineMessageLinks(body, parsedText.text, { navigate: handlers?.navigate });
|
||||
card.append(body);
|
||||
}
|
||||
|
||||
@@ -802,7 +816,7 @@ function renderNodeCard(node, heading, handlers, localNumber) {
|
||||
|
||||
const likeButton = document.createElement('button');
|
||||
likeButton.type = 'button';
|
||||
likeButton.className = 'ui-button channel-action-item thread-like-btn';
|
||||
likeButton.className = 'ui-button channel-action-item channel-action-like thread-like-btn';
|
||||
if (isLiked) likeButton.classList.add('is-liked');
|
||||
likeButton.innerHTML = `
|
||||
<span class="channel-action-icon" aria-hidden="true">${iconHtml('heart', isLiked)}</span>
|
||||
@@ -844,6 +858,11 @@ function renderNodeCard(node, heading, handlers, localNumber) {
|
||||
replyButton.addEventListener('click', (event) => {
|
||||
event.stopPropagation();
|
||||
animatePress(event.currentTarget);
|
||||
if (!state.session.isAuthorized) {
|
||||
state.authReturnHash = window.location.pathname || '/channels';
|
||||
handlers.navigate('login-view');
|
||||
return;
|
||||
}
|
||||
openReplyModal({
|
||||
onSubmit: async (textValue) => handlers.onReply(target, textValue),
|
||||
isActive: handlers.isActive,
|
||||
@@ -860,7 +879,7 @@ function renderNodeCard(node, heading, handlers, localNumber) {
|
||||
|
||||
const shareButton = document.createElement('button');
|
||||
shareButton.type = 'button';
|
||||
shareButton.className = 'ui-button channel-action-item thread-share-btn';
|
||||
shareButton.className = 'ui-button channel-action-item channel-action-share thread-share-btn';
|
||||
shareButton.innerHTML = `
|
||||
<span class="channel-action-icon" aria-hidden="true">${iconHtml('share')}</span>
|
||||
<span class="channel-action-label">Отправить</span>
|
||||
@@ -876,11 +895,22 @@ function renderNodeCard(node, heading, handlers, localNumber) {
|
||||
// Точка возврата: docs/Future_Features/2026-05-24_1140_репосты_в_каналах_и_тредах.md
|
||||
const discussionButton = document.createElement('button');
|
||||
discussionButton.type = 'button';
|
||||
discussionButton.className = 'ui-button channel-action-item';
|
||||
discussionButton.innerHTML = `<span class="channel-action-icon">${iconHtml('message')}</span>${Number(replies) > 0 ? `<span>${replies}</span>` : ''}`;
|
||||
discussionButton.setAttribute('aria-label', `Открыть обсуждение, ответов: ${replies}`);
|
||||
discussionButton.addEventListener('click', () => handlers.onOpenThread(target));
|
||||
actions.append(likeButton, discussionButton, shareButton, replyButton);
|
||||
discussionButton.className = 'ui-button channel-action-item channel-action-discussion';
|
||||
discussionButton.innerHTML = `
|
||||
<span class="channel-action-icon" aria-hidden="true">${iconHtml('message')}</span>
|
||||
<span class="channel-action-label">Обсуждение</span>
|
||||
<span class="channel-action-counter">${replies || ''}</span>
|
||||
`;
|
||||
setActionTitle(discussionButton, `Открыть обсуждение, ответов: ${replies}`);
|
||||
discussionButton.addEventListener('click', (event) => {
|
||||
event.stopPropagation();
|
||||
animatePress(event.currentTarget);
|
||||
if (focusPost) card.closest('.channels-screen')?.querySelector('.thread-block--replies')?.scrollIntoView({ block: 'start', behavior: 'smooth' });
|
||||
else handlers.onOpenThread(target);
|
||||
});
|
||||
// Тот же вид и порядок кнопок, что в ленте канала.
|
||||
actions.append(likeButton, shareButton, discussionButton);
|
||||
menuItems.unshift({ label: 'Ответить', iconHtml: iconHtml('reply'), action: () => replyButton.click() });
|
||||
if (repostTarget) {
|
||||
const originalButton = document.createElement('button');
|
||||
originalButton.type = 'button';
|
||||
@@ -958,6 +988,15 @@ function renderNodeCard(node, heading, handlers, localNumber) {
|
||||
}
|
||||
if (versionsTotal > 1) menuItems.push({ label: 'История изменений', action: () => openMessageHistoryModal({ versions: versions }) });
|
||||
attachMessageMenu(card, headRow, menuItems);
|
||||
if (isOwnerPost) {
|
||||
const meta = document.createElement('div');
|
||||
meta.className = 'channel-message-meta';
|
||||
const moreButton = headRow.querySelector('.channel-message-more');
|
||||
meta.append(timestamp);
|
||||
if (moreButton) meta.append(moreButton);
|
||||
actions.append(meta);
|
||||
if (!headRow.querySelector('.channel-message-type-button')) headRow.hidden = true;
|
||||
}
|
||||
card.append(actions);
|
||||
authorTile.addEventListener('click', (event) => {
|
||||
event.stopPropagation();
|
||||
@@ -985,13 +1024,13 @@ function nodeKey(node) {
|
||||
}
|
||||
|
||||
// Исходная запись сверху: две строки, «Развернуть» — только если текст правда обрезан
|
||||
function renderThreadContext(node, { onOpenPost }) {
|
||||
function renderThreadContext(node, { onOpenPost, onNavigate }) {
|
||||
const parsed = parseMessageAttachments(resolveNodeText(node));
|
||||
const box = document.createElement('section');
|
||||
box.className = 'thread-context';
|
||||
const text = document.createElement('p');
|
||||
text.className = 'thread-context__text';
|
||||
text.textContent = parsed.text || (parsed.attachments.length ? 'Запись с вложением' : '');
|
||||
appendShineMessageLinks(text, parsed.text || (parsed.attachments.length ? 'Запись с вложением' : ''), { navigate: onNavigate });
|
||||
const meta = document.createElement('div');
|
||||
meta.className = 'thread-context__meta';
|
||||
const time = document.createElement('span');
|
||||
@@ -1088,7 +1127,7 @@ function renderComment({ node, parent, focus, channelOwner, handlers }) {
|
||||
}
|
||||
const text = document.createElement('p');
|
||||
text.className = 'thread-comment__text';
|
||||
text.textContent = parsed.text;
|
||||
appendShineMessageLinks(text, parsed.text, { navigate: handlers?.navigate });
|
||||
item.append(text);
|
||||
|
||||
const actions = document.createElement('div');
|
||||
@@ -1237,7 +1276,7 @@ function createThreadComposer({ draftKey, isAuthorized, onLogin, onSend }) {
|
||||
const login = document.createElement('button');
|
||||
login.type = 'button';
|
||||
login.className = 'primary-btn channel-main-action';
|
||||
login.textContent = 'Войти и ответить';
|
||||
login.textContent = 'Войти / зарегистрироваться';
|
||||
login.addEventListener('click', onLogin);
|
||||
root.append(login);
|
||||
return { root, setReplyTo() {} };
|
||||
@@ -1338,8 +1377,11 @@ function createThreadComposer({ draftKey, isAuthorized, onLogin, onSend }) {
|
||||
export function render({ navigate, route, chrome }) {
|
||||
let selector = parseThreadSelector(route);
|
||||
const channelDisplayName = resolveChannelDisplayName(selector?.channel);
|
||||
const routeKey = `${selector?.message?.blockchainName || ''}:${selector?.message?.blockNumber || ''}:${selector?.message?.blockHash || ''}`;
|
||||
const routeKey = selector?.publicationOrdinal
|
||||
? `channel:${selector?.short?.ownerBlockchainName || ''}:${selector?.short?.channelName || ''}:${selector.publicationOrdinal}`
|
||||
: `${selector?.message?.blockchainName || ''}:${selector?.message?.blockNumber || ''}:${selector?.message?.blockHash || ''}`;
|
||||
let activeResolvedChannelLabel = channelDisplayName;
|
||||
let focusOrdinal = selector?.publicationOrdinal || null;
|
||||
|
||||
const screen = document.createElement('section');
|
||||
screen.className = 'stack channels-screen channels-screen--thread';
|
||||
@@ -1370,7 +1412,7 @@ export function render({ navigate, route, chrome }) {
|
||||
const header = createTopBar({
|
||||
center: threadHeaderButton,
|
||||
className: 'topbar--identity',
|
||||
back: { label: '<', onClick: () => navigate(resolveThreadPreviousInChannels(selector, activeResolvedChannelLabel)) },
|
||||
back: state.session.isAuthorized ? { label: '<', onClick: () => navigate(resolveThreadPreviousInChannels(selector, activeResolvedChannelLabel)) } : null,
|
||||
actions: [{
|
||||
label: '⋯',
|
||||
ariaLabel: 'Меню обсуждения',
|
||||
@@ -1415,6 +1457,11 @@ export function render({ navigate, route, chrome }) {
|
||||
navigate,
|
||||
isActive: () => !disposed,
|
||||
onToggleLike: async (target, action) => {
|
||||
if (!state.session.isAuthorized) {
|
||||
state.authReturnHash = window.location.pathname || '/channels';
|
||||
navigate('login-view');
|
||||
return;
|
||||
}
|
||||
const actionKey = makeReactionActionKey(target);
|
||||
if (!actionKey) throw new Error('Некорректная ссылка на сообщение для реакции.');
|
||||
if (pendingReactionActions.has(actionKey)) return;
|
||||
@@ -1510,7 +1557,7 @@ export function render({ navigate, route, chrome }) {
|
||||
},
|
||||
onShare: async (target) => {
|
||||
try {
|
||||
const routePath = buildThreadRouteFromTarget(target, selector);
|
||||
const routePath = buildThreadRouteFromTarget(target, selector, focusOrdinal);
|
||||
if (!routePath) throw new Error('Не удалось подготовить ссылку на обсуждение.');
|
||||
const result = await shareOrCopyLink({
|
||||
title: 'Сияние · Обсуждение',
|
||||
@@ -1526,7 +1573,7 @@ export function render({ navigate, route, chrome }) {
|
||||
}
|
||||
},
|
||||
onOpenThread: (target) => {
|
||||
const routePath = buildThreadRouteFromTarget(target, selector);
|
||||
const routePath = buildThreadRouteFromTarget(target, selector, focusOrdinal);
|
||||
if (!routePath) {
|
||||
showStatus('Не удалось определить ссылку на обсуждение.');
|
||||
return;
|
||||
@@ -1599,10 +1646,13 @@ export function render({ navigate, route, chrome }) {
|
||||
if (!hadContent) clearContent();
|
||||
showStatus('');
|
||||
selector = parseThreadSelector(route);
|
||||
focusOrdinal = selector?.publicationOrdinal || null;
|
||||
activeResolvedChannelLabel = resolveChannelDisplayName(selector?.channel);
|
||||
threadHeaderChannel.textContent = '…';
|
||||
threadHeaderButton.disabled = true;
|
||||
threadHeaderButton.onclick = null;
|
||||
threadHeaderButton.querySelector('.channel-thread-header-avatar')?.remove();
|
||||
threadHeaderTitle.textContent = 'Обсуждение';
|
||||
|
||||
if (!selector) {
|
||||
const invalid = document.createElement('div');
|
||||
@@ -1616,8 +1666,9 @@ export function render({ navigate, route, chrome }) {
|
||||
|
||||
try {
|
||||
let resolvedMessage = selector.message;
|
||||
let cachedChannelPayload = null;
|
||||
if (selector.short?.ownerBlockchainName && selector.short?.channelName) {
|
||||
const ownFeed = await authService.listSubscriptionsFeed(state.session.login, 1000);
|
||||
const ownFeed = state.session.isAuthorized ? await authService.listSubscriptionsFeed(state.session.login, 1000) : {};
|
||||
if (disposed || seq !== refreshSeq) return;
|
||||
const allRows = [
|
||||
...(Array.isArray(ownFeed?.ownedChannels) ? ownFeed.ownedChannels : []),
|
||||
@@ -1666,10 +1717,21 @@ export function render({ navigate, route, chrome }) {
|
||||
// ignore owner feed lookup errors
|
||||
}
|
||||
}
|
||||
if (!channel && ownerLoginFromBch) {
|
||||
try {
|
||||
const publicChannels = await authService.listUserProfileChannels(ownerLoginFromBch, 'owned', 500, 0, true);
|
||||
const row = (Array.isArray(publicChannels?.channels) ? publicChannels.channels : []).find((item) =>
|
||||
String(item?.slug || '').trim().toLowerCase() === channelNameNormalized);
|
||||
if (row) channel = { channel: {
|
||||
ownerBlockchainName: row.ownerBlockchainName,
|
||||
channelRoot: { blockNumber: Number(row.rootBlockNumber), blockHash: normalizeRouteHash(row.rootBlockHashHex) },
|
||||
} };
|
||||
} catch { /* Public profile may be unavailable. */ }
|
||||
}
|
||||
const ownerBch = String(channel?.channel?.ownerBlockchainName || '').trim();
|
||||
const rootNo = Number(channel?.channel?.channelRoot?.blockNumber);
|
||||
const rootHash = normalizeRouteHash(channel?.channel?.channelRoot?.blockHash);
|
||||
if (!ownerBch || !Number.isFinite(rootNo) || !Number.isFinite(resolvedMessage?.blockNumber)) {
|
||||
if (!ownerBch || !Number.isFinite(rootNo) || !focusOrdinal) {
|
||||
throw new Error('Канал или сообщение не найдено.');
|
||||
}
|
||||
selector.channel = {
|
||||
@@ -1678,11 +1740,22 @@ export function render({ navigate, route, chrome }) {
|
||||
channelRootBlockHash: rootHash,
|
||||
};
|
||||
|
||||
// One-based channel publication ordinal -> original POST block reference.
|
||||
// Editions are deliberately excluded by GetChannelMessages on the server.
|
||||
cachedChannelPayload = await authService.getChannelMessages(selector.channel, null, 'asc', state.session.isAuthorized ? state.session.login : '');
|
||||
if (disposed || seq !== refreshSeq) return;
|
||||
const message = publicationAtOrdinal(cachedChannelPayload?.messages || [], focusOrdinal);
|
||||
const blockNumber = Number(message?.messageRef?.blockNumber);
|
||||
const blockHash = normalizeMessageHash(message?.messageRef?.blockHash);
|
||||
if (!Number.isSafeInteger(blockNumber) || blockNumber < 0 || !blockHash) {
|
||||
throw new Error(`Публикация №${focusOrdinal} не найдена в канале.`);
|
||||
}
|
||||
resolvedMessage = {
|
||||
blockchainName: ownerBch,
|
||||
blockNumber: resolvedMessage.blockNumber,
|
||||
blockHash: normalizeMessageHash(resolvedMessage?.blockHash),
|
||||
blockchainName: String(message?.authorBlockchainName || ownerBch),
|
||||
blockNumber,
|
||||
blockHash,
|
||||
};
|
||||
selector.message = { ...resolvedMessage };
|
||||
}
|
||||
|
||||
const payload = await authService.getMessageThread(resolvedMessage, 20, 2, 50, state.session.login);
|
||||
@@ -1717,8 +1790,51 @@ export function render({ navigate, route, chrome }) {
|
||||
activeResolvedChannelLabel = resolvedChannelLabel;
|
||||
const fallbackChannel = String(selector?.channel?.ownerBlockchainName || '').trim() || 'неизвестно';
|
||||
const resolvedChannelTitle = resolvedChannelLabel || fallbackChannel;
|
||||
const channelOwner = extractLoginFromBlockchainName(selector?.channel?.ownerBlockchainName || focus?.channelInfo?.ownerBlockchainName || selector?.short?.ownerBlockchainName || '');
|
||||
const channelSlug = String(selector?.short?.channelName || (resolvedChannelLabel.includes('/') ? resolvedChannelLabel.split('/').slice(1).join('/') : '')).trim();
|
||||
let title = channelTitleByLabel.get(resolvedChannelTitle) || channelSlug || resolvedChannelTitle;
|
||||
let avatarAr = '';
|
||||
let avatarSha256 = '';
|
||||
// Метаданные канала доступны гостям: заголовок и аватар берём из того же API, что у ленты.
|
||||
if (selector?.channel?.ownerBlockchainName && selector?.channel?.channelRootBlockNumber != null && Number.isFinite(Number(selector.channel.channelRootBlockNumber))) {
|
||||
try {
|
||||
const channelPayload = cachedChannelPayload || await authService.getChannelMessages(selector.channel, null, 'asc', state.session.isAuthorized ? state.session.login : '');
|
||||
if (disposed || seq !== refreshSeq) return;
|
||||
if (!focusOrdinal && focus) {
|
||||
focusOrdinal = ordinalForPublication(channelPayload?.messages || [], {
|
||||
blockchainName: String(focus?.authorBlockchainName || selector.channel.ownerBlockchainName),
|
||||
blockNumber: focus?.messageRef?.blockNumber,
|
||||
blockHash: focus?.messageRef?.blockHash,
|
||||
});
|
||||
}
|
||||
const meta = channelPayload?.channel || {};
|
||||
title = String(meta.displayName || meta.channelName || title).trim();
|
||||
avatarAr = String(meta.avaAr || '').trim();
|
||||
avatarSha256 = String(meta.avaSha256 || '').trim().toLowerCase();
|
||||
if (!selector.short && meta.channelName) selector.short = { ownerBlockchainName: selector.channel.ownerBlockchainName, channelName: String(meta.channelName) };
|
||||
} catch {
|
||||
// Обсуждение должно открываться даже при временной недоступности метаданных канала.
|
||||
}
|
||||
}
|
||||
const shortName = String(selector?.short?.channelName || channelSlug).trim();
|
||||
const visibleOwner = channelOwner || extractLoginFromBlockchainName(selector?.short?.ownerBlockchainName || '');
|
||||
const number = focusOrdinal || (selector?.short ? null : Number(selector?.message?.blockNumber));
|
||||
const headerNumber = Number.isSafeInteger(number) && number > 0 ? ` · №${number}` : '';
|
||||
if (threadHeaderButton) {
|
||||
threadHeaderChannel.textContent = channelTitleByLabel.get(resolvedChannelTitle) || resolvedChannelTitle;
|
||||
threadHeaderTitle.textContent = `${title}${headerNumber}`;
|
||||
threadHeaderChannel.textContent = `${visibleOwner ? `@${visibleOwner}` : ''}${visibleOwner && shortName ? ' / ' : ''}${shortName}`;
|
||||
threadHeaderButton.querySelector('.channel-thread-header-avatar')?.remove();
|
||||
const avatar = renderAvatar({
|
||||
initials: (title[0] || 'К').toUpperCase(),
|
||||
avatar: (avatarAr || avatarSha256) ? { ar: avatarAr, sha256Hex: avatarSha256 } : null,
|
||||
authorLogin: visibleOwner,
|
||||
size: 'xl',
|
||||
className: 'channel-profile-avatar channel-thread-header-avatar',
|
||||
title,
|
||||
alt: 'Аватар канала',
|
||||
});
|
||||
avatar.style.setProperty('--channel-avatar-size', '40px');
|
||||
threadHeaderButton.prepend(avatar);
|
||||
threadHeaderButton.title = 'Открыть канал';
|
||||
threadHeaderButton.disabled = false;
|
||||
threadHeaderButton.onclick = (event) => {
|
||||
@@ -1731,7 +1847,6 @@ export function render({ navigate, route, chrome }) {
|
||||
}
|
||||
|
||||
clearContent();
|
||||
const channelOwner = extractLoginFromBlockchainName(selector?.channel?.ownerBlockchainName || focus?.channelInfo?.ownerBlockchainName || '');
|
||||
const openPost = () => {
|
||||
const routeToChannel = buildChannelRouteFromThread(selector, resolvedChannelLabel);
|
||||
if (routeToChannel) navigate(routeToChannel);
|
||||
@@ -1751,7 +1866,7 @@ export function render({ navigate, route, chrome }) {
|
||||
title: 'Поделиться записью',
|
||||
kicker: `${resolvedChannelTitle} · запись`,
|
||||
text: parseMessageAttachments(resolveNodeText(focus)).text,
|
||||
url: buildAbsoluteRouteUrl(buildThreadRouteFromTarget(focusTarget, selector)),
|
||||
url: buildAbsoluteRouteUrl(buildThreadRouteFromTarget(focusTarget, selector, focusOrdinal)),
|
||||
});
|
||||
} },
|
||||
];
|
||||
@@ -1760,13 +1875,13 @@ export function render({ navigate, route, chrome }) {
|
||||
if (ancestors.length) {
|
||||
const ancestorsWrap = document.createElement('div');
|
||||
ancestorsWrap.className = 'thread-block thread-block--ancestors';
|
||||
ancestors.forEach((node) => ancestorsWrap.append(renderThreadContext(node, { onOpenPost: openPost })));
|
||||
ancestors.forEach((node) => ancestorsWrap.append(renderThreadContext(node, { onOpenPost: openPost, onNavigate: navigate })));
|
||||
screen.append(ancestorsWrap);
|
||||
}
|
||||
if (focus) {
|
||||
const focusWrap = document.createElement('div');
|
||||
focusWrap.className = 'thread-block thread-block--focus';
|
||||
focusWrap.append(renderThreadContext(focus, { onOpenPost: openPost }));
|
||||
focusWrap.append(renderNodeCard(focus, '', handlers, focusOrdinal || Number(selector?.message?.blockNumber ?? 0), { focusPost: true, channelOwnerBlockchainName: selector?.channel?.ownerBlockchainName || '' }));
|
||||
screen.append(focusWrap);
|
||||
}
|
||||
|
||||
@@ -1811,7 +1926,7 @@ export function render({ navigate, route, chrome }) {
|
||||
title: 'Поделиться комментарием',
|
||||
kicker: `${node.authorLogin} · комментарий`,
|
||||
text: parseMessageAttachments(resolveNodeText(node)).text,
|
||||
url: `${buildAbsoluteRouteUrl(buildThreadRouteFromTarget(focusTarget, selector))}#comment-${node?.messageRef?.blockNumber ?? ''}`,
|
||||
url: `${buildAbsoluteRouteUrl(buildThreadRouteFromTarget(focusTarget, selector, focusOrdinal))}#comment-${node?.messageRef?.blockNumber ?? ''}`,
|
||||
}),
|
||||
};
|
||||
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import { appendShineMessageLinks } from '../services/shine-message-links.js';
|
||||
import { confirmDialog } from '../components/confirm-dialog.js';
|
||||
import { iconHtml } from '../components/ui-icon.js';
|
||||
import { rememberChannelPosition, readChannelPosition, restoreChannelPosition } from '../services/channel-view-state.js';
|
||||
@@ -41,10 +42,12 @@ import {
|
||||
extractLoginFromBlockchainName,
|
||||
makeProfileRoute,
|
||||
makeShineMessageRoute,
|
||||
makeShineChannelStreamRoute,
|
||||
makeShineChannelAboutRoute,
|
||||
makeShineChannelDonateRoute,
|
||||
} from '../services/shine-routes.js';
|
||||
import { parseDmTechBlocks } from '../services/dm-tech-blocks.js';
|
||||
import { sortedChannelPublications } from '../services/channel-message-ordinals.js';
|
||||
|
||||
export const pageMeta = { id: 'channel-view', title: 'Канал', hideToolbar: true, shellMode: { scrollbar: 'hidden', topFade: false, contentUnderTopbar: false, contentWidth: 'wide' } };
|
||||
const CHANNEL_TYPE_STORIES = 0;
|
||||
@@ -236,13 +239,17 @@ function buildSelectorFromRoute(route, channelId) {
|
||||
};
|
||||
}
|
||||
|
||||
function buildThreadRoute(messageRef, selector) {
|
||||
function buildThreadRoute(post, selector) {
|
||||
const messageRef = post?.messageRef;
|
||||
if (!messageRef || !selector) return '';
|
||||
const ownerLogin = extractLoginFromBlockchainName(selector.ownerBlockchainName);
|
||||
return makeShineMessageRoute({
|
||||
ownerLogin,
|
||||
messageBlockchainName: messageRef.blockchainName,
|
||||
messageBlockNumber: messageRef.blockNumber,
|
||||
messageOrdinal: selector.publicOrdinalUrlsAllowed ? post.localNumber : '',
|
||||
channelName: selector.publicOrdinalUrlsAllowed ? selector.channelName : '',
|
||||
channelOwnerBlockchainName: selector.ownerBlockchainName,
|
||||
});
|
||||
}
|
||||
|
||||
@@ -1483,6 +1490,9 @@ async function loadFromApi(route, channelId) {
|
||||
const ownerLogin = String(payload.channel?.ownerLogin || '').trim();
|
||||
const channelName = String(payload.channel?.channelName || '').trim();
|
||||
const channelTypeCode = Number(payload.channel?.channelTypeCode ?? 1);
|
||||
// Channel-publication URLs are only unambiguous for public channels, not merged private chats.
|
||||
selector.channelName = String(payload.channel?.channelName || selector.channelName || '').trim();
|
||||
selector.publicOrdinalUrlsAllowed = channelTypeCode !== CHANNEL_TYPE_STORIES && channelTypeCode !== CHANNEL_TYPE_PERSONAL;
|
||||
if (channelTypeCode === CHANNEL_TYPE_STORIES) {
|
||||
throw new Error('Канал stories скрыт из пользовательского интерфейса.');
|
||||
}
|
||||
@@ -1516,16 +1526,9 @@ async function loadFromApi(route, channelId) {
|
||||
}
|
||||
}
|
||||
|
||||
const posts = mergedMessages
|
||||
.map((message, index) => mapApiMessageToPost(message, selector, index + 1))
|
||||
.sort((a, b) => {
|
||||
const byTime = Number(a?.timestampMs || 0) - Number(b?.timestampMs || 0);
|
||||
if (byTime !== 0) return byTime;
|
||||
const aNum = Number(a?.messageRef?.blockNumber || 0);
|
||||
const bNum = Number(b?.messageRef?.blockNumber || 0);
|
||||
return aNum - bNum;
|
||||
})
|
||||
.map((post, index) => ({ ...post, localNumber: index + 1 }));
|
||||
const posts = sortedChannelPublications(
|
||||
mergedMessages.map((message, index) => mapApiMessageToPost(message, selector, index + 1)),
|
||||
).map((post, index) => ({ ...post, localNumber: index + 1 }));
|
||||
const isOwnChannel = ownerLogin.toLowerCase() === currentSessionLogin.toLowerCase();
|
||||
const followedRows = Array.isArray(state.channelsFeed?.followedChannels) ? state.channelsFeed.followedChannels : [];
|
||||
const isSubscribed = isAuthorized && followedRows.some((row) => (
|
||||
@@ -2024,7 +2027,7 @@ function renderPostCard(post, {
|
||||
}
|
||||
const body = document.createElement('p');
|
||||
body.className = 'channel-message-body';
|
||||
body.textContent = parsedBody.text;
|
||||
appendShineMessageLinks(body, parsedBody.text, { navigate, viewMode: 'feed' });
|
||||
card.append(body);
|
||||
}
|
||||
|
||||
@@ -2089,7 +2092,7 @@ function renderPostCard(post, {
|
||||
setActionTitle(discussionButton, `Открыть обсуждение, ответов: ${post.repliesCount || 0}`);
|
||||
discussionButton.addEventListener('click', (event) => {
|
||||
event.stopPropagation();
|
||||
const route = buildThreadRoute(post.messageRef, selector);
|
||||
const route = buildThreadRoute(post, selector);
|
||||
if (route) navigate(route);
|
||||
});
|
||||
|
||||
@@ -2130,12 +2133,20 @@ function renderPostCard(post, {
|
||||
shareButton.addEventListener('click', async (event) => {
|
||||
event.stopPropagation();
|
||||
animatePress(event.currentTarget);
|
||||
const route = buildThreadRoute(post.messageRef, selector);
|
||||
const route = buildThreadRoute(post, selector);
|
||||
await onShare(route);
|
||||
});
|
||||
|
||||
// Порядок как в макете V4: лайк → поделиться → обсуждение; дата и «⋯» — справа
|
||||
actions.append(likeButton, shareButton, discussionButton);
|
||||
if (selector?.publicOrdinalUrlsAllowed && post.messageRef?.blockNumber != null) {
|
||||
const streamRoute = makeShineChannelStreamRoute({
|
||||
ownerBlockchainName: selector?.ownerBlockchainName,
|
||||
channelName: selector?.channelName || '',
|
||||
messageOrdinal: post.localNumber,
|
||||
});
|
||||
if (streamRoute) menuItems.unshift({ label: 'Ссылка на сообщение в ленте', iconHtml: iconHtml('share'), action: () => onShare(streamRoute) });
|
||||
}
|
||||
menuItems.unshift({ label: 'Ответить', iconHtml: iconHtml('reply'), action: () => replyButton.click() });
|
||||
if (post.msgSubType === MSG_SUBTYPE_TEXT_REPOST && post.targetRef?.blockchainName && Number.isFinite(post.targetRef?.blockNumber) && post.targetRef?.blockHash) {
|
||||
const originalBtn = document.createElement('button');
|
||||
@@ -2252,7 +2263,7 @@ function renderBody(screen, navigate, routeKey, channelData, handlers) {
|
||||
const actionButton = document.createElement('button');
|
||||
actionButton.type = 'button';
|
||||
actionButton.className = 'primary-btn channel-main-action';
|
||||
actionButton.innerHTML = `${iconHtml('bell')}<span>${state.session.isAuthorized ? 'Подписаться' : 'Войти и подписаться'}</span>`;
|
||||
actionButton.innerHTML = `${iconHtml('bell')}<span>${state.session.isAuthorized ? 'Подписаться' : 'Войти / зарегистрироваться'}</span>`;
|
||||
|
||||
const addMessageButton = document.createElement('button');
|
||||
addMessageButton.type = 'button';
|
||||
@@ -2368,6 +2379,13 @@ function renderBody(screen, navigate, routeKey, channelData, handlers) {
|
||||
screen.append(feed);
|
||||
}
|
||||
|
||||
const requestedOrdinal = Number(handlers.scrollToMessageOrdinal);
|
||||
if (Number.isSafeInteger(requestedOrdinal) && requestedOrdinal > 0) {
|
||||
const card = [...screen.querySelectorAll('.channel-message-card[data-local-number]')]
|
||||
.find((el) => Number(el.dataset.localNumber) === requestedOrdinal);
|
||||
if (card) pendingScrollByRoute.set(routeKey, card.dataset.messageKey);
|
||||
else showStatus(`Публикация №${requestedOrdinal} не найдена в канале.`);
|
||||
}
|
||||
const hasPendingScrollTarget = pendingScrollByRoute.has(routeKey);
|
||||
const restorePosition = handlers.restorePosition;
|
||||
const pendingScrollTimer = Number.isFinite(restorePosition) && !hasPendingScrollTarget ? 0 : applyPendingScroll(screen, routeKey, channelData.isOwnChannel || channelData.isDiary || unreadCount === 0);
|
||||
@@ -2442,12 +2460,14 @@ function renderSkeleton(screen) {
|
||||
|
||||
export function render({ navigate, route, chrome }) {
|
||||
const channelId = route.params.channelId || '';
|
||||
const scrollToMessageOrdinal = route.params.scrollToMessageOrdinal || '';
|
||||
const routeSelector = buildSelectorFromRoute(route, channelId);
|
||||
const routeKey = `${routeSelector?.ownerBlockchainName || ''}:${routeSelector?.channelRootBlockNumber || ''}:${routeSelector?.channelRootBlockHash || ''}`;
|
||||
|
||||
const screen = document.createElement('section');
|
||||
screen.className = 'stack channels-screen channels-screen--channel';
|
||||
const positionKey = `${state.session.login}:channel:${routeKey}`;
|
||||
// A deep link must take precedence over a saved scroll position.
|
||||
|
||||
let disposed = false;
|
||||
let refreshSeq = 0;
|
||||
@@ -2485,7 +2505,7 @@ export function render({ navigate, route, chrome }) {
|
||||
|
||||
const header = createTopBar({
|
||||
center: channelHeaderButton,
|
||||
back: { onClick: () => navigate('channels-list') },
|
||||
back: state.session.isAuthorized ? { onClick: () => navigate('channels-list') } : null,
|
||||
className: 'channel-view-topbar topbar--identity',
|
||||
actions: [
|
||||
{
|
||||
@@ -2936,9 +2956,9 @@ export function render({ navigate, route, chrome }) {
|
||||
};
|
||||
activeOpenEntrypointHistory = openEntrypointHistory;
|
||||
if (channelHeaderButton) {
|
||||
// Короткий адрес канала и число подписчиков; владелец и полный путь — в «О канале»
|
||||
// Под названием показываем владельца и короткое название, одинаково для ленты и /s/<номер>.
|
||||
const slug = String(apiData?.channel?.name || '').trim();
|
||||
const subs = Number(apiData?.channel?.subscribersCount || 0);
|
||||
const owner = String(apiData?.channel?.ownerName || extractLoginFromBlockchainName(apiData?.selector?.ownerBlockchainName) || '').trim();
|
||||
channelHeaderButton.replaceChildren();
|
||||
const text = document.createElement('span');
|
||||
text.className = 'topbar-identity__text';
|
||||
@@ -2947,7 +2967,7 @@ export function render({ navigate, route, chrome }) {
|
||||
titleNode.textContent = titleLabel;
|
||||
const subNode = document.createElement('span');
|
||||
subNode.className = 'topbar-identity__sub';
|
||||
subNode.textContent = apiData?.isDiary ? 'Только вам' : [slug ? `@${slug}` : '', subs ? String(subs) : ''].filter(Boolean).join(' · ');
|
||||
subNode.textContent = apiData?.isDiary ? 'Только вам' : `${owner ? `@${owner}` : ''}${owner && slug ? ' / ' : ''}${slug}`;
|
||||
text.append(titleNode, subNode);
|
||||
channelHeaderButton.append(createChannelAvatarElement(apiData?.channel, 40), text);
|
||||
channelHeaderButton.setAttribute('aria-label', `${titleLabel}. О канале`);
|
||||
@@ -2963,6 +2983,7 @@ export function render({ navigate, route, chrome }) {
|
||||
};
|
||||
}
|
||||
activeChannelData = apiData;
|
||||
|
||||
if (channelMoreButton) {
|
||||
channelMoreButton.disabled = false;
|
||||
}
|
||||
@@ -2982,6 +3003,7 @@ export function render({ navigate, route, chrome }) {
|
||||
cleanupSeenTracking = renderBody(screen, navigate, routeKey, apiData, {
|
||||
chrome,
|
||||
restorePosition,
|
||||
scrollToMessageOrdinal,
|
||||
showStatus,
|
||||
isActive: () => !disposed,
|
||||
onAddMessage: activeAddMessage = async () => {
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import { appendShineMessageLinks } from '../services/shine-message-links.js';
|
||||
import { iconHtml } from '../components/ui-icon.js';
|
||||
import { createTopBar } from '../components/topbar.js';
|
||||
import { createDropdownMenu } from '../components/dropdown-menu.js';
|
||||
@@ -819,7 +820,7 @@ function scrollToLatestMessage(list) {
|
||||
window.setTimeout(apply, 260);
|
||||
}
|
||||
|
||||
function renderMessageText(textNode, messageText) {
|
||||
function renderMessageText(textNode, messageText, chatNavigate) {
|
||||
const text = String(messageText || '');
|
||||
const emoji = text.trim();
|
||||
if (text === emoji && hasTwemojiAsset(emoji)) {
|
||||
@@ -827,9 +828,16 @@ function renderMessageText(textNode, messageText) {
|
||||
textNode.append(createTwemojiAsset(emoji, { className: 'chat-twemoji' }));
|
||||
return;
|
||||
}
|
||||
if (appendTwemojiText(textNode, text, { className: 'chat-twemoji chat-twemoji--inline' })) {
|
||||
textNode.classList.add('bubble-text--twemoji-inline');
|
||||
}
|
||||
appendShineMessageLinks(textNode, text, {
|
||||
navigate: chatNavigate,
|
||||
appendText: (root, part) => {
|
||||
const fragment = document.createDocumentFragment();
|
||||
if (appendTwemojiText(fragment, part, { className: 'chat-twemoji chat-twemoji--inline' })) {
|
||||
textNode.classList.add('bubble-text--twemoji-inline');
|
||||
}
|
||||
root.append(fragment);
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
function isTwemojiOnlyMessage(messageText) {
|
||||
@@ -1062,6 +1070,7 @@ function renderLog(
|
||||
chatId,
|
||||
{
|
||||
onOpenActions,
|
||||
navigate,
|
||||
markAsRead = true,
|
||||
scrollMode = 'latest',
|
||||
showUnreadSeparator = true,
|
||||
@@ -1165,7 +1174,7 @@ function renderLog(
|
||||
|
||||
const textNode = document.createElement('div');
|
||||
textNode.className = 'bubble-text';
|
||||
renderMessageText(textNode, parsedText.displayText || '');
|
||||
renderMessageText(textNode, parsedText.displayText || '', navigate);
|
||||
if (parsedText.replyRef) {
|
||||
const replyTarget = findMessageByBaseKey(messages, parsedText.replyRef.baseKey);
|
||||
if (replyTarget) {
|
||||
@@ -1348,6 +1357,7 @@ export function render({ navigate, route, chrome }) {
|
||||
const renderChatLog = ({ scrollMode = 'latest', markAsRead = true } = {}) => {
|
||||
renderLog(log, chatId, {
|
||||
onOpenActions: handleOpenActions,
|
||||
navigate,
|
||||
markAsRead,
|
||||
scrollMode,
|
||||
showUnreadSeparator: unreadSeparatorVisible,
|
||||
@@ -2627,6 +2637,7 @@ export function render({ navigate, route, chrome }) {
|
||||
chrome?.setComposer(form);
|
||||
renderLog(log, chatId, {
|
||||
onOpenActions: handleOpenActions,
|
||||
navigate,
|
||||
markAsRead: false,
|
||||
scrollMode: hasUnreadIncoming ? 'unread' : 'latest',
|
||||
showUnreadSeparator: unreadSeparatorVisible,
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
import { openPaletteEditor } from '../components/palette-editor.js';
|
||||
import { resolveThemeMode } from '../services/theme-service.js';
|
||||
import { createTopBar } from '../components/topbar.js';
|
||||
import { addAppLogEntry, authService, state } from '../state.js';
|
||||
import {
|
||||
@@ -258,6 +260,7 @@ export function render({navigate, chrome}) {
|
||||
const card = document.createElement('div');
|
||||
card.className = 'nav-list settings-developer-card';
|
||||
card.innerHTML = `
|
||||
<button class="nav-row" type="button" id="settings-theme-editor"><span class="nav-row__label">Настроить цвета</span></button>
|
||||
<button class="nav-row" type="button" id="settings-force-ui-update"><span class="nav-row__label">Принудительно обновить UI</span></button>
|
||||
<button class="nav-row" type="button" id="settings-force-update-help"><span class="nav-row__label">Клиент не обновляется?</span></button>
|
||||
<button class="nav-row" type="button" id="settings-ui-error-reporting"><span class="nav-row__label">Отправлять ошибки на сервер</span></button>
|
||||
@@ -269,6 +272,7 @@ export function render({navigate, chrome}) {
|
||||
<button class="nav-row" type="button" id="settings-upload-avatar"><span class="nav-row__label">Загрузить аватар</span></button>
|
||||
`;
|
||||
|
||||
card.querySelector('#settings-theme-editor').addEventListener('click', () => openPaletteEditor({ theme: resolveThemeMode() }));
|
||||
const appLogBtn = card.querySelector('#settings-app-log');
|
||||
const diagnosticsBtn = card.querySelector('#settings-pwa-diagnostics');
|
||||
const pwaInstallBtn = card.querySelector('#settings-pwa-install');
|
||||
|
||||
@@ -81,11 +81,9 @@ export function render({navigate, chrome}) {
|
||||
actions.className = 'nav-list';
|
||||
actions.innerHTML = `
|
||||
<button class="nav-row" type="button" id="pair-by-code-btn"><span class="nav-row__label">Подключить другое устройство</span><span class="nav-row__hint">Подтвердить вход на новом устройстве</span></button>
|
||||
<button class="nav-row" type="button" id="show-keys-btn"><span class="nav-row__label">Ключи этого устройства</span></button>
|
||||
`;
|
||||
|
||||
actions.querySelector('#pair-by-code-btn').addEventListener('click', () => navigate('device-pairing-view'));
|
||||
actions.querySelector('#show-keys-btn').addEventListener('click', () => navigate('show-keys-view'));
|
||||
|
||||
const sessionsBlock = document.createElement('div');
|
||||
sessionsBlock.className = 'stack device-sessions';
|
||||
|
||||
@@ -15,7 +15,7 @@ function input(label,type='password'){const wrap=document.createElement('label')
|
||||
|
||||
export function render({navigate,chrome}){
|
||||
const screen=document.createElement('section');screen.className='stack';
|
||||
chrome?.setTopbar(createTopBar({title:'Смена ключей',back:{label:'←',onClick:()=>navigate('my-blockchain-view')}}));
|
||||
chrome?.setTopbar(createTopBar({title:'Смена ключей',back:{label:'←',onClick:()=>navigate('access-keys-view')}}));
|
||||
const root=document.createElement('div');root.className='stack';screen.append(root);
|
||||
const client=new KeyRotationClient(authService);let disposed=false;let timer=null;let cachedOldBundle=null;let cachedNewBundle=null;
|
||||
const login=String(state.session.login||'').trim(); const storagePwd=String(state.session.storagePwdInMemory||'').trim();
|
||||
@@ -119,12 +119,12 @@ export function render({navigate,chrome}){
|
||||
}catch(e){err.textContent=e?.message||String(e);transfer.disabled=false;skip.disabled=false;}finally{refreshBalance.disabled=false;}});
|
||||
continueButton.addEventListener('click',async()=>{continueButton.disabled=true;refreshBalance.disabled=true;err.textContent='';try{
|
||||
const next=await client.continueRotation({walletMigrationStatus:'COMPLETE'});
|
||||
if(String(next?.rotationStatus||'')==='COMPLETE'){navigate('my-blockchain-view');return;}
|
||||
if(String(next?.rotationStatus||'')==='COMPLETE'){navigate('access-keys-view');return;}
|
||||
await refresh();
|
||||
}catch(e){err.textContent=e?.message||String(e);continueButton.disabled=false;refreshBalance.disabled=false;}});
|
||||
skip.addEventListener('click',async()=>{skip.disabled=true;transfer.disabled=true;refreshBalance.disabled=true;err.textContent='';try{
|
||||
const next=await client.continueRotation({walletMigrationStatus:'SKIPPED'});
|
||||
if(String(next?.rotationStatus||'')==='COMPLETE'){navigate('my-blockchain-view');return;}
|
||||
if(String(next?.rotationStatus||'')==='COMPLETE'){navigate('access-keys-view');return;}
|
||||
await refresh();
|
||||
}catch(e){err.textContent=e?.message||String(e);skip.disabled=false;transfer.disabled=!oldWallet;refreshBalance.disabled=false;}});
|
||||
|
||||
@@ -172,7 +172,7 @@ export function render({navigate,chrome}){
|
||||
}
|
||||
}
|
||||
const next=await client.continueRotation({});
|
||||
if(String(next?.rotationStatus||'')==='COMPLETE'){navigate('my-blockchain-view');return;}
|
||||
if(String(next?.rotationStatus||'')==='COMPLETE'){navigate('access-keys-view');return;}
|
||||
await refresh();
|
||||
};
|
||||
go.addEventListener('click',()=>void run().catch(e=>{err.textContent=e?.message||String(e);go.disabled=false;}));
|
||||
@@ -180,6 +180,6 @@ export function render({navigate,chrome}){
|
||||
if(cachedOldBundle&&cachedNewBundle)void run().catch(e=>{err.textContent=e?.message||String(e);go.disabled=false;});
|
||||
}
|
||||
|
||||
async function refresh(){if(disposed)return;if(timer){clearTimeout(timer);timer=null;}try{const s=await client.status();const st=String(s.rotationStatus||'NONE');if(st==='NONE'){await renderNone();return;}if(st==='COPYING_CHAIN'){if(cachedNewBundle)await runCopy(s);else await askNewPasswordAndCopy(s);return;}if(st==='CHAIN_READY'){await renderChainReady(s);return;}if(['ROTATING_PDA','PDA_ROTATED','REBUILDING_SERVER'].includes(st)){pollView(s);return;}if(st==='WALLET_MIGRATION'){await renderWalletMigration(s);return;}if(st==='MESSAGE_MIGRATION'){await renderMessageMigration(s);return;}if(st==='FINALIZING'){const next=await client.continueRotation({});if(String(next?.rotationStatus||'')==='COMPLETE'){navigate('my-blockchain-view');return;}await refresh();return;}if(st==='COMPLETE'){setRoot(note('Смена ключей завершена.'));return;}setRoot(note(`Неизвестное состояние ротации: ${st}`));}catch(e){setRoot(note(`Не удалось прочитать состояние смены ключей: ${e?.message||e}`));}}
|
||||
async function refresh(){if(disposed)return;if(timer){clearTimeout(timer);timer=null;}try{const s=await client.status();const st=String(s.rotationStatus||'NONE');if(st==='NONE'){await renderNone();return;}if(st==='COPYING_CHAIN'){if(cachedNewBundle)await runCopy(s);else await askNewPasswordAndCopy(s);return;}if(st==='CHAIN_READY'){await renderChainReady(s);return;}if(['ROTATING_PDA','PDA_ROTATED','REBUILDING_SERVER'].includes(st)){pollView(s);return;}if(st==='WALLET_MIGRATION'){await renderWalletMigration(s);return;}if(st==='MESSAGE_MIGRATION'){await renderMessageMigration(s);return;}if(st==='FINALIZING'){const next=await client.continueRotation({});if(String(next?.rotationStatus||'')==='COMPLETE'){navigate('access-keys-view');return;}await refresh();return;}if(st==='COMPLETE'){setRoot(note('Смена ключей завершена.'));return;}setRoot(note(`Неизвестное состояние ротации: ${st}`));}catch(e){setRoot(note(`Не удалось прочитать состояние смены ключей: ${e?.message||e}`));}}
|
||||
void refresh();screen.cleanup=()=>{disposed=true;if(timer)clearTimeout(timer);};return screen;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
import { render as renderBlockchain } from './my-blockchain-view.js';
|
||||
|
||||
export const pageMeta = { id: 'my-blockchain-history-view', title: 'История моего блокчейна' };
|
||||
export function render(context) {
|
||||
return renderBlockchain(context, { historyOnly: true });
|
||||
}
|
||||
@@ -481,24 +481,40 @@ function createEntryCard({ item, inspection, parseError, channelNames, blockchai
|
||||
return card;
|
||||
}
|
||||
|
||||
export function render({ navigate, chrome }) {
|
||||
export function render({ navigate, chrome }, { historyOnly = false } = {}) {
|
||||
const screen = document.createElement('section');
|
||||
screen.className = 'stack my-blockchain-screen';
|
||||
chrome?.setTopbar(createTopBar({ title: 'Мой блокчейн', back: { label: '←', onClick: () => navigate('settings-view') } }));
|
||||
chrome?.setTopbar(createTopBar({
|
||||
title: historyOnly ? 'История моего блокчейна' : 'Мой блокчейн',
|
||||
back: { label: '←', onClick: () => navigate(historyOnly ? 'my-blockchain-view' : 'settings-view') },
|
||||
}));
|
||||
|
||||
const intro = document.createElement('div');
|
||||
intro.className = 'card stack';
|
||||
intro.innerHTML = '<strong>История ваших действий</strong><span class="meta-muted">Это текущая активная версия вашего блокчейна. Хэши записей сохраняют логическую идентичность при fork.</span>';
|
||||
const rotate = document.createElement('button');
|
||||
rotate.type = 'button';
|
||||
rotate.className = 'primary-btn';
|
||||
rotate.textContent = 'Сменить пароль / ключи';
|
||||
rotate.addEventListener('click', () => navigate('key-rotation-view'));
|
||||
intro.append(rotate);
|
||||
screen.append(intro);
|
||||
if (!historyOnly) {
|
||||
const intro = document.createElement('div');
|
||||
intro.className = 'card stack';
|
||||
const historyButton = document.createElement('button');
|
||||
historyButton.type = 'button';
|
||||
historyButton.className = 'nav-row';
|
||||
historyButton.textContent = 'Показать историю моего блокчейна';
|
||||
historyButton.addEventListener('click', () => navigate('my-blockchain-history-view'));
|
||||
const filesButton = document.createElement('button');
|
||||
filesButton.type = 'button';
|
||||
filesButton.className = 'nav-row';
|
||||
filesButton.textContent = 'Файлы в блокчейне';
|
||||
filesButton.addEventListener('click', () => navigate('arweave-uploads-view'));
|
||||
const remoteButton = document.createElement('button');
|
||||
remoteButton.type = 'button';
|
||||
remoteButton.className = 'nav-row';
|
||||
remoteButton.textContent = 'Использовать ключ блокчейна с внешнего устройства';
|
||||
remoteButton.addEventListener('click', () => navigate('remote-addblock-session-view'));
|
||||
intro.append(historyButton, filesButton, remoteButton);
|
||||
screen.append(intro);
|
||||
return screen;
|
||||
}
|
||||
|
||||
const list = document.createElement('div');
|
||||
list.className = 'stack my-blockchain-list';
|
||||
list.hidden = false;
|
||||
screen.append(list);
|
||||
const more = document.createElement('button');
|
||||
more.type = 'button';
|
||||
|
||||
@@ -35,7 +35,7 @@ export function render({navigate, chrome}) {
|
||||
|
||||
chrome?.setTopbar(createTopBar({
|
||||
title: 'AddBlock через homeserver',
|
||||
back: { label: '←', onClick: () => navigate('settings-view') },
|
||||
back: { label: '←', onClick: () => navigate('my-blockchain-view') },
|
||||
}));
|
||||
|
||||
const actions = document.createElement('div');
|
||||
|
||||
@@ -163,7 +163,7 @@ export function render({navigate, chrome}) {
|
||||
cancelButton.className = 'ghost-btn';
|
||||
cancelButton.type = 'button';
|
||||
cancelButton.textContent = 'Отмена';
|
||||
cancelButton.addEventListener('click', () => navigate('settings-view'));
|
||||
cancelButton.addEventListener('click', () => navigate('settings-servers-view'));
|
||||
|
||||
const saveButton = document.createElement('button');
|
||||
saveButton.className = 'primary-btn';
|
||||
@@ -172,7 +172,7 @@ export function render({navigate, chrome}) {
|
||||
saveButton.addEventListener('click', async () => {
|
||||
try {
|
||||
await saveEntrySettings(draft);
|
||||
navigate('settings-view');
|
||||
navigate('settings-servers-view');
|
||||
} catch (error) {
|
||||
window.alert(error?.message || 'Не удалось сохранить настройки серверов блокчейнов.');
|
||||
}
|
||||
@@ -192,7 +192,7 @@ export function render({navigate, chrome}) {
|
||||
|
||||
chrome?.setTopbar(createTopBar({
|
||||
title: 'Серверы блокчейнов',
|
||||
back: { label: '←', onClick: () => navigate('settings-view') },
|
||||
back: { label: '←', onClick: () => navigate('settings-servers-view') },
|
||||
}));
|
||||
screen.append(
|
||||
introCard,
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
import { createTopBar } from '../components/topbar.js';
|
||||
|
||||
export const pageMeta = { id: 'settings-servers-view', title: 'Настройки серверов' };
|
||||
|
||||
export function render({ navigate, chrome }) {
|
||||
const screen = document.createElement('section');
|
||||
screen.className = 'stack';
|
||||
chrome?.setTopbar(createTopBar({
|
||||
title: 'Настройки серверов',
|
||||
back: { label: '←', onClick: () => navigate('settings-view') },
|
||||
}));
|
||||
const list = document.createElement('div');
|
||||
list.className = 'nav-list';
|
||||
const entries = [
|
||||
['Мой сервер доступа', 'access-servers-view'],
|
||||
['Серверы блокчейнов', 'server-settings-view'],
|
||||
];
|
||||
for (const [label, pageId] of entries) {
|
||||
const button = document.createElement('button');
|
||||
button.type = 'button';
|
||||
button.className = 'nav-row';
|
||||
button.innerHTML = `<span class="nav-row__label">${label}</span>`;
|
||||
button.addEventListener('click', () => navigate(pageId));
|
||||
list.append(button);
|
||||
}
|
||||
screen.append(list);
|
||||
return screen;
|
||||
}
|
||||
@@ -2,8 +2,7 @@ import { confirmDialog } from '../components/confirm-dialog.js';
|
||||
import { createTopBar } from '../components/topbar.js';
|
||||
import { addAppLogEntry, authService, closeSavedProfile, state } from '../state.js';
|
||||
import { isDeveloperToolsEnabled } from '../services/feature-settings.js';
|
||||
import { getThemeMode, resolveThemeMode, setThemeMode } from '../services/theme-service.js';
|
||||
import { openPaletteEditor } from '../components/palette-editor.js';
|
||||
import { getThemeMode, setThemeMode } from '../services/theme-service.js';
|
||||
import {
|
||||
canInstallPwa,
|
||||
isStandalonePwaMode,
|
||||
@@ -44,6 +43,25 @@ export function render({navigate, chrome}) {
|
||||
title: 'Настройки',
|
||||
back: { label: '←', onClick: () => navigate('profile-view') },
|
||||
});
|
||||
const themeButton = document.createElement('button');
|
||||
themeButton.type = 'button';
|
||||
themeButton.className = 'settings-theme-cycle';
|
||||
themeButton.title = 'Переключить тему оформления';
|
||||
themeButton.setAttribute('aria-label', 'Переключить тему оформления');
|
||||
const modes = ['light', 'dark', 'system'];
|
||||
const themeNames = { light: '☀️ Светлая', dark: '🌙 Тёмная', system: '◐ Авто' };
|
||||
const updateThemeButton = () => {
|
||||
const mode = getThemeMode();
|
||||
themeButton.textContent = themeNames[mode] || themeNames.system;
|
||||
themeButton.setAttribute('aria-label', `Тема: ${themeButton.textContent}. Нажмите для переключения`);
|
||||
};
|
||||
themeButton.addEventListener('click', () => {
|
||||
const index = modes.indexOf(getThemeMode());
|
||||
setThemeMode(modes[(index + 1) % modes.length]);
|
||||
updateThemeButton();
|
||||
});
|
||||
updateThemeButton();
|
||||
topbar.querySelector('.topbar__right')?.append(themeButton);
|
||||
chrome?.setTopbar(topbar);
|
||||
|
||||
// Скрытый вход в «Дополнительные настройки»: пять быстрых нажатий на заголовок.
|
||||
@@ -62,56 +80,27 @@ export function render({navigate, chrome}) {
|
||||
card.className = 'stack settings-sections';
|
||||
const row = (id, label, hint) => `<button class="nav-row" type="button" id="${id}"><span class="nav-row__label">${label}</span>${hint ? `<span class="nav-row__hint">${hint}</span>` : ''}</button>`;
|
||||
card.innerHTML = `
|
||||
<div class="card stack settings-theme-card">
|
||||
<strong id="settings-theme-label">Оформление</strong>
|
||||
<div class="tabs tabs--auto" id="settings-theme" role="radiogroup" aria-labelledby="settings-theme-label">
|
||||
<button type="button" class="tab-btn" role="radio" data-mode="system">Авто</button>
|
||||
<button type="button" class="tab-btn" role="radio" data-mode="light">День</button>
|
||||
<button type="button" class="tab-btn" role="radio" data-mode="dark">Ночь</button>
|
||||
</div>
|
||||
<span class="meta-muted">«Авто» – как на устройстве.</span>
|
||||
<button type="button" class="secondary-btn settings-theme-editor" id="settings-theme-editor">Настроить цвета</button>
|
||||
</div>
|
||||
<div class="nav-list">
|
||||
${row('settings-device', 'Устройства', 'Сеансы, подключение устройств, ключи')}
|
||||
${row('settings-my-blockchain', 'Мой блокчейн', 'Все ваши подписанные события и смена ключей')}
|
||||
${row('settings-access-servers', 'Сервер доступа', 'Личная переписка, звонки и зашифрованные данные')}
|
||||
${row('settings-blockchain-servers', 'Серверы блокчейнов', 'Solana, Сияние и Arweave для публичных данных')}
|
||||
${row('settings-arweave-uploads', 'Файлы в блокчейне', 'Заранее загрузить файл и выбрать его потом')}
|
||||
${row('settings-remote-addblock', 'Публикация через домашний сервер', 'Когда ключа публикаций нет на этом устройстве')}
|
||||
${row('settings-device', 'Устройства', 'Сеансы и подключение устройств')}
|
||||
${row('settings-my-blockchain', 'Мой блокчейн', 'История записей, файлы и внешнее устройство')}
|
||||
${row('settings-servers', 'Настройки серверов', 'Сервер доступа и серверы блокчейнов')}
|
||||
${row('settings-access-keys', 'Ключи и пароли', 'Просмотр ключей и смена пароля')}
|
||||
${row('settings-language', 'Язык / Language', 'Русский')}
|
||||
</div>
|
||||
<div class="nav-list" id="settings-install-list" hidden></div>
|
||||
<div class="nav-list">
|
||||
<button class="nav-row nav-row--danger" type="button" id="settings-signout"><span class="nav-row__label">Выйти из аккаунта на этом устройстве</span></button>
|
||||
${row('settings-developer', 'Настройки разработчика', 'Цветовая схема и инструменты разработчика')}
|
||||
</div>
|
||||
<div class="nav-list">
|
||||
<button class="nav-row nav-row--danger" type="button" id="settings-signout"><span class="nav-row__label">Выйти из аккаунта</span></button>
|
||||
</div>
|
||||
`;
|
||||
|
||||
const themeSwitch = card.querySelector('#settings-theme');
|
||||
const syncThemeSwitch = () => {
|
||||
const mode = getThemeMode();
|
||||
themeSwitch.querySelectorAll('[data-mode]').forEach((btn) => {
|
||||
btn.setAttribute('aria-checked', String(btn.dataset.mode === mode));
|
||||
});
|
||||
};
|
||||
syncThemeSwitch();
|
||||
|
||||
themeSwitch.addEventListener('click', (event) => {
|
||||
const mode = event.target.closest('[data-mode]')?.dataset.mode;
|
||||
if (!mode) return;
|
||||
setThemeMode(mode);
|
||||
syncThemeSwitch();
|
||||
});
|
||||
card.querySelector('#settings-theme-editor').addEventListener('click', () => {
|
||||
openPaletteEditor({ theme: resolveThemeMode() });
|
||||
});
|
||||
|
||||
card.querySelector('#settings-device').addEventListener('click', () => navigate('device-view'));
|
||||
card.querySelector('#settings-my-blockchain').addEventListener('click', () => navigate('my-blockchain-view'));
|
||||
card.querySelector('#settings-remote-addblock').addEventListener('click', () => navigate('remote-addblock-session-view'));
|
||||
card.querySelector('#settings-access-servers').addEventListener('click', () => navigate('access-servers-view'));
|
||||
card.querySelector('#settings-blockchain-servers').addEventListener('click', () => navigate('server-settings-view'));
|
||||
card.querySelector('#settings-arweave-uploads').addEventListener('click', () => navigate('arweave-uploads-view'));
|
||||
card.querySelector('#settings-servers').addEventListener('click', () => navigate('settings-servers-view'));
|
||||
card.querySelector('#settings-access-keys').addEventListener('click', () => navigate('access-keys-view'));
|
||||
card.querySelector('#settings-developer').addEventListener('click', () => navigate('developer-settings-view'));
|
||||
card.querySelector('#settings-language').addEventListener('click', () => {
|
||||
sessionStorage.setItem('shine-language-return-page', 'settings-view');
|
||||
navigate('language-view');
|
||||
@@ -193,12 +182,6 @@ export function render({navigate, chrome}) {
|
||||
|
||||
versionCard.append(title, clientVersion, uiBuild, serverVersion);
|
||||
|
||||
const developerCard = document.createElement('div');
|
||||
developerCard.className = 'card stack';
|
||||
developerCard.innerHTML = `
|
||||
<button class="shine-btn shine-btn--settings" type="button" id="settings-developer">Настройки разработчика</button>
|
||||
`;
|
||||
developerCard.querySelector('#settings-developer').addEventListener('click', () => navigate('developer-settings-view'));
|
||||
|
||||
void (async () => {
|
||||
try {
|
||||
@@ -222,7 +205,7 @@ export function render({navigate, chrome}) {
|
||||
}
|
||||
})();
|
||||
|
||||
screen.append(versionCard, developerCard);
|
||||
screen.append(versionCard);
|
||||
}
|
||||
|
||||
screen.cleanup = () => {
|
||||
|
||||
@@ -16,7 +16,7 @@ export function render({navigate, chrome}) {
|
||||
|
||||
chrome?.setTopbar(createTopBar({
|
||||
title: 'Ключи этого устройства',
|
||||
back: { label: '←', onClick: () => navigate('device-view') },
|
||||
back: { label: '←', onClick: () => navigate('access-keys-view') },
|
||||
}));
|
||||
|
||||
const status = document.createElement('p');
|
||||
|
||||
+17
-3
@@ -31,9 +31,12 @@ const PRETTY_PATHS = new Map([
|
||||
['network-view', 'network'],
|
||||
['notifications-view', 'notifications'],
|
||||
['settings-view', 'settings'],
|
||||
['access-keys-view', 'settings/keys'],
|
||||
['my-blockchain-view', 'settings/blockchain'],
|
||||
['my-blockchain-history-view', 'settings/blockchain/history'],
|
||||
['key-rotation-view', 'settings/key-rotation'],
|
||||
['access-servers-view', 'settings/access-servers'],
|
||||
['settings-servers-view', 'settings/server-options'],
|
||||
['server-settings-view', 'settings/servers'],
|
||||
['arweave-uploads-view', 'settings/arweave-uploads'],
|
||||
['developer-settings-view', 'settings/developer'],
|
||||
@@ -149,14 +152,19 @@ export function parseRouteFromPath(pathname = '') {
|
||||
if (segments.length >= baseOffset + 1) {
|
||||
const ownerBlockchainName = shineLogin;
|
||||
const channelName = decodePart(segments[baseOffset] || '');
|
||||
const messageBlockNumber = segments[baseOffset + 1] || '';
|
||||
if (ownerBlockchainName && channelName && messageBlockNumber) {
|
||||
const streamMode = decodePart(segments[baseOffset + 1] || '').toLowerCase() === 's';
|
||||
const streamOrdinal = streamMode ? decodePart(segments[baseOffset + 2] || '') : '';
|
||||
if (ownerBlockchainName && channelName && streamMode && /^[1-9][0-9]*$/.test(streamOrdinal) && segments.length === baseOffset + 3) {
|
||||
return { pageId: 'channel-view', params: { ownerBlockchainName, channelName, channelId: '', scrollToMessageOrdinal: streamOrdinal } };
|
||||
}
|
||||
const messageOrdinal = segments[baseOffset + 1] || '';
|
||||
if (ownerBlockchainName && channelName && /^[1-9][0-9]*$/.test(messageOrdinal) && segments.length === baseOffset + 2) {
|
||||
return {
|
||||
pageId: 'channel-thread-view',
|
||||
params: {
|
||||
ownerBlockchainName,
|
||||
channelName,
|
||||
messageBlockNumber,
|
||||
messageOrdinal,
|
||||
messageBlockHash: '',
|
||||
messageBlockchainName: '',
|
||||
channelOwnerBlockchainName: ownerBlockchainName,
|
||||
@@ -321,7 +329,10 @@ export function parseRouteFromPath(pathname = '') {
|
||||
|
||||
if (pageId === 'settings') {
|
||||
const sub = decodePart(segments[1] || '').toLowerCase();
|
||||
if (sub === 'keys') return { pageId: 'access-keys-view', params: {} };
|
||||
if (sub === 'server-options') return { pageId: 'settings-servers-view', params: {} };
|
||||
if (sub === 'access-servers') return { pageId: 'access-servers-view', params: {} };
|
||||
if (sub === 'blockchain' && decodePart(segments[2] || '').toLowerCase() === 'history') return { pageId: 'my-blockchain-history-view', params: {} };
|
||||
if (sub === 'blockchain') return { pageId: 'my-blockchain-view', params: {} };
|
||||
if (sub === 'key-rotation') return { pageId: 'key-rotation-view', params: {} };
|
||||
if (sub === 'servers') return { pageId: 'server-settings-view', params: {} };
|
||||
@@ -499,9 +510,12 @@ function resolveToolbarTab(pageId) {
|
||||
pageId === 'profiles-view' ||
|
||||
pageId === 'wallet-view' ||
|
||||
pageId === 'settings-view' ||
|
||||
pageId === 'access-keys-view' ||
|
||||
pageId === 'my-blockchain-view' ||
|
||||
pageId === 'my-blockchain-history-view' ||
|
||||
pageId === 'key-rotation-view' ||
|
||||
pageId === 'access-servers-view' ||
|
||||
pageId === 'settings-servers-view' ||
|
||||
pageId === 'developer-settings-view' ||
|
||||
pageId === 'advanced-settings-view' ||
|
||||
pageId === 'server-settings-view' ||
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
// Public channel URLs use one-based publication positions, not blockchain block numbers.
|
||||
// Order must match the channel feed: message time, then original block number.
|
||||
function messageTimestamp(message) {
|
||||
const value = Number(message?.timestampMs ?? message?.createdAtMs ?? 0);
|
||||
return Number.isFinite(value) ? value : 0;
|
||||
}
|
||||
|
||||
function blockNumber(message) {
|
||||
const value = Number(message?.messageRef?.blockNumber);
|
||||
return Number.isSafeInteger(value) ? value : 0;
|
||||
}
|
||||
|
||||
export function sortedChannelPublications(messages = []) {
|
||||
return [...messages].sort((a, b) => {
|
||||
const byTime = messageTimestamp(a) - messageTimestamp(b);
|
||||
return byTime !== 0 ? byTime : blockNumber(a) - blockNumber(b);
|
||||
});
|
||||
}
|
||||
|
||||
export function parsePublicationOrdinal(value) {
|
||||
const text = String(value ?? '').trim();
|
||||
if (!/^[1-9][0-9]*$/.test(text)) return null;
|
||||
const number = Number(text);
|
||||
return Number.isSafeInteger(number) ? number : null;
|
||||
}
|
||||
|
||||
export function publicationAtOrdinal(messages, ordinal) {
|
||||
const value = parsePublicationOrdinal(ordinal);
|
||||
if (!value) return null;
|
||||
return sortedChannelPublications(messages)[value - 1] || null;
|
||||
}
|
||||
|
||||
export function ordinalForPublication(messages, reference) {
|
||||
if (!reference) return null;
|
||||
const number = Number(reference.blockNumber);
|
||||
const hash = String(reference.blockHash || '').trim().toLowerCase();
|
||||
const owner = String(reference.blockchainName || '').trim().toLowerCase();
|
||||
const i = sortedChannelPublications(messages).findIndex((item) => {
|
||||
const ref = item?.messageRef;
|
||||
if (Number(ref?.blockNumber) !== number) return false;
|
||||
if (hash && String(ref?.blockHash || '').trim().toLowerCase() !== hash) return false;
|
||||
if (owner && String(item?.authorBlockchainName || '').trim().toLowerCase() !== owner) return false;
|
||||
return true;
|
||||
});
|
||||
return i < 0 ? null : i + 1;
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
import { renderUserAvatar } from '../components/avatar-image.js';
|
||||
// Minimal public preview sidebar, shown only to visitors without a session.
|
||||
export function mountPublicChannelSidebar(screen, { owner = '', channel = '', subscribers = null, avatar = null, navigate }) {
|
||||
screen.querySelector('.shine-public-sidebar')?.remove();
|
||||
const panel = document.createElement('aside');
|
||||
panel.className = 'shine-public-sidebar';
|
||||
const identity = document.createElement('div');
|
||||
identity.className = 'shine-public-sidebar__identity';
|
||||
const face = document.createElement('span');
|
||||
face.className = 'shine-public-sidebar__face';
|
||||
face.replaceChildren(renderUserAvatar({ login: owner || 'unknown', size: 'sm' }));
|
||||
const details = document.createElement('div');
|
||||
const author = document.createElement('strong');
|
||||
author.textContent = owner || 'Автор';
|
||||
details.append(author);
|
||||
identity.append(face, details);
|
||||
const name = document.createElement('h2');
|
||||
name.textContent = channel || 'Канал';
|
||||
const count = document.createElement('p');
|
||||
count.textContent = subscribers == null ? '' : `${Math.max(0, Number(subscribers) || 0)} подписчиков`;
|
||||
const button = document.createElement('button');
|
||||
button.type = 'button';
|
||||
button.className = 'primary-btn';
|
||||
button.textContent = 'Открыть в SHiNE';
|
||||
button.addEventListener('click', () => {
|
||||
window.sessionStorage.setItem('shine-public-return-path', window.location.pathname);
|
||||
navigate('login-view');
|
||||
});
|
||||
panel.append(identity, name, count, button);
|
||||
screen.append(panel);
|
||||
}
|
||||
@@ -0,0 +1,98 @@
|
||||
// Ссылки — часть обычного текста; в блокчейне не нужен новый формат.
|
||||
// Внутренние SHiNE-адреса открываются на текущем сервере доступа.
|
||||
const LINK_PATTERN = /(?:https?:\/\/|www\.|\/?SHiNE\/)[^\s<>"'`]+/gi;
|
||||
const TRAILING_PUNCTUATION = /[.,!?;:»”。,!?;:]$/u;
|
||||
const POSITIVE_ORDINAL = /^[1-9][0-9]*$/;
|
||||
|
||||
function trimLinkEnd(source) {
|
||||
let end = source.length;
|
||||
while (end > 0) {
|
||||
const last = source[end - 1];
|
||||
if (TRAILING_PUNCTUATION.test(last)) {
|
||||
end -= 1;
|
||||
continue;
|
||||
}
|
||||
// Закрывающую скобку считаем частью URL лишь при наличии парной открывающей.
|
||||
const opening = last === ')' ? '(' : last === ']' ? '[' : null;
|
||||
if (opening && source.slice(0, end).split(last).length > source.slice(0, end).split(opening).length) {
|
||||
end -= 1;
|
||||
continue;
|
||||
}
|
||||
break;
|
||||
}
|
||||
return source.slice(0, end);
|
||||
}
|
||||
|
||||
// Для /SHiNE/owner/channel/N сохраняем контекст, /s/N всегда принудительно ведёт в ленту.
|
||||
export function resolveShineTextLink(raw, { viewMode = 'thread' } = {}) {
|
||||
const value = String(raw || '');
|
||||
if (/^(?:https?:\/\/|www\.)/i.test(value)) {
|
||||
try {
|
||||
const url = new URL(/^www\./i.test(value) ? `https://${value}` : value);
|
||||
if ((url.protocol !== 'https:' && url.protocol !== 'http:') || !url.hostname) return null;
|
||||
if (/^www\./i.test(value) && !/^www\.[^./]+\.[^/]+/i.test(value)) return null;
|
||||
return { type: 'external', href: url.href };
|
||||
} catch {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
const route = value.replace(/^\//, '');
|
||||
const parts = route.split('/');
|
||||
if (parts.length < 2 || !/^shine$/i.test(parts[0]) || parts.slice(1).some((part) => !part || /[?#]/.test(part))) return null;
|
||||
const cleanRoute = `SHiNE/${parts.slice(1).join('/')}`;
|
||||
let destination = cleanRoute;
|
||||
if (viewMode === 'feed' && parts.length === 4 && POSITIVE_ORDINAL.test(parts[3])
|
||||
&& Number.isSafeInteger(Number(parts[3]))) {
|
||||
destination = `SHiNE/${parts[1]}/${parts[2]}/s/${parts[3]}`;
|
||||
}
|
||||
return { type: 'internal', route: destination, href: `/${destination}` };
|
||||
}
|
||||
|
||||
// Чистая функция для UI и тестов: сохраняет все символы, кроме ссылок ничего не преобразует.
|
||||
export function tokenizeShineMessageLinks(text, options = {}) {
|
||||
const source = String(text ?? '');
|
||||
const tokens = [];
|
||||
let cursor = 0;
|
||||
LINK_PATTERN.lastIndex = 0;
|
||||
for (const found of source.matchAll(LINK_PATTERN)) {
|
||||
const start = found.index;
|
||||
// Не выделяем подстроки чужих путей, доменов или идентификаторов.
|
||||
if (start > 0 && /[\p{L}\p{N}_/@.\-]/u.test(source[start - 1])) continue;
|
||||
const candidate = trimLinkEnd(found[0]);
|
||||
const target = candidate && resolveShineTextLink(candidate, options);
|
||||
if (!target) continue;
|
||||
if (start > cursor) tokens.push({ type: 'text', value: source.slice(cursor, start) });
|
||||
tokens.push({ ...target, type: target.type, value: candidate });
|
||||
cursor = start + candidate.length;
|
||||
}
|
||||
if (cursor < source.length) tokens.push({ type: 'text', value: source.slice(cursor) });
|
||||
return tokens;
|
||||
}
|
||||
|
||||
export function appendShineMessageLinks(root, text, { navigate, viewMode = 'thread', appendText } = {}) {
|
||||
for (const token of tokenizeShineMessageLinks(text, { viewMode })) {
|
||||
if (token.type === 'text') {
|
||||
if (typeof appendText === 'function') appendText(root, token.value);
|
||||
else root.append(document.createTextNode(token.value));
|
||||
continue;
|
||||
}
|
||||
const link = document.createElement('a');
|
||||
link.className = 'shine-inline-link';
|
||||
link.textContent = token.value;
|
||||
link.href = token.href;
|
||||
if (token.type === 'external') {
|
||||
link.target = '_blank';
|
||||
link.rel = 'noopener noreferrer';
|
||||
}
|
||||
link.addEventListener('click', (event) => {
|
||||
event.stopPropagation();
|
||||
if (token.type === 'internal' && typeof navigate === 'function'
|
||||
&& event.button === 0 && !event.ctrlKey && !event.metaKey && !event.shiftKey && !event.altKey) {
|
||||
event.preventDefault();
|
||||
navigate(token.route);
|
||||
}
|
||||
});
|
||||
root.append(link);
|
||||
}
|
||||
}
|
||||
@@ -73,13 +73,25 @@ export function makeShineChannelShortRoute({ ownerLogin = '', ownerBlockchainNam
|
||||
const cleanOwnerLogin = normalizeLogin(ownerLogin) || extractLoginFromBlockchainName(ownerBlockchainName);
|
||||
const chName = String(channelName || '').trim();
|
||||
if (!cleanOwnerLogin || !chName) return '';
|
||||
return `${encodeRoutePart(cleanOwnerLogin)}/${encodeRoutePart(chName)}`;
|
||||
return `${SHINE_ROUTE_SEGMENT}/${encodeRoutePart(cleanOwnerLogin)}/${encodeRoutePart(chName)}`;
|
||||
}
|
||||
|
||||
export function makeShineMessageRoute({ ownerLogin = '', messageBlockchainName = '', messageBlockNumber = '' }) {
|
||||
export function makeShineChannelStreamRoute({ ownerLogin = '', ownerBlockchainName = '', channelName = '', messageOrdinal = '' }) {
|
||||
const base = makeShineChannelShortRoute({ ownerLogin, ownerBlockchainName, channelName });
|
||||
const no = String(messageOrdinal ?? '').trim();
|
||||
return base && /^[1-9][0-9]*$/.test(no) && Number.isSafeInteger(Number(no)) ? `${base}/s/${no}` : '';
|
||||
}
|
||||
|
||||
export function makeShineMessageRoute({ ownerLogin = '', messageBlockchainName = '', messageBlockNumber = '', messageOrdinal = '', channelName = '', channelOwnerBlockchainName = '' }) {
|
||||
const msgBch = String(messageBlockchainName || '').trim();
|
||||
const msgNo = String(messageBlockNumber || '').trim();
|
||||
if (!msgBch || !msgNo) return '';
|
||||
const ordinal = String(messageOrdinal ?? '').trim();
|
||||
if (channelName && /^[1-9][0-9]*$/.test(ordinal) && Number.isSafeInteger(Number(ordinal))) {
|
||||
const base = makeShineChannelShortRoute({ ownerLogin, ownerBlockchainName: channelOwnerBlockchainName || msgBch, channelName });
|
||||
if (base) return `${base}/${encodeRoutePart(ordinal)}`;
|
||||
}
|
||||
// Technical URLs remain valid for non-channel messages (replies, notifications, old links).
|
||||
if (!msgBch || !/^[0-9]+$/.test(msgNo)) return '';
|
||||
return `${SHINE_ROUTE_SEGMENT}/${encodeRoutePart(msgBch)}/${encodeRoutePart(msgNo)}`;
|
||||
}
|
||||
|
||||
|
||||
@@ -652,3 +652,12 @@ body { overflow-x: hidden; }
|
||||
cursor: default;
|
||||
opacity: .55;
|
||||
}
|
||||
|
||||
/* Ссылки в текстах каналов, обсуждений и личных сообщений. */
|
||||
.shine-inline-link {
|
||||
color: var(--accent, #5684d8);
|
||||
text-decoration: underline;
|
||||
text-underline-offset: 2px;
|
||||
overflow-wrap: anywhere;
|
||||
}
|
||||
.shine-inline-link:focus-visible { outline: 2px solid var(--focus-ring, currentColor); outline-offset: 2px; }
|
||||
|
||||
@@ -42,3 +42,6 @@ button.thread-quote:hover { background: var(--surface); }
|
||||
.thread-replying__cancel { width: 32px; height: 32px; flex-shrink: 0; padding: 0; display: grid; place-items: center; border: 0; background: transparent; color: var(--text-secondary); cursor: pointer; }
|
||||
.thread-replying__cancel svg { width: 20px; height: 20px; }
|
||||
.thread-composer__emoji { max-height: 260px; overflow: auto; }
|
||||
|
||||
/* Отдельная публикация в обсуждении использует карточку и действия из ленты. */
|
||||
.thread-block--focus > .channel-message-card { margin-bottom: 8px; }
|
||||
|
||||
@@ -481,3 +481,17 @@
|
||||
grid-template-columns: 84px minmax(0, 1fr);
|
||||
}
|
||||
}
|
||||
|
||||
/* Compact three-state theme control in settings topbar. */
|
||||
.settings-theme-cycle {
|
||||
border: 1px solid var(--border-control);
|
||||
background: var(--surface-raised);
|
||||
color: var(--text-primary);
|
||||
border-radius: 999px;
|
||||
padding: 7px 10px;
|
||||
font: inherit;
|
||||
font-size: 12px;
|
||||
white-space: nowrap;
|
||||
cursor: pointer;
|
||||
}
|
||||
.settings-theme-cycle:focus-visible { outline: 2px solid var(--accent); outline-offset: 2px; }
|
||||
|
||||
@@ -0,0 +1,110 @@
|
||||
import test from 'node:test';
|
||||
import assert from 'node:assert/strict';
|
||||
import { resolveShineTextLink, tokenizeShineMessageLinks } from '../js/services/shine-message-links.js';
|
||||
|
||||
function links(text, viewMode = 'thread') {
|
||||
return tokenizeShineMessageLinks(text, { viewMode }).filter((item) => item.type !== 'text');
|
||||
}
|
||||
|
||||
test('обычная ссылка на публикацию сохраняет режим просмотра', () => {
|
||||
const source = 'SHiNE/aidar/news/34';
|
||||
assert.equal(resolveShineTextLink(source).route, 'SHiNE/aidar/news/34');
|
||||
assert.equal(resolveShineTextLink(source, { viewMode: 'feed' }).route, 'SHiNE/aidar/news/s/34');
|
||||
assert.equal(resolveShineTextLink('/' + source, { viewMode: 'feed' }).href, '/SHiNE/aidar/news/s/34');
|
||||
});
|
||||
|
||||
test('явная /s/34 всегда открывает ленту', () => {
|
||||
for (const viewMode of ['thread', 'feed']) {
|
||||
assert.equal(resolveShineTextLink('SHiNE/aidar/news/s/34', { viewMode }).route, 'SHiNE/aidar/news/s/34');
|
||||
}
|
||||
});
|
||||
|
||||
test('канал и профиль не меняются в ленте', () => {
|
||||
assert.equal(resolveShineTextLink('SHiNE/aidar/news', { viewMode: 'feed' }).route, 'SHiNE/aidar/news');
|
||||
assert.equal(resolveShineTextLink('SHiNE/aidar', { viewMode: 'feed' }).route, 'SHiNE/aidar');
|
||||
assert.equal(resolveShineTextLink('SHiNE/aidar@home/news/34', { viewMode: 'feed' }).route, 'SHiNE/aidar@home/news/s/34');
|
||||
});
|
||||
|
||||
test('несколько ссылок в тексте с пунктуацией сохраняют текст', () => {
|
||||
const message = 'Смотри (SHiNE/aidar/news/34), потом SHiNE/aidar/news/s/6!';
|
||||
const tokens = tokenizeShineMessageLinks(message, { viewMode: 'feed' });
|
||||
assert.equal(tokens.map((t) => t.value).join(''), message);
|
||||
assert.deepEqual(tokens.filter((t) => t.type === 'internal').map((t) => t.route), [
|
||||
'SHiNE/aidar/news/s/34', 'SHiNE/aidar/news/s/6',
|
||||
]);
|
||||
});
|
||||
|
||||
test('внешние ссылки открываются отдельно и не преобразуются во внутренние', () => {
|
||||
const items = links('https://example.org/SHiNE/aidar/news/34 и www.example.com/path?q=1');
|
||||
assert.equal(items.length, 2);
|
||||
assert.equal(items[0].type, 'external');
|
||||
assert.equal(items[0].href, 'https://example.org/SHiNE/aidar/news/34');
|
||||
assert.equal(items[1].href, 'https://www.example.com/path?q=1');
|
||||
assert.equal(links('http://localhost:8080/test')[0].href, 'http://localhost:8080/test');
|
||||
});
|
||||
|
||||
test('опасные протоколы, пустые и встроенные подстроки не становятся ссылками', () => {
|
||||
assert.equal(links('javascript:alert(1) file:///etc/passwd fooSHiNE/aidar/news/34').length, 0);
|
||||
assert.equal(links('https:// www. SHiNE/').length, 0);
|
||||
assert.equal(resolveShineTextLink('SHiNE/aidar/news/34?redirect=evil'), null);
|
||||
});
|
||||
|
||||
test('скобки в URL сохраняются, лишняя закрывающая скобка остаётся текстом', () => {
|
||||
const message = 'Документ https://example.org/(archive).';
|
||||
const tokens = tokenizeShineMessageLinks(message);
|
||||
assert.equal(tokens.map((t) => t.value).join(''), message);
|
||||
assert.equal(links(message)[0].href, 'https://example.org/(archive)');
|
||||
});
|
||||
|
||||
test('DOM не интерпретирует текст как HTML, а навигация вызывается при обычном клике', async () => {
|
||||
const { appendShineMessageLinks } = await import('../js/services/shine-message-links.js');
|
||||
class FakeNode {
|
||||
constructor(tag = '') { this.tag = tag; this.children = []; this.handlers = {}; }
|
||||
append(...children) { this.children.push(...children); }
|
||||
addEventListener(type, handler) { this.handlers[type] = handler; }
|
||||
set textContent(value) { this.text = value; }
|
||||
}
|
||||
const before = globalThis.document;
|
||||
globalThis.document = {
|
||||
createTextNode: (value) => ({ value }),
|
||||
createElement: (tag) => new FakeNode(tag),
|
||||
};
|
||||
try {
|
||||
const root = new FakeNode();
|
||||
const routes = [];
|
||||
appendShineMessageLinks(root, '<script> SHiNE/aidar/news/34', {
|
||||
viewMode: 'feed', navigate: (route) => routes.push(route),
|
||||
});
|
||||
assert.equal(root.children[0].value, '<script> ');
|
||||
const anchor = root.children[1];
|
||||
assert.equal(anchor.tag, 'a');
|
||||
assert.equal(anchor.href, '/SHiNE/aidar/news/s/34');
|
||||
let prevented = false;
|
||||
anchor.handlers.click({ button: 0, preventDefault() { prevented = true; }, stopPropagation() {} });
|
||||
assert.equal(prevented, true);
|
||||
assert.deepEqual(routes, ['SHiNE/aidar/news/s/34']);
|
||||
} finally {
|
||||
globalThis.document = before;
|
||||
}
|
||||
});
|
||||
|
||||
test('сформированные текстовые ссылки открывают существующие страницы роутера', async () => {
|
||||
const previousWindow = globalThis.window;
|
||||
globalThis.window = { location: { pathname: '/' } };
|
||||
try {
|
||||
const { parseRouteFromPath } = await import('../js/router.js');
|
||||
const fromFeed = resolveShineTextLink('SHiNE/aidar/news/34', { viewMode: 'feed' });
|
||||
const inFeed = parseRouteFromPath(fromFeed.href);
|
||||
assert.equal(inFeed.pageId, 'channel-view');
|
||||
assert.equal(inFeed.params.scrollToMessageOrdinal, '34');
|
||||
const fromThread = resolveShineTextLink('SHiNE/aidar/news/34');
|
||||
const inThread = parseRouteFromPath(fromThread.href);
|
||||
assert.equal(inThread.pageId, 'channel-thread-view');
|
||||
assert.equal(inThread.params.messageOrdinal, '34');
|
||||
assert.equal(parseRouteFromPath('/SHiNE/aidar/news/s/34').pageId, 'channel-view');
|
||||
assert.equal(parseRouteFromPath('/SHiNE/aidar/news').pageId, 'channel-view');
|
||||
assert.equal(parseRouteFromPath('/SHiNE/aidar').pageId, 'user');
|
||||
} finally {
|
||||
globalThis.window = previousWindow;
|
||||
}
|
||||
});
|
||||
Reference in New Issue
Block a user